Revision: 3182 Author: eliot Date: 2014-12-12 20:15:40 -0800 (Fri, 12 Dec 2014) Log Message: ----------- CogVM source as per VMMaker.oscog-eem.984 Hack fix generateIntegerObjectOf:on:indent: for 64 bits. Add code to dump register state on linux x64 Modified Paths: -------------- branches/Cog/platforms/unix/vm/sqUnixMain.c branches/Cog/spurstack64src/vm/gcc3x-interp.c branches/Cog/spurstack64src/vm/interp.c Property Changed: ---------------- branches/Cog/platforms/Cross/vm/sqSCCSVersion.h Property changes on: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h ___________________________________________________________________ Modified: checkindate - Fri Dec 12 19:17:46 PST 2014 + Fri Dec 12 20:15:46 PST 2014 Modified: branches/Cog/platforms/unix/vm/sqUnixMain.c =================================================================== --- branches/Cog/platforms/unix/vm/sqUnixMain.c 2014-12-13 03:18:47 UTC (rev 3181) +++ branches/Cog/platforms/unix/vm/sqUnixMain.c 2014-12-13 04:15:40 UTC (rev 3182) @@ -897,6 +897,19 @@ regs->mc_edi, regs->mc_edi, regs->mc_ebp, regs->mc_esp, regs->mc_eip); return regs->mc_eip; +#elif __linux__ && __x86_64__ + gregset_t *regs = &uap->uc_mcontext.gregs; + printf( "\trax 0x%08x rbx 0x%08x rcx 0x%08x rdx 0x%08x\n" + "\trdi 0x%08x rsi 0x%08x rbp 0x%08x rsp 0x%08x\n" + "\tr8 0x%08x r9 0x%08x r10 0x%08x r11 0x%08x\n" + "\tr12 0x%08x r13 0x%08x r14 0x%08x r15 0x%08x\n" + "\trip 0x%08x\n", + regs[REG_RAX], regs[REG_RBX], regs[REG_RCX], regs[REG_RDX], + regs[REG_RDI], regs[REG_RDI], regs[REG_RBP], regs[REG_RSP], + regs[REG_R8 ], regs[REG_R9 ], regs[REG_R10], regs[REG_R11], + regs[REG_R12], regs[REG_R13], regs[REG_R14], regs[REG_R15], + regs[REG_RIP]); + return regs[REG_RIP]; #else printf("don't know how to derive register state from a ucontext_t on this platform\n"); return 0; Modified: branches/Cog/spurstack64src/vm/gcc3x-interp.c =================================================================== --- branches/Cog/spurstack64src/vm/gcc3x-interp.c 2014-12-13 03:18:47 UTC (rev 3181) +++ branches/Cog/spurstack64src/vm/gcc3x-interp.c 2014-12-13 04:15:40 UTC (rev 3182) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.980 uuid: 3d7d339f-6a22-4bd1-b959-cddf9c41cc60 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.984 uuid: 82523b67-016c-4327-b41e-658b54a99470 from - StackInterpreter VMMaker.oscog-eem.980 uuid: 3d7d339f-6a22-4bd1-b959-cddf9c41cc60 + StackInterpreter VMMaker.oscog-eem.984 uuid: 82523b67-016c-4327-b41e-658b54a99470 */ -static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.980 uuid: 3d7d339f-6a22-4bd1-b959-cddf9c41cc60 " __DATE__ ; +static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.984 uuid: 82523b67-016c-4327-b41e-658b54a99470 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2116,7 +2116,7 @@ /* 574 */ (void (*)(void))0, /* 575 */ (void (*)(void))0, 0 }; -const char *interpreterVersion = "Croquet Closure Stack VM [StackInterpreterPrimitives VMMaker.oscog-eem.980]"; +const char *interpreterVersion = "Croquet Closure Stack VM [StackInterpreterPrimitives VMMaker.oscog-eem.984]"; volatile int sendTrace; sqInt suppressHeartbeatFlag; @@ -5589,7 +5589,7 @@ 1; goto l114; } - longAtPointerput(localSP, (((localPrimIndex - 261) << 1) | 1)); + longAtPointerput(localSP, (((localPrimIndex - 261) << 3) | 1)); 1; l114: /* end internalQuickPrimitiveResponse */; goto l111; @@ -5703,7 +5703,7 @@ goto l110; } } - errorCode = ((GIV(primFailCode) << 1) | 1); + errorCode = ((GIV(primFailCode) << 3) | 1); l110: /* end getErrorObjectFromPrimFailCode */; longAtPointerput(localSP, errorCode); } @@ -5839,7 +5839,7 @@ } if (byte3 == StackPointerIndex) { assert((ReceiverIndex + (stackPointerIndexForFrame(spouseFP))) < (lengthOf(rcvr1))); - object1 = (((stackPointerIndexForFrame(spouseFP)) << 1) | 1); + object1 = (((stackPointerIndexForFrame(spouseFP)) << 3) | 1); goto l6; } if (byte3 == InstructionPointerIndex) { @@ -6439,10 +6439,10 @@ longAtput((newClosure1 + BaseHeaderSize) + (ClosureOuterContextIndex << (shiftForWord())), context); /* begin storePointerUnchecked:ofObject:withValue: */ assert(!(isForwarded(newClosure1))); - longAtput((newClosure1 + BaseHeaderSize) + (ClosureStartPCIndex << (shiftForWord())), ((initialIP << 1) | 1)); + longAtput((newClosure1 + BaseHeaderSize) + (ClosureStartPCIndex << (shiftForWord())), ((initialIP << 3) | 1)); /* begin storePointerUnchecked:ofObject:withValue: */ assert(!(isForwarded(newClosure1))); - longAtput((newClosure1 + BaseHeaderSize) + (ClosureNumArgsIndex << (shiftForWord())), ((numArgs << 1) | 1)); + longAtput((newClosure1 + BaseHeaderSize) + (ClosureNumArgsIndex << (shiftForWord())), ((numArgs << 3) | 1)); newClosure = newClosure1; if (numCopied > 0) { for (i = 0; i < numCopied; i += 1) { @@ -6733,7 +6733,7 @@ result = ((rcvr >> 3)) + ((arg >> 3)); if ((((((usqInt) result) >> 60) + 1) & 15) <= 1) { /* begin internalPop:thenPush: */ - longAtPointerput((localSP += (2 - 1) * BytesPerOop), ((result << 1) | 1)); + longAtPointerput((localSP += (2 - 1) * BytesPerOop), ((result << 3) | 1)); /* begin fetchNextBytecode */ currentBytecode = byteAtPointer(++localIP); @@ -6803,7 +6803,7 @@ result = ((rcvr >> 3)) - ((arg >> 3)); if ((((((usqInt) result) >> 60) + 1) & 15) <= 1) { /* begin internalPop:thenPush: */ - longAtPointerput((localSP += (2 - 1) * BytesPerOop), ((result << 1) | 1)); + longAtPointerput((localSP += (2 - 1) * BytesPerOop), ((result << 3) | 1)); /* begin fetchNextBytecode */ currentBytecode = byteAtPointer(++localIP); @@ -7336,7 +7336,7 @@ || (((result / arg) == rcvr) && ((((((usqInt) result) >> 60) + 1) & 15) <= 1))) { /* begin internalPop:thenPush: */ - longAtPointerput((localSP += (2 - 1) * BytesPerOop), ((result << 1) | 1)); + longAtPointerput((localSP += (2 - 1) * BytesPerOop), ((result << 3) | 1)); /* begin fetchNextBytecode */ currentBytecode = byteAtPointer(++localIP); @@ -7413,7 +7413,7 @@ result = rcvr / arg; if ((((((usqInt) result) >> 60) + 1) & 15) <= 1) { /* begin internalPop:thenPush: */ - longAtPointerput((localSP += (2 - 1) * BytesPerOop), ((result << 1) | 1)); + longAtPointerput((localSP += (2 - 1) * BytesPerOop), ((result << 3) | 1)); /* begin fetchNextBytecode */ currentBytecode = byteAtPointer(++localIP); @@ -7486,7 +7486,7 @@ mod = doPrimitiveModby(longAtPointer(localSP + (1 * BytesPerOop)), longAtPointer(localSP + (0 * BytesPerOop))); if (!GIV(primFailCode)) { /* begin internalPop:thenPush: */ - longAtPointerput((localSP += (2 - 1) * BytesPerOop), ((mod << 1) | 1)); + longAtPointerput((localSP += (2 - 1) * BytesPerOop), ((mod << 3) | 1)); /* begin fetchNextBytecode */ currentBytecode = byteAtPointer(++localIP); @@ -7576,10 +7576,10 @@ l51: /* end eeInstantiateSmallClass:numSlots: */; /* begin storePointerUnchecked:ofObject:withValue: */ assert(!(isForwarded(pointResult))); - longAtput((pointResult + BaseHeaderSize) + (XIndex << (shiftForWord())), ((((rcvr >> 3)) << 1) | 1)); + longAtput((pointResult + BaseHeaderSize) + (XIndex << (shiftForWord())), ((((rcvr >> 3)) << 3) | 1)); /* begin storePointerUnchecked:ofObject:withValue: */ assert(!(isForwarded(pointResult))); - longAtput((pointResult + BaseHeaderSize) + (YIndex << (shiftForWord())), ((((argument >> 3)) << 1) | 1)); + longAtput((pointResult + BaseHeaderSize) + (YIndex << (shiftForWord())), ((((argument >> 3)) << 3) | 1)); pt = pointResult; } else { @@ -7621,10 +7621,10 @@ l48: /* end eeInstantiateSmallClass:numSlots: */; /* begin storePointerUnchecked:ofObject:withValue: */ assert(!(isForwarded(pointResult1))); - longAtput((pointResult1 + BaseHeaderSize) + (XIndex << (shiftForWord())), ((((rcvr >> 3)) << 1) | 1)); + longAtput((pointResult1 + BaseHeaderSize) + (XIndex << (shiftForWord())), ((((rcvr >> 3)) << 3) | 1)); /* begin storePointerUnchecked:ofObject:withValue: */ assert(!(isForwarded(pointResult1))); - longAtput((pointResult1 + BaseHeaderSize) + (YIndex << (shiftForWord())), ((0 << 1) | 1)); + longAtput((pointResult1 + BaseHeaderSize) + (YIndex << (shiftForWord())), ((0 << 3) | 1)); pt = pointResult1; /* begin storePointer:ofObject:withValue: */ valuePointer = longAt(GIV(stackPointer) + (0 * BytesPerWord)); @@ -7697,10 +7697,10 @@ l50: /* end eeInstantiateSmallClass:numSlots: */; /* begin storePointerUnchecked:ofObject:withValue: */ assert(!(isForwarded(pointResult2))); - longAtput((pointResult2 + BaseHeaderSize) + (XIndex << (shiftForWord())), ((0 << 1) | 1)); + longAtput((pointResult2 + BaseHeaderSize) + (XIndex << (shiftForWord())), ((0 << 3) | 1)); /* begin storePointerUnchecked:ofObject:withValue: */ assert(!(isForwarded(pointResult2))); - longAtput((pointResult2 + BaseHeaderSize) + (YIndex << (shiftForWord())), ((0 << 1) | 1)); + longAtput((pointResult2 + BaseHeaderSize) + (YIndex << (shiftForWord())), ((0 << 3) | 1)); pt = pointResult2; /* begin storePointer:ofObject:withValue: */ valuePointer1 = longAt(GIV(stackPointer) + (1 * BytesPerWord)); @@ -7822,7 +7822,7 @@ shifted = ((usqInt) integerReceiver) >> (0 - integerArgument); } shifted = ((((((usqInt) shifted) >> 60) + 1) & 15) <= 1 - ? ((shifted << 1) | 1) + ? ((shifted << 3) | 1) : signed64BitIntegerFor(shifted)); /* begin pop:thenPush: */ longAtput((sp = GIV(stackPointer) + ((2 - 1) * BytesPerWord)), shifted); @@ -7857,7 +7857,7 @@ quotient = doPrimitiveDivby(longAtPointer(localSP + (1 * BytesPerOop)), longAtPointer(localSP + (0 * BytesPerOop))); if (!GIV(primFailCode)) { /* begin internalPop:thenPush: */ - longAtPointerput((localSP += (2 - 1) * BytesPerOop), ((quotient << 1) | 1)); + longAtPointerput((localSP += (2 - 1) * BytesPerOop), ((quotient << 3) | 1)); /* begin fetchNextBytecode */ currentBytecode = byteAtPointer(++localIP); @@ -8214,7 +8214,7 @@ else { if ((fmt2 < 24) || (((index >> 3)) >= ((((literalCountOf(rcvr)) + LiteralStart) * BytesPerOop) + 1))) { - result = (((byteAt((rcvr + BaseHeaderSize) + (((index >> 3)) - 1))) << 1) | 1); + result = (((byteAt((rcvr + BaseHeaderSize) + (((index >> 3)) - 1))) << 3) | 1); goto l58; } } @@ -8587,7 +8587,7 @@ } sz = (numSlots << ((shiftForWord()) - 2)) - (((((usqInt) (longAt(rcvr))) >> 24) & 0x1F) & 1); l87: /* end lengthOf:format: */; - longAtPointerput(localSP, ((sz << 1) | 1)); + longAtPointerput(localSP, ((sz << 3) | 1)); /* begin fetchNextBytecode */ currentBytecode = byteAtPointer(++localIP); @@ -8630,7 +8630,7 @@ } sz = (numSlots2 << ((shiftForWord()) - 2)) - (((((usqInt) (longAt(rcvr))) >> 24) & 0x1F) & 1); l89: /* end lengthOf:format: */; - longAtPointerput(localSP, ((sz << 1) | 1)); + longAtPointerput(localSP, ((sz << 3) | 1)); /* begin fetchNextBytecode */ currentBytecode = byteAtPointer(++localIP); @@ -9231,7 +9231,7 @@ if (isNegative) { smallVal = 0 - smallVal; } - return ((smallVal << 1) | 1); + return ((smallVal << 3) | 1); } largeClass = (isNegative ? (/* begin knownClassAtIndex: */ @@ -9523,7 +9523,7 @@ if (!GIV(primFailCode)) { if ((((((usqInt) integerResult) >> 60) + 1) & 15) <= 1) { /* begin pop:thenPush: */ - longAtput((sp = GIV(stackPointer) + ((2 - 1) * BytesPerWord)), ((integerResult << 1) | 1)); + longAtput((sp = GIV(stackPointer) + ((2 - 1) * BytesPerWord)), ((integerResult << 3) | 1)); GIV(stackPointer) = sp; } else { @@ -10054,7 +10054,7 @@ goto l7; } if (fmt >= 16) { - result = (((byteAt((rcvr + BaseHeaderSize) + ((index + fixedFields) - 1))) << 1) | 1); + result = (((byteAt((rcvr + BaseHeaderSize) + ((index + fixedFields) - 1))) << 3) | 1); goto l7; } result = positive32BitIntegerFor(long32At((rcvr + BaseHeaderSize) + (((index + fixedFields) - 1) << 2))); @@ -10631,7 +10631,7 @@ l1: /* end ensureBehaviorHash: */; if (hashOrError >= 0) { /* begin pop:thenPushInteger: */ - longAtput((sp = GIV(stackPointer) + (((GIV(argumentCount) + 1) - 1) * BytesPerWord)), ((hashOrError << 1) | 1)); + longAtput((sp = GIV(stackPointer) + (((GIV(argumentCount) + 1) - 1) * BytesPerWord)), ((hashOrError << 3) | 1)); GIV(stackPointer) = sp; } else { @@ -10813,7 +10813,7 @@ shifted = ((usqInt) integerReceiver) >> (0 - integerArgument); } shifted = ((((((usqInt) shifted) >> 60) + 1) & 15) <= 1 - ? ((shifted << 1) | 1) + ? ((shifted << 3) | 1) : signed64BitIntegerFor(shifted)); /* begin pop:thenPush: */ longAtput((sp = GIV(stackPointer) + ((2 - 1) * BytesPerWord)), shifted); @@ -10975,7 +10975,7 @@ /* old behavior - just return the size of free memory */ /* begin pop:thenPushInteger: */ - longAtput((sp = GIV(stackPointer) + ((1 - 1) * BytesPerWord)), ((GIV(totalFreeOldSpace) << 1) | 1)); + longAtput((sp = GIV(stackPointer) + ((1 - 1) * BytesPerWord)), ((GIV(totalFreeOldSpace) << 3) | 1)); GIV(stackPointer) = sp; return; } @@ -11005,7 +11005,7 @@ if (!GIV(primFailCode)) { /* begin pop:thenPushInteger: */ integerVal = (((GIV(totalFreeOldSpace) + ((((eden()).limit)) - GIV(freeStart))) + ((((pastSpace()).limit)) - GIV(pastSpaceStart))) + ((((futureSpace()).limit)) - (((futureSpace()).limit)))) - (interpreterAllocationReserveBytes()); - longAtput((sp1 = GIV(stackPointer) + ((2 - 1) * BytesPerWord)), ((integerVal << 1) | 1)); + longAtput((sp1 = GIV(stackPointer) + ((2 - 1) * BytesPerWord)), ((integerVal << 3) | 1)); GIV(stackPointer) = sp1; return; } @@ -11157,7 +11157,7 @@ /* the Character must be the receiver for safety */ characterCode = (CharacterTable == null - ? (((((usqInt) (((usqInt)characterObject))) >> 3) << 1) | 1) + ? (((((usqInt) (((usqInt)characterObject))) >> 3) << 3) | 1) : longAt((characterObject + BaseHeaderSize) + (CharacterValueIndex << (shiftForWord())))); /* begin pop:thenPush: */ longAtput((sp = GIV(stackPointer) + ((1 - 1) * BytesPerWord)), characterCode); @@ -11392,7 +11392,7 @@ } /* begin storePointerUnchecked:ofObject:withValue: */ assert(!(isForwarded(GIV(remapBuffer)[GIV(remapBufferCount)]))); - longAtput(((GIV(remapBuffer)[GIV(remapBufferCount)]) + BaseHeaderSize) + (0 << (shiftForWord())), ((runInNOut << 1) | 1)); + longAtput(((GIV(remapBuffer)[GIV(remapBufferCount)]) + BaseHeaderSize) + (0 << (shiftForWord())), ((runInNOut << 3) | 1)); v1 = positive32BitIntegerFor(((usqInt)usecs)); v2 = positive32BitIntegerFor(((usqInt)msecs)); if (GIV(primFailCode)) { @@ -11423,7 +11423,7 @@ longAtput(((GIV(remapBuffer)[GIV(remapBufferCount)]) + BaseHeaderSize) + (1 << (shiftForWord())), v1); /* begin storePointerUnchecked:ofObject:withValue: */ assert(!(isForwarded(GIV(remapBuffer)[GIV(remapBufferCount)]))); - longAtput(((GIV(remapBuffer)[GIV(remapBufferCount)]) + BaseHeaderSize) + (2 << (shiftForWord())), ((uidx << 1) | 1)); + longAtput(((GIV(remapBuffer)[GIV(remapBufferCount)]) + BaseHeaderSize) + (2 << (shiftForWord())), ((uidx << 3) | 1)); /* begin storePointer:ofObject:withValue: */ assert(!(isForwarded(GIV(remapBuffer)[GIV(remapBufferCount)]))); if (isOldObject(GIV(remapBuffer)[GIV(remapBufferCount)])) { @@ -11441,7 +11441,7 @@ longAtput(((GIV(remapBuffer)[GIV(remapBufferCount)]) + BaseHeaderSize) + (3 << (shiftForWord())), v2); /* begin storePointerUnchecked:ofObject:withValue: */ assert(!(isForwarded(GIV(remapBuffer)[GIV(remapBufferCount)]))); - longAtput(((GIV(remapBuffer)[GIV(remapBufferCount)]) + BaseHeaderSize) + (4 << (shiftForWord())), ((midx << 1) | 1)); + longAtput(((GIV(remapBuffer)[GIV(remapBufferCount)]) + BaseHeaderSize) + (4 << (shiftForWord())), ((midx << 3) | 1)); /* begin pop:thenPush: */ /* begin popRemappableOop */ oop2 = GIV(remapBuffer)[GIV(remapBufferCount)]; @@ -12052,7 +12052,7 @@ } numSamples = ioControlNewProfile(onOffBar,bufferSize); /* begin pop:thenPushInteger: */ - longAtput((sp = GIV(stackPointer) + ((3 - 1) * BytesPerWord)), ((numSamples << 1) | 1)); + longAtput((sp = GIV(stackPointer) + ((3 - 1) * BytesPerWord)), ((numSamples << 3) | 1)); GIV(stackPointer) = sp; } @@ -12266,7 +12266,7 @@ if (!GIV(primFailCode)) { if ((((((usqInt) quotient) >> 60) + 1) & 15) <= 1) { /* begin pop:thenPush: */ - longAtput((sp = GIV(stackPointer) + ((2 - 1) * BytesPerWord)), ((quotient << 1) | 1)); + longAtput((sp = GIV(stackPointer) + ((2 - 1) * BytesPerWord)), ((quotient << 3) | 1)); GIV(stackPointer) = sp; } else { @@ -12329,7 +12329,7 @@ if (!GIV(primFailCode)) { if ((((((usqInt) (integerReceiver / integerArgument)) >> 60) + 1) & 15) <= 1) { /* begin pop:thenPush: */ - longAtput((sp = GIV(stackPointer) + ((2 - 1) * BytesPerWord)), (((integerReceiver / integerArgument) << 1) | 1)); + longAtput((sp = GIV(stackPointer) + ((2 - 1) * BytesPerWord)), (((integerReceiver / integerArgument) << 3) | 1)); GIV(stackPointer) = sp; } else { @@ -12680,7 +12680,7 @@ frac = frexp(rcvr, &pwr); /* begin pushInteger: */ /* begin push: */ - longAtput((sp = GIV(stackPointer) - BytesPerWord), (((pwr - 1) << 1) | 1)); + longAtput((sp = GIV(stackPointer) - BytesPerWord), (((pwr - 1) << 3) | 1)); GIV(stackPointer) = sp; null; } @@ -13751,7 +13751,7 @@ if ((((((usqInt) (evtBuf[0])) >> 60) + 1) & 15) <= 1) { /* begin storePointerUnchecked:ofObject:withValue: */ assert(!(isForwarded(arg))); - longAtput((arg + BaseHeaderSize) + (0 << (shiftForWord())), (((evtBuf[0]) << 1) | 1)); + longAtput((arg + BaseHeaderSize) + (0 << (shiftForWord())), (((evtBuf[0]) << 3) | 1)); } else { /* begin primitiveFail */ @@ -13767,7 +13767,7 @@ if ((((((usqInt) ((evtBuf[1]) & MillisecondClockMask)) >> 60) + 1) & 15) <= 1) { /* begin storePointerUnchecked:ofObject:withValue: */ assert(!(isForwarded(arg))); - longAtput((arg + BaseHeaderSize) + (1 << (shiftForWord())), ((((evtBuf[1]) & MillisecondClockMask) << 1) | 1)); + longAtput((arg + BaseHeaderSize) + (1 << (shiftForWord())), ((((evtBuf[1]) & MillisecondClockMask) << 3) | 1)); } else { /* begin primitiveFail */ @@ -13786,7 +13786,7 @@ if ((((((usqInt) value) >> 60) + 1) & 15) <= 1) { /* begin storePointerUnchecked:ofObject:withValue: */ assert(!(isForwarded(arg))); - longAtput((arg + BaseHeaderSize) + (i << (shiftForWord())), ((value << 1) | 1)); + longAtput((arg + BaseHeaderSize) + (i << (shiftForWord())), ((value << 3) | 1)); } else { /* begin primitiveFail */ @@ -13920,10 +13920,10 @@ l1: /* end eeInstantiateSmallClass:numSlots: */; /* begin storePointerUnchecked:ofObject:withValue: */ assert(!(isForwarded(pointResult))); - longAtput((pointResult + BaseHeaderSize) + (XIndex << (shiftForWord())), ((w << 1) | 1)); + longAtput((pointResult + BaseHeaderSize) + (XIndex << (shiftForWord())), ((w << 3) | 1)); /* begin storePointerUnchecked:ofObject:withValue: */ assert(!(isForwarded(pointResult))); - longAtput((pointResult + BaseHeaderSize) + (YIndex << (shiftForWord())), ((h << 1) | 1)); + longAtput((pointResult + BaseHeaderSize) + (YIndex << (shiftForWord())), ((h << 3) | 1)); object = pointResult; longAtput((sp = GIV(stackPointer) - BytesPerWord), object); GIV(stackPointer) = sp; @@ -14121,7 +14121,7 @@ } else { /* begin pop:thenPushInteger: */ - longAtput((sp = GIV(stackPointer) + ((2 - 1) * BytesPerWord)), ((segSize << 1) | 1)); + longAtput((sp = GIV(stackPointer) + ((2 - 1) * BytesPerWord)), ((segSize << 3) | 1)); GIV(stackPointer) = sp; } } @@ -14248,7 +14248,7 @@ long32Atput(thisReceiver + 4, ((((long32At(thisReceiver + 4)) | 0x3FFFFF) - 0x3FFFFF)) + hash); } integerVal = hash; - longAtput((sp = GIV(stackPointer) + (((GIV(argumentCount) + 1) - 1) * BytesPerWord)), ((integerVal << 1) | 1)); + longAtput((sp = GIV(stackPointer) + (((GIV(argumentCount) + 1) - 1) * BytesPerWord)), ((integerVal << 3) | 1)); GIV(stackPointer) = sp; } } @@ -14386,7 +14386,7 @@ char *sp; /* begin pop:thenPushInteger: */ - longAtput((sp = GIV(stackPointer) + ((1 - 1) * BytesPerWord)), ((0 << 1) | 1)); + longAtput((sp = GIV(stackPointer) + ((1 - 1) * BytesPerWord)), ((0 << 3) | 1)); GIV(stackPointer) = sp; } @@ -14474,7 +14474,7 @@ if ((((((usqInt) value) >> 60) + 1) & 15) <= 1) { /* begin pushInteger: */ /* begin push: */ - longAtput((sp = GIV(stackPointer) - BytesPerWord), ((value << 1) | 1)); + longAtput((sp = GIV(stackPointer) - BytesPerWord), ((value << 3) | 1)); GIV(stackPointer) = sp; null; } @@ -14598,7 +14598,7 @@ return null; } /* begin pop:thenPush: */ - oop = (((ioHeartbeatMilliseconds()) << 1) | 1); + oop = (((ioHeartbeatMilliseconds()) << 3) | 1); longAtput((sp = GIV(stackPointer) + ((1 - 1) * BytesPerWord)), oop); GIV(stackPointer) = sp; } @@ -14833,7 +14833,7 @@ goto l2; } } - errorCode = ((GIV(primFailCode) << 1) | 1); + errorCode = ((GIV(primFailCode) << 3) | 1); l2: /* end getErrorObjectFromPrimFailCode */; longAtPointerput(GIV(stackPointer), errorCode); } @@ -14920,7 +14920,7 @@ if (keystrokeWord >= 0) { /* begin pushInteger: */ /* begin push: */ - longAtput((sp1 = GIV(stackPointer) - BytesPerWord), ((keystrokeWord << 1) | 1)); + longAtput((sp1 = GIV(stackPointer) - BytesPerWord), ((keystrokeWord << 3) | 1)); GIV(stackPointer) = sp1; null; } @@ -14952,7 +14952,7 @@ if (keystrokeWord >= 0) { /* begin pushInteger: */ /* begin push: */ - longAtput((sp1 = GIV(stackPointer) - BytesPerWord), ((keystrokeWord << 1) | 1)); + longAtput((sp1 = GIV(stackPointer) - BytesPerWord), ((keystrokeWord << 3) | 1)); GIV(stackPointer) = sp1; null; } @@ -15472,10 +15472,10 @@ l1: /* end eeInstantiateSmallClass:numSlots: */; /* begin storePointerUnchecked:ofObject:withValue: */ assert(!(isForwarded(pointResult))); - longAtput((pointResult + BaseHeaderSize) + (XIndex << (shiftForWord())), ((((rcvr >> 3)) << 1) | 1)); + longAtput((pointResult + BaseHeaderSize) + (XIndex << (shiftForWord())), ((((rcvr >> 3)) << 3) | 1)); /* begin storePointerUnchecked:ofObject:withValue: */ assert(!(isForwarded(pointResult))); - longAtput((pointResult + BaseHeaderSize) + (YIndex << (shiftForWord())), ((((argument >> 3)) << 1) | 1)); + longAtput((pointResult + BaseHeaderSize) + (YIndex << (shiftForWord())), ((((argument >> 3)) << 3) | 1)); pt = pointResult; } else { @@ -15517,10 +15517,10 @@ l2: /* end eeInstantiateSmallClass:numSlots: */; /* begin storePointerUnchecked:ofObject:withValue: */ assert(!(isForwarded(pointResult1))); - longAtput((pointResult1 + BaseHeaderSize) + (XIndex << (shiftForWord())), ((((rcvr >> 3)) << 1) | 1)); + longAtput((pointResult1 + BaseHeaderSize) + (XIndex << (shiftForWord())), ((((rcvr >> 3)) << 3) | 1)); /* begin storePointerUnchecked:ofObject:withValue: */ assert(!(isForwarded(pointResult1))); - longAtput((pointResult1 + BaseHeaderSize) + (YIndex << (shiftForWord())), ((0 << 1) | 1)); + longAtput((pointResult1 + BaseHeaderSize) + (YIndex << (shiftForWord())), ((0 << 3) | 1)); pt = pointResult1; /* begin storePointer:ofObject:withValue: */ valuePointer = longAt(GIV(stackPointer) + (0 * BytesPerWord)); @@ -15592,10 +15592,10 @@ l3: /* end eeInstantiateSmallClass:numSlots: */; /* begin storePointerUnchecked:ofObject:withValue: */ assert(!(isForwarded(pointResult2))); - longAtput((pointResult2 + BaseHeaderSize) + (XIndex << (shiftForWord())), ((0 << 1) | 1)); + longAtput((pointResult2 + BaseHeaderSize) + (XIndex << (shiftForWord())), ((0 << 3) | 1)); /* begin storePointerUnchecked:ofObject:withValue: */ assert(!(isForwarded(pointResult2))); - longAtput((pointResult2 + BaseHeaderSize) + (YIndex << (shiftForWord())), ((0 << 1) | 1)); + longAtput((pointResult2 + BaseHeaderSize) + (YIndex << (shiftForWord())), ((0 << 3) | 1)); pt = pointResult2; /* begin storePointer:ofObject:withValue: */ valuePointer1 = longAt(GIV(stackPointer) + (1 * BytesPerWord)); @@ -15641,7 +15641,7 @@ char *sp; /* begin pop:thenPushInteger: */ - longAtput((sp = GIV(stackPointer) + ((1 - 1) * BytesPerWord)), ((0x3FFFFF << 1) | 1)); + longAtput((sp = GIV(stackPointer) + ((1 - 1) * BytesPerWord)), ((0x3FFFFF << 3) | 1)); GIV(stackPointer) = sp; } @@ -15668,7 +15668,7 @@ char *sp; /* begin pop:thenPush: */ - oop = ((((ioMSecs()) & MillisecondClockMask) << 1) | 1); + oop = ((((ioMSecs()) & MillisecondClockMask) << 3) | 1); longAtput((sp = GIV(stackPointer) + ((1 - 1) * BytesPerWord)), oop); GIV(stackPointer) = sp; } @@ -15683,7 +15683,7 @@ char *sp; /* begin pop:thenPush: */ - longAtput((sp = GIV(stackPointer) + ((1 - 1) * BytesPerWord)), ((MillisecondClockMask << 1) | 1)); + longAtput((sp = GIV(stackPointer) + ((1 - 1) * BytesPerWord)), ((MillisecondClockMask << 3) | 1)); GIV(stackPointer) = sp; } @@ -15698,7 +15698,7 @@ if (!GIV(primFailCode)) { if ((((((usqInt) mod) >> 60) + 1) & 15) <= 1) { /* begin pop:thenPush: */ - longAtput((sp = GIV(stackPointer) + ((2 - 1) * BytesPerWord)), ((mod << 1) | 1)); + longAtput((sp = GIV(stackPointer) + ((2 - 1) * BytesPerWord)), ((mod << 3) | 1)); GIV(stackPointer) = sp; } else { @@ -15781,7 +15781,7 @@ buttonWord = ioGetButtonState(); /* begin pushInteger: */ /* begin push: */ - longAtput((sp = GIV(stackPointer) - BytesPerWord), ((buttonWord << 1) | 1)); + longAtput((sp = GIV(stackPointer) - BytesPerWord), ((buttonWord << 3) | 1)); GIV(stackPointer) = sp; null; } @@ -15870,10 +15870,10 @@ l3: /* end eeInstantiateSmallClass:numSlots: */; /* begin storePointerUnchecked:ofObject:withValue: */ assert(!(isForwarded(pointResult))); - longAtput((pointResult + BaseHeaderSize) + (XIndex << (shiftForWord())), ((x << 1) | 1)); + longAtput((pointResult + BaseHeaderSize) + (XIndex << (shiftForWord())), ((x << 3) | 1)); /* begin storePointerUnchecked:ofObject:withValue: */ assert(!(isForwarded(pointResult))); - longAtput((pointResult + BaseHeaderSize) + (YIndex << (shiftForWord())), ((y << 1) | 1)); + longAtput((pointResult + BaseHeaderSize) + (YIndex << (shiftForWord())), ((y << 3) | 1)); object = pointResult; longAtput((sp = GIV(stackPointer) - BytesPerWord), object); GIV(stackPointer) = sp; @@ -15932,7 +15932,7 @@ if (!GIV(primFailCode)) { if ((((((usqInt) integerResult) >> 60) + 1) & 15) <= 1) { /* begin pop:thenPush: */ - longAtput((sp = GIV(stackPointer) + ((2 - 1) * BytesPerWord)), ((integerResult << 1) | 1)); + longAtput((sp = GIV(stackPointer) + ((2 - 1) * BytesPerWord)), ((integerResult << 3) | 1)); GIV(stackPointer) = sp; } else { @@ -16532,7 +16532,7 @@ instance = accessibleObjectAfter(longAt(GIV(stackPointer))); if (instance == null) { /* begin pop:thenPushInteger: */ - longAtput((sp = GIV(stackPointer) + (((GIV(argumentCount) + 1) - 1) * BytesPerWord)), ((0 << 1) | 1)); + longAtput((sp = GIV(stackPointer) + (((GIV(argumentCount) + 1) - 1) * BytesPerWord)), ((0 << 3) | 1)); GIV(stackPointer) = sp; } else { @@ -16762,7 +16762,7 @@ char *sp; /* begin pop:thenPush: */ - oop = ((((ioOldMSecs()) & MillisecondClockMask) << 1) | 1); + oop = ((((ioOldMSecs()) & MillisecondClockMask) << 3) | 1); longAtput((sp = GIV(stackPointer) + ((1 - 1) * BytesPerWord)), oop); GIV(stackPointer) = sp; } @@ -16987,7 +16987,7 @@ longAtput((stack + BaseHeaderSize) + (stackp << (shiftForWord())), current); /* begin storePointerUnchecked:ofObject:withValue: */ assert(!(isForwarded(stack))); - longAtput((stack + BaseHeaderSize) + ((stackp + 1) << (shiftForWord())), ((index << 1) | 1)); + longAtput((stack + BaseHeaderSize) + ((stackp + 1) << (shiftForWord())), ((index << 3) | 1)); stackp += 2; if ((((((usqInt)(((char *) next)))) & (BytesPerWord - 1)) == 0) && ((((((usqInt)(((char *) next)))) >= (((usqInt)GIV(stackMemory)))) && ((((usqInt)(((char *) next)))) <= (((usqInt)GIV(pages))))))) { @@ -17409,7 +17409,7 @@ if (!GIV(primFailCode)) { if ((((((usqInt) integerResult) >> 60) + 1) & 15) <= 1) { /* begin pop:thenPush: */ - longAtput((sp = GIV(stackPointer) + ((2 - 1) * BytesPerWord)), ((integerResult << 1) | 1)); + longAtput((sp = GIV(stackPointer) + ((2 - 1) * BytesPerWord)), ((integerResult << 3) | 1)); GIV(stackPointer) = sp; } else { @@ -17812,7 +17812,7 @@ if ((((((usqInt) scanDestX) >> 60) + 1) & 15) <= 1) { /* begin storePointerUnchecked:ofObject:withValue: */ assert(!(isForwarded(rcvr))); - longAtput((rcvr + BaseHeaderSize) + (0 << (shiftForWord())), ((scanDestX << 1) | 1)); + longAtput((rcvr + BaseHeaderSize) + (0 << (shiftForWord())), ((scanDestX << 3) | 1)); } else { /* begin primitiveFail */ @@ -17825,7 +17825,7 @@ if ((((((usqInt) scanLastIndex) >> 60) + 1) & 15) <= 1) { /* begin storePointerUnchecked:ofObject:withValue: */ assert(!(isForwarded(rcvr))); - longAtput((rcvr + BaseHeaderSize) + (1 << (shiftForWord())), ((scanLastIndex << 1) | 1)); + longAtput((rcvr + BaseHeaderSize) + (1 << (shiftForWord())), ((scanLastIndex << 3) | 1)); } else { /* begin primitiveFail */ @@ -17879,7 +17879,7 @@ if ((((((usqInt) scanDestX) >> 60) + 1) & 15) <= 1) { /* begin storePointerUnchecked:ofObject:withValue: */ assert(!(isForwarded(rcvr))); - longAtput((rcvr + BaseHeaderSize) + (0 << (shiftForWord())), ((scanDestX << 1) | 1)); + longAtput((rcvr + BaseHeaderSize) + (0 << (shiftForWord())), ((scanDestX << 3) | 1)); } else { /* begin primitiveFail */ @@ -17892,7 +17892,7 @@ if ((((((usqInt) scanLastIndex) >> 60) + 1) & 15) <= 1) { /* begin storePointerUnchecked:ofObject:withValue: */ assert(!(isForwarded(rcvr))); - longAtput((rcvr + BaseHeaderSize) + (1 << (shiftForWord())), ((scanLastIndex << 1) | 1)); + longAtput((rcvr + BaseHeaderSize) + (1 << (shiftForWord())), ((scanLastIndex << 3) | 1)); } else { /* begin primitiveFail */ @@ -17920,7 +17920,7 @@ if ((((((usqInt) scanDestX) >> 60) + 1) & 15) <= 1) { /* begin storePointerUnchecked:ofObject:withValue: */ assert(!(isForwarded(rcvr))); - longAtput((rcvr + BaseHeaderSize) + (0 << (shiftForWord())), ((scanDestX << 1) | 1)); + longAtput((rcvr + BaseHeaderSize) + (0 << (shiftForWord())), ((scanDestX << 3) | 1)); } else { /* begin primitiveFail */ @@ -17933,7 +17933,7 @@ if ((((((usqInt) scanStopIndex) >> 60) + 1) & 15) <= 1) { /* begin storePointerUnchecked:ofObject:withValue: */ assert(!(isForwarded(rcvr))); - longAtput((rcvr + BaseHeaderSize) + (1 << (shiftForWord())), ((scanStopIndex << 1) | 1)); + longAtput((rcvr + BaseHeaderSize) + (1 << (shiftForWord())), ((scanStopIndex << 3) | 1)); } else { /* begin primitiveFail */ @@ -17968,7 +17968,7 @@ return null; } /* begin pop:thenPushInteger: */ - longAtput((sp = GIV(stackPointer) + ((1 - 1) * BytesPerWord)), ((depth << 1) | 1)); + longAtput((sp = GIV(stackPointer) + ((1 - 1) * BytesPerWord)), ((depth << 3) | 1)); GIV(stackPointer) = sp; } @@ -18030,10 +18030,10 @@ l1: /* end eeInstantiateSmallClass:numSlots: */; /* begin storePointerUnchecked:ofObject:withValue: */ assert(!(isForwarded(pointResult))); - longAtput((pointResult + BaseHeaderSize) + (XIndex << (shiftForWord())), ((((((usqInt) pointWord) >> 16) & 0xFFFF) << 1) | 1)); + longAtput((pointResult + BaseHeaderSize) + (XIndex << (shiftForWord())), ((((((usqInt) pointWord) >> 16) & 0xFFFF) << 3) | 1)); /* begin storePointerUnchecked:ofObject:withValue: */ assert(!(isForwarded(pointResult))); - longAtput((pointResult + BaseHeaderSize) + (YIndex << (shiftForWord())), (((pointWord & 0xFFFF) << 1) | 1)); + longAtput((pointResult + BaseHeaderSize) + (YIndex << (shiftForWord())), (((pointWord & 0xFFFF) << 3) | 1)); oop = pointResult; longAtput((sp = GIV(stackPointer) + ((1 - 1) * BytesPerWord)), oop); GIV(stackPointer) = sp; @@ -18243,7 +18243,7 @@ assert(((hash >= 0) && (hash <= (identityHashHalfWordMask())))); long32Atput(thisReceiver + 4, ((((long32At(thisReceiver + 4)) | 0x3FFFFF) - 0x3FFFFF)) + hash); /* begin pop:thenPushInteger: */ - longAtput((sp = GIV(stackPointer) + (((GIV(argumentCount) + 1) - 1) * BytesPerWord)), ((oldHash << 1) | 1)); + longAtput((sp = GIV(stackPointer) + (((GIV(argumentCount) + 1) - 1) * BytesPerWord)), ((oldHash << 3) | 1)); GIV(stackPointer) = sp; } } @@ -18500,7 +18500,7 @@ value = shortAt((rcvr + BaseHeaderSize) + ((index - 1) << 1)); null; /* begin pop:thenPushInteger: */ - longAtput((sp = GIV(stackPointer) + ((2 - 1) * BytesPerWord)), ((value << 1) | 1)); + longAtput((sp = GIV(stackPointer) + ((2 - 1) * BytesPerWord)), ((value << 3) | 1)); GIV(stackPointer) = sp; } @@ -18545,7 +18545,7 @@ } shortAtput((rcvr + BaseHeaderSize) + ((index - 1) << 1), value); /* begin pop:thenPush: */ - longAtput((sp = GIV(stackPointer) + ((3 - 1) * BytesPerWord)), ((value << 1) | 1)); + longAtput((sp = GIV(stackPointer) + ((3 - 1) * BytesPerWord)), ((value << 3) | 1)); GIV(stackPointer) = sp; } @@ -18816,7 +18816,7 @@ fixedFields = (((longAt((class + BaseHeaderSize) + (InstanceSpecificationIndex << (shiftForWord())))) >> 3)) & ((1 << 16) - 1); l4: /* end fixedFieldsOf:format:length: */; /* begin pop:thenPush: */ - longAtput((sp = GIV(stackPointer) + (((GIV(argumentCount) + 1) - 1) * BytesPerWord)), (((totalLength - fixedFields) << 1) | 1)); + longAtput((sp = GIV(stackPointer) + (((GIV(argumentCount) + 1) - 1) * BytesPerWord)), (((totalLength - fixedFields) << 3) | 1)); GIV(stackPointer) = sp; } @@ -18941,7 +18941,7 @@ return; } /* begin pop:thenPushInteger: */ - longAtput((sp1 = GIV(stackPointer) + ((1 - 1) * BytesPerWord)), ((byteSize << 1) | 1)); + longAtput((sp1 = GIV(stackPointer) + ((1 - 1) * BytesPerWord)), ((byteSize << 3) | 1)); GIV(stackPointer) = sp1; } @@ -19054,7 +19054,7 @@ /* begin pop:thenPushInteger: */ integerVal = (exponentOfSmallFloat(longAt(GIV(stackPointer)))) - 1; - longAtput((sp = GIV(stackPointer) + ((1 - 1) * BytesPerWord)), ((integerVal << 1) | 1)); + longAtput((sp = GIV(stackPointer) + ((1 - 1) * BytesPerWord)), ((integerVal << 3) | 1)); GIV(stackPointer) = sp; } @@ -19316,7 +19316,7 @@ modf(rcvr, (&trunc)); if (((trunc >= (((double) (MinSmallInteger) ))) && (trunc <= (((double) (MaxSmallInteger) ))))) { /* begin pop:thenPushInteger: */ - longAtput((sp = GIV(stackPointer) + ((1 - 1) * BytesPerWord)), (((((sqInt)trunc)) << 1) | 1)); + longAtput((sp = GIV(stackPointer) + ((1 - 1) * BytesPerWord)), (((((sqInt)trunc)) << 3) | 1)); GIV(stackPointer) = sp; } else { @@ -19649,7 +19649,7 @@ goto l7; } if (fmt >= 16) { - result = (((byteAt((rcvr + BaseHeaderSize) + ((index + fixedFields) - 1))) << 1) | 1); + result = (((byteAt((rcvr + BaseHeaderSize) + ((index + fixedFields) - 1))) << 3) | 1); goto l7; } result = positive32BitIntegerFor(long32At((rcvr + BaseHeaderSize) + (((index + fixedFields) - 1) << 2))); @@ -20204,7 +20204,7 @@ if (!GIV(primFailCode)) { if ((((((usqInt) integerResult) >> 60) + 1) & 15) <= 1) { /* begin pop:thenPush: */ - longAtput((sp = GIV(stackPointer) + ((2 - 1) * BytesPerWord)), ((integerResult << 1) | 1)); + longAtput((sp = GIV(stackPointer) + ((2 - 1) * BytesPerWord)), ((integerResult << 3) | 1)); GIV(stackPointer) = sp; } else { @@ -20654,7 +20654,7 @@ if (!GIV(primFailCode)) { /* begin pushInteger: */ /* begin push: */ - longAtput((sp = GIV(stackPointer) - BytesPerWord), (((((sqInt)trunc)) << 1) | 1)); + longAtput((sp = GIV(stackPointer) - BytesPerWord), (((((sqInt)trunc)) << 3) | 1)); GIV(stackPointer) = sp; null; } @@ -21034,7 +21034,7 @@ longAtput((resultArray + BaseHeaderSize) + (0 << (shiftForWord())), valuePointer); /* begin storePointerUnchecked:ofObject:withValue: */ assert(!(isForwarded(resultArray))); - longAtput((resultArray + BaseHeaderSize) + (1 << (shiftForWord())), ((offset << 1) | 1)); + longAtput((resultArray + BaseHeaderSize) + (1 << (shiftForWord())), ((offset << 3) | 1)); /* begin pop:thenPush: */ longAtput((sp = GIV(stackPointer) + ((1 - 1) * BytesPerWord)), resultArray); GIV(stackPointer) = sp; @@ -21137,7 +21137,7 @@ sampleBufferAddress = ((void *) (pointerForOop(sampleBuffer + BaseHeaderSize))); numSamples = ioNewProfileSamplesInto(sampleBufferAddress); /* begin pop:thenPushInteger: */ - longAtput((sp1 = GIV(stackPointer) + (((GIV(argumentCount) + 1) - 1) * BytesPerWord)), ((numSamples << 1) | 1)); + longAtput((sp1 = GIV(stackPointer) + (((GIV(argumentCount) + 1) - 1) * BytesPerWord)), ((numSamples << 3) | 1)); GIV(stackPointer) = sp1; } @@ -21159,7 +21159,7 @@ if ((((((usqInt) (excessSignals - 1)) >> 60) + 1) & 15) <= 1) { /* begin storePointerUnchecked:ofObject:withValue: */ assert(!(isForwarded(sema))); - longAtput((sema + BaseHeaderSize) + (ExcessSignalsIndex << (shiftForWord())), (((excessSignals - 1) << 1) | 1)); + longAtput((sema + BaseHeaderSize) + (ExcessSignalsIndex << (shiftForWord())), (((excessSignals - 1) << 3) | 1)); } else { /* begin primitiveFail */ @@ -25119,7 +25119,7 @@ /* can't split a single word */ freeObject(freeChunk); - return ((count << 1) | 1); + return ((count << 3) | 1); } if (count < 0xFF) { /* begin allocateSlots:format:classIndex: */ @@ -25440,7 +25440,7 @@ /* begin checkFreeSpace */ assert(bitsSetInFreeSpaceMaskForAllFreeLists()); assert(GIV(totalFreeOldSpace) == (totalFreeListBytes())); - return ((count << 1) | 1); + return ((count << 3) | 1); } bytes = (BaseHeaderSize + BaseHeaderSize) + (count * BytesPerOop); start = ((byteAt(freeChunk + 7)) == 0xFF @@ -34706,7 +34706,7 @@ if ((topOfObjStack(GIV(markStack))) != objToScan) { pushonObjStack(objToScan, GIV(markStack)); } - pushonObjStack(((index1 << 1) | 1), GIV(markStack)); + pushonObjStack(((index1 << 3) | 1), GIV(markStack)); } objToScan = field1; index1 = -1; @@ -34777,7 +34777,7 @@ pushonObjStack(field1, GIV(markStack)); if (((byteAt(field1 + 7)) > 64) && (((numStrongSlots = numStrongSlotsOfInephemeral(field1))) > 64)) { - pushonObjStack(((numStrongSlots << 1) | 1), GIV(markStack)); + pushonObjStack(((numStrongSlots << 3) | 1), GIV(markStack)); } l2: ; @@ -35016,7 +35016,7 @@ if ((topOfObjStack(GIV(markStack))) != objToScan) { pushonObjStack(objToScan, GIV(markStack)); } - pushonObjStack(((index << 1) | 1), GIV(markStack)); + pushonObjStack(((index << 3) | 1), GIV(markStack)); } objToScan = field; index = -1; @@ -35087,7 +35087,7 @@ pushonObjStack(field, GIV(markStack)); if (((byteAt(field + 7)) > 64) && (((numStrongSlots = numStrongSlotsOfInephemeral(field))) > 64)) { - pushonObjStack(((numStrongSlots << 1) | 1), GIV(markStack)); + pushonObjStack(((numStrongSlots << 3) | 1), GIV(markStack)); } l2: ; @@ -35342,7 +35342,7 @@ if ((topOfObjStack(GIV(markStack))) != objToScan) { pushonObjStack(objToScan, GIV(markStack)); } - pushonObjStack(((index << 1) | 1), GIV(markStack)); + pushonObjStack(((index << 3) | 1), GIV(markStack)); } objToScan = field; index = -1; @@ -35413,7 +35413,7 @@ pushonObjStack(field, GIV(markStack)); if (((byteAt(field + 7)) > 64) && (((numStrongSlots = numStrongSlotsOfInephemeral(field))) > 64)) { - pushonObjStack(((numStrongSlots << 1) | 1), GIV(markStack)); + pushonObjStack(((numStrongSlots << 3) | 1), GIV(markStack)); } l2: ; @@ -35994,7 +35994,7 @@ if ((topOfObjStack(GIV(markStack))) != objToScan2) { pushonObjStack(objToScan2, GIV(markStack)); } - pushonObjStack(((index2 << 1) | 1), GIV(markStack)); + pushonObjStack(((index2 << 3) | 1), GIV(markStack)); } objToScan2 = field2; index2 = -1; @@ -36064,7 +36064,7 @@ pushonObjStack(field2, GIV(markStack)); if (((byteAt(field2 + 7)) > 64) && (((numStrongSlots2 = numStrongSlotsOfInephemeral(field2))) > 64)) { - pushonObjStack(((numStrongSlots2 << 1) | 1), GIV(markStack)); + pushonObjStack(((numStrongSlots2 << 3) | 1), GIV(markStack)); } l4: ; } @@ -36270,7 +36270,7 @@ if ((topOfObjStack(GIV(markStack))) != objToScan1) { pushonObjStack(objToScan1, GIV(markStack)); } - pushonObjStack(((index1 << 1) | 1), GIV(markStack)); + pushonObjStack(((index1 << 3) | 1), GIV(markStack)); } objToScan1 = field1; index1 = -1; @@ -36340,7 +36340,7 @@ pushonObjStack(field1, GIV(markStack)); if (((byteAt(field1 + 7)) > 64) && (((numStrongSlots1 = numStrongSlotsOfInephemeral(field1))) > 64)) { - pushonObjStack(((numStrongSlots1 << 1) | 1), GIV(markStack)); + pushonObjStack(((numStrongSlots1 << 3) | 1), GIV(markStack)); } l6: ; } @@ -36554,7 +36554,7 @@ if ((topOfObjStack(GIV(markStack))) != objToScan) { pushonObjStack(objToScan, GIV(markStack)); } - pushonObjStack(((index << 1) | 1), GIV(markStack)); + pushonObjStack(((index << 3) | 1), GIV(markStack)); } objToScan = field; index = -1; @@ -36625,7 +36625,7 @@ pushonObjStack(field, GIV(markStack)); if (((byteAt(field + 7)) > 64) && (((numStrongSlots = numStrongSlotsOfInephemeral(field))) > 64)) { - pushonObjStack(((numStrongSlots << 1) | 1), GIV(markStack)); + pushonObjStack(((numStrongSlots << 3) | 1), GIV(markStack)); } l2: ; @@ -36835,7 +36835,7 @@ if ((topOfObjStack(GIV(markStack))) != objToScan6) { pushonObjStack(objToScan6, GIV(markStack)); } - pushonObjStack(((index6 << 1) | 1), GIV(markStack)); + pushonObjStack(((index6 << 3) | 1), GIV(markStack)); } objToScan6 = field6; index6 = -1; @@ -36906,7 +36906,7 @@ pushonObjStack(field6, GIV(markStack)); if (((byteAt(field6 + 7)) > 64) && (((numStrongSlots6 = numStrongSlotsOfInephemeral(field6))) > 64)) { - pushonObjStack(((numStrongSlots6 << 1) | 1), GIV(markStack)); + pushonObjStack(((numStrongSlots6 << 3) | 1), GIV(markStack)); } l21: ; @@ -37110,7 +37110,7 @@ if ((topOfObjStack(GIV(markStack))) != objToScan7) { pushonObjStack(objToScan7, GIV(markStack)); } - pushonObjStack(((index7 << 1) | 1), GIV(markStack)); + pushonObjStack(((index7 << 3) | 1), GIV(markStack)); } objToScan7 = field7; index7 = -1; @@ -37181,7 +37181,7 @@ pushonObjStack(field7, GIV(markStack)); if (((byteAt(field7 + 7)) > 64) && (((numStrongSlots7 = numStrongSlotsOfInephemeral(field7))) > 64)) { - pushonObjStack(((numStrongSlots7 << 1) | 1), GIV(markStack)); + pushonObjStack(((numStrongSlots7 << 3) | 1), GIV(markStack)); } l22: ; @@ -37418,7 +37418,7 @@ if ((topOfObjStack(GIV(markStack))) != objToScan22) { pushonObjStack(objToScan22, GIV(markStack)); } - pushonObjStack(((index22 << 1) | 1), GIV(markStack)); + pushonObjStack(((index22 << 3) | 1), GIV(markStack)); } objToScan22 = field22; index22 = -1; @@ -37489,7 +37489,7 @@ pushonObjStack(field22, GIV(markStack)); if (((byteAt(field22 + 7)) > 64) && (((numStrongSlots22 = numStrongSlotsOfInephemeral(field22))) > 64)) { - pushonObjStack(((numStrongSlots22 << 1) | 1), GIV(markStack)); + pushonObjStack(((numStrongSlots22 << 3) | 1), GIV(markStack)); } l80: ; @@ -37692,7 +37692,7 @@ if ((topOfObjStack(GIV(markStack))) != objToScan31) { pushonObjStack(objToScan31, GIV(markStack)); } - pushonObjStack(((index31 << 1) | 1), GIV(markStack)); + pushonObjStack(((index31 << 3) | 1), GIV(markStack)); } objToScan31 = field31; index31 = -1; @@ -37763,7 +37763,7 @@ pushonObjStack(field31, GIV(markStack)); if (((byteAt(field31 + 7)) > 64) && (((numStrongSlots31 = numStrongSlotsOfInephemeral(field31))) > 64)) { - pushonObjStack(((numStrongSlots31 << 1) | 1), GIV(markStack)); + pushonObjStack(((numStrongSlots31 << 3) | 1), GIV(markStack)); } l74: ; @@ -37966,7 +37966,7 @@ if ((topOfObjStack(GIV(markStack))) != objToScan41) { pushonObjStack(objToScan41, GIV(markStack)); } - pushonObjStack(((index41 << 1) | 1), GIV(markStack)); + pushonObjStack(((index41 << 3) | 1), GIV(markStack)); } objToScan41 = field41; index41 = -1; @@ -38037,7 +38037,7 @@ pushonObjStack(field41, GIV(markStack)); if (((byteAt(field41 + 7)) > 64) && (((numStrongSlots41 = numStrongSlotsOfInephemeral(field41))) > 64)) { - pushonObjStack(((numStrongSlots41 << 1) | 1), GIV(markStack)); + pushonObjStack(((numStrongSlots41 << 3) | 1), GIV(markStack)); } l65: ; @@ -38253,7 +38253,7 @@ if ((topOfObjStack(GIV(markStack))) != objToScan8) { pushonObjStack(objToScan8, GIV(markStack)); } - pushonObjStack(((index8 << 1) | 1), GIV(markStack)); + pushonObjStack(((index8 << 3) | 1), GIV(markStack)); } objToScan8 = field8; index8 = -1; @@ -38324,7 +38324,7 @@ pushonObjStack(field8, GIV(markStack)); if (((byteAt(field8 + 7)) > 64) && (((numStrongSlots8 = numStrongSlotsOfInephemeral(field8))) > 64)) { - pushonObjStack(((numStrongSlots8 << 1) | 1), GIV(markStack)); + pushonObjStack(((numStrongSlots8 << 3) | 1), GIV(markStack)); } l69: ; @@ -38539,7 +38539,7 @@ if ((topOfObjStack(GIV(markStack))) != objToScan12) { pushonObjStack(objToScan12, GIV(markStack)); } - pushonObjStack(((index12 << 1) | 1), GIV(markStack)); + pushonObjStack(((index12 << 3) | 1), GIV(markStack)); } objToScan12 = field12; index12 = -1; @@ -38610,7 +38610,7 @@ pushonObjStack(field12, GIV(markStack)); if (((byteAt(field12 + 7)) > 64) && (((numStrongSlots12 = numStrongSlotsOfInephemeral(field12))) > 64)) { - pushonObjStack(((numStrongSlots12 << 1) | 1), GIV(markStack)); + pushonObjStack(((numStrongSlots12 << 3) | 1), GIV(markStack)); } l62: ; @@ -38815,7 +38815,7 @@ if ((topOfObjStack(GIV(markStack))) != objToScan11) { pushonObjStack(objToScan11, GIV(markStack)); } - pushonObjStack(((index11 << 1) | 1), GIV(markStack)); + pushonObjStack(((index11 << 3) | 1), GIV(markStack)); } objToScan11 = field11; index11 = -1; @@ -38886,7 +38886,7 @@ pushonObjStack(field11, GIV(markStack)); if (((byteAt(field11 + 7)) > 64) && (((numStrongSlots11 = numStrongSlotsOfInephemeral(field11))) > 64)) { - pushonObjStack(((numStrongSlots11 << 1) | 1), GIV(markStack)); + pushonObjStack(((numStrongSlots11 << 3) | 1), GIV(markStack)); } l11: ; @@ -39091,7 +39091,7 @@ if ((topOfObjStack(GIV(markStack))) != objToScan21) { pushonObjStack(objToScan21, GIV(markStack)); } - pushonObjStack(((index21 << 1) | 1), GIV(markStack)); + pushonObjStack(((index21 << 3) | 1), GIV(markStack)); } objToScan21 = field21; index21 = -1; @@ -39162,7 +39162,7 @@ pushonObjStack(field21, GIV(markStack)); if (((byteAt(field21 + 7)) > 64) && (((numStrongSlots21 = numStrongSlotsOfInephemeral(field21))) > 64)) { - pushonObjStack(((numStrongSlots21 << 1) | 1), GIV(markStack)); + pushonObjStack(((numStrongSlots21 << 3) | 1), GIV(markStack)); } l13: ; @@ -39368,7 +39368,7 @@ if ((topOfObjStack(GIV(markStack))) != objToScan3) { pushonObjStack(objToScan3, GIV(markStack)); } - pushonObjStack(((index3 << 1) | 1), GIV(markStack)); + pushonObjStack(((index3 << 3) | 1), GIV(markStack)); } objToScan3 = field3; index3 = -1; @@ -39439,7 +39439,7 @@ pushonObjStack(field3, GIV(markStack)); if (((byteAt(field3 + 7)) > 64) && (((numStrongSlots3 = numStrongSlotsOfInephemeral(field3))) > 64)) { - pushonObjStack(((numStrongSlots3 << 1) | 1), GIV(markStack)); + pushonObjStack(((numStrongSlots3 << 3) | 1), GIV(markStack)); } l15: ; @@ -39646,7 +39646,7 @@ if ((topOfObjStack(GIV(markStack))) != objToScan4) { pushonObjStack(objToScan4, GIV(markStack)); } - pushonObjStack(((index4 << 1) | 1), GIV(markStack)); + pushonObjStack(((index4 << 3) | 1), GIV(markStack)); } objToScan4 = field4; index4 = -1; @@ -39717,7 +39717,7 @@ pushonObjStack(field4, GIV(markStack)); if (((byteAt(field4 + 7)) > 64) && (((numStrongSlots4 = numStrongSlotsOfInephemeral(field4))) > 64)) { - pushonObjStack(((numStrongSlots4 << 1) | 1), GIV(markStack)); + pushonObjStack(((numStrongSlots4 << 3) | 1), GIV(markStack)); } l17: ; @@ -39922,7 +39922,7 @@ if ((topOfObjStack(GIV(markStack))) != objToScan5) { pushonObjStack(objToScan5, GIV(markStack)); } - pushonObjStack(((index5 << 1) | 1), GIV(markStack)); + pushonObjStack(((index5 << 3) | 1), GIV(markStack)); } objToScan5 = field5; index5 = -1; @@ -39993,7 +39993,7 @@ pushonObjStack(field5, GIV(markStack)); if (((byteAt(field5 + 7)) > 64) && (((numStrongSlots5 = numStrongSlotsOfInephemeral(field5))) > 64)) { - pushonObjStack(((numStrongSlots5 << 1) | 1), GIV(markStack)); + pushonObjStack(((numStrongSlots5 << 3) | 1), GIV(markStack)); } l19: ; @@ -40344,7 +40344,7 @@ if ((topOfObjStack(GIV(markStack))) != objToScan) { pushonObjStack(objToScan, GIV(markStack)); } - pushonObjStack(((index << 1) | 1), GIV(markStack)); + pushonObjStack(((index << 3) | 1), GIV(markStack)); } objToScan = field1; index = -1; @@ -40415,7 +40415,7 @@ pushonObjStack(field1, GIV(markStack)); if (((byteAt(field1 + 7)) > 64) && (((numStrongSlots = numStrongSlotsOfInephemeral(field1))) > 64)) { - pushonObjStack(((numStrongSlots << 1) | 1), GIV(markStack)); + pushonObjStack(((numStrongSlots << 3) | 1), GIV(markStack)); } l20: ; @@ -40655,7 +40655,7 @@ if ((topOfObjStack(GIV(markStack))) != objToScan1) { pushonObjStack(objToScan1, GIV(markStack)); } @@ Diff output truncated at 50000 characters. @@ |
Free forum by Nabble | Edit this page |