Vm-dev February 2015

vm-dev@lists.squeakfoundation.org

27 participants
101 discussions

VM Maker: VMMaker.oscog-eem.1056.mcz
by commits＠source.squeak.org 12 Feb '15

12 Feb '15

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.1056.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.1056 Author: eem Time: 11 February 2015, 6:06:30.048 pm UUID: 3069334b-0e1a-4609-840d-f85302692f97 Ancestors: VMMaker.oscog-eem.1055 Range-check the three float timesTwoPower: implementations to ensure that the argument to ldexp does not exceed int range. =============== Diff against VMMaker.oscog-eem.1055 =============== Item was added: + ----- Method: FloatMathPlugin>>isFinite: (in category 'float primitives') ----- + isFinite: aDouble + <var: #aDouble type: #double> + <inline: true> + ^aDouble - aDouble = 0.0! Item was changed: ----- Method: FloatMathPlugin>>primitiveTimesTwoPower (in category 'float primitives') ----- primitiveTimesTwoPower "Computes E raised to the receiver power." + | rcvr arg twiceMaxExponent result | - | rcvr arg result | <export: true> + <var: #rcvr type: #double> + <var: #result type: #double> - <var: #rcvr type: 'double'> - <var: #result type: 'double'> arg := interpreterProxy stackIntegerValue: 0. rcvr := interpreterProxy stackFloatValue: 1. + interpreterProxy failed ifTrue: + [^nil]. + ((self isFinite: rcvr) and: [rcvr ~= 0.0]) + ifFalse: + [result := rcvr] + ifTrue: + [twiceMaxExponent := 2 * (1 << 11). + arg < twiceMaxExponent negated + ifTrue: + [result := rcvr < 0.0 ifTrue: [-0.0] ifFalse: [0.0]] + ifFalse: + [arg > twiceMaxExponent + ifTrue: + [result := rcvr < 0.0 ifTrue: [-1.0e200 / 1.0e-200] ifFalse: [1.0e200 / 1.0e-200]] + ifFalse: + [result := self cCode: '__ieee754_ldexp(rcvr, arg)' + inSmalltalk: [rcvr timesTwoPower: arg]]]]. + (self isnan: result) ifTrue: + [^interpreterProxy primitiveFail]. + interpreterProxy + pop: interpreterProxy methodArgumentCount + 1; + pushFloat: result! - (interpreterProxy failed) ifTrue:[^nil]. - result := self cCode: '__ieee754_ldexp(rcvr, arg)' inSmalltalk: [rcvr timesTwoPower: arg]. - (self isnan: result) ifTrue:[^interpreterProxy primitiveFail]. - interpreterProxy pop: interpreterProxy methodArgumentCount + 1. - interpreterProxy pushFloat: result.! Item was added: + ----- Method: InterpreterPrimitives>>floatExponentBits (in category 'primitive support') ----- + floatExponentBits + "Answer the number of bits in the double-precision exponent. This is an 11-bit field." + ^11! Item was added: + ----- Method: InterpreterPrimitives>>isFinite: (in category 'primitive support') ----- + isFinite: aDouble + <var: #aDouble type: #double> + <inline: true> + ^aDouble - aDouble = 0.0! Item was changed: ----- Method: InterpreterPrimitives>>primitiveSmallFloatTimesTwoPower (in category 'arithmetic float primitives') ----- primitiveSmallFloatTimesTwoPower <option: #Spur64BitMemoryManager> + | rcvr result arg twiceMaxExponent | - | rcvr arg | <var: #rcvr type: #double> + <var: #result type: #double> arg := self stackTop. + (objectMemory isIntegerObject: arg) ifFalse: + [^self primitiveFailFor: PrimErrBadArgument]. + rcvr := objectMemory smallFloatValueOf: (self stackValue: 1). + "N.B. SmallFloats are finite. NaN and Infinity overflow into boxed floats." + rcvr = 0.0 - (objectMemory isIntegerObject: arg) ifTrue: + [result := rcvr] - [rcvr := objectMemory smallFloatValueOf: (self stackValue: 1). - arg := objectMemory integerValueOf: arg. - self pop: 2 - thenPushFloat: (self cCode: [self ld: rcvr exp: arg] - inSmalltalk: [rcvr timesTwoPower: arg])] ifFalse: + [arg := objectMemory integerValueOf: arg. + twiceMaxExponent := 2 * (1 << self floatExponentBits). + arg < twiceMaxExponent negated + ifTrue: + [result := rcvr < 0.0 ifTrue: [-0.0] ifFalse: [0.0]] + ifFalse: + [arg > twiceMaxExponent + ifTrue: + [result := rcvr < 0.0 ifTrue: [-1.0e200 / 1.0e-200] ifFalse: [1.0e200 / 1.0e-200]] + ifFalse: + [result := self cCode: [self ld: rcvr exp: arg] + inSmalltalk: [rcvr timesTwoPower: arg]]]]. + self pop: 2 thenPushFloat: result! - [self primitiveFail]! Item was changed: ----- Method: InterpreterPrimitives>>primitiveTimesTwoPower (in category 'arithmetic float primitives') ----- primitiveTimesTwoPower + <option: #Spur64BitMemoryManager> + | rcvr result arg twiceMaxExponent | - | rcvr arg | <var: #rcvr type: #double> + <var: #result type: #double> + arg := self stackTop. + (objectMemory isIntegerObject: arg) ifFalse: + [^self primitiveFailFor: PrimErrBadArgument]. + rcvr := objectMemory floatValueOf: (self stackValue: 1). + ((self isFinite: rcvr) and: [rcvr ~= 0]) + ifFalse: + [result := rcvr] + ifTrue: + [arg := objectMemory integerValueOf: arg. + twiceMaxExponent := 2 * (1 << self floatExponentBits). + arg < twiceMaxExponent negated + ifTrue: + [result := rcvr < 0.0 ifTrue: [-0.0] ifFalse: [0.0]] + ifFalse: + [arg > twiceMaxExponent + ifTrue: + [result := rcvr < 0.0 ifTrue: [-1.0e200 / 1.0e-200] ifFalse: [1.0e200 / 1.0e-200]] + ifFalse: + [result := self cCode: [self ld: rcvr exp: arg] + inSmalltalk: [rcvr timesTwoPower: arg]]]]. + self pop: 2 thenPushFloat: result! - arg := self popInteger. - rcvr := self popFloat. - self successful - ifTrue: [ self pushFloat: (self cCode: 'ldexp(rcvr, arg)' inSmalltalk: [rcvr timesTwoPower: arg]) ] - ifFalse: [ self unPop: 2 ]!

1 0

[commit][3253] CogVM source as per VMMaker.oscog-eem.1055
by commits＠squeakvm.org 11 Feb '15

11 Feb '15

Revision: 3253 Author: eliot Date: 2015-02-11 14:20:23 -0800 (Wed, 11 Feb 2015) Log Message: ----------- CogVM source as per VMMaker.oscog-eem.1055 Broaden primitiveBitXor, primitiveBitAnd and primitiveBitOr for Spur 64-bits. Make the bytecodes handle the common SmallInteger op SmallInteger case. Now there are no uses of popPos32BitInteger in Cog :-) Fix C code for Spur64BitMemoryManager>>fetchLong32:ofFloatObject: Modified Paths: -------------- branches/Cog/nscogsrc/vm/cointerp.c branches/Cog/nscogsrc/vm/cointerp.h branches/Cog/nscogsrc/vm/gcc3x-cointerp.c branches/Cog/nsspursrc/vm/cointerp.c branches/Cog/nsspursrc/vm/cointerp.h branches/Cog/nsspursrc/vm/gcc3x-cointerp.c branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c branches/Cog/nsspurstacksrc/vm/interp.c branches/Cog/sistasrc/vm/cointerp.c branches/Cog/sistasrc/vm/cointerp.h branches/Cog/sistasrc/vm/gcc3x-cointerp.c branches/Cog/spursistasrc/vm/cointerp.c branches/Cog/spursistasrc/vm/cointerp.h branches/Cog/spursistasrc/vm/gcc3x-cointerp.c branches/Cog/spursrc/vm/cointerp.c branches/Cog/spursrc/vm/cointerp.h branches/Cog/spursrc/vm/gcc3x-cointerp.c branches/Cog/spurstack64src/vm/gcc3x-interp.c branches/Cog/spurstack64src/vm/interp.c branches/Cog/spurstacksrc/vm/gcc3x-interp.c branches/Cog/spurstacksrc/vm/interp.c branches/Cog/src/vm/cointerp.c branches/Cog/src/vm/cointerp.h branches/Cog/src/vm/cointerpmt.c branches/Cog/src/vm/cointerpmt.h branches/Cog/src/vm/gcc3x-cointerp.c branches/Cog/src/vm/gcc3x-cointerpmt.c branches/Cog/stacksrc/vm/gcc3x-interp.c branches/Cog/stacksrc/vm/interp.c Property Changed: ---------------- branches/Cog/platforms/Cross/vm/sqSCCSVersion.h Modified: branches/Cog/nscogsrc/vm/cointerp.c =================================================================== --- branches/Cog/nscogsrc/vm/cointerp.c 2015-02-11 19:21:48 UTC (rev 3252) +++ branches/Cog/nscogsrc/vm/cointerp.c 2015-02-11 22:20:23 UTC (rev 3253) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1050 uuid: ad3a825c-97ba-4d01-a0e7-637af8cbf52b + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1055 uuid: dd8f0ae4-8ad8-470c-a35b-29cf787f83c8 from - CoInterpreter VMMaker.oscog-eem.1050 uuid: ad3a825c-97ba-4d01-a0e7-637af8cbf52b + CoInterpreter VMMaker.oscog-eem.1055 uuid: dd8f0ae4-8ad8-470c-a35b-29cf787f83c8 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1050 uuid: ad3a825c-97ba-4d01-a0e7-637af8cbf52b " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1055 uuid: dd8f0ae4-8ad8-470c-a35b-29cf787f83c8 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2097,7 +2097,7 @@ /* 575 */ (void (*)(void))0, 0 }; char expensiveAsserts = 0; -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.1050"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.1055"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -8081,16 +8081,21 @@ case 190: /* bytecodePrimBitAnd */ { - usqInt integerArgument; - usqInt integerReceiver; - sqInt object; - char *sp; - sqInt top; - sqInt top1; - sqInt top2; - sqInt top3; + sqInt arg; + sqInt rcvr; VM_LABEL(bytecodePrimBitAnd); + arg = longAtPointer(localSP); + rcvr = longAtPointer(localSP + (1 * BytesPerOop)); + if (((arg & 1)) + && ((rcvr & 1))) { + /* begin internalPop:thenPush: */ + longAtPointerput((localSP += (2 - 1) * BytesPerOop), arg & rcvr); + /* begin fetchNextBytecode */ + currentBytecode = (byteAtPointer(++localIP)) + GIV(bytecodeSetSelector); + + goto l110; + } /* begin initPrimCall */ GIV(primFailCode) = 0; /* begin externalizeIPandSP */ @@ -8098,29 +8103,7 @@ GIV(instructionPointer) = oopForPointer(localIP); GIV(stackPointer) = localSP; GIV(framePointer) = localFP; - /* begin primitiveBitAnd */ - /* begin popPos32BitInteger */ - /* begin popStack */ - top2 = longAt(GIV(stackPointer)); - GIV(stackPointer) += BytesPerWord; - top = top2; - integerArgument = positive32BitValueOf(top); - /* begin popPos32BitInteger */ - /* begin popStack */ - top3 = longAt(GIV(stackPointer)); - GIV(stackPointer) += BytesPerWord; - top1 = top3; - integerReceiver = positive32BitValueOf(top1); - if (!GIV(primFailCode)) { - /* begin push: */ - object = positive32BitIntegerFor(integerReceiver & integerArgument); - longAtput((sp = GIV(stackPointer) - BytesPerWord), object); - GIV(stackPointer) = sp; - } - else { - /* begin unPop: */ - GIV(stackPointer) -= 2 * BytesPerWord; - } + primitiveBitAnd(); /* begin internalizeIPandSP */ assert(GIV(instructionPointer) != (ceReturnToInterpreterPC())); localIP = pointerForOop(GIV(instructionPointer)); @@ -8142,16 +8125,21 @@ case 191: /* bytecodePrimBitOr */ { - usqInt integerArgument; - usqInt integerReceiver; - sqInt object; - char *sp; - sqInt top; - sqInt top1; - sqInt top2; - sqInt top3; + sqInt arg; + sqInt rcvr; VM_LABEL(bytecodePrimBitOr); + arg = longAtPointer(localSP); + rcvr = longAtPointer(localSP + (1 * BytesPerOop)); + if (((arg & 1)) + && ((rcvr & 1))) { + /* begin internalPop:thenPush: */ + longAtPointerput((localSP += (2 - 1) * BytesPerOop), arg | rcvr); + /* begin fetchNextBytecode */ + currentBytecode = (byteAtPointer(++localIP)) + GIV(bytecodeSetSelector); + + goto l111; + } /* begin initPrimCall */ GIV(primFailCode) = 0; /* begin externalizeIPandSP */ @@ -8159,29 +8147,7 @@ GIV(instructionPointer) = oopForPointer(localIP); GIV(stackPointer) = localSP; GIV(framePointer) = localFP; - /* begin primitiveBitOr */ - /* begin popPos32BitInteger */ - /* begin popStack */ - top2 = longAt(GIV(stackPointer)); - GIV(stackPointer) += BytesPerWord; - top = top2; - integerArgument = positive32BitValueOf(top); - /* begin popPos32BitInteger */ - /* begin popStack */ - top3 = longAt(GIV(stackPointer)); - GIV(stackPointer) += BytesPerWord; - top1 = top3; - integerReceiver = positive32BitValueOf(top1); - if (!GIV(primFailCode)) { - /* begin push: */ - object = positive32BitIntegerFor(integerReceiver | integerArgument); - longAtput((sp = GIV(stackPointer) - BytesPerWord), object); - GIV(stackPointer) = sp; - } - else { - /* begin unPop: */ - GIV(stackPointer) -= 2 * BytesPerWord; - } + primitiveBitOr(); /* begin internalizeIPandSP */ assert(GIV(instructionPointer) != (ceReturnToInterpreterPC())); localIP = pointerForOop(GIV(instructionPointer)); @@ -11035,16 +11001,21 @@ case 350: /*94*/ /* bytecodePrimBitAnd */ { - usqInt integerArgument; - usqInt integerReceiver; - sqInt object; - char *sp; - sqInt top; - sqInt top1; - sqInt top2; - sqInt top3; + sqInt arg; + sqInt rcvr; VM_LABEL(bytecodePrimBitAnd1); + arg = longAtPointer(localSP); + rcvr = longAtPointer(localSP + (1 * BytesPerOop)); + if (((arg & 1)) + && ((rcvr & 1))) { + /* begin internalPop:thenPush: */ + longAtPointerput((localSP += (2 - 1) * BytesPerOop), arg & rcvr); + /* begin fetchNextBytecode */ + currentBytecode = (byteAtPointer(++localIP)) + GIV(bytecodeSetSelector); + + goto l245; + } /* begin initPrimCall */ GIV(primFailCode) = 0; /* begin externalizeIPandSP */ @@ -11052,29 +11023,7 @@ GIV(instructionPointer) = oopForPointer(localIP); GIV(stackPointer) = localSP; GIV(framePointer) = localFP; - /* begin primitiveBitAnd */ - /* begin popPos32BitInteger */ - /* begin popStack */ - top2 = longAt(GIV(stackPointer)); - GIV(stackPointer) += BytesPerWord; - top = top2; - integerArgument = positive32BitValueOf(top); - /* begin popPos32BitInteger */ - /* begin popStack */ - top3 = longAt(GIV(stackPointer)); - GIV(stackPointer) += BytesPerWord; - top1 = top3; - integerReceiver = positive32BitValueOf(top1); - if (!GIV(primFailCode)) { - /* begin push: */ - object = positive32BitIntegerFor(integerReceiver & integerArgument); - longAtput((sp = GIV(stackPointer) - BytesPerWord), object); - GIV(stackPointer) = sp; - } - else { - /* begin unPop: */ - GIV(stackPointer) -= 2 * BytesPerWord; - } + primitiveBitAnd(); /* begin internalizeIPandSP */ assert(GIV(instructionPointer) != (ceReturnToInterpreterPC())); localIP = pointerForOop(GIV(instructionPointer)); @@ -11096,16 +11045,21 @@ case 351: /*95*/ /* bytecodePrimBitOr */ { - usqInt integerArgument; - usqInt integerReceiver; - sqInt object; - char *sp; - sqInt top; - sqInt top1; - sqInt top2; - sqInt top3; + sqInt arg; + sqInt rcvr; VM_LABEL(bytecodePrimBitOr1); + arg = longAtPointer(localSP); + rcvr = longAtPointer(localSP + (1 * BytesPerOop)); + if (((arg & 1)) + && ((rcvr & 1))) { + /* begin internalPop:thenPush: */ + longAtPointerput((localSP += (2 - 1) * BytesPerOop), arg | rcvr); + /* begin fetchNextBytecode */ + currentBytecode = (byteAtPointer(++localIP)) + GIV(bytecodeSetSelector); + + goto l246; + } /* begin initPrimCall */ GIV(primFailCode) = 0; /* begin externalizeIPandSP */ @@ -11113,29 +11067,7 @@ GIV(instructionPointer) = oopForPointer(localIP); GIV(stackPointer) = localSP; GIV(framePointer) = localFP; - /* begin primitiveBitOr */ - /* begin popPos32BitInteger */ - /* begin popStack */ - top2 = longAt(GIV(stackPointer)); - GIV(stackPointer) += BytesPerWord; - top = top2; - integerArgument = positive32BitValueOf(top); - /* begin popPos32BitInteger */ - /* begin popStack */ - top3 = longAt(GIV(stackPointer)); - GIV(stackPointer) += BytesPerWord; - top1 = top3; - integerReceiver = positive32BitValueOf(top1); - if (!GIV(primFailCode)) { - /* begin push: */ - object = positive32BitIntegerFor(integerReceiver | integerArgument); - longAtput((sp = GIV(stackPointer) - BytesPerWord), object); - GIV(stackPointer) = sp; - } - else { - /* begin unPop: */ - GIV(stackPointer) -= 2 * BytesPerWord; - } + primitiveBitOr(); /* begin internalizeIPandSP */ assert(GIV(instructionPointer) != (ceReturnToInterpreterPC())); localIP = pointerForOop(GIV(instructionPointer)); @@ -24136,35 +24068,30 @@ { DECL_MAYBE_SQ_GLOBAL_STRUCT usqInt integerArgument; usqInt integerReceiver; - sqInt object; + sqInt oop; + sqInt oop1; char *sp; - sqInt top; - sqInt top1; - sqInt top2; - sqInt top3; + char *sp1; - /* begin popPos32BitInteger */ - /* begin popStack */ - top2 = longAt(GIV(stackPointer)); - GIV(stackPointer) += BytesPerWord; - top = top2; - integerArgument = positive32BitValueOf(top); - /* begin popPos32BitInteger */ - /* begin popStack */ - top3 = longAt(GIV(stackPointer)); - GIV(stackPointer) += BytesPerWord; - top1 = top3; - integerReceiver = positive32BitValueOf(top1); + integerArgument = longAt(GIV(stackPointer)); + + /* Comment out the short-cut. Either the inline interpreter bytecode or the JIT primitive will handle this case. + ((objectMemory isIntegerObject: integerArgument) + and: [objectMemory isIntegerObject: integerReceiver]) + ifTrue: [self pop: 2 thenPush: (integerArgument bitAnd: integerReceiver)] + ifFalse: + [ */ + + integerReceiver = longAt(GIV(stackPointer) + (1 * BytesPerWord)); + integerArgument = positive32BitValueOf(integerArgument); + integerReceiver = positive32BitValueOf(integerReceiver); if (!GIV(primFailCode)) { - /* begin push: */ - object = positive32BitIntegerFor(integerReceiver & integerArgument); - longAtput((sp = GIV(stackPointer) - BytesPerWord), object); - GIV(stackPointer) = sp; + /* begin pop:thenPush: */ + oop1 = positive32BitIntegerFor(integerArgument & integerReceiver); + longAtput((sp1 = GIV(stackPointer) + ((2 - 1) * BytesPerWord)), oop1); + GIV(stackPointer) = sp1; } - else { - /* begin unPop: */ - GIV(stackPointer) -= 2 * BytesPerWord; - } + } @@ -24196,35 +24123,30 @@ { DECL_MAYBE_SQ_GLOBAL_STRUCT usqInt integerArgument; usqInt integerReceiver; - sqInt object; + sqInt oop; + sqInt oop1; char *sp; - sqInt top; - sqInt top1; - sqInt top2; - sqInt top3; + char *sp1; - /* begin popPos32BitInteger */ - /* begin popStack */ - top2 = longAt(GIV(stackPointer)); - GIV(stackPointer) += BytesPerWord; - top = top2; - integerArgument = positive32BitValueOf(top); - /* begin popPos32BitInteger */ - /* begin popStack */ - top3 = longAt(GIV(stackPointer)); - GIV(stackPointer) += BytesPerWord; - top1 = top3; - integerReceiver = positive32BitValueOf(top1); + integerArgument = longAt(GIV(stackPointer)); + + /* Comment out the short-cut. Either the inline interpreter bytecode or the JIT primitive will handle this case. + ((objectMemory isIntegerObject: integerArgument) + and: [objectMemory isIntegerObject: integerReceiver]) + ifTrue: [self pop: 2 thenPush: (integerArgument bitOr: integerReceiver)] + ifFalse: + [ */ + + integerReceiver = longAt(GIV(stackPointer) + (1 * BytesPerWord)); + integerArgument = positive32BitValueOf(integerArgument); + integerReceiver = positive32BitValueOf(integerReceiver); if (!GIV(primFailCode)) { - /* begin push: */ - object = positive32BitIntegerFor(integerReceiver | integerArgument); - longAtput((sp = GIV(stackPointer) - BytesPerWord), object); - GIV(stackPointer) = sp; + /* begin pop:thenPush: */ + oop1 = positive32BitIntegerFor(integerArgument | integerReceiver); + longAtput((sp1 = GIV(stackPointer) + ((2 - 1) * BytesPerWord)), oop1); + GIV(stackPointer) = sp1; } - else { - /* begin unPop: */ - GIV(stackPointer) -= 2 * BytesPerWord; - } + } @@ -24392,34 +24314,33 @@ { DECL_MAYBE_SQ_GLOBAL_STRUCT usqInt integerArgument; usqInt integerReceiver; - sqInt object; + sqInt oop; + sqInt oop1; char *sp; - sqInt top; - sqInt top1; - sqInt top2; - sqInt top3; + char *sp1; + char *sp2; - /* begin popPos32BitInteger */ - /* begin popStack */ - top2 = longAt(GIV(stackPointer)); - GIV(stackPointer) += BytesPerWord; - top = top2; - integerArgument = positive32BitValueOf(top); - /* begin popPos32BitInteger */ - /* begin popStack */ - top3 = longAt(GIV(stackPointer)); - GIV(stackPointer) += BytesPerWord; - top1 = top3; - integerReceiver = positive32BitValueOf(top1); - if (!GIV(primFailCode)) { - /* begin push: */ - object = positive32BitIntegerFor(integerReceiver ^ integerArgument); - longAtput((sp = GIV(stackPointer) - BytesPerWord), object); + integerArgument = longAt(GIV(stackPointer)); + integerReceiver = longAt(GIV(stackPointer) + (1 * BytesPerWord)); + if (((integerArgument & 1)) + && ((integerReceiver & 1))) { + + /* xoring will leave the tag bits zero, whether the tag is 1 or zero, so add it back in. */ + + /* begin pop:thenPush: */ + longAtput((sp = GIV(stackPointer) + ((2 - 1) * BytesPerWord)), (integerArgument ^ integerReceiver) + 1); GIV(stackPointer) = sp; } else { - /* begin unPop: */ - GIV(stackPointer) -= 2 * BytesPerWord; + integerArgument = positive32BitValueOf(integerArgument); + integerReceiver = positive32BitValueOf(integerReceiver); + if (!GIV(primFailCode)) { + /* begin pop:thenPush: */ + oop1 = positive32BitIntegerFor(integerArgument ^ integerReceiver); + longAtput((sp2 = GIV(stackPointer) + ((2 - 1) * BytesPerWord)), oop1); + GIV(stackPointer) = sp2; + } + } } Modified: branches/Cog/nscogsrc/vm/cointerp.h =================================================================== --- branches/Cog/nscogsrc/vm/cointerp.h 2015-02-11 19:21:48 UTC (rev 3252) +++ branches/Cog/nscogsrc/vm/cointerp.h 2015-02-11 22:20:23 UTC (rev 3253) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1050 uuid: ad3a825c-97ba-4d01-a0e7-637af8cbf52b + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1055 uuid: dd8f0ae4-8ad8-470c-a35b-29cf787f83c8 */ Modified: branches/Cog/nscogsrc/vm/gcc3x-cointerp.c =================================================================== --- branches/Cog/nscogsrc/vm/gcc3x-cointerp.c 2015-02-11 19:21:48 UTC (rev 3252) +++ branches/Cog/nscogsrc/vm/gcc3x-cointerp.c 2015-02-11 22:20:23 UTC (rev 3253) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1050 uuid: ad3a825c-97ba-4d01-a0e7-637af8cbf52b + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1055 uuid: dd8f0ae4-8ad8-470c-a35b-29cf787f83c8 from - CoInterpreter VMMaker.oscog-eem.1050 uuid: ad3a825c-97ba-4d01-a0e7-637af8cbf52b + CoInterpreter VMMaker.oscog-eem.1055 uuid: dd8f0ae4-8ad8-470c-a35b-29cf787f83c8 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1050 uuid: ad3a825c-97ba-4d01-a0e7-637af8cbf52b " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1055 uuid: dd8f0ae4-8ad8-470c-a35b-29cf787f83c8 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2100,7 +2100,7 @@ /* 575 */ (void (*)(void))0, 0 }; char expensiveAsserts = 0; -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.1050"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.1055"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -8090,16 +8090,21 @@ CASE(190) /* bytecodePrimBitAnd */ { - usqInt integerArgument; - usqInt integerReceiver; - sqInt object; - char *sp; - sqInt top; - sqInt top1; - sqInt top2; - sqInt top3; + sqInt arg; + sqInt rcvr; VM_LABEL(bytecodePrimBitAnd); + arg = longAtPointer(localSP); + rcvr = longAtPointer(localSP + (1 * BytesPerOop)); + if (((arg & 1)) + && ((rcvr & 1))) { + /* begin internalPop:thenPush: */ + longAtPointerput((localSP += (2 - 1) * BytesPerOop), arg & rcvr); + /* begin fetchNextBytecode */ + currentBytecode = (byteAtPointer(++localIP)) + GIV(bytecodeSetSelector); + + goto l110; + } /* begin initPrimCall */ GIV(primFailCode) = 0; /* begin externalizeIPandSP */ @@ -8107,29 +8112,7 @@ GIV(instructionPointer) = oopForPointer(localIP); GIV(stackPointer) = localSP; GIV(framePointer) = localFP; - /* begin primitiveBitAnd */ - /* begin popPos32BitInteger */ - /* begin popStack */ - top2 = longAt(GIV(stackPointer)); - GIV(stackPointer) += BytesPerWord; - top = top2; - integerArgument = positive32BitValueOf(top); - /* begin popPos32BitInteger */ - /* begin popStack */ - top3 = longAt(GIV(stackPointer)); - GIV(stackPointer) += BytesPerWord; - top1 = top3; - integerReceiver = positive32BitValueOf(top1); - if (!GIV(primFailCode)) { - /* begin push: */ - object = positive32BitIntegerFor(integerReceiver & integerArgument); - longAtput((sp = GIV(stackPointer) - BytesPerWord), object); - GIV(stackPointer) = sp; - } - else { - /* begin unPop: */ - GIV(stackPointer) -= 2 * BytesPerWord; - } + primitiveBitAnd(); /* begin internalizeIPandSP */ assert(GIV(instructionPointer) != (ceReturnToInterpreterPC())); localIP = pointerForOop(GIV(instructionPointer)); @@ -8151,16 +8134,21 @@ CASE(191) /* bytecodePrimBitOr */ { - usqInt integerArgument; - usqInt integerReceiver; - sqInt object; - char *sp; - sqInt top; - sqInt top1; - sqInt top2; - sqInt top3; + sqInt arg; + sqInt rcvr; VM_LABEL(bytecodePrimBitOr); + arg = longAtPointer(localSP); + rcvr = longAtPointer(localSP + (1 * BytesPerOop)); + if (((arg & 1)) + && ((rcvr & 1))) { + /* begin internalPop:thenPush: */ + longAtPointerput((localSP += (2 - 1) * BytesPerOop), arg | rcvr); + /* begin fetchNextBytecode */ + currentBytecode = (byteAtPointer(++localIP)) + GIV(bytecodeSetSelector); + + goto l111; + } /* begin initPrimCall */ GIV(primFailCode) = 0; /* begin externalizeIPandSP */ @@ -8168,29 +8156,7 @@ GIV(instructionPointer) = oopForPointer(localIP); GIV(stackPointer) = localSP; GIV(framePointer) = localFP; - /* begin primitiveBitOr */ - /* begin popPos32BitInteger */ - /* begin popStack */ - top2 = longAt(GIV(stackPointer)); - GIV(stackPointer) += BytesPerWord; - top = top2; - integerArgument = positive32BitValueOf(top); - /* begin popPos32BitInteger */ - /* begin popStack */ - top3 = longAt(GIV(stackPointer)); - GIV(stackPointer) += BytesPerWord; - top1 = top3; - integerReceiver = positive32BitValueOf(top1); - if (!GIV(primFailCode)) { - /* begin push: */ - object = positive32BitIntegerFor(integerReceiver | integerArgument); - longAtput((sp = GIV(stackPointer) - BytesPerWord), object); - GIV(stackPointer) = sp; - } - else { - /* begin unPop: */ - GIV(stackPointer) -= 2 * BytesPerWord; - } + primitiveBitOr(); /* begin internalizeIPandSP */ assert(GIV(instructionPointer) != (ceReturnToInterpreterPC())); localIP = pointerForOop(GIV(instructionPointer)); @@ -11044,16 +11010,21 @@ CASE(350) /*94*/ /* bytecodePrimBitAnd */ { - usqInt integerArgument; - usqInt integerReceiver; - sqInt object; - char *sp; - sqInt top; - sqInt top1; - sqInt top2; - sqInt top3; + sqInt arg; + sqInt rcvr; VM_LABEL(bytecodePrimBitAnd1); + arg = longAtPointer(localSP); + rcvr = longAtPointer(localSP + (1 * BytesPerOop)); + if (((arg & 1)) + && ((rcvr & 1))) { + /* begin internalPop:thenPush: */ + longAtPointerput((localSP += (2 - 1) * BytesPerOop), arg & rcvr); + /* begin fetchNextBytecode */ + currentBytecode = (byteAtPointer(++localIP)) + GIV(bytecodeSetSelector); + + goto l245; + } /* begin initPrimCall */ GIV(primFailCode) = 0; /* begin externalizeIPandSP */ @@ -11061,29 +11032,7 @@ GIV(instructionPointer) = oopForPointer(localIP); GIV(stackPointer) = localSP; GIV(framePointer) = localFP; - /* begin primitiveBitAnd */ - /* begin popPos32BitInteger */ - /* begin popStack */ - top2 = longAt(GIV(stackPointer)); - GIV(stackPointer) += BytesPerWord; - top = top2; - integerArgument = positive32BitValueOf(top); - /* begin popPos32BitInteger */ - /* begin popStack */ - top3 = longAt(GIV(stackPointer)); - GIV(stackPointer) += BytesPerWord; - top1 = top3; - integerReceiver = positive32BitValueOf(top1); - if (!GIV(primFailCode)) { - /* begin push: */ - object = positive32BitIntegerFor(integerReceiver & integerArgument); - longAtput((sp = GIV(stackPointer) - BytesPerWord), object); - GIV(stackPointer) = sp; - } - else { - /* begin unPop: */ - GIV(stackPointer) -= 2 * BytesPerWord; - } + primitiveBitAnd(); /* begin internalizeIPandSP */ assert(GIV(instructionPointer) != (ceReturnToInterpreterPC())); localIP = pointerForOop(GIV(instructionPointer)); @@ -11105,16 +11054,21 @@ CASE(351) /*95*/ /* bytecodePrimBitOr */ { - usqInt integerArgument; - usqInt integerReceiver; - sqInt object; - char *sp; - sqInt top; - sqInt top1; - sqInt top2; - sqInt top3; + sqInt arg; + sqInt rcvr; VM_LABEL(bytecodePrimBitOr1); + arg = longAtPointer(localSP); + rcvr = longAtPointer(localSP + (1 * BytesPerOop)); + if (((arg & 1)) + && ((rcvr & 1))) { + /* begin internalPop:thenPush: */ + longAtPointerput((localSP += (2 - 1) * BytesPerOop), arg | rcvr); + /* begin fetchNextBytecode */ + currentBytecode = (byteAtPointer(++localIP)) + GIV(bytecodeSetSelector); + + goto l246; + } /* begin initPrimCall */ GIV(primFailCode) = 0; /* begin externalizeIPandSP */ @@ -11122,29 +11076,7 @@ GIV(instructionPointer) = oopForPointer(localIP); GIV(stackPointer) = localSP; GIV(framePointer) = localFP; - /* begin primitiveBitOr */ - /* begin popPos32BitInteger */ - /* begin popStack */ - top2 = longAt(GIV(stackPointer)); - GIV(stackPointer) += BytesPerWord; - top = top2; - integerArgument = positive32BitValueOf(top); - /* begin popPos32BitInteger */ - /* begin popStack */ - top3 = longAt(GIV(stackPointer)); - GIV(stackPointer) += BytesPerWord; - top1 = top3; - integerReceiver = positive32BitValueOf(top1); - if (!GIV(primFailCode)) { - /* begin push: */ - object = positive32BitIntegerFor(integerReceiver | integerArgument); - longAtput((sp = GIV(stackPointer) - BytesPerWord), object); - GIV(stackPointer) = sp; - } - else { - /* begin unPop: */ - GIV(stackPointer) -= 2 * BytesPerWord; - } + primitiveBitOr(); /* begin internalizeIPandSP */ assert(GIV(instructionPointer) != (ceReturnToInterpreterPC())); localIP = pointerForOop(GIV(instructionPointer)); @@ -24145,35 +24077,30 @@ { DECL_MAYBE_SQ_GLOBAL_STRUCT usqInt integerArgument; usqInt integerReceiver; - sqInt object; + sqInt oop; + sqInt oop1; char *sp; - sqInt top; - sqInt top1; - sqInt top2; - sqInt top3; + char *sp1; - /* begin popPos32BitInteger */ - /* begin popStack */ - top2 = longAt(GIV(stackPointer)); - GIV(stackPointer) += BytesPerWord; - top = top2; - integerArgument = positive32BitValueOf(top); - /* begin popPos32BitInteger */ - /* begin popStack */ - top3 = longAt(GIV(stackPointer)); - GIV(stackPointer) += BytesPerWord; - top1 = top3; - integerReceiver = positive32BitValueOf(top1); + integerArgument = longAt(GIV(stackPointer)); + + /* Comment out the short-cut. Either the inline interpreter bytecode or the JIT primitive will handle this case. + ((objectMemory isIntegerObject: integerArgument) + and: [objectMemory isIntegerObject: integerReceiver]) + ifTrue: [self pop: 2 thenPush: (integerArgument bitAnd: integerReceiver)] + ifFalse: + [ */ + + integerReceiver = longAt(GIV(stackPointer) + (1 * BytesPerWord)); + integerArgument = positive32BitValueOf(integerArgument); + integerReceiver = positive32BitValueOf(integerReceiver); if (!GIV(primFailCode)) { - /* begin push: */ - object = positive32BitIntegerFor(integerReceiver & integerArgument); - longAtput((sp = GIV(stackPointer) - BytesPerWord), object); - GIV(stackPointer) = sp; + /* begin pop:thenPush: */ + oop1 = positive32BitIntegerFor(integerArgument & integerReceiver); + longAtput((sp1 = GIV(stackPointer) + ((2 - 1) * BytesPerWord)), oop1); + GIV(stackPointer) = sp1; } - else { - /* begin unPop: */ - GIV(stackPointer) -= 2 * BytesPerWord; - } + } @@ -24205,35 +24132,30 @@ { DECL_MAYBE_SQ_GLOBAL_STRUCT usqInt integerArgument; usqInt integerReceiver; - sqInt object; + sqInt oop; + sqInt oop1; char *sp; - sqInt top; - sqInt top1; - sqInt top2; - sqInt top3; + char *sp1; - /* begin popPos32BitInteger */ - /* begin popStack */ - top2 = longAt(GIV(stackPointer)); - GIV(stackPointer) += BytesPerWord; - top = top2; - integerArgument = positive32BitValueOf(top); - /* begin popPos32BitInteger */ - /* begin popStack */ - top3 = longAt(GIV(stackPointer)); - GIV(stackPointer) += BytesPerWord; - top1 = top3; - integerReceiver = positive32BitValueOf(top1); + integerArgument = longAt(GIV(stackPointer)); + + /* Comment out the short-cut. Either the inline interpreter bytecode or the JIT primitive will handle this case. + ((objectMemory isIntegerObject: integerArgument) + and: [objectMemory isIntegerObject: integerReceiver]) + ifTrue: [self pop: 2 thenPush: (integerArgument bitOr: integerReceiver)] + ifFalse: + [ */ + + integerReceiver = longAt(GIV(stackPointer) + (1 * BytesPerWord)); + integerArgument = positive32BitValueOf(integerArgument); + integerReceiver = positive32BitValueOf(integerReceiver); if (!GIV(primFailCode)) { - /* begin push: */ - object = positive32BitIntegerFor(integerReceiver | integerArgument); - longAtput((sp = GIV(stackPointer) - BytesPerWord), object); - GIV(stackPointer) = sp; + /* begin pop:thenPush: */ + oop1 = positive32BitIntegerFor(integerArgument | integerReceiver); + longAtput((sp1 = GIV(stackPointer) + ((2 - 1) * BytesPerWord)), oop1); + GIV(stackPointer) = sp1; } - else { - /* begin unPop: */ - GIV(stackPointer) -= 2 * BytesPerWord; - } + } @@ -24401,34 +24323,33 @@ { DECL_MAYBE_SQ_GLOBAL_STRUCT usqInt integerArgument; usqInt integerReceiver; - sqInt object; + sqInt oop; + sqInt oop1; char *sp; - sqInt top; - sqInt top1; - sqInt top2; - sqInt top3; + char *sp1; + char *sp2; - /* begin popPos32BitInteger */ - /* begin popStack */ - top2 = longAt(GIV(stackPointer)); - GIV(stackPointer) += BytesPerWord; - top = top2; - integerArgument = positive32BitValueOf(top); - /* begin popPos32BitInteger */ - /* begin popStack */ - top3 = longAt(GIV(stackPointer)); - GIV(stackPointer) += BytesPerWord; - top1 = top3; - integerReceiver = positive32BitValueOf(top1); - if (!GIV(primFailCode)) { - /* begin push: */ - object = positive32BitIntegerFor(integerReceiver ^ integerArgument); - longAtput((sp = GIV(stackPointer) - BytesPerWord), object); + integerArgument = longAt(GIV(stackPointer)); + integerReceiver = longAt(GIV(stackPointer) + (1 * BytesPerWord)); + if (((integerArgument & 1)) + && ((integerReceiver & 1))) { + + /* xoring will leave the tag bits zero, whether the tag is 1 or zero, so add it back in. */ + + /* begin pop:thenPush: */ + longAtput((sp = GIV(stackPointer) + ((2 - 1) * BytesPerWord)), (integerArgument ^ integerReceiver) + 1); GIV(stackPointer) = sp; } else { - /* begin unPop: */ - GIV(stackPointer) -= 2 * BytesPerWord; + integerArgument = positive32BitValueOf(integerArgument); + integerReceiver = positive32BitValueOf(integerReceiver); + if (!GIV(primFailCode)) { + /* begin pop:thenPush: */ + oop1 = positive32BitIntegerFor(integerArgument ^ integerReceiver); + longAtput((sp2 = GIV(stackPointer) + ((2 - 1) * BytesPerWord)), oop1); + GIV(stackPointer) = sp2; + } + } } Modified: branches/Cog/nsspursrc/vm/cointerp.c =================================================================== --- branches/Cog/nsspursrc/vm/cointerp.c 2015-02-11 19:21:48 UTC (rev 3252) +++ branches/Cog/nsspursrc/vm/cointerp.c 2015-02-11 22:20:23 UTC (rev 3253) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1053 uuid: 86f23972-c4fa-430d-93b9-865bb86a098d + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1055 uuid: dd8f0ae4-8ad8-470c-a35b-29cf787f83c8 from - CoInterpreter VMMaker.oscog-eem.1053 uuid: 86f23972-c4fa-430d-93b9-865bb86a098d + CoInterpreter VMMaker.oscog-eem.1055 uuid: dd8f0ae4-8ad8-470c-a35b-29cf787f83c8 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1053 uuid: 86f23972-c4fa-430d-93b9-865bb86a098d " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1055 uuid: dd8f0ae4-8ad8-470c-a35b-29cf787f83c8 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2325,7 +2325,7 @@ /* 575 */ (void (*)(void))0, 0 }; static signed char primitiveAccessorDepthTable[MaxPrimitiveIndex + 2 /* 577 */] = { -/*0*/ -1,-1,-1,-1,-1,-1,-1,-1,-1, 0, 0,-1,-1, 0,-1,-1,-1, 0, 0,-1, +/*0*/ -1,-1,-1,-1,-1,-1,-1,-1,-1, 0, 0,-1,-1, 0, 0, 0, 0, 0, 0,-1, /*20*/ 0, 0, 0,-1,-1,-1,-1,-1,-1, 0, 0, 0, 0, 0,-1,-1,-1, 0, 0, 0, /*40*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, /*60*/ 0, 0, 1,-1,-1,-1,-1,-1, 0, 0,-1,-1, 0, 1, 1, 0, 0, 0, 0, 0, @@ -2356,7 +2356,7 @@ /*560*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, 0, 0, 0,-1,-1 }; char expensiveAsserts = 0; -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.1053"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.1055"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -8952,16 +8952,21 @@ case 190: /* bytecodePrimBitAnd */ { - usqInt integerArgument; - usqInt integerReceiver; - sqInt object; - char *sp; - sqInt top; - sqInt top1; - sqInt top2; - sqInt top3; + sqInt arg; + sqInt rcvr; VM_LABEL(bytecodePrimBitAnd); + arg = longAtPointer(localSP); + rcvr = longAtPointer(localSP + (1 * BytesPerOop)); + if (((arg & 1)) + && ((rcvr & 1))) { + /* begin internalPop:thenPush: */ + longAtPointerput((localSP += (2 - 1) * BytesPerOop), arg & rcvr); + /* begin fetchNextBytecode */ + currentBytecode = (byteAtPointer(++localIP)) + GIV(bytecodeSetSelector); + + goto l77; + } /* begin initPrimCall */ GIV(primFailCode) = 0; /* begin externalizeIPandSP */ @@ -8969,29 +8974,7 @@ GIV(instructionPointer) = oopForPointer(localIP); GIV(stackPointer) = localSP; GIV(framePointer) = localFP; - /* begin primitiveBitAnd */ - /* begin popPos32BitInteger */ - /* begin popStack */ - top2 = longAt(GIV(stackPointer)); - GIV(stackPointer) += BytesPerWord; - top = top2; - integerArgument = positive32BitValueOf(top); - /* begin popPos32BitInteger */ - /* begin popStack */ - top3 = longAt(GIV(stackPointer)); - GIV(stackPointer) += BytesPerWord; - top1 = top3; - integerReceiver = positive32BitValueOf(top1); - if (!GIV(primFailCode)) { - /* begin push: */ - object = positive32BitIntegerFor(integerReceiver & integerArgument); - longAtput((sp = GIV(stackPointer) - BytesPerWord), object); - GIV(stackPointer) = sp; - } - else { - /* begin unPop: */ - GIV(stackPointer) -= 2 * BytesPerWord; - } + primitiveBitAnd(); /* begin internalizeIPandSP */ assert(GIV(instructionPointer) != (ceReturnToInterpreterPC())); localIP = pointerForOop(GIV(instructionPointer)); @@ -9013,16 +8996,21 @@ case 191: /* bytecodePrimBitOr */ { - usqInt integerArgument; - usqInt integerReceiver; - sqInt object; - char *sp; - sqInt top; - sqInt top1; - sqInt top2; - sqInt top3; + sqInt arg; + sqInt rcvr; VM_LABEL(bytecodePrimBitOr); + arg = longAtPointer(localSP); + rcvr = longAtPointer(localSP + (1 * BytesPerOop)); + if (((arg & 1)) + && ((rcvr & 1))) { + /* begin internalPop:thenPush: */ + longAtPointerput((localSP += (2 - 1) * BytesPerOop), arg | rcvr); + /* begin fetchNextBytecode */ + currentBytecode = (byteAtPointer(++localIP)) + GIV(bytecodeSetSelector); + + goto l78; + } /* begin initPrimCall */ GIV(primFailCode) = 0; /* begin externalizeIPandSP */ @@ -9030,29 +9018,7 @@ GIV(instructionPointer) = oopForPointer(localIP); GIV(stackPointer) = localSP; GIV(framePointer) = localFP; - /* begin primitiveBitOr */ - /* begin popPos32BitInteger */ - /* begin popStack */ - top2 = longAt(GIV(stackPointer)); - GIV(stackPointer) += BytesPerWord; - top = top2; - integerArgument = positive32BitValueOf(top); - /* begin popPos32BitInteger */ - /* begin popStack */ - top3 = longAt(GIV(stackPointer)); - GIV(stackPointer) += BytesPerWord; - top1 = top3; - integerReceiver = positive32BitValueOf(top1); - if (!GIV(primFailCode)) { - /* begin push: */ - object = positive32BitIntegerFor(integerReceiver | integerArgument); - longAtput((sp = GIV(stackPointer) - BytesPerWord), object); - GIV(stackPointer) = sp; - } - else { - /* begin unPop: */ - GIV(stackPointer) -= 2 * BytesPerWord; - } + primitiveBitOr(); /* begin internalizeIPandSP */ assert(GIV(instructionPointer) != (ceReturnToInterpreterPC())); localIP = pointerForOop(GIV(instructionPointer)); @@ -11701,16 +11667,21 @@ case 350: /*94*/ /* bytecodePrimBitAnd */ { - usqInt integerArgument; - usqInt integerReceiver; - sqInt object; - char *sp; - sqInt top; - sqInt top1; - sqInt top2; - sqInt top3; + sqInt arg; + sqInt rcvr; VM_LABEL(bytecodePrimBitAnd1); + arg = longAtPointer(localSP); + rcvr = longAtPointer(localSP + (1 * BytesPerOop)); + if (((arg & 1)) + && ((rcvr & 1))) { + /* begin internalPop:thenPush: */ + longAtPointerput((localSP += (2 - 1) * BytesPerOop), arg & rcvr); + /* begin fetchNextBytecode */ + currentBytecode = (byteAtPointer(++localIP)) + GIV(bytecodeSetSelector); + + goto l171; + } /* begin initPrimCall */ GIV(primFailCode) = 0; /* begin externalizeIPandSP */ @@ -11718,29 +11689,7 @@ GIV(instructionPointer) = oopForPointer(localIP); GIV(stackPointer) = localSP; GIV(framePointer) = localFP; - /* begin primitiveBitAnd */ - /* begin popPos32BitInteger */ - /* begin popStack */ - top2 = longAt(GIV(stackPointer)); - GIV(stackPointer) += BytesPerWord; - top = top2; - integerArgument = positive32BitValueOf(top); - /* begin popPos32BitInteger */ - /* begin popStack */ - top3 = longAt(GIV(stackPointer)); - GIV(stackPointer) += BytesPerWord; - top1 = top3; - integerReceiver = positive32BitValueOf(top1); - if (!GIV(primFailCode)) { - /* begin push: */ - object = positive32BitIntegerFor(integerReceiver & integerArgument); - longAtput((sp = GIV(stackPointer) - BytesPerWord), object); - GIV(stackPointer) = sp; - } - else { - /* begin unPop: */ - GIV(stackPointer) -= 2 * BytesPerWord; - } + primitiveBitAnd(); /* begin internalizeIPandSP */ assert(GIV(instructionPointer) != (ceReturnToInterpreterPC())); localIP = pointerForOop(GIV(instructionPointer)); @@ -11762,16 +11711,21 @@ case 351: /*95*/ /* bytecodePrimBitOr */ { - usqInt integerArgument; - usqInt integerReceiver; - sqInt object; - char *sp; - sqInt top; - sqInt top1; - sqInt top2; - sqInt top3; + sqInt arg; + sqInt rcvr; VM_LABEL(bytecodePrimBitOr1); + arg = longAtPointer(localSP); + rcvr = longAtPointer(localSP + (1 * BytesPerOop)); + if (((arg & 1)) + && ((rcvr & 1))) { + /* begin internalPop:thenPush: */ + longAtPointerput((localSP += (2 - 1) * BytesPerOop), arg | rcvr); + /* begin fetchNextBytecode */ + currentBytecode = (byteAtPointer(++localIP)) + GIV(bytecodeSetSelector); + + goto l172; + } /* begin initPrimCall */ GIV(primFailCode) = 0; /* begin externalizeIPandSP */ @@ -11779,29 +11733,7 @@ GIV(instructionPointer) = oopForPointer(localIP); GIV(stackPointer) = localSP; GIV(framePointer) = localFP; - /* begin primitiveBitOr */ - /* begin popPos32BitInteger */ - /* begin popStack */ - top2 = longAt(GIV(stackPointer)); - GIV(stackPointer) += BytesPerWord; - top = top2; - integerArgument = positive32BitValueOf(top); - /* begin popPos32BitInteger */ - /* begin popStack */ - top3 = longAt(GIV(stackPointer)); - GIV(stackPointer) += BytesPerWord; - top1 = top3; - integerReceiver = positive32BitValueOf(top1); - if (!GIV(primFailCode)) { - /* begin push: */ - object = positive32BitIntegerFor(integerReceiver | integerArgument); - longAtput((sp = GIV(stackPointer) - BytesPerWord), object); - GIV(stackPointer) = sp; - } - else { - /* begin unPop: */ - GIV(stackPointer) -= 2 * BytesPerWord; - } + primitiveBitOr(); /* begin internalizeIPandSP */ assert(GIV(instructionPointer) != (ceReturnToInterpreterPC())); localIP = pointerForOop(GIV(instructionPointer)); @@ -28360,37 +28292,32 @@ static void primitiveBitAnd(void) { DECL_MAYBE_SQ_GLOBAL_STRUCT - usqInt integerArgument; - usqInt integerReceiver; - sqInt object; + usqLong integerArgument; + usqLong integerReceiver; + sqInt oop; + sqInt oop1; char *sp; - sqInt top; - sqInt top1; - sqInt top2; - sqInt top3; + char *sp1; - /* begin popPos32BitInteger */ - /* begin popStack */ - top2 = longAt(GIV(stackPointer)); - GIV(stackPointer) += BytesPerWord; - top = top2; - integerArgument = positive32BitValueOf(top); - /* begin popPos32BitInteger */ - /* begin popStack */ - top3 = longAt(GIV(stackPointer)); - GIV(stackPointer) += BytesPerWord; - top1 = top3; - integerReceiver = positive32BitValueOf(top1); + integerArgument = longAt(GIV(stackPointer)); + + /* Comment out the short-cut. Either the inline interpreter bytecode or the JIT primitive will handle this case. + ((objectMemory isIntegerObject: integerArgument) + and: [objectMemory isIntegerObject: integerReceiver]) + ifTrue: [self pop: 2 thenPush: (integerArgument bitAnd: integerReceiver)] + ifFalse: + [ */ + + integerReceiver = longAt(GIV(stackPointer) + (1 * BytesPerWord)); + integerArgument = positive32BitValueOf(integerArgument); + integerReceiver = positive32BitValueOf(integerReceiver); if (!GIV(primFailCode)) { - /* begin push: */ - object = positive32BitIntegerFor(integerReceiver & integerArgument); - longAtput((sp = GIV(stackPointer) - BytesPerWord), object); - GIV(stackPointer) = sp; + /* begin pop:thenPush: */ + oop1 = positive32BitIntegerFor(integerArgument & integerReceiver); + longAtput((sp1 = GIV(stackPointer) + ((2 - 1) * BytesPerWord)), oop1); + GIV(stackPointer) = sp1; } - else { - /* begin unPop: */ - GIV(stackPointer) -= 2 * BytesPerWord; - } + } @@ -28420,37 +28347,32 @@ static void primitiveBitOr(void) { DECL_MAYBE_SQ_GLOBAL_STRUCT - usqInt integerArgument; - usqInt integerReceiver; - sqInt object; + usqLong integerArgument; + usqLong integerReceiver; + sqInt oop; + sqInt oop1; char *sp; - sqInt top; - sqInt top1; - sqInt top2; - sqInt top3; + char *sp1; - /* begin popPos32BitInteger */ - /* begin popStack */ - top2 = longAt(GIV(stackPointer)); - GIV(stackPointer) += BytesPerWord; - top = top2; - integerArgument = positive32BitValueOf(top); - /* begin popPos32BitInteger */ - /* begin popStack */ - top3 = longAt(GIV(stackPointer)); - GIV(stackPointer) += BytesPerWord; - top1 = top3; - integerReceiver = positive32BitValueOf(top1); + integerArgument = longAt(GIV(stackPointer)); + + /* Comment out the short-cut. Either the inline interpreter bytecode or the JIT primitive will handle this case. + ((objectMemory isIntegerObject: integerArgument) + and: [objectMemory isIntegerObject: integerReceiver]) + ifTrue: [self pop: 2 thenPush: (integerArgument bitOr: integerReceiver)] + ifFalse: + [ */ + + integerReceiver = longAt(GIV(stackPointer) + (1 * BytesPerWord)); + integerArgument = positive32BitValueOf(integerArgument); + integerReceiver = positive32BitValueOf(integerReceiver); if (!GIV(primFailCode)) { - /* begin push: */ - object = positive32BitIntegerFor(integerReceiver | integerArgument); - longAtput((sp = GIV(stackPointer) - BytesPerWord), object); - GIV(stackPointer) = sp; + /* begin pop:thenPush: */ + oop1 = positive32BitIntegerFor(integerArgument | integerReceiver); + longAtput((sp1 = GIV(stackPointer) + ((2 - 1) * BytesPerWord)), oop1); + GIV(stackPointer) = sp1; } - else { - /* begin unPop: */ - GIV(stackPointer) -= 2 * BytesPerWord; - } + } @@ -28616,36 +28538,35 @@ static void primitiveBitXor(void) { DECL_MAYBE_SQ_GLOBAL_STRUCT - usqInt integerArgument; - usqInt integerReceiver; - sqInt object; + usqLong integerArgument; + usqLong integerReceiver; + sqInt oop; + sqInt oop1; char *sp; - sqInt top; - sqInt top1; - sqInt top2; - sqInt top3; + char *sp1; + char *sp2; - /* begin popPos32BitInteger */ - /* begin popStack */ - top2 = longAt(GIV(stackPointer)); - GIV(stackPointer) += BytesPerWord; - top = top2; - integerArgument = positive32BitValueOf(top); - /* begin popPos32BitInteger */ - /* begin popStack */ - top3 = longAt(GIV(stackPointer)); - GIV(stackPointer) += BytesPerWord; - top1 = top3; - integerReceiver = positive32BitValueOf(top1); - if (!GIV(primFailCode)) { - /* begin push: */ - object = positive32BitIntegerFor(integerReceiver ^ integerArgument); - longAtput((sp = GIV(stackPointer) - BytesPerWord), object); + integerArgument = longAt(GIV(stackPointer)); + integerReceiver = longAt(GIV(stackPointer) + (1 * BytesPerWord)); + if (((integerArgument & 1)) + && ((integerReceiver & 1))) { + + /* xoring will leave the tag bits zero, whether the tag is 1 or zero, so add it back in. */ + + /* begin pop:thenPush: */ + longAtput((sp = GIV(stackPointer) + ((2 - 1) * BytesPerWord)), (integerArgument ^ integerReceiver) + 1); GIV(stackPointer) = sp; } else { - /* begin unPop: */ - GIV(stackPointer) -= 2 * BytesPerWord; + integerArgument = positive32BitValueOf(integerArgument); + integerReceiver = positive32BitValueOf(integerReceiver); + if (!GIV(primFailCode)) { + /* begin pop:thenPush: */ + oop1 = positive32BitIntegerFor(integerArgument ^ integerReceiver); + longAtput((sp2 = GIV(stackPointer) + ((2 - 1) * BytesPerWord)), oop1); + GIV(stackPointer) = sp2; + } + } } Modified: branches/Cog/nsspursrc/vm/cointerp.h =================================================================== --- branches/Cog/nsspursrc/vm/cointerp.h 2015-02-11 19:21:48 UTC (rev 3252) +++ branches/Cog/nsspursrc/vm/cointerp.h 2015-02-11 22:20:23 UTC (rev 3253) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1053 uuid: 86f23972-c4fa-430d-93b9-865bb86a098d + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1055 uuid: dd8f0ae4-8ad8-470c-a35b-29cf787f83c8 */ Modified: branches/Cog/nsspursrc/vm/gcc3x-cointerp.c =================================================================== --- branches/Cog/nsspursrc/vm/gcc3x-cointerp.c 2015-02-11 19:21:48 UTC (rev 3252) +++ branches/Cog/nsspursrc/vm/gcc3x-cointerp.c 2015-02-11 22:20:23 UTC (rev 3253) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1053 uuid: 86f23972-c4fa-430d-93b9-865bb86a098d + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1055 uuid: dd8f0ae4-8ad8-470c-a35b-29cf787f83c8 from - CoInterpreter VMMaker.oscog-eem.1053 uuid: 86f23972-c4fa-430d-93b9-865bb86a098d + CoInterpreter VMMaker.oscog-eem.1055 uuid: dd8f0ae4-8ad8-470c-a35b-29cf787f83c8 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1053 uuid: 86f23972-c4fa-430d-93b9-865bb86a098d " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1055 uuid: dd8f0ae4-8ad8-470c-a35b-29cf787f83c8 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2328,7 +2328,7 @@ /* 575 */ (void (*)(void))0, 0 }; static signed char primitiveAccessorDepthTable[MaxPrimitiveIndex + 2 /* 577 */] = { -/*0*/ -1,-1,-1,-1,-1,-1,-1,-1,-1, 0, 0,-1,-1, 0,-1,-1,-1, 0, 0,-1, +/*0*/ -1,-1,-1,-1,-1,-1,-1,-1,-1, 0, 0,-1,-1, 0, 0, 0, 0, 0, 0,-1, /*20*/ 0, 0, 0,-1,-1,-1,-1,-1,-1, 0, 0, 0, 0, 0,-1,-1,-1, 0, 0, 0, /*40*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, /*60*/ 0, 0, 1,-1,-1,-1,-1,-1, 0, 0,-1,-1, 0, 1, 1, 0, 0, 0, 0, 0, @@ -2359,7 +2359,7 @@ /*560*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, 0, 0, 0,-1,-1 }; char expensiveAsserts = 0; -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.1053"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.1055"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -8961,16 +8961,21 @@ CASE(190) /* bytecodePrimBitAnd */ { - usqInt integerArgument; - usqInt integerReceiver; - sqInt object; - char *sp; - sqInt top; - sqInt top1; - sqInt top2; - sqInt top3; + sqInt arg; + sqInt rcvr; VM_LABEL(bytecodePrimBitAnd); + arg = longAtPointer(localSP); + rcvr = longAtPointer(localSP + (1 * BytesPerOop)); + if (((arg & 1)) + && ((rcvr & 1))) { + /* begin internalPop:thenPush: */ + longAtPointerput((localSP += (2 - 1) * BytesPerOop), arg & rcvr); + /* begin fetchNextBytecode */ + currentBytecode = (byteAtPointer(++localIP)) + GIV(bytecodeSetSelector); + + goto l77; + } /* begin initPrimCall */ GIV(primFailCode) = 0; /* begin externalizeIPandSP */ @@ -8978,29 +8983,7 @@ GIV(instructionPointer) = oopForPointer(localIP); GIV(stackPointer) = localSP; GIV(framePointer) = localFP; - /* begin primitiveBitAnd */ - /* begin popPos32BitInteger */ - /* begin popStack */ - top2 = longAt(GIV(stackPointer)); - GIV(stackPointer) += BytesPerWord; - top = top2; - integerArgument = positive32BitValueOf(top); - /* begin popPos32BitInteger */ - /* begin popStack */ - top3 = longAt(GIV(stackPointer)); - GIV(stackPointer) += BytesPerWord; - top1 = top3; - integerReceiver = positive32BitValueOf(top1); - if (!GIV(primFailCode)) { - /* begin push: */ - object = positive32BitIntegerFor(integerReceiver & integerArgument); - longAtput((sp = GIV(stackPointer) - BytesPerWord), object); - GIV(stackPointer) = sp; - } - else { - /* begin unPop: */ - GIV(stackPointer) -= 2 * BytesPerWord; - } + primitiveBitAnd(); /* begin internalizeIPandSP */ assert(GIV(instructionPointer) != (ceReturnToInterpreterPC())); localIP = pointerForOop(GIV(instructionPointer)); @@ -9022,16 +9005,21 @@ CASE(191) /* bytecodePrimBitOr */ { - usqInt integerArgument; - usqInt integerReceiver; - sqInt object; - char *sp; - sqInt top; - sqInt top1; - sqInt top2; - sqInt top3; + sqInt arg; + sqInt rcvr; VM_LABEL(bytecodePrimBitOr); + arg = longAtPointer(localSP); + rcvr = longAtPointer(localSP + (1 * BytesPerOop)); + if (((arg & 1)) + && ((rcvr & 1))) { + /* begin internalPop:thenPush: */ + longAtPointerput((localSP += (2 - 1) * BytesPerOop), arg | rcvr); + /* begin fetchNextBytecode */ + currentBytecode = (byteAtPointer(++localIP)) + GIV(bytecodeSetSelector); + + goto l78; + } /* begin initPrimCall */ GIV(primFailCode) = 0; /* begin externalizeIPandSP */ @@ -9039,29 +9027,7 @@ GIV(instructionPointer) = oopForPointer(localIP); GIV(stackPointer) = localSP; GIV(framePointer) = localFP; - /* begin primitiveBitOr */ - /* begin popPos32BitInteger */ - /* begin popStack */ - top2 = longAt(GIV(stackPointer)); - GIV(stackPointer) += BytesPerWord; - top = top2; - integerArgument = positive32BitValueOf(top); - /* begin popPos32BitInteger */ - /* begin popStack */ - top3 = longAt(GIV(stackPointer)); - GIV(stackPointer) += BytesPerWord; - top1 = top3; - integerReceiver = positive32BitValueOf(top1); - if (!GIV(primFailCode)) { - /* begin push: */ - object = positive32BitIntegerFor(integerReceiver | integerArgument); - longAtput((sp = GIV(stackPointer) - BytesPerWord), object); - GIV(stackPointer) = sp; - } - else { - /* begin unPop: */ - GIV(stackPointer) -= 2 * BytesPerWord; - } + primitiveBitOr(); /* begin internalizeIPandSP */ assert(GIV(instructionPointer) != (ceReturnToInterpreterPC())); localIP = pointerForOop(GIV(instructionPointer)); @@ -11710,16 +11676,21 @@ CASE(350) /*94*/ /* bytecodePrimBitAnd */ { - usqInt integerArgument; - usqInt integerReceiver; - sqInt object; - char *sp; - sqInt top; - sqInt top1; - sqInt top2; - sqInt top3; + sqInt arg; + sqInt rcvr; VM_LABEL(bytecodePrimBitAnd1); + arg = longAtPointer(localSP); + rcvr = longAtPointer(localSP + (1 * BytesPerOop)); + if (((arg & 1)) + && ((rcvr & 1))) { + /* begin internalPop:thenPush: */ + longAtPointerput((localSP += (2 - 1) * BytesPerOop), arg & rcvr); + /* begin fetchNextBytecode */ + currentBytecode = (byteAtPointer(++localIP)) + GIV(bytecodeSetSelector); + + goto l171; + } /* begin initPrimCall */ GIV(primFailCode) = 0; /* begin externalizeIPandSP */ @@ -11727,29 +11698,7 @@ GIV(instructionPointer) = oopForPointer(localIP); GIV(stackPointer) = localSP; GIV(framePointer) = localFP; - /* begin primitiveBitAnd */ - /* begin popPos32BitInteger */ - /* begin popStack */ - top2 = longAt(GIV(stackPointer)); - GIV(stackPointer) += BytesPerWord; - top = top2; - integerArgument = positive32BitValueOf(top); - /* begin popPos32BitInteger */ - /* begin popStack */ - top3 = longAt(GIV(stackPointer)); - GIV(stackPointer) += BytesPerWord; - top1 = top3; - integerReceiver = positive32BitValueOf(top1); - if (!GIV(primFailCode)) { - /* begin push: */ - object = positive32BitIntegerFor(integerReceiver & integerArgument); - longAtput((sp = GIV(stackPointer) - BytesPerWord), object); @@ Diff output truncated at 50000 characters. @@

1 0

VM Maker: VMMaker.oscog-eem.1055.mcz
by commits＠source.squeak.org 11 Feb '15

11 Feb '15

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.1055.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.1055 Author: eem Time: 11 February 2015, 2:10:42.938 pm UUID: dd8f0ae4-8ad8-470c-a35b-29cf787f83c8 Ancestors: VMMaker.oscog-eem.1054 Broaden primitiveBitXor for Spur 64-bits. Now there are no uses of popPos32BitInteger in Cog :-) =============== Diff against VMMaker.oscog-eem.1054 =============== Item was changed: ----- Method: InterpreterPrimitives>>primitiveBitXor (in category 'arithmetic integer primitives') ----- primitiveBitXor + <inline: false> | integerReceiver integerArgument | + integerArgument := self stackTop. + integerReceiver := self stackValue: 1. + ((objectMemory isIntegerObject: integerArgument) + and: [objectMemory isIntegerObject: integerReceiver]) + ifTrue: "xoring will leave the tag bits zero, whether the tag is 1 or zero, so add it back in." + [self pop: 2 thenPush: (integerArgument bitXor: integerReceiver) + objectMemory smallIntegerTag] + ifFalse: + [objectMemory wordSize = 8 + ifTrue: + [integerArgument := self positive64BitValueOf: integerArgument. + integerReceiver := self positive64BitValueOf: integerReceiver. + self successful ifTrue: + [self pop: 2 thenPush: (self positive64BitIntegerFor: (integerArgument bitXor: integerReceiver))]] + ifFalse: + [integerArgument := self positive32BitValueOf: integerArgument. + integerReceiver := self positive32BitValueOf: integerReceiver. + self successful ifTrue: + [self pop: 2 thenPush: (self positive32BitIntegerFor: (integerArgument bitXor: integerReceiver))]]]! - integerArgument := self popPos32BitInteger. - integerReceiver := self popPos32BitInteger. - self successful - ifTrue: [self push: (self positive32BitIntegerFor: - (integerReceiver bitXor: integerArgument))] - ifFalse: [self unPop: 2]!

1 0

VM Maker: VMMaker.oscog-eem.1054.mcz
by commits＠source.squeak.org 11 Feb '15

11 Feb '15

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.1054.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.1054 Author: eem Time: 11 February 2015, 1:20:01.475 pm UUID: 3d511797-53fc-4848-b1ec-4b8a1eb0c0ff Ancestors: VMMaker.oscog-eem.1053 Broaden primitiveBitAnd and primitiveBitOr for Spur 64-bits. Make the bytecodes handle the common SmallInteger op SmallInteger case. Fix C code for and endianness under simulation of Spur64BitMemoryManager>>fetchLong32:ofFloatObject: =============== Diff against VMMaker.oscog-eem.1053 =============== Item was changed: ----- Method: InterpreterPrimitives>>primitiveBitAnd (in category 'arithmetic integer primitives') ----- primitiveBitAnd + <inline: false> | integerReceiver integerArgument | + integerArgument := self stackTop. + integerReceiver := self stackValue: 1. + "Comment out the short-cut. Either the inline interpreter bytecode or the JIT primitive will handle this case. + ((objectMemory isIntegerObject: integerArgument) + and: [objectMemory isIntegerObject: integerReceiver]) + ifTrue: [self pop: 2 thenPush: (integerArgument bitAnd: integerReceiver)] + ifFalse: + ["objectMemory wordSize = 8 + ifTrue: + [integerArgument := self positive64BitValueOf: integerArgument. + integerReceiver := self positive64BitValueOf: integerReceiver. + self successful ifTrue: + [self pop: 2 thenPush: (self positive64BitIntegerFor: (integerArgument bitAnd: integerReceiver))]] + ifFalse: + [integerArgument := self positive32BitValueOf: integerArgument. + integerReceiver := self positive32BitValueOf: integerReceiver. + self successful ifTrue: + [self pop: 2 thenPush: (self positive32BitIntegerFor: (integerArgument bitAnd: integerReceiver))]]"]"! - integerArgument := self popPos32BitInteger. - integerReceiver := self popPos32BitInteger. - self successful - ifTrue: [self push: (self positive32BitIntegerFor: - (integerReceiver bitAnd: integerArgument))] - ifFalse: [self unPop: 2]! Item was changed: ----- Method: InterpreterPrimitives>>primitiveBitOr (in category 'arithmetic integer primitives') ----- primitiveBitOr + <inline: false> | integerReceiver integerArgument | + integerArgument := self stackTop. + integerReceiver := self stackValue: 1. + "Comment out the short-cut. Either the inline interpreter bytecode or the JIT primitive will handle this case. + ((objectMemory isIntegerObject: integerArgument) + and: [objectMemory isIntegerObject: integerReceiver]) + ifTrue: [self pop: 2 thenPush: (integerArgument bitOr: integerReceiver)] + ifFalse: + ["objectMemory wordSize = 8 + ifTrue: + [integerArgument := self positive64BitValueOf: integerArgument. + integerReceiver := self positive64BitValueOf: integerReceiver. + self successful ifTrue: + [self pop: 2 thenPush: (self positive64BitIntegerFor: (integerArgument bitOr: integerReceiver))]] + ifFalse: + [integerArgument := self positive32BitValueOf: integerArgument. + integerReceiver := self positive32BitValueOf: integerReceiver. + self successful ifTrue: + [self pop: 2 thenPush: (self positive32BitIntegerFor: (integerArgument bitOr: integerReceiver))]]"]"! - integerArgument := self popPos32BitInteger. - integerReceiver := self popPos32BitInteger. - self successful - ifTrue: [self push: (self positive32BitIntegerFor: - (integerReceiver bitOr: integerArgument))] - ifFalse: [self unPop: 2]! Item was changed: ----- Method: Spur64BitMemoryManager>>fetchLong32:ofFloatObject: (in category 'object access') ----- fetchLong32: fieldIndex ofFloatObject: oop "index by word size, and return a pointer as long as the word size" | bits | (self isImmediateFloat: oop) ifFalse: [^self fetchLong32: fieldIndex ofObject: oop]. bits := self smallFloatBitsOf: oop. ^self + cCode: [(self cCoerceSimple: (self addressOf: bits) to: #'int *') at: fieldIndex] + inSmalltalk: + [self flag: #endian. + fieldIndex = 0 + ifTrue: [bits bitAnd: 16rFFFFFFFF] + ifFalse: [bits >> 32]]! - cCode: [self longAt: (self cCoerceSimple: (self addressOf: bits) to: #'char *') - + (fieldIndex << self shiftForWord)] - inSmalltalk: [self flag: #endian. - fieldIndex = 0 - ifTrue: [bits >> 32] - ifFalse: [bits bitAnd: 16rFFFFFFFF]]! Item was changed: ----- Method: StackInterpreter>>bytecodePrimBitAnd (in category 'common selector sends') ----- bytecodePrimBitAnd + | rcvr arg | + arg := self internalStackTop. + rcvr := self internalStackValue: 1. + ((objectMemory isIntegerObject: arg) + and: [objectMemory isIntegerObject: rcvr]) ifTrue: + [self internalPop: 2 thenPush: (arg bitAnd: rcvr). + ^self fetchNextBytecode "success"]. self initPrimCall. self externalizeIPandSP. self primitiveBitAnd. self internalizeIPandSP. + self successful ifTrue: + [^self fetchNextBytecode "success"]. - self successful ifTrue: [^ self fetchNextBytecode "success"]. messageSelector := self specialSelector: 14. argumentCount := 1. self normalSend! Item was changed: ----- Method: StackInterpreter>>bytecodePrimBitOr (in category 'common selector sends') ----- bytecodePrimBitOr + | rcvr arg | + arg := self internalStackTop. + rcvr := self internalStackValue: 1. + ((objectMemory isIntegerObject: arg) + and: [objectMemory isIntegerObject: rcvr]) ifTrue: + [self internalPop: 2 thenPush: (arg bitOr: rcvr). + ^self fetchNextBytecode "success"]. self initPrimCall. self externalizeIPandSP. self primitiveBitOr. self internalizeIPandSP. + self successful ifTrue: + [^self fetchNextBytecode "success"]. - self successful ifTrue: [^ self fetchNextBytecode "success"]. messageSelector := self specialSelector: 15. argumentCount := 1. self normalSend!

1 0

[commit][3252] CogVM source as per VMMaker.oscog-eem.1053
by commits＠squeakvm.org 11 Feb '15

11 Feb '15

Revision: 3252 Author: eliot Date: 2015-02-11 11:21:48 -0800 (Wed, 11 Feb 2015) Log Message: ----------- CogVM source as per VMMaker.oscog-eem.1053 Spur: Fix idiocy with image segment bit-position constants. Move the constants to class variables. Ensure all methods commented as being part of load or save. Modified Paths: -------------- 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/spursistasrc/vm/cointerp.c branches/Cog/spursistasrc/vm/cointerp.h branches/Cog/spursistasrc/vm/gcc3x-cointerp.c branches/Cog/spursrc/vm/cointerp.c branches/Cog/spursrc/vm/cointerp.h branches/Cog/spursrc/vm/gcc3x-cointerp.c branches/Cog/spurstack64src/vm/gcc3x-interp.c branches/Cog/spurstack64src/vm/interp.c branches/Cog/spurstacksrc/vm/gcc3x-interp.c branches/Cog/spurstacksrc/vm/interp.c Property Changed: ---------------- branches/Cog/platforms/Cross/vm/sqSCCSVersion.h Modified: branches/Cog/nsspursrc/vm/cointerp.c =================================================================== --- branches/Cog/nsspursrc/vm/cointerp.c 2015-02-11 03:01:24 UTC (rev 3251) +++ branches/Cog/nsspursrc/vm/cointerp.c 2015-02-11 19:21:48 UTC (rev 3252) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1050 uuid: ad3a825c-97ba-4d01-a0e7-637af8cbf52b + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1053 uuid: 86f23972-c4fa-430d-93b9-865bb86a098d from - CoInterpreter VMMaker.oscog-eem.1050 uuid: ad3a825c-97ba-4d01-a0e7-637af8cbf52b + CoInterpreter VMMaker.oscog-eem.1053 uuid: 86f23972-c4fa-430d-93b9-865bb86a098d */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1050 uuid: ad3a825c-97ba-4d01-a0e7-637af8cbf52b " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1053 uuid: 86f23972-c4fa-430d-93b9-865bb86a098d " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -350,6 +350,8 @@ #define TheInterruptSemaphore 30 #define TheLowSpaceSemaphore 17 #define TheTimerSemaphore 29 +#define TopHashBit 0x200000 +#define TopOopBit 0x80000000UL #define TraceBlockActivation 5 #define TraceBlockCreation 7 #define TraceBufferSize 768 @@ -2354,7 +2356,7 @@ /*560*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, 0, 0, 0,-1,-1 }; char expensiveAsserts = 0; -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.1050"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.1053"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -45018,7 +45020,8 @@ } -/* Copy objOop into the segment beginning at segAddr, and forward it to the +/* This is part of storeImageSegmentInto:outPointers:roots:. + Copy objOop into the segment beginning at segAddr, and forward it to the copy. If it is a class in the class table, set the copy's hash to 0 for reassignment on load, and mark it as a class by setting its isRemembered bit. @@ -48934,9 +48937,6 @@ sqInt slotBytes1; sqInt stopAddr; sqInt stopAddr1; - sqInt topHashBit; - sqInt topHashBit1; - sqInt topOopBit; /* begin numSlotsOf: */ flag("endianness"); @@ -49027,8 +49027,6 @@ numOutPointers = (numSlots4 == 0xFF ? longAt(outPointerArray - BaseHeaderSize) : numSlots4); - topHashBit = 1 << (22 - 1); - topOopBit = ((1 << BytesPerOop) * 8) - 1; /* begin objectStartingAt: */ numSlots13 = byteAt(segmentStart + 7); objOop1 = (numSlots13 == 0xFF @@ -49043,12 +49041,12 @@ /* validate the class ref, but don't update it until any internal classes have been added to the class table. */ classIndex = ((longAt(objOop1)) & 0x3FFFFF) - 16; - if (classIndex & topHashBit) { - if ((classIndex - topHashBit) >= numOutPointers) { + if (classIndex & TopHashBit) { + if ((classIndex - TopHashBit) >= numOutPointers) { errorCode = PrimErrBadIndex; goto l2; } - mappedOop = longAt((outPointerArray + BaseHeaderSize) + ((classIndex - topHashBit) << (shiftForWord()))); + mappedOop = longAt((outPointerArray + BaseHeaderSize) + ((classIndex - TopHashBit) << (shiftForWord()))); hash = (long32At(mappedOop + 4)) & 0x3FFFFF; if (!((hash > 0x1F) && ((classOrNilAtIndex(hash)) == mappedOop))) { @@ -49072,8 +49070,8 @@ for (i = 0, iLimiT = ((numPointerSlotsOf(objOop1)) - 1); i <= iLimiT; i += 1) { oop1 = longAt((objOop1 + BaseHeaderSize) + (i << (shiftForWord()))); if ((oop1 & 3) == 0) { - if (oop1 & topOopBit) { - if (((oop1 = (oop1 - topOopBit) / BytesPerOop)) >= numOutPointers) { + if (oop1 & TopOopBit) { + if (((oop1 = (oop1 - TopOopBit) / BytesPerOop)) >= numOutPointers) { errorCode = PrimErrBadIndex; goto l2; } @@ -49126,7 +49124,6 @@ return errorCode; } /* begin assignClassIndicesAndPinFrom:to:outPointers: */ - topHashBit1 = 1 << (22 - 1); /* begin objectStartingAt: */ numSlots5 = byteAt(segmentStart + 7); objOop2 = (numSlots5 == 0xFF @@ -49138,8 +49135,8 @@ or into outPointers. See mapOopsFrom:to:outPointers:outHashes:. */ classRef = ((longAt(objOop2)) & 0x3FFFFF) - 16; - classOop = (classRef & topHashBit1 - ? longAt((outPointerArray + BaseHeaderSize) + ((classRef - topHashBit1) << (shiftForWord()))) + classOop = (classRef & TopHashBit + ? longAt((outPointerArray + BaseHeaderSize) + ((classRef - TopHashBit) << (shiftForWord()))) : (classRef * 8) + segmentStart); classIndex1 = (long32At(classOop + 4)) & 0x3FFFFF; assert((classIndex1 > (lastClassIndexPun())) @@ -49520,8 +49517,6 @@ sqInt outIndex; usqInt p; sqInt segIndex; - sqInt topHashBit; - sqInt topOopBit; outIndex = 0; /* begin fillObj:numSlots:with: */ @@ -49537,8 +49532,6 @@ longAtput(p, GIV(nilObj)); longAtput(p + 4, GIV(nilObj)); } - topHashBit = 1 << (22 - 1); - topOopBit = ((1 << BytesPerOop) * 8) - 1; /* begin objectStartingAt: */ numSlots1 = byteAt(segStart + 7); objOop = (numSlots1 == 0xFF @@ -49550,7 +49543,7 @@ /* oop is a new outPointer; allocate its oop */ - /* begin newOutPointer:at:in:hashes:topHashBit: */ + /* begin newOutPointer:at:in:hashes: */ if (outIndex >= (numSlotsOf(outPointerArray))) { /* no room in outPointers; fail */ @@ -49576,11 +49569,11 @@ long32Atput((savedOutHashes + BaseHeaderSize) + (outIndex << 2), (long32At(oop + 4)) & 0x3FFFFF); /* begin setHashBitsOf:to: */ flag("endianness"); - assert((((outIndex + topHashBit) >= 0) && ((outIndex + topHashBit) <= (identityHashHalfWordMask())))); - long32Atput(oop + 4, ((((long32At(oop + 4)) | 0x3FFFFF) - 0x3FFFFF)) + (outIndex + topHashBit)); + assert((((outIndex + TopHashBit) >= 0) && ((outIndex + TopHashBit) <= (identityHashHalfWordMask())))); + long32Atput(oop + 4, ((((long32At(oop + 4)) | 0x3FFFFF) - 0x3FFFFF)) + (outIndex + TopHashBit)); setIsMarkedOfto(oop, 1); outIndex += 1; - l1: /* end newOutPointer:at:in:hashes:topHashBit: */; + l1: /* end newOutPointer:at:in:hashes: */; if (outIndex == 0) { /* no room in outPointers; fail */ @@ -49600,7 +49593,7 @@ /* oop is a new outPointer; allocate its oop */ - /* begin newOutPointer:at:in:hashes:topHashBit: */ + /* begin newOutPointer:at:in:hashes: */ if (outIndex >= (numSlotsOf(outPointerArray))) { /* no room in outPointers; fail */ @@ -49626,11 +49619,11 @@ long32Atput((savedOutHashes + BaseHeaderSize) + (outIndex << 2), (long32At(oop + 4)) & 0x3FFFFF); /* begin setHashBitsOf:to: */ flag("endianness"); - assert((((outIndex + topHashBit) >= 0) && ((outIndex + topHashBit) <= (identityHashHalfWordMask())))); - long32Atput(oop + 4, ((((long32At(oop + 4)) | 0x3FFFFF) - 0x3FFFFF)) + (outIndex + topHashBit)); + assert((((outIndex + TopHashBit) >= 0) && ((outIndex + TopHashBit) <= (identityHashHalfWordMask())))); + long32Atput(oop + 4, ((((long32At(oop + 4)) | 0x3FFFFF) - 0x3FFFFF)) + (outIndex + TopHashBit)); setIsMarkedOfto(oop, 1); outIndex += 1; - l2: /* end newOutPointer:at:in:hashes:topHashBit: */; + l2: /* end newOutPointer:at:in:hashes: */; if (outIndex == 0) { /* no room in outPointers; fail */ @@ -49638,10 +49631,10 @@ return -1; } } - /* begin mappedOopOf:topHashBit:topOopBit: */ + /* begin mappedInSegmentOopOf: */ hash = (long32At(oop + 4)) & 0x3FFFFF; - oop = (hash & topHashBit - ? ((hash - topHashBit) * BytesPerOop) + topOopBit + oop = (hash & TopHashBit + ? ((hash - TopHashBit) * BytesPerOop) + TopOopBit : hash * 8); /* begin storePointerUnchecked:ofObject:withValue: */ assert(!(isForwarded(objOop))); @@ -58315,7 +58308,8 @@ } -/* Enumerate the objects in objArray, unmarking them and restoring their +/* This is part of storeImageSegmentInto:outPointers:roots:. + Enumerate the objects in objArray, unmarking them and restoring their hashes from the corresponding 32-bit slots in savedHashes. The first unused entry in objArray will have a non-hash value entry in savedHashes. Free Modified: branches/Cog/nsspursrc/vm/cointerp.h =================================================================== --- branches/Cog/nsspursrc/vm/cointerp.h 2015-02-11 03:01:24 UTC (rev 3251) +++ branches/Cog/nsspursrc/vm/cointerp.h 2015-02-11 19:21:48 UTC (rev 3252) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1050 uuid: ad3a825c-97ba-4d01-a0e7-637af8cbf52b + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1053 uuid: 86f23972-c4fa-430d-93b9-865bb86a098d */ Modified: branches/Cog/nsspursrc/vm/gcc3x-cointerp.c =================================================================== --- branches/Cog/nsspursrc/vm/gcc3x-cointerp.c 2015-02-11 03:01:24 UTC (rev 3251) +++ branches/Cog/nsspursrc/vm/gcc3x-cointerp.c 2015-02-11 19:21:48 UTC (rev 3252) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1050 uuid: ad3a825c-97ba-4d01-a0e7-637af8cbf52b + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1053 uuid: 86f23972-c4fa-430d-93b9-865bb86a098d from - CoInterpreter VMMaker.oscog-eem.1050 uuid: ad3a825c-97ba-4d01-a0e7-637af8cbf52b + CoInterpreter VMMaker.oscog-eem.1053 uuid: 86f23972-c4fa-430d-93b9-865bb86a098d */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1050 uuid: ad3a825c-97ba-4d01-a0e7-637af8cbf52b " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1053 uuid: 86f23972-c4fa-430d-93b9-865bb86a098d " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -353,6 +353,8 @@ #define TheInterruptSemaphore 30 #define TheLowSpaceSemaphore 17 #define TheTimerSemaphore 29 +#define TopHashBit 0x200000 +#define TopOopBit 0x80000000UL #define TraceBlockActivation 5 #define TraceBlockCreation 7 #define TraceBufferSize 768 @@ -2357,7 +2359,7 @@ /*560*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, 0, 0, 0,-1,-1 }; char expensiveAsserts = 0; -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.1050"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.1053"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -45027,7 +45029,8 @@ } -/* Copy objOop into the segment beginning at segAddr, and forward it to the +/* This is part of storeImageSegmentInto:outPointers:roots:. + Copy objOop into the segment beginning at segAddr, and forward it to the copy. If it is a class in the class table, set the copy's hash to 0 for reassignment on load, and mark it as a class by setting its isRemembered bit. @@ -48943,9 +48946,6 @@ sqInt slotBytes1; sqInt stopAddr; sqInt stopAddr1; - sqInt topHashBit; - sqInt topHashBit1; - sqInt topOopBit; /* begin numSlotsOf: */ flag("endianness"); @@ -49036,8 +49036,6 @@ numOutPointers = (numSlots4 == 0xFF ? longAt(outPointerArray - BaseHeaderSize) : numSlots4); - topHashBit = 1 << (22 - 1); - topOopBit = ((1 << BytesPerOop) * 8) - 1; /* begin objectStartingAt: */ numSlots13 = byteAt(segmentStart + 7); objOop1 = (numSlots13 == 0xFF @@ -49052,12 +49050,12 @@ /* validate the class ref, but don't update it until any internal classes have been added to the class table. */ classIndex = ((longAt(objOop1)) & 0x3FFFFF) - 16; - if (classIndex & topHashBit) { - if ((classIndex - topHashBit) >= numOutPointers) { + if (classIndex & TopHashBit) { + if ((classIndex - TopHashBit) >= numOutPointers) { errorCode = PrimErrBadIndex; goto l2; } - mappedOop = longAt((outPointerArray + BaseHeaderSize) + ((classIndex - topHashBit) << (shiftForWord()))); + mappedOop = longAt((outPointerArray + BaseHeaderSize) + ((classIndex - TopHashBit) << (shiftForWord()))); hash = (long32At(mappedOop + 4)) & 0x3FFFFF; if (!((hash > 0x1F) && ((classOrNilAtIndex(hash)) == mappedOop))) { @@ -49081,8 +49079,8 @@ for (i = 0, iLimiT = ((numPointerSlotsOf(objOop1)) - 1); i <= iLimiT; i += 1) { oop1 = longAt((objOop1 + BaseHeaderSize) + (i << (shiftForWord()))); if ((oop1 & 3) == 0) { - if (oop1 & topOopBit) { - if (((oop1 = (oop1 - topOopBit) / BytesPerOop)) >= numOutPointers) { + if (oop1 & TopOopBit) { + if (((oop1 = (oop1 - TopOopBit) / BytesPerOop)) >= numOutPointers) { errorCode = PrimErrBadIndex; goto l2; } @@ -49135,7 +49133,6 @@ return errorCode; } /* begin assignClassIndicesAndPinFrom:to:outPointers: */ - topHashBit1 = 1 << (22 - 1); /* begin objectStartingAt: */ numSlots5 = byteAt(segmentStart + 7); objOop2 = (numSlots5 == 0xFF @@ -49147,8 +49144,8 @@ or into outPointers. See mapOopsFrom:to:outPointers:outHashes:. */ classRef = ((longAt(objOop2)) & 0x3FFFFF) - 16; - classOop = (classRef & topHashBit1 - ? longAt((outPointerArray + BaseHeaderSize) + ((classRef - topHashBit1) << (shiftForWord()))) + classOop = (classRef & TopHashBit + ? longAt((outPointerArray + BaseHeaderSize) + ((classRef - TopHashBit) << (shiftForWord()))) : (classRef * 8) + segmentStart); classIndex1 = (long32At(classOop + 4)) & 0x3FFFFF; assert((classIndex1 > (lastClassIndexPun())) @@ -49529,8 +49526,6 @@ sqInt outIndex; usqInt p; sqInt segIndex; - sqInt topHashBit; - sqInt topOopBit; outIndex = 0; /* begin fillObj:numSlots:with: */ @@ -49546,8 +49541,6 @@ longAtput(p, GIV(nilObj)); longAtput(p + 4, GIV(nilObj)); } - topHashBit = 1 << (22 - 1); - topOopBit = ((1 << BytesPerOop) * 8) - 1; /* begin objectStartingAt: */ numSlots1 = byteAt(segStart + 7); objOop = (numSlots1 == 0xFF @@ -49559,7 +49552,7 @@ /* oop is a new outPointer; allocate its oop */ - /* begin newOutPointer:at:in:hashes:topHashBit: */ + /* begin newOutPointer:at:in:hashes: */ if (outIndex >= (numSlotsOf(outPointerArray))) { /* no room in outPointers; fail */ @@ -49585,11 +49578,11 @@ long32Atput((savedOutHashes + BaseHeaderSize) + (outIndex << 2), (long32At(oop + 4)) & 0x3FFFFF); /* begin setHashBitsOf:to: */ flag("endianness"); - assert((((outIndex + topHashBit) >= 0) && ((outIndex + topHashBit) <= (identityHashHalfWordMask())))); - long32Atput(oop + 4, ((((long32At(oop + 4)) | 0x3FFFFF) - 0x3FFFFF)) + (outIndex + topHashBit)); + assert((((outIndex + TopHashBit) >= 0) && ((outIndex + TopHashBit) <= (identityHashHalfWordMask())))); + long32Atput(oop + 4, ((((long32At(oop + 4)) | 0x3FFFFF) - 0x3FFFFF)) + (outIndex + TopHashBit)); setIsMarkedOfto(oop, 1); outIndex += 1; - l1: /* end newOutPointer:at:in:hashes:topHashBit: */; + l1: /* end newOutPointer:at:in:hashes: */; if (outIndex == 0) { /* no room in outPointers; fail */ @@ -49609,7 +49602,7 @@ /* oop is a new outPointer; allocate its oop */ - /* begin newOutPointer:at:in:hashes:topHashBit: */ + /* begin newOutPointer:at:in:hashes: */ if (outIndex >= (numSlotsOf(outPointerArray))) { /* no room in outPointers; fail */ @@ -49635,11 +49628,11 @@ long32Atput((savedOutHashes + BaseHeaderSize) + (outIndex << 2), (long32At(oop + 4)) & 0x3FFFFF); /* begin setHashBitsOf:to: */ flag("endianness"); - assert((((outIndex + topHashBit) >= 0) && ((outIndex + topHashBit) <= (identityHashHalfWordMask())))); - long32Atput(oop + 4, ((((long32At(oop + 4)) | 0x3FFFFF) - 0x3FFFFF)) + (outIndex + topHashBit)); + assert((((outIndex + TopHashBit) >= 0) && ((outIndex + TopHashBit) <= (identityHashHalfWordMask())))); + long32Atput(oop + 4, ((((long32At(oop + 4)) | 0x3FFFFF) - 0x3FFFFF)) + (outIndex + TopHashBit)); setIsMarkedOfto(oop, 1); outIndex += 1; - l2: /* end newOutPointer:at:in:hashes:topHashBit: */; + l2: /* end newOutPointer:at:in:hashes: */; if (outIndex == 0) { /* no room in outPointers; fail */ @@ -49647,10 +49640,10 @@ return -1; } } - /* begin mappedOopOf:topHashBit:topOopBit: */ + /* begin mappedInSegmentOopOf: */ hash = (long32At(oop + 4)) & 0x3FFFFF; - oop = (hash & topHashBit - ? ((hash - topHashBit) * BytesPerOop) + topOopBit + oop = (hash & TopHashBit + ? ((hash - TopHashBit) * BytesPerOop) + TopOopBit : hash * 8); /* begin storePointerUnchecked:ofObject:withValue: */ assert(!(isForwarded(objOop))); @@ -58324,7 +58317,8 @@ } -/* Enumerate the objects in objArray, unmarking them and restoring their +/* This is part of storeImageSegmentInto:outPointers:roots:. + Enumerate the objects in objArray, unmarking them and restoring their hashes from the corresponding 32-bit slots in savedHashes. The first unused entry in objArray will have a non-hash value entry in savedHashes. Free Modified: branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c =================================================================== --- branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c 2015-02-11 03:01:24 UTC (rev 3251) +++ branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c 2015-02-11 19:21:48 UTC (rev 3252) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1050 uuid: ad3a825c-97ba-4d01-a0e7-637af8cbf52b + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1053 uuid: 86f23972-c4fa-430d-93b9-865bb86a098d from - StackInterpreter VMMaker.oscog-eem.1050 uuid: ad3a825c-97ba-4d01-a0e7-637af8cbf52b + StackInterpreter VMMaker.oscog-eem.1053 uuid: 86f23972-c4fa-430d-93b9-865bb86a098d */ -static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1050 uuid: ad3a825c-97ba-4d01-a0e7-637af8cbf52b " __DATE__ ; +static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1053 uuid: 86f23972-c4fa-430d-93b9-865bb86a098d " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -318,6 +318,8 @@ #define TheInterruptSemaphore 30 #define TheLowSpaceSemaphore 17 #define TheTimerSemaphore 29 +#define TopHashBit 0x200000 +#define TopOopBit 0x80000000UL #define TrueObject 2 #define V3PrimitiveBitsMask 0x200003FE #define ValueIndex 1 @@ -2106,7 +2108,7 @@ /* 575 */ (void (*)(void))0, 0 }; char expensiveAsserts = 0; -const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscog-eem.1050"; +const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscog-eem.1053"; volatile int sendTrace; sqInt suppressHeartbeatFlag; @@ -32147,7 +32149,8 @@ } -/* Copy objOop into the segment beginning at segAddr, and forward it to the +/* This is part of storeImageSegmentInto:outPointers:roots:. + Copy objOop into the segment beginning at segAddr, and forward it to the copy. If it is a class in the class table, set the copy's hash to 0 for reassignment on load, and mark it as a class by setting its isRemembered bit. @@ -36060,9 +36063,6 @@ sqInt slotBytes1; sqInt stopAddr; sqInt stopAddr1; - sqInt topHashBit; - sqInt topHashBit1; - sqInt topOopBit; /* begin numSlotsOf: */ flag("endianness"); @@ -36153,8 +36153,6 @@ numOutPointers = (numSlots4 == 0xFF ? longAt(outPointerArray - BaseHeaderSize) : numSlots4); - topHashBit = 1 << (22 - 1); - topOopBit = ((1 << BytesPerOop) * 8) - 1; /* begin objectStartingAt: */ numSlots13 = byteAt(segmentStart + 7); objOop1 = (numSlots13 == 0xFF @@ -36169,12 +36167,12 @@ /* validate the class ref, but don't update it until any internal classes have been added to the class table. */ classIndex = ((longAt(objOop1)) & 0x3FFFFF) - 16; - if (classIndex & topHashBit) { - if ((classIndex - topHashBit) >= numOutPointers) { + if (classIndex & TopHashBit) { + if ((classIndex - TopHashBit) >= numOutPointers) { errorCode = PrimErrBadIndex; goto l2; } - mappedOop = longAt((outPointerArray + BaseHeaderSize) + ((classIndex - topHashBit) << (shiftForWord()))); + mappedOop = longAt((outPointerArray + BaseHeaderSize) + ((classIndex - TopHashBit) << (shiftForWord()))); hash = (long32At(mappedOop + 4)) & 0x3FFFFF; if (!((hash > 0x1F) && ((classOrNilAtIndex(hash)) == mappedOop))) { @@ -36198,8 +36196,8 @@ for (i = 0, iLimiT = ((numPointerSlotsOf(objOop1)) - 1); i <= iLimiT; i += 1) { oop1 = longAt((objOop1 + BaseHeaderSize) + (i << (shiftForWord()))); if ((oop1 & 3) == 0) { - if (oop1 & topOopBit) { - if (((oop1 = (oop1 - topOopBit) / BytesPerOop)) >= numOutPointers) { + if (oop1 & TopOopBit) { + if (((oop1 = (oop1 - TopOopBit) / BytesPerOop)) >= numOutPointers) { errorCode = PrimErrBadIndex; goto l2; } @@ -36252,7 +36250,6 @@ return errorCode; } /* begin assignClassIndicesAndPinFrom:to:outPointers: */ - topHashBit1 = 1 << (22 - 1); /* begin objectStartingAt: */ numSlots5 = byteAt(segmentStart + 7); objOop2 = (numSlots5 == 0xFF @@ -36264,8 +36261,8 @@ or into outPointers. See mapOopsFrom:to:outPointers:outHashes:. */ classRef = ((longAt(objOop2)) & 0x3FFFFF) - 16; - classOop = (classRef & topHashBit1 - ? longAt((outPointerArray + BaseHeaderSize) + ((classRef - topHashBit1) << (shiftForWord()))) + classOop = (classRef & TopHashBit + ? longAt((outPointerArray + BaseHeaderSize) + ((classRef - TopHashBit) << (shiftForWord()))) : (classRef * 8) + segmentStart); classIndex1 = (long32At(classOop + 4)) & 0x3FFFFF; assert((classIndex1 > (lastClassIndexPun())) @@ -36646,8 +36643,6 @@ sqInt outIndex; usqInt p; sqInt segIndex; - sqInt topHashBit; - sqInt topOopBit; outIndex = 0; /* begin fillObj:numSlots:with: */ @@ -36663,8 +36658,6 @@ longAtput(p, GIV(nilObj)); longAtput(p + 4, GIV(nilObj)); } - topHashBit = 1 << (22 - 1); - topOopBit = ((1 << BytesPerOop) * 8) - 1; /* begin objectStartingAt: */ numSlots1 = byteAt(segStart + 7); objOop = (numSlots1 == 0xFF @@ -36676,7 +36669,7 @@ /* oop is a new outPointer; allocate its oop */ - /* begin newOutPointer:at:in:hashes:topHashBit: */ + /* begin newOutPointer:at:in:hashes: */ if (outIndex >= (numSlotsOf(outPointerArray))) { /* no room in outPointers; fail */ @@ -36702,11 +36695,11 @@ long32Atput((savedOutHashes + BaseHeaderSize) + (outIndex << 2), (long32At(oop + 4)) & 0x3FFFFF); /* begin setHashBitsOf:to: */ flag("endianness"); - assert((((outIndex + topHashBit) >= 0) && ((outIndex + topHashBit) <= (identityHashHalfWordMask())))); - long32Atput(oop + 4, ((((long32At(oop + 4)) | 0x3FFFFF) - 0x3FFFFF)) + (outIndex + topHashBit)); + assert((((outIndex + TopHashBit) >= 0) && ((outIndex + TopHashBit) <= (identityHashHalfWordMask())))); + long32Atput(oop + 4, ((((long32At(oop + 4)) | 0x3FFFFF) - 0x3FFFFF)) + (outIndex + TopHashBit)); setIsMarkedOfto(oop, 1); outIndex += 1; - l1: /* end newOutPointer:at:in:hashes:topHashBit: */; + l1: /* end newOutPointer:at:in:hashes: */; if (outIndex == 0) { /* no room in outPointers; fail */ @@ -36726,7 +36719,7 @@ /* oop is a new outPointer; allocate its oop */ - /* begin newOutPointer:at:in:hashes:topHashBit: */ + /* begin newOutPointer:at:in:hashes: */ if (outIndex >= (numSlotsOf(outPointerArray))) { /* no room in outPointers; fail */ @@ -36752,11 +36745,11 @@ long32Atput((savedOutHashes + BaseHeaderSize) + (outIndex << 2), (long32At(oop + 4)) & 0x3FFFFF); /* begin setHashBitsOf:to: */ flag("endianness"); - assert((((outIndex + topHashBit) >= 0) && ((outIndex + topHashBit) <= (identityHashHalfWordMask())))); - long32Atput(oop + 4, ((((long32At(oop + 4)) | 0x3FFFFF) - 0x3FFFFF)) + (outIndex + topHashBit)); + assert((((outIndex + TopHashBit) >= 0) && ((outIndex + TopHashBit) <= (identityHashHalfWordMask())))); + long32Atput(oop + 4, ((((long32At(oop + 4)) | 0x3FFFFF) - 0x3FFFFF)) + (outIndex + TopHashBit)); setIsMarkedOfto(oop, 1); outIndex += 1; - l2: /* end newOutPointer:at:in:hashes:topHashBit: */; + l2: /* end newOutPointer:at:in:hashes: */; if (outIndex == 0) { /* no room in outPointers; fail */ @@ -36764,10 +36757,10 @@ return -1; } } - /* begin mappedOopOf:topHashBit:topOopBit: */ + /* begin mappedInSegmentOopOf: */ hash = (long32At(oop + 4)) & 0x3FFFFF; - oop = (hash & topHashBit - ? ((hash - topHashBit) * BytesPerOop) + topOopBit + oop = (hash & TopHashBit + ? ((hash - TopHashBit) * BytesPerOop) + TopOopBit : hash * 8); /* begin storePointerUnchecked:ofObject:withValue: */ assert(!(isForwarded(objOop))); @@ -45297,7 +45290,8 @@ } -/* Enumerate the objects in objArray, unmarking them and restoring their +/* This is part of storeImageSegmentInto:outPointers:roots:. + Enumerate the objects in objArray, unmarking them and restoring their hashes from the corresponding 32-bit slots in savedHashes. The first unused entry in objArray will have a non-hash value entry in savedHashes. Free Modified: branches/Cog/nsspurstacksrc/vm/interp.c =================================================================== --- branches/Cog/nsspurstacksrc/vm/interp.c 2015-02-11 03:01:24 UTC (rev 3251) +++ branches/Cog/nsspurstacksrc/vm/interp.c 2015-02-11 19:21:48 UTC (rev 3252) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1050 uuid: ad3a825c-97ba-4d01-a0e7-637af8cbf52b + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1053 uuid: 86f23972-c4fa-430d-93b9-865bb86a098d from - StackInterpreter VMMaker.oscog-eem.1050 uuid: ad3a825c-97ba-4d01-a0e7-637af8cbf52b + StackInterpreter VMMaker.oscog-eem.1053 uuid: 86f23972-c4fa-430d-93b9-865bb86a098d */ -static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1050 uuid: ad3a825c-97ba-4d01-a0e7-637af8cbf52b " __DATE__ ; +static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1053 uuid: 86f23972-c4fa-430d-93b9-865bb86a098d " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -315,6 +315,8 @@ #define TheInterruptSemaphore 30 #define TheLowSpaceSemaphore 17 #define TheTimerSemaphore 29 +#define TopHashBit 0x200000 +#define TopOopBit 0x80000000UL #define TrueObject 2 #define V3PrimitiveBitsMask 0x200003FE #define ValueIndex 1 @@ -2103,7 +2105,7 @@ /* 575 */ (void (*)(void))0, 0 }; char expensiveAsserts = 0; -const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscog-eem.1050"; +const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscog-eem.1053"; volatile int sendTrace; sqInt suppressHeartbeatFlag; @@ -32138,7 +32140,8 @@ } -/* Copy objOop into the segment beginning at segAddr, and forward it to the +/* This is part of storeImageSegmentInto:outPointers:roots:. + Copy objOop into the segment beginning at segAddr, and forward it to the copy. If it is a class in the class table, set the copy's hash to 0 for reassignment on load, and mark it as a class by setting its isRemembered bit. @@ -36051,9 +36054,6 @@ sqInt slotBytes1; sqInt stopAddr; sqInt stopAddr1; - sqInt topHashBit; - sqInt topHashBit1; - sqInt topOopBit; /* begin numSlotsOf: */ flag("endianness"); @@ -36144,8 +36144,6 @@ numOutPointers = (numSlots4 == 0xFF ? longAt(outPointerArray - BaseHeaderSize) : numSlots4); - topHashBit = 1 << (22 - 1); - topOopBit = ((1 << BytesPerOop) * 8) - 1; /* begin objectStartingAt: */ numSlots13 = byteAt(segmentStart + 7); objOop1 = (numSlots13 == 0xFF @@ -36160,12 +36158,12 @@ /* validate the class ref, but don't update it until any internal classes have been added to the class table. */ classIndex = ((longAt(objOop1)) & 0x3FFFFF) - 16; - if (classIndex & topHashBit) { - if ((classIndex - topHashBit) >= numOutPointers) { + if (classIndex & TopHashBit) { + if ((classIndex - TopHashBit) >= numOutPointers) { errorCode = PrimErrBadIndex; goto l2; } - mappedOop = longAt((outPointerArray + BaseHeaderSize) + ((classIndex - topHashBit) << (shiftForWord()))); + mappedOop = longAt((outPointerArray + BaseHeaderSize) + ((classIndex - TopHashBit) << (shiftForWord()))); hash = (long32At(mappedOop + 4)) & 0x3FFFFF; if (!((hash > 0x1F) && ((classOrNilAtIndex(hash)) == mappedOop))) { @@ -36189,8 +36187,8 @@ for (i = 0, iLimiT = ((numPointerSlotsOf(objOop1)) - 1); i <= iLimiT; i += 1) { oop1 = longAt((objOop1 + BaseHeaderSize) + (i << (shiftForWord()))); if ((oop1 & 3) == 0) { - if (oop1 & topOopBit) { - if (((oop1 = (oop1 - topOopBit) / BytesPerOop)) >= numOutPointers) { + if (oop1 & TopOopBit) { + if (((oop1 = (oop1 - TopOopBit) / BytesPerOop)) >= numOutPointers) { errorCode = PrimErrBadIndex; goto l2; } @@ -36243,7 +36241,6 @@ return errorCode; } /* begin assignClassIndicesAndPinFrom:to:outPointers: */ - topHashBit1 = 1 << (22 - 1); /* begin objectStartingAt: */ numSlots5 = byteAt(segmentStart + 7); objOop2 = (numSlots5 == 0xFF @@ -36255,8 +36252,8 @@ or into outPointers. See mapOopsFrom:to:outPointers:outHashes:. */ classRef = ((longAt(objOop2)) & 0x3FFFFF) - 16; - classOop = (classRef & topHashBit1 - ? longAt((outPointerArray + BaseHeaderSize) + ((classRef - topHashBit1) << (shiftForWord()))) + classOop = (classRef & TopHashBit + ? longAt((outPointerArray + BaseHeaderSize) + ((classRef - TopHashBit) << (shiftForWord()))) : (classRef * 8) + segmentStart); classIndex1 = (long32At(classOop + 4)) & 0x3FFFFF; assert((classIndex1 > (lastClassIndexPun())) @@ -36637,8 +36634,6 @@ sqInt outIndex; usqInt p; sqInt segIndex; - sqInt topHashBit; - sqInt topOopBit; outIndex = 0; /* begin fillObj:numSlots:with: */ @@ -36654,8 +36649,6 @@ longAtput(p, GIV(nilObj)); longAtput(p + 4, GIV(nilObj)); } - topHashBit = 1 << (22 - 1); - topOopBit = ((1 << BytesPerOop) * 8) - 1; /* begin objectStartingAt: */ numSlots1 = byteAt(segStart + 7); objOop = (numSlots1 == 0xFF @@ -36667,7 +36660,7 @@ /* oop is a new outPointer; allocate its oop */ - /* begin newOutPointer:at:in:hashes:topHashBit: */ + /* begin newOutPointer:at:in:hashes: */ if (outIndex >= (numSlotsOf(outPointerArray))) { /* no room in outPointers; fail */ @@ -36693,11 +36686,11 @@ long32Atput((savedOutHashes + BaseHeaderSize) + (outIndex << 2), (long32At(oop + 4)) & 0x3FFFFF); /* begin setHashBitsOf:to: */ flag("endianness"); - assert((((outIndex + topHashBit) >= 0) && ((outIndex + topHashBit) <= (identityHashHalfWordMask())))); - long32Atput(oop + 4, ((((long32At(oop + 4)) | 0x3FFFFF) - 0x3FFFFF)) + (outIndex + topHashBit)); + assert((((outIndex + TopHashBit) >= 0) && ((outIndex + TopHashBit) <= (identityHashHalfWordMask())))); + long32Atput(oop + 4, ((((long32At(oop + 4)) | 0x3FFFFF) - 0x3FFFFF)) + (outIndex + TopHashBit)); setIsMarkedOfto(oop, 1); outIndex += 1; - l1: /* end newOutPointer:at:in:hashes:topHashBit: */; + l1: /* end newOutPointer:at:in:hashes: */; if (outIndex == 0) { /* no room in outPointers; fail */ @@ -36717,7 +36710,7 @@ /* oop is a new outPointer; allocate its oop */ - /* begin newOutPointer:at:in:hashes:topHashBit: */ + /* begin newOutPointer:at:in:hashes: */ if (outIndex >= (numSlotsOf(outPointerArray))) { /* no room in outPointers; fail */ @@ -36743,11 +36736,11 @@ long32Atput((savedOutHashes + BaseHeaderSize) + (outIndex << 2), (long32At(oop + 4)) & 0x3FFFFF); /* begin setHashBitsOf:to: */ flag("endianness"); - assert((((outIndex + topHashBit) >= 0) && ((outIndex + topHashBit) <= (identityHashHalfWordMask())))); - long32Atput(oop + 4, ((((long32At(oop + 4)) | 0x3FFFFF) - 0x3FFFFF)) + (outIndex + topHashBit)); + assert((((outIndex + TopHashBit) >= 0) && ((outIndex + TopHashBit) <= (identityHashHalfWordMask())))); + long32Atput(oop + 4, ((((long32At(oop + 4)) | 0x3FFFFF) - 0x3FFFFF)) + (outIndex + TopHashBit)); setIsMarkedOfto(oop, 1); outIndex += 1; - l2: /* end newOutPointer:at:in:hashes:topHashBit: */; + l2: /* end newOutPointer:at:in:hashes: */; if (outIndex == 0) { /* no room in outPointers; fail */ @@ -36755,10 +36748,10 @@ return -1; } } - /* begin mappedOopOf:topHashBit:topOopBit: */ + /* begin mappedInSegmentOopOf: */ hash = (long32At(oop + 4)) & 0x3FFFFF; - oop = (hash & topHashBit - ? ((hash - topHashBit) * BytesPerOop) + topOopBit + oop = (hash & TopHashBit + ? ((hash - TopHashBit) * BytesPerOop) + TopOopBit : hash * 8); /* begin storePointerUnchecked:ofObject:withValue: */ assert(!(isForwarded(objOop))); @@ -45288,7 +45281,8 @@ } -/* Enumerate the objects in objArray, unmarking them and restoring their +/* This is part of storeImageSegmentInto:outPointers:roots:. + Enumerate the objects in objArray, unmarking them and restoring their hashes from the corresponding 32-bit slots in savedHashes. The first unused entry in objArray will have a non-hash value entry in savedHashes. Free Property changes on: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h ___________________________________________________________________ Modified: checkindate - Tue Feb 10 19:01:40 PST 2015 + Wed Feb 11 11:20:59 PST 2015 Modified: branches/Cog/spursistasrc/vm/cointerp.c =================================================================== --- branches/Cog/spursistasrc/vm/cointerp.c 2015-02-11 03:01:24 UTC (rev 3251) +++ branches/Cog/spursistasrc/vm/cointerp.c 2015-02-11 19:21:48 UTC (rev 3252) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1050 uuid: ad3a825c-97ba-4d01-a0e7-637af8cbf52b + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1053 uuid: 86f23972-c4fa-430d-93b9-865bb86a098d from - CoInterpreter VMMaker.oscog-eem.1050 uuid: ad3a825c-97ba-4d01-a0e7-637af8cbf52b + CoInterpreter VMMaker.oscog-eem.1053 uuid: 86f23972-c4fa-430d-93b9-865bb86a098d */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1050 uuid: ad3a825c-97ba-4d01-a0e7-637af8cbf52b " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1053 uuid: 86f23972-c4fa-430d-93b9-865bb86a098d " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -350,6 +350,8 @@ #define TheInterruptSemaphore 30 #define TheLowSpaceSemaphore 17 #define TheTimerSemaphore 29 +#define TopHashBit 0x200000 +#define TopOopBit 0x80000000UL #define TraceBlockActivation 5 #define TraceBlockCreation 7 #define TraceBufferSize 768 @@ -2355,7 +2357,7 @@ /*560*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, 0, 0, 0,-1,-1 }; char expensiveAsserts = 0; -const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreterPrimitives VMMaker.oscog-eem.1050]"; +const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreterPrimitives VMMaker.oscog-eem.1053]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -45439,7 +45441,8 @@ } -/* Copy objOop into the segment beginning at segAddr, and forward it to the +/* This is part of storeImageSegmentInto:outPointers:roots:. + Copy objOop into the segment beginning at segAddr, and forward it to the copy. If it is a class in the class table, set the copy's hash to 0 for reassignment on load, and mark it as a class by setting its isRemembered bit. @@ -49362,9 +49365,6 @@ sqInt slotBytes1; sqInt stopAddr; sqInt stopAddr1; - sqInt topHashBit; - sqInt topHashBit1; - sqInt topOopBit; /* begin numSlotsOf: */ flag("endianness"); @@ -49455,8 +49455,6 @@ numOutPointers = (numSlots4 == 0xFF ? longAt(outPointerArray - BaseHeaderSize) : numSlots4); - topHashBit = 1 << (22 - 1); - topOopBit = ((1 << BytesPerOop) * 8) - 1; /* begin objectStartingAt: */ numSlots13 = byteAt(segmentStart + 7); objOop1 = (numSlots13 == 0xFF @@ -49471,12 +49469,12 @@ /* validate the class ref, but don't update it until any internal classes have been added to the class table. */ classIndex = ((longAt(objOop1)) & 0x3FFFFF) - 16; - if (classIndex & topHashBit) { - if ((classIndex - topHashBit) >= numOutPointers) { + if (classIndex & TopHashBit) { + if ((classIndex - TopHashBit) >= numOutPointers) { errorCode = PrimErrBadIndex; goto l2; } - mappedOop = longAt((outPointerArray + BaseHeaderSize) + ((classIndex - topHashBit) << (shiftForWord()))); + mappedOop = longAt((outPointerArray + BaseHeaderSize) + ((classIndex - TopHashBit) << (shiftForWord()))); hash = (long32At(mappedOop + 4)) & 0x3FFFFF; if (!((hash > 0x1F) && ((classOrNilAtIndex(hash)) == mappedOop))) { @@ -49500,8 +49498,8 @@ for (i = 0, iLimiT = ((numPointerSlotsOf(objOop1)) - 1); i <= iLimiT; i += 1) { oop1 = longAt((objOop1 + BaseHeaderSize) + (i << (shiftForWord()))); if ((oop1 & 3) == 0) { - if (oop1 & topOopBit) { - if (((oop1 = (oop1 - topOopBit) / BytesPerOop)) >= numOutPointers) { + if (oop1 & TopOopBit) { + if (((oop1 = (oop1 - TopOopBit) / BytesPerOop)) >= numOutPointers) { errorCode = PrimErrBadIndex; goto l2; } @@ -49554,7 +49552,6 @@ return errorCode; } /* begin assignClassIndicesAndPinFrom:to:outPointers: */ - topHashBit1 = 1 << (22 - 1); /* begin objectStartingAt: */ numSlots5 = byteAt(segmentStart + 7); objOop2 = (numSlots5 == 0xFF @@ -49566,8 +49563,8 @@ or into outPointers. See mapOopsFrom:to:outPointers:outHashes:. */ classRef = ((longAt(objOop2)) & 0x3FFFFF) - 16; - classOop = (classRef & topHashBit1 - ? longAt((outPointerArray + BaseHeaderSize) + ((classRef - topHashBit1) << (shiftForWord()))) + classOop = (classRef & TopHashBit + ? longAt((outPointerArray + BaseHeaderSize) + ((classRef - TopHashBit) << (shiftForWord()))) : (classRef * 8) + segmentStart); classIndex1 = (long32At(classOop + 4)) & 0x3FFFFF; assert((classIndex1 > (lastClassIndexPun())) @@ -49948,8 +49945,6 @@ sqInt outIndex; usqInt p; sqInt segIndex; - sqInt topHashBit; - sqInt topOopBit; outIndex = 0; /* begin fillObj:numSlots:with: */ @@ -49965,8 +49960,6 @@ longAtput(p, GIV(nilObj)); longAtput(p + 4, GIV(nilObj)); } - topHashBit = 1 << (22 - 1); - topOopBit = ((1 << BytesPerOop) * 8) - 1; /* begin objectStartingAt: */ numSlots1 = byteAt(segStart + 7); objOop = (numSlots1 == 0xFF @@ -49978,7 +49971,7 @@ /* oop is a new outPointer; allocate its oop */ - /* begin newOutPointer:at:in:hashes:topHashBit: */ + /* begin newOutPointer:at:in:hashes: */ if (outIndex >= (numSlotsOf(outPointerArray))) { /* no room in outPointers; fail */ @@ -50004,11 +49997,11 @@ long32Atput((savedOutHashes + BaseHeaderSize) + (outIndex << 2), (long32At(oop + 4)) & 0x3FFFFF); /* begin setHashBitsOf:to: */ flag("endianness"); - assert((((outIndex + topHashBit) >= 0) && ((outIndex + topHashBit) <= (identityHashHalfWordMask())))); - long32Atput(oop + 4, ((((long32At(oop + 4)) | 0x3FFFFF) - 0x3FFFFF)) + (outIndex + topHashBit)); + assert((((outIndex + TopHashBit) >= 0) && ((outIndex + TopHashBit) <= (identityHashHalfWordMask())))); + long32Atput(oop + 4, ((((long32At(oop + 4)) | 0x3FFFFF) - 0x3FFFFF)) + (outIndex + TopHashBit)); setIsMarkedOfto(oop, 1); outIndex += 1; - l1: /* end newOutPointer:at:in:hashes:topHashBit: */; + l1: /* end newOutPointer:at:in:hashes: */; if (outIndex == 0) { /* no room in outPointers; fail */ @@ -50028,7 +50021,7 @@ /* oop is a new outPointer; allocate its oop */ - /* begin newOutPointer:at:in:hashes:topHashBit: */ + /* begin newOutPointer:at:in:hashes: */ if (outIndex >= (numSlotsOf(outPointerArray))) { /* no room in outPointers; fail */ @@ -50054,11 +50047,11 @@ long32Atput((savedOutHashes + BaseHeaderSize) + (outIndex << 2), (long32At(oop + 4)) & 0x3FFFFF); /* begin setHashBitsOf:to: */ flag("endianness"); - assert((((outIndex + topHashBit) >= 0) && ((outIndex + topHashBit) <= (identityHashHalfWordMask())))); - long32Atput(oop + 4, ((((long32At(oop + 4)) | 0x3FFFFF) - 0x3FFFFF)) + (outIndex + topHashBit)); + assert((((outIndex + TopHashBit) >= 0) && ((outIndex + TopHashBit) <= (identityHashHalfWordMask())))); + long32Atput(oop + 4, ((((long32At(oop + 4)) | 0x3FFFFF) - 0x3FFFFF)) + (outIndex + TopHashBit)); setIsMarkedOfto(oop, 1); outIndex += 1; - l2: /* end newOutPointer:at:in:hashes:topHashBit: */; + l2: /* end newOutPointer:at:in:hashes: */; if (outIndex == 0) { /* no room in outPointers; fail */ @@ -50066,10 +50059,10 @@ return -1; } } - /* begin mappedOopOf:topHashBit:topOopBit: */ + /* begin mappedInSegmentOopOf: */ hash = (long32At(oop + 4)) & 0x3FFFFF; - oop = (hash & topHashBit - ? ((hash - topHashBit) * BytesPerOop) + topOopBit + oop = (hash & TopHashBit + ? ((hash - TopHashBit) * BytesPerOop) + TopOopBit : hash * 8); /* begin storePointerUnchecked:ofObject:withValue: */ assert(!(isForwarded(objOop))); @@ -58737,7 +58730,8 @@ } -/* Enumerate the objects in objArray, unmarking them and restoring their +/* This is part of storeImageSegmentInto:outPointers:roots:. + Enumerate the objects in objArray, unmarking them and restoring their hashes from the corresponding 32-bit slots in savedHashes. The first unused entry in objArray will have a non-hash value entry in savedHashes. Free Modified: branches/Cog/spursistasrc/vm/cointerp.h =================================================================== --- branches/Cog/spursistasrc/vm/cointerp.h 2015-02-11 03:01:24 UTC (rev 3251) +++ branches/Cog/spursistasrc/vm/cointerp.h 2015-02-11 19:21:48 UTC (rev 3252) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1050 uuid: ad3a825c-97ba-4d01-a0e7-637af8cbf52b + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1053 uuid: 86f23972-c4fa-430d-93b9-865bb86a098d */ Modified: branches/Cog/spursistasrc/vm/gcc3x-cointerp.c =================================================================== --- branches/Cog/spursistasrc/vm/gcc3x-cointerp.c 2015-02-11 03:01:24 UTC (rev 3251) +++ branches/Cog/spursistasrc/vm/gcc3x-cointerp.c 2015-02-11 19:21:48 UTC (rev 3252) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1050 uuid: ad3a825c-97ba-4d01-a0e7-637af8cbf52b + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1053 uuid: 86f23972-c4fa-430d-93b9-865bb86a098d from - CoInterpreter VMMaker.oscog-eem.1050 uuid: ad3a825c-97ba-4d01-a0e7-637af8cbf52b + CoInterpreter VMMaker.oscog-eem.1053 uuid: 86f23972-c4fa-430d-93b9-865bb86a098d */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1050 uuid: ad3a825c-97ba-4d01-a0e7-637af8cbf52b " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1053 uuid: 86f23972-c4fa-430d-93b9-865bb86a098d " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -353,6 +353,8 @@ #define TheInterruptSemaphore 30 #define TheLowSpaceSemaphore 17 #define TheTimerSemaphore 29 +#define TopHashBit 0x200000 +#define TopOopBit 0x80000000UL #define TraceBlockActivation 5 #define TraceBlockCreation 7 #define TraceBufferSize 768 @@ -2358,7 +2360,7 @@ /*560*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, 0, 0, 0,-1,-1 }; char expensiveAsserts = 0; -const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreterPrimitives VMMaker.oscog-eem.1050]"; +const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreterPrimitives VMMaker.oscog-eem.1053]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -45448,7 +45450,8 @@ } -/* Copy objOop into the segment beginning at segAddr, and forward it to the +/* This is part of storeImageSegmentInto:outPointers:roots:. + Copy objOop into the segment beginning at segAddr, and forward it to the copy. If it is a class in the class table, set the copy's hash to 0 for reassignment on load, and mark it as a class by setting its isRemembered bit. @@ -49371,9 +49374,6 @@ sqInt slotBytes1; sqInt stopAddr; sqInt stopAddr1; - sqInt topHashBit; - sqInt topHashBit1; - sqInt topOopBit; /* begin numSlotsOf: */ flag("endianness"); @@ -49464,8 +49464,6 @@ numOutPointers = (numSlots4 == 0xFF ? longAt(outPointerArray - BaseHeaderSize) : numSlots4); - topHashBit = 1 << (22 - 1); - topOopBit = ((1 << BytesPerOop) * 8) - 1; /* begin objectStartingAt: */ numSlots13 = byteAt(segmentStart + 7); objOop1 = (numSlots13 == 0xFF @@ -49480,12 +49478,12 @@ /* validate the class ref, but don't update it until any internal classes have been added to the class table. */ classIndex = ((longAt(objOop1)) & 0x3FFFFF) - 16; - if (classIndex & topHashBit) { - if ((classIndex - topHashBit) >= numOutPointers) { + if (classIndex & TopHashBit) { + if ((classIndex - TopHashBit) >= numOutPointers) { errorCode = PrimErrBadIndex; goto l2; } - mappedOop = longAt((outPointerArray + BaseHeaderSize) + ((classIndex - topHashBit) << (shiftForWord()))); + mappedOop = longAt((outPointerArray + BaseHeaderSize) + ((classIndex - TopHashBit) << (shiftForWord()))); hash = (long32At(mappedOop + 4)) & 0x3FFFFF; if (!((hash > 0x1F) && ((classOrNilAtIndex(hash)) == mappedOop))) { @@ -49509,8 +49507,8 @@ for (i = 0, iLimiT = ((numPointerSlotsOf(objOop1)) - 1); i <= iLimiT; i += 1) { oop1 = longAt((objOop1 + BaseHeaderSize) + (i << (shiftForWord()))); if ((oop1 & 3) == 0) { - if (oop1 & topOopBit) { - if (((oop1 = (oop1 - topOopBit) / BytesPerOop)) >= numOutPointers) { + if (oop1 & TopOopBit) { + if (((oop1 = (oop1 - TopOopBit) / BytesPerOop)) >= numOutPointers) { errorCode = PrimErrBadIndex; goto l2; } @@ -49563,7 +49561,6 @@ return errorCode; } /* begin assignClassIndicesAndPinFrom:to:outPointers: */ - topHashBit1 = 1 << (22 - 1); /* begin objectStartingAt: */ numSlots5 = byteAt(segmentStart + 7); objOop2 = (numSlots5 == 0xFF @@ -49575,8 +49572,8 @@ or into outPointers. See mapOopsFrom:to:outPointers:outHashes:. */ classRef = ((longAt(objOop2)) & 0x3FFFFF) - 16; - classOop = (classRef & topHashBit1 - ? longAt((outPointerArray + BaseHeaderSize) + ((classRef - topHashBit1) << (shiftForWord()))) + classOop = (classRef & TopHashBit + ? longAt((outPointerArray + BaseHeaderSize) + ((classRef - TopHashBit) << (shiftForWord()))) : (classRef * 8) + segmentStart); classIndex1 = (long32At(classOop + 4)) & 0x3FFFFF; assert((classIndex1 > (lastClassIndexPun())) @@ -49957,8 +49954,6 @@ sqInt outIndex; usqInt p; sqInt segIndex; - sqInt topHashBit; - sqInt topOopBit; outIndex = 0; /* begin fillObj:numSlots:with: */ @@ -49974,8 +49969,6 @@ longAtput(p, GIV(nilObj)); longAtput(p + 4, GIV(nilObj)); } - topHashBit = 1 << (22 - 1); - topOopBit = ((1 << BytesPerOop) * 8) - 1; /* begin objectStartingAt: */ numSlots1 = byteAt(segStart + 7); objOop = (numSlots1 == 0xFF @@ -49987,7 +49980,7 @@ /* oop is a new outPointer; allocate its oop */ - /* begin newOutPointer:at:in:hashes:topHashBit: */ + /* begin newOutPointer:at:in:hashes: */ if (outIndex >= (numSlotsOf(outPointerArray))) { /* no room in outPointers; fail */ @@ -50013,11 +50006,11 @@ long32Atput((savedOutHashes + BaseHeaderSize) + (outIndex << 2), (long32At(oop + 4)) & 0x3FFFFF); /* begin setHashBitsOf:to: */ flag("endianness"); - assert((((outIndex + topHashBit) >= 0) && ((outIndex + topHashBit) <= (identityHashHalfWordMask())))); - long32Atput(oop + 4, ((((long32At(oop + 4)) | 0x3FFFFF) - 0x3FFFFF)) + (outIndex + topHashBit)); + assert((((outIndex + TopHashBit) >= 0) && ((outIndex + TopHashBit) <= (identityHashHalfWordMask())))); + long32Atput(oop + 4, ((((long32At(oop + 4)) | 0x3FFFFF) - 0x3FFFFF)) + (outIndex + TopHashBit)); setIsMarkedOfto(oop, 1); outIndex += 1; - l1: /* end newOutPointer:at:in:hashes:topHashBit: */; + l1: /* end newOutPointer:at:in:hashes: */; if (outIndex == 0) { /* no room in outPointers; fail */ @@ -50037,7 +50030,7 @@ /* oop is a new outPointer; allocate its oop */ - /* begin newOutPointer:at:in:hashes:topHashBit: */ + /* begin newOutPointer:at:in:hashes: */ if (outIndex >= (numSlotsOf(outPointerArray))) { /* no room in outPointers; fail */ @@ -50063,11 +50056,11 @@ long32Atput((savedOutHashes + BaseHeaderSize) + (outIndex << 2), (long32At(oop + 4)) & 0x3FFFFF); /* begin setHashBitsOf:to: */ flag("endianness"); - assert((((outIndex + topHashBit) >= 0) && ((outIndex + topHashBit) <= (identityHashHalfWordMask())))); - long32Atput(oop + 4, ((((long32At(oop + 4)) | 0x3FFFFF) - 0x3FFFFF)) + (outIndex + topHashBit)); + assert((((outIndex + TopHashBit) >= 0) && ((outIndex + TopHashBit) <= (identityHashHalfWordMask())))); + long32Atput(oop + 4, ((((long32At(oop + 4)) | 0x3FFFFF) - 0x3FFFFF)) + (outIndex + TopHashBit)); setIsMarkedOfto(oop, 1); outIndex += 1; - l2: /* end newOutPointer:at:in:hashes:topHashBit: */; + l2: /* end newOutPointer:at:in:hashes: */; if (outIndex == 0) { /* no room in outPointers; fail */ @@ -50075,10 +50068,10 @@ return -1; } } - /* begin mappedOopOf:topHashBit:topOopBit: */ + /* begin mappedInSegmentOopOf: */ hash = (long32At(oop + 4)) & 0x3FFFFF; - oop = (hash & topHashBit - ? ((hash - topHashBit) * BytesPerOop) + topOopBit + oop = (hash & TopHashBit + ? ((hash - TopHashBit) * BytesPerOop) + TopOopBit : hash * 8); /* begin storePointerUnchecked:ofObject:withValue: */ assert(!(isForwarded(objOop))); @@ -58746,7 +58739,8 @@ } -/* Enumerate the objects in objArray, unmarking them and restoring their +/* This is part of storeImageSegmentInto:outPointers:roots:. + Enumerate the objects in objArray, unmarking them and restoring their hashes from the corresponding 32-bit slots in savedHashes. The first unused entry in objArray will have a non-hash value entry in savedHashes. Free Modified: branches/Cog/spursrc/vm/cointerp.c =================================================================== --- branches/Cog/spursrc/vm/cointerp.c 2015-02-11 03:01:24 UTC (rev 3251) +++ branches/Cog/spursrc/vm/cointerp.c 2015-02-11 19:21:48 UTC (rev 3252) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1050 uuid: ad3a825c-97ba-4d01-a0e7-637af8cbf52b + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1053 uuid: 86f23972-c4fa-430d-93b9-865bb86a098d from - CoInterpreter VMMaker.oscog-eem.1050 uuid: ad3a825c-97ba-4d01-a0e7-637af8cbf52b + CoInterpreter VMMaker.oscog-eem.1053 uuid: 86f23972-c4fa-430d-93b9-865bb86a098d */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1050 uuid: ad3a825c-97ba-4d01-a0e7-637af8cbf52b " __DATE__ ; @@ Diff output truncated at 50000 characters. @@

1 0

VM Maker: VMMaker.oscog-eem.1053.mcz
by commits＠source.squeak.org 11 Feb '15

11 Feb '15

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.1053.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.1053 Author: eem Time: 11 February 2015, 11:10:38.333 am UUID: 86f23972-c4fa-430d-93b9-865bb86a098d Ancestors: VMMaker.oscog-eem.1052 ...and fix initialization of those constants on generation =============== Diff against VMMaker.oscog-eem.1052 =============== Item was changed: ----- Method: SpurMemoryManager class>>initializeObjectHeaderConstants (in category 'class initialization') ----- initializeObjectHeaderConstants BytesPerWord ifNil: [BytesPerWord := 4]. "May get called on fileIn, so supply default" BaseHeaderSize := 8. "This is still needed for VM generation." "These are used in image segments" + self ~~ SpurMemoryManager ifTrue: + [TopHashBit := 1 << (self basicNew identityHashFieldWidth - 1). + TopOopBit := 1 << (self basicNew bytesPerOop * 8 - 1)]! - TopHashBit := 1 << (self basicNew identityHashFieldWidth - 1). - TopOopBit := 1 << (self basicNew bytesPerOop * 8 - 1)!

1 0

VM Maker: VMMaker.oscog-eem.1052.mcz
by commits＠source.squeak.org 11 Feb '15

11 Feb '15

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.1052.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.1052 Author: eem Time: 11 February 2015, 11:06:52.97 am UUID: 95db113a-844c-43a2-8da1-a7943c926aee Ancestors: VMMaker.oscog-eem.1051 Spur: Fix idiocy with bit-position constants in image segments. Move the constants to class variables. Make sure every method is commented as being part of load or save. =============== Diff against VMMaker.oscog-eem.1051 =============== Item was changed: CogClass subclass: #SpurMemoryManager (excessive size, no diff calculated) Item was changed: ----- Method: SpurMemoryManager class>>initializeObjectHeaderConstants (in category 'class initialization') ----- initializeObjectHeaderConstants BytesPerWord ifNil: [BytesPerWord := 4]. "May get called on fileIn, so supply default" + BaseHeaderSize := 8. "This is still needed for VM generation." + + "These are used in image segments" + TopHashBit := 1 << (self basicNew identityHashFieldWidth - 1). + TopOopBit := 1 << (self basicNew bytesPerOop * 8 - 1)! - BaseHeaderSize := 8 "This is still needed for VM generation."! Item was changed: ----- Method: SpurMemoryManager>>assignClassIndicesAndPinFrom:to:outPointers: (in category 'image segment in/out') ----- assignClassIndicesAndPinFrom: segmentStart to: segmentLimit outPointers: outPointerArray "This is part of loadImageSegmentFrom:outPointers:. Make a final pass, assigning the real class indices and/or pinning pinned objects." + | objOop | - | objOop topHashBit | - topHashBit := 1 << (self identityHashFieldWidth - 1). objOop := self objectStartingAt: segmentStart. [objOop < segmentLimit] whileTrue: [| classRef classOop classIndex | "In the segment, class indices are offset indexes into the segment data, or into outPointers. See mapOopsFrom:to:outPointers:outHashes:." classRef := (self classIndexOf: objOop) - self firstClassIndexPun. + classOop := (classRef anyMask: TopHashBit) + ifTrue: [self fetchPointer: classRef - TopHashBit ofObject: outPointerArray] - classOop := (classRef anyMask: topHashBit) - ifTrue: [self fetchPointer: classRef - topHashBit ofObject: outPointerArray] ifFalse: [classRef * self allocationUnit + segmentStart]. classIndex := self rawHashBitsOf: classOop. self assert: (classIndex > self lastClassIndexPun and: [(self classOrNilAtIndex: classIndex) = classOop]). self setClassIndexOf: objOop to: classIndex. ((self isInNewSpace: objOop) and: [self isPinned: objOop]) ifTrue: [| oldClone | oldClone := self cloneInOldSpaceForPinning: objOop. oldClone ~= 0 ifTrue: [self setIsPinnedOf: oldClone to: true. self forward: objOop to: oldClone]]. objOop := self objectAfter: objOop limit: segmentLimit]. ! Item was changed: ----- Method: SpurMemoryManager>>copyObj:toAddr:startAt:stopAt: (in category 'image segment in/out') ----- copyObj: objOop toAddr: segAddr startAt: segStart stopAt: endSeg + "This is part of storeImageSegmentInto:outPointers:roots:. + Copy objOop into the segment beginning at segAddr, and forward it to the copy. - "Copy objOop into the segment beginning at segAddr, and forward it to the copy. If it is a class in the class table, set the copy's hash to 0 for reassignment on load, and mark it as a class by setting its isRemembered bit. Answer the next segmentAddr if successful. Answer an appropriate error code if not" "Copy the object..." | bodySize copy hash newOop | <inline: false> bodySize := self bytesInObject: objOop. (self oop: segAddr + bodySize isGreaterThanOrEqualTo: endSeg) ifTrue: [^PrimErrWritePastObject]. self mem: segAddr asVoidPointer cp: (self startOfObject: objOop) asVoidPointer y: bodySize. copy := self objectStartingAt: segAddr. "Clear remembered, mark bits of all headers copied into the segment (except classes)" self setIsRememberedOf: copy to: false; setIsMarkedOf: copy to: false. self ifAProxy: objOop updateCopy: copy. "If the object is a class, zero its identityHash (which is its classIndex) and set its isRemembered bit. It will be assigned a new hash and entered into the table on load." hash := self rawHashBitsOf: objOop. (hash > self lastClassIndexPun and: [(self classOrNilAtIndex: hash) = objOop]) ifTrue: [self setHashBitsOf: copy to: 0. self setIsRememberedOf: copy to: true]. newOop := copy - segStart / self allocationUnit. newOop > self maxIdentityHash ifTrue: [^PrimErrLimitExceeded]. self setHashBitsOf: objOop to: copy - segStart / self allocationUnit. self setIsMarkedOf: objOop to: true. "Answer the new end of segment" ^segAddr + bodySize! Item was changed: ----- Method: SpurMemoryManager>>enterClassesIntoClassTableFrom:to: (in category 'image segment in/out') ----- enterClassesIntoClassTableFrom: segmentStart to: segmentLimit + "This is part of loadImageSegmentFrom:outPointers:. + Scan for classes contained in the segment, entering them into the class table, - "Scan for classes contained in the segment, entering them into the class table, and clearing their isRemembered: bit. Classes are at the front, after the root array and have the remembered bit set. If the attempt succeeds, answer 0, otherwise remove all entered entries and answer an error code." | objOop errorCode| objOop := self objectAfter: (self objectStartingAt: segmentStart). [objOop < segmentLimit and: [self isRemembered: objOop]] whileTrue: [self setIsRememberedOf: objOop to: false. (errorCode := self enterIntoClassTable: objOop) ~= 0 ifTrue: [| oop | oop := objOop. objOop := self objectAfter: (self objectStartingAt: segmentStart). [objOop < oop] whileTrue: [self expungeFromClassTable: objOop. objOop := self objectAfter: objOop limit: segmentLimit]. ^errorCode]. objOop := self objectAfter: objOop limit: segmentLimit]. ^0! Item was changed: ----- Method: SpurMemoryManager>>ifAProxy:updateCopy: (in category 'image segment in/out') ----- ifAProxy: objOop updateCopy: copy + "This is part of storeImageSegmentInto:outPointers:roots:. + If the object being copied to the segment is weird and has exotic state, - "If the object being copied to the segment is weird and has exotic state, i.e. a married context or a jitted method, update the copy with the vanilla state." ((self isContext: objOop) and: [coInterpreter isMarriedOrWidowedContext: objOop]) ifTrue: [| numMediatedSlots | "Since the context is here via objectsReachableFromRoots: we know it cannot be divorced. I'd like to assert coInterpreter checkIsStillMarriedContext: objOop currentFP: framePointer, here but that requires access to framePointer." numMediatedSlots := coInterpreter numSlotsOfMarriedContext: objOop. 0 to: numMediatedSlots - 1 do: [:i| | oop | oop := coInterpreter fetchPointer: i ofMarriedContext: objOop. self storePointerUnchecked: i ofObject: copy withValue: oop]. "And make sure to nil the slots beyond the top of stack..." numMediatedSlots to: (self numSlotsOf: objOop) - 1 do: [:i| self storePointerUnchecked: i ofObject: copy withValue: nilObj]]! Item was changed: ----- Method: SpurMemoryManager>>mapOopsAndValidateClassRefsFrom:to:outPointers: (in category 'image segment in/out') ----- mapOopsAndValidateClassRefsFrom: segmentStart to: segmentLimit outPointers: outPointerArray "This is part of loadImageSegmentFrom:outPointers:. Scan through mapping oops and validating class references. Defer entering any class objects into the class table and/or pinning objects until the second pass in assignClassIndicesAndPinFrom:to:outPointers:." + | numOutPointers objOop | - | numOutPointers objOop topHashBit topOopBit | numOutPointers := self numSlotsOf: outPointerArray. - topHashBit := 1 << (self identityHashFieldWidth - 1). - topOopBit := 1 << self bytesPerOop * 8 - 1. objOop := self objectStartingAt: segmentStart. [objOop < segmentLimit] whileTrue: [| classIndex hash oop mappedOop | (self isMarked: objOop) ifTrue: [^PrimErrInappropriate]. classIndex := (self classIndexOf: objOop) - self firstClassIndexPun. "validate the class ref, but don't update it until any internal classes have been added to the class table." + (classIndex anyMask: TopHashBit) - (classIndex anyMask: topHashBit) ifTrue: + [classIndex - TopHashBit >= numOutPointers ifTrue: - [classIndex - topHashBit >= numOutPointers ifTrue: [^PrimErrBadIndex]. + mappedOop := self fetchPointer: classIndex - TopHashBit ofObject: outPointerArray. - mappedOop := self fetchPointer: classIndex - topHashBit ofObject: outPointerArray. hash := self rawHashBitsOf: mappedOop. (hash > self lastClassIndexPun and: [(self classOrNilAtIndex: hash) = mappedOop]) ifFalse: [^PrimErrInappropriate]] ifFalse: "The class is contained within the segment." [(oop := classIndex * self allocationUnit + segmentStart) >= segmentLimit ifTrue: [^PrimErrBadIndex]. (self rawHashBitsOf: oop) ~= 0 ifTrue: [^PrimErrInappropriate]]. 0 to: (self numPointerSlotsOf: objOop) - 1 do: [:i| oop := self fetchPointer: i ofObject: objOop. (self isNonImmediate: oop) ifTrue: + [(oop anyMask: TopOopBit) - [(oop anyMask: topOopBit) ifTrue: + [(oop := oop - TopOopBit / self bytesPerOop) >= numOutPointers ifTrue: - [(oop := oop - topOopBit / self bytesPerOop) >= numOutPointers ifTrue: [^PrimErrBadIndex]. mappedOop := self fetchPointer: oop ofObject: outPointerArray] ifFalse: [(oop bitAnd: self allocationUnit - 1) ~= 0 ifTrue: [^PrimErrInappropriate]. (mappedOop := oop + segmentStart) >= segmentLimit ifTrue: [^PrimErrBadIndex]]. self storePointerUnchecked: i ofObject: objOop withValue: mappedOop]]. objOop := self objectAfter: objOop limit: segmentLimit]. ^0! Item was changed: ----- Method: SpurMemoryManager>>mapOopsFrom:to:outPointers:outHashes: (in category 'image segment in/out') ----- mapOopsFrom: segStart to: segAddr outPointers: outPointerArray outHashes: savedOutHashes "This is part of storeImageSegmentInto:outPointers:roots:. Now scan, adding out pointers to the outPointersArray; all objects in arrayOfObjects have had their hashes set to point to their copies in segmentWordArray. Answer the outIndex if the scan succeded. Fail if outPointers is too small and answer -1." + | objOop outIndex | - | objOop outIndex topHashBit topOopBit | outIndex := 0. self fillObj: outPointerArray numSlots: (self numSlotsOf: outPointerArray) with: nilObj. - topHashBit := 1 << (self identityHashFieldWidth - 1). - topOopBit := 1 << self bytesPerOop * 8 - 1. objOop := self objectStartingAt: segStart. [objOop < segAddr] whileTrue: [| oop segIndex | oop := self fetchClassOfNonImm: objOop. (self isMarked: oop) ifFalse: "oop is a new outPointer; allocate its oop" + [outIndex := self newOutPointer: oop at: outIndex in: outPointerArray hashes: savedOutHashes. - [outIndex := self newOutPointer: oop at: outIndex in: outPointerArray hashes: savedOutHashes topHashBit: topHashBit. outIndex = 0 ifTrue:"no room in outPointers; fail" [^-1]]. "Set the clone's class index to an offset index into segmentWordArray. Use an offset so that code cannot confuse a clone with e.g. a forwarder." segIndex := self rawHashBitsOf: oop. self setClassIndexOf: objOop to: segIndex + self firstClassIndexPun. 0 to: (self numPointerSlotsOf: objOop) - 1 do: [:i| oop := self fetchPointer: i ofObject: objOop. (self isNonImmediate: oop) ifTrue: [(self isMarked: oop) ifFalse: "oop is a new outPointer; allocate its oop" + [outIndex := self newOutPointer: oop at: outIndex in: outPointerArray hashes: savedOutHashes. - [outIndex := self newOutPointer: oop at: outIndex in: outPointerArray hashes: savedOutHashes topHashBit: topHashBit. outIndex = 0 ifTrue: "no room in outPointers; fail" [^-1]]. + oop := self mappedInSegmentOopOf: oop. - oop := self mappedOopOf: oop topHashBit: topHashBit topOopBit: topOopBit.. self storePointerUnchecked: i ofObject: objOop withValue: oop]]. objOop := self objectAfter: objOop limit: segAddr]. ^outIndex! Item was added: + ----- Method: SpurMemoryManager>>mappedInSegmentOopOf: (in category 'image segment in/out') ----- + mappedInSegmentOopOf: objOop + "This is part of storeImageSegmentInto:outPointers:roots:. + objOop is an object whose hash has been set to its mapped oop in either the segment or the + out pointers. If its hash's top bit is set then it is in out pointers. Answer the mapped oop." + <inline: true> + | hash | + hash := self rawHashBitsOf: objOop. + ^(hash anyMask: TopHashBit) + ifTrue: [hash - TopHashBit * self bytesPerOop + TopOopBit] + ifFalse: [hash * self allocationUnit]! Item was removed: - ----- Method: SpurMemoryManager>>mappedOopOf:topHashBit:topOopBit: (in category 'image segment in/out') ----- - mappedOopOf: objOop topHashBit: topHashBit topOopBit: topOopBit - "objOop is an object whose hash has been set to its mapped oop in either the segment or the - out pointers. If its hash's top bit is set then it is in out pointers. Answer the mapped oop." - <inline: true> - | hash | - hash := self rawHashBitsOf: objOop. - ^(hash anyMask: topHashBit) - ifTrue: [hash - topHashBit * self bytesPerOop + topOopBit] - ifFalse: [hash * self allocationUnit]! Item was changed: ----- Method: SpurMemoryManager>>markObjectsIn: (in category 'image segment in/out') ----- markObjectsIn: arrayOfRoots + "This is part of storeImageSegmentInto:outPointers:roots:." self setIsMarkedOf: arrayOfRoots to: true. 0 to: (self numSlotsOf: arrayOfRoots) - 1 do: [:i| | oop | oop := self followField: i ofObject: arrayOfRoots. (self isNonImmediate: oop) ifTrue: [self setIsMarkedOf: oop to: true]]! Item was changed: ----- Method: SpurMemoryManager>>moveClassesForwardsIn: (in category 'image segment in/out') ----- moveClassesForwardsIn: arrayOfObjects + "This is part of storeImageSegmentInto:outPointers:roots:. + Both to expand the max size of segment and to reduce the length of the - "Both to expand the max size of segment and to reduce the length of the load-time pass that adds classes to the class table, move classes to the front of arrayOfObjects, leaving the root array as the first element." | there | there := 0. "if > 0, this is the index of the first non-class past the first element." 1 to: (self numSlotsOf: arrayOfObjects) - 1 do: [:here| | objOop hash tempObjOop | objOop := self fetchPointer: here ofObject: arrayOfObjects. hash := self rawHashBitsOf: objOop. (hash > self lastClassIndexPun and: [(self classOrNilAtIndex: hash) = objOop]) ifTrue: [there > 0 ifTrue: "if there is zero we're in a run of classes at the start so don't move" [tempObjOop := self fetchPointer: there ofObject: arrayOfObjects. self storePointerUnchecked: there ofObject: arrayOfObjects withValue: objOop. self storePointerUnchecked: here ofObject: arrayOfObjects withValue: tempObjOop. there := there + 1]] ifFalse: [there = 0 ifTrue: [there := here]]]! Item was added: + ----- Method: SpurMemoryManager>>newOutPointer:at:in:hashes: (in category 'image segment in/out') ----- + newOutPointer: oop at: outIndex in: outPointerArray hashes: savedOutHashes + "This is part of storeImageSegmentInto:outPointers:roots:. + oop is a new outPointer; allocate its oop, and answer the new outIndex. + If outPointerArray is full, answer 0." + <inline: true> + outIndex >= (self numSlotsOf: outPointerArray) ifTrue: + ["no room in outPointers; fail" + ^0]. + self storePointer: outIndex ofObject: outPointerArray withValue: oop. + self storeLong32: outIndex ofObject: savedOutHashes withValue: (self rawHashBitsOf: oop). + self setHashBitsOf: oop to: outIndex + TopHashBit. + self setIsMarkedOf: oop to: true. + ^outIndex + 1! Item was removed: - ----- Method: SpurMemoryManager>>newOutPointer:at:in:hashes:topHashBit: (in category 'image segment in/out') ----- - newOutPointer: oop at: outIndex in: outPointerArray hashes: savedOutHashes topHashBit: topHashBit - "oop is a new outPointer; allocate its oop, and answer the new outIndex. - If outPointerArray is full, answer 0." - <inline: true> - outIndex >= (self numSlotsOf: outPointerArray) ifTrue: - ["no room in outPointers; fail" - ^0]. - self storePointer: outIndex ofObject: outPointerArray withValue: oop. - self storeLong32: outIndex ofObject: savedOutHashes withValue: (self rawHashBitsOf: oop). - self setHashBitsOf: oop to: outIndex + topHashBit. - self setIsMarkedOf: oop to: true. - ^outIndex + 1! Item was changed: ----- Method: SpurMemoryManager>>objectsReachableFromRoots: (in category 'image segment in/out') ----- objectsReachableFromRoots: arrayOfRoots + "This is part of storeImageSegmentInto:outPointers:roots:. + Answer an Array of all the objects only reachable from the argument, an Array of root objects, - "Answer an Array of all the objects only reachable from the argument, an Array of root objects, starting with arrayOfRoots. If there is no space, answer a SmallInteger whose value is the number of slots required. This is used to collect the objects to include in an image segment on Spur, separate from creating the segment, hence simplifying the implementation. Thanks to Igor Stasenko for this idea." | freeChunk ptr start limit count oop objOop | self assert: (self isArray: arrayOfRoots). "Mark all objects except those only reachable from the arrayOfRoots by marking each object in arrayOfRoots and then marking all reachable objects (from the system roots). This leaves unmarked only objects reachable from the arrayOfRoots. N.B. A side-effect of the marking is that all forwarders in arrayOfRoots will be followed." self assert: self allObjectsUnmarked. self markObjectsIn: arrayOfRoots. self markObjects: false. "After the mark phase all unreachable weak slots will have been nilled and all active ephemerons fired." self assert: (self isEmptyObjStack: markStack). self assert: (self isEmptyObjStack: weaklingStack). self assert: self noUnscannedEphemerons. "Use the largest free chunk to answer the result." freeChunk := self allocateLargestFreeChunk. ptr := start := freeChunk + self baseHeaderSize. limit := self addressAfter: freeChunk. count := 0. "First put the arrayOfRoots; order is important." count := count + 1. ptr < limit ifTrue: [self longAt: ptr put: arrayOfRoots. ptr := ptr + self bytesPerOop]. 0 to: (self numSlotsOf: arrayOfRoots) - 1 do: [:i| oop := self fetchPointer: i ofObject: arrayOfRoots. (self isNonImmediate: oop) ifTrue: [self push: oop onObjStack: markStack]]. "Now collect the unmarked objects reachable from the roots." [self isEmptyObjStack: markStack] whileFalse: [objOop := self popObjStack: markStack. count := count + 1. ptr < limit ifTrue: [self longAt: ptr put: objOop. ptr := ptr + self bytesPerOop]. oop := self fetchClassOfNonImm: objOop. (self isMarked: oop) ifFalse: [self setIsMarkedOf: objOop to: true. self push: oop onObjStack: markStack]. ((self isContextNonImm: objOop) and: [coInterpreter isStillMarriedContext: objOop]) "widow now, before the loop" ifTrue: [0 to: (coInterpreter numSlotsOfMarriedContext: objOop) - 1 do: [:i| oop := coInterpreter fetchPointer: i ofMarriedContext: objOop. ((self isImmediate: oop) or: [self isMarked: oop]) ifFalse: [self setIsMarkedOf: objOop to: true. self push: oop onObjStack: markStack]]] ifFalse: [0 to: (self numPointerSlotsOf: objOop) - 1 do: [:i| oop := self fetchPointer: i ofObject: objOop. ((self isImmediate: oop) or: [self isMarked: oop]) ifFalse: [self setIsMarkedOf: objOop to: true. self push: oop onObjStack: markStack]]]]. self unmarkAllObjects. totalFreeOldSpace := totalFreeOldSpace - (self bytesInObject: freeChunk). "Now try and allocate the result" (count > (ptr - start / self bytesPerOop) "not enough room" or: [limit ~= ptr and: [limit - ptr <= self allocationUnit]]) ifTrue: "can't split a single word" [self freeChunkWithBytes: (self bytesInObject: freeChunk) at: (self startOfObject: freeChunk). self checkFreeSpace. ^self integerObjectOf: count]. "There's room; set the format, & classIndex and shorten." self setFormatOf: freeChunk to: self arrayFormat. self setClassIndexOf: freeChunk to: ClassArrayCompactIndex. self shorten: freeChunk toIndexableSize: count. self possibleRootStoreInto: freeChunk. self checkFreeSpace. self runLeakCheckerFor: GCModeImageSegment. ^freeChunk! Item was changed: ----- Method: SpurMemoryManager>>restoreObjectsIn:savedHashes: (in category 'image segment in/out') ----- restoreObjectsIn: objArray savedHashes: savedHashes + "This is part of storeImageSegmentInto:outPointers:roots:. + Enumerate the objects in objArray, unmarking them and restoring their hashes - "Enumerate the objects in objArray, unmarking them and restoring their hashes from the corresponding 32-bit slots in savedHashes. The first unused entry in objArray will have a non-hash value entry in savedHashes. Free savedHashes." <inline: false> 0 to: (self numSlotsOf: objArray) - 1 do: [:i| | hash oop | (hash := self fetchLong32: i ofObject: savedHashes) > self maxIdentityHash ifTrue: [(self isInOldSpace: savedHashes) ifTrue: [self freeObject: savedHashes]. ^self]. oop := self fetchPointer: i ofObject: objArray. self setHashBitsOf: oop to: hash. self setIsMarkedOf: oop to: false]. (self isInOldSpace: savedHashes) ifTrue: [self freeObject: savedHashes]! Item was changed: ----- Method: SpurMemoryManager>>return:restoringObjectsIn:savedHashes:and:savedHashes: (in category 'image segment in/out') ----- return: errCode restoringObjectsIn: firstArray savedHashes: firstSavedHashes and: secondArray savedHashes: secondSavedHashes + "This is part of storeImageSegmentInto:outPointers:roots:." self restoreObjectsIn: firstArray savedHashes: firstSavedHashes. self restoreObjectsIn: secondArray savedHashes: secondSavedHashes. self runLeakCheckerFor: GCModeImageSegment. self assert: self allObjectsUnmarked. ^errCode!

1 0

[commit][3251] CogVM source as per VMMaker.oscog-eem.1051
by commits＠squeakvm.org 11 Feb '15

11 Feb '15

Revision: 3251 Author: eliot Date: 2015-02-10 19:01:24 -0800 (Tue, 10 Feb 2015) Log Message: ----------- CogVM source as per VMMaker.oscog-eem.1051 ...and rescue compilation of the cogits given the change to checkIntegrityOfObjectReferencesInCode: in VMMaker.oscog-eem.1048 Modified Paths: -------------- branches/Cog/nscogsrc/vm/cogit.c branches/Cog/nscogsrc/vm/cogit.h branches/Cog/nsspursrc/vm/cogit.c branches/Cog/nsspursrc/vm/cogit.h branches/Cog/sistasrc/vm/cogit.c branches/Cog/sistasrc/vm/cogit.h branches/Cog/spursistasrc/vm/cogit.c branches/Cog/spursistasrc/vm/cogit.h branches/Cog/spursrc/vm/cogit.c branches/Cog/spursrc/vm/cogit.h branches/Cog/src/vm/cogit.c branches/Cog/src/vm/cogit.h Property Changed: ---------------- branches/Cog/platforms/Cross/vm/sqSCCSVersion.h Modified: branches/Cog/nscogsrc/vm/cogit.c =================================================================== --- branches/Cog/nscogsrc/vm/cogit.c 2015-02-11 02:46:48 UTC (rev 3250) +++ branches/Cog/nscogsrc/vm/cogit.c 2015-02-11 03:01:24 UTC (rev 3251) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.1048 uuid: 8c759c0d-f612-4018-8a05-45ec7f6af78f + CCodeGenerator VMMaker.oscog-eem.1051 uuid: 75c9356f-fb1e-4f2b-99a7-21725cccaa91 from - StackToRegisterMappingCogit VMMaker.oscog-eem.1048 uuid: 8c759c0d-f612-4018-8a05-45ec7f6af78f + StackToRegisterMappingCogit VMMaker.oscog-eem.1051 uuid: 75c9356f-fb1e-4f2b-99a7-21725cccaa91 */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1048 uuid: 8c759c0d-f612-4018-8a05-45ec7f6af78f " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1051 uuid: 75c9356f-fb1e-4f2b-99a7-21725cccaa91 " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -836,6 +836,7 @@ static sqInt genInnerPrimitiveNew(sqInt retNoffset) NoDbgRegParms; static sqInt genInnerPrimitiveStringAtPut(sqInt retNoffset) NoDbgRegParms; static sqInt getActiveContextAllocatesInMachineCode(void); +static sqInt hasSpurMemoryManagerAPI(void); static void maybeCompileRetryonPrimitiveFail(AbstractInstruction *retryInst, sqInt primIndex) NoDbgRegParms; static sqInt allYoungObjectsAgeInFullGC(void); static sqInt cacheTagIsMarked(sqInt cacheTag) NoDbgRegParms; @@ -9087,8 +9088,7 @@ if ((mapForperformUntilarg(cogMethod, checkIfValidOopRefpccogMethod, ((sqInt)cogMethod))) != 0) { ok = 0; } - if ((hasSpurMemoryManagerAPI()) - || (gcModes & GCModeNewSpace)) { + if (gcModes & GCModeNewSpace) { if (((isYoungObject((cogMethod->methodObject))) || (isYoung((cogMethod->selector)))) && (!((cogMethod->cmRefersToYoung)))) { @@ -15468,7 +15468,13 @@ return 0; } +static sqInt +hasSpurMemoryManagerAPI(void) +{ + return 0; +} + /* Object representations with lazy forwarding will want to check for forwarding pointers on primitive failure and retry the primitive if found. By default do nothing. */ Modified: branches/Cog/nscogsrc/vm/cogit.h =================================================================== --- branches/Cog/nscogsrc/vm/cogit.h 2015-02-11 02:46:48 UTC (rev 3250) +++ branches/Cog/nscogsrc/vm/cogit.h 2015-02-11 03:01:24 UTC (rev 3251) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.1048 uuid: 8c759c0d-f612-4018-8a05-45ec7f6af78f + CCodeGenerator VMMaker.oscog-eem.1051 uuid: 75c9356f-fb1e-4f2b-99a7-21725cccaa91 */ Modified: branches/Cog/nsspursrc/vm/cogit.c =================================================================== --- branches/Cog/nsspursrc/vm/cogit.c 2015-02-11 02:46:48 UTC (rev 3250) +++ branches/Cog/nsspursrc/vm/cogit.c 2015-02-11 03:01:24 UTC (rev 3251) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.1048 uuid: 8c759c0d-f612-4018-8a05-45ec7f6af78f + CCodeGenerator VMMaker.oscog-eem.1051 uuid: 75c9356f-fb1e-4f2b-99a7-21725cccaa91 from - StackToRegisterMappingCogit VMMaker.oscog-eem.1048 uuid: 8c759c0d-f612-4018-8a05-45ec7f6af78f + StackToRegisterMappingCogit VMMaker.oscog-eem.1051 uuid: 75c9356f-fb1e-4f2b-99a7-21725cccaa91 */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1048 uuid: 8c759c0d-f612-4018-8a05-45ec7f6af78f " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1051 uuid: 75c9356f-fb1e-4f2b-99a7-21725cccaa91 " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -895,6 +895,7 @@ static sqInt genStoreSourceRegslotIndexdestRegscratchReg(sqInt sourceReg, sqInt index, sqInt destReg, sqInt scratchReg) NoDbgRegParms; static sqInt genStoreSourceRegslotIndexintoNewObjectInDestReg(sqInt sourceReg, sqInt index, sqInt destReg) NoDbgRegParms; static sqInt getActiveContextAllocatesInMachineCode(void); +static sqInt hasSpurMemoryManagerAPI(void); static sqInt inlineCacheTagIsYoung(sqInt cacheTag) NoDbgRegParms; static sqInt inlineCacheTagsMayBeObjects(void); static sqInt isSmallIntegerTagNonZero(void); @@ -9105,18 +9106,16 @@ if ((mapForperformUntilarg(cogMethod, checkIfValidOopRefpccogMethod, ((sqInt)cogMethod))) != 0) { ok = 0; } - if ((hasSpurMemoryManagerAPI()) - || (gcModes & GCModeNewSpace)) { - if (((isYoungObject((cogMethod->methodObject))) - || (isYoung((cogMethod->selector)))) - && (!((cogMethod->cmRefersToYoung)))) { - print("CM "); - printHex(((sqInt)cogMethod)); - print(" refers to young but not marked as such"); - cr(); - ok = 0; - } + if (((isYoungObject((cogMethod->methodObject))) + || (isYoung((cogMethod->selector)))) + && (!((cogMethod->cmRefersToYoung)))) { + print("CM "); + printHex(((sqInt)cogMethod)); + print(" refers to young but not marked as such"); + cr(); + ok = 0; } + } else { if (((cogMethod->cmType)) == CMClosedPIC) { @@ -18179,7 +18178,13 @@ return 1; } +static sqInt +hasSpurMemoryManagerAPI(void) +{ + return 1; +} + /* Since all cache tags in Spur are class indices none of them are young or have to be updated in a scavenge. */ Modified: branches/Cog/nsspursrc/vm/cogit.h =================================================================== --- branches/Cog/nsspursrc/vm/cogit.h 2015-02-11 02:46:48 UTC (rev 3250) +++ branches/Cog/nsspursrc/vm/cogit.h 2015-02-11 03:01:24 UTC (rev 3251) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.1048 uuid: 8c759c0d-f612-4018-8a05-45ec7f6af78f + CCodeGenerator VMMaker.oscog-eem.1051 uuid: 75c9356f-fb1e-4f2b-99a7-21725cccaa91 */ Property changes on: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h ___________________________________________________________________ Modified: checkindate - Tue Feb 10 18:45:50 PST 2015 + Tue Feb 10 19:01:40 PST 2015 Modified: branches/Cog/sistasrc/vm/cogit.c =================================================================== --- branches/Cog/sistasrc/vm/cogit.c 2015-02-11 02:46:48 UTC (rev 3250) +++ branches/Cog/sistasrc/vm/cogit.c 2015-02-11 03:01:24 UTC (rev 3251) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.1048 uuid: 8c759c0d-f612-4018-8a05-45ec7f6af78f + CCodeGenerator VMMaker.oscog-eem.1051 uuid: 75c9356f-fb1e-4f2b-99a7-21725cccaa91 from - SistaStackToRegisterMappingCogit VMMaker.oscog-eem.1048 uuid: 8c759c0d-f612-4018-8a05-45ec7f6af78f + SistaStackToRegisterMappingCogit VMMaker.oscog-eem.1051 uuid: 75c9356f-fb1e-4f2b-99a7-21725cccaa91 */ -static char __buildInfo[] = "SistaStackToRegisterMappingCogit VMMaker.oscog-eem.1048 uuid: 8c759c0d-f612-4018-8a05-45ec7f6af78f " __DATE__ ; +static char __buildInfo[] = "SistaStackToRegisterMappingCogit VMMaker.oscog-eem.1051 uuid: 75c9356f-fb1e-4f2b-99a7-21725cccaa91 " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -827,6 +827,7 @@ static sqInt genInnerPrimitiveNew(sqInt retNoffset) NoDbgRegParms; static sqInt genInnerPrimitiveStringAtPut(sqInt retNoffset) NoDbgRegParms; static sqInt getActiveContextAllocatesInMachineCode(void); +static sqInt hasSpurMemoryManagerAPI(void); static void maybeCompileRetryonPrimitiveFail(AbstractInstruction *retryInst, sqInt primIndex) NoDbgRegParms; static sqInt allocateCounters(sqInt nCounters) NoDbgRegParms; static sqInt allYoungObjectsAgeInFullGC(void); @@ -9009,8 +9010,7 @@ if ((mapForperformUntilarg(cogMethod, checkIfValidOopRefpccogMethod, ((sqInt)cogMethod))) != 0) { ok = 0; } - if ((hasSpurMemoryManagerAPI()) - || (gcModes & GCModeNewSpace)) { + if (gcModes & GCModeNewSpace) { if (((isYoungObject((cogMethod->methodObject))) || (isYoung((cogMethod->selector)))) && (!((cogMethod->cmRefersToYoung)))) { @@ -14926,7 +14926,13 @@ return 0; } +static sqInt +hasSpurMemoryManagerAPI(void) +{ + return 0; +} + /* Object representations with lazy forwarding will want to check for forwarding pointers on primitive failure and retry the primitive if found. By default do nothing. */ Modified: branches/Cog/sistasrc/vm/cogit.h =================================================================== --- branches/Cog/sistasrc/vm/cogit.h 2015-02-11 02:46:48 UTC (rev 3250) +++ branches/Cog/sistasrc/vm/cogit.h 2015-02-11 03:01:24 UTC (rev 3251) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.1048 uuid: 8c759c0d-f612-4018-8a05-45ec7f6af78f + CCodeGenerator VMMaker.oscog-eem.1051 uuid: 75c9356f-fb1e-4f2b-99a7-21725cccaa91 */ Modified: branches/Cog/spursistasrc/vm/cogit.c =================================================================== --- branches/Cog/spursistasrc/vm/cogit.c 2015-02-11 02:46:48 UTC (rev 3250) +++ branches/Cog/spursistasrc/vm/cogit.c 2015-02-11 03:01:24 UTC (rev 3251) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.1048 uuid: 8c759c0d-f612-4018-8a05-45ec7f6af78f + CCodeGenerator VMMaker.oscog-eem.1051 uuid: 75c9356f-fb1e-4f2b-99a7-21725cccaa91 from - SistaStackToRegisterMappingCogit VMMaker.oscog-eem.1048 uuid: 8c759c0d-f612-4018-8a05-45ec7f6af78f + SistaStackToRegisterMappingCogit VMMaker.oscog-eem.1051 uuid: 75c9356f-fb1e-4f2b-99a7-21725cccaa91 */ -static char __buildInfo[] = "SistaStackToRegisterMappingCogit VMMaker.oscog-eem.1048 uuid: 8c759c0d-f612-4018-8a05-45ec7f6af78f " __DATE__ ; +static char __buildInfo[] = "SistaStackToRegisterMappingCogit VMMaker.oscog-eem.1051 uuid: 75c9356f-fb1e-4f2b-99a7-21725cccaa91 " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -891,6 +891,7 @@ static sqInt genStoreSourceRegslotIndexdestRegscratchReg(sqInt sourceReg, sqInt index, sqInt destReg, sqInt scratchReg) NoDbgRegParms; static sqInt genStoreSourceRegslotIndexintoNewObjectInDestReg(sqInt sourceReg, sqInt index, sqInt destReg) NoDbgRegParms; static sqInt getActiveContextAllocatesInMachineCode(void); +static sqInt hasSpurMemoryManagerAPI(void); static sqInt inlineCacheTagIsYoung(sqInt cacheTag) NoDbgRegParms; static sqInt inlineCacheTagsMayBeObjects(void); static sqInt isSmallIntegerTagNonZero(void); @@ -9039,18 +9040,16 @@ if ((mapForperformUntilarg(cogMethod, checkIfValidOopRefpccogMethod, ((sqInt)cogMethod))) != 0) { ok = 0; } - if ((hasSpurMemoryManagerAPI()) - || (gcModes & GCModeNewSpace)) { - if (((isYoungObject((cogMethod->methodObject))) - || (isYoung((cogMethod->selector)))) - && (!((cogMethod->cmRefersToYoung)))) { - print("CM "); - printHex(((sqInt)cogMethod)); - print(" refers to young but not marked as such"); - cr(); - ok = 0; - } + if (((isYoungObject((cogMethod->methodObject))) + || (isYoung((cogMethod->selector)))) + && (!((cogMethod->cmRefersToYoung)))) { + print("CM "); + printHex(((sqInt)cogMethod)); + print(" refers to young but not marked as such"); + cr(); + ok = 0; } + } else { if (((cogMethod->cmType)) == CMClosedPIC) { @@ -17502,7 +17501,13 @@ return 1; } +static sqInt +hasSpurMemoryManagerAPI(void) +{ + return 1; +} + /* Since all cache tags in Spur are class indices none of them are young or have to be updated in a scavenge. */ Modified: branches/Cog/spursistasrc/vm/cogit.h =================================================================== --- branches/Cog/spursistasrc/vm/cogit.h 2015-02-11 02:46:48 UTC (rev 3250) +++ branches/Cog/spursistasrc/vm/cogit.h 2015-02-11 03:01:24 UTC (rev 3251) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.1048 uuid: 8c759c0d-f612-4018-8a05-45ec7f6af78f + CCodeGenerator VMMaker.oscog-eem.1051 uuid: 75c9356f-fb1e-4f2b-99a7-21725cccaa91 */ Modified: branches/Cog/spursrc/vm/cogit.c =================================================================== --- branches/Cog/spursrc/vm/cogit.c 2015-02-11 02:46:48 UTC (rev 3250) +++ branches/Cog/spursrc/vm/cogit.c 2015-02-11 03:01:24 UTC (rev 3251) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.1048 uuid: 8c759c0d-f612-4018-8a05-45ec7f6af78f + CCodeGenerator VMMaker.oscog-eem.1051 uuid: 75c9356f-fb1e-4f2b-99a7-21725cccaa91 from - StackToRegisterMappingCogit VMMaker.oscog-eem.1048 uuid: 8c759c0d-f612-4018-8a05-45ec7f6af78f + StackToRegisterMappingCogit VMMaker.oscog-eem.1051 uuid: 75c9356f-fb1e-4f2b-99a7-21725cccaa91 */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1048 uuid: 8c759c0d-f612-4018-8a05-45ec7f6af78f " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1051 uuid: 75c9356f-fb1e-4f2b-99a7-21725cccaa91 " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -880,6 +880,7 @@ static sqInt genStoreSourceRegslotIndexdestRegscratchReg(sqInt sourceReg, sqInt index, sqInt destReg, sqInt scratchReg) NoDbgRegParms; static sqInt genStoreSourceRegslotIndexintoNewObjectInDestReg(sqInt sourceReg, sqInt index, sqInt destReg) NoDbgRegParms; static sqInt getActiveContextAllocatesInMachineCode(void); +static sqInt hasSpurMemoryManagerAPI(void); static sqInt inlineCacheTagIsYoung(sqInt cacheTag) NoDbgRegParms; static sqInt inlineCacheTagsMayBeObjects(void); static sqInt isSmallIntegerTagNonZero(void); @@ -8696,18 +8697,16 @@ if ((mapForperformUntilarg(cogMethod, checkIfValidOopRefpccogMethod, ((sqInt)cogMethod))) != 0) { ok = 0; } - if ((hasSpurMemoryManagerAPI()) - || (gcModes & GCModeNewSpace)) { - if (((isYoungObject((cogMethod->methodObject))) - || (isYoung((cogMethod->selector)))) - && (!((cogMethod->cmRefersToYoung)))) { - print("CM "); - printHex(((sqInt)cogMethod)); - print(" refers to young but not marked as such"); - cr(); - ok = 0; - } + if (((isYoungObject((cogMethod->methodObject))) + || (isYoung((cogMethod->selector)))) + && (!((cogMethod->cmRefersToYoung)))) { + print("CM "); + printHex(((sqInt)cogMethod)); + print(" refers to young but not marked as such"); + cr(); + ok = 0; } + } else { if (((cogMethod->cmType)) == CMClosedPIC) { @@ -16952,7 +16951,13 @@ return 1; } +static sqInt +hasSpurMemoryManagerAPI(void) +{ + return 1; +} + /* Since all cache tags in Spur are class indices none of them are young or have to be updated in a scavenge. */ Modified: branches/Cog/spursrc/vm/cogit.h =================================================================== --- branches/Cog/spursrc/vm/cogit.h 2015-02-11 02:46:48 UTC (rev 3250) +++ branches/Cog/spursrc/vm/cogit.h 2015-02-11 03:01:24 UTC (rev 3251) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.1048 uuid: 8c759c0d-f612-4018-8a05-45ec7f6af78f + CCodeGenerator VMMaker.oscog-eem.1051 uuid: 75c9356f-fb1e-4f2b-99a7-21725cccaa91 */ Modified: branches/Cog/src/vm/cogit.c =================================================================== --- branches/Cog/src/vm/cogit.c 2015-02-11 02:46:48 UTC (rev 3250) +++ branches/Cog/src/vm/cogit.c 2015-02-11 03:01:24 UTC (rev 3251) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.1048 uuid: 8c759c0d-f612-4018-8a05-45ec7f6af78f + CCodeGenerator VMMaker.oscog-eem.1051 uuid: 75c9356f-fb1e-4f2b-99a7-21725cccaa91 from - StackToRegisterMappingCogit VMMaker.oscog-eem.1048 uuid: 8c759c0d-f612-4018-8a05-45ec7f6af78f + StackToRegisterMappingCogit VMMaker.oscog-eem.1051 uuid: 75c9356f-fb1e-4f2b-99a7-21725cccaa91 */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1048 uuid: 8c759c0d-f612-4018-8a05-45ec7f6af78f " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1051 uuid: 75c9356f-fb1e-4f2b-99a7-21725cccaa91 " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -823,6 +823,7 @@ static sqInt genInnerPrimitiveNew(sqInt retNoffset) NoDbgRegParms; static sqInt genInnerPrimitiveStringAtPut(sqInt retNoffset) NoDbgRegParms; static sqInt getActiveContextAllocatesInMachineCode(void); +static sqInt hasSpurMemoryManagerAPI(void); static void maybeCompileRetryonPrimitiveFail(AbstractInstruction *retryInst, sqInt primIndex) NoDbgRegParms; static sqInt allYoungObjectsAgeInFullGC(void); static sqInt cacheTagIsMarked(sqInt cacheTag) NoDbgRegParms; @@ -8666,8 +8667,7 @@ if ((mapForperformUntilarg(cogMethod, checkIfValidOopRefpccogMethod, ((sqInt)cogMethod))) != 0) { ok = 0; } - if ((hasSpurMemoryManagerAPI()) - || (gcModes & GCModeNewSpace)) { + if (gcModes & GCModeNewSpace) { if (((isYoungObject((cogMethod->methodObject))) || (isYoung((cogMethod->selector)))) && (!((cogMethod->cmRefersToYoung)))) { @@ -14672,7 +14672,13 @@ return 0; } +static sqInt +hasSpurMemoryManagerAPI(void) +{ + return 0; +} + /* Object representations with lazy forwarding will want to check for forwarding pointers on primitive failure and retry the primitive if found. By default do nothing. */ Modified: branches/Cog/src/vm/cogit.h =================================================================== --- branches/Cog/src/vm/cogit.h 2015-02-11 02:46:48 UTC (rev 3250) +++ branches/Cog/src/vm/cogit.h 2015-02-11 03:01:24 UTC (rev 3251) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.1048 uuid: 8c759c0d-f612-4018-8a05-45ec7f6af78f + CCodeGenerator VMMaker.oscog-eem.1051 uuid: 75c9356f-fb1e-4f2b-99a7-21725cccaa91 */

1 0

VM Maker: VMMaker.oscog-eem.1051.mcz
by commits＠source.squeak.org 11 Feb '15

11 Feb '15

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.1051.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.1051 Author: eem Time: 10 February 2015, 6:58:51.832 pm UUID: 75c9356f-fb1e-4f2b-99a7-21725cccaa91 Ancestors: VMMaker.oscog-eem.1050 ...and rescue compilation of the cogits given the change to checkIntegrityOfObjectReferencesInCode: in VMMaker.oscog-eem.1048 =============== Diff against VMMaker.oscog-eem.1050 =============== Item was added: + ----- Method: CogObjectRepresentation>>hasSpurMemoryManagerAPI (in category 'testing') ----- + hasSpurMemoryManagerAPI + ^false! Item was added: + ----- Method: CogObjectRepresentationForSpur>>hasSpurMemoryManagerAPI (in category 'testing') ----- + hasSpurMemoryManagerAPI + ^true! Item was changed: ----- Method: Cogit>>checkIntegrityOfObjectReferencesInCode: (in category 'debugging') ----- checkIntegrityOfObjectReferencesInCode: gcModes <api> "Answer if all references to objects in machine-code are valid." | cogMethod ok count | <var: #cogMethod type: #'CogMethod *'> cogMethod := self cCoerceSimple: methodZoneBase to: #'CogMethod *'. ok := true. [cogMethod < methodZone limitZony] whileTrue: [cogMethod cmType ~= CMFree ifTrue: [cogMethod cmRefersToYoung ifTrue: [(count := methodZone occurrencesInYoungReferrers: cogMethod) ~= 1 ifTrue: [coInterpreter print: 'young referrer CM '; printHex: cogMethod asInteger. count = 0 ifTrue: [coInterpreter print: ' is not in youngReferrers'; cr] ifFalse: [coInterpreter print: ' is in youngReferrers '; printNum: count; print: ' times!!'; cr]. ok := false]]. (objectRepresentation checkValidOopReference: cogMethod selector) ifFalse: [coInterpreter print: 'object leak in CM '; printHex: cogMethod asInteger; print: ' selector'; cr. ok := false]. cogMethod cmType = CMMethod ifTrue: [self assert: cogMethod objectHeader = objectMemory nullHeaderForMachineCodeMethod. (objectRepresentation checkValidObjectReference: cogMethod methodObject) ifFalse: [coInterpreter print: 'object leak in CM '; printHex: cogMethod asInteger; print: ' methodObject'; cr. ok := false]. (objectMemory isOopCompiledMethod: cogMethod methodObject) ifFalse: [coInterpreter print: 'non-method in CM '; printHex: cogMethod asInteger; print: ' methodObject'; cr. ok := false]. (self mapFor: cogMethod performUntil: #checkIfValidOopRef:pc:cogMethod: arg: cogMethod asInteger) ~= 0 ifTrue: [ok := false]. + (objectRepresentation hasSpurMemoryManagerAPI - (objectMemory hasSpurMemoryManagerAPI or: [gcModes anyMask: GCModeNewSpace]) ifTrue: [(((objectMemory isYoungObject: cogMethod methodObject) or: [objectMemory isYoung: cogMethod selector]) and: [cogMethod cmRefersToYoung not]) ifTrue: [coInterpreter print: 'CM '; printHex: cogMethod asInteger; print: ' refers to young but not marked as such'; cr. ok := false]]] ifFalse: [cogMethod cmType = CMClosedPIC ifTrue: [(self checkValidObjectReferencesInClosedPIC: cogMethod) ifFalse: [ok := false]] ifFalse: [cogMethod cmType = CMOpenPIC ifTrue: [(self mapFor: cogMethod performUntil: #checkIfValidOopRef:pc:cogMethod: arg: cogMethod asInteger) ~= 0 ifTrue: [ok := false]]]]]. cogMethod := methodZone methodAfter: cogMethod]. ^ok!

1 0

[commit][3250] CogVM source as per VMMaker.oscog-eem.1050
by commits＠squeakvm.org 11 Feb '15

11 Feb '15

Revision: 3250 Author: eliot Date: 2015-02-10 18:46:48 -0800 (Tue, 10 Feb 2015) Log Message: ----------- CogVM source as per VMMaker.oscog-eem.1050 Spur: It's the atCache, stupid. Flush the atCache after every become. Eliminate duplicate flush in flushExternalPrimitives. General: Clean up a few more flushAtCache duplicates Introduce lastPointerOfArray: and use it to slim down become checking. Simplify getErrorObjectFromPrimFailCode. Use lastPointerOfMethodHeader: in makeBaseFrameFor: to same effect. Modified Paths: -------------- branches/Cog/nscogsrc/vm/cointerp.c branches/Cog/nscogsrc/vm/cointerp.h branches/Cog/nscogsrc/vm/gcc3x-cointerp.c branches/Cog/nsspursrc/vm/cointerp.c branches/Cog/nsspursrc/vm/cointerp.h branches/Cog/nsspursrc/vm/gcc3x-cointerp.c branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c branches/Cog/nsspurstacksrc/vm/interp.c branches/Cog/sistasrc/vm/cointerp.c branches/Cog/sistasrc/vm/cointerp.h branches/Cog/sistasrc/vm/gcc3x-cointerp.c branches/Cog/spursistasrc/vm/cointerp.c branches/Cog/spursistasrc/vm/cointerp.h branches/Cog/spursistasrc/vm/gcc3x-cointerp.c branches/Cog/spursrc/vm/cointerp.c branches/Cog/spursrc/vm/cointerp.h branches/Cog/spursrc/vm/gcc3x-cointerp.c branches/Cog/spurstack64src/vm/gcc3x-interp.c branches/Cog/spurstack64src/vm/interp.c branches/Cog/spurstacksrc/vm/gcc3x-interp.c branches/Cog/spurstacksrc/vm/interp.c branches/Cog/src/vm/cointerp.c branches/Cog/src/vm/cointerp.h branches/Cog/src/vm/cointerpmt.c branches/Cog/src/vm/cointerpmt.h branches/Cog/src/vm/gcc3x-cointerp.c branches/Cog/src/vm/gcc3x-cointerpmt.c branches/Cog/stacksrc/vm/gcc3x-interp.c branches/Cog/stacksrc/vm/interp.c Property Changed: ---------------- branches/Cog/platforms/Cross/vm/sqSCCSVersion.h Modified: branches/Cog/nscogsrc/vm/cointerp.c =================================================================== --- branches/Cog/nscogsrc/vm/cointerp.c 2015-02-10 23:19:26 UTC (rev 3249) +++ branches/Cog/nscogsrc/vm/cointerp.c 2015-02-11 02:46:48 UTC (rev 3250) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1048 uuid: 8c759c0d-f612-4018-8a05-45ec7f6af78f + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1050 uuid: ad3a825c-97ba-4d01-a0e7-637af8cbf52b from - CoInterpreter VMMaker.oscog-eem.1048 uuid: 8c759c0d-f612-4018-8a05-45ec7f6af78f + CoInterpreter VMMaker.oscog-eem.1050 uuid: ad3a825c-97ba-4d01-a0e7-637af8cbf52b */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1048 uuid: 8c759c0d-f612-4018-8a05-45ec7f6af78f " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1050 uuid: ad3a825c-97ba-4d01-a0e7-637af8cbf52b " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -833,6 +833,7 @@ static void initializeObjectMemory(sqInt bytesToShift) NoDbgRegParms; static sqInt isContextHeader(sqInt aHeader) NoDbgRegParms; sqInt isYoungObject(sqInt obj); +static sqInt lastPointerOfMethodHeader(sqInt methodHeader) NoDbgRegParms; sqInt lastPointerOf(sqInt objOop); sqInt leakCheckBecome(void); sqInt leakCheckFullGC(void); @@ -1455,8 +1456,8 @@ _iss sqInt overflowLimit; _iss StackPage * overflowedPage; _iss sqInt the2ndUnknownShort; -_iss sqInt atCache[AtCacheTotalSize + 1 /* 65 */]; _iss long methodCache[MethodCacheSize + 1 /* 4097 */]; +_iss sqInt atCache[AtCacheTotalSize + 1 /* 65 */]; _iss sqInt traceLog[TraceBufferSize /* 768 */]; _iss sqInt remapBuffer[RemapBufferSize + 1 /* 26 */]; _iss sqInt primTraceLog[256]; @@ -2096,7 +2097,7 @@ /* 575 */ (void (*)(void))0, 0 }; char expensiveAsserts = 0; -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.1048"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.1050"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -5436,7 +5437,7 @@ /* begin getErrorObjectFromPrimFailCode */ if (GIV(primFailCode) > 0) { table = longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (PrimErrTableIndex << (shiftForWord()))); - if (GIV(primFailCode) <= ((lastPointerOf(table)) / BytesPerWord)) { + if (GIV(primFailCode) <= (numSlotsOf(table))) { errorCode = longAt((table + BaseHeaderSize) + ((GIV(primFailCode) - 1) << (shiftForWord()))); goto l304; } @@ -13257,7 +13258,7 @@ /* begin getErrorObjectFromPrimFailCode */ if (GIV(primFailCode) > 0) { table = longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (PrimErrTableIndex << (shiftForWord()))); - if (GIV(primFailCode) <= ((lastPointerOf(table)) / BytesPerWord)) { + if (GIV(primFailCode) <= (numSlotsOf(table))) { errorCode = longAt((table + BaseHeaderSize) + ((GIV(primFailCode) - 1) << (shiftForWord()))); goto l1; } @@ -13385,7 +13386,7 @@ /* begin getErrorObjectFromPrimFailCode */ if (GIV(primFailCode) > 0) { table = longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (PrimErrTableIndex << (shiftForWord()))); - if (GIV(primFailCode) <= ((lastPointerOf(table)) / BytesPerWord)) { + if (GIV(primFailCode) <= (numSlotsOf(table))) { errorCode = longAt((table + BaseHeaderSize) + ((GIV(primFailCode) - 1) << (shiftForWord()))); goto l1; } @@ -17078,7 +17079,7 @@ && ((((((sqInt) header)) < 0 ? header & AlternateHeaderHasPrimFlag : header & V3PrimitiveBitsMask)) - && (theIP == (1 + (lastPointerOf(theMethod)))))) { + && (theIP == (1 + (lastPointerOfMethodHeader(header)))))) { theIP += ((((sqInt) header)) < 0 ? 3 : 0); @@ -18935,10 +18936,8 @@ sqInt i1; sqInt i11; sqInt i2; - sqInt i21; sqInt i3; sqInt i4; - sqInt i5; sqInt iLimiT; sqInt lastHash; sqInt memEnd; @@ -19182,22 +19181,22 @@ /* default */ GIV(thisClassIndex) = 5; - for (i5 = (InstanceSpecificationIndex + 1), iLimiT = (lengthOf(classArrayClass)); i5 <= iLimiT; i5 += 1) { - if ((longAt((classArrayClass + BaseHeaderSize) + ((i5 - 1) << (shiftForWord())))) == classArrayObj) { - GIV(thisClassIndex) = i5 - 1; + for (i4 = (InstanceSpecificationIndex + 1), iLimiT = (lengthOf(classArrayClass)); i4 <= iLimiT; i4 += 1) { + if ((longAt((classArrayClass + BaseHeaderSize) + ((i4 - 1) << (shiftForWord())))) == classArrayObj) { + GIV(thisClassIndex) = i4 - 1; } } /* default */ GIV(classNameIndex) = 6; - for (i5 = (InstanceSpecificationIndex + 1), iLimiT = (lengthOf(classArrayObj)); i5 <= iLimiT; i5 += 1) { - oop = longAt((classArrayObj + BaseHeaderSize) + ((i5 - 1) << (shiftForWord()))); + for (i4 = (InstanceSpecificationIndex + 1), iLimiT = (lengthOf(classArrayObj)); i4 <= iLimiT; i4 += 1) { + oop = longAt((classArrayObj + BaseHeaderSize) + ((i4 - 1) << (shiftForWord()))); if ((((oop & 1) == 0) && (((((usqInt) (longAt(oop))) >> (instFormatFieldLSB())) & 15) >= 8)) && (((lengthOf(oop)) == 5) && ((strncmp("Array", firstFixedField(oop), 5)) == 0))) { - GIV(classNameIndex) = i5 - 1; + GIV(classNameIndex) = i4 - 1; } } GIV(method) = (GIV(newMethod) = GIV(nilObj)); @@ -19216,31 +19215,23 @@ GIV(atCache)[i1] = 0; } unlinkAllSends(); - /* begin flushAtCache */ - for (i2 = 1; i2 <= AtCacheTotalSize; i2 += 1) { - GIV(atCache)[i2] = 0; - } /* begin initialCleanup */ /* begin flushMethodCache */ - for (i4 = 1; i4 <= MethodCacheSize; i4 += 1) { - GIV(methodCache)[i4] = 0; + for (i3 = 1; i3 <= MethodCacheSize; i3 += 1) { + GIV(methodCache)[i3] = 0; } /* this for primitiveExternalMethod */ GIV(lastMethodCacheProbeWrite) = 0; /* begin flushAtCache */ - for (i3 = 1; i3 <= AtCacheTotalSize; i3 += 1) { - GIV(atCache)[i3] = 0; + for (i2 = 1; i2 <= AtCacheTotalSize; i2 += 1) { + GIV(atCache)[i2] = 0; } unlinkAllSends(); - /* begin flushAtCache */ - for (i11 = 1; i11 <= AtCacheTotalSize; i11 += 1) { - GIV(atCache)[i11] = 0; - } /* begin flushExternalPrimitiveTable */ - for (i21 = 0; i21 < MaxExternalPrimitiveTableSize; i21 += 1) { - externalPrimitiveTable[i21] = 0; + for (i11 = 0; i11 < MaxExternalPrimitiveTableSize; i11 += 1) { + externalPrimitiveTable[i11] = 0; } GIV(externalPrimitiveTableFirstFreeIndex) = 0; GIV(profileSemaphore) = (GIV(profileProcess) = (GIV(profileMethod) = GIV(nilObj))); @@ -19723,7 +19714,7 @@ /* begin getErrorObjectFromPrimFailCode */ if (GIV(primFailCode) > 0) { table = longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (PrimErrTableIndex << (shiftForWord()))); - if (GIV(primFailCode) <= ((lastPointerOf(table)) / BytesPerWord)) { + if (GIV(primFailCode) <= (numSlotsOf(table))) { errorCode = longAt((table + BaseHeaderSize) + ((GIV(primFailCode) - 1) << (shiftForWord()))); goto l1; } @@ -19958,7 +19949,7 @@ /* begin getErrorObjectFromPrimFailCode */ if (GIV(primFailCode) > 0) { table = longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (PrimErrTableIndex << (shiftForWord()))); - if (GIV(primFailCode) <= ((lastPointerOf(table)) / BytesPerWord)) { + if (GIV(primFailCode) <= (numSlotsOf(table))) { errorCode = longAt((table + BaseHeaderSize) + ((GIV(primFailCode) - 1) << (shiftForWord()))); goto l1; } @@ -27532,7 +27523,6 @@ { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt i; sqInt i1; - sqInt i2; /* begin flushMethodCache */ for (i = 1; i <= MethodCacheSize; i += 1) { @@ -27547,10 +27537,6 @@ GIV(atCache)[i1] = 0; } unlinkAllSends(); - /* begin flushAtCache */ - for (i2 = 1; i2 <= AtCacheTotalSize; i2 += 1) { - GIV(atCache)[i2] = 0; - } } @@ -27568,7 +27554,6 @@ sqInt i; sqInt i1; sqInt i2; - sqInt i3; sqInt methodHeader; sqInt oop; sqInt oop1; @@ -27643,13 +27628,9 @@ GIV(atCache)[i1] = 0; } unlinkAllSends(); - /* begin flushAtCache */ - for (i2 = 1; i2 <= AtCacheTotalSize; i2 += 1) { - GIV(atCache)[i2] = 0; - } /* begin flushExternalPrimitiveTable */ - for (i3 = 0; i3 < MaxExternalPrimitiveTableSize; i3 += 1) { - externalPrimitiveTable[i3] = 0; + for (i2 = 0; i2 < MaxExternalPrimitiveTableSize; i2 += 1) { + externalPrimitiveTable[i2] = 0; } GIV(externalPrimitiveTableFirstFreeIndex) = 0; } @@ -33688,7 +33669,6 @@ sqInt i; sqInt i1; sqInt i2; - sqInt i3; sqInt methodHeader; sqInt moduleName; sqInt oop; @@ -33794,13 +33774,9 @@ GIV(atCache)[i1] = 0; } unlinkAllSends(); - /* begin flushAtCache */ - for (i2 = 1; i2 <= AtCacheTotalSize; i2 += 1) { - GIV(atCache)[i2] = 0; - } /* begin flushExternalPrimitiveTable */ - for (i3 = 0; i3 < MaxExternalPrimitiveTableSize; i3 += 1) { - externalPrimitiveTable[i3] = 0; + for (i2 = 0; i2 < MaxExternalPrimitiveTableSize; i2 += 1) { + externalPrimitiveTable[i2] = 0; } GIV(externalPrimitiveTableFirstFreeIndex) = 0; forceInterruptCheck(); @@ -37274,6 +37250,24 @@ } +/* Answer the byte offset of the last pointer field of a + CompiledMethod with the given header. Use a temp to + allow inlining given MULTIPLEBYTECODESETS complications. */ + +static sqInt +lastPointerOfMethodHeader(sqInt methodHeader) +{ + sqInt numLiterals; + + /* begin literalCountOfMethodHeader: */ + assert((methodHeader & 1)); + numLiterals = ((((sqInt) methodHeader)) < 0 + ? ((methodHeader >> 1)) & AlternateHeaderNumLiteralsMask + : (((usqInt) methodHeader) >> 10) & 0xFF); + return (((numLiterals + LiteralStart) - 1) * BytesPerOop) + BaseHeaderSize; +} + + /* Return the byte offset of the last pointer field of the given object. Can be used even when the type bits are not correct. Works with CompiledMethods, as well as ordinary objects. */ @@ -52103,7 +52097,7 @@ /* begin getErrorObjectFromPrimFailCode */ if (GIV(primFailCode) > 0) { table = longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (PrimErrTableIndex << (shiftForWord()))); - if (GIV(primFailCode) <= ((lastPointerOf(table)) / BytesPerWord)) { + if (GIV(primFailCode) <= (numSlotsOf(table))) { errorCode = longAt((table + BaseHeaderSize) + ((GIV(primFailCode) - 1) << (shiftForWord()))); goto l1; } Modified: branches/Cog/nscogsrc/vm/cointerp.h =================================================================== --- branches/Cog/nscogsrc/vm/cointerp.h 2015-02-10 23:19:26 UTC (rev 3249) +++ branches/Cog/nscogsrc/vm/cointerp.h 2015-02-11 02:46:48 UTC (rev 3250) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1048 uuid: 8c759c0d-f612-4018-8a05-45ec7f6af78f + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1050 uuid: ad3a825c-97ba-4d01-a0e7-637af8cbf52b */ Modified: branches/Cog/nscogsrc/vm/gcc3x-cointerp.c =================================================================== --- branches/Cog/nscogsrc/vm/gcc3x-cointerp.c 2015-02-10 23:19:26 UTC (rev 3249) +++ branches/Cog/nscogsrc/vm/gcc3x-cointerp.c 2015-02-11 02:46:48 UTC (rev 3250) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1048 uuid: 8c759c0d-f612-4018-8a05-45ec7f6af78f + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1050 uuid: ad3a825c-97ba-4d01-a0e7-637af8cbf52b from - CoInterpreter VMMaker.oscog-eem.1048 uuid: 8c759c0d-f612-4018-8a05-45ec7f6af78f + CoInterpreter VMMaker.oscog-eem.1050 uuid: ad3a825c-97ba-4d01-a0e7-637af8cbf52b */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1048 uuid: 8c759c0d-f612-4018-8a05-45ec7f6af78f " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1050 uuid: ad3a825c-97ba-4d01-a0e7-637af8cbf52b " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -836,6 +836,7 @@ static void initializeObjectMemory(sqInt bytesToShift) NoDbgRegParms; static sqInt isContextHeader(sqInt aHeader) NoDbgRegParms; sqInt isYoungObject(sqInt obj); +static sqInt lastPointerOfMethodHeader(sqInt methodHeader) NoDbgRegParms; sqInt lastPointerOf(sqInt objOop); sqInt leakCheckBecome(void); sqInt leakCheckFullGC(void); @@ -1458,8 +1459,8 @@ _iss sqInt overflowLimit; _iss StackPage * overflowedPage; _iss sqInt the2ndUnknownShort; -_iss sqInt atCache[AtCacheTotalSize + 1 /* 65 */]; _iss long methodCache[MethodCacheSize + 1 /* 4097 */]; +_iss sqInt atCache[AtCacheTotalSize + 1 /* 65 */]; _iss sqInt traceLog[TraceBufferSize /* 768 */]; _iss sqInt remapBuffer[RemapBufferSize + 1 /* 26 */]; _iss sqInt primTraceLog[256]; @@ -2099,7 +2100,7 @@ /* 575 */ (void (*)(void))0, 0 }; char expensiveAsserts = 0; -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.1048"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.1050"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -5445,7 +5446,7 @@ /* begin getErrorObjectFromPrimFailCode */ if (GIV(primFailCode) > 0) { table = longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (PrimErrTableIndex << (shiftForWord()))); - if (GIV(primFailCode) <= ((lastPointerOf(table)) / BytesPerWord)) { + if (GIV(primFailCode) <= (numSlotsOf(table))) { errorCode = longAt((table + BaseHeaderSize) + ((GIV(primFailCode) - 1) << (shiftForWord()))); goto l304; } @@ -13266,7 +13267,7 @@ /* begin getErrorObjectFromPrimFailCode */ if (GIV(primFailCode) > 0) { table = longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (PrimErrTableIndex << (shiftForWord()))); - if (GIV(primFailCode) <= ((lastPointerOf(table)) / BytesPerWord)) { + if (GIV(primFailCode) <= (numSlotsOf(table))) { errorCode = longAt((table + BaseHeaderSize) + ((GIV(primFailCode) - 1) << (shiftForWord()))); goto l1; } @@ -13394,7 +13395,7 @@ /* begin getErrorObjectFromPrimFailCode */ if (GIV(primFailCode) > 0) { table = longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (PrimErrTableIndex << (shiftForWord()))); - if (GIV(primFailCode) <= ((lastPointerOf(table)) / BytesPerWord)) { + if (GIV(primFailCode) <= (numSlotsOf(table))) { errorCode = longAt((table + BaseHeaderSize) + ((GIV(primFailCode) - 1) << (shiftForWord()))); goto l1; } @@ -17087,7 +17088,7 @@ && ((((((sqInt) header)) < 0 ? header & AlternateHeaderHasPrimFlag : header & V3PrimitiveBitsMask)) - && (theIP == (1 + (lastPointerOf(theMethod)))))) { + && (theIP == (1 + (lastPointerOfMethodHeader(header)))))) { theIP += ((((sqInt) header)) < 0 ? 3 : 0); @@ -18944,10 +18945,8 @@ sqInt i1; sqInt i11; sqInt i2; - sqInt i21; sqInt i3; sqInt i4; - sqInt i5; sqInt iLimiT; sqInt lastHash; sqInt memEnd; @@ -19191,22 +19190,22 @@ /* default */ GIV(thisClassIndex) = 5; - for (i5 = (InstanceSpecificationIndex + 1), iLimiT = (lengthOf(classArrayClass)); i5 <= iLimiT; i5 += 1) { - if ((longAt((classArrayClass + BaseHeaderSize) + ((i5 - 1) << (shiftForWord())))) == classArrayObj) { - GIV(thisClassIndex) = i5 - 1; + for (i4 = (InstanceSpecificationIndex + 1), iLimiT = (lengthOf(classArrayClass)); i4 <= iLimiT; i4 += 1) { + if ((longAt((classArrayClass + BaseHeaderSize) + ((i4 - 1) << (shiftForWord())))) == classArrayObj) { + GIV(thisClassIndex) = i4 - 1; } } /* default */ GIV(classNameIndex) = 6; - for (i5 = (InstanceSpecificationIndex + 1), iLimiT = (lengthOf(classArrayObj)); i5 <= iLimiT; i5 += 1) { - oop = longAt((classArrayObj + BaseHeaderSize) + ((i5 - 1) << (shiftForWord()))); + for (i4 = (InstanceSpecificationIndex + 1), iLimiT = (lengthOf(classArrayObj)); i4 <= iLimiT; i4 += 1) { + oop = longAt((classArrayObj + BaseHeaderSize) + ((i4 - 1) << (shiftForWord()))); if ((((oop & 1) == 0) && (((((usqInt) (longAt(oop))) >> (instFormatFieldLSB())) & 15) >= 8)) && (((lengthOf(oop)) == 5) && ((strncmp("Array", firstFixedField(oop), 5)) == 0))) { - GIV(classNameIndex) = i5 - 1; + GIV(classNameIndex) = i4 - 1; } } GIV(method) = (GIV(newMethod) = GIV(nilObj)); @@ -19225,31 +19224,23 @@ GIV(atCache)[i1] = 0; } unlinkAllSends(); - /* begin flushAtCache */ - for (i2 = 1; i2 <= AtCacheTotalSize; i2 += 1) { - GIV(atCache)[i2] = 0; - } /* begin initialCleanup */ /* begin flushMethodCache */ - for (i4 = 1; i4 <= MethodCacheSize; i4 += 1) { - GIV(methodCache)[i4] = 0; + for (i3 = 1; i3 <= MethodCacheSize; i3 += 1) { + GIV(methodCache)[i3] = 0; } /* this for primitiveExternalMethod */ GIV(lastMethodCacheProbeWrite) = 0; /* begin flushAtCache */ - for (i3 = 1; i3 <= AtCacheTotalSize; i3 += 1) { - GIV(atCache)[i3] = 0; + for (i2 = 1; i2 <= AtCacheTotalSize; i2 += 1) { + GIV(atCache)[i2] = 0; } unlinkAllSends(); - /* begin flushAtCache */ - for (i11 = 1; i11 <= AtCacheTotalSize; i11 += 1) { - GIV(atCache)[i11] = 0; - } /* begin flushExternalPrimitiveTable */ - for (i21 = 0; i21 < MaxExternalPrimitiveTableSize; i21 += 1) { - externalPrimitiveTable[i21] = 0; + for (i11 = 0; i11 < MaxExternalPrimitiveTableSize; i11 += 1) { + externalPrimitiveTable[i11] = 0; } GIV(externalPrimitiveTableFirstFreeIndex) = 0; GIV(profileSemaphore) = (GIV(profileProcess) = (GIV(profileMethod) = GIV(nilObj))); @@ -19732,7 +19723,7 @@ /* begin getErrorObjectFromPrimFailCode */ if (GIV(primFailCode) > 0) { table = longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (PrimErrTableIndex << (shiftForWord()))); - if (GIV(primFailCode) <= ((lastPointerOf(table)) / BytesPerWord)) { + if (GIV(primFailCode) <= (numSlotsOf(table))) { errorCode = longAt((table + BaseHeaderSize) + ((GIV(primFailCode) - 1) << (shiftForWord()))); goto l1; } @@ -19967,7 +19958,7 @@ /* begin getErrorObjectFromPrimFailCode */ if (GIV(primFailCode) > 0) { table = longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (PrimErrTableIndex << (shiftForWord()))); - if (GIV(primFailCode) <= ((lastPointerOf(table)) / BytesPerWord)) { + if (GIV(primFailCode) <= (numSlotsOf(table))) { errorCode = longAt((table + BaseHeaderSize) + ((GIV(primFailCode) - 1) << (shiftForWord()))); goto l1; } @@ -27541,7 +27532,6 @@ { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt i; sqInt i1; - sqInt i2; /* begin flushMethodCache */ for (i = 1; i <= MethodCacheSize; i += 1) { @@ -27556,10 +27546,6 @@ GIV(atCache)[i1] = 0; } unlinkAllSends(); - /* begin flushAtCache */ - for (i2 = 1; i2 <= AtCacheTotalSize; i2 += 1) { - GIV(atCache)[i2] = 0; - } } @@ -27577,7 +27563,6 @@ sqInt i; sqInt i1; sqInt i2; - sqInt i3; sqInt methodHeader; sqInt oop; sqInt oop1; @@ -27652,13 +27637,9 @@ GIV(atCache)[i1] = 0; } unlinkAllSends(); - /* begin flushAtCache */ - for (i2 = 1; i2 <= AtCacheTotalSize; i2 += 1) { - GIV(atCache)[i2] = 0; - } /* begin flushExternalPrimitiveTable */ - for (i3 = 0; i3 < MaxExternalPrimitiveTableSize; i3 += 1) { - externalPrimitiveTable[i3] = 0; + for (i2 = 0; i2 < MaxExternalPrimitiveTableSize; i2 += 1) { + externalPrimitiveTable[i2] = 0; } GIV(externalPrimitiveTableFirstFreeIndex) = 0; } @@ -33697,7 +33678,6 @@ sqInt i; sqInt i1; sqInt i2; - sqInt i3; sqInt methodHeader; sqInt moduleName; sqInt oop; @@ -33803,13 +33783,9 @@ GIV(atCache)[i1] = 0; } unlinkAllSends(); - /* begin flushAtCache */ - for (i2 = 1; i2 <= AtCacheTotalSize; i2 += 1) { - GIV(atCache)[i2] = 0; - } /* begin flushExternalPrimitiveTable */ - for (i3 = 0; i3 < MaxExternalPrimitiveTableSize; i3 += 1) { - externalPrimitiveTable[i3] = 0; + for (i2 = 0; i2 < MaxExternalPrimitiveTableSize; i2 += 1) { + externalPrimitiveTable[i2] = 0; } GIV(externalPrimitiveTableFirstFreeIndex) = 0; forceInterruptCheck(); @@ -37283,6 +37259,24 @@ } +/* Answer the byte offset of the last pointer field of a + CompiledMethod with the given header. Use a temp to + allow inlining given MULTIPLEBYTECODESETS complications. */ + +static sqInt +lastPointerOfMethodHeader(sqInt methodHeader) +{ + sqInt numLiterals; + + /* begin literalCountOfMethodHeader: */ + assert((methodHeader & 1)); + numLiterals = ((((sqInt) methodHeader)) < 0 + ? ((methodHeader >> 1)) & AlternateHeaderNumLiteralsMask + : (((usqInt) methodHeader) >> 10) & 0xFF); + return (((numLiterals + LiteralStart) - 1) * BytesPerOop) + BaseHeaderSize; +} + + /* Return the byte offset of the last pointer field of the given object. Can be used even when the type bits are not correct. Works with CompiledMethods, as well as ordinary objects. */ @@ -52112,7 +52106,7 @@ /* begin getErrorObjectFromPrimFailCode */ if (GIV(primFailCode) > 0) { table = longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (PrimErrTableIndex << (shiftForWord()))); - if (GIV(primFailCode) <= ((lastPointerOf(table)) / BytesPerWord)) { + if (GIV(primFailCode) <= (numSlotsOf(table))) { errorCode = longAt((table + BaseHeaderSize) + ((GIV(primFailCode) - 1) << (shiftForWord()))); goto l1; } Modified: branches/Cog/nsspursrc/vm/cointerp.c =================================================================== --- branches/Cog/nsspursrc/vm/cointerp.c 2015-02-10 23:19:26 UTC (rev 3249) +++ branches/Cog/nsspursrc/vm/cointerp.c 2015-02-11 02:46:48 UTC (rev 3250) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1048 uuid: 8c759c0d-f612-4018-8a05-45ec7f6af78f + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1050 uuid: ad3a825c-97ba-4d01-a0e7-637af8cbf52b from - CoInterpreter VMMaker.oscog-eem.1048 uuid: 8c759c0d-f612-4018-8a05-45ec7f6af78f + CoInterpreter VMMaker.oscog-eem.1050 uuid: ad3a825c-97ba-4d01-a0e7-637af8cbf52b */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1048 uuid: 8c759c0d-f612-4018-8a05-45ec7f6af78f " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1050 uuid: ad3a825c-97ba-4d01-a0e7-637af8cbf52b " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2354,7 +2354,7 @@ /*560*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, 0, 0, 0,-1,-1 }; char expensiveAsserts = 0; -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.1048"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.1050"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -6318,7 +6318,7 @@ /* begin getErrorObjectFromPrimFailCode */ if (GIV(primFailCode) > 0) { table = longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (PrimErrTableIndex << (shiftForWord()))); - if (GIV(primFailCode) <= ((lastPointerOf(table)) / BytesPerWord)) { + if (GIV(primFailCode) <= (numSlotsOf(table))) { errorCode = longAt((table + BaseHeaderSize) + ((GIV(primFailCode) - 1) << (shiftForWord()))); goto l234; } @@ -14144,7 +14144,7 @@ /* begin getErrorObjectFromPrimFailCode */ if (GIV(primFailCode) > 0) { table = longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (PrimErrTableIndex << (shiftForWord()))); - if (GIV(primFailCode) <= ((lastPointerOf(table)) / BytesPerWord)) { + if (GIV(primFailCode) <= (numSlotsOf(table))) { errorCode = longAt((table + BaseHeaderSize) + ((GIV(primFailCode) - 1) << (shiftForWord()))); goto l1; } @@ -14268,7 +14268,7 @@ /* begin getErrorObjectFromPrimFailCode */ if (GIV(primFailCode) > 0) { table = longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (PrimErrTableIndex << (shiftForWord()))); - if (GIV(primFailCode) <= ((lastPointerOf(table)) / BytesPerWord)) { + if (GIV(primFailCode) <= (numSlotsOf(table))) { errorCode = longAt((table + BaseHeaderSize) + ((GIV(primFailCode) - 1) << (shiftForWord()))); goto l1; } @@ -18293,7 +18293,7 @@ numArgs = (((usqInt) header) >> MethodHeaderArgCountShift) & 15; if (((((sqInt) theIP)) > 0) && ((header & AlternateHeaderHasPrimFlag) - && (theIP == (1 + (lastPointerOf(theMethod)))))) { + && (theIP == (1 + (((((literalCountOfMethodHeader(header)) + LiteralStart) - 1) * BytesPerOop) + BaseHeaderSize))))) { theIP += 3; } longAtput((pointer -= BytesPerWord), rcvr); @@ -22642,10 +22642,8 @@ sqInt i1; sqInt i11; sqInt i2; - sqInt i21; sqInt i3; sqInt i4; - sqInt i5; sqInt iLimiT; usqInt limit; sqInt memEnd; @@ -22925,22 +22923,22 @@ /* default */ GIV(thisClassIndex) = 5; - for (i5 = (InstanceSpecificationIndex + 1), iLimiT = (lengthOfformat(classArrayClass, (((usqInt) (longAt(classArrayClass))) >> 24) & 0x1F)); i5 <= iLimiT; i5 += 1) { - if ((longAt((classArrayClass + BaseHeaderSize) + ((i5 - 1) << (shiftForWord())))) == classArrayObj) { - GIV(thisClassIndex) = i5 - 1; + for (i4 = (InstanceSpecificationIndex + 1), iLimiT = (lengthOfformat(classArrayClass, (((usqInt) (longAt(classArrayClass))) >> 24) & 0x1F)); i4 <= iLimiT; i4 += 1) { + if ((longAt((classArrayClass + BaseHeaderSize) + ((i4 - 1) << (shiftForWord())))) == classArrayObj) { + GIV(thisClassIndex) = i4 - 1; } } /* default */ GIV(classNameIndex) = 6; - for (i5 = (InstanceSpecificationIndex + 1), iLimiT = (lengthOfformat(classArrayObj, (((usqInt) (longAt(classArrayObj))) >> 24) & 0x1F)); i5 <= iLimiT; i5 += 1) { - oop = longAt((classArrayObj + BaseHeaderSize) + ((i5 - 1) << (shiftForWord()))); + for (i4 = (InstanceSpecificationIndex + 1), iLimiT = (lengthOfformat(classArrayObj, (((usqInt) (longAt(classArrayObj))) >> 24) & 0x1F)); i4 <= iLimiT; i4 += 1) { + oop = longAt((classArrayObj + BaseHeaderSize) + ((i4 - 1) << (shiftForWord()))); if ((((oop & 3) == 0) && (((((usqInt) (longAt(oop))) >> 24) & 0x1F) >= 16)) && (((lengthOfformat(oop, (((usqInt) (longAt(oop))) >> 24) & 0x1F)) == 5) && ((strncmp("Array", firstFixedField(oop), 5)) == 0))) { - GIV(classNameIndex) = i5 - 1; + GIV(classNameIndex) = i4 - 1; } } GIV(method) = (GIV(newMethod) = GIV(nilObj)); @@ -22959,31 +22957,23 @@ GIV(atCache)[i1] = 0; } unlinkAllSends(); - /* begin flushAtCache */ - for (i2 = 1; i2 <= AtCacheTotalSize; i2 += 1) { - GIV(atCache)[i2] = 0; - } /* begin initialCleanup */ /* begin flushMethodCache */ - for (i4 = 1; i4 <= MethodCacheSize; i4 += 1) { - GIV(methodCache)[i4] = 0; + for (i3 = 1; i3 <= MethodCacheSize; i3 += 1) { + GIV(methodCache)[i3] = 0; } /* this for primitiveExternalMethod */ GIV(lastMethodCacheProbeWrite) = 0; /* begin flushAtCache */ - for (i3 = 1; i3 <= AtCacheTotalSize; i3 += 1) { - GIV(atCache)[i3] = 0; + for (i2 = 1; i2 <= AtCacheTotalSize; i2 += 1) { + GIV(atCache)[i2] = 0; } unlinkAllSends(); - /* begin flushAtCache */ - for (i11 = 1; i11 <= AtCacheTotalSize; i11 += 1) { - GIV(atCache)[i11] = 0; - } /* begin flushExternalPrimitiveTable */ - for (i21 = 0; i21 < MaxExternalPrimitiveTableSize; i21 += 1) { - externalPrimitiveTable[i21] = 0; + for (i11 = 0; i11 < MaxExternalPrimitiveTableSize; i11 += 1) { + externalPrimitiveTable[i11] = 0; } GIV(externalPrimitiveTableFirstFreeIndex) = 0; GIV(profileSemaphore) = (GIV(profileProcess) = (GIV(profileMethod) = GIV(nilObj))); @@ -23464,7 +23454,7 @@ /* begin getErrorObjectFromPrimFailCode */ if (GIV(primFailCode) > 0) { table = longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (PrimErrTableIndex << (shiftForWord()))); - if (GIV(primFailCode) <= ((lastPointerOf(table)) / BytesPerWord)) { + if (GIV(primFailCode) <= (numSlotsOf(table))) { errorCode = longAt((table + BaseHeaderSize) + ((GIV(primFailCode) - 1) << (shiftForWord()))); goto l1; } @@ -23689,7 +23679,7 @@ /* begin getErrorObjectFromPrimFailCode */ if (GIV(primFailCode) > 0) { table = longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (PrimErrTableIndex << (shiftForWord()))); - if (GIV(primFailCode) <= ((lastPointerOf(table)) / BytesPerWord)) { + if (GIV(primFailCode) <= (numSlotsOf(table))) { errorCode = longAt((table + BaseHeaderSize) + ((GIV(primFailCode) - 1) << (shiftForWord()))); goto l1; } @@ -31525,7 +31515,6 @@ { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt i; sqInt i1; - sqInt i2; /* begin flushMethodCache */ for (i = 1; i <= MethodCacheSize; i += 1) { @@ -31540,10 +31529,6 @@ GIV(atCache)[i1] = 0; } unlinkAllSends(); - /* begin flushAtCache */ - for (i2 = 1; i2 <= AtCacheTotalSize; i2 += 1) { - GIV(atCache)[i2] = 0; - } } @@ -31561,7 +31546,6 @@ sqInt i; sqInt i1; sqInt i2; - sqInt i3; sqInt limit; sqInt methodHeader; usqInt numSlots; @@ -31730,13 +31714,9 @@ GIV(atCache)[i1] = 0; } unlinkAllSends(); - /* begin flushAtCache */ - for (i2 = 1; i2 <= AtCacheTotalSize; i2 += 1) { - GIV(atCache)[i2] = 0; - } /* begin flushExternalPrimitiveTable */ - for (i3 = 0; i3 < MaxExternalPrimitiveTableSize; i3 += 1) { - externalPrimitiveTable[i3] = 0; + for (i2 = 0; i2 < MaxExternalPrimitiveTableSize; i2 += 1) { + externalPrimitiveTable[i2] = 0; } GIV(externalPrimitiveTableFirstFreeIndex) = 0; } @@ -38236,7 +38216,6 @@ sqInt i; sqInt i1; sqInt i2; - sqInt i3; sqInt limit; sqInt methodHeader; sqInt moduleName; @@ -38436,13 +38415,9 @@ GIV(atCache)[i1] = 0; } unlinkAllSends(); - /* begin flushAtCache */ - for (i2 = 1; i2 <= AtCacheTotalSize; i2 += 1) { - GIV(atCache)[i2] = 0; - } /* begin flushExternalPrimitiveTable */ - for (i3 = 0; i3 < MaxExternalPrimitiveTableSize; i3 += 1) { - externalPrimitiveTable[i3] = 0; + for (i2 = 0; i2 < MaxExternalPrimitiveTableSize; i2 += 1) { + externalPrimitiveTable[i2] = 0; } GIV(externalPrimitiveTableFirstFreeIndex) = 0; forceInterruptCheck(); @@ -43023,7 +42998,6 @@ sqInt clone1; sqInt clone2; sqInt contextSize; - sqInt contextSize1; sqInt ec; sqInt effectsFlags; sqInt effectsFlags1; @@ -43031,7 +43005,6 @@ sqInt fieldOffset1; sqInt fmt; sqInt fmt1; - sqInt fmt2; sqInt hash; sqInt hash1; sqInt hash2; @@ -43040,8 +43013,6 @@ sqInt hash5; sqInt header; sqInt header1; - sqInt header11; - sqInt header2; sqLong headerTemp; sqInt i; sqInt i1; @@ -43081,7 +43052,6 @@ sqInt referent5; sqInt size; sqInt sp; - sqInt sp1; sqInt temp1; sqInt temp2; @@ -43112,20 +43082,20 @@ sp = longAt((array1 + BaseHeaderSize) + (StackPointerIndex << (shiftForWord()))); if (!((sp & 1))) { contextSize = 0; - goto l3; + goto l2; } assert((ReceiverIndex + ((sp >> 1))) < (lengthOf(array1))); contextSize = (sp >> 1); - l3: /* end fetchStackPointerOf: */; + l2: /* end fetchStackPointerOf: */; fieldOffset = (((CtxtTempFrameStart - 1) + contextSize) * BytesPerOop) + BaseHeaderSize; - goto l4; + goto l3; } fieldOffset = (((numSlotsOf(array1)) - 1) * BytesPerOop) + BaseHeaderSize; - goto l4; + goto l3; } if (fmt < 24) { fieldOffset = 0; - goto l4; + goto l3; } /* begin methodHeaderOf: */ assert(isCompiledMethod(array1)); @@ -43136,7 +43106,7 @@ assert((((((CogMethod *) header1))->objectHeader)) == (nullHeaderForMachineCodeMethod())), ((((CogMethod *) header1))->methodHeader))); fieldOffset = ((((literalCountOfMethodHeader(header)) + LiteralStart) - 1) * BytesPerOop) + BaseHeaderSize; - l4: /* end lastPointerOf: */; + l3: /* end lastPointerOf: */; /* same size as array2 */ @@ -43190,56 +43160,21 @@ size += bytesInObject(oop); fieldOffset -= BytesPerOop; } - GIV(becomeEffectsFlags) = effectsFlags; if (size >= (GIV(totalFreeOldSpace) + (GIV(scavengeThreshold) - GIV(freeStart)))) { ec = PrimErrNoMemory; goto l1; } + GIV(becomeEffectsFlags) = effectsFlags; ec = 0; l1: /* end containsOnlyValidBecomeObjects:and: */; } else { followForwardedObjectFieldstoDepth(array2, 0); /* begin containsOnlyValidBecomeObjects: */ - /* begin lastPointerOf: */ - fmt1 = (((usqInt) (longAt(array1))) >> 24) & 0x1F; - assert(fmt1 != (forwardedFormat())); - if (fmt1 <= 5) { - if ((fmt1 == 3) - && (((longAt(array1)) & 0x3FFFFF) == ClassMethodContextCompactIndex)) { + /* begin lastPointerOfArray: */ + assert(isArray(array1)); + fieldOffset1 = (((numSlotsOf(array1)) - 1) * BytesPerOop) + BaseHeaderSize; - /* contexts end at the stack pointer */ - - /* begin fetchStackPointerOf: */ - sp1 = longAt((array1 + BaseHeaderSize) + (StackPointerIndex << (shiftForWord()))); - if (!((sp1 & 1))) { - contextSize1 = 0; - goto l5; - } - assert((ReceiverIndex + ((sp1 >> 1))) < (lengthOf(array1))); - contextSize1 = (sp1 >> 1); - l5: /* end fetchStackPointerOf: */; - fieldOffset1 = (((CtxtTempFrameStart - 1) + contextSize1) * BytesPerOop) + BaseHeaderSize; - goto l6; - } - fieldOffset1 = (((numSlotsOf(array1)) - 1) * BytesPerOop) + BaseHeaderSize; - goto l6; - } - if (fmt1 < 24) { - fieldOffset1 = 0; - goto l6; - } - /* begin methodHeaderOf: */ - assert(isCompiledMethod(array1)); - header11 = longAt((array1 + BaseHeaderSize) + (HeaderIndex << (shiftForWord()))); - header2 = ((header11 & 1) - ? header11 - : (assert((((usqInt)header11)) < GIV(newSpaceStart)), - assert((((((CogMethod *) header11))->objectHeader)) == (nullHeaderForMachineCodeMethod())), - ((((CogMethod *) header11))->methodHeader))); - fieldOffset1 = ((((literalCountOfMethodHeader(header2)) + LiteralStart) - 1) * BytesPerOop) + BaseHeaderSize; - l6: /* end lastPointerOf: */; - /* same size as array2 */ effectsFlags1 = 0; @@ -43249,28 +43184,28 @@ && (((longAt(oop1)) & 0x3FFFFF) == 8)) { /* begin followForwarded: */ assert(isUnambiguouslyForwarder(oop1)); - referent2 = longAt((oop1 + BaseHeaderSize) + (0 << (shiftForWord()))); - while (((referent2 & 3) == 0) - && (((longAt(referent2)) & 0x3FFFFF) == 8)) { - referent2 = longAt((referent2 + BaseHeaderSize) + (0 << (shiftForWord()))); + referent3 = longAt((oop1 + BaseHeaderSize) + (0 << (shiftForWord()))); + while (((referent3 & 3) == 0) + && (((longAt(referent3)) & 0x3FFFFF) == 8)) { + referent3 = longAt((referent3 + BaseHeaderSize) + (0 << (shiftForWord()))); } - oop1 = referent2; + oop1 = referent3; longAtput(array1 + fieldOffset1, oop1); } if ((oop1 & 3) != 0) { ec = PrimErrInappropriate; - goto l2; + goto l4; } if (((((usqInt) (longAt(oop1))) >> 30) & 1) != 0) { ec = PrimErrObjectIsPinned; - goto l2; + goto l4; } effectsFlags1 = effectsFlags1 | (becomeEffectFlagsFor(oop1)); fieldOffset1 -= BytesPerOop; } GIV(becomeEffectsFlags) = effectsFlags1; ec = 0; - l2: /* end containsOnlyValidBecomeObjects: */; + l4: /* end containsOnlyValidBecomeObjects: */; } if (ec != 0) { GIV(becomeEffectsFlags) = 0; @@ -43384,10 +43319,10 @@ } } if (isOldObject(obj1)) { - fmt2 = (((usqInt) (longAt(obj1))) >> 24) & 0x1F; + fmt1 = (((usqInt) (longAt(obj1))) >> 24) & 0x1F; if (o1HasYoung - && (!((fmt2 >= 9) - && (fmt2 < 24)))) { + && (!((fmt1 >= 9) + && (fmt1 < 24)))) { /* begin possibleRootStoreInto: */ if (!(((((usqInt) (longAt(obj1))) >> 29) & 1) != 0)) { remember(obj1); @@ -43395,17 +43330,17 @@ } } if (isOldObject(obj2)) { - fmt2 = (((usqInt) (longAt(obj2))) >> 24) & 0x1F; + fmt1 = (((usqInt) (longAt(obj2))) >> 24) & 0x1F; if (o2HasYoung - && (!((fmt2 >= 9) - && (fmt2 < 24)))) { + && (!((fmt1 >= 9) + && (fmt1 < 24)))) { /* begin possibleRootStoreInto: */ if (!(((((usqInt) (longAt(obj2))) >> 29) & 1) != 0)) { remember(obj2); } } } - goto l8; + goto l6; } /* begin outOfPlaceBecome:and:copyHashFlag: */ clone1 = (((longAt(obj1)) & 0x3FFFFF) == ClassMethodContextCompactIndex @@ -43493,7 +43428,7 @@ GIV(becomeEffectsFlags) = GIV(becomeEffectsFlags) | OldBecameNewFlag; } if (copyHashFlag) { - goto l8; + goto l6; } if (o1ClassIndex != 0) { if (o2ClassIndex != 0) { @@ -43539,7 +43474,7 @@ long32Atput(newObj1 + 4, ((((long32At(newObj1 + 4)) | 0x3FFFFF) - 0x3FFFFF)) + o2ClassIndex); } } - l8: /* end doBecome:and:copyHash: */; + l6: /* end doBecome:and:copyHash: */; /* begin followField:ofObject: */ objOop = longAt((array1 + BaseHeaderSize) + (i << (shiftForWord()))); if (((objOop & 3) == 0) @@ -43635,12 +43570,12 @@ if (((longAt(GIV(specialObjectsOop))) & (0x3FFFFF - 8)) == 0) { /* begin followForwarded: */ assert(isUnambiguouslyForwarder(GIV(specialObjectsOop))); - referent3 = longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (0 << (shiftForWord()))); - while (((referent3 & 3) == 0) - && (((longAt(referent3)) & 0x3FFFFF) == 8)) { - referent3 = longAt((referent3 + BaseHeaderSize) + (0 << (shiftForWord()))); + referent2 = longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (0 << (shiftForWord()))); + while (((referent2 & 3) == 0) + && (((longAt(referent2)) & 0x3FFFFF) == 8)) { + referent2 = longAt((referent2 + BaseHeaderSize) + (0 << (shiftForWord()))); } - GIV(specialObjectsOop) = referent3; + GIV(specialObjectsOop) = referent2; } followForwardedObjectFieldstoDepth(GIV(specialObjectsOop), 0); /* begin postBecomeAction: */ @@ -43655,7 +43590,7 @@ /* begin postBecomeScanClassTable: */ assert(validClassTableRootPages()); if (!(GIV(becomeEffectsFlags) & BecamePointerObjectFlag)) { - goto l7; + goto l5; } for (i2 = 0; i2 < GIV(numClassTablePages); i2 += 1) { page = longAt((GIV(hiddenRootsObj) + BaseHeaderSize) + (i2 << (shiftForWord()))); @@ -43700,7 +43635,7 @@ } } assert(GIV(classTableIndex) >= (1 << (classTableMajorIndexShift()))); -l7: /* end postBecomeScanClassTable: */; +l5: /* end postBecomeScanClassTable: */; GIV(becomeEffectsFlags) = 0; assert(validClassTableHashes()); runLeakCheckerFor(GCModeBecome); @@ -70811,7 +70746,7 @@ /* begin getErrorObjectFromPrimFailCode */ if (GIV(primFailCode) > 0) { table = longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (PrimErrTableIndex << (shiftForWord()))); - if (GIV(primFailCode) <= ((lastPointerOf(table)) / BytesPerWord)) { + if (GIV(primFailCode) <= (numSlotsOf(table))) { errorCode = longAt((table + BaseHeaderSize) + ((GIV(primFailCode) - 1) << (shiftForWord()))); goto l1; } @@ -70872,6 +70807,7 @@ sqInt first; sqInt i; sqInt i1; + sqInt i11; sqInt i2; sqInt i3; sqInt i4; @@ -70910,13 +70846,17 @@ sqInt xArray; followForwardingPointersInStackZone(theBecomeEffectsFlags); + /* begin flushAtCache */ + for (i = 1; i <= AtCacheTotalSize; i += 1) { + GIV(atCache)[i] = 0; + } if (theBecomeEffectsFlags != 0) { if (theBecomeEffectsFlags & BecameCompiledMethodFlag) { /* begin followForwardedMethodsInMethodCache */ - for (i = 0; i < MethodCacheSize; i += MethodCacheEntrySize) { - c = GIV(methodCache)[i + MethodCacheClass]; - s = GIV(methodCache)[i + MethodCacheSelector]; - m = GIV(methodCache)[i + MethodCacheMethod]; + for (i1 = 0; i1 < MethodCacheSize; i1 += MethodCacheEntrySize) { + c = GIV(methodCache)[i1 + MethodCacheClass]; + s = GIV(methodCache)[i1 + MethodCacheSelector]; + m = GIV(methodCache)[i1 + MethodCacheMethod]; if ((c != 0) && ((s != 0) && ((m != 0) @@ -70930,7 +70870,7 @@ referent = longAt((referent + BaseHeaderSize) + (0 << (shiftForWord()))); } m = referent; - GIV(methodCache)[i + MethodCacheMethod] = m; + GIV(methodCache)[i1 + MethodCacheMethod] = m; } } /* begin followForwardedMethodsInMethodZone */ @@ -70949,8 +70889,8 @@ } } /* begin flushAtCache */ - for (i1 = 1; i1 <= AtCacheTotalSize; i1 += 1) { - GIV(atCache)[i1] = 0; + for (i11 = 1; i11 <= AtCacheTotalSize; i11 += 1) { + GIV(atCache)[i11] = 0; } /* begin flushBecommedClassesInMethodZone */ unlinkSendsToForwardedClasses(); Modified: branches/Cog/nsspursrc/vm/cointerp.h =================================================================== --- branches/Cog/nsspursrc/vm/cointerp.h 2015-02-10 23:19:26 UTC (rev 3249) +++ branches/Cog/nsspursrc/vm/cointerp.h 2015-02-11 02:46:48 UTC (rev 3250) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1048 uuid: 8c759c0d-f612-4018-8a05-45ec7f6af78f + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1050 uuid: ad3a825c-97ba-4d01-a0e7-637af8cbf52b */ Modified: branches/Cog/nsspursrc/vm/gcc3x-cointerp.c =================================================================== --- branches/Cog/nsspursrc/vm/gcc3x-cointerp.c 2015-02-10 23:19:26 UTC (rev 3249) +++ branches/Cog/nsspursrc/vm/gcc3x-cointerp.c 2015-02-11 02:46:48 UTC (rev 3250) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1048 uuid: 8c759c0d-f612-4018-8a05-45ec7f6af78f + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1050 uuid: ad3a825c-97ba-4d01-a0e7-637af8cbf52b from - CoInterpreter VMMaker.oscog-eem.1048 uuid: 8c759c0d-f612-4018-8a05-45ec7f6af78f + CoInterpreter VMMaker.oscog-eem.1050 uuid: ad3a825c-97ba-4d01-a0e7-637af8cbf52b */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1048 uuid: 8c759c0d-f612-4018-8a05-45ec7f6af78f " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1050 uuid: ad3a825c-97ba-4d01-a0e7-637af8cbf52b " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2357,7 +2357,7 @@ /*560*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, 0, 0, 0,-1,-1 }; char expensiveAsserts = 0; -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.1048"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.1050"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -6327,7 +6327,7 @@ /* begin getErrorObjectFromPrimFailCode */ if (GIV(primFailCode) > 0) { table = longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (PrimErrTableIndex << (shiftForWord()))); - if (GIV(primFailCode) <= ((lastPointerOf(table)) / BytesPerWord)) { + if (GIV(primFailCode) <= (numSlotsOf(table))) { errorCode = longAt((table + BaseHeaderSize) + ((GIV(primFailCode) - 1) << (shiftForWord()))); goto l234; } @@ -14153,7 +14153,7 @@ /* begin getErrorObjectFromPrimFailCode */ if (GIV(primFailCode) > 0) { table = longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (PrimErrTableIndex << (shiftForWord()))); - if (GIV(primFailCode) <= ((lastPointerOf(table)) / BytesPerWord)) { + if (GIV(primFailCode) <= (numSlotsOf(table))) { errorCode = longAt((table + BaseHeaderSize) + ((GIV(primFailCode) - 1) << (shiftForWord()))); goto l1; } @@ -14277,7 +14277,7 @@ /* begin getErrorObjectFromPrimFailCode */ if (GIV(primFailCode) > 0) { table = longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (PrimErrTableIndex << (shiftForWord()))); - if (GIV(primFailCode) <= ((lastPointerOf(table)) / BytesPerWord)) { + if (GIV(primFailCode) <= (numSlotsOf(table))) { errorCode = longAt((table + BaseHeaderSize) + ((GIV(primFailCode) - 1) << (shiftForWord()))); goto l1; } @@ -18302,7 +18302,7 @@ numArgs = (((usqInt) header) >> MethodHeaderArgCountShift) & 15; if (((((sqInt) theIP)) > 0) && ((header & AlternateHeaderHasPrimFlag) - && (theIP == (1 + (lastPointerOf(theMethod)))))) { + && (theIP == (1 + (((((literalCountOfMethodHeader(header)) + LiteralStart) - 1) * BytesPerOop) + BaseHeaderSize))))) { theIP += 3; } longAtput((pointer -= BytesPerWord), rcvr); @@ -22651,10 +22651,8 @@ sqInt i1; sqInt i11; sqInt i2; - sqInt i21; sqInt i3; sqInt i4; - sqInt i5; sqInt iLimiT; usqInt limit; sqInt memEnd; @@ -22934,22 +22932,22 @@ /* default */ GIV(thisClassIndex) = 5; - for (i5 = (InstanceSpecificationIndex + 1), iLimiT = (lengthOfformat(classArrayClass, (((usqInt) (longAt(classArrayClass))) >> 24) & 0x1F)); i5 <= iLimiT; i5 += 1) { - if ((longAt((classArrayClass + BaseHeaderSize) + ((i5 - 1) << (shiftForWord())))) == classArrayObj) { - GIV(thisClassIndex) = i5 - 1; + for (i4 = (InstanceSpecificationIndex + 1), iLimiT = (lengthOfformat(classArrayClass, (((usqInt) (longAt(classArrayClass))) >> 24) & 0x1F)); i4 <= iLimiT; i4 += 1) { + if ((longAt((classArrayClass + BaseHeaderSize) + ((i4 - 1) << (shiftForWord())))) == classArrayObj) { + GIV(thisClassIndex) = i4 - 1; } } /* default */ GIV(classNameIndex) = 6; - for (i5 = (InstanceSpecificationIndex + 1), iLimiT = (lengthOfformat(classArrayObj, (((usqInt) (longAt(classArrayObj))) >> 24) & 0x1F)); i5 <= iLimiT; i5 += 1) { - oop = longAt((classArrayObj + BaseHeaderSize) + ((i5 - 1) << (shiftForWord()))); + for (i4 = (InstanceSpecificationIndex + 1), iLimiT = (lengthOfformat(classArrayObj, (((usqInt) (longAt(classArrayObj))) >> 24) & 0x1F)); i4 <= iLimiT; i4 += 1) { + oop = longAt((classArrayObj + BaseHeaderSize) + ((i4 - 1) << (shiftForWord()))); if ((((oop & 3) == 0) && (((((usqInt) (longAt(oop))) >> 24) & 0x1F) >= 16)) && (((lengthOfformat(oop, (((usqInt) (longAt(oop))) >> 24) & 0x1F)) == 5) && ((strncmp("Array", firstFixedField(oop), 5)) == 0))) { - GIV(classNameIndex) = i5 - 1; + GIV(classNameIndex) = i4 - 1; } } GIV(method) = (GIV(newMethod) = GIV(nilObj)); @@ -22968,31 +22966,23 @@ GIV(atCache)[i1] = 0; } unlinkAllSends(); - /* begin flushAtCache */ - for (i2 = 1; i2 <= AtCacheTotalSize; i2 += 1) { - GIV(atCache)[i2] = 0; - } /* begin initialCleanup */ /* begin flushMethodCache */ - for (i4 = 1; i4 <= MethodCacheSize; i4 += 1) { - GIV(methodCache)[i4] = 0; + for (i3 = 1; i3 <= MethodCacheSize; i3 += 1) { + GIV(methodCache)[i3] = 0; } /* this for primitiveExternalMethod */ GIV(lastMethodCacheProbeWrite) = 0; /* begin flushAtCache */ - for (i3 = 1; i3 <= AtCacheTotalSize; i3 += 1) { - GIV(atCache)[i3] = 0; + for (i2 = 1; i2 <= AtCacheTotalSize; i2 += 1) { + GIV(atCache)[i2] = 0; } unlinkAllSends(); - /* begin flushAtCache */ - for (i11 = 1; i11 <= AtCacheTotalSize; i11 += 1) { - GIV(atCache)[i11] = 0; - } /* begin flushExternalPrimitiveTable */ - for (i21 = 0; i21 < MaxExternalPrimitiveTableSize; i21 += 1) { - externalPrimitiveTable[i21] = 0; + for (i11 = 0; i11 < MaxExternalPrimitiveTableSize; i11 += 1) { + externalPrimitiveTable[i11] = 0; } GIV(externalPrimitiveTableFirstFreeIndex) = 0; GIV(profileSemaphore) = (GIV(profileProcess) = (GIV(profileMethod) = GIV(nilObj))); @@ -23473,7 +23463,7 @@ /* begin getErrorObjectFromPrimFailCode */ if (GIV(primFailCode) > 0) { table = longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (PrimErrTableIndex << (shiftForWord()))); - if (GIV(primFailCode) <= ((lastPointerOf(table)) / BytesPerWord)) { + if (GIV(primFailCode) <= (numSlotsOf(table))) { errorCode = longAt((table + BaseHeaderSize) + ((GIV(primFailCode) - 1) << (shiftForWord()))); goto l1; } @@ -23698,7 +23688,7 @@ /* begin getErrorObjectFromPrimFailCode */ if (GIV(primFailCode) > 0) { table = longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (PrimErrTableIndex << (shiftForWord()))); - if (GIV(primFailCode) <= ((lastPointerOf(table)) / BytesPerWord)) { + if (GIV(primFailCode) <= (numSlotsOf(table))) { errorCode = longAt((table + BaseHeaderSize) + ((GIV(primFailCode) - 1) << (shiftForWord()))); goto l1; } @@ -31534,7 +31524,6 @@ { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt i; sqInt i1; - sqInt i2; /* begin flushMethodCache */ for (i = 1; i <= MethodCacheSize; i += 1) { @@ -31549,10 +31538,6 @@ GIV(atCache)[i1] = 0; } unlinkAllSends(); - /* begin flushAtCache */ - for (i2 = 1; i2 <= AtCacheTotalSize; i2 += 1) { - GIV(atCache)[i2] = 0; - } } @@ -31570,7 +31555,6 @@ sqInt i; sqInt i1; sqInt i2; - sqInt i3; sqInt limit; sqInt methodHeader; usqInt numSlots; @@ -31739,13 +31723,9 @@ GIV(atCache)[i1] = 0; } unlinkAllSends(); - /* begin flushAtCache */ - for (i2 = 1; i2 <= AtCacheTotalSize; i2 += 1) { - GIV(atCache)[i2] = 0; - } /* begin flushExternalPrimitiveTable */ - for (i3 = 0; i3 < MaxExternalPrimitiveTableSize; i3 += 1) { - externalPrimitiveTable[i3] = 0; + for (i2 = 0; i2 < MaxExternalPrimitiveTableSize; i2 += 1) { + externalPrimitiveTable[i2] = 0; } GIV(externalPrimitiveTableFirstFreeIndex) = 0; } @@ -38245,7 +38225,6 @@ sqInt i; sqInt i1; sqInt i2; - sqInt i3; sqInt limit; sqInt methodHeader; sqInt moduleName; @@ -38445,13 +38424,9 @@ GIV(atCache)[i1] = 0; } unlinkAllSends(); - /* begin flushAtCache */ - for (i2 = 1; i2 <= AtCacheTotalSize; i2 += 1) { - GIV(atCache)[i2] = 0; - } /* begin flushExternalPrimitiveTable */ - for (i3 = 0; i3 < MaxExternalPrimitiveTableSize; i3 += 1) { - externalPrimitiveTable[i3] = 0; + for (i2 = 0; i2 < MaxExternalPrimitiveTableSize; i2 += 1) { + externalPrimitiveTable[i2] = 0; } GIV(externalPrimitiveTableFirstFreeIndex) = 0; forceInterruptCheck(); @@ -43032,7 +43007,6 @@ sqInt clone1; sqInt clone2; sqInt contextSize; - sqInt contextSize1; sqInt ec; sqInt effectsFlags; sqInt effectsFlags1; @@ -43040,7 +43014,6 @@ sqInt fieldOffset1; sqInt fmt; sqInt fmt1; - sqInt fmt2; sqInt hash; sqInt hash1; sqInt hash2; @@ -43049,8 +43022,6 @@ sqInt hash5; sqInt header; sqInt header1; - sqInt header11; - sqInt header2; sqLong headerTemp; sqInt i; sqInt i1; @@ -43090,7 +43061,6 @@ sqInt referent5; sqInt size; sqInt sp; - sqInt sp1; sqInt temp1; sqInt temp2; @@ -43121,20 +43091,20 @@ sp = longAt((array1 + BaseHeaderSize) + (StackPointerIndex << (shiftForWord()))); if (!((sp & 1))) { contextSize = 0; - goto l3; + goto l2; } assert((ReceiverIndex + ((sp >> 1))) < (lengthOf(array1))); contextSize = (sp >> 1); - l3: /* end fetchStackPointerOf: */; + l2: /* end fetchStackPointerOf: */; fieldOffset = (((CtxtTempFrameStart - 1) + contextSize) * BytesPerOop) + BaseHeaderSize; - goto l4; + goto l3; } fieldOffset = (((numSlotsOf(array1)) - 1) * BytesPerOop) + BaseHeaderSize; - goto l4; + goto l3; } if (fmt < 24) { fieldOffset = 0; - goto l4; + goto l3; } /* begin methodHeaderOf: */ assert(isCompiledMethod(array1)); @@ -43145,7 +43115,7 @@ assert((((((CogMethod *) header1))->objectHeader)) == (nullHeaderForMachineCodeMethod())), @@ Diff output truncated at 50000 characters. @@

1 0

← Newer
1
...
4
5
6
7
8
9
10
11
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

Vm-dev February 2015