Vm-dev October 2014

vm-dev@lists.squeakfoundation.org

38 participants
133 discussions

VM Maker: VMMaker-bf.352.mcz
by commits＠source.squeak.org 09 Oct '14

09 Oct '14

Bert Freudenberg uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker-bf.352.mcz ==================== Summary ==================== Name: VMMaker-bf.352 Author: bf Time: 9 October 2014, 9:09:29.549 am UUID: df60954e-037f-4f2d-a948-aa0ba81641f5 Ancestors: VMMaker-bf.351 Set reclaimableContextCount to 0 in internalCannotReturn:. =============== Diff against VMMaker-bf.351 =============== Item was changed: ----- Method: Interpreter>>internalCannotReturn: (in category 'return bytecodes') ----- internalCannotReturn: resultObj <inline: true> + reclaimableContextCount := 0. self internalPush: activeContext. self internalPush: resultObj. messageSelector := objectMemory splObj: SelectorCannotReturn. argumentCount := 1. ^ self normalSend!

1 0

internalCannotReturn:
by Bert Freudenberg 08 Oct '14

08 Oct '14

Shouldn't that set reclaimableContextCount to 0 since it hands out activeContext? - Bert -

2 1

[commit][3097] CogVM source as per VMMaker.oscog-eem.895
by commits＠squeakvm.org 08 Oct '14

08 Oct '14

Revision: 3097 Author: eliot Date: 2014-10-08 12:18:05 -0700 (Wed, 08 Oct 2014) Log Message: ----------- CogVM source as per VMMaker.oscog-eem.895 Compile the NewspeakV4 bytecode extPushPseudoVariableOrOuter frameless when pushing nil, true, false. This means the scanMethod and scanBlock: implementations must maintain extA and extB. Rename "explicit outer" foo to "enclosing object" foo Modified Paths: -------------- branches/Cog/nscogsrc/vm/cogit.c branches/Cog/nscogsrc/vm/cogit.h branches/Cog/nscogsrc/vm/cointerp.c branches/Cog/nscogsrc/vm/cointerp.h branches/Cog/nscogsrc/vm/gcc3x-cointerp.c branches/Cog/nsspursrc/vm/cogit.c branches/Cog/nsspursrc/vm/cogit.h branches/Cog/nsspursrc/vm/cointerp.c branches/Cog/nsspursrc/vm/cointerp.h branches/Cog/nsspursrc/vm/gcc3x-cointerp.c branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c branches/Cog/nsspurstacksrc/vm/interp.c branches/Cog/sistasrc/vm/cogit.c branches/Cog/sistasrc/vm/cogit.h branches/Cog/sistasrc/vm/cointerp.c branches/Cog/sistasrc/vm/cointerp.h branches/Cog/sistasrc/vm/gcc3x-cointerp.c branches/Cog/spursistasrc/vm/cogit.c branches/Cog/spursistasrc/vm/cogit.h branches/Cog/spursistasrc/vm/cointerp.c branches/Cog/spursistasrc/vm/cointerp.h branches/Cog/spursistasrc/vm/gcc3x-cointerp.c branches/Cog/spursrc/vm/cogit.c branches/Cog/spursrc/vm/cogit.h branches/Cog/spursrc/vm/cointerp.c branches/Cog/spursrc/vm/cointerp.h branches/Cog/spursrc/vm/gcc3x-cointerp.c branches/Cog/spurstacksrc/vm/gcc3x-interp.c branches/Cog/spurstacksrc/vm/interp.c branches/Cog/src/vm/cogit.c branches/Cog/src/vm/cogit.h branches/Cog/src/vm/cointerp.c branches/Cog/src/vm/cointerp.h branches/Cog/src/vm/cointerpmt.c branches/Cog/src/vm/cointerpmt.h branches/Cog/src/vm/gcc3x-cointerp.c branches/Cog/src/vm/gcc3x-cointerpmt.c branches/Cog/stacksrc/vm/gcc3x-interp.c branches/Cog/stacksrc/vm/interp.c Property Changed: ---------------- branches/Cog/platforms/Cross/vm/sqSCCSVersion.h Modified: branches/Cog/nscogsrc/vm/cogit.c =================================================================== --- branches/Cog/nscogsrc/vm/cogit.c 2014-10-05 21:56:54 UTC (rev 3096) +++ branches/Cog/nscogsrc/vm/cogit.c 2014-10-08 19:18:05 UTC (rev 3097) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.891 uuid: 2b1ec85c-bd1d-4299-938a-80aef455e476 + CCodeGenerator VMMaker.oscog-eem.895 uuid: 2c674935-8b94-45ff-b8fc-59fb78830eb3 from - StackToRegisterMappingCogit VMMaker.oscog-eem.891 uuid: 2b1ec85c-bd1d-4299-938a-80aef455e476 + StackToRegisterMappingCogit VMMaker.oscog-eem.895 uuid: 2c674935-8b94-45ff-b8fc-59fb78830eb3 */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.891 uuid: 2b1ec85c-bd1d-4299-938a-80aef455e476 " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.895 uuid: 2c674935-8b94-45ff-b8fc-59fb78830eb3 " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -964,7 +964,7 @@ static sqInt genPushConstantOneBytecode(void); static sqInt genPushConstantTrueBytecode(void); static sqInt genPushConstantZeroBytecode(void); -static sqInt genPushExplicitOuterReceiverBytecode(void); +static sqInt genPushEnclosingObjectBytecode(void); static sqInt genPushLiteralConstantBytecode(void); static sqInt genPushLiteralIndex(sqInt literalIndex) NoDbgRegParms; static sqInt genPushLiteralVariable16CasesBytecode(void); @@ -1073,7 +1073,7 @@ static sqInt genPrimitiveSubtract(void); static sqInt genPushActiveContextBytecode(void); static sqInt genPushClosureCopyCopiedValuesBytecode(void); -static sqInt genPushExplicitOuterReceiver(sqInt level) NoDbgRegParms; +static sqInt genPushEnclosingObjectAt(sqInt level) NoDbgRegParms; static sqInt genPushImplicitReceiverBytecode(void); static sqInt genPushLiteralVariable(sqInt literalIndex) NoDbgRegParms; static sqInt genPushLiteral(sqInt literal) NoDbgRegParms; @@ -1114,6 +1114,7 @@ static void marshallSendArguments(sqInt numArgs) NoDbgRegParms; static void mergeafterContinuation(BytecodeFixup *fixup, sqInt mergeWithContinuation) NoDbgRegParms; static sqInt methodAbortTrampolineFor(sqInt numArgs) NoDbgRegParms; +static sqInt needsFrameIfExtBGT2(sqInt stackDelta) NoDbgRegParms; static sqInt needsFrameIfMod16GENumArgs(sqInt stackDelta) NoDbgRegParms; static sqInt needsFrameIfStackGreaterThanOne(sqInt stackDelta) NoDbgRegParms; static sqInt numberOfSpillsInTopNItems(sqInt n) NoDbgRegParms; @@ -1194,8 +1195,8 @@ static sqInt ceClosureCopyTrampoline; static sqInt ceCPICMissTrampoline; static sqInt ceCreateNewArrayTrampoline; +static sqInt ceEnclosingObjectTrampoline; void (*ceEnterCogCodePopReceiverReg)(void); -static sqInt ceExplicitReceiverTrampoline; static sqInt ceFetchContextInstVarTrampoline; unsigned long (*ceGetSP)(void); static sqInt ceImplicitReceiverTrampoline; @@ -1386,7 +1387,7 @@ { duplicateTopBytecode, 0, needsFrameNever, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 }, { genPushActiveContextBytecode, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 }, { genPushNewArrayBytecode, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0 }, - { genPushExplicitOuterReceiverBytecode, 0, 0, 0, 0, 2, 0, 0, 0, 0, 1, 0, 0, 0 }, + { genPushEnclosingObjectBytecode, 0, 0, 0, 0, 2, 0, 0, 0, 0, 1, 0, 0, 0 }, { genPushRemoteTempLongBytecode, 0, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0 }, { genStoreRemoteTempLongBytecode, 0, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0 }, { genStoreAndPopRemoteTempLongBytecode, 0, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0 }, @@ -1580,7 +1581,7 @@ { genPushTemporaryVariableBytecode, 0, needsFrameIfMod16GENumArgs, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 }, { genPushTemporaryVariableBytecode, 0, needsFrameIfMod16GENumArgs, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 }, { genPushReceiverBytecode, 0, needsFrameNever, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 }, - { genExtPushPseudoVariableOrOuterBytecode, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 }, + { genExtPushPseudoVariableOrOuterBytecode, 0, needsFrameIfExtBGT2, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 }, { genPushConstantZeroBytecode, 0, needsFrameNever, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 }, { genPushConstantOneBytecode, 0, needsFrameNever, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 }, { genSpecialSelectorArithmetic, 0, 0, 0, AddRR, 1, 0, 0, 0, 0, 1, 0, 0, 0 }, @@ -9638,7 +9639,6 @@ else { bytecodeSetOffset = 0; } - extA = (extB = 0); /* begin ensureNoForwardedLiteralsIn: */ methodObj = aMethodObj; cogMethod = compileCogMethod(aSelectorOop); @@ -11062,7 +11062,7 @@ Generate the class fetch and cache probe inline for speed. Smashes Arg1Reg, RegClass and caller-saved regs. */ - ceExplicitReceiverTrampoline = genTrampolineForcalledargresult(ceExplicitReceiverAt, "ceExplicitReceiverTrampoline", SendNumArgsReg, ReceiverResultReg); + ceEnclosingObjectTrampoline = genTrampolineForcalledargresult(ceEnclosingObjectAt, "ceEnclosingObjectTrampoline", SendNumArgsReg, ReceiverResultReg); opcodeIndex = 0; /* begin MoveMw:r:R: */ genoperandoperandoperand(MoveMwrR, FoxMFReceiver, FPReg, ReceiverResultReg); @@ -17336,7 +17336,7 @@ /* 77 01001101 Push false [* 1:true, 2:nil, 3:thisContext, ..., -N: - pushExplicitOuter: N, N = Extend B] + pushEnclosingObjectAt: N, N = Extend B] */ static sqInt @@ -17362,7 +17362,7 @@ default: if (ext < 0) { - return genPushExplicitOuterReceiver(0 - ext); + return genPushEnclosingObjectAt(0 - ext); } warning("undefined extension for extPushPseudoVariableOrOuter"); return unknownBytecode(); @@ -17942,16 +17942,16 @@ } -/* Uncached push explicit outer send receiver */ +/* Uncached push enclosing object */ static sqInt -genPushExplicitOuterReceiverBytecode(void) +genPushEnclosingObjectBytecode(void) { sqInt levelOop; levelOop = getLiteral(byte1); assert((levelOop & 1)); - return genPushExplicitOuterReceiver((levelOop >> 1)); + return genPushEnclosingObjectAt((levelOop >> 1)); } static sqInt @@ -20722,17 +20722,16 @@ } -/* Uncached push explicit outer send receiver */ +/* Uncached push enclosing object */ static sqInt -genPushExplicitOuterReceiver(sqInt level) +genPushEnclosingObjectAt(sqInt level) { - assert(needsFrame); (optStatus.isReceiverResultRegLive = 0); ssAllocateCallReg(SendNumArgsReg); /* begin MoveCq:R: */ genoperandoperand(MoveCqR, level, SendNumArgsReg); - CallRT(ceExplicitReceiverTrampoline); + CallRT(ceEnclosingObjectTrampoline); return ssPushRegister(ReceiverResultReg); } @@ -22097,6 +22096,13 @@ } static sqInt +needsFrameIfExtBGT2(sqInt stackDelta) +{ + return (extB < 0) + || (extB > 2); +} + +static sqInt needsFrameIfMod16GENumArgs(sqInt stackDelta) { return (byte0 % 16) >= methodOrBlockNumArgs; @@ -22249,11 +22255,15 @@ inBlock = 1; pc = (blockStart->startpc); end = ((blockStart->startpc)) + ((blockStart->span)); - framelessStackDelta = (nExts = 0); + framelessStackDelta = (nExts = (extA = (extB = 0))); pushingNils = 1; while (pc < end) { byte0 = (fetchByteofObject(pc, methodObj)) + bytecodeSetOffset; descriptor = generatorAt(byte0); + if ((descriptor->isExtension)) { + loadSubsequentBytesForDescriptorat(descriptor, pc); + ((descriptor->generator))(); + } if (!needsFrame) { if ((((descriptor->needsFrameFunction)) == null) || (((descriptor->needsFrameFunction))(framelessStackDelta))) { @@ -22290,9 +22300,12 @@ pc = (pc + ((descriptor->numBytes))) + (((descriptor->isBlockCreation) ? ((descriptor->spanFunction))(descriptor, pc, nExts, methodObj) : 0)); - nExts = ((descriptor->isExtension) - ? nExts + 1 - : 0); + if ((descriptor->isExtension)) { + nExts += 1; + } + else { + nExts = (extA = (extB = 0)); + } prevBCDescriptor = descriptor; } if (!needsFrame) { @@ -22337,10 +22350,14 @@ return 0; } pc = (latestContinuation = initialPC); - numBlocks = (framelessStackDelta = (nExts = 0)); + numBlocks = (framelessStackDelta = (nExts = (extA = (extB = 0)))); while (pc <= endPC) { byte0 = (fetchByteofObject(pc, methodObj)) + bytecodeSetOffset; descriptor = generatorAt(byte0); + if ((descriptor->isExtension)) { + loadSubsequentBytesForDescriptorat(descriptor, pc); + ((descriptor->generator))(); + } if (((descriptor->isReturn)) && (pc >= latestContinuation)) { endPC = pc; @@ -22379,9 +22396,12 @@ # endif /* NewspeakVM */ pc += (descriptor->numBytes); - nExts = ((descriptor->isExtension) - ? nExts + 1 - : 0); + if ((descriptor->isExtension)) { + nExts += 1; + } + else { + nExts = (extA = (extB = 0)); + } prevBCDescriptor = descriptor; } return numBlocks; Modified: branches/Cog/nscogsrc/vm/cogit.h =================================================================== --- branches/Cog/nscogsrc/vm/cogit.h 2014-10-05 21:56:54 UTC (rev 3096) +++ branches/Cog/nscogsrc/vm/cogit.h 2014-10-08 19:18:05 UTC (rev 3097) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.891 uuid: 2b1ec85c-bd1d-4299-938a-80aef455e476 + CCodeGenerator VMMaker.oscog-eem.895 uuid: 2c674935-8b94-45ff-b8fc-59fb78830eb3 */ Modified: branches/Cog/nscogsrc/vm/cointerp.c =================================================================== --- branches/Cog/nscogsrc/vm/cointerp.c 2014-10-05 21:56:54 UTC (rev 3096) +++ branches/Cog/nscogsrc/vm/cointerp.c 2014-10-08 19:18:05 UTC (rev 3097) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.891 uuid: 2b1ec85c-bd1d-4299-938a-80aef455e476 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.895 uuid: 2c674935-8b94-45ff-b8fc-59fb78830eb3 from - CoInterpreter VMMaker.oscog-eem.891 uuid: 2b1ec85c-bd1d-4299-938a-80aef455e476 + CoInterpreter VMMaker.oscog-eem.895 uuid: 2c674935-8b94-45ff-b8fc-59fb78830eb3 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.891 uuid: 2b1ec85c-bd1d-4299-938a-80aef455e476 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.895 uuid: 2c674935-8b94-45ff-b8fc-59fb78830eb3 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -406,7 +406,7 @@ sqInt ceContextinstVar(sqInt maybeContext, sqInt slotIndex); sqInt ceContextinstVarvalue(sqInt maybeMarriedContext, sqInt slotIndex, sqInt anOop); sqInt ceDynamicSuperSendtonumArgs(sqInt selector, sqInt rcvr, sqInt numArgs); -sqInt ceExplicitReceiverAt(sqInt level); +sqInt ceEnclosingObjectAt(sqInt level); sqInt ceInterpretMethodFromPICreceiver(sqInt aMethodObj, sqInt rcvr); sqInt ceMNUFromPICMNUMethodreceiver(sqInt aMethodObj, sqInt rcvr); sqInt ceNewArraySlotSize(sqInt slotSize); @@ -1054,10 +1054,10 @@ sqInt doSignalSemaphoreWithIndex(sqInt index); static void dummyReferToProxy(void); EXPORT(sqInt) dumpImage(sqInt fileName); +static sqInt enclosingObjectAtwithObjectwithMixin(sqInt n, sqInt anObject, sqInt mixin) NoDbgRegParms; static sqInt ensureCallerContext(char *theFP) NoDbgRegParms; static void ensureImageFormatIsUpToDate(sqInt swapBytes) NoDbgRegParms; static char * establishFrameForContextToReturnTo(sqInt contextToReturnTo) NoDbgRegParms; -static sqInt explicitOuterReceiverwithObjectwithMixin(sqInt n, sqInt anObject, sqInt mixin) NoDbgRegParms; static void externalDivorceFrameandContext(char *theFP, sqInt ctxt) NoDbgRegParms; static char * externalEnsureIsBaseFrame(char *aFramePtr) NoDbgRegParms; static sqInt externalInstVarofContextput(sqInt index, sqInt maybeMarriedContext, sqInt anOop) NoDbgRegParms; @@ -2084,7 +2084,7 @@ /* 574 */ (void (*)(void))0, /* 575 */ (void (*)(void))0, 0 }; -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.891"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.895"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -6002,14 +6002,14 @@ } break; case 139: - /* pushExplicitOuterReceiverBytecode */ + /* pushEnclosingObjectBytecode */ { sqInt anIntOop; sqInt litIndex; sqInt n; sqInt object; - VM_LABEL(0pushExplicitOuterReceiverBytecode); + VM_LABEL(0pushEnclosingObjectBytecode); litIndex = byteAtPointer(++localIP); /* begin literal: */ assert(GIV(method) == (iframeMethod(localFP))); @@ -6021,7 +6021,7 @@ currentBytecode = (byteAtPointer(++localIP)) + GIV(bytecodeSetSelector); /* begin internalPush: */ - object = explicitOuterReceiverwithObjectwithMixin(n, longAt(localFP + FoxIFReceiver), methodClassOf(GIV(method))); + object = enclosingObjectAtwithObjectwithMixin(n, longAt(localFP + FoxIFReceiver), methodClassOf(GIV(method))); longAtPointerput((localSP -= BytesPerOop), object); } break; @@ -9361,7 +9361,7 @@ break; default: thing = (extB < 0 - ? explicitOuterReceiverwithObjectwithMixin(0 - extB, longAt(localFP + FoxIFReceiver), methodClassOf(GIV(method))) + ? enclosingObjectAtwithObjectwithMixin(0 - extB, longAt(localFP + FoxIFReceiver), methodClassOf(GIV(method))) : (error("undefined extension for extPushPseudoVariableOrOuter"), GIV(nilObj))); @@ -14382,9 +14382,9 @@ } sqInt -ceExplicitReceiverAt(sqInt level) +ceEnclosingObjectAt(sqInt level) { DECL_MAYBE_SQ_GLOBAL_STRUCT - return explicitOuterReceiverwithObjectwithMixin(level, longAt(GIV(framePointer) + FoxMFReceiver), methodClassOf(((mframeHomeMethod(GIV(framePointer)))->methodObject))); + return enclosingObjectAtwithObjectwithMixin(level, longAt(GIV(framePointer) + FoxMFReceiver), methodClassOf(((mframeHomeMethod(GIV(framePointer)))->methodObject))); } sqInt @@ -44673,6 +44673,52 @@ } +/* This is used to implement the innards of the pushEnclosingObjectBytecode, + used for explicit outer sends in NS2/NS3. */ + +static sqInt +enclosingObjectAtwithObjectwithMixin(sqInt n, sqInt anObject, sqInt mixin) +{ DECL_MAYBE_SQ_GLOBAL_STRUCT + sqInt aClass; + sqInt ccIndex; + sqInt count; + sqInt enclosingObject; + sqInt mixinApplication; + sqInt mixinOrMixinApplication; + sqInt targetMixin; + + enclosingObject = anObject; + targetMixin = mixin; + count = 0; + while (count < n) { + count += 1; + if ((targetMixin == GIV(nilObj)) + || (enclosingObject == GIV(nilObj))) { + return GIV(nilObj); + } + /* begin findApplicationOfTargetMixin:startingAtNonMetaClass: */ + aClass = ((enclosingObject & 1) + ? longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassSmallInteger << ShiftForWord)) + : (((ccIndex = (((usqInt) (longAt(enclosingObject))) >> (compactClassFieldLSB())) & 0x1F)) == 0 + ? (longAt(enclosingObject - BaseHeaderSize)) & AllButTypeMask + : longAt(((longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (CompactClasses << ShiftForWord))) + BaseHeaderSize) + ((ccIndex - 1) << ShiftForWord)))); + mixinOrMixinApplication = aClass; + while (!((mixinOrMixinApplication == GIV(nilObj)) + || ((mixinOrMixinApplication == targetMixin) + || ((longAt((mixinOrMixinApplication + BaseHeaderSize) + (MixinIndex << ShiftForWord))) == targetMixin)))) { + mixinOrMixinApplication = longAt((mixinOrMixinApplication + BaseHeaderSize) + (SuperclassIndex << ShiftForWord)); + } + mixinApplication = mixinOrMixinApplication; + if (mixinApplication == GIV(nilObj)) { + return GIV(nilObj); + } + enclosingObject = longAt((mixinApplication + BaseHeaderSize) + (EnclosingObjectIndex << ShiftForWord)); + targetMixin = longAt((targetMixin + BaseHeaderSize) + (EnclosingMixinIndex << ShiftForWord)); + } + return enclosingObject; +} + + /* Answerr the caller context for a frame. If the frame has a caller frame that doesn't have a context, then marry the caller frame. */ @@ -44898,53 +44944,6 @@ } -/* This is used to implement the innards of the - pushExplicitOuterReceiverBytecode, used for explicit outer sends in - NS2/NS3. */ - -static sqInt -explicitOuterReceiverwithObjectwithMixin(sqInt n, sqInt anObject, sqInt mixin) -{ DECL_MAYBE_SQ_GLOBAL_STRUCT - sqInt aClass; - sqInt ccIndex; - sqInt count; - sqInt explicitReceiver; - sqInt mixinApplication; - sqInt mixinOrMixinApplication; - sqInt targetMixin; - - explicitReceiver = anObject; - targetMixin = mixin; - count = 0; - while (count < n) { - count += 1; - if ((targetMixin == GIV(nilObj)) - || (explicitReceiver == GIV(nilObj))) { - return GIV(nilObj); - } - /* begin findApplicationOfTargetMixin:startingAtNonMetaClass: */ - aClass = ((explicitReceiver & 1) - ? longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassSmallInteger << ShiftForWord)) - : (((ccIndex = (((usqInt) (longAt(explicitReceiver))) >> (compactClassFieldLSB())) & 0x1F)) == 0 - ? (longAt(explicitReceiver - BaseHeaderSize)) & AllButTypeMask - : longAt(((longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (CompactClasses << ShiftForWord))) + BaseHeaderSize) + ((ccIndex - 1) << ShiftForWord)))); - mixinOrMixinApplication = aClass; - while (!((mixinOrMixinApplication == GIV(nilObj)) - || ((mixinOrMixinApplication == targetMixin) - || ((longAt((mixinOrMixinApplication + BaseHeaderSize) + (MixinIndex << ShiftForWord))) == targetMixin)))) { - mixinOrMixinApplication = longAt((mixinOrMixinApplication + BaseHeaderSize) + (SuperclassIndex << ShiftForWord)); - } - mixinApplication = mixinOrMixinApplication; - if (mixinApplication == GIV(nilObj)) { - return GIV(nilObj); - } - explicitReceiver = longAt((mixinApplication + BaseHeaderSize) + (EnclosingObjectIndex << ShiftForWord)); - targetMixin = longAt((targetMixin + BaseHeaderSize) + (EnclosingMixinIndex << ShiftForWord)); - } - return explicitReceiver; -} - - /* Divorce a single frame and its context. If it is not the top frame of a stack this means splitting its stack. */ Modified: branches/Cog/nscogsrc/vm/cointerp.h =================================================================== --- branches/Cog/nscogsrc/vm/cointerp.h 2014-10-05 21:56:54 UTC (rev 3096) +++ branches/Cog/nscogsrc/vm/cointerp.h 2014-10-08 19:18:05 UTC (rev 3097) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.891 uuid: 2b1ec85c-bd1d-4299-938a-80aef455e476 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.895 uuid: 2c674935-8b94-45ff-b8fc-59fb78830eb3 */ @@ -36,7 +36,7 @@ sqInt ceContextinstVar(sqInt maybeContext, sqInt slotIndex); sqInt ceContextinstVarvalue(sqInt maybeMarriedContext, sqInt slotIndex, sqInt anOop); sqInt ceDynamicSuperSendtonumArgs(sqInt selector, sqInt rcvr, sqInt numArgs); -sqInt ceExplicitReceiverAt(sqInt level); +sqInt ceEnclosingObjectAt(sqInt level); sqInt ceInterpretMethodFromPICreceiver(sqInt aMethodObj, sqInt rcvr); sqInt ceMNUFromPICMNUMethodreceiver(sqInt aMethodObj, sqInt rcvr); sqInt ceNewArraySlotSize(sqInt slotSize); Modified: branches/Cog/nscogsrc/vm/gcc3x-cointerp.c =================================================================== --- branches/Cog/nscogsrc/vm/gcc3x-cointerp.c 2014-10-05 21:56:54 UTC (rev 3096) +++ branches/Cog/nscogsrc/vm/gcc3x-cointerp.c 2014-10-08 19:18:05 UTC (rev 3097) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.891 uuid: 2b1ec85c-bd1d-4299-938a-80aef455e476 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.895 uuid: 2c674935-8b94-45ff-b8fc-59fb78830eb3 from - CoInterpreter VMMaker.oscog-eem.891 uuid: 2b1ec85c-bd1d-4299-938a-80aef455e476 + CoInterpreter VMMaker.oscog-eem.895 uuid: 2c674935-8b94-45ff-b8fc-59fb78830eb3 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.891 uuid: 2b1ec85c-bd1d-4299-938a-80aef455e476 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.895 uuid: 2c674935-8b94-45ff-b8fc-59fb78830eb3 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -409,7 +409,7 @@ sqInt ceContextinstVar(sqInt maybeContext, sqInt slotIndex); sqInt ceContextinstVarvalue(sqInt maybeMarriedContext, sqInt slotIndex, sqInt anOop); sqInt ceDynamicSuperSendtonumArgs(sqInt selector, sqInt rcvr, sqInt numArgs); -sqInt ceExplicitReceiverAt(sqInt level); +sqInt ceEnclosingObjectAt(sqInt level); sqInt ceInterpretMethodFromPICreceiver(sqInt aMethodObj, sqInt rcvr); sqInt ceMNUFromPICMNUMethodreceiver(sqInt aMethodObj, sqInt rcvr); sqInt ceNewArraySlotSize(sqInt slotSize); @@ -1057,10 +1057,10 @@ sqInt doSignalSemaphoreWithIndex(sqInt index); static void dummyReferToProxy(void); EXPORT(sqInt) dumpImage(sqInt fileName); +static sqInt enclosingObjectAtwithObjectwithMixin(sqInt n, sqInt anObject, sqInt mixin) NoDbgRegParms; static sqInt ensureCallerContext(char *theFP) NoDbgRegParms; static void ensureImageFormatIsUpToDate(sqInt swapBytes) NoDbgRegParms; static char * establishFrameForContextToReturnTo(sqInt contextToReturnTo) NoDbgRegParms; -static sqInt explicitOuterReceiverwithObjectwithMixin(sqInt n, sqInt anObject, sqInt mixin) NoDbgRegParms; static void externalDivorceFrameandContext(char *theFP, sqInt ctxt) NoDbgRegParms; static char * externalEnsureIsBaseFrame(char *aFramePtr) NoDbgRegParms; static sqInt externalInstVarofContextput(sqInt index, sqInt maybeMarriedContext, sqInt anOop) NoDbgRegParms; @@ -2087,7 +2087,7 @@ /* 574 */ (void (*)(void))0, /* 575 */ (void (*)(void))0, 0 }; -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.891"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.895"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -6011,14 +6011,14 @@ } BREAK; CASE(139) - /* pushExplicitOuterReceiverBytecode */ + /* pushEnclosingObjectBytecode */ { sqInt anIntOop; sqInt litIndex; sqInt n; sqInt object; - VM_LABEL(0pushExplicitOuterReceiverBytecode); + VM_LABEL(0pushEnclosingObjectBytecode); litIndex = byteAtPointer(++localIP); /* begin literal: */ assert(GIV(method) == (iframeMethod(localFP))); @@ -6030,7 +6030,7 @@ currentBytecode = (byteAtPointer(++localIP)) + GIV(bytecodeSetSelector); /* begin internalPush: */ - object = explicitOuterReceiverwithObjectwithMixin(n, longAt(localFP + FoxIFReceiver), methodClassOf(GIV(method))); + object = enclosingObjectAtwithObjectwithMixin(n, longAt(localFP + FoxIFReceiver), methodClassOf(GIV(method))); longAtPointerput((localSP -= BytesPerOop), object); } BREAK; @@ -9370,7 +9370,7 @@ break; default: thing = (extB < 0 - ? explicitOuterReceiverwithObjectwithMixin(0 - extB, longAt(localFP + FoxIFReceiver), methodClassOf(GIV(method))) + ? enclosingObjectAtwithObjectwithMixin(0 - extB, longAt(localFP + FoxIFReceiver), methodClassOf(GIV(method))) : (error("undefined extension for extPushPseudoVariableOrOuter"), GIV(nilObj))); @@ -14391,9 +14391,9 @@ } sqInt -ceExplicitReceiverAt(sqInt level) +ceEnclosingObjectAt(sqInt level) { DECL_MAYBE_SQ_GLOBAL_STRUCT - return explicitOuterReceiverwithObjectwithMixin(level, longAt(GIV(framePointer) + FoxMFReceiver), methodClassOf(((mframeHomeMethod(GIV(framePointer)))->methodObject))); + return enclosingObjectAtwithObjectwithMixin(level, longAt(GIV(framePointer) + FoxMFReceiver), methodClassOf(((mframeHomeMethod(GIV(framePointer)))->methodObject))); } sqInt @@ -44682,6 +44682,52 @@ } +/* This is used to implement the innards of the pushEnclosingObjectBytecode, + used for explicit outer sends in NS2/NS3. */ + +static sqInt +enclosingObjectAtwithObjectwithMixin(sqInt n, sqInt anObject, sqInt mixin) +{ DECL_MAYBE_SQ_GLOBAL_STRUCT + sqInt aClass; + sqInt ccIndex; + sqInt count; + sqInt enclosingObject; + sqInt mixinApplication; + sqInt mixinOrMixinApplication; + sqInt targetMixin; + + enclosingObject = anObject; + targetMixin = mixin; + count = 0; + while (count < n) { + count += 1; + if ((targetMixin == GIV(nilObj)) + || (enclosingObject == GIV(nilObj))) { + return GIV(nilObj); + } + /* begin findApplicationOfTargetMixin:startingAtNonMetaClass: */ + aClass = ((enclosingObject & 1) + ? longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassSmallInteger << ShiftForWord)) + : (((ccIndex = (((usqInt) (longAt(enclosingObject))) >> (compactClassFieldLSB())) & 0x1F)) == 0 + ? (longAt(enclosingObject - BaseHeaderSize)) & AllButTypeMask + : longAt(((longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (CompactClasses << ShiftForWord))) + BaseHeaderSize) + ((ccIndex - 1) << ShiftForWord)))); + mixinOrMixinApplication = aClass; + while (!((mixinOrMixinApplication == GIV(nilObj)) + || ((mixinOrMixinApplication == targetMixin) + || ((longAt((mixinOrMixinApplication + BaseHeaderSize) + (MixinIndex << ShiftForWord))) == targetMixin)))) { + mixinOrMixinApplication = longAt((mixinOrMixinApplication + BaseHeaderSize) + (SuperclassIndex << ShiftForWord)); + } + mixinApplication = mixinOrMixinApplication; + if (mixinApplication == GIV(nilObj)) { + return GIV(nilObj); + } + enclosingObject = longAt((mixinApplication + BaseHeaderSize) + (EnclosingObjectIndex << ShiftForWord)); + targetMixin = longAt((targetMixin + BaseHeaderSize) + (EnclosingMixinIndex << ShiftForWord)); + } + return enclosingObject; +} + + /* Answerr the caller context for a frame. If the frame has a caller frame that doesn't have a context, then marry the caller frame. */ @@ -44907,53 +44953,6 @@ } -/* This is used to implement the innards of the - pushExplicitOuterReceiverBytecode, used for explicit outer sends in - NS2/NS3. */ - -static sqInt -explicitOuterReceiverwithObjectwithMixin(sqInt n, sqInt anObject, sqInt mixin) -{ DECL_MAYBE_SQ_GLOBAL_STRUCT - sqInt aClass; - sqInt ccIndex; - sqInt count; - sqInt explicitReceiver; - sqInt mixinApplication; - sqInt mixinOrMixinApplication; - sqInt targetMixin; - - explicitReceiver = anObject; - targetMixin = mixin; - count = 0; - while (count < n) { - count += 1; - if ((targetMixin == GIV(nilObj)) - || (explicitReceiver == GIV(nilObj))) { - return GIV(nilObj); - } - /* begin findApplicationOfTargetMixin:startingAtNonMetaClass: */ - aClass = ((explicitReceiver & 1) - ? longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassSmallInteger << ShiftForWord)) - : (((ccIndex = (((usqInt) (longAt(explicitReceiver))) >> (compactClassFieldLSB())) & 0x1F)) == 0 - ? (longAt(explicitReceiver - BaseHeaderSize)) & AllButTypeMask - : longAt(((longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (CompactClasses << ShiftForWord))) + BaseHeaderSize) + ((ccIndex - 1) << ShiftForWord)))); - mixinOrMixinApplication = aClass; - while (!((mixinOrMixinApplication == GIV(nilObj)) - || ((mixinOrMixinApplication == targetMixin) - || ((longAt((mixinOrMixinApplication + BaseHeaderSize) + (MixinIndex << ShiftForWord))) == targetMixin)))) { - mixinOrMixinApplication = longAt((mixinOrMixinApplication + BaseHeaderSize) + (SuperclassIndex << ShiftForWord)); - } - mixinApplication = mixinOrMixinApplication; - if (mixinApplication == GIV(nilObj)) { - return GIV(nilObj); - } - explicitReceiver = longAt((mixinApplication + BaseHeaderSize) + (EnclosingObjectIndex << ShiftForWord)); - targetMixin = longAt((targetMixin + BaseHeaderSize) + (EnclosingMixinIndex << ShiftForWord)); - } - return explicitReceiver; -} - - /* Divorce a single frame and its context. If it is not the top frame of a stack this means splitting its stack. */ Modified: branches/Cog/nsspursrc/vm/cogit.c =================================================================== --- branches/Cog/nsspursrc/vm/cogit.c 2014-10-05 21:56:54 UTC (rev 3096) +++ branches/Cog/nsspursrc/vm/cogit.c 2014-10-08 19:18:05 UTC (rev 3097) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.890 uuid: 4cec861e-a7df-45b3-8298-ecb127ee6703 + CCodeGenerator VMMaker.oscog-eem.895 uuid: 2c674935-8b94-45ff-b8fc-59fb78830eb3 from - StackToRegisterMappingCogit VMMaker.oscog-eem.890 uuid: 4cec861e-a7df-45b3-8298-ecb127ee6703 + StackToRegisterMappingCogit VMMaker.oscog-eem.895 uuid: 2c674935-8b94-45ff-b8fc-59fb78830eb3 */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.890 uuid: 4cec861e-a7df-45b3-8298-ecb127ee6703 " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.895 uuid: 2c674935-8b94-45ff-b8fc-59fb78830eb3 " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -1090,7 +1090,7 @@ static sqInt genPrimitiveSubtract(void); static sqInt genPushActiveContextBytecode(void); static sqInt genPushClosureCopyCopiedValuesBytecode(void); -static sqInt genPushExplicitOuterReceiver(sqInt level) NoDbgRegParms; +static sqInt genPushEnclosingObjectAt(sqInt level) NoDbgRegParms; static sqInt genPushImplicitReceiverBytecode(void); static sqInt genPushLiteralVariable(sqInt literalIndex) NoDbgRegParms; static sqInt genPushLiteral(sqInt literal) NoDbgRegParms; @@ -1131,6 +1131,7 @@ static void marshallSendArguments(sqInt numArgs) NoDbgRegParms; static void mergeafterContinuation(BytecodeFixup *fixup, sqInt mergeWithContinuation) NoDbgRegParms; static sqInt methodAbortTrampolineFor(sqInt numArgs) NoDbgRegParms; +static sqInt needsFrameIfExtBGT2(sqInt stackDelta) NoDbgRegParms; static sqInt needsFrameIfMod16GENumArgs(sqInt stackDelta) NoDbgRegParms; static sqInt needsFrameIfStackGreaterThanOne(sqInt stackDelta) NoDbgRegParms; static sqInt numberOfSpillsInTopNItems(sqInt n) NoDbgRegParms; @@ -1208,8 +1209,8 @@ static unsigned long (*ceCheckFeaturesFunction)(void); sqInt ceCheckForInterruptTrampoline; static sqInt ceCPICMissTrampoline; +static sqInt ceEnclosingObjectTrampoline; void (*ceEnterCogCodePopReceiverReg)(void); -static sqInt ceExplicitReceiverTrampoline; static sqInt ceFetchContextInstVarTrampoline; unsigned long (*ceGetSP)(void); static sqInt ceImplicitReceiverTrampoline; @@ -1598,7 +1599,7 @@ { genPushTemporaryVariableBytecode, 0, needsFrameIfMod16GENumArgs, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 }, { genPushTemporaryVariableBytecode, 0, needsFrameIfMod16GENumArgs, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 }, { genPushReceiverBytecode, 0, needsFrameNever, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 }, - { genExtPushPseudoVariableOrOuterBytecode, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 }, + { genExtPushPseudoVariableOrOuterBytecode, 0, needsFrameIfExtBGT2, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 }, { genPushConstantZeroBytecode, 0, needsFrameNever, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 }, { genPushConstantOneBytecode, 0, needsFrameNever, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 }, { genSpecialSelectorArithmetic, 0, 0, 0, AddRR, 1, 0, 0, 0, 0, 1, 0, 0, 0 }, @@ -9595,7 +9596,6 @@ else { bytecodeSetOffset = 0; } - extA = (extB = 0); ensureNoForwardedLiteralsIn(aMethodObj); methodObj = aMethodObj; cogMethod = compileCogMethod(aSelectorOop); @@ -11184,7 +11184,7 @@ Generate the class fetch and cache probe inline for speed. Smashes Arg1Reg, RegClass and caller-saved regs. */ - ceExplicitReceiverTrampoline = genTrampolineForcalledargresult(ceExplicitReceiverAt, "ceExplicitReceiverTrampoline", SendNumArgsReg, ReceiverResultReg); + ceEnclosingObjectTrampoline = genTrampolineForcalledargresult(ceEnclosingObjectAt, "ceEnclosingObjectTrampoline", SendNumArgsReg, ReceiverResultReg); opcodeIndex = 0; /* begin MoveMw:r:R: */ genoperandoperandoperand(MoveMwrR, FoxMFReceiver, FPReg, ReceiverResultReg); @@ -19122,7 +19122,7 @@ /* 77 01001101 Push false [* 1:true, 2:nil, 3:thisContext, ..., -N: - pushExplicitOuter: N, N = Extend B] + pushEnclosingObjectAt: N, N = Extend B] */ static sqInt @@ -19148,7 +19148,7 @@ default: if (ext < 0) { - return genPushExplicitOuterReceiver(0 - ext); + return genPushEnclosingObjectAt(0 - ext); } warning("undefined extension for extPushPseudoVariableOrOuter"); return unknownBytecode(); @@ -22526,17 +22526,16 @@ } -/* Uncached push explicit outer send receiver */ +/* Uncached push enclosing object */ static sqInt -genPushExplicitOuterReceiver(sqInt level) +genPushEnclosingObjectAt(sqInt level) { - assert(needsFrame); (optStatus.isReceiverResultRegLive = 0); ssAllocateCallReg(SendNumArgsReg); /* begin MoveCq:R: */ genoperandoperand(MoveCqR, level, SendNumArgsReg); - CallRT(ceExplicitReceiverTrampoline); + CallRT(ceEnclosingObjectTrampoline); return ssPushRegister(ReceiverResultReg); } @@ -23925,6 +23924,13 @@ } static sqInt +needsFrameIfExtBGT2(sqInt stackDelta) +{ + return (extB < 0) + || (extB > 2); +} + +static sqInt needsFrameIfMod16GENumArgs(sqInt stackDelta) { return (byte0 % 16) >= methodOrBlockNumArgs; @@ -24077,11 +24083,15 @@ inBlock = 1; pc = (blockStart->startpc); end = ((blockStart->startpc)) + ((blockStart->span)); - framelessStackDelta = (nExts = 0); + framelessStackDelta = (nExts = (extA = (extB = 0))); pushingNils = 1; while (pc < end) { byte0 = (fetchByteofObject(pc, methodObj)) + bytecodeSetOffset; descriptor = generatorAt(byte0); + if ((descriptor->isExtension)) { + loadSubsequentBytesForDescriptorat(descriptor, pc); + ((descriptor->generator))(); + } if (!needsFrame) { if ((((descriptor->needsFrameFunction)) == null) || (((descriptor->needsFrameFunction))(framelessStackDelta))) { @@ -24118,9 +24128,12 @@ pc = (pc + ((descriptor->numBytes))) + (((descriptor->isBlockCreation) ? ((descriptor->spanFunction))(descriptor, pc, nExts, methodObj) : 0)); - nExts = ((descriptor->isExtension) - ? nExts + 1 - : 0); + if ((descriptor->isExtension)) { + nExts += 1; + } + else { + nExts = (extA = (extB = 0)); + } prevBCDescriptor = descriptor; } if (!needsFrame) { @@ -24165,10 +24178,14 @@ return 0; } pc = (latestContinuation = initialPC); - numBlocks = (framelessStackDelta = (nExts = 0)); + numBlocks = (framelessStackDelta = (nExts = (extA = (extB = 0)))); while (pc <= endPC) { byte0 = (fetchByteofObject(pc, methodObj)) + bytecodeSetOffset; descriptor = generatorAt(byte0); + if ((descriptor->isExtension)) { + loadSubsequentBytesForDescriptorat(descriptor, pc); + ((descriptor->generator))(); + } if (((descriptor->isReturn)) && (pc >= latestContinuation)) { endPC = pc; @@ -24207,9 +24224,12 @@ # endif /* NewspeakVM */ pc += (descriptor->numBytes); - nExts = ((descriptor->isExtension) - ? nExts + 1 - : 0); + if ((descriptor->isExtension)) { + nExts += 1; + } + else { + nExts = (extA = (extB = 0)); + } prevBCDescriptor = descriptor; } return numBlocks; Modified: branches/Cog/nsspursrc/vm/cogit.h =================================================================== --- branches/Cog/nsspursrc/vm/cogit.h 2014-10-05 21:56:54 UTC (rev 3096) +++ branches/Cog/nsspursrc/vm/cogit.h 2014-10-08 19:18:05 UTC (rev 3097) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.890 uuid: 4cec861e-a7df-45b3-8298-ecb127ee6703 + CCodeGenerator VMMaker.oscog-eem.895 uuid: 2c674935-8b94-45ff-b8fc-59fb78830eb3 */ Modified: branches/Cog/nsspursrc/vm/cointerp.c =================================================================== --- branches/Cog/nsspursrc/vm/cointerp.c 2014-10-05 21:56:54 UTC (rev 3096) +++ branches/Cog/nsspursrc/vm/cointerp.c 2014-10-08 19:18:05 UTC (rev 3097) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.890 uuid: 4cec861e-a7df-45b3-8298-ecb127ee6703 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.895 uuid: 2c674935-8b94-45ff-b8fc-59fb78830eb3 from - CoInterpreter VMMaker.oscog-eem.890 uuid: 4cec861e-a7df-45b3-8298-ecb127ee6703 + CoInterpreter VMMaker.oscog-eem.895 uuid: 2c674935-8b94-45ff-b8fc-59fb78830eb3 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.890 uuid: 4cec861e-a7df-45b3-8298-ecb127ee6703 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.895 uuid: 2c674935-8b94-45ff-b8fc-59fb78830eb3 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -415,7 +415,7 @@ sqInt ceContextinstVar(sqInt maybeContext, sqInt slotIndex); sqInt ceContextinstVarvalue(sqInt maybeMarriedContext, sqInt slotIndex, sqInt anOop); sqInt ceDynamicSuperSendtonumArgs(sqInt selector, sqInt rcvr, sqInt numArgs); -sqInt ceExplicitReceiverAt(sqInt level); +sqInt ceEnclosingObjectAt(sqInt level); sqInt ceInterpretMethodFromPICreceiver(sqInt aMethodObj, sqInt rcvr); sqInt ceMNUFromPICMNUMethodreceiver(sqInt aMethodObj, sqInt rcvr); sqInt ceNewArraySlotSize(sqInt slotSize); @@ -1229,10 +1229,10 @@ sqInt doSignalSemaphoreWithIndex(sqInt index); static void dummyReferToProxy(void); EXPORT(sqInt) dumpImage(sqInt fileName); +static sqInt enclosingObjectAtwithObjectwithMixin(sqInt n, sqInt anObject, sqInt mixin) NoDbgRegParms; static sqInt ensureCallerContext(char *theFP) NoDbgRegParms; static void ensureImageFormatIsUpToDate(sqInt swapBytes) NoDbgRegParms; static char * establishFrameForContextToReturnTo(sqInt contextToReturnTo) NoDbgRegParms; -static sqInt explicitOuterReceiverwithObjectwithMixin(sqInt n, sqInt anObject, sqInt mixin) NoDbgRegParms; static void externalDivorceFrameandContext(char *theFP, sqInt ctxt) NoDbgRegParms; static char * externalEnsureIsBaseFrame(char *aFramePtr) NoDbgRegParms; static sqInt externalInstVarofContextput(sqInt index, sqInt maybeMarriedContext, sqInt anOop) NoDbgRegParms; @@ -2322,7 +2322,7 @@ /*540*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, /*560*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, 0, 0, 0,-1,-1 }; -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.890"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.895"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -5614,6 +5614,7 @@ GIV(framePointer) = localFP; ceEnterCogCodePopReceiverReg(); + null; goto l294; } localIP = pointerForOop(longAt(localFP + FoxIFSavedIP)); @@ -5631,7 +5632,7 @@ /* begin fetchNextBytecode */ currentBytecode = (byteAtPointer(++localIP)) + GIV(bytecodeSetSelector); - /* return self */ + null; l294: /* end baseFrameReturn */; goto l293; } @@ -10610,7 +10611,7 @@ break; default: thing = (extB < 0 - ? explicitOuterReceiverwithObjectwithMixin(0 - extB, longAt(localFP + FoxIFReceiver), methodClassOf(GIV(method))) + ? enclosingObjectAtwithObjectwithMixin(0 - extB, longAt(localFP + FoxIFReceiver), methodClassOf(GIV(method))) : (error("undefined extension for extPushPseudoVariableOrOuter"), GIV(nilObj))); @@ -16259,9 +16260,9 @@ } sqInt -ceExplicitReceiverAt(sqInt level) +ceEnclosingObjectAt(sqInt level) { DECL_MAYBE_SQ_GLOBAL_STRUCT - return explicitOuterReceiverwithObjectwithMixin(level, longAt(GIV(framePointer) + FoxMFReceiver), methodClassOf(((mframeHomeMethod(GIV(framePointer)))->methodObject))); + return enclosingObjectAtwithObjectwithMixin(level, longAt(GIV(framePointer) + FoxMFReceiver), methodClassOf(((mframeHomeMethod(GIV(framePointer)))->methodObject))); } sqInt @@ -55140,6 +55141,77 @@ } +/* This is used to implement the innards of the pushEnclosingObjectBytecode, + used for explicit outer sends in NS2/NS3. */ + +static sqInt +enclosingObjectAtwithObjectwithMixin(sqInt n, sqInt anObject, sqInt mixin) +{ DECL_MAYBE_SQ_GLOBAL_STRUCT + sqInt aClass; + sqInt classIndex; + sqInt classTablePage; + sqInt count; + sqInt enclosingObject; + sqInt mixinApplication; + sqInt mixinOrMixinApplication; + sqInt tagBits; + sqInt targetMixin; + + enclosingObject = anObject; + targetMixin = mixin; + count = 0; + while (count < n) { + count += 1; + if ((targetMixin == GIV(nilObj)) + || (enclosingObject == GIV(nilObj))) { + return GIV(nilObj); + } + /* begin findApplicationOfTargetMixin:startingAtNonMetaClass: */ + /* begin fetchClassOf: */ + if (((tagBits = enclosingObject & 3)) != 0) { + aClass = longAt((GIV(classTableFirstPage) + (BaseHeaderSize)) + (tagBits << 2)); + goto l1; + } + /* begin fetchClassOfNonImm: */ + classIndex = (longAt(enclosingObject)) & 0x3FFFFF; + if (classIndex <= 0x1F) { + if (classIndex == 0x1F) { + aClass = enclosingObject; + goto l1; + } + if (classIndex == 8) { + aClass = GIV(nilObj); + goto l1; + } + } + assert(classIndex >= (arrayClassIndexPun())); + /* begin classOrNilAtIndex: */ + assert((classIndex <= (tagMask())) + || (classIndex >= (arrayClassIndexPun()))); + classTablePage = longAt((GIV(hiddenRootsObj) + (BaseHeaderSize)) + ((((usqInt) classIndex) >> 10) << 2)); + if (classTablePage == GIV(nilObj)) { + aClass = GIV(nilObj); + goto l1; + } + aClass = longAt((classTablePage + (BaseHeaderSize)) + ((classIndex & ((1 << 10) - 1)) << 2)); + l1: /* end fetchClassOf: */; + mixinOrMixinApplication = aClass; + while (!((mixinOrMixinApplication == GIV(nilObj)) + || ((mixinOrMixinApplication == targetMixin) + || ((longAt((mixinOrMixinApplication + (BaseHeaderSize)) + (MixinIndex << 2))) == targetMixin)))) { + mixinOrMixinApplication = longAt((mixinOrMixinApplication + (BaseHeaderSize)) + (SuperclassIndex << 2)); + } + mixinApplication = mixinOrMixinApplication; + if (mixinApplication == GIV(nilObj)) { + return GIV(nilObj); + } + enclosingObject = longAt((mixinApplication + (BaseHeaderSize)) + (EnclosingObjectIndex << 2)); + targetMixin = longAt((targetMixin + (BaseHeaderSize)) + (EnclosingMixinIndex << 2)); + } + return enclosingObject; +} + + /* Answerr the caller context for a frame. If the frame has a caller frame that doesn't have a context, then marry the caller frame. */ @@ -55527,78 +55599,6 @@ } -/* This is used to implement the innards of the - pushExplicitOuterReceiverBytecode, used for explicit outer sends in - NS2/NS3. */ - -static sqInt -explicitOuterReceiverwithObjectwithMixin(sqInt n, sqInt anObject, sqInt mixin) -{ DECL_MAYBE_SQ_GLOBAL_STRUCT - sqInt aClass; - sqInt classIndex; - sqInt classTablePage; - sqInt count; - sqInt explicitReceiver; - sqInt mixinApplication; - sqInt mixinOrMixinApplication; - sqInt tagBits; - sqInt targetMixin; - - explicitReceiver = anObject; - targetMixin = mixin; - count = 0; - while (count < n) { - count += 1; - if ((targetMixin == GIV(nilObj)) - || (explicitReceiver == GIV(nilObj))) { - return GIV(nilObj); - } - /* begin findApplicationOfTargetMixin:startingAtNonMetaClass: */ - /* begin fetchClassOf: */ - if (((tagBits = explicitReceiver & 3)) != 0) { - aClass = longAt((GIV(classTableFirstPage) + (BaseHeaderSize)) + (tagBits << 2)); - goto l1; - } - /* begin fetchClassOfNonImm: */ - classIndex = (longAt(explicitReceiver)) & 0x3FFFFF; - if (classIndex <= 0x1F) { - if (classIndex == 0x1F) { - aClass = explicitReceiver; - goto l1; - } - if (classIndex == 8) { - aClass = GIV(nilObj); - goto l1; - } - } - assert(classIndex >= (arrayClassIndexPun())); - /* begin classOrNilAtIndex: */ - assert((classIndex <= (tagMask())) - || (classIndex >= (arrayClassIndexPun()))); - classTablePage = longAt((GIV(hiddenRootsObj) + (BaseHeaderSize)) + ((((usqInt) classIndex) >> 10) << 2)); - if (classTablePage == GIV(nilObj)) { - aClass = GIV(nilObj); - goto l1; - } - aClass = longAt((classTablePage + (BaseHeaderSize)) + ((classIndex & ((1 << 10) - 1)) << 2)); - l1: /* end fetchClassOf: */; - mixinOrMixinApplication = aClass; - while (!((mixinOrMixinApplication == GIV(nilObj)) - || ((mixinOrMixinApplication == targetMixin) - || ((longAt((mixinOrMixinApplication + (BaseHeaderSize)) + (MixinIndex << 2))) == targetMixin)))) { - mixinOrMixinApplication = longAt((mixinOrMixinApplication + (BaseHeaderSize)) + (SuperclassIndex << 2)); - } - mixinApplication = mixinOrMixinApplication; - if (mixinApplication == GIV(nilObj)) { - return GIV(nilObj); - } - explicitReceiver = longAt((mixinApplication + (BaseHeaderSize)) + (EnclosingObjectIndex << 2)); - targetMixin = longAt((targetMixin + (BaseHeaderSize)) + (EnclosingMixinIndex << 2)); - } - return explicitReceiver; -} - - /* Divorce a single frame and its context. If it is not the top frame of a stack this means splitting its stack. */ Modified: branches/Cog/nsspursrc/vm/cointerp.h =================================================================== --- branches/Cog/nsspursrc/vm/cointerp.h 2014-10-05 21:56:54 UTC (rev 3096) +++ branches/Cog/nsspursrc/vm/cointerp.h 2014-10-08 19:18:05 UTC (rev 3097) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.890 uuid: 4cec861e-a7df-45b3-8298-ecb127ee6703 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.895 uuid: 2c674935-8b94-45ff-b8fc-59fb78830eb3 */ @@ -38,7 +38,7 @@ sqInt ceContextinstVar(sqInt maybeContext, sqInt slotIndex); sqInt ceContextinstVarvalue(sqInt maybeMarriedContext, sqInt slotIndex, sqInt anOop); sqInt ceDynamicSuperSendtonumArgs(sqInt selector, sqInt rcvr, sqInt numArgs); -sqInt ceExplicitReceiverAt(sqInt level); +sqInt ceEnclosingObjectAt(sqInt level); sqInt ceInterpretMethodFromPICreceiver(sqInt aMethodObj, sqInt rcvr); sqInt ceMNUFromPICMNUMethodreceiver(sqInt aMethodObj, sqInt rcvr); sqInt ceNewArraySlotSize(sqInt slotSize); Modified: branches/Cog/nsspursrc/vm/gcc3x-cointerp.c =================================================================== --- branches/Cog/nsspursrc/vm/gcc3x-cointerp.c 2014-10-05 21:56:54 UTC (rev 3096) +++ branches/Cog/nsspursrc/vm/gcc3x-cointerp.c 2014-10-08 19:18:05 UTC (rev 3097) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.890 uuid: 4cec861e-a7df-45b3-8298-ecb127ee6703 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.895 uuid: 2c674935-8b94-45ff-b8fc-59fb78830eb3 from - CoInterpreter VMMaker.oscog-eem.890 uuid: 4cec861e-a7df-45b3-8298-ecb127ee6703 + CoInterpreter VMMaker.oscog-eem.895 uuid: 2c674935-8b94-45ff-b8fc-59fb78830eb3 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.890 uuid: 4cec861e-a7df-45b3-8298-ecb127ee6703 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.895 uuid: 2c674935-8b94-45ff-b8fc-59fb78830eb3 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -418,7 +418,7 @@ sqInt ceContextinstVar(sqInt maybeContext, sqInt slotIndex); sqInt ceContextinstVarvalue(sqInt maybeMarriedContext, sqInt slotIndex, sqInt anOop); sqInt ceDynamicSuperSendtonumArgs(sqInt selector, sqInt rcvr, sqInt numArgs); -sqInt ceExplicitReceiverAt(sqInt level); +sqInt ceEnclosingObjectAt(sqInt level); sqInt ceInterpretMethodFromPICreceiver(sqInt aMethodObj, sqInt rcvr); sqInt ceMNUFromPICMNUMethodreceiver(sqInt aMethodObj, sqInt rcvr); sqInt ceNewArraySlotSize(sqInt slotSize); @@ -1232,10 +1232,10 @@ sqInt doSignalSemaphoreWithIndex(sqInt index); static void dummyReferToProxy(void); EXPORT(sqInt) dumpImage(sqInt fileName); +static sqInt enclosingObjectAtwithObjectwithMixin(sqInt n, sqInt anObject, sqInt mixin) NoDbgRegParms; static sqInt ensureCallerContext(char *theFP) NoDbgRegParms; static void ensureImageFormatIsUpToDate(sqInt swapBytes) NoDbgRegParms; static char * establishFrameForContextToReturnTo(sqInt contextToReturnTo) NoDbgRegParms; -static sqInt explicitOuterReceiverwithObjectwithMixin(sqInt n, sqInt anObject, sqInt mixin) NoDbgRegParms; static void externalDivorceFrameandContext(char *theFP, sqInt ctxt) NoDbgRegParms; static char * externalEnsureIsBaseFrame(char *aFramePtr) NoDbgRegParms; static sqInt externalInstVarofContextput(sqInt index, sqInt maybeMarriedContext, sqInt anOop) NoDbgRegParms; @@ -2325,7 +2325,7 @@ /*540*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, /*560*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, 0, 0, 0,-1,-1 }; -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.890"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.895"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -5623,6 +5623,7 @@ GIV(framePointer) = localFP; ceEnterCogCodePopReceiverReg(); + null; goto l294; } localIP = pointerForOop(longAt(localFP + FoxIFSavedIP)); @@ -5640,7 +5641,7 @@ /* begin fetchNextBytecode */ currentBytecode = (byteAtPointer(++localIP)) + GIV(bytecodeSetSelector); - /* return self */ + null; l294: /* end baseFrameReturn */; goto l293; } @@ -10619,7 +10620,7 @@ break; default: thing = (extB < 0 - ? explicitOuterReceiverwithObjectwithMixin(0 - extB, longAt(localFP + FoxIFReceiver), methodClassOf(GIV(method))) + ? enclosingObjectAtwithObjectwithMixin(0 - extB, longAt(localFP + FoxIFReceiver), methodClassOf(GIV(method))) : (error("undefined extension for extPushPseudoVariableOrOuter"), GIV(nilObj))); @@ -16268,9 +16269,9 @@ } sqInt -ceExplicitReceiverAt(sqInt level) +ceEnclosingObjectAt(sqInt level) { DECL_MAYBE_SQ_GLOBAL_STRUCT - return explicitOuterReceiverwithObjectwithMixin(level, longAt(GIV(framePointer) + FoxMFReceiver), methodClassOf(((mframeHomeMethod(GIV(framePointer)))->methodObject))); + return enclosingObjectAtwithObjectwithMixin(level, longAt(GIV(framePointer) + FoxMFReceiver), methodClassOf(((mframeHomeMethod(GIV(framePointer)))->methodObject))); } sqInt @@ -55149,6 +55150,77 @@ } +/* This is used to implement the innards of the pushEnclosingObjectBytecode, + used for explicit outer sends in NS2/NS3. */ + +static sqInt +enclosingObjectAtwithObjectwithMixin(sqInt n, sqInt anObject, sqInt mixin) +{ DECL_MAYBE_SQ_GLOBAL_STRUCT + sqInt aClass; + sqInt classIndex; + sqInt classTablePage; + sqInt count; + sqInt enclosingObject; + sqInt mixinApplication; + sqInt mixinOrMixinApplication; + sqInt tagBits; + sqInt targetMixin; + + enclosingObject = anObject; + targetMixin = mixin; + count = 0; + while (count < n) { + count += 1; + if ((targetMixin == GIV(nilObj)) + || (enclosingObject == GIV(nilObj))) { + return GIV(nilObj); + } + /* begin findApplicationOfTargetMixin:startingAtNonMetaClass: */ + /* begin fetchClassOf: */ + if (((tagBits = enclosingObject & 3)) != 0) { + aClass = longAt((GIV(classTableFirstPage) + (BaseHeaderSize)) + (tagBits << 2)); + goto l1; + } + /* begin fetchClassOfNonImm: */ + classIndex = (longAt(enclosingObject)) & 0x3FFFFF; + if (classIndex <= 0x1F) { + if (classIndex == 0x1F) { + aClass = enclosingObject; + goto l1; + } + if (classIndex == 8) { + aClass = GIV(nilObj); + goto l1; + } + } + assert(classIndex >= (arrayClassIndexPun())); + /* begin classOrNilAtIndex: */ + assert((classIndex <= (tagMask())) + || (classIndex >= (arrayClassIndexPun()))); + classTablePage = longAt((GIV(hiddenRootsObj) + (BaseHeaderSize)) + ((((usqInt) classIndex) >> 10) << 2)); + if (classTablePage == GIV(nilObj)) { + aClass = GIV(nilObj); + goto l1; + } @@ Diff output truncated at 50000 characters. @@

1 0

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

08 Oct '14

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.895.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.895 Author: eem Time: 8 October 2014, 11:43:36.404 am UUID: 2c674935-8b94-45ff-b8fc-59fb78830eb3 Ancestors: VMMaker.oscog-eem.894 Compile the NewspeakV4 bytecode extPushPseudoVariableOrOuter frameless when pushing nil, true, false. This means the scanMethod and scanBlock: implementations must maintain extA and extB. Provide a simulation-only allCogMethodsFor: that yields block methods within a Cog method, for testing. =============== Diff against VMMaker.oscog-eem.894 =============== Item was added: + ----- Method: Cogit>>allCogMethodsFor: (in category 'disassembly') ----- + allCogMethodsFor: cogMethod + <doNotGenerate> + | blockEntry end methods pc | + cogMethod isInteger ifTrue: [^self allCogMethodsFor: (self cogMethodSurrogateAt: cogMethod)]. + cogMethod cmType = CMBlock ifTrue: + [^self allCogMethodsFor: cogMethod cmHomeMethod]. + (cogMethod cmType ~= CMMethod + or: [cogMethod blockEntryOffset = 0]) ifTrue: + [^{cogMethod}]. + + methods := OrderedCollection with: cogMethod. + pc := blockEntry := cogMethod blockEntryOffset + cogMethod asInteger. + end := (self mapEndFor: cogMethod) - 1. + [pc < end] whileTrue: + [| targetpc | + targetpc := blockEntry. + (backEnd isJumpAt: pc) ifTrue: + [targetpc := backEnd jumpTargetPCAt: pc. + targetpc < blockEntry ifTrue: + [methods add: (self cCoerceSimple: targetpc - (self sizeof: CogBlockMethod) to: #'CogBlockMethod *')]]. + pc := pc + (backEnd instructionSizeAt: pc)]. + ^methods sort! Item was changed: ----- Method: Cogit>>cog:selector: (in category 'jit - api') ----- cog: aMethodObj selector: aSelectorOop "Attempt to produce a machine code method for the bytecode method object aMethodObj. N.B. If there is no code memory available do *NOT* attempt to reclaim the method zone. Certain clients (e.g. ceSICMiss:) depend on the zone remaining constant across method generation." <api> <returnTypeC: #'CogMethod *'> | cogMethod | <var: #cogMethod type: #'CogMethod *'> self assert: ((coInterpreter methodHasCogMethod: aMethodObj) not or: [(self noAssertMethodClassAssociationOf: aMethodObj) = objectMemory nilObject]). "coInterpreter stringOf: aSelectorOop" coInterpreter compilationBreak: aSelectorOop point: (objectMemory lengthOf: aSelectorOop). aMethodObj = breakMethod ifTrue: [self halt: 'Compilation of breakMethod']. self cppIf: NewspeakVM ifTrue: [cogMethod := methodZone findPreviouslyCompiledVersionOf: aMethodObj with: aSelectorOop. cogMethod ifNotNil: [(coInterpreter methodHasCogMethod: aMethodObj) not ifTrue: [self assert: (coInterpreter rawHeaderOf: aMethodObj) = cogMethod methodHeader. cogMethod methodObject: aMethodObj. coInterpreter rawHeaderOf: aMethodObj put: cogMethod asInteger]. ^cogMethod]]. "If the generators for the alternate bytecode set are missing then interpret." (coInterpreter methodUsesAlternateBytecodeSet: aMethodObj) ifTrue: [(self numElementsIn: generatorTable) <= 256 ifTrue: [^nil]. bytecodeSetOffset := 256] ifFalse: [bytecodeSetOffset := 0]. - extA := extB := 0. objectRepresentation ensureNoForwardedLiteralsIn: aMethodObj. methodObj := aMethodObj. cogMethod := self compileCogMethod: aSelectorOop. (cogMethod asInteger between: MaxNegativeErrorCode and: -1) ifTrue: [cogMethod asInteger = InsufficientCodeSpace ifTrue: [coInterpreter callForCogCompiledCodeCompaction]. self maybeFreeCounters. "Right now no errors should be reported, so nothing more to do." "self reportError: (self cCoerceSimple: cogMethod to: #sqInt)." ^nil]. "self cCode: '' inSmalltalk: [coInterpreter printCogMethod: cogMethod. ""coInterpreter symbolicMethod: aMethodObj."" self assertValidMethodMap: cogMethod." "self disassembleMethod: cogMethod." "printInstructions := clickConfirm := true""]." ^cogMethod! Item was added: + ----- Method: Cogit>>generatorTable (in category 'accessing') ----- + generatorTable + <doNotGenerate> + ^generatorTable! Item was changed: ----- Method: Cogit>>scanBlock: (in category 'compile abstract instructions') ----- scanBlock: blockStart "Scan the block to determine if the block needs a frame or not" | descriptor pc end framelessStackDelta nExts | <var: #blockStart type: #'BlockStart *'> <var: #descriptor type: #'BytecodeDescriptor *'> needsFrame := false. methodOrBlockNumArgs := blockStart numArgs. inBlock := true. pc := blockStart startpc. end := blockStart startpc + blockStart span. + framelessStackDelta := nExts := extA := extB := 0. - framelessStackDelta := nExts := 0. [pc < end] whileTrue: [byte0 := (objectMemory fetchByte: pc ofObject: methodObj) + bytecodeSetOffset. descriptor := self generatorAt: byte0. + descriptor isExtension ifTrue: + [self loadSubsequentBytesForDescriptor: descriptor at: pc. + self perform: descriptor generator]. needsFrame ifFalse: [(descriptor needsFrameFunction isNil or: [self perform: descriptor needsFrameFunction with: framelessStackDelta]) ifTrue: [needsFrame := true] ifFalse: [framelessStackDelta := framelessStackDelta + descriptor stackDelta]]. pc := self nextBytecodePCFor: descriptor at: pc exts: nExts in: methodObj. + descriptor isExtension + ifTrue: [nExts := nExts + 1] + ifFalse: [nExts := extA := extB := 0]]. - nExts := descriptor isExtension ifTrue: [nExts + 1] ifFalse: [0]]. needsFrame ifFalse: [framelessStackDelta < 0 ifTrue: [self error: 'negative stack delta in block; block contains bogus code or internal error']. [framelessStackDelta > 0] whileTrue: [descriptor := self generatorAt: (objectMemory fetchByte: blockStart startpc ofObject: methodObj) + bytecodeSetOffset. descriptor generator ~~ #genPushConstantNilBytecode ifTrue: [self error: 'frameless block doesn''t start with enough pushNils']. blockStart startpc: blockStart startpc + descriptor numBytes; span: blockStart span - descriptor numBytes. framelessStackDelta := framelessStackDelta - 1]]! Item was changed: ----- Method: Cogit>>scanMethod (in category 'compile abstract instructions') ----- scanMethod "Scan the method (and all embedded blocks) to determine - what the last bytecode is; extra bytes at the end of a method are used to encode things like source pointers or temp names - if the method needs a frame or not - what are the targets of any backward branches. - how many blocks it creates Answer the block count or on error a negative error code" | latestContinuation nExts descriptor pc numBlocks distance targetPC framelessStackDelta | <var: #descriptor type: #'BytecodeDescriptor *'> needsFrame := false. inBlock := false. self cppIf: #NewspeakVM ifTrue: [numIRCs := 0]. (primitiveIndex > 0 and: [coInterpreter isQuickPrimitiveIndex: primitiveIndex]) ifTrue: [^0]. pc := latestContinuation := initialPC. + numBlocks := framelessStackDelta := nExts := extA := extB := 0. - numBlocks := framelessStackDelta := nExts := 0. [pc <= endPC] whileTrue: [byte0 := (objectMemory fetchByte: pc ofObject: methodObj) + bytecodeSetOffset. + descriptor := self generatorAt: byte0. + descriptor isExtension ifTrue: + [self loadSubsequentBytesForDescriptor: descriptor at: pc. + self perform: descriptor generator]. + (descriptor isReturn + and: [pc >= latestContinuation]) ifTrue: - descriptor := self generatorAt: byte0. - (descriptor isReturn - and: [pc >= latestContinuation]) ifTrue: [endPC := pc]. needsFrame ifFalse: [(descriptor needsFrameFunction isNil or: [self perform: descriptor needsFrameFunction with: framelessStackDelta]) ifTrue: [needsFrame := true] ifFalse: [framelessStackDelta := framelessStackDelta + descriptor stackDelta]]. + descriptor isBranch ifTrue: - descriptor isBranch ifTrue: [distance := self spanFor: descriptor at: pc exts: nExts in: methodObj. targetPC := pc + descriptor numBytes + distance. (self isBackwardBranch: descriptor at: pc exts: nExts in: methodObj) ifTrue: [self initializeFixupAt: targetPC - initialPC] ifFalse: [latestContinuation := latestContinuation max: targetPC]]. + descriptor isBlockCreation ifTrue: - descriptor isBlockCreation ifTrue: [numBlocks := numBlocks + 1. distance := self spanFor: descriptor at: pc exts: nExts in: methodObj. targetPC := pc + descriptor numBytes + distance. latestContinuation := latestContinuation max: targetPC]. + self cppIf: #NewspeakVM ifTrue: - self cppIf: #NewspeakVM ifTrue: [descriptor hasIRC ifTrue: [numIRCs := numIRCs + 1]]. + pc := pc + descriptor numBytes. + descriptor isExtension + ifTrue: [nExts := nExts + 1] + ifFalse: [nExts := extA := extB := 0]]. - pc := pc + descriptor numBytes. - nExts := descriptor isExtension ifTrue: [nExts + 1] ifFalse: [0]]. ^numBlocks! Item was changed: ----- Method: SistaStackToRegisterMappingCogit>>scanMethod (in category 'compile abstract instructions') ----- scanMethod "Scan the method (and all embedded blocks) to determine - what the last bytecode is; extra bytes at the end of a method are used to encode things like source pointers or temp names - if the method needs a frame or not - what are the targets of any backward branches. - how many blocks it creates - how many counters it needs/conditional branches it contains Answer the block count or on error a negative error code" | latestContinuation nExts descriptor pc numBlocks distance targetPC framelessStackDelta | <var: #descriptor type: #'BytecodeDescriptor *'> needsFrame := false. inBlock := false. prevBCDescriptor := nil. numCounters := 0. self cppIf: #NewspeakVM ifTrue: [numIRCs := 0]. (primitiveIndex > 0 and: [coInterpreter isQuickPrimitiveIndex: primitiveIndex]) ifTrue: [^0]. pc := latestContinuation := initialPC. + numBlocks := framelessStackDelta := nExts := extA := extB := 0. - numBlocks := framelessStackDelta := nExts := 0. [pc <= endPC] whileTrue: [byte0 := (objectMemory fetchByte: pc ofObject: methodObj) + bytecodeSetOffset. + descriptor := self generatorAt: byte0. + descriptor isExtension ifTrue: + [self loadSubsequentBytesForDescriptor: descriptor at: pc. + self perform: descriptor generator]. + (descriptor isReturn + and: [pc >= latestContinuation]) ifTrue: - descriptor := self generatorAt: byte0. - (descriptor isReturn - and: [pc >= latestContinuation]) ifTrue: [endPC := pc]. needsFrame ifFalse: [(descriptor needsFrameFunction isNil or: [self perform: descriptor needsFrameFunction with: framelessStackDelta]) ifTrue: [needsFrame := true] ifFalse: [framelessStackDelta := framelessStackDelta + descriptor stackDelta]]. + descriptor isBranch ifTrue: - descriptor isBranch ifTrue: [distance := self spanFor: descriptor at: pc exts: nExts in: methodObj. targetPC := pc + descriptor numBytes + distance. (self isBackwardBranch: descriptor at: pc exts: nExts in: methodObj) ifTrue: [self initializeFixupAt: targetPC - initialPC] ifFalse: [latestContinuation := latestContinuation max: targetPC. (descriptor isBranchTrue or: [descriptor isBranchFalse]) ifTrue: [numCounters := numCounters + 1]]]. + descriptor isBlockCreation ifTrue: - descriptor isBlockCreation ifTrue: [numBlocks := numBlocks + 1. distance := self spanFor: descriptor at: pc exts: nExts in: methodObj. targetPC := pc + descriptor numBytes + distance. latestContinuation := latestContinuation max: targetPC]. + self cppIf: #NewspeakVM ifTrue: - self cppIf: #NewspeakVM ifTrue: [descriptor hasIRC ifTrue: [numIRCs := numIRCs + 1]]. + pc := pc + descriptor numBytes. + descriptor isExtension + ifTrue: [nExts := nExts + 1] + ifFalse: [nExts := extA := extB := 0]. + prevBCDescriptor := descriptor]. - pc := pc + descriptor numBytes. - nExts := descriptor isExtension ifTrue: [nExts + 1] ifFalse: [0]. - prevBCDescriptor := descriptor]. ^numBlocks! Item was changed: ----- Method: StackToRegisterMappingCogit class>>initializeBytecodeTableForNewspeakV4 (in category 'class initialization') ----- initializeBytecodeTableForNewspeakV4 "StackToRegisterMappingCogit initializeBytecodeTableForNewspeakV4" numPushNilsFunction := #v4:Num:Push:Nils:. pushNilSizeFunction := #v4PushNilSize:. NSSendIsPCAnnotated := false. "IsNSSendCall used by SendAbsentImplicit" FirstSpecialSelector := 80. self flag: 'Special selector send class must be inlined to agree with the interpreter, which inlines class. If class is sent to e.g. a general instance of ProtoObject then unless class is inlined there will be an MNU. It must be that the Cointerpreter and Cogit have identical semantics. We get away with not hardwiring the other special selectors either because in the Cointerpreter they are not inlined or because they are inlined only to instances of classes for which there will always be a method.'. self generatorTableFrom: #( "1 byte bytecodes" (1 0 15 genPushReceiverVariableBytecode needsFrameNever: 1) (1 16 31 genPushLiteralVariable16CasesBytecode needsFrameNever: 1) (1 32 63 genPushLiteralConstantBytecode needsFrameNever: 1) (1 64 75 genPushTemporaryVariableBytecode needsFrameIfMod16GENumArgs: 1) (1 76 76 genPushReceiverBytecode needsFrameNever: 1) + (1 77 77 genExtPushPseudoVariableOrOuterBytecode needsFrameIfExtBGT2: 1) - (1 77 77 genExtPushPseudoVariableOrOuterBytecode) (1 78 78 genPushConstantZeroBytecode needsFrameNever: 1) (1 79 79 genPushConstantOneBytecode needsFrameNever: 1) (1 80 80 genSpecialSelectorArithmetic isMapped AddRR) (1 81 81 genSpecialSelectorArithmetic isMapped SubRR) (1 82 82 genSpecialSelectorComparison isMapped JumpLess) (1 83 83 genSpecialSelectorComparison isMapped JumpGreater) (1 84 84 genSpecialSelectorComparison isMapped JumpLessOrEqual) (1 85 85 genSpecialSelectorComparison isMapped JumpGreaterOrEqual) (1 86 86 genSpecialSelectorComparison isMapped JumpZero) (1 87 87 genSpecialSelectorComparison isMapped JumpNonZero) (1 88 93 genSpecialSelectorSend isMapped) " #* #/ #\\ #@ #bitShift: //" (1 94 94 genSpecialSelectorArithmetic isMapped AndRR) (1 95 95 genSpecialSelectorArithmetic isMapped OrRR) (1 96 101 genSpecialSelectorSend isMapped) "#at: #at:put: #size #next #nextPut: #atEnd" (1 102 102 genSpecialSelectorEqualsEquals needsFrameNever: notMapped -1) "not mapped because it is directly inlined (for now)" (1 103 103 genSpecialSelectorClass needsFrameIfStackGreaterThanOne: notMapped 0) "not mapped because it is directly inlined (for now)" (1 104 111 genSpecialSelectorSend isMapped) "#blockCopy: #value #value: #do: #new #new: #x #y" (1 112 127 genSendLiteralSelector0ArgsBytecode isMapped) (1 128 143 genSendLiteralSelector1ArgBytecode isMapped) (1 144 159 genSendLiteralSelector2ArgsBytecode isMapped) (1 160 175 genSendAbsentImplicit0ArgsBytecode isMapped hasIRC) (1 176 183 genStoreAndPopReceiverVariableBytecode needsFrameNever: -1) "N.B. not frameless if immutability" (1 184 191 genStoreAndPopTemporaryVariableBytecode) (1 192 199 genShortUnconditionalJump branch v3:ShortForward:Branch:Distance:) (1 200 207 genShortJumpIfTrue branch isBranchTrue isMapped "because of mustBeBoolean" v3:ShortForward:Branch:Distance:) (1 208 215 genShortJumpIfFalse branch isBranchFalse isMapped "because of mustBeBoolean" v3:ShortForward:Branch:Distance:) (1 216 216 genReturnReceiver return needsFrameIfInBlock: isMappedInBlock 0) (1 217 217 genReturnTopFromMethod return needsFrameIfInBlock: isMappedInBlock -1) (1 218 218 genExtReturnTopFromBlock return needsFrameNever: -1) (1 219 219 duplicateTopBytecode needsFrameNever: 1) (1 220 220 genPopStackBytecode needsFrameNever: -1) (1 221 221 genExtNopBytecode needsFrameNever: 0) (1 222 223 unknownBytecode) "2 byte bytecodes" (2 224 224 extABytecode extension needsFrameNever: 0) (2 225 225 extBBytecode extension needsFrameNever: 0) (2 226 226 genExtPushReceiverVariableBytecode) (2 227 227 genExtPushLiteralVariableBytecode needsFrameNever: 1) (2 228 228 genExtPushLiteralBytecode needsFrameNever: 1) (2 229 229 genExtPushIntegerBytecode needsFrameNever: 1) (2 230 230 genLongPushTemporaryVariableBytecode) (2 231 231 genPushNewArrayBytecode) (2 232 232 genExtStoreReceiverVariableBytecode) (2 233 233 genExtStoreLiteralVariableBytecode) (2 234 234 genLongStoreTemporaryVariableBytecode) (2 235 235 genExtStoreAndPopReceiverVariableBytecode) (2 236 236 genExtStoreAndPopLiteralVariableBytecode) (2 237 237 genLongStoreAndPopTemporaryVariableBytecode) (2 238 238 genExtSendBytecode isMapped) (2 239 239 genExtSendSuperBytecode isMapped) (2 240 240 genExtSendAbsentImplicitBytecode isMapped hasIRC) (2 241 241 genExtSendAbsentDynamicSuperBytecode isMapped) (2 242 242 genExtUnconditionalJump branch isMapped "because of interrupt check" v4:Long:Branch:Distance:) (2 243 243 genExtJumpIfTrue branch isBranchTrue isMapped "because of mustBeBoolean" v4:Long:Branch:Distance:) (2 244 244 genExtJumpIfFalse branch isBranchFalse isMapped "because of mustBeBoolean" v4:Long:Branch:Distance:) (2 245 248 unknownBytecode) "3 byte bytecodes" (3 249 249 callPrimitiveBytecode) (3 250 250 genPushRemoteTempLongBytecode) (3 251 251 genStoreRemoteTempLongBytecode) (3 252 252 genStoreAndPopRemoteTempLongBytecode) (3 253 253 genExtPushClosureBytecode block v4:Block:Code:Size:) (3 254 255 unknownBytecode))! Item was added: + ----- Method: StackToRegisterMappingCogit>>needsFrameIfExtBGT2: (in category 'compile abstract instructions') ----- + needsFrameIfExtBGT2: stackDelta + ^extB < 0 or: [extB > 2]! Item was changed: ----- Method: StackToRegisterMappingCogit>>scanBlock: (in category 'compile abstract instructions') ----- scanBlock: blockStart "Scan the block to determine if the block needs a frame or not" | descriptor pc end framelessStackDelta nExts pushingNils numPushNils | <var: #blockStart type: #'BlockStart *'> <var: #descriptor type: #'BytecodeDescriptor *'> needsFrame := false. prevBCDescriptor := nil. methodOrBlockNumArgs := blockStart numArgs. inBlock := true. pc := blockStart startpc. end := blockStart startpc + blockStart span. + framelessStackDelta := nExts := extA := extB := 0. - framelessStackDelta := nExts := 0. pushingNils := true. [pc < end] whileTrue: [byte0 := (objectMemory fetchByte: pc ofObject: methodObj) + bytecodeSetOffset. descriptor := self generatorAt: byte0. + descriptor isExtension ifTrue: + [self loadSubsequentBytesForDescriptor: descriptor at: pc. + self perform: descriptor generator]. needsFrame ifFalse: [(descriptor needsFrameFunction isNil or: [self perform: descriptor needsFrameFunction with: framelessStackDelta]) ifTrue: [needsFrame := true] ifFalse: [framelessStackDelta := framelessStackDelta + descriptor stackDelta]]. (pushingNils and: [descriptor isExtension not]) ifTrue: ["Count the initial number of pushed nils acting as temp initializers. We can't tell whether an initial pushNil is an operand reference or a temp initializer, except when the pushNil is a jump target (has a fixup), which never happens: self systemNavigation browseAllSelect: [:m| | ebc | (ebc := m embeddedBlockClosures select: [:ea| ea decompile statements first isMessage] thenCollect: [:ea| ea decompile statements first selector]) notEmpty and: [(#(whileTrue whileFalse whileTrue: whileFalse:) intersection: ebc) notEmpty]] or if the bytecode set has a push multiple nils bytecode. We simply count initial nils. Rarely we may end up over-estimating. We will correct by checking the stack depth at the end of the block in compileBlockBodies." (numPushNils := self numPushNils: descriptor pc: pc nExts: nExts method: methodObj) > 0 ifTrue: [self assert: descriptor numBytes = 1. "see compileMethodBody" blockStart numInitialNils: blockStart numInitialNils + numPushNils] ifFalse: [pushingNils := false]]. pc := self nextBytecodePCFor: descriptor at: pc exts: nExts in: methodObj. + descriptor isExtension + ifTrue: [nExts := nExts + 1] + ifFalse: [nExts := extA := extB := 0]. - nExts := descriptor isExtension ifTrue: [nExts + 1] ifFalse: [0]. prevBCDescriptor := descriptor]. "It would be nice of this wasn't necessary but alas we need to do the eager scan for frameless methods so that we don't end up popping too much off the simulated stack, e.g. for pushNil; returnTopFromBlock methods." needsFrame ifFalse: [self assert: (framelessStackDelta >= 0 and: [blockStart numInitialNils >= framelessStackDelta]). blockStart numInitialNils: blockStart numInitialNils - framelessStackDelta]! Item was changed: ----- Method: StackToRegisterMappingCogit>>scanMethod (in category 'compile abstract instructions') ----- scanMethod "Scan the method (and all embedded blocks) to determine - what the last bytecode is; extra bytes at the end of a method are used to encode things like source pointers or temp names - if the method needs a frame or not - what are the targets of any backward branches. - how many blocks it creates Answer the block count or on error a negative error code" | latestContinuation nExts descriptor pc numBlocks distance targetPC framelessStackDelta | <var: #descriptor type: #'BytecodeDescriptor *'> needsFrame := false. inBlock := false. prevBCDescriptor := nil. self cppIf: #NewspeakVM ifTrue: [numIRCs := 0]. (primitiveIndex > 0 and: [coInterpreter isQuickPrimitiveIndex: primitiveIndex]) ifTrue: [^0]. pc := latestContinuation := initialPC. + numBlocks := framelessStackDelta := nExts := extA := extB := 0. - numBlocks := framelessStackDelta := nExts := 0. [pc <= endPC] whileTrue: [byte0 := (objectMemory fetchByte: pc ofObject: methodObj) + bytecodeSetOffset. + descriptor := self generatorAt: byte0. + descriptor isExtension ifTrue: + [self loadSubsequentBytesForDescriptor: descriptor at: pc. + self perform: descriptor generator]. + (descriptor isReturn + and: [pc >= latestContinuation]) ifTrue: - descriptor := self generatorAt: byte0. - (descriptor isReturn - and: [pc >= latestContinuation]) ifTrue: [endPC := pc]. needsFrame ifFalse: [(descriptor needsFrameFunction isNil or: [self perform: descriptor needsFrameFunction with: framelessStackDelta]) ifTrue: [needsFrame := true] ifFalse: [framelessStackDelta := framelessStackDelta + descriptor stackDelta]]. + descriptor isBranch ifTrue: - descriptor isBranch ifTrue: [distance := self spanFor: descriptor at: pc exts: nExts in: methodObj. targetPC := pc + descriptor numBytes + distance. (self isBackwardBranch: descriptor at: pc exts: nExts in: methodObj) ifTrue: [self initializeFixupAt: targetPC - initialPC] ifFalse: [latestContinuation := latestContinuation max: targetPC]]. + descriptor isBlockCreation ifTrue: - descriptor isBlockCreation ifTrue: [numBlocks := numBlocks + 1. distance := self spanFor: descriptor at: pc exts: nExts in: methodObj. targetPC := pc + descriptor numBytes + distance. latestContinuation := latestContinuation max: targetPC]. + self cppIf: #NewspeakVM ifTrue: - self cppIf: #NewspeakVM ifTrue: [descriptor hasIRC ifTrue: [numIRCs := numIRCs + 1]]. + pc := pc + descriptor numBytes. + descriptor isExtension + ifTrue: [nExts := nExts + 1] + ifFalse: [nExts := extA := extB := 0]. + prevBCDescriptor := descriptor]. - pc := pc + descriptor numBytes. - nExts := descriptor isExtension ifTrue: [nExts + 1] ifFalse: [0]. - prevBCDescriptor := descriptor]. ^numBlocks!

1 0

problem building latest cog.v3 on linux
by djm1329＠san.rr.com 08 Oct '14

08 Oct '14

Trying to build the latest squeak.cog.v3 on Ubuntu 12.04 (gcc 4.6.3), I encountered the following problems: 1. Due to the compile flag -Werror in platforms/Cross/unix/vm-display-fbdev/Makefile.in, vm-display-fbdev does not compile. Removing -Werror allows the build to complete. gcc -m32 -g -O2 -DNDEBUG -DDEBUGVM=0 -msse2 -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -DCOGMTVM=0 -DLSB_FIRST=1 -g -O2 -DNDEBUG -DDEBUGVM=0 -msse2 -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -DCOGMTVM=0 -DLSB_FIRST=1 -Wall -Werror -Wno-unknown-pragmas -DHAVE_CONFIG_H -I/home/dmcphers/Cog/build.linux32x86/squeak.cog.v3/build -I/home/dmcphers/Cog/build.linux32x86/squeak.cog.v3/build -I/home/dmcphers/Cog/platforms/unix/vm -I/home/dmcphers/Cog/platforms/Cross/vm -I/home/dmcphers/Cog/src/vm -I/home/dmcphers/Cog/build.linux32x86/squeak.cog.v3/build -I/home/dmcphers/Cog/build.linux32x86/squeak.cog.v3/build -I/home/dmcphers/Cog/platforms/unix/vm -I/home/dmcphers/Cog/platforms/Cross/vm -I/home/dmcphers/Cog/src/vm -I/home/dmcphers/Cog/platforms/Cross/plugins/FilePlugin -I/home/dmcphers/Cog/platforms/Cross/plugins/B3DAcceleratorPlugin -I/home/dmcphers/Cog/platforms/unix/plugins/B3DAcceleratorPlugin -c /home/dmcphers/Cog/platforms/unix/vm-display-fbdev/sqUnixFBDev.c -fPIC -DPIC -DPIC -o sqUnixFBDev.o In file included from /home/dmcphers/Cog/platforms/Cross/vm/sq.h:20:0, from /home/dmcphers/Cog/platforms/unix/vm-display-fbdev/sqUnixFBDev.c:43: /home/dmcphers/Cog/platforms/Cross/vm/sqVirtualMachine.h:297:0: error: "DisownVMLockOutFullGC" redefined [-Werror] /home/dmcphers/Cog/src/vm/interp.h:38:0: note: this is the location of the previous definition cc1: all warnings being treated as errors make[1]: *** [sqUnixFBDev.lo] Error 1 make: *** [vm-display-fbdev.la] Error 2 2. The regular VM coglinuxht fails to run (it just hangs), however the debug vm seems to run ok. May be due to compiler optimization level? Thanks, Doug

2 1

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

07 Oct '14

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.894.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.894 Author: eem Time: 7 October 2014, 11:20:33.469 am UUID: 7417a203-5178-46d0-951c-b3dd1487a267 Ancestors: VMMaker.oscog-eem.893 Rename "explicit outer" foo to "enclosing object" foo =============== Diff against VMMaker.oscog-eem.893 =============== Item was added: + ----- Method: CoInterpreter>>ceEnclosingObjectAt: (in category 'stack bytecodes') ----- + ceEnclosingObjectAt: level + <api> + <option: #NewspeakVM> + ^self + enclosingObjectAt: level + withObject: (self mframeReceiver: framePointer) + withMixin: self mMethodClass! Item was removed: - ----- Method: CoInterpreter>>ceExplicitReceiverAt: (in category 'stack bytecodes') ----- - ceExplicitReceiverAt: level - <api> - <option: #NewspeakVM> - ^self - explicitOuterReceiver: level - withObject: (self mframeReceiver: framePointer) - withMixin: self mMethodClass! Item was changed: CogClass subclass: #Cogit + instanceVariableNames: 'coInterpreter objectMemory objectRepresentation processor threadManager methodZone methodZoneBase codeBase minValidCallAddress lastNInstructions simulatedAddresses simulatedTrampolines simulatedVariableGetters simulatedVariableSetters printRegisters printInstructions compilationTrace clickConfirm breakPC breakBlock singleStep guardPageSize traceFlags traceStores breakMethod methodObj initialPC endPC methodOrBlockNumArgs inBlock needsFrame hasYoungReferent primitiveIndex backEnd callerSavedRegMask postCompileHook primInvokeLabel methodLabel stackCheckLabel blockEntryLabel blockEntryNoContextSwitch blockNoContextSwitchOffset stackOverflowCall sendMiss sendMissCall missOffset entryPointMask checkedEntryAlignment uncheckedEntryAlignment cmEntryOffset entry cmNoCheckEntryOffset noCheckEntry dynSuperEntry dynSuperEntryAlignment cmDynSuperEntryOffset mnuCall interpretCall interpretLabel endCPICCase0 endCPICCase1 numPICCases firstCPICCaseOffset cPICCaseSize cPICEndSize closedPICSize openPICSize fixups abstractOpcodes annotations generatorTable primitiveGeneratorTable byte0 byte1 byte2 byte3 bytecodePC bytecodeSetOffset opcodeIndex numAbstractOpcodes annotationIndex blockStarts blockCount labelCounter cStackAlignment expectedSPAlignment expectedFPAlignment codeModified maxLitIndex ceMethodAbortTrampoline cePICAbortTrampoline ceCheckForInterruptTrampoline ceCPICMissTrampoline ceReturnToInterpreterTrampoline ceBaseFrameReturnTrampoline ceSendMustBeBooleanAddTrueTrampoline ceSendMustBeBooleanAddFalseTrampoline ceCannotResumeTrampoline ceEnterCogCodePopReceiverReg ceCallCogCodePopReceiverReg ceCallCogCodePopReceiverAndClassRegs cePrimReturnEnterCogCode cePrimReturnEnterCogCodeProfiling ceNonLocalReturnTrampoline ceFetchContextInstVarTrampoline ceStoreContextInstVarTrampoline ceImplicitReceiverTrampoline ceEnclosingObjectTrampoline ceCaptureCStackPointers ceFlushICache ceCheckFeaturesFunction ceTraceLinkedSendTrampoline ceTraceBlockActivationTrampoline ceTraceStoreTrampoline ceGetSP sendTrampolines superSendTrampolines dynamicSuperSendTrampolines firstSend lastSend realCEEnterCogCodePopReceiverReg realCECallCogCodePopReceiverReg realCECallCogCodePopReceiverAndClassRegs trampolineTableIndex trampolineAddresses objectReferencesInRuntime runtimeObjectRefIndex cFramePointerInUse debugPrimCallStackOffset ceTryLockVMOwner ceUnlockVMOwner cogMethodSurrogateClass cogBlockMethodSurrogateClass extA extB numIRCs indexOfIRC theIRCs' - instanceVariableNames: 'coInterpreter objectMemory objectRepresentation processor threadManager methodZone methodZoneBase codeBase minValidCallAddress lastNInstructions simulatedAddresses simulatedTrampolines simulatedVariableGetters simulatedVariableSetters printRegisters printInstructions compilationTrace clickConfirm breakPC breakBlock singleStep guardPageSize traceFlags traceStores breakMethod methodObj initialPC endPC methodOrBlockNumArgs inBlock needsFrame hasYoungReferent primitiveIndex backEnd callerSavedRegMask postCompileHook primInvokeLabel methodLabel stackCheckLabel blockEntryLabel blockEntryNoContextSwitch blockNoContextSwitchOffset stackOverflowCall sendMiss sendMissCall missOffset entryPointMask checkedEntryAlignment uncheckedEntryAlignment cmEntryOffset entry cmNoCheckEntryOffset noCheckEntry dynSuperEntry dynSuperEntryAlignment cmDynSuperEntryOffset mnuCall interpretCall interpretLabel endCPICCase0 endCPICCase1 numPICCases firstCPICCaseOffset cPICCaseSize cPICEndSize closedPICSize openPICSize fixups abstractOpcodes annotations generatorTable primitiveGeneratorTable byte0 byte1 byte2 byte3 bytecodePC bytecodeSetOffset opcodeIndex numAbstractOpcodes annotationIndex blockStarts blockCount labelCounter cStackAlignment expectedSPAlignment expectedFPAlignment codeModified maxLitIndex ceMethodAbortTrampoline cePICAbortTrampoline ceCheckForInterruptTrampoline ceCPICMissTrampoline ceReturnToInterpreterTrampoline ceBaseFrameReturnTrampoline ceSendMustBeBooleanAddTrueTrampoline ceSendMustBeBooleanAddFalseTrampoline ceCannotResumeTrampoline ceEnterCogCodePopReceiverReg ceCallCogCodePopReceiverReg ceCallCogCodePopReceiverAndClassRegs cePrimReturnEnterCogCode cePrimReturnEnterCogCodeProfiling ceNonLocalReturnTrampoline ceFetchContextInstVarTrampoline ceStoreContextInstVarTrampoline ceImplicitReceiverTrampoline ceExplicitReceiverTrampoline ceCaptureCStackPointers ceFlushICache ceCheckFeaturesFunction ceTraceLinkedSendTrampoline ceTraceBlockActivationTrampoline ceTraceStoreTrampoline ceGetSP sendTrampolines superSendTrampolines dynamicSuperSendTrampolines firstSend lastSend realCEEnterCogCodePopReceiverReg realCECallCogCodePopReceiverReg realCECallCogCodePopReceiverAndClassRegs trampolineTableIndex trampolineAddresses objectReferencesInRuntime runtimeObjectRefIndex cFramePointerInUse debugPrimCallStackOffset ceTryLockVMOwner ceUnlockVMOwner cogMethodSurrogateClass cogBlockMethodSurrogateClass extA extB numIRCs indexOfIRC theIRCs' classVariableNames: 'AltBlockCreationBytecodeSize AltFirstSpecialSelector AltNSSendIsPCAnnotated AnnotationConstantNames AnnotationShift BlockCreationBytecodeSize Debug DisplacementMask DisplacementX2N EagerInstructionDecoration EncounteredUnknownBytecode FirstAnnotation FirstSpecialSelector HasBytecodePC InsufficientCodeSpace IsAbsPCReference IsDisplacement IsDisplacementX2N IsNSSendCall IsObjectReference IsRelativeCall IsSendCall MapEnd MaxCompiledPrimitiveIndex MaxNegativeErrorCode MaxStackAllocSize MaxUnitDisplacement MaxX2NDisplacement MethodTooBig NSSendIsPCAnnotated NotFullyInitialized NumObjRefsInRuntime NumOopsPerIRC NumSendTrampolines NumTrampolines ProcessorClass ShouldNotJIT UnimplementedPrimitive YoungSelectorInPIC' poolDictionaries: 'CogCompilationConstants CogMethodConstants CogRTLOpcodes VMBasicConstants VMObjectIndices VMStackFrameOffsets' category: 'VMMaker-JIT'! Cogit class instanceVariableNames: 'generatorTable primitiveTable'! !Cogit commentStamp: 'eem 2/13/2013 15:37' prior: 0! I am the code generator for the Cog VM. My job is to produce machine code versions of methods for faster execution and to manage inline caches for faster send performance. I can be tested in the current image using my class-side in-image compilation facilities. e.g. try StackToRegisterMappingCogit genAndDis: (Integer >> #benchFib) I have concrete subclasses that implement different levels of optimization: SimpleStackBasedCogit is the simplest code generator. StackToRegisterMappingCogit is the current production code generator It defers pushing operands to the stack until necessary and implements a register-based calling convention for low-arity sends. StackToRegisterMappingCogit is an experimental code generator with support for counting conditional branches, intended to support adaptive optimization. coInterpreter <CoInterpreterSimulator> the VM's interpreter with which I cooperate methodZoneManager <CogMethodZoneManager> the manager of the machine code zone objectRepresentation <CogObjectRepresentation> the object used to generate object accesses processor <BochsIA32Alien|?> the simulator that executes the IA32/x86 machine code I generate when simulating execution in Smalltalk simulatedTrampolines <Dictionary of Integer -> MessageSend> the dictionary mapping trap jump addresses to run-time routines used to warp from simulated machine code in to the Smalltalk run-time. simulatedVariableGetters <Dictionary of Integer -> MessageSend> the dictionary mapping trap read addresses to variables in run-time objects used to allow simulated machine code to read variables in the Smalltalk run-time. simulatedVariableSetters <Dictionary of Integer -> MessageSend> the dictionary mapping trap write addresses to variables in run-time objects used to allow simulated machine code to write variables in the Smalltalk run-time. printRegisters printInstructions clickConfirm <Boolean> flags controlling debug printing and code simulation breakPC <Integer> machine code pc breakpoint cFramePointer cStackPointer <Integer> the variables representing the C stack & frame pointers, which must change on FFI callback and return selectorOop <sqInt> the oop of the methodObj being compiled methodObj <sqInt> the bytecode method being compiled initialPC endPC <Integer> the start and end pcs of the methodObj being compiled methodOrBlockNumArgs <Integer> argument count of current method or block being compiled needsFrame <Boolean> whether methodObj or block needs a frame to execute primitiveIndex <Integer> primitive index of current method being compiled methodLabel <CogAbstractOpcode> label for the method header blockEntryLabel <CogAbstractOpcode> label for the start of the block dispatch code stackOverflowCall <CogAbstractOpcode> label for the call of ceStackOverflow in the method prolog sendMissCall <CogAbstractOpcode> label for the call of ceSICMiss in the method prolog entryOffset <Integer> offset of method entry code from start (header) of method entry <CogAbstractOpcode> label for the first instruction of the method entry code noCheckEntryOffset <Integer> offset of the start of a method proper (after the method entry code) from start (header) of method noCheckEntry <CogAbstractOpcode> label for the first instruction of start of a method proper fixups <Array of <AbstractOpcode Label | nil>> the labels for forward jumps that will be fixed up when reaching the relevant bytecode. fixup shas one element per byte in methodObj's bytecode abstractOpcodes <Array of <AbstractOpcode>> the code generated when compiling methodObj byte0 byte1 byte2 byte3 <Integer> individual bytes of current bytecode being compiled in methodObj bytecodePointer <Integer> bytecode pc (same as Smalltalk) of the current bytecode being compiled opcodeIndex <Integer> the index of the next free entry in abstractOpcodes (this code is translated into C where OrderedCollection et al do not exist) numAbstractOpcodes <Integer> the number of elements in abstractOpcocdes blockStarts <Array of <BlockStart>> the starts of blocks in the current method blockCount the index into blockStarts as they are being noted, and hence eventuakly teh total number of blocks in the current method labelCounter <Integer> a nicety for numbering labels not needed in the production system but probably not expensive enough to worry about ceStackOverflowTrampoline <Integer> ceSend0ArgsTrampoline <Integer> ceSend1ArgsTrampoline <Integer> ceSend2ArgsTrampoline <Integer> ceSendNArgsTrampoline <Integer> ceSendSuper0ArgsTrampoline <Integer> ceSendSuper1ArgsTrampoline <Integer> ceSendSuper2ArgsTrampoline <Integer> ceSendSuperNArgsTrampoline <Integer> ceSICMissTrampoline <Integer> ceCPICMissTrampoline <Integer> ceStoreCheckTrampoline <Integer> ceReturnToInterpreterTrampoline <Integer> ceBaseFrameReturnTrampoline <Integer> ceSendMustBeBooleanTrampoline <Integer> ceClosureCopyTrampoline <Integer> the various trampolines (system-call-like jumps from machine code to the run-time). See Cogit>>generateTrampolines for the mapping from trampoline to run-time routine and then read the run-time routine for a funcitonal description. ceEnterCogCodePopReceiverReg <Integer> the enilopmart (jump from run-time to machine-code) methodZoneBase <Integer> ! Cogit class instanceVariableNames: 'generatorTable primitiveTable'! Item was changed: ----- Method: Cogit>>generateNewspeakRuntime (in category 'initialization') ----- generateNewspeakRuntime <option: #NewspeakVM> | jumpMiss jumpItsTheReceiverStupid retpcReg | <var: #jumpMiss type: #'AbstractInstruction *'> <var: #jumpItsTheReceiverStupid type: #'AbstractInstruction *'> "Generate the non-send runtime support for Newspeak, explicit outer and implicit receiver. The dynamic frequency of explicit outer is so low we merely call an interpreter routine." + ceEnclosingObjectTrampoline := self genTrampolineFor: #ceEnclosingObjectAt: + called: 'ceEnclosingObjectTrampoline' - ceExplicitReceiverTrampoline := self genTrampolineFor: #ceExplicitReceiverAt: - called: 'ceExplicitReceiverTrampoline' arg: SendNumArgsReg result: ReceiverResultReg. "Cached push implicit receiver implementation. If objectRepresentation doesn't support pinning then caller looks like mov selector, SendNumArgsReg call ceImplicitReceiver br continue Lclass: .word Lmixin:: .word continue: If objectRepresentation supports pinning then caller looks like mov Lclass, Arg1Reg mov selector, SendNumArgsReg call ceImplicitReceiver and Lclass: .word; Lmixin: .word is somewhere on the heap. If class tag matches class of receiver then mixin contains either 0 or the implicit receiver. If 0, answer the actual receiver, otherwise the mixin. Generate the class fetch and cache probe inline for speed. Smashes Arg1Reg, RegClass and caller-saved regs." opcodeIndex := 0. self MoveMw: FoxMFReceiver r: FPReg R: ReceiverResultReg. objectRepresentation genGetInlineCacheClassTagFrom: ReceiverResultReg into: ClassReg forEntry: false. objectRepresentation canPinObjects ifTrue: [self MoveMw: 0 r: Arg1Reg R: TempReg. self CmpR: ClassReg R: TempReg. jumpMiss := self JumpNonZero: 0. self MoveMw: BytesPerOop r: Arg1Reg R: TempReg. self CmpCq: 0 R: TempReg. jumpItsTheReceiverStupid := self JumpZero: 0. self MoveR: TempReg R: ReceiverResultReg. jumpItsTheReceiverStupid jmpTarget: (self RetN: 0). jumpMiss jmpTarget: self Label. ceImplicitReceiverTrampoline := self genTrampolineFor: #ceImplicitReceiverFor:receiver:cache: called: 'ceImplicitReceiverTrampoline' numArgs: 3 arg: SendNumArgsReg arg: ReceiverResultReg arg: Arg1Reg arg: nil saveRegs: false pushLinkReg: true resultReg: ReceiverResultReg appendOpcodes: true] ifFalse: [backEnd hasLinkRegister ifTrue: [retpcReg := LinkReg] ifFalse: [self MoveMw: 0 r: SPReg R: (retpcReg := TempReg)]. self MoveMw: 0 r: SPReg R: retpcReg. self MoveMw: backEnd jumpShortByteSize r: retpcReg R: Arg1Reg. self CmpR: ClassReg R: Arg1Reg. jumpMiss := self JumpNonZero: 0. self MoveMw: backEnd jumpShortByteSize + BytesPerOop r: retpcReg R: ClassReg. self CmpCq: 0 R: ClassReg. jumpItsTheReceiverStupid := self JumpZero: 0. self MoveR: ClassReg R: ReceiverResultReg. jumpItsTheReceiverStupid jmpTarget: (self RetN: 0). jumpMiss jmpTarget: self Label. ceImplicitReceiverTrampoline := self genTrampolineFor: #ceImplicitReceiverFor:receiver: called: 'ceImplicitReceiverTrampoline' numArgs: 2 arg: SendNumArgsReg arg: ReceiverResultReg arg: nil arg: nil saveRegs: false pushLinkReg: true resultReg: ReceiverResultReg appendOpcodes: true]! Item was changed: ----- Method: NewspeakInterpreter class>>initializeBytecodeTable (in category 'initialization') ----- initializeBytecodeTable "NewspeakInterpreter initializeBytecodeTable" "Note: This table will be used to generate a C switch statement." BytecodeTable := Array new: 256. self table: BytecodeTable from: #( ( 0 15 pushReceiverVariableBytecode) ( 16 31 pushTemporaryVariableBytecode) ( 32 63 pushLiteralConstantBytecode) ( 64 95 pushLiteralVariableBytecode) ( 96 103 storeAndPopReceiverVariableBytecode) (104 111 storeAndPopTemporaryVariableBytecode) (112 pushReceiverBytecode) (113 pushConstantTrueBytecode) (114 pushConstantFalseBytecode) (115 pushConstantNilBytecode) (116 pushConstantMinusOneBytecode) (117 pushConstantZeroBytecode) (118 pushConstantOneBytecode) (119 pushConstantTwoBytecode) (120 returnReceiver) (121 returnTrue) (122 returnFalse) (123 returnNil) (124 returnTopFromMethod) (125 returnTopFromBlock) "Newspeak bytecodes" (126 dynamicSuperSendBytecode) (127 pushImplicitReceiverBytecode) (128 extendedPushBytecode) (129 extendedStoreBytecode) (130 extendedStoreAndPopBytecode) (131 singleExtendedSendBytecode) (132 doubleExtendedDoAnythingBytecode) (133 singleExtendedSuperBytecode) (134 secondExtendedSendBytecode) (135 popStackBytecode) (136 duplicateTopBytecode) (137 pushActiveContextBytecode) "Closure & Newspeak bytecodes" (138 pushNewArrayBytecode) + (139 pushEnclosingObjectBytecode) - (139 pushExplicitOuterReceiverBytecode) (140 pushRemoteTempLongBytecode) (141 storeRemoteTempLongBytecode) (142 storeAndPopRemoteTempLongBytecode) (143 pushClosureCopyCopiedValuesBytecode) (144 151 shortUnconditionalJump) (152 159 shortConditionalJump) (160 167 longUnconditionalJump) (168 171 longJumpIfTrue) (172 175 longJumpIfFalse) "176-191 were sendArithmeticSelectorBytecode" (176 bytecodePrimAdd) (177 bytecodePrimSubtract) (178 bytecodePrimLessThan) (179 bytecodePrimGreaterThan) (180 bytecodePrimLessOrEqual) (181 bytecodePrimGreaterOrEqual) (182 bytecodePrimEqual) (183 bytecodePrimNotEqual) (184 bytecodePrimMultiply) (185 bytecodePrimDivide) (186 bytecodePrimMod) (187 bytecodePrimMakePoint) (188 bytecodePrimBitShift) (189 bytecodePrimDiv) (190 bytecodePrimBitAnd) (191 bytecodePrimBitOr) "192-207 were sendCommonSelectorBytecode" (192 bytecodePrimAt) (193 bytecodePrimAtPut) (194 bytecodePrimSize) (195 bytecodePrimNext) (196 bytecodePrimNextPut) (197 bytecodePrimAtEnd) (198 bytecodePrimEquivalent) (199 bytecodePrimClass) (200 bytecodePrimBlockCopy) (201 bytecodePrimValue) (202 bytecodePrimValueWithArg) (203 bytecodePrimDo) (204 bytecodePrimNew) (205 bytecodePrimNewWithArg) (206 bytecodePrimPointX) (207 bytecodePrimPointY) (208 223 sendLiteralSelector0ArgsBytecode) (224 239 sendLiteralSelector1ArgBytecode) (240 255 sendLiteralSelector2ArgsBytecode) ).! Item was added: + ----- Method: NewspeakInterpreter>>enclosingObjectAt:withObject:withMixin: (in category 'stack bytecodes') ----- + enclosingObjectAt: n withObject: anObject withMixin: mixin + "This is used to implement the innards of the pushEnclosingObjectBytecode, + used for explicit outer sends in NS2/NS3. " + | enclosingObject mixinApplication targetMixin count | + + enclosingObject := anObject. + targetMixin := mixin. + count := 0. + [count < n] whileTrue: + [count := count + 1. + (targetMixin = nilObj or:[enclosingObject = nilObj]) ifTrue: + [^nilObj]. + mixinApplication := self + findApplicationOfTargetMixin: targetMixin + startingAtNonMetaClass: (self fetchClassOf: enclosingObject). + mixinApplication == nilObj ifTrue:[^nilObj]. "should never happen!!" + enclosingObject := self fetchPointer: EnclosingObjectIndex + ofObject: mixinApplication. + targetMixin := self fetchPointer: EnclosingMixinIndex ofObject: targetMixin]. + + ^enclosingObject! Item was removed: - ----- Method: NewspeakInterpreter>>explicitOuterReceiver:withObject:withMixin: (in category 'stack bytecodes') ----- - explicitOuterReceiver: n withObject: anObject withMixin: mixin - "This is used to implement the innards of the pushExplicitOuterReceiverBytecode, - used for explicit outer sends in NS2/NS3. " - | explicitReceiver mixinApplication targetMixin count | - - explicitReceiver := anObject. - targetMixin := mixin. - count := 0. - [count < n] whileTrue:[ - count := count + 1. - (targetMixin == nilObj or:[explicitReceiver == nilObj]) ifTrue: - [^nilObj]. - mixinApplication := self - findApplicationOfTargetMixin: targetMixin - startingAtNonMetaClass: (self fetchClassOf: explicitReceiver). - mixinApplication == nilObj ifTrue:[^nilObj]. "should never happen!!" - explicitReceiver := self fetchPointer: EnclosingObjectIndex - ofObject: mixinApplication. - targetMixin := self fetchPointer: EnclosingMixinIndex ofObject: targetMixin. - ]. - - ^explicitReceiver! Item was added: + ----- Method: NewspeakInterpreter>>pushEnclosingObjectBytecode (in category 'stack bytecodes') ----- + pushEnclosingObjectBytecode + "Find the enclosing object at level N" + | mClassMixin litIndex anInt | + <inline: true> + litIndex := self fetchByte. + anInt := self literal: litIndex. + self fetchNextBytecode. + mClassMixin := self methodClassOf: method. + self internalPush: (self + enclosingObjectAt: (self integerValueOf: anInt) + withObject: receiver + withMixin: mClassMixin) + ! Item was removed: - ----- Method: NewspeakInterpreter>>pushExplicitOuterReceiverBytecode (in category 'stack bytecodes') ----- - pushExplicitOuterReceiverBytecode - "Find the appropriate implicit receiver for outer N" - | mClassMixin litIndex n anInt | - <inline: true> - litIndex := self fetchByte. - anInt := self literal: litIndex. - n := self checkedIntegerValueOf: anInt. - self fetchNextBytecode. - mClassMixin := self methodClassOf: method. - self internalPush:(self - explicitOuterReceiver: n - withObject: receiver - withMixin: mClassMixin - ) - ! Item was changed: ----- Method: SimpleStackBasedCogit class>>initializeBytecodeTableForNewspeakV3PlusClosures (in category 'class initialization') ----- initializeBytecodeTableForNewspeakV3PlusClosures "SimpleStackBasedCogit initializeBytecodeTableForNewspeakV3PlusClosures" NSSendIsPCAnnotated := true. "IsNSSendCall used by PushImplicitReceiver" FirstSpecialSelector := 176. self flag: 'Special selector send class must be inlined to agree with the interpreter, which inlines class. If class is sent to e.g. a general instance of ProtoObject then unless class is inlined there will be an MNU. It must be that the Cointerpreter and Cogit have identical semantics. We get away with not hardwiring the other special selectors either because in the Cointerpreter they are not inlined or because they are inlined only to instances of classes for which there will always be a method.'. self generatorTableFrom: #( (1 0 15 genPushReceiverVariableBytecode) (1 16 31 genPushTemporaryVariableBytecode) (1 32 63 genPushLiteralConstantBytecode needsFrameNever: 1) (1 64 95 genPushLiteralVariableBytecode needsFrameNever: 1) (1 96 103 genStoreAndPopReceiverVariableBytecode needsFrameNever: -1) "N.B. not frameless if immutability" (1 104 111 genStoreAndPopTemporaryVariableBytecode) (1 112 112 genPushReceiverBytecode) (1 113 113 genPushConstantTrueBytecode needsFrameNever: 1) (1 114 114 genPushConstantFalseBytecode needsFrameNever: 1) (1 115 115 genPushConstantNilBytecode needsFrameNever: 1) (1 116 119 genPushQuickIntegerConstantBytecode needsFrameNever: 1) "method returns in blocks need a frame because of nonlocalReturn:through:" (1 120 120 genReturnReceiver return needsFrameIfInBlock: isMappedInBlock 0) (1 121 121 genReturnTrue return needsFrameIfInBlock: isMappedInBlock 0) (1 122 122 genReturnFalse return needsFrameIfInBlock: isMappedInBlock 0) (1 123 123 genReturnNil return needsFrameIfInBlock: isMappedInBlock 0) (1 124 124 genReturnTopFromMethod return needsFrameIfInBlock: isMappedInBlock -1) (1 125 125 genReturnTopFromBlock return needsFrameNever: -1) (3 126 126 genDynamicSuperSendBytecode isMapped) "Newspeak" (2 127 127 genPushImplicitReceiverBytecode isMapped hasIRC) "Newspeak" (2 128 128 extendedPushBytecode needsFrameNever: 1) (2 129 129 extendedStoreBytecode) (2 130 130 extendedStoreAndPopBytecode) (2 131 131 genExtendedSendBytecode isMapped) (3 132 132 doubleExtendedDoAnythingBytecode isMapped) (2 133 133 genExtendedSuperBytecode isMapped) (2 134 134 genSecondExtendedSendBytecode isMapped) (1 135 135 genPopStackBytecode needsFrameNever: -1) (1 136 136 duplicateTopBytecode needsFrameNever: 1) (1 137 137 genPushActiveContextBytecode) (2 138 138 genPushNewArrayBytecode)), ((initializationOptions at: #SpurObjectMemory ifAbsent: [false]) ifTrue: [#((3 139 139 callPrimitiveBytecode))] "V3PlusClosures on Spur" + ifFalse: [#((2 139 139 genPushEnclosingObjectBytecode isMapped))]), "Newspeak" - ifFalse: [#((2 139 139 genPushExplicitOuterReceiverBytecode isMapped))]), "Newspeak" #( (3 140 140 genPushRemoteTempLongBytecode) (3 141 141 genStoreRemoteTempLongBytecode) (3 142 142 genStoreAndPopRemoteTempLongBytecode) (4 143 143 genPushClosureCopyCopiedValuesBytecode block v3:Block:Code:Size:) (1 144 151 genShortUnconditionalJump branch v3:ShortForward:Branch:Distance:) (1 152 159 genShortJumpIfFalse branch isBranchFalse isMapped "because of mustBeBoolean" v3:ShortForward:Branch:Distance:) (2 160 163 genLongUnconditionalBackwardJump branch isMapped "because of interrupt check" v3:Long:Branch:Distance:) (2 164 167 genLongUnconditionalForwardJump branch v3:Long:Branch:Distance:) (2 168 171 genLongJumpIfTrue branch isBranchTrue isMapped "because of mustBeBoolean" v3:LongForward:Branch:Distance:) (2 172 175 genLongJumpIfFalse branch isBranchFalse isMapped "because of mustBeBoolean" v3:LongForward:Branch:Distance:) (1 176 197 genSpecialSelectorSend isMapped) (1 198 198 genSpecialSelectorEqualsEquals needsFrameNever: notMapped -1) "not mapped because it is directly inlined (for now)" (1 199 199 genSpecialSelectorClass needsFrameNever: notMapped 0) "not mapped because it is directly inlined (for now)" (1 200 207 genSpecialSelectorSend isMapped) (1 208 223 genSendLiteralSelector0ArgsBytecode isMapped) (1 224 239 genSendLiteralSelector1ArgBytecode isMapped) (1 240 255 genSendLiteralSelector2ArgsBytecode isMapped))! Item was changed: ----- Method: SimpleStackBasedCogit>>genExtPushPseudoVariableOrOuterBytecode (in category 'bytecode generators') ----- genExtPushPseudoVariableOrOuterBytecode + "77 01001101 Push false [* 1:true, 2:nil, 3:thisContext, ..., -N: pushEnclosingObjectAt: N, N = Extend B]" - "77 01001101 Push false [* 1:true, 2:nil, 3:thisContext, ..., -N: pushExplicitOuter: N, N = Extend B]" | ext | ext := extB. extB := 0. ext caseOf: { [0] -> [^self genPushLiteral: objectMemory falseObject]. [1] -> [^self genPushLiteral: objectMemory trueObject]. [2] -> [^self genPushLiteral: objectMemory nilObject]. [3] -> [^self genPushActiveContextBytecode] } otherwise: [ext < 0 ifTrue: + [^self genPushEnclosingObjectAt: 0 - ext]. - [^self genPushExplicitOuterReceiver: 0 - ext]. self warning: 'undefined extension for extPushPseudoVariableOrOuter'. ^self unknownBytecode]. ^0! Item was added: + ----- Method: SimpleStackBasedCogit>>genPushEnclosingObjectAt: (in category 'bytecode generators') ----- + genPushEnclosingObjectAt: level + "Uncached push enclosing object" + self MoveCq: level R: SendNumArgsReg. + self CallRT: ceEnclosingObjectTrampoline. + self PushR: ReceiverResultReg. + ^0! Item was added: + ----- Method: SimpleStackBasedCogit>>genPushEnclosingObjectBytecode (in category 'bytecode generators') ----- + genPushEnclosingObjectBytecode + "Uncached push enclosing object" + | levelOop | + levelOop := self getLiteral: byte1. + self assert: (objectMemory isIntegerObject: levelOop). + ^self genPushEnclosingObjectAt: (objectMemory integerValueOf: levelOop)! Item was removed: - ----- Method: SimpleStackBasedCogit>>genPushExplicitOuterReceiver: (in category 'bytecode generators') ----- - genPushExplicitOuterReceiver: level - "Uncached push explicit outer send receiver" - self assert: needsFrame. "because this should always be followed by a send" - self MoveCq: level R: SendNumArgsReg. - self CallRT: ceExplicitReceiverTrampoline. - self PushR: ReceiverResultReg. - ^0! Item was removed: - ----- Method: SimpleStackBasedCogit>>genPushExplicitOuterReceiverBytecode (in category 'bytecode generators') ----- - genPushExplicitOuterReceiverBytecode - "Uncached push explicit outer send receiver" - | levelOop | - levelOop := self getLiteral: byte1. - self assert: (objectMemory isIntegerObject: levelOop). - ^self genPushExplicitOuterReceiver: (objectMemory integerValueOf: levelOop)! Item was changed: ----- Method: StackInterpreter class>>initializeBytecodeTableForNewspeakV3PlusClosures (in category 'initialization') ----- initializeBytecodeTableForNewspeakV3PlusClosures "StackInterpreter initializeBytecodeTableForNewspeakV3PlusClosures" "Note: This table will be used to generate a C switch statement." BytecodeTable := Array new: 256. BytecodeEncoderClassName := #EncoderForNewsqueakV3. LongStoreBytecode := 129. self table: BytecodeTable from: #( ( 0 15 pushReceiverVariableBytecode) ( 16 31 pushTemporaryVariableBytecode) ( 32 63 pushLiteralConstantBytecode) ( 64 95 pushLiteralVariableBytecode) ( 96 103 storeAndPopReceiverVariableBytecode) (104 111 storeAndPopTemporaryVariableBytecode) (112 pushReceiverBytecode) (113 pushConstantTrueBytecode) (114 pushConstantFalseBytecode) (115 pushConstantNilBytecode) (116 pushConstantMinusOneBytecode) (117 pushConstantZeroBytecode) (118 pushConstantOneBytecode) (119 pushConstantTwoBytecode) (120 returnReceiver) (121 returnTrue) (122 returnFalse) (123 returnNil) (124 returnTopFromMethod) (125 returnTopFromBlock) "2 of the 3 Newspeak bytecodes" (126 dynamicSuperSendBytecode) (127 pushImplicitReceiverBytecode) (128 extendedPushBytecode) (129 extendedStoreBytecode) (130 extendedStoreAndPopBytecode) (131 singleExtendedSendBytecode) (132 doubleExtendedDoAnythingBytecode) (133 singleExtendedSuperBytecode) (134 secondExtendedSendBytecode) (135 popStackBytecode) (136 duplicateTopBytecode) (137 pushActiveContextBytecode) (138 pushNewArrayBytecode)), ((initializationOptions at: #SpurObjectMemory ifAbsent: [false]) ifTrue: [#((139 callPrimitiveBytecode))] "V3PlusClosures on Spur" + ifFalse: [#((139 pushEnclosingObjectBytecode))]), "Newspeak on V3" - ifFalse: [#((139 pushExplicitOuterReceiverBytecode))]), "Newspeak on V3" #( (140 pushRemoteTempLongBytecode) (141 storeRemoteTempLongBytecode) (142 storeAndPopRemoteTempLongBytecode) (143 pushClosureCopyCopiedValuesBytecode) (144 151 shortUnconditionalJump) (152 159 shortConditionalJumpFalse) (160 167 longUnconditionalJump) (168 171 longJumpIfTrue) (172 175 longJumpIfFalse) "176-191 were sendArithmeticSelectorBytecode" (176 bytecodePrimAdd) (177 bytecodePrimSubtract) (178 bytecodePrimLessThan) (179 bytecodePrimGreaterThan) (180 bytecodePrimLessOrEqual) (181 bytecodePrimGreaterOrEqual) (182 bytecodePrimEqual) (183 bytecodePrimNotEqual) (184 bytecodePrimMultiply) (185 bytecodePrimDivide) (186 bytecodePrimMod) (187 bytecodePrimMakePoint) (188 bytecodePrimBitShift) (189 bytecodePrimDiv) (190 bytecodePrimBitAnd) (191 bytecodePrimBitOr) "192-207 were sendCommonSelectorBytecode" (192 bytecodePrimAt) (193 bytecodePrimAtPut) (194 bytecodePrimSize) (195 bytecodePrimNext) (196 bytecodePrimNextPut) (197 bytecodePrimAtEnd) (198 bytecodePrimIdentical) (199 bytecodePrimClass) (200 bytecodePrimSpecialSelector24) (201 bytecodePrimValue) (202 bytecodePrimValueWithArg) (203 bytecodePrimDo) (204 bytecodePrimNew) (205 bytecodePrimNewWithArg) (206 bytecodePrimPointX) (207 bytecodePrimPointY) (208 223 sendLiteralSelector0ArgsBytecode) (224 239 sendLiteralSelector1ArgBytecode) (240 255 sendLiteralSelector2ArgsBytecode) )! Item was added: + ----- Method: StackInterpreter>>enclosingObjectAt:withObject:withMixin: (in category 'newspeak bytecode support') ----- + enclosingObjectAt: n withObject: anObject withMixin: mixin + "This is used to implement the innards of the pushEnclosingObjectBytecode, + used for explicit outer sends in NS2/NS3. " + | enclosingObject mixinApplication targetMixin count | + + enclosingObject := anObject. + targetMixin := mixin. + count := 0. + [count < n] whileTrue: + [count := count + 1. + (targetMixin = objectMemory nilObject or:[enclosingObject = objectMemory nilObject]) ifTrue: + [^objectMemory nilObject]. + mixinApplication := self + findApplicationOfTargetMixin: targetMixin + startingAtNonMetaClass: (objectMemory fetchClassOf: enclosingObject). + mixinApplication = objectMemory nilObject ifTrue: + [^objectMemory nilObject]. "should never happen!!" + enclosingObject := objectMemory fetchPointer: EnclosingObjectIndex ofObject: mixinApplication. + targetMixin := objectMemory fetchPointer: EnclosingMixinIndex ofObject: targetMixin]. + + ^enclosingObject! Item was removed: - ----- Method: StackInterpreter>>explicitOuterReceiver:withObject:withMixin: (in category 'newspeak bytecode support') ----- - explicitOuterReceiver: n withObject: anObject withMixin: mixin - "This is used to implement the innards of the pushExplicitOuterReceiverBytecode, - used for explicit outer sends in NS2/NS3. " - | explicitReceiver mixinApplication targetMixin count | - - explicitReceiver := anObject. - targetMixin := mixin. - count := 0. - [count < n] whileTrue: - [count := count + 1. - (targetMixin = objectMemory nilObject or:[explicitReceiver = objectMemory nilObject]) ifTrue: - [^objectMemory nilObject]. - mixinApplication := self - findApplicationOfTargetMixin: targetMixin - startingAtNonMetaClass: (objectMemory fetchClassOf: explicitReceiver). - mixinApplication = objectMemory nilObject ifTrue: - [^objectMemory nilObject]. "should never happen!!" - explicitReceiver := objectMemory fetchPointer: EnclosingObjectIndex ofObject: mixinApplication. - targetMixin := objectMemory fetchPointer: EnclosingMixinIndex ofObject: targetMixin]. - - ^explicitReceiver! Item was changed: ----- Method: StackInterpreter>>extPushPseudoVariableOrOuterBytecode (in category 'stack bytecodes') ----- extPushPseudoVariableOrOuterBytecode "77 01001101 Push false [* 1:true, 2:nil, 3:thisContext, ..., -N: pushExplicitOuter: N, N = Extend B]" | thing | self fetchNextBytecode. thing := extB caseOf: { [0] -> [^self internalPush: objectMemory falseObject]. [1] -> [objectMemory trueObject]. [2] -> [objectMemory nilObject]. [3] -> [| context | context := self ensureFrameIsMarried: localFP SP: localSP. context] } otherwise: [extB < 0 ifTrue: [self + enclosingObjectAt: 0 - extB - explicitOuterReceiver: 0 - extB withObject: self receiver withMixin: (self methodClassOf: method)] ifFalse: [self error: 'undefined extension for extPushPseudoVariableOrOuter'. objectMemory nilObject]]. extB := 0. self internalPush: thing! Item was added: + ----- Method: StackInterpreter>>pushEnclosingObjectBytecode (in category 'stack bytecodes') ----- + pushEnclosingObjectBytecode + "Find the enclosing object at level N" + | litIndex n anIntOop | + <inline: true> + litIndex := self fetchByte. + anIntOop := self literal: litIndex. + n := (objectMemory isIntegerObject: anIntOop) + ifTrue: [objectMemory integerValueOf: anIntOop] + ifFalse: [0]. + self fetchNextBytecode. + self internalPush:(self + enclosingObjectAt: n + withObject: self receiver + withMixin: (self methodClassOf: method))! Item was removed: - ----- Method: StackInterpreter>>pushExplicitOuterReceiverBytecode (in category 'stack bytecodes') ----- - pushExplicitOuterReceiverBytecode - "Find the appropriate implicit receiver for outer N" - | litIndex n anIntOop | - <inline: true> - litIndex := self fetchByte. - anIntOop := self literal: litIndex. - n := (objectMemory isIntegerObject: anIntOop) - ifTrue: [objectMemory integerValueOf: anIntOop] - ifFalse: [0]. - self fetchNextBytecode. - self internalPush:(self - explicitOuterReceiver: n - withObject: self receiver - withMixin: (self methodClassOf: method))! Item was changed: ----- Method: StackToRegisterMappingCogit class>>initializeBytecodeTableForNewspeakV3PlusClosures (in category 'class initialization') ----- initializeBytecodeTableForNewspeakV3PlusClosures "StackToRegisterMappingCogit initializeBytecodeTableForNewspeakV3PlusClosures" numPushNilsFunction := #v3:Num:Push:Nils:. pushNilSizeFunction := #v3PushNilSize:. NSSendIsPCAnnotated := true. "IsNSSendCall used by PushImplicitReceiver" FirstSpecialSelector := 176. self flag: 'Special selector send class must be inlined to agree with the interpreter, which inlines class. If class is sent to e.g. a general instance of ProtoObject then unless class is inlined there will be an MNU. It must be that the Cointerpreter and Cogit have identical semantics. We get away with not hardwiring the other special selectors either because in the Cointerpreter they are not inlined or because they are inlined only to instances of classes for which there will always be a method.'. self generatorTableFrom: #( (1 0 15 genPushReceiverVariableBytecode needsFrameNever: 1) (1 16 31 genPushTemporaryVariableBytecode needsFrameIfMod16GENumArgs: 1) (1 32 63 genPushLiteralConstantBytecode needsFrameNever: 1) (1 64 95 genPushLiteralVariableBytecode needsFrameNever: 1) (1 96 103 genStoreAndPopReceiverVariableBytecode needsFrameNever: -1) "N.B. not frameless if immutability" (1 104 111 genStoreAndPopTemporaryVariableBytecode) (1 112 112 genPushReceiverBytecode needsFrameNever: 1) (1 113 113 genPushConstantTrueBytecode needsFrameNever: 1) (1 114 114 genPushConstantFalseBytecode needsFrameNever: 1) (1 115 115 genPushConstantNilBytecode needsFrameNever: 1) (1 116 119 genPushQuickIntegerConstantBytecode needsFrameNever: 1) "method returns in blocks need a frame because of nonlocalReturn:through:" (1 120 120 genReturnReceiver return needsFrameIfInBlock: isMappedInBlock 0) (1 121 121 genReturnTrue return needsFrameIfInBlock: isMappedInBlock 0) (1 122 122 genReturnFalse return needsFrameIfInBlock: isMappedInBlock 0) (1 123 123 genReturnNil return needsFrameIfInBlock: isMappedInBlock 0) (1 124 124 genReturnTopFromMethod return needsFrameIfInBlock: isMappedInBlock -1) (1 125 125 genReturnTopFromBlock return needsFrameNever: -1) (3 126 126 genDynamicSuperSendBytecode isMapped) "Newspeak" (2 127 127 genPushImplicitReceiverBytecode isMapped hasIRC) "Newspeak" (2 128 128 extendedPushBytecode needsFrameNever: 1) (2 129 129 extendedStoreBytecode) (2 130 130 extendedStoreAndPopBytecode) (2 131 131 genExtendedSendBytecode isMapped) (3 132 132 doubleExtendedDoAnythingBytecode isMapped) (2 133 133 genExtendedSuperBytecode isMapped) (2 134 134 genSecondExtendedSendBytecode isMapped) (1 135 135 genPopStackBytecode needsFrameNever: -1) (1 136 136 duplicateTopBytecode needsFrameNever: 1) (1 137 137 genPushActiveContextBytecode) (2 138 138 genPushNewArrayBytecode)), ((initializationOptions at: #SpurObjectMemory ifAbsent: [false]) ifTrue: [#((3 139 139 callPrimitiveBytecode))] "V3PlusClosures on Spur" + ifFalse: [#((2 139 139 genPushEnclosingObjectBytecode isMapped))]), "Newspeak" - ifFalse: [#((2 139 139 genPushExplicitOuterReceiverBytecode isMapped))]), "Newspeak" #( (3 140 140 genPushRemoteTempLongBytecode) (3 141 141 genStoreRemoteTempLongBytecode) (3 142 142 genStoreAndPopRemoteTempLongBytecode) (4 143 143 genPushClosureCopyCopiedValuesBytecode block v3:Block:Code:Size:) (1 144 151 genShortUnconditionalJump branch v3:ShortForward:Branch:Distance:) (1 152 159 genShortJumpIfFalse branch isBranchFalse isMapped "because of mustBeBoolean" v3:ShortForward:Branch:Distance:) (2 160 163 genLongUnconditionalBackwardJump branch isMapped "because of interrupt check" v3:Long:Branch:Distance:) (2 164 167 genLongUnconditionalForwardJump branch v3:Long:Branch:Distance:) (2 168 171 genLongJumpIfTrue branch isBranchTrue isMapped "because of mustBeBoolean" v3:LongForward:Branch:Distance:) (2 172 175 genLongJumpIfFalse branch isBranchFalse isMapped "because of mustBeBoolean" v3:LongForward:Branch:Distance:) (1 176 176 genSpecialSelectorArithmetic isMapped AddRR) (1 177 177 genSpecialSelectorArithmetic isMapped SubRR) (1 178 178 genSpecialSelectorComparison isMapped JumpLess) (1 179 179 genSpecialSelectorComparison isMapped JumpGreater) (1 180 180 genSpecialSelectorComparison isMapped JumpLessOrEqual) (1 181 181 genSpecialSelectorComparison isMapped JumpGreaterOrEqual) (1 182 182 genSpecialSelectorComparison isMapped JumpZero) (1 183 183 genSpecialSelectorComparison isMapped JumpNonZero) (1 184 189 genSpecialSelectorSend isMapped) " #* #/ #\\ #@ #bitShift: //" (1 190 190 genSpecialSelectorArithmetic isMapped AndRR) (1 191 191 genSpecialSelectorArithmetic isMapped OrRR) (1 192 197 genSpecialSelectorSend isMapped) "#at: #at:put: #size #next #nextPut: #atEnd" (1 198 198 genSpecialSelectorEqualsEquals needsFrameNever: notMapped -1) "not mapped because it is directly inlined (for now)" (1 199 199 genSpecialSelectorClass needsFrameIfStackGreaterThanOne: notMapped 0) "not mapped because it is directly inlined (for now)" (1 200 207 genSpecialSelectorSend isMapped) "#blockCopy: #value #value: #do: #new #new: #x #y" (1 208 223 genSendLiteralSelector0ArgsBytecode isMapped) (1 224 239 genSendLiteralSelector1ArgBytecode isMapped) (1 240 255 genSendLiteralSelector2ArgsBytecode isMapped))! Item was added: + ----- Method: StackToRegisterMappingCogit>>genPushEnclosingObjectAt: (in category 'bytecode generators') ----- + genPushEnclosingObjectAt: level + "Uncached push enclosing object" + optStatus isReceiverResultRegLive: false. + self ssAllocateCallReg: SendNumArgsReg. + self MoveCq: level R: SendNumArgsReg. + self CallRT: ceEnclosingObjectTrampoline. + ^self ssPushRegister: ReceiverResultReg! Item was removed: - ----- Method: StackToRegisterMappingCogit>>genPushExplicitOuterReceiver: (in category 'bytecode generators') ----- - genPushExplicitOuterReceiver: level - "Uncached push explicit outer send receiver" - self assert: needsFrame. "because this should always be followed by a send" - optStatus isReceiverResultRegLive: false. - self ssAllocateCallReg: SendNumArgsReg. - self MoveCq: level R: SendNumArgsReg. - self CallRT: ceExplicitReceiverTrampoline. - ^self ssPushRegister: ReceiverResultReg!

1 0

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

07 Oct '14

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.893.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.893 Author: eem Time: 7 October 2014, 10:40:35.144 am UUID: 1db16930-a6b8-419b-bedc-83dfe3c6f277 Ancestors: VMMaker.oscog-eem.892 Further work to rescue the SimpleStackBasedCogit. =============== Diff against VMMaker.oscog-eem.892 =============== Item was changed: ----- Method: CoInterpreter>>callRegisterArgCogMethod:at:receiver: (in category 'enilopmarts') ----- callRegisterArgCogMethod: cogMethod at: entryOffset receiver: rcvr "convert rcvr base arg(s) retpc <- sp to retpc base entrypc rcvr arg(s) <- sp and then enter at either the checked or the unchecked entry-point." + <option: #StackToRegisterMappingCogit> <var: #cogMethod type: #'CogMethod *'> self assert: (cogit numRegArgs > 0 and: [cogit numRegArgs <= 2 and: [cogMethod cmNumArgs <= cogit numRegArgs]]). cogMethod cmNumArgs = 2 ifTrue: [self stackValue: 3 put: self stackTop. "retpc" self push: (self stackValue: 1). "last arg" self stackValue: 1 put: (self stackValue: 3). "first arg" self stackValue: 2 put: rcvr. self stackValue: 3 put: cogMethod asInteger + entryOffset. cogit ceCallCogCodePopReceiverArg1Arg0Regs "NOTREACHED"]. cogMethod cmNumArgs = 1 ifTrue: [self stackValue: 2 put: self stackTop. "retpc" self push: (self stackValue: 1). "arg" self stackValue: 1 put: rcvr. self stackValue: 2 put: cogMethod asInteger + entryOffset. cogit ceCallCogCodePopReceiverArg0Regs "NOTREACHED"]. self assert: cogMethod cmNumArgs = 0. self stackValue: 1 put: self stackTop. "retpc" self stackValue: 0 put: cogMethod asInteger + entryOffset. self push: rcvr. cogit ceCallCogCodePopReceiverReg "NOTREACHED"! Item was changed: ----- Method: SimpleStackBasedCogit>>compileOpenPIC:numArgs: (in category 'in-line cacheing') ----- compileOpenPIC: selector numArgs: numArgs "Compile the code for an open PIC. Perform a probe of the first-level method lookup cache followed by a call of ceSendFromInLineCacheMiss: if the probe fails." | jumpSelectorMiss jumpClassMiss itsAHit jumpBCMethod | <var: #jumpSelectorMiss type: #'AbstractInstruction *'> <var: #jumpClassMiss type: #'AbstractInstruction *'> <var: #itsAHit type: #'AbstractInstruction *'> <var: #jumpBCMethod type: #'AbstractInstruction *'> self compilePICProlog: numArgs. self cppIf: NewspeakVM ifTrue: [self Nop. "1st nop differentiates dynSuperEntry from no-check entry if using nextMethod" dynSuperEntry := self Nop]. entry := objectRepresentation genGetClassTagOf: ReceiverResultReg into: ClassReg scratchReg: TempReg. "Do first of three probes. See CoInterpreter>>lookupInMethodCacheSel:classTag:" self flag: #lookupInMethodCacheSel:classTag:. "so this method shows up as a sender of lookupInMethodCacheSel:class:" self MoveR: ClassReg R: SendNumArgsReg. self annotate: (self XorCw: selector R: ClassReg) objRef: selector. self LogicalShiftLeftCq: ShiftForWord R: ClassReg. self AndCq: MethodCacheMask << ShiftForWord R: ClassReg. self MoveMw: coInterpreter methodCacheAddress asUnsignedInteger + (MethodCacheSelector << ShiftForWord) r: ClassReg R: TempReg. self annotate: (self CmpCw: selector R: TempReg) objRef: selector. jumpSelectorMiss := self JumpNonZero: 0. self MoveMw: coInterpreter methodCacheAddress asUnsignedInteger + (MethodCacheClass << ShiftForWord) r: ClassReg R: TempReg. self CmpR: SendNumArgsReg R: TempReg. jumpClassMiss := self JumpNonZero: 0. itsAHit := self Label. "Fetch the method. The interpret trampoline requires the bytecoded method in SendNumArgsReg" self MoveMw: coInterpreter methodCacheAddress asUnsignedInteger + (MethodCacheMethod << ShiftForWord) r: ClassReg R: SendNumArgsReg. "If the method is compiled jump to its unchecked entry-point, otherwise interpret it." objectRepresentation genLoadSlot: HeaderIndex sourceReg: SendNumArgsReg destReg: TempReg. self MoveR: TempReg R: ClassReg. jumpBCMethod := objectRepresentation genJumpSmallIntegerInScratchReg: TempReg. jumpBCMethod jmpTarget: interpretLabel. self AddCq: cmNoCheckEntryOffset R: ClassReg. self JumpR: ClassReg. "First probe missed. Do second of three probes. Shift hash right one and retry." jumpSelectorMiss jmpTarget: (jumpClassMiss jmpTarget: self Label). self MoveR: SendNumArgsReg R: ClassReg. self annotate: (self XorCw: selector R: ClassReg) objRef: selector. self LogicalShiftLeftCq: ShiftForWord - 1 R: ClassReg. self AndCq: MethodCacheMask << ShiftForWord R: ClassReg. self MoveMw: coInterpreter methodCacheAddress asUnsignedInteger + (MethodCacheSelector << ShiftForWord) r: ClassReg R: TempReg. self annotate: (self CmpCw: selector R: TempReg) objRef: selector. jumpSelectorMiss := self JumpNonZero: 0. self MoveMw: coInterpreter methodCacheAddress asUnsignedInteger + (MethodCacheClass << ShiftForWord) r: ClassReg R: TempReg. self CmpR: SendNumArgsReg R: TempReg. self JumpZero: itsAHit. "Second probe missed. Do last probe. Shift hash right two and retry." jumpSelectorMiss jmpTarget: self Label. self MoveR: SendNumArgsReg R: ClassReg. self annotate: (self XorCw: selector R: ClassReg) objRef: selector. ShiftForWord > 2 ifTrue: [self LogicalShiftLeftCq: ShiftForWord - 1 R: ClassReg]. self AndCq: MethodCacheMask << ShiftForWord R: ClassReg. self MoveMw: coInterpreter methodCacheAddress asUnsignedInteger + (MethodCacheSelector << ShiftForWord) r: ClassReg R: TempReg. self annotate: (self CmpCw: selector R: TempReg) objRef: selector. jumpSelectorMiss := self JumpNonZero: 0. self MoveMw: coInterpreter methodCacheAddress asUnsignedInteger + (MethodCacheClass << ShiftForWord) r: ClassReg R: TempReg. self CmpR: SendNumArgsReg R: TempReg. self JumpZero: itsAHit. "Last probe missed. Call ceSendFromInLineCacheMiss: to do the full lookup." jumpSelectorMiss jmpTarget: self Label. + backEnd genSaveStackPointers. + backEnd genLoadCStackPointers. - self genSaveStackPointers. - self genLoadCStackPointers. methodLabel addDependent: (self annotateAbsolutePCRef: (self MoveCw: methodLabel asInteger R: SendNumArgsReg)). self compileCallFor: #ceSendFromInLineCacheMiss: numArgs: 1 arg: SendNumArgsReg arg: nil arg: nil arg: nil resultReg: nil saveRegs: false "Note that this call does not return."!

1 0

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

07 Oct '14

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.892.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.892 Author: eem Time: 6 October 2014, 5:20:39.792 pm UUID: 8054d05d-3157-4dd0-b7d6-82df62e46ae2 Ancestors: VMMaker.oscog-eem.891 Stop addMethodFor:selector: from removing methods unless a doNotGenerate overrides a superclass implementation. Make isInlineableConditional:in: use anyMethodNamed:. This rescues #numRegArgs usage in the CoInterpreter with SimpleStackBasedCogit. =============== Diff against VMMaker.oscog-eem.891 =============== Item was changed: ----- Method: CCodeGenerator>>addMethodFor:selector: (in category 'utilities') ----- addMethodFor: aClass selector: selector "Add the given method to the code base and answer its translation or nil if it shouldn't be translated." | method tmethod | method := aClass compiledMethodAt: selector. (method pragmaAt: #doNotGenerate) ifNotNil: ["only remove a previous method if this one overrides it, i.e. this is a subclass method. If the existing method is in a different hierarchy this method must be merely a redeirect." (methods at: selector ifAbsent: []) ifNotNil: [:tm| (aClass includesBehavior: tm definingClass) ifTrue: + [self removeMethodForSelector: selector]]. - [methods removeKey: selector]]. ^nil]. method isSubclassResponsibility ifTrue: + [^nil]. - [methods removeKey: selector ifAbsent: []. - ^nil]. (self shouldIncludeMethodFor: aClass selector: selector) ifFalse: + [^nil]. - [methods removeKey: selector ifAbsent: []. - ^nil]. tmethod := self compileToTMethodSelector: selector in: aClass. "Even thoug we exclude initialize methods, we must consider their global variable usage, otherwise globals may be incorrectly localized." selector == #initialize ifTrue: [self checkForGlobalUsage: tmethod allReferencedVariables in: tmethod. ^nil]. self addMethod: tmethod. "If the method has a macro then add the macro. But keep the method for analysis purposes (e.g. its variable accesses)." (method pragmaAt: #cmacro:) ifNotNil: [:pragma| self addMacro: (pragma argumentAt: 1) for: selector. (inlineList includes: selector) ifTrue: [inlineList := inlineList copyWithout: selector]]. (method propertyValueAt: #cmacro:) ifNotNil: [:macro| self addMacro: macro for: selector. (inlineList includes: selector) ifTrue: [inlineList := inlineList copyWithout: selector]]. ^tmethod! Item was changed: ----- Method: TMethod>>isInlineableConditional:in: (in category 'inlining') ----- isInlineableConditional: aSendNode in: aCodeGen "Answer if the given send node is of the form aSend [ifTrue:|ifFalse:] [statements] where the method for aSend is marked as inline and all returns within it answer booleans." |method | ^(#(ifTrue: ifFalse:) includes: aSendNode selector) and: [aSendNode receiver isSend + and: [(method := aCodeGen anyMethodNamed: aSendNode receiver selector) notNil - and: [(method := aCodeGen methodNamed: aSendNode receiver selector) notNil and: [method inline == true and: [method parseTree statements last isReturn and: [method parseTree allSatisfy: [:node| node isReturn not or: [node expression isConstant and: [#(true false) includes: node expression value]]]]]]]]!

1 0

[commit][3096] CogVM source as per VMMaker.oscog-eem.891
by commits＠squeakvm.org 05 Oct '14

05 Oct '14

Revision: 3096 Author: eliot Date: 2014-10-05 14:56:54 -0700 (Sun, 05 Oct 2014) Log Message: ----------- CogVM source as per VMMaker.oscog-eem.891 Fix compilatiom of v3 VMs (fix v3 pinObject: type). Fix Squeak V3 checkValidInlineCacheTag: (SmallInteger 0 is a valid cache tag). Modified Paths: -------------- branches/Cog/nscogsrc/vm/cogit.c branches/Cog/nscogsrc/vm/cogit.h branches/Cog/nscogsrc/vm/cointerp.c branches/Cog/nscogsrc/vm/cointerp.h branches/Cog/nscogsrc/vm/gcc3x-cointerp.c branches/Cog/scripts/uploadvms branches/Cog/sistasrc/vm/cogit.c branches/Cog/sistasrc/vm/cogit.h branches/Cog/sistasrc/vm/cointerp.c branches/Cog/sistasrc/vm/cointerp.h branches/Cog/sistasrc/vm/gcc3x-cointerp.c branches/Cog/src/vm/cogit.c branches/Cog/src/vm/cogit.h branches/Cog/src/vm/cointerp.c branches/Cog/src/vm/cointerp.h branches/Cog/src/vm/cointerpmt.c branches/Cog/src/vm/cointerpmt.h branches/Cog/src/vm/gcc3x-cointerp.c branches/Cog/src/vm/gcc3x-cointerpmt.c branches/Cog/stacksrc/vm/gcc3x-interp.c branches/Cog/stacksrc/vm/interp.c Property Changed: ---------------- branches/Cog/platforms/Cross/vm/sqSCCSVersion.h Modified: branches/Cog/nscogsrc/vm/cogit.c =================================================================== --- branches/Cog/nscogsrc/vm/cogit.c 2014-10-03 21:49:26 UTC (rev 3095) +++ branches/Cog/nscogsrc/vm/cogit.c 2014-10-05 21:56:54 UTC (rev 3096) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.889 uuid: f7ca0f83-4116-4c07-8307-3c23f8f5600a + CCodeGenerator VMMaker.oscog-eem.891 uuid: 2b1ec85c-bd1d-4299-938a-80aef455e476 from - StackToRegisterMappingCogit VMMaker.oscog-eem.889 uuid: f7ca0f83-4116-4c07-8307-3c23f8f5600a + StackToRegisterMappingCogit VMMaker.oscog-eem.891 uuid: 2b1ec85c-bd1d-4299-938a-80aef455e476 */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.889 uuid: f7ca0f83-4116-4c07-8307-3c23f8f5600a " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.891 uuid: 2b1ec85c-bd1d-4299-938a-80aef455e476 " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -15477,9 +15477,10 @@ static sqInt checkValidInlineCacheTag(sqInt cacheTag) { - return (((cacheTag & ((1 << ShiftForWord) - 1)) == 0) + return (cacheTag == ConstZero) + || ((((cacheTag & ((1 << ShiftForWord) - 1)) == 0) && (((cacheTag >= (1 << (compactClassFieldLSB()))) && (cacheTag <= ((compactClassIndexOfHeader(-1)) << (compactClassFieldLSB())))))) - || (checkValidObjectReference(cacheTag)); + || (checkValidObjectReference(cacheTag))); } static sqInt Modified: branches/Cog/nscogsrc/vm/cogit.h =================================================================== --- branches/Cog/nscogsrc/vm/cogit.h 2014-10-03 21:49:26 UTC (rev 3095) +++ branches/Cog/nscogsrc/vm/cogit.h 2014-10-05 21:56:54 UTC (rev 3096) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.889 uuid: f7ca0f83-4116-4c07-8307-3c23f8f5600a + CCodeGenerator VMMaker.oscog-eem.891 uuid: 2b1ec85c-bd1d-4299-938a-80aef455e476 */ Modified: branches/Cog/nscogsrc/vm/cointerp.c =================================================================== --- branches/Cog/nscogsrc/vm/cointerp.c 2014-10-03 21:49:26 UTC (rev 3095) +++ branches/Cog/nscogsrc/vm/cointerp.c 2014-10-05 21:56:54 UTC (rev 3096) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.887 uuid: f980d45a-5622-46f6-95d9-ac8d00a34e81 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.891 uuid: 2b1ec85c-bd1d-4299-938a-80aef455e476 from - CoInterpreter VMMaker.oscog-eem.887 uuid: f980d45a-5622-46f6-95d9-ac8d00a34e81 + CoInterpreter VMMaker.oscog-eem.891 uuid: 2b1ec85c-bd1d-4299-938a-80aef455e476 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.887 uuid: f980d45a-5622-46f6-95d9-ac8d00a34e81 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.891 uuid: 2b1ec85c-bd1d-4299-938a-80aef455e476 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -843,7 +843,7 @@ sqInt objectAfter(sqInt oop); static sqInt okayOop(sqInt signedOop) NoDbgRegParms; static sqInt oopHasAcceptableClass(sqInt signedOop) NoDbgRegParms; -void pinObject(sqInt objOop); +sqInt pinObject(sqInt objOop); static sqInt prepareForwardingTableForBecomingwithtwoWay(sqInt array1, sqInt array2, sqInt twoWayFlag) NoDbgRegParms; void printMemory(void); void printObjectsFromto(sqInt startAddress, sqInt endAddress); @@ -851,7 +851,7 @@ void printWronglySizedContexts(sqInt printContexts); static void restoreHeadersFromtofromandtofrom(sqInt firstIn, sqInt lastIn, sqInt hdrBaseIn, sqInt firstOut, sqInt lastOut, sqInt hdrBaseOut) NoDbgRegParms; static void runLeakCheckerForFullGC(sqInt fullGCFlag) NoDbgRegParms; -static sqInt safeObjectAfter(sqInt oop) NoDbgRegParms; +static usqInt safeObjectAfter(sqInt oop) NoDbgRegParms; static sqInt safePrintStringOf(sqInt oop) NoDbgRegParms; static sqInt shortentoIndexableSize(sqInt obj, sqInt nSlots) NoDbgRegParms; static sqInt sizeBitsOfSafe(sqInt oop) NoDbgRegParms; @@ -2084,7 +2084,7 @@ /* 574 */ (void (*)(void))0, /* 575 */ (void (*)(void))0, 0 }; -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.887"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.891"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -13058,7 +13058,7 @@ if ((((((sqInt) header)) < 0 ? header & (65536 << SmallIntegerShift) : (header & 536871934) != 0)) - && (localIP == ((GIV(method) + ((LiteralStart + (literalCountOfMethodHeader(header))) * BytesPerOop)) + (BaseHeaderSize)))) { + && ((((sqInt)localIP)) == ((GIV(method) + ((LiteralStart + (literalCountOfMethodHeader(header))) * BytesPerOop)) + (BaseHeaderSize)))) { localIP += ((((sqInt) header)) < 0 ? 3 : 0); @@ -30829,16 +30829,15 @@ } -/* Pin or unpin the receiver, i.e. make it immobile or mobile. Answer whether - the object was - already pinned. N.B. pinning does *not* prevent an object from being - garbage collected. */ +/* Pin or unpin the receiver, i.e. make it immobile or mobile, based on the + argument. Answer whether the object was already pinned. N.B. pinning does + *not* prevent + an object from being garbage collected. */ static void primitivePin(void) { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt boolean; - sqInt failure; sqInt obj; char *sp; sqInt wasPinned; @@ -30863,10 +30862,9 @@ return; } wasPinned = GIV(falseObj); - /* begin pinObject: */ - GIV(primFailCode) = PrimErrUnsupported; - if (failure != 0) { - (GIV(primFailCode) = failure); + if (((boolean == GIV(trueObj)) + && (pinObject(obj))) == 0) { + (GIV(primFailCode) = PrimErrNoMemory); return; } @@ -36756,17 +36754,15 @@ sqInt header1; sqInt header2; sqInt header3; - sqInt header4; usqInt lastWord; sqInt newFreeChunk; sqInt newOop; - sqInt next; + usqInt next; sqInt oop; sqInt realHeader; sqInt sz; sqInt sz1; sqInt sz2; - sqInt sz3; sqInt target; usqInt w; @@ -36777,21 +36773,7 @@ /* begin objectAfterWhileForwarding: */ header2 = longAt(oop); if ((header2 & MarkBit) == 0) { - /* begin objectAfter: */ - if (!(asserta(oopisLessThan(oop, GIV(freeStart))))) { - error("no objects after the end of memory"); - } - if (((longAt(oop)) & TypeMask) == HeaderTypeFree) { - sz2 = (longAt(oop)) & AllButTypeMask; - } - else { - /* begin sizeBitsOf: */ - header3 = longAt(oop); - sz2 = ((header3 & TypeMask) == HeaderTypeSizeAndClass - ? (longAt(oop - (BytesPerWord * 2))) & LongSizeMask - : header3 & SizeMask); - } - next = (oop + sz2) + (headerTypeBytes[(longAt(oop + sz2)) & TypeMask]); + next = ((sqInt) (objectAfter(oop))); goto l1; } fwdBlock1 = (header2 & AllButMarkBitAndTypeMask) << 1; @@ -36806,7 +36788,7 @@ else { sz1 = realHeader & SizeMask; } - next = (oop + sz1) + (headerTypeBytes[(longAt(oop + sz1)) & TypeMask]); + next = ((sqInt) ((oop + sz1) + (headerTypeBytes[(longAt(oop + sz1)) & TypeMask]))); l1: /* end objectAfterWhileForwarding: */; if (!(((longAt(oop)) & TypeMask) == HeaderTypeFree)) { @@ -36860,18 +36842,18 @@ } /* begin safeObjectAfter: */ if (((longAt(newFreeChunk)) & TypeMask) == HeaderTypeFree) { - sz3 = (longAt(newFreeChunk)) & AllButTypeMask; + sz2 = (longAt(newFreeChunk)) & AllButTypeMask; } else { /* begin sizeBitsOf: */ - header4 = longAt(newFreeChunk); - sz3 = ((header4 & TypeMask) == HeaderTypeSizeAndClass + header3 = longAt(newFreeChunk); + sz2 = ((header3 & TypeMask) == HeaderTypeSizeAndClass ? (longAt(newFreeChunk - (BytesPerWord * 2))) & LongSizeMask - : header4 & SizeMask); + : header3 & SizeMask); } - next = ((newFreeChunk + sz3) >= GIV(freeStart) + next = ((newFreeChunk + sz2) >= GIV(freeStart) ? GIV(freeStart) - : (newFreeChunk + sz3) + (headerTypeBytes[(longAt(newFreeChunk + sz3)) & TypeMask])); + : (newFreeChunk + sz2) + (headerTypeBytes[(longAt(newFreeChunk + sz2)) & TypeMask])); assert((next == GIV(freeStart)) || (next == (oopFromChunk(GIV(compEnd))))); if (next == GIV(freeStart)) { @@ -38021,10 +38003,11 @@ pinning. */ -void +sqInt pinObject(sqInt objOop) { DECL_MAYBE_SQ_GLOBAL_STRUCT GIV(primFailCode) = PrimErrUnsupported; + return 0; } @@ -38743,7 +38726,7 @@ given object or free chunk in memory. Return freeStart when enumeration is complete. This is for assertion checking only. */ -static sqInt +static usqInt safeObjectAfter(sqInt oop) { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt header; Modified: branches/Cog/nscogsrc/vm/cointerp.h =================================================================== --- branches/Cog/nscogsrc/vm/cointerp.h 2014-10-03 21:49:26 UTC (rev 3095) +++ branches/Cog/nscogsrc/vm/cointerp.h 2014-10-05 21:56:54 UTC (rev 3096) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.887 uuid: f980d45a-5622-46f6-95d9-ac8d00a34e81 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.891 uuid: 2b1ec85c-bd1d-4299-938a-80aef455e476 */ @@ -141,7 +141,7 @@ sqInt literalCountOfMethodHeader(sqInt header); void longPrintReferencesTo(sqInt anOop); sqInt objectAfter(sqInt oop); -void pinObject(sqInt objOop); +sqInt pinObject(sqInt objOop); void printObjectsFromto(sqInt startAddress, sqInt endAddress); void printReferencesTo(sqInt anOop); void printWronglySizedContexts(sqInt printContexts); Modified: branches/Cog/nscogsrc/vm/gcc3x-cointerp.c =================================================================== --- branches/Cog/nscogsrc/vm/gcc3x-cointerp.c 2014-10-03 21:49:26 UTC (rev 3095) +++ branches/Cog/nscogsrc/vm/gcc3x-cointerp.c 2014-10-05 21:56:54 UTC (rev 3096) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.887 uuid: f980d45a-5622-46f6-95d9-ac8d00a34e81 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.891 uuid: 2b1ec85c-bd1d-4299-938a-80aef455e476 from - CoInterpreter VMMaker.oscog-eem.887 uuid: f980d45a-5622-46f6-95d9-ac8d00a34e81 + CoInterpreter VMMaker.oscog-eem.891 uuid: 2b1ec85c-bd1d-4299-938a-80aef455e476 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.887 uuid: f980d45a-5622-46f6-95d9-ac8d00a34e81 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.891 uuid: 2b1ec85c-bd1d-4299-938a-80aef455e476 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -846,7 +846,7 @@ sqInt objectAfter(sqInt oop); static sqInt okayOop(sqInt signedOop) NoDbgRegParms; static sqInt oopHasAcceptableClass(sqInt signedOop) NoDbgRegParms; -void pinObject(sqInt objOop); +sqInt pinObject(sqInt objOop); static sqInt prepareForwardingTableForBecomingwithtwoWay(sqInt array1, sqInt array2, sqInt twoWayFlag) NoDbgRegParms; void printMemory(void); void printObjectsFromto(sqInt startAddress, sqInt endAddress); @@ -854,7 +854,7 @@ void printWronglySizedContexts(sqInt printContexts); static void restoreHeadersFromtofromandtofrom(sqInt firstIn, sqInt lastIn, sqInt hdrBaseIn, sqInt firstOut, sqInt lastOut, sqInt hdrBaseOut) NoDbgRegParms; static void runLeakCheckerForFullGC(sqInt fullGCFlag) NoDbgRegParms; -static sqInt safeObjectAfter(sqInt oop) NoDbgRegParms; +static usqInt safeObjectAfter(sqInt oop) NoDbgRegParms; static sqInt safePrintStringOf(sqInt oop) NoDbgRegParms; static sqInt shortentoIndexableSize(sqInt obj, sqInt nSlots) NoDbgRegParms; static sqInt sizeBitsOfSafe(sqInt oop) NoDbgRegParms; @@ -2087,7 +2087,7 @@ /* 574 */ (void (*)(void))0, /* 575 */ (void (*)(void))0, 0 }; -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.887"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.891"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -13067,7 +13067,7 @@ if ((((((sqInt) header)) < 0 ? header & (65536 << SmallIntegerShift) : (header & 536871934) != 0)) - && (localIP == ((GIV(method) + ((LiteralStart + (literalCountOfMethodHeader(header))) * BytesPerOop)) + (BaseHeaderSize)))) { + && ((((sqInt)localIP)) == ((GIV(method) + ((LiteralStart + (literalCountOfMethodHeader(header))) * BytesPerOop)) + (BaseHeaderSize)))) { localIP += ((((sqInt) header)) < 0 ? 3 : 0); @@ -30838,16 +30838,15 @@ } -/* Pin or unpin the receiver, i.e. make it immobile or mobile. Answer whether - the object was - already pinned. N.B. pinning does *not* prevent an object from being - garbage collected. */ +/* Pin or unpin the receiver, i.e. make it immobile or mobile, based on the + argument. Answer whether the object was already pinned. N.B. pinning does + *not* prevent + an object from being garbage collected. */ static void primitivePin(void) { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt boolean; - sqInt failure; sqInt obj; char *sp; sqInt wasPinned; @@ -30872,10 +30871,9 @@ return; } wasPinned = GIV(falseObj); - /* begin pinObject: */ - GIV(primFailCode) = PrimErrUnsupported; - if (failure != 0) { - (GIV(primFailCode) = failure); + if (((boolean == GIV(trueObj)) + && (pinObject(obj))) == 0) { + (GIV(primFailCode) = PrimErrNoMemory); return; } @@ -36765,17 +36763,15 @@ sqInt header1; sqInt header2; sqInt header3; - sqInt header4; usqInt lastWord; sqInt newFreeChunk; sqInt newOop; - sqInt next; + usqInt next; sqInt oop; sqInt realHeader; sqInt sz; sqInt sz1; sqInt sz2; - sqInt sz3; sqInt target; usqInt w; @@ -36786,21 +36782,7 @@ /* begin objectAfterWhileForwarding: */ header2 = longAt(oop); if ((header2 & MarkBit) == 0) { - /* begin objectAfter: */ - if (!(asserta(oopisLessThan(oop, GIV(freeStart))))) { - error("no objects after the end of memory"); - } - if (((longAt(oop)) & TypeMask) == HeaderTypeFree) { - sz2 = (longAt(oop)) & AllButTypeMask; - } - else { - /* begin sizeBitsOf: */ - header3 = longAt(oop); - sz2 = ((header3 & TypeMask) == HeaderTypeSizeAndClass - ? (longAt(oop - (BytesPerWord * 2))) & LongSizeMask - : header3 & SizeMask); - } - next = (oop + sz2) + (headerTypeBytes[(longAt(oop + sz2)) & TypeMask]); + next = ((sqInt) (objectAfter(oop))); goto l1; } fwdBlock1 = (header2 & AllButMarkBitAndTypeMask) << 1; @@ -36815,7 +36797,7 @@ else { sz1 = realHeader & SizeMask; } - next = (oop + sz1) + (headerTypeBytes[(longAt(oop + sz1)) & TypeMask]); + next = ((sqInt) ((oop + sz1) + (headerTypeBytes[(longAt(oop + sz1)) & TypeMask]))); l1: /* end objectAfterWhileForwarding: */; if (!(((longAt(oop)) & TypeMask) == HeaderTypeFree)) { @@ -36869,18 +36851,18 @@ } /* begin safeObjectAfter: */ if (((longAt(newFreeChunk)) & TypeMask) == HeaderTypeFree) { - sz3 = (longAt(newFreeChunk)) & AllButTypeMask; + sz2 = (longAt(newFreeChunk)) & AllButTypeMask; } else { /* begin sizeBitsOf: */ - header4 = longAt(newFreeChunk); - sz3 = ((header4 & TypeMask) == HeaderTypeSizeAndClass + header3 = longAt(newFreeChunk); + sz2 = ((header3 & TypeMask) == HeaderTypeSizeAndClass ? (longAt(newFreeChunk - (BytesPerWord * 2))) & LongSizeMask - : header4 & SizeMask); + : header3 & SizeMask); } - next = ((newFreeChunk + sz3) >= GIV(freeStart) + next = ((newFreeChunk + sz2) >= GIV(freeStart) ? GIV(freeStart) - : (newFreeChunk + sz3) + (headerTypeBytes[(longAt(newFreeChunk + sz3)) & TypeMask])); + : (newFreeChunk + sz2) + (headerTypeBytes[(longAt(newFreeChunk + sz2)) & TypeMask])); assert((next == GIV(freeStart)) || (next == (oopFromChunk(GIV(compEnd))))); if (next == GIV(freeStart)) { @@ -38030,10 +38012,11 @@ pinning. */ -void +sqInt pinObject(sqInt objOop) { DECL_MAYBE_SQ_GLOBAL_STRUCT GIV(primFailCode) = PrimErrUnsupported; + return 0; } @@ -38752,7 +38735,7 @@ given object or free chunk in memory. Return freeStart when enumeration is complete. This is for assertion checking only. */ -static sqInt +static usqInt safeObjectAfter(sqInt oop) { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt header; Property changes on: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h ___________________________________________________________________ Modified: checkindate - Fri Oct 3 14:48:56 PDT 2014 + Sun Oct 5 14:56:31 PDT 2014 Modified: branches/Cog/scripts/uploadvms =================================================================== --- branches/Cog/scripts/uploadvms 2014-10-03 21:49:26 UTC (rev 3095) +++ branches/Cog/scripts/uploadvms 2014-10-05 21:56:54 UTC (rev 3096) @@ -57,6 +57,8 @@ case $1 in -archives) JustUpload=JustUpload;; -all) all;; + -spur) CheckDMG=1;CheckMSI=1; + LSPUR=1;MSPUR=1;WSPUR=1;LNSSPUR=1;MNSSPUR=1;WNSSPUR=1;; -c) LCOG=1;LTCOG=1;MCOG=1;MTCOG=1;WCOG=1;WMTCOG=1; LSPUR=1;MSPUR=1;WSPUR=1;; -cl) LCOG=1;LTCOG=1;LSPUR=1;; @@ -131,7 +133,7 @@ echo upload $a done fi -if [ -n "$CheckDMG" -a ! -f "Newspeak Virtual Machine-$TAG.dmg" ]; then +if [ -n "$CheckDMG" -a -n "$MNSCOG" -a ! -f "Newspeak Virtual Machine-$TAG.dmg" ]; then NMID=../build.macos32x86/newspeak.cog.v3/installer if [ -f "Newspeak Virtual Machine-$TAG.dmg" ]; then true @@ -142,7 +144,7 @@ exit 1 fi fi -if [ -n "$CheckDMG" -a ! -f "Newspeak Spur Virtual Machine-$TAG.dmg" ]; then +if [ -n "$CheckDMG" -a -n "$MNSSPUR" -a ! -f "Newspeak Spur Virtual Machine-$TAG.dmg" ]; then NMID=../build.macos32x86/newspeak.cog.spur/installer if [ -f "Newspeak Virtual Spur Machine-$TAG.dmg" ]; then true @@ -153,7 +155,7 @@ exit 1 fi fi -if [ -n "$CheckMSI" -a ! -f nsvm-$TAG.msi ]; then +if [ -n "$CheckMSI" -a -n "$WNSCOG" -a ! -f nsvm-$TAG.msi ]; then NMID=../build.win32x86/newspeak.cog.v3/installer if [ -f nsvm-$TAG.msi ]; then true @@ -164,7 +166,7 @@ exit 1 fi fi -if [ -n "$CheckMSI" -a ! -f nsvm-spur-$TAG.msi ]; then +if [ -n "$CheckMSI" -a -n "$WNSSPUR" -a ! -f nsvm-spur-$TAG.msi ]; then NMID=../build.win32x86/newspeak.cog.spur/installer if [ -f nsvm-spur-$TAG.msi ]; then true Modified: branches/Cog/sistasrc/vm/cogit.c =================================================================== --- branches/Cog/sistasrc/vm/cogit.c 2014-10-03 21:49:26 UTC (rev 3095) +++ branches/Cog/sistasrc/vm/cogit.c 2014-10-05 21:56:54 UTC (rev 3096) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.889 uuid: f7ca0f83-4116-4c07-8307-3c23f8f5600a + CCodeGenerator VMMaker.oscog-eem.891 uuid: 2b1ec85c-bd1d-4299-938a-80aef455e476 from - SistaStackToRegisterMappingCogit VMMaker.oscog-eem.889 uuid: f7ca0f83-4116-4c07-8307-3c23f8f5600a + SistaStackToRegisterMappingCogit VMMaker.oscog-eem.891 uuid: 2b1ec85c-bd1d-4299-938a-80aef455e476 */ -static char __buildInfo[] = "SistaStackToRegisterMappingCogit VMMaker.oscog-eem.889 uuid: f7ca0f83-4116-4c07-8307-3c23f8f5600a " __DATE__ ; +static char __buildInfo[] = "SistaStackToRegisterMappingCogit VMMaker.oscog-eem.891 uuid: 2b1ec85c-bd1d-4299-938a-80aef455e476 " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -15077,9 +15077,10 @@ static sqInt checkValidInlineCacheTag(sqInt cacheTag) { - return (((cacheTag & ((1 << ShiftForWord) - 1)) == 0) + return (cacheTag == ConstZero) + || ((((cacheTag & ((1 << ShiftForWord) - 1)) == 0) && (((cacheTag >= (1 << (compactClassFieldLSB()))) && (cacheTag <= ((compactClassIndexOfHeader(-1)) << (compactClassFieldLSB())))))) - || (checkValidObjectReference(cacheTag)); + || (checkValidObjectReference(cacheTag))); } static sqInt Modified: branches/Cog/sistasrc/vm/cogit.h =================================================================== --- branches/Cog/sistasrc/vm/cogit.h 2014-10-03 21:49:26 UTC (rev 3095) +++ branches/Cog/sistasrc/vm/cogit.h 2014-10-05 21:56:54 UTC (rev 3096) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.889 uuid: f7ca0f83-4116-4c07-8307-3c23f8f5600a + CCodeGenerator VMMaker.oscog-eem.891 uuid: 2b1ec85c-bd1d-4299-938a-80aef455e476 */ Modified: branches/Cog/sistasrc/vm/cointerp.c =================================================================== --- branches/Cog/sistasrc/vm/cointerp.c 2014-10-03 21:49:26 UTC (rev 3095) +++ branches/Cog/sistasrc/vm/cointerp.c 2014-10-05 21:56:54 UTC (rev 3096) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.887 uuid: f980d45a-5622-46f6-95d9-ac8d00a34e81 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.891 uuid: 2b1ec85c-bd1d-4299-938a-80aef455e476 from - CoInterpreter VMMaker.oscog-eem.887 uuid: f980d45a-5622-46f6-95d9-ac8d00a34e81 + CoInterpreter VMMaker.oscog-eem.891 uuid: 2b1ec85c-bd1d-4299-938a-80aef455e476 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.887 uuid: f980d45a-5622-46f6-95d9-ac8d00a34e81 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.891 uuid: 2b1ec85c-bd1d-4299-938a-80aef455e476 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -842,7 +842,7 @@ sqInt objectAfter(sqInt oop); static sqInt okayOop(sqInt signedOop) NoDbgRegParms; static sqInt oopHasAcceptableClass(sqInt signedOop) NoDbgRegParms; -void pinObject(sqInt objOop); +sqInt pinObject(sqInt objOop); static sqInt prepareForwardingTableForBecomingwithtwoWay(sqInt array1, sqInt array2, sqInt twoWayFlag) NoDbgRegParms; void printMemory(void); void printObjectsFromto(sqInt startAddress, sqInt endAddress); @@ -2081,7 +2081,7 @@ /* 574 */ (void (*)(void))0, /* 575 */ (void (*)(void))0, 0 }; -const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreterPrimitives VMMaker.oscog-eem.887]"; +const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreterPrimitives VMMaker.oscog-eem.891]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -30900,16 +30900,15 @@ } -/* Pin or unpin the receiver, i.e. make it immobile or mobile. Answer whether - the object was - already pinned. N.B. pinning does *not* prevent an object from being - garbage collected. */ +/* Pin or unpin the receiver, i.e. make it immobile or mobile, based on the + argument. Answer whether the object was already pinned. N.B. pinning does + *not* prevent + an object from being garbage collected. */ static void primitivePin(void) { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt boolean; - sqInt failure; sqInt obj; char *sp; sqInt wasPinned; @@ -30934,10 +30933,9 @@ return; } wasPinned = GIV(falseObj); - /* begin pinObject: */ - GIV(primFailCode) = PrimErrUnsupported; - if (failure != 0) { - (GIV(primFailCode) = failure); + if (((boolean == GIV(trueObj)) + && (pinObject(obj))) == 0) { + (GIV(primFailCode) = PrimErrNoMemory); return; } @@ -38092,10 +38090,11 @@ pinning. */ -void +sqInt pinObject(sqInt objOop) { DECL_MAYBE_SQ_GLOBAL_STRUCT GIV(primFailCode) = PrimErrUnsupported; + return 0; } Modified: branches/Cog/sistasrc/vm/cointerp.h =================================================================== --- branches/Cog/sistasrc/vm/cointerp.h 2014-10-03 21:49:26 UTC (rev 3095) +++ branches/Cog/sistasrc/vm/cointerp.h 2014-10-05 21:56:54 UTC (rev 3096) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.887 uuid: f980d45a-5622-46f6-95d9-ac8d00a34e81 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.891 uuid: 2b1ec85c-bd1d-4299-938a-80aef455e476 */ @@ -139,7 +139,7 @@ sqInt literalCountOfMethodHeader(sqInt header); void longPrintReferencesTo(sqInt anOop); sqInt objectAfter(sqInt oop); -void pinObject(sqInt objOop); +sqInt pinObject(sqInt objOop); void printObjectsFromto(sqInt startAddress, sqInt endAddress); void printReferencesTo(sqInt anOop); void printWronglySizedContexts(sqInt printContexts); Modified: branches/Cog/sistasrc/vm/gcc3x-cointerp.c =================================================================== --- branches/Cog/sistasrc/vm/gcc3x-cointerp.c 2014-10-03 21:49:26 UTC (rev 3095) +++ branches/Cog/sistasrc/vm/gcc3x-cointerp.c 2014-10-05 21:56:54 UTC (rev 3096) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.887 uuid: f980d45a-5622-46f6-95d9-ac8d00a34e81 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.891 uuid: 2b1ec85c-bd1d-4299-938a-80aef455e476 from - CoInterpreter VMMaker.oscog-eem.887 uuid: f980d45a-5622-46f6-95d9-ac8d00a34e81 + CoInterpreter VMMaker.oscog-eem.891 uuid: 2b1ec85c-bd1d-4299-938a-80aef455e476 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.887 uuid: f980d45a-5622-46f6-95d9-ac8d00a34e81 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.891 uuid: 2b1ec85c-bd1d-4299-938a-80aef455e476 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -845,7 +845,7 @@ sqInt objectAfter(sqInt oop); static sqInt okayOop(sqInt signedOop) NoDbgRegParms; static sqInt oopHasAcceptableClass(sqInt signedOop) NoDbgRegParms; -void pinObject(sqInt objOop); +sqInt pinObject(sqInt objOop); static sqInt prepareForwardingTableForBecomingwithtwoWay(sqInt array1, sqInt array2, sqInt twoWayFlag) NoDbgRegParms; void printMemory(void); void printObjectsFromto(sqInt startAddress, sqInt endAddress); @@ -2084,7 +2084,7 @@ /* 574 */ (void (*)(void))0, /* 575 */ (void (*)(void))0, 0 }; -const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreterPrimitives VMMaker.oscog-eem.887]"; +const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreterPrimitives VMMaker.oscog-eem.891]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -30909,16 +30909,15 @@ } -/* Pin or unpin the receiver, i.e. make it immobile or mobile. Answer whether - the object was - already pinned. N.B. pinning does *not* prevent an object from being - garbage collected. */ +/* Pin or unpin the receiver, i.e. make it immobile or mobile, based on the + argument. Answer whether the object was already pinned. N.B. pinning does + *not* prevent + an object from being garbage collected. */ static void primitivePin(void) { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt boolean; - sqInt failure; sqInt obj; char *sp; sqInt wasPinned; @@ -30943,10 +30942,9 @@ return; } wasPinned = GIV(falseObj); - /* begin pinObject: */ - GIV(primFailCode) = PrimErrUnsupported; - if (failure != 0) { - (GIV(primFailCode) = failure); + if (((boolean == GIV(trueObj)) + && (pinObject(obj))) == 0) { + (GIV(primFailCode) = PrimErrNoMemory); return; } @@ -38101,10 +38099,11 @@ pinning. */ -void +sqInt pinObject(sqInt objOop) { DECL_MAYBE_SQ_GLOBAL_STRUCT GIV(primFailCode) = PrimErrUnsupported; + return 0; } Modified: branches/Cog/src/vm/cogit.c =================================================================== --- branches/Cog/src/vm/cogit.c 2014-10-03 21:49:26 UTC (rev 3095) +++ branches/Cog/src/vm/cogit.c 2014-10-05 21:56:54 UTC (rev 3096) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.889 uuid: f7ca0f83-4116-4c07-8307-3c23f8f5600a + CCodeGenerator VMMaker.oscog-eem.891 uuid: 2b1ec85c-bd1d-4299-938a-80aef455e476 from - StackToRegisterMappingCogit VMMaker.oscog-eem.889 uuid: f7ca0f83-4116-4c07-8307-3c23f8f5600a + StackToRegisterMappingCogit VMMaker.oscog-eem.891 uuid: 2b1ec85c-bd1d-4299-938a-80aef455e476 */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.889 uuid: f7ca0f83-4116-4c07-8307-3c23f8f5600a " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.891 uuid: 2b1ec85c-bd1d-4299-938a-80aef455e476 " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -14686,9 +14686,10 @@ static sqInt checkValidInlineCacheTag(sqInt cacheTag) { - return (((cacheTag & ((1 << ShiftForWord) - 1)) == 0) + return (cacheTag == ConstZero) + || ((((cacheTag & ((1 << ShiftForWord) - 1)) == 0) && (((cacheTag >= (1 << (compactClassFieldLSB()))) && (cacheTag <= ((compactClassIndexOfHeader(-1)) << (compactClassFieldLSB())))))) - || (checkValidObjectReference(cacheTag)); + || (checkValidObjectReference(cacheTag))); } static sqInt Modified: branches/Cog/src/vm/cogit.h =================================================================== --- branches/Cog/src/vm/cogit.h 2014-10-03 21:49:26 UTC (rev 3095) +++ branches/Cog/src/vm/cogit.h 2014-10-05 21:56:54 UTC (rev 3096) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.889 uuid: f7ca0f83-4116-4c07-8307-3c23f8f5600a + CCodeGenerator VMMaker.oscog-eem.891 uuid: 2b1ec85c-bd1d-4299-938a-80aef455e476 */ Modified: branches/Cog/src/vm/cointerp.c =================================================================== --- branches/Cog/src/vm/cointerp.c 2014-10-03 21:49:26 UTC (rev 3095) +++ branches/Cog/src/vm/cointerp.c 2014-10-05 21:56:54 UTC (rev 3096) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.887 uuid: f980d45a-5622-46f6-95d9-ac8d00a34e81 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.891 uuid: 2b1ec85c-bd1d-4299-938a-80aef455e476 from - CoInterpreter VMMaker.oscog-eem.887 uuid: f980d45a-5622-46f6-95d9-ac8d00a34e81 + CoInterpreter VMMaker.oscog-eem.891 uuid: 2b1ec85c-bd1d-4299-938a-80aef455e476 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.887 uuid: f980d45a-5622-46f6-95d9-ac8d00a34e81 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.891 uuid: 2b1ec85c-bd1d-4299-938a-80aef455e476 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -835,7 +835,7 @@ sqInt objectAfter(sqInt oop); static sqInt okayOop(sqInt signedOop) NoDbgRegParms; static sqInt oopHasAcceptableClass(sqInt signedOop) NoDbgRegParms; -void pinObject(sqInt objOop); +sqInt pinObject(sqInt objOop); static sqInt prepareForwardingTableForBecomingwithtwoWay(sqInt array1, sqInt array2, sqInt twoWayFlag) NoDbgRegParms; void printMemory(void); void printObjectsFromto(sqInt startAddress, sqInt endAddress); @@ -843,7 +843,7 @@ void printWronglySizedContexts(sqInt printContexts); static void restoreHeadersFromtofromandtofrom(sqInt firstIn, sqInt lastIn, sqInt hdrBaseIn, sqInt firstOut, sqInt lastOut, sqInt hdrBaseOut) NoDbgRegParms; static void runLeakCheckerForFullGC(sqInt fullGCFlag) NoDbgRegParms; -static sqInt safeObjectAfter(sqInt oop) NoDbgRegParms; +static usqInt safeObjectAfter(sqInt oop) NoDbgRegParms; static sqInt safePrintStringOf(sqInt oop) NoDbgRegParms; static sqInt shortentoIndexableSize(sqInt obj, sqInt nSlots) NoDbgRegParms; static sqInt sizeBitsOfSafe(sqInt oop) NoDbgRegParms; @@ -2073,7 +2073,7 @@ /* 574 */ (void (*)(void))0, /* 575 */ (void (*)(void))0, 0 }; -const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreterPrimitives VMMaker.oscog-eem.887]"; +const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreterPrimitives VMMaker.oscog-eem.891]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -26280,16 +26280,15 @@ } -/* Pin or unpin the receiver, i.e. make it immobile or mobile. Answer whether - the object was - already pinned. N.B. pinning does *not* prevent an object from being - garbage collected. */ +/* Pin or unpin the receiver, i.e. make it immobile or mobile, based on the + argument. Answer whether the object was already pinned. N.B. pinning does + *not* prevent + an object from being garbage collected. */ static void primitivePin(void) { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt boolean; - sqInt failure; sqInt obj; char *sp; sqInt wasPinned; @@ -26314,10 +26313,9 @@ return; } wasPinned = GIV(falseObj); - /* begin pinObject: */ - GIV(primFailCode) = PrimErrUnsupported; - if (failure != 0) { - (GIV(primFailCode) = failure); + if (((boolean == GIV(trueObj)) + && (pinObject(obj))) == 0) { + (GIV(primFailCode) = PrimErrNoMemory); return; } @@ -32202,17 +32200,15 @@ sqInt header1; sqInt header2; sqInt header3; - sqInt header4; usqInt lastWord; sqInt newFreeChunk; sqInt newOop; - sqInt next; + usqInt next; sqInt oop; sqInt realHeader; sqInt sz; sqInt sz1; sqInt sz2; - sqInt sz3; sqInt target; usqInt w; @@ -32223,21 +32219,7 @@ /* begin objectAfterWhileForwarding: */ header2 = longAt(oop); if ((header2 & MarkBit) == 0) { - /* begin objectAfter: */ - if (!(asserta(oopisLessThan(oop, GIV(freeStart))))) { - error("no objects after the end of memory"); - } - if (((longAt(oop)) & TypeMask) == HeaderTypeFree) { - sz2 = (longAt(oop)) & AllButTypeMask; - } - else { - /* begin sizeBitsOf: */ - header3 = longAt(oop); - sz2 = ((header3 & TypeMask) == HeaderTypeSizeAndClass - ? (longAt(oop - (BytesPerWord * 2))) & LongSizeMask - : header3 & SizeMask); - } - next = (oop + sz2) + (headerTypeBytes[(longAt(oop + sz2)) & TypeMask]); + next = ((sqInt) (objectAfter(oop))); goto l1; } fwdBlock1 = (header2 & AllButMarkBitAndTypeMask) << 1; @@ -32252,7 +32234,7 @@ else { sz1 = realHeader & SizeMask; } - next = (oop + sz1) + (headerTypeBytes[(longAt(oop + sz1)) & TypeMask]); + next = ((sqInt) ((oop + sz1) + (headerTypeBytes[(longAt(oop + sz1)) & TypeMask]))); l1: /* end objectAfterWhileForwarding: */; if (!(((longAt(oop)) & TypeMask) == HeaderTypeFree)) { @@ -32306,18 +32288,18 @@ } /* begin safeObjectAfter: */ if (((longAt(newFreeChunk)) & TypeMask) == HeaderTypeFree) { - sz3 = (longAt(newFreeChunk)) & AllButTypeMask; + sz2 = (longAt(newFreeChunk)) & AllButTypeMask; } else { /* begin sizeBitsOf: */ - header4 = longAt(newFreeChunk); - sz3 = ((header4 & TypeMask) == HeaderTypeSizeAndClass + header3 = longAt(newFreeChunk); + sz2 = ((header3 & TypeMask) == HeaderTypeSizeAndClass ? (longAt(newFreeChunk - (BytesPerWord * 2))) & LongSizeMask - : header4 & SizeMask); + : header3 & SizeMask); } - next = ((newFreeChunk + sz3) >= GIV(freeStart) + next = ((newFreeChunk + sz2) >= GIV(freeStart) ? GIV(freeStart) - : (newFreeChunk + sz3) + (headerTypeBytes[(longAt(newFreeChunk + sz3)) & TypeMask])); + : (newFreeChunk + sz2) + (headerTypeBytes[(longAt(newFreeChunk + sz2)) & TypeMask])); assert((next == GIV(freeStart)) || (next == (oopFromChunk(GIV(compEnd))))); if (next == GIV(freeStart)) { @@ -33467,10 +33449,11 @@ pinning. */ -void +sqInt pinObject(sqInt objOop) { DECL_MAYBE_SQ_GLOBAL_STRUCT GIV(primFailCode) = PrimErrUnsupported; + return 0; } @@ -34189,7 +34172,7 @@ given object or free chunk in memory. Return freeStart when enumeration is complete. This is for assertion checking only. */ -static sqInt +static usqInt safeObjectAfter(sqInt oop) { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt header; Modified: branches/Cog/src/vm/cointerp.h =================================================================== --- branches/Cog/src/vm/cointerp.h 2014-10-03 21:49:26 UTC (rev 3095) +++ branches/Cog/src/vm/cointerp.h 2014-10-05 21:56:54 UTC (rev 3096) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.887 uuid: f980d45a-5622-46f6-95d9-ac8d00a34e81 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.891 uuid: 2b1ec85c-bd1d-4299-938a-80aef455e476 */ @@ -137,7 +137,7 @@ sqInt literalCountOfMethodHeader(sqInt header); void longPrintReferencesTo(sqInt anOop); sqInt objectAfter(sqInt oop); -void pinObject(sqInt objOop); +sqInt pinObject(sqInt objOop); void printObjectsFromto(sqInt startAddress, sqInt endAddress); void printReferencesTo(sqInt anOop); void printWronglySizedContexts(sqInt printContexts); Modified: branches/Cog/src/vm/cointerpmt.c =================================================================== --- branches/Cog/src/vm/cointerpmt.c 2014-10-03 21:49:26 UTC (rev 3095) +++ branches/Cog/src/vm/cointerpmt.c 2014-10-05 21:56:54 UTC (rev 3096) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.887 uuid: f980d45a-5622-46f6-95d9-ac8d00a34e81 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.891 uuid: 2b1ec85c-bd1d-4299-938a-80aef455e476 from - CoInterpreterMT VMMaker.oscog-eem.887 uuid: f980d45a-5622-46f6-95d9-ac8d00a34e81 + CoInterpreterMT VMMaker.oscog-eem.891 uuid: 2b1ec85c-bd1d-4299-938a-80aef455e476 */ -static char __buildInfo[] = "CoInterpreterMT VMMaker.oscog-eem.887 uuid: f980d45a-5622-46f6-95d9-ac8d00a34e81 " __DATE__ ; +static char __buildInfo[] = "CoInterpreterMT VMMaker.oscog-eem.891 uuid: 2b1ec85c-bd1d-4299-938a-80aef455e476 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -921,7 +921,7 @@ sqInt objectAfter(sqInt oop); static sqInt okayOop(sqInt signedOop) NoDbgRegParms; static sqInt oopHasAcceptableClass(sqInt signedOop) NoDbgRegParms; -void pinObject(sqInt objOop); +sqInt pinObject(sqInt objOop); static sqInt prepareForwardingTableForBecomingwithtwoWay(sqInt array1, sqInt array2, sqInt twoWayFlag) NoDbgRegParms; void printMemory(void); void printObjectsFromto(sqInt startAddress, sqInt endAddress); @@ -2170,7 +2170,7 @@ /* 574 */ (void (*)(void))0, /* 575 */ (void (*)(void))0, 0 }; -const char *interpreterVersion = "Croquet Closure Cog MT VM [CoInterpreterMT VMMaker.oscog-eem.887]"; +const char *interpreterVersion = "Croquet Closure Cog MT VM [CoInterpreterMT VMMaker.oscog-eem.891]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; sqInt willNotThreadWarnCount; @@ -28644,16 +28644,15 @@ } -/* Pin or unpin the receiver, i.e. make it immobile or mobile. Answer whether - the object was - already pinned. N.B. pinning does *not* prevent an object from being - garbage collected. */ +/* Pin or unpin the receiver, i.e. make it immobile or mobile, based on the + argument. Answer whether the object was already pinned. N.B. pinning does + *not* prevent + an object from being garbage collected. */ static void primitivePin(void) { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt boolean; - sqInt failure; sqInt obj; char *sp; sqInt wasPinned; @@ -28678,10 +28677,9 @@ return; } wasPinned = GIV(falseObj); - /* begin pinObject: */ - GIV(primFailCode) = PrimErrUnsupported; - if (failure != 0) { - (GIV(primFailCode) = failure); + if (((boolean == GIV(trueObj)) + && (pinObject(obj))) == 0) { + (GIV(primFailCode) = PrimErrNoMemory); return; } @@ -35784,10 +35782,11 @@ pinning. */ -void +sqInt pinObject(sqInt objOop) { DECL_MAYBE_SQ_GLOBAL_STRUCT GIV(primFailCode) = PrimErrUnsupported; + return 0; } Modified: branches/Cog/src/vm/cointerpmt.h =================================================================== --- branches/Cog/src/vm/cointerpmt.h 2014-10-03 21:49:26 UTC (rev 3095) +++ branches/Cog/src/vm/cointerpmt.h 2014-10-05 21:56:54 UTC (rev 3096) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.887 uuid: f980d45a-5622-46f6-95d9-ac8d00a34e81 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.891 uuid: 2b1ec85c-bd1d-4299-938a-80aef455e476 */ @@ -141,7 +141,7 @@ sqInt literalCountOfMethodHeader(sqInt header); void longPrintReferencesTo(sqInt anOop); sqInt objectAfter(sqInt oop); -void pinObject(sqInt objOop); +sqInt pinObject(sqInt objOop); void printObjectsFromto(sqInt startAddress, sqInt endAddress); void printReferencesTo(sqInt anOop); void printWronglySizedContexts(sqInt printContexts); Modified: branches/Cog/src/vm/gcc3x-cointerp.c =================================================================== --- branches/Cog/src/vm/gcc3x-cointerp.c 2014-10-03 21:49:26 UTC (rev 3095) +++ branches/Cog/src/vm/gcc3x-cointerp.c 2014-10-05 21:56:54 UTC (rev 3096) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.887 uuid: f980d45a-5622-46f6-95d9-ac8d00a34e81 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.891 uuid: 2b1ec85c-bd1d-4299-938a-80aef455e476 from - CoInterpreter VMMaker.oscog-eem.887 uuid: f980d45a-5622-46f6-95d9-ac8d00a34e81 + CoInterpreter VMMaker.oscog-eem.891 uuid: 2b1ec85c-bd1d-4299-938a-80aef455e476 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.887 uuid: f980d45a-5622-46f6-95d9-ac8d00a34e81 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.891 uuid: 2b1ec85c-bd1d-4299-938a-80aef455e476 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -838,7 +838,7 @@ sqInt objectAfter(sqInt oop); static sqInt okayOop(sqInt signedOop) NoDbgRegParms; static sqInt oopHasAcceptableClass(sqInt signedOop) NoDbgRegParms; -void pinObject(sqInt objOop); +sqInt pinObject(sqInt objOop); static sqInt prepareForwardingTableForBecomingwithtwoWay(sqInt array1, sqInt array2, sqInt twoWayFlag) NoDbgRegParms; void printMemory(void); void printObjectsFromto(sqInt startAddress, sqInt endAddress); @@ -846,7 +846,7 @@ void printWronglySizedContexts(sqInt printContexts); static void restoreHeadersFromtofromandtofrom(sqInt firstIn, sqInt lastIn, sqInt hdrBaseIn, sqInt firstOut, sqInt lastOut, sqInt hdrBaseOut) NoDbgRegParms; static void runLeakCheckerForFullGC(sqInt fullGCFlag) NoDbgRegParms; -static sqInt safeObjectAfter(sqInt oop) NoDbgRegParms; +static usqInt safeObjectAfter(sqInt oop) NoDbgRegParms; static sqInt safePrintStringOf(sqInt oop) NoDbgRegParms; static sqInt shortentoIndexableSize(sqInt obj, sqInt nSlots) NoDbgRegParms; static sqInt sizeBitsOfSafe(sqInt oop) NoDbgRegParms; @@ -2076,7 +2076,7 @@ /* 574 */ (void (*)(void))0, /* 575 */ (void (*)(void))0, 0 }; -const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreterPrimitives VMMaker.oscog-eem.887]"; +const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreterPrimitives VMMaker.oscog-eem.891]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -26289,16 +26289,15 @@ } -/* Pin or unpin the receiver, i.e. make it immobile or mobile. Answer whether - the object was - already pinned. N.B. pinning does *not* prevent an object from being - garbage collected. */ +/* Pin or unpin the receiver, i.e. make it immobile or mobile, based on the + argument. Answer whether the object was already pinned. N.B. pinning does + *not* prevent + an object from being garbage collected. */ static void primitivePin(void) { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt boolean; - sqInt failure; sqInt obj; char *sp; sqInt wasPinned; @@ -26323,10 +26322,9 @@ return; } wasPinned = GIV(falseObj); - /* begin pinObject: */ - GIV(primFailCode) = PrimErrUnsupported; - if (failure != 0) { - (GIV(primFailCode) = failure); + if (((boolean == GIV(trueObj)) + && (pinObject(obj))) == 0) { + (GIV(primFailCode) = PrimErrNoMemory); return; } @@ -32211,17 +32209,15 @@ sqInt header1; sqInt header2; sqInt header3; - sqInt header4; usqInt lastWord; sqInt newFreeChunk; sqInt newOop; - sqInt next; + usqInt next; sqInt oop; sqInt realHeader; sqInt sz; sqInt sz1; sqInt sz2; - sqInt sz3; sqInt target; usqInt w; @@ -32232,21 +32228,7 @@ /* begin objectAfterWhileForwarding: */ header2 = longAt(oop); if ((header2 & MarkBit) == 0) { - /* begin objectAfter: */ - if (!(asserta(oopisLessThan(oop, GIV(freeStart))))) { - error("no objects after the end of memory"); - } - if (((longAt(oop)) & TypeMask) == HeaderTypeFree) { - sz2 = (longAt(oop)) & AllButTypeMask; - } - else { - /* begin sizeBitsOf: */ - header3 = longAt(oop); - sz2 = ((header3 & TypeMask) == HeaderTypeSizeAndClass - ? (longAt(oop - (BytesPerWord * 2))) & LongSizeMask - : header3 & SizeMask); - } - next = (oop + sz2) + (headerTypeBytes[(longAt(oop + sz2)) & TypeMask]); + next = ((sqInt) (objectAfter(oop))); goto l1; } fwdBlock1 = (header2 & AllButMarkBitAndTypeMask) << 1; @@ -32261,7 +32243,7 @@ else { sz1 = realHeader & SizeMask; } - next = (oop + sz1) + (headerTypeBytes[(longAt(oop + sz1)) & TypeMask]); + next = ((sqInt) ((oop + sz1) + (headerTypeBytes[(longAt(oop + sz1)) & TypeMask]))); l1: /* end objectAfterWhileForwarding: */; if (!(((longAt(oop)) & TypeMask) == HeaderTypeFree)) { @@ -32315,18 +32297,18 @@ } /* begin safeObjectAfter: */ if (((longAt(newFreeChunk)) & TypeMask) == HeaderTypeFree) { - sz3 = (longAt(newFreeChunk)) & AllButTypeMask; + sz2 = (longAt(newFreeChunk)) & AllButTypeMask; } else { /* begin sizeBitsOf: */ - header4 = longAt(newFreeChunk); - sz3 = ((header4 & TypeMask) == HeaderTypeSizeAndClass + header3 = longAt(newFreeChunk); + sz2 = ((header3 & TypeMask) == HeaderTypeSizeAndClass ? (longAt(newFreeChunk - (BytesPerWord * 2))) & LongSizeMask - : header4 & SizeMask); + : header3 & SizeMask); } - next = ((newFreeChunk + sz3) >= GIV(freeStart) + next = ((newFreeChunk + sz2) >= GIV(freeStart) ? GIV(freeStart) - : (newFreeChunk + sz3) + (headerTypeBytes[(longAt(newFreeChunk + sz3)) & TypeMask])); + : (newFreeChunk + sz2) + (headerTypeBytes[(longAt(newFreeChunk + sz2)) & TypeMask])); assert((next == GIV(freeStart)) || (next == (oopFromChunk(GIV(compEnd))))); if (next == GIV(freeStart)) { @@ -33476,10 +33458,11 @@ pinning. */ -void +sqInt pinObject(sqInt objOop) { DECL_MAYBE_SQ_GLOBAL_STRUCT GIV(primFailCode) = PrimErrUnsupported; + return 0; } @@ -34198,7 +34181,7 @@ given object or free chunk in memory. Return freeStart when enumeration is complete. This is for assertion checking only. */ -static sqInt +static usqInt safeObjectAfter(sqInt oop) { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt header; Modified: branches/Cog/src/vm/gcc3x-cointerpmt.c =================================================================== --- branches/Cog/src/vm/gcc3x-cointerpmt.c 2014-10-03 21:49:26 UTC (rev 3095) +++ branches/Cog/src/vm/gcc3x-cointerpmt.c 2014-10-05 21:56:54 UTC (rev 3096) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.887 uuid: f980d45a-5622-46f6-95d9-ac8d00a34e81 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.891 uuid: 2b1ec85c-bd1d-4299-938a-80aef455e476 from - CoInterpreterMT VMMaker.oscog-eem.887 uuid: f980d45a-5622-46f6-95d9-ac8d00a34e81 + CoInterpreterMT VMMaker.oscog-eem.891 uuid: 2b1ec85c-bd1d-4299-938a-80aef455e476 */ -static char __buildInfo[] = "CoInterpreterMT VMMaker.oscog-eem.887 uuid: f980d45a-5622-46f6-95d9-ac8d00a34e81 " __DATE__ ; +static char __buildInfo[] = "CoInterpreterMT VMMaker.oscog-eem.891 uuid: 2b1ec85c-bd1d-4299-938a-80aef455e476 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -924,7 +924,7 @@ sqInt objectAfter(sqInt oop); static sqInt okayOop(sqInt signedOop) NoDbgRegParms; static sqInt oopHasAcceptableClass(sqInt signedOop) NoDbgRegParms; -void pinObject(sqInt objOop); +sqInt pinObject(sqInt objOop); static sqInt prepareForwardingTableForBecomingwithtwoWay(sqInt array1, sqInt array2, sqInt twoWayFlag) NoDbgRegParms; void printMemory(void); void printObjectsFromto(sqInt startAddress, sqInt endAddress); @@ -2173,7 +2173,7 @@ /* 574 */ (void (*)(void))0, /* 575 */ (void (*)(void))0, 0 }; -const char *interpreterVersion = "Croquet Closure Cog MT VM [CoInterpreterMT VMMaker.oscog-eem.887]"; +const char *interpreterVersion = "Croquet Closure Cog MT VM [CoInterpreterMT VMMaker.oscog-eem.891]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; sqInt willNotThreadWarnCount; @@ -28653,16 +28653,15 @@ } -/* Pin or unpin the receiver, i.e. make it immobile or mobile. Answer whether - the object was - already pinned. N.B. pinning does *not* prevent an object from being - garbage collected. */ +/* Pin or unpin the receiver, i.e. make it immobile or mobile, based on the + argument. Answer whether the object was already pinned. N.B. pinning does + *not* prevent + an object from being garbage collected. */ static void primitivePin(void) { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt boolean; - sqInt failure; sqInt obj; char *sp; sqInt wasPinned; @@ -28687,10 +28686,9 @@ return; } wasPinned = GIV(falseObj); - /* begin pinObject: */ - GIV(primFailCode) = PrimErrUnsupported; - if (failure != 0) { - (GIV(primFailCode) = failure); + if (((boolean == GIV(trueObj)) + && (pinObject(obj))) == 0) { + (GIV(primFailCode) = PrimErrNoMemory); return; } @@ -35793,10 +35791,11 @@ pinning. */ -void +sqInt pinObject(sqInt objOop) { DECL_MAYBE_SQ_GLOBAL_STRUCT GIV(primFailCode) = PrimErrUnsupported; + return 0; } Modified: branches/Cog/stacksrc/vm/gcc3x-interp.c =================================================================== --- branches/Cog/stacksrc/vm/gcc3x-interp.c 2014-10-03 21:49:26 UTC (rev 3095) +++ branches/Cog/stacksrc/vm/gcc3x-interp.c 2014-10-05 21:56:54 UTC (rev 3096) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.887 uuid: f980d45a-5622-46f6-95d9-ac8d00a34e81 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.891 uuid: 2b1ec85c-bd1d-4299-938a-80aef455e476 from - StackInterpreter VMMaker.oscog-eem.887 uuid: f980d45a-5622-46f6-95d9-ac8d00a34e81 + StackInterpreter VMMaker.oscog-eem.891 uuid: 2b1ec85c-bd1d-4299-938a-80aef455e476 */ -static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.887 uuid: f980d45a-5622-46f6-95d9-ac8d00a34e81 " __DATE__ ; +static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.891 uuid: 2b1ec85c-bd1d-4299-938a-80aef455e476 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -597,7 +597,7 @@ sqInt objectAfter(sqInt oop); static sqInt okayOop(sqInt signedOop) NoDbgRegParms; static sqInt oopHasAcceptableClass(sqInt signedOop) NoDbgRegParms; -void pinObject(sqInt objOop); +sqInt pinObject(sqInt objOop); static sqInt prepareForwardingTableForBecomingwithtwoWay(sqInt array1, sqInt array2, sqInt twoWayFlag) NoDbgRegParms; void printMemory(void); void printObjectsFromto(sqInt startAddress, sqInt endAddress); @@ -1858,7 +1858,7 @@ 0 }; char * breakSelector; sqInt breakSelectorLength = -1; -const char *interpreterVersion = "Croquet Closure Stack VM [StackInterpreterPrimitives VMMaker.oscog-eem.887]"; +const char *interpreterVersion = "Croquet Closure Stack VM [StackInterpreterPrimitives VMMaker.oscog-eem.891]"; volatile int sendTrace; sqInt suppressHeartbeatFlag; @@ -16359,16 +16359,15 @@ } -/* Pin or unpin the receiver, i.e. make it immobile or mobile. Answer whether - the object was - already pinned. N.B. pinning does *not* prevent an object from being - garbage collected. */ +/* Pin or unpin the receiver, i.e. make it immobile or mobile, based on the + argument. Answer whether the object was already pinned. N.B. pinning does + *not* prevent + an object from being garbage collected. */ static void primitivePin(void) { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt boolean; - sqInt failure; sqInt obj; char *sp; sqInt wasPinned; @@ -16393,10 +16392,9 @@ return; } @@ Diff output truncated at 50000 characters. @@

1 0

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

05 Oct '14

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.891.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.891 Author: eem Time: 5 October 2014, 2:34:42.815 pm UUID: 2b1ec85c-bd1d-4299-938a-80aef455e476 Ancestors: VMMaker.oscog-eem.890 Fix compilatiom of v3 VMs (fix v3 pinObject: type). Fix Squeak V3 checkValidInlineCacheTag: (SmallInteger 0 is a valid cache tag). =============== Diff against VMMaker.oscog-eem.890 =============== Item was changed: ----- Method: CogObjectRepresentationForSqueakV3>>checkValidInlineCacheTag: (in category 'garbage collection') ----- checkValidInlineCacheTag: cacheTag + ^cacheTag = ConstZero + or: [((cacheTag bitAnd: 1 << ShiftForWord - 1) = 0 + and: [cacheTag - ^((cacheTag bitAnd: 1 << ShiftForWord - 1) = 0 - and: [cacheTag between: 1 << objectMemory compactClassFieldLSB and: (objectMemory compactClassIndexOfHeader: -1) << objectMemory compactClassFieldLSB]) + or: [self checkValidObjectReference: cacheTag]]! - or: [self checkValidObjectReference: cacheTag]! Item was changed: ----- Method: NewObjectMemory>>pinObject: (in category 'primitive support') ----- pinObject: objOop "For forward-compatibility with Spur. Fail; ObjectMemory does not support pinning." <api> + coInterpreter primitiveFailFor: PrimErrUnsupported. + ^0! - coInterpreter primitiveFailFor: PrimErrUnsupported!

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

Vm-dev October 2014