Vm-dev March 2016

vm-dev@lists.squeakfoundation.org

33 participants
139 discussions

[commit][3643] CogVM source as per VMMaker.oscog-eem.1722
by commits＠squeakvm.org 11 Mar '16

11 Mar '16

Revision: 3643 Author: eliot Date: 2016-03-10 17:42:54 -0800 (Thu, 10 Mar 2016) Log Message: ----------- CogVM source as per VMMaker.oscog-eem.1722 V3: Fix simulation of fetchLong64:ofObject: and hence in signed64BitValueOf: et al. Spur: Resolve the conflict between 32-bit and 64-bit tag assignments. In 32-bits we have 1=even SmallIntegers, 2=Characters, 3=odd SmallIntegers, and in 64-bits we had 1=SmallIntegers, 2=Characters, 3=SmallFloats. Hence we would want SmallFloat64's identityHash to be 3, which conflicts with 32 bits' odd SmallIntegers. Change is for 64-bits to use 1=SmallIntegers, 2=Characters, 4=SmallFloats. This also means single-bit tests in the Cogit, which produces better code, and no scratch registers to hold masked tags. Hence roll the 64-bit Spur image format version number from 68019 to 68021. Delegate to the object memories to determine the image format version number. Add noInlineObjectAfter:limit: for a slighly less verbose initializeObjectMemory: Turn the various class pun constants into macros for more readable C. Modified Paths: -------------- branches/Cog/nsspur64src/vm/cogit.h branches/Cog/nsspur64src/vm/cogitX64.c branches/Cog/nsspur64src/vm/cointerp.c branches/Cog/nsspur64src/vm/cointerp.h branches/Cog/nsspur64src/vm/gcc3x-cointerp.c branches/Cog/nsspursrc/vm/cogit.h branches/Cog/nsspursrc/vm/cogitARMv5.c branches/Cog/nsspursrc/vm/cogitIA32.c branches/Cog/nsspursrc/vm/cogitMIPSEL.c branches/Cog/nsspursrc/vm/cointerp.c branches/Cog/nsspursrc/vm/cointerp.h branches/Cog/nsspursrc/vm/gcc3x-cointerp.c branches/Cog/nsspurstack64src/vm/gcc3x-interp.c branches/Cog/nsspurstack64src/vm/interp.c branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c branches/Cog/nsspurstacksrc/vm/interp.c branches/Cog/scripts/svnci branches/Cog/spur64src/vm/cogit.h branches/Cog/spur64src/vm/cogitX64.c branches/Cog/spur64src/vm/cointerp.c branches/Cog/spur64src/vm/cointerp.h branches/Cog/spur64src/vm/gcc3x-cointerp.c branches/Cog/spursistasrc/vm/cogit.h branches/Cog/spursistasrc/vm/cogitARMv5.c branches/Cog/spursistasrc/vm/cogitIA32.c branches/Cog/spursistasrc/vm/cogitMIPSEL.c branches/Cog/spursistasrc/vm/cointerp.c branches/Cog/spursistasrc/vm/cointerp.h branches/Cog/spursistasrc/vm/gcc3x-cointerp.c branches/Cog/spursrc/vm/cogit.h branches/Cog/spursrc/vm/cogitARMv5.c branches/Cog/spursrc/vm/cogitIA32.c branches/Cog/spursrc/vm/cogitMIPSEL.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/plugins/BitBltPlugin/BitBltPlugin.c branches/Cog/src/vm/cogit.h branches/Cog/src/vm/cogitARMv5.c branches/Cog/src/vm/cogitIA32.c branches/Cog/src/vm/cogitMIPSEL.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/nsspur64src/vm/cogit.h =================================================================== --- branches/Cog/nsspur64src/vm/cogit.h 2016-03-09 09:00:31 UTC (rev 3642) +++ branches/Cog/nsspur64src/vm/cogit.h 2016-03-11 01:42:54 UTC (rev 3643) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.1716 uuid: 9115c93b-f425-4118-96e7-7130adeff1f2 + CCodeGenerator VMMaker.oscog-eem.1722 uuid: e5c44d63-ba75-4cd1-bf4e-c92c4232bbfe */ Modified: branches/Cog/nsspur64src/vm/cogitX64.c =================================================================== --- branches/Cog/nsspur64src/vm/cogitX64.c 2016-03-09 09:00:31 UTC (rev 3642) +++ branches/Cog/nsspur64src/vm/cogitX64.c 2016-03-11 01:42:54 UTC (rev 3643) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.1707 uuid: 6073be04-c0ce-4791-8ada-b2d1ec54f4a4 + CCodeGenerator VMMaker.oscog-eem.1722 uuid: e5c44d63-ba75-4cd1-bf4e-c92c4232bbfe from - StackToRegisterMappingCogit VMMaker.oscog-eem.1707 uuid: 6073be04-c0ce-4791-8ada-b2d1ec54f4a4 + StackToRegisterMappingCogit VMMaker.oscog-eem.1722 uuid: e5c44d63-ba75-4cd1-bf4e-c92c4232bbfe */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1707 uuid: 6073be04-c0ce-4791-8ada-b2d1ec54f4a4 " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1722 uuid: e5c44d63-ba75-4cd1-bf4e-c92c4232bbfe " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -768,12 +768,12 @@ static sqInt NoDbgRegParms genGetOverflowSlotsOfinto(sqInt srcReg, sqInt destReg); static sqInt NoDbgRegParms genGetSmallFloatValueOfscratchinto(sqInt oopReg, sqInt scratch, sqInt dpReg); static AbstractInstruction * NoDbgRegParms genJumpIsSmallIntegerValuescratch(sqInt aRegister, sqInt scratchReg); -static AbstractInstruction * NoDbgRegParms genJumpNotCharacterscratchReg(sqInt reg, sqInt scratch); +static AbstractInstruction * NoDbgRegParms genJumpNotCharacter(sqInt reg); static AbstractInstruction * NoDbgRegParms genJumpNotSmallFloatValueBitsscratch(sqInt reg, sqInt exponent); -static AbstractInstruction * NoDbgRegParms genJumpNotSmallIntegersInandScratchscratch(sqInt aRegister, sqInt scratchA, sqInt scratchB); +static AbstractInstruction * NoDbgRegParms genJumpNotSmallFloat(sqInt reg); static AbstractInstruction * NoDbgRegParms genJumpNotSmallIntegerValuescratch(sqInt aRegister, sqInt scratchReg); -static AbstractInstruction * NoDbgRegParms genJumpNotSmallIntegerscratchReg(sqInt reg, sqInt scratch); -static AbstractInstruction * NoDbgRegParms genJumpSmallIntegerscratchReg(sqInt reg, sqInt scratch); +static AbstractInstruction * NoDbgRegParms genJumpNotSmallInteger(sqInt reg); +static AbstractInstruction * NoDbgRegParms genJumpSmallInteger(sqInt aRegister); static sqInt genPrimitiveAt(void); static sqInt genPrimitiveAtPut(void); static sqInt genPrimitiveIdentityHash(void); @@ -4361,7 +4361,7 @@ /* begin genMarshallNArgs:arg:arg:arg:arg: */ if (numArgs == 0) { ((AbstractInstruction *) backEnd); - goto l2; + goto l15; } if (regOrConst0 < NoReg) { /* begin MoveCq:R: */ @@ -4375,7 +4375,7 @@ } if (numArgs == 1) { ((AbstractInstruction *) backEnd); - goto l2; + goto l15; } if (regOrConst1 < NoReg) { /* begin MoveCq:R: */ @@ -4389,7 +4389,7 @@ } if (numArgs == 2) { ((AbstractInstruction *) backEnd); - goto l2; + goto l15; } # if ABI == SysV @@ -4405,7 +4405,7 @@ } if (numArgs == 3) { ((AbstractInstruction *) backEnd); - goto l2; + goto l15; } if (regOrConst3 < NoReg) { /* begin MoveCq:R: */ @@ -4434,7 +4434,7 @@ } if (numArgs == 3) { ((AbstractInstruction *) backEnd); - goto l2; + goto l15; } if (regOrConst3 < NoReg) { /* begin MoveCq:R: */ @@ -4451,7 +4451,7 @@ assert(numArgs <= 4); ((AbstractInstruction *) backEnd); -l2: /* end genMarshallNArgs:arg:arg:arg:arg: */; +l15: /* end genMarshallNArgs:arg:arg:arg:arg: */; /* begin CallFullRT: */ callTarget = ((usqInt)aRoutine); /* begin CallFull: */ @@ -5834,12 +5834,12 @@ generateMapAtstart(sqInt addressOrNull, sqInt startAddress) { unsigned char annotation; - sqInt delta; + usqInt delta; sqInt i; AbstractInstruction *instruction; sqInt length; - sqInt location; - sqInt mapEntry; + usqInt location; + usqInt mapEntry; sqInt maxDelta; usqInt mcpc; @@ -10878,7 +10878,8 @@ /* begin MoveMw:r:R: */ anInstruction = genoperandoperandoperand(MoveMwrR, BaseHeaderSize, methodReg, headerReg); - jumpNotCogged = genJumpSmallIntegerscratchReg(headerReg, scratchReg); + /* begin genJumpSmallInteger:scratchReg: */ + jumpNotCogged = genJumpSmallInteger(headerReg); /* begin MoveMw:r:R: */ offset = offsetof(CogMethod, methodHeader); /* begin gen:quickConstant:operand:operand: */ @@ -10912,7 +10913,8 @@ assert(0 < (numRegArgs())); /* begin MoveR:R: */ genoperandoperand(MoveRR, Arg0Reg, ClassReg); - jumpNotSI = genJumpNotSmallIntegerscratchReg(Arg0Reg, TempReg); + /* begin genJumpNotSmallInteger:scratchReg: */ + jumpNotSI = genJumpNotSmallInteger(Arg0Reg); genRemoveSmallIntegerTagsInScratchReg(ClassReg); /* begin AddR:R: */ genoperandoperand(AddRR, ReceiverResultReg, ClassReg); @@ -10961,9 +10963,8 @@ } /* begin genLoadArgAtDepth:into: */ assert(0 < (numRegArgs())); - - /* Whether the SmallInteger tags are zero or non-zero, anding them together will preserve them. */ - jumpNotSI = genJumpNotSmallIntegerscratchReg(Arg0Reg, TempReg); + /* begin genJumpNotSmallInteger:scratchReg: */ + jumpNotSI = genJumpNotSmallInteger(Arg0Reg); /* begin AndR:R: */ genoperandoperand(AndRR, Arg0Reg, ReceiverResultReg); /* begin genPrimReturn */ @@ -10985,9 +10986,8 @@ } /* begin genLoadArgAtDepth:into: */ assert(0 < (numRegArgs())); - - /* Whether the SmallInteger tags are zero or non-zero, oring them together will preserve them. */ - jumpNotSI = genJumpNotSmallIntegerscratchReg(Arg0Reg, TempReg); + /* begin genJumpNotSmallInteger:scratchReg: */ + jumpNotSI = genJumpNotSmallInteger(Arg0Reg); /* begin OrR:R: */ genoperandoperand(OrRR, Arg0Reg, ReceiverResultReg); /* begin genPrimReturn */ @@ -11056,7 +11056,8 @@ assert(0 < (numRegArgs())); /* begin MoveR:R: */ genoperandoperand(MoveRR, Arg0Reg, ClassReg); - jumpNotSI = genJumpNotSmallIntegerscratchReg(Arg0Reg, TempReg); + /* begin genJumpNotSmallInteger:scratchReg: */ + jumpNotSI = genJumpNotSmallInteger(Arg0Reg); genConvertSmallIntegerToIntegerInReg(ClassReg); if (!(setsConditionCodesFor(lastOpcode(), JumpNegative))) { /* begin CmpCq:R: */ @@ -11120,9 +11121,8 @@ } /* begin genLoadArgAtDepth:into: */ assert(0 < (numRegArgs())); - - /* Clear one or the other tag so that xoring will preserve them. */ - jumpNotSI = genJumpNotSmallIntegerscratchReg(Arg0Reg, TempReg); + /* begin genJumpNotSmallInteger:scratchReg: */ + jumpNotSI = genJumpNotSmallInteger(Arg0Reg); genRemoveSmallIntegerTagsInScratchReg(Arg0Reg); /* begin XorR:R: */ genoperandoperand(XorRR, Arg0Reg, ReceiverResultReg); @@ -11186,10 +11186,8 @@ genoperandoperand(MoveRR, Arg0Reg, ClassReg); /* begin MoveR:R: */ genoperandoperand(MoveRR, Arg0Reg, Arg1Reg); - - /* We must shift away the tags, not just subtract them, so that the - overflow case doesn't actually overflow the machine instruction. */ - jumpNotSI = genJumpNotSmallIntegerscratchReg(Arg0Reg, TempReg); + /* begin genJumpNotSmallInteger:scratchReg: */ + jumpNotSI = genJumpNotSmallInteger(Arg0Reg); genShiftAwaySmallIntegerTagsInScratchReg(ClassReg); if (!(setsConditionCodesFor(lastOpcode(), JumpZero))) { /* begin CmpCq:R: */ @@ -11247,10 +11245,8 @@ assert(0 < (numRegArgs())); /* begin MoveR:R: */ genoperandoperand(MoveRR, Arg0Reg, ClassReg); - - /* We must shift away the tags, not just subtract them, so that the - overflow case doesn't actually overflow the machine instruction. */ - jumpNotSI = genJumpNotSmallIntegerscratchReg(Arg0Reg, TempReg); + /* begin genJumpNotSmallInteger:scratchReg: */ + jumpNotSI = genJumpNotSmallInteger(Arg0Reg); genShiftAwaySmallIntegerTagsInScratchReg(ClassReg); /* begin JumpZero: */ jumpZero = genConditionalBranchoperand(JumpZero, ((sqInt)0)); @@ -11424,7 +11420,8 @@ assert(0 < (numRegArgs())); /* begin MoveR:R: */ genoperandoperand(MoveRR, Arg0Reg, ClassReg); - jumpNotSI = genJumpNotSmallIntegerscratchReg(Arg0Reg, TempReg); + /* begin genJumpNotSmallInteger:scratchReg: */ + jumpNotSI = genJumpNotSmallInteger(Arg0Reg); genRemoveSmallIntegerTagsInScratchReg(ClassReg); /* begin JumpZero: */ jumpZero = genConditionalBranchoperand(JumpZero, ((sqInt)0)); @@ -11478,7 +11475,8 @@ genoperandoperand(MoveRR, Arg0Reg, ClassReg); /* begin MoveR:R: */ genoperandoperand(MoveRR, ReceiverResultReg, Arg1Reg); - jumpNotSI = genJumpNotSmallIntegerscratchReg(Arg0Reg, TempReg); + /* begin genJumpNotSmallInteger:scratchReg: */ + jumpNotSI = genJumpNotSmallInteger(Arg0Reg); genShiftAwaySmallIntegerTagsInScratchReg(ClassReg); genRemoveSmallIntegerTagsInScratchReg(Arg1Reg); /* begin MulR:R: */ @@ -11539,10 +11537,8 @@ assert(0 < (numRegArgs())); /* begin MoveR:R: */ genoperandoperand(MoveRR, Arg0Reg, ClassReg); - - /* We must shift away the tags, not just subtract them, so that the - overflow case doesn't actually overflow the machine instruction. */ - jumpNotSI = genJumpNotSmallIntegerscratchReg(Arg0Reg, TempReg); + /* begin genJumpNotSmallInteger:scratchReg: */ + jumpNotSI = genJumpNotSmallInteger(Arg0Reg); genShiftAwaySmallIntegerTagsInScratchReg(ClassReg); if (!(setsConditionCodesFor(lastOpcode(), JumpZero))) { /* begin CmpCq:R: */ @@ -11676,7 +11672,8 @@ } /* begin genLoadArgAtDepth:into: */ assert(0 < (numRegArgs())); - jumpNotSI = genJumpNotSmallIntegerscratchReg(Arg0Reg, TempReg); + /* begin genJumpNotSmallInteger:scratchReg: */ + jumpNotSI = genJumpNotSmallInteger(Arg0Reg); /* begin MoveR:R: */ genoperandoperand(MoveRR, ReceiverResultReg, TempReg); /* begin SubR:R: */ @@ -11708,7 +11705,8 @@ } /* begin genLoadArgAtDepth:into: */ assert(0 < (numRegArgs())); - jumpFail = genJumpNotSmallIntegerscratchReg(Arg0Reg, TempReg); + /* begin genJumpNotSmallInteger:scratchReg: */ + jumpFail = genJumpNotSmallInteger(Arg0Reg); /* begin CmpR:R: */ genoperandoperand(CmpRR, Arg0Reg, ReceiverResultReg); jumpTrue = genConditionalBranchoperand(jumpOpcode, 0); @@ -11976,23 +11974,27 @@ /* Convert the SmallFloat in reg to its identityHash as a SmallInteger. - Rotate the sign bit from bit 3 (zero-relative) the sign bit. This - implicitly sets - SmallInteger tags (3 >> 1 = 1). c.f. - Spur64BitMemoryManager>>rotatedFloatBitsOf: */ + Rotate the sign bit from bit 3 (zero-relative) to the sign bit. + c.f. Spur64BitMemoryManager>>rotatedFloatBitsOf: */ /* CogObjectRepresentationFor64BitSpur>>#genConvertSmallFloatToSmallFloatHashAsIntegerInReg:scratch: */ static sqInt NoDbgRegParms genConvertSmallFloatToSmallFloatHashAsIntegerInRegscratch(sqInt reg, sqInt scratch) { + AbstractInstruction *anInstruction; sqInt quickConstant; + sqInt quickConstant1; - assert((((usqInt) (smallFloatTag())) >> 1) == (smallIntegerTag())); + assert(((((usqInt) (smallFloatTag())) >> 1) - (smallIntegerTag())) == (smallIntegerTag())); /* begin LogicalShiftRightCq:R: */ genoperandoperand(LogicalShiftRightCqR, 1, reg); gAndCqRR(1LL << ((numTagBits()) - 1), reg, scratch); /* begin SubR:R: */ genoperandoperand(SubRR, scratch, reg); + /* begin SubCq:R: */ + quickConstant1 = (((usqInt) (smallFloatTag())) >> 1) - (smallIntegerTag()); + /* begin gen:quickConstant:operand: */ + anInstruction = genoperandoperand(SubCqR, quickConstant1, reg); /* begin LogicalShiftLeftCq:R: */ quickConstant = 0x3F - ((numTagBits()) - 1); genoperandoperand(LogicalShiftLeftCqR, quickConstant, scratch); @@ -12059,8 +12061,6 @@ static sqInt NoDbgRegParms genFloatArithmeticpreOpCheckboxed(sqInt arithmeticOperator, AbstractInstruction *(*preOpCheckOrNil)(int rcvrReg, int argReg), sqInt rcvrBoxed) { - AbstractInstruction *anInstruction; - AbstractInstruction *anInstruction1; AbstractInstruction *doOp; AbstractInstruction *jumpFailAlloc; AbstractInstruction *jumpFailCheck; @@ -12068,8 +12068,6 @@ AbstractInstruction *jumpNotBoxedFloat; AbstractInstruction *jumpNotSmallFloat; AbstractInstruction *jumpNotSmallInteger; - sqInt quickConstant; - sqInt quickConstant1; /* begin genLoadArgAtDepth:into: */ assert(0 < (numRegArgs())); @@ -12079,18 +12077,7 @@ else { genGetSmallFloatValueOfscratchinto(ReceiverResultReg, TempReg, DPFPReg0); } - /* begin MoveR:R: */ - genoperandoperand(MoveRR, Arg0Reg, ClassReg); - /* begin AndCq:R: */ - quickConstant = tagMask(); - /* begin gen:quickConstant:operand: */ - anInstruction = genoperandoperand(AndCqR, quickConstant, ClassReg); - /* begin CmpCq:R: */ - quickConstant1 = smallFloatTag(); - /* begin gen:quickConstant:operand: */ - anInstruction1 = genoperandoperand(CmpCqR, quickConstant1, ClassReg); - /* begin JumpNonZero: */ - jumpNotSmallFloat = genConditionalBranchoperand(JumpNonZero, ((sqInt)0)); + jumpNotSmallFloat = genJumpNotSmallFloat(Arg0Reg); genGetSmallFloatValueOfscratchinto(Arg0Reg, TempReg, DPFPReg1); /* begin Label */ doOp = genoperandoperand(Label, (labelCounter += 1), bytecodePC); @@ -12105,9 +12092,8 @@ assert(methodOrBlockNumArgs <= (numRegArgs())); /* begin RetN: */ genoperand(RetN, 0); - jmpTarget(jumpNotSmallFloat, gCmpCqR(smallIntegerTag(), ClassReg)); - /* begin JumpNonZero: */ - jumpNotSmallInteger = genConditionalBranchoperand(JumpNonZero, ((sqInt)0)); + jmpTarget(jumpNotSmallFloat, gLabel()); + jumpNotSmallInteger = genJumpNotSmallInteger(Arg0Reg); /* begin MoveR:R: */ genoperandoperand(MoveRR, Arg0Reg, Arg1Reg); genConvertSmallIntegerToIntegerInReg(Arg1Reg); @@ -12115,9 +12101,8 @@ genoperandoperand(ConvertRRd, Arg1Reg, DPFPReg1); /* begin Jump: */ genoperand(Jump, ((sqInt)doOp)); - jmpTarget(jumpNotSmallInteger, gCmpCqR(0, ClassReg)); - /* begin JumpNonZero: */ - jumpImmediate = genConditionalBranchoperand(JumpNonZero, ((sqInt)0)); + jmpTarget(jumpNotSmallInteger, gLabel()); + jumpImmediate = genJumpImmediate(Arg0Reg); genGetCompactClassIndexNonImmOfinto(Arg0Reg, SendNumArgsReg); genCmpClassFloatCompactIndexR(SendNumArgsReg); /* begin JumpNonZero: */ @@ -12137,8 +12122,6 @@ genFloatComparisoninvertboxed(AbstractInstruction *(*jumpOpcodeGenerator)(void *), sqInt invertComparison, sqInt rcvrBoxed) { AbstractInstruction *anInstruction; - AbstractInstruction *anInstruction1; - AbstractInstruction *anInstruction2; AbstractInstruction * compare; sqInt constant; AbstractInstruction *jumpCond; @@ -12146,8 +12129,6 @@ AbstractInstruction *jumpNotBoxedFloat; AbstractInstruction *jumpNotSmallFloat; AbstractInstruction *jumpNotSmallInteger; - sqInt quickConstant; - sqInt quickConstant1; /* begin genLoadArgAtDepth:into: */ assert(0 < (numRegArgs())); @@ -12157,18 +12138,7 @@ else { genGetSmallFloatValueOfscratchinto(ReceiverResultReg, TempReg, DPFPReg0); } - /* begin MoveR:R: */ - genoperandoperand(MoveRR, Arg0Reg, ClassReg); - /* begin AndCq:R: */ - quickConstant = tagMask(); - /* begin gen:quickConstant:operand: */ - anInstruction = genoperandoperand(AndCqR, quickConstant, ClassReg); - /* begin CmpCq:R: */ - quickConstant1 = smallFloatTag(); - /* begin gen:quickConstant:operand: */ - anInstruction1 = genoperandoperand(CmpCqR, quickConstant1, ClassReg); - /* begin JumpNonZero: */ - jumpNotSmallFloat = genConditionalBranchoperand(JumpNonZero, ((sqInt)0)); + jumpNotSmallFloat = genJumpNotSmallFloat(Arg0Reg); genGetSmallFloatValueOfscratchinto(Arg0Reg, TempReg, DPFPReg1); if (invertComparison) { @@ -12190,7 +12160,7 @@ } else { /* begin MoveCq:R: */ - anInstruction2 = genoperandoperand(MoveCqR, constant, ReceiverResultReg); + anInstruction = genoperandoperand(MoveCqR, constant, ReceiverResultReg); } /* begin genPrimReturn */ assert(methodOrBlockNumArgs <= (numRegArgs())); @@ -12201,17 +12171,15 @@ assert(methodOrBlockNumArgs <= (numRegArgs())); /* begin RetN: */ genoperand(RetN, 0); - jmpTarget(jumpNotSmallFloat, gCmpCqR(smallIntegerTag(), ClassReg)); - /* begin JumpNonZero: */ - jumpNotSmallInteger = genConditionalBranchoperand(JumpNonZero, ((sqInt)0)); + jmpTarget(jumpNotSmallFloat, gLabel()); + jumpNotSmallInteger = genJumpNotSmallInteger(Arg0Reg); genConvertSmallIntegerToIntegerInReg(Arg0Reg); /* begin ConvertR:Rd: */ genoperandoperand(ConvertRRd, Arg0Reg, DPFPReg1); /* begin Jump: */ genoperand(Jump, ((sqInt)compare)); - jmpTarget(jumpNotSmallInteger, gCmpCqR(0, ClassReg)); - /* begin JumpNonZero: */ - jumpImmediate = genConditionalBranchoperand(JumpNonZero, ((sqInt)0)); + jmpTarget(jumpNotSmallInteger, gLabel()); + jumpImmediate = genJumpImmediate(Arg0Reg); genGetCompactClassIndexNonImmOfinto(Arg0Reg, SendNumArgsReg); genCmpClassFloatCompactIndexR(SendNumArgsReg); /* begin JumpNonZero: */ @@ -12399,22 +12367,22 @@ /* Generate a compare and branch to test if aRegister contains other than a - Character. Answer the jump. Override since scratch is needed. */ + Character. + */ - /* CogObjectRepresentationFor64BitSpur>>#genJumpNotCharacter:scratchReg: */ + /* CogObjectRepresentationFor64BitSpur>>#genJumpNotCharacter: */ static AbstractInstruction * NoDbgRegParms -genJumpNotCharacterscratchReg(sqInt reg, sqInt scratch) +genJumpNotCharacter(sqInt reg) { AbstractInstruction *anInstruction; sqInt quickConstant; - return (gAndCqRR(tagMask(), reg, scratch), - /* begin CmpCq:R: */ + return (/* begin TstCq:R: */ (quickConstant = characterTag()), /* begin gen:quickConstant:operand: */ - (anInstruction = genoperandoperand(CmpCqR, quickConstant, scratch)), - /* begin JumpNonZero: */ - genConditionalBranchoperand(JumpNonZero, ((sqInt)0))); + (anInstruction = genoperandoperand(TstCqR, quickConstant, reg)), + /* begin JumpZero: */ + genConditionalBranchoperand(JumpZero, ((sqInt)0))); } @@ -12478,49 +12446,22 @@ } -/* Generate a compare and branch to test if aRegister and scratchA contains - other than SmallIntegers, - i.e. don't branch if both aRegister and scratchA contain SmallIntegers. - Answer the jump. Destroy scratchA and scratchB if required. */ -/* Straight-forward approach. Map SmallIntegers to 0 in scratchA & scratchB, - add and jump non-zero. */ +/* Generate a compare and branch to test if aRegister contains other than a + SmallFloat. Answer the jump. */ - /* CogObjectRepresentationFor64BitSpur>>#genJumpNotSmallIntegersIn:andScratch:scratch: */ + /* CogObjectRepresentationFor64BitSpur>>#genJumpNotSmallFloat: */ static AbstractInstruction * NoDbgRegParms -genJumpNotSmallIntegersInandScratchscratch(sqInt aRegister, sqInt scratchA, sqInt scratchB) +genJumpNotSmallFloat(sqInt reg) { - AbstractInstruction *anInstruction1; - AbstractInstruction *anInstruction2; - AbstractInstruction *anInstruction3; - AbstractInstruction *anInstruction4; - sqInt quickConstant1; - sqInt quickConstant2; - sqInt quickConstant3; - sqInt quickConstant4; + AbstractInstruction *anInstruction; + sqInt quickConstant; - return (/* begin MoveR:R: */ - genoperandoperand(MoveRR, aRegister, scratchB), - /* begin SubCq:R: */ - (quickConstant3 = smallIntegerTag()), + return (/* begin TstCq:R: */ + (quickConstant = smallFloatTag()), /* begin gen:quickConstant:operand: */ - (anInstruction1 = genoperandoperand(SubCqR, quickConstant3, scratchA)), - /* begin SubCq:R: */ - (quickConstant4 = smallIntegerTag()), - /* begin gen:quickConstant:operand: */ - (anInstruction2 = genoperandoperand(SubCqR, quickConstant4, scratchB)), - /* begin AndCq:R: */ - (quickConstant1 = tagMask()), - /* begin gen:quickConstant:operand: */ - (anInstruction3 = genoperandoperand(AndCqR, quickConstant1, scratchA)), - /* begin AndCq:R: */ - (quickConstant2 = tagMask()), - /* begin gen:quickConstant:operand: */ - (anInstruction4 = genoperandoperand(AndCqR, quickConstant2, scratchB)), - /* begin AddR:R: */ - genoperandoperand(AddRR, scratchA, scratchB), - /* begin JumpNonZero: */ - genConditionalBranchoperand(JumpNonZero, ((sqInt)0))); - + (anInstruction = genoperandoperand(TstCqR, quickConstant, reg)), + /* begin JumpZero: */ + genConditionalBranchoperand(JumpZero, ((sqInt)0))); } @@ -12557,42 +12498,43 @@ /* Generate a compare and branch to test if aRegister contains other than a - SmallInteger. Answer the jump. Override since scratch is needed. */ + SmallInteger. + */ - /* CogObjectRepresentationFor64BitSpur>>#genJumpNotSmallInteger:scratchReg: */ + /* CogObjectRepresentationFor64BitSpur>>#genJumpNotSmallInteger: */ static AbstractInstruction * NoDbgRegParms -genJumpNotSmallIntegerscratchReg(sqInt reg, sqInt scratch) +genJumpNotSmallInteger(sqInt reg) { AbstractInstruction *anInstruction; sqInt quickConstant; - return (gAndCqRR(tagMask(), reg, scratch), - /* begin CmpCq:R: */ + return (/* begin TstCq:R: */ (quickConstant = smallIntegerTag()), /* begin gen:quickConstant:operand: */ - (anInstruction = genoperandoperand(CmpCqR, quickConstant, scratch)), - /* begin JumpNonZero: */ - genConditionalBranchoperand(JumpNonZero, ((sqInt)0))); + (anInstruction = genoperandoperand(TstCqR, quickConstant, reg)), + /* begin JumpZero: */ + genConditionalBranchoperand(JumpZero, ((sqInt)0))); } /* Generate a compare and branch to test if aRegister contains a - SmallInteger. Answer the jump. Override since scratch is needed. */ + SmallInteger. Answer the jump, or UnimplementedOperation if this cannot be + done with + a single register. */ - /* CogObjectRepresentationFor64BitSpur>>#genJumpSmallInteger:scratchReg: */ + /* CogObjectRepresentationFor64BitSpur>>#genJumpSmallInteger: */ static AbstractInstruction * NoDbgRegParms -genJumpSmallIntegerscratchReg(sqInt reg, sqInt scratch) +genJumpSmallInteger(sqInt aRegister) { AbstractInstruction *anInstruction; sqInt quickConstant; - return (gAndCqRR(tagMask(), reg, scratch), - /* begin CmpCq:R: */ + return (/* begin TstCq:R: */ (quickConstant = smallIntegerTag()), /* begin gen:quickConstant:operand: */ - (anInstruction = genoperandoperand(CmpCqR, quickConstant, scratch)), - /* begin JumpZero: */ - genConditionalBranchoperand(JumpZero, ((sqInt)0))); + (anInstruction = genoperandoperand(TstCqR, quickConstant, aRegister)), + /* begin JumpNonZero: */ + genConditionalBranchoperand(JumpNonZero, ((sqInt)0))); } @@ -12654,7 +12596,8 @@ jumpImmediate = genJumpImmediate(ReceiverResultReg); /* begin MoveR:R: */ genoperandoperand(MoveRR, Arg0Reg, Arg1Reg); - jumpBadIndex = genJumpNotSmallIntegerscratchReg(Arg0Reg, TempReg); + /* begin genJumpNotSmallInteger:scratchReg: */ + jumpBadIndex = genJumpNotSmallInteger(Arg0Reg); genConvertSmallIntegerToIntegerInReg(Arg1Reg); /* begin SubCq:R: */ anInstruction = genoperandoperand(SubCqR, 1, Arg1Reg); @@ -12872,7 +12815,8 @@ /* begin genLoadArgAtDepth:into: */ assert(0 < (numRegArgs())); jumpImmediate = genJumpImmediate(ReceiverResultReg); - jumpBadIndex = genJumpNotSmallIntegerscratchReg(Arg0Reg, TempReg); + /* begin genJumpNotSmallInteger:scratchReg: */ + jumpBadIndex = genJumpNotSmallInteger(Arg0Reg); genConvertSmallIntegerToIntegerInReg(Arg0Reg); /* begin SubCq:R: */ anInstruction16 = genoperandoperand(SubCqR, 1, Arg0Reg); @@ -12948,7 +12892,8 @@ /* begin RetN: */ genoperand(RetN, 0); jmpTarget(jumpNotPointers, gLabel()); - jumpNonSmallIntegerValue = genJumpNotSmallIntegerscratchReg(Arg1Reg, TempReg); + /* begin genJumpNotSmallInteger:scratchReg: */ + jumpNonSmallIntegerValue = genJumpNotSmallInteger(Arg1Reg); /* begin CmpCq:R: */ quickConstant3 = firstByteFormat(); /* begin gen:quickConstant:operand: */ @@ -13247,7 +13192,8 @@ /* begin JumpZero: */ jumpUnhashed = genConditionalBranchoperand(JumpZero, ((sqInt)0)); genLoadSlotsourceRegdestReg(InstanceSpecificationIndex, Arg0Reg, instSpecReg); - jumpBadFormat = genJumpNotSmallIntegerscratchReg(instSpecReg, TempReg); + /* begin genJumpNotSmallInteger:scratchReg: */ + jumpBadFormat = genJumpNotSmallInteger(instSpecReg); genConvertSmallIntegerToIntegerInReg(instSpecReg); /* begin MoveR:R: */ genoperandoperand(MoveRR, instSpecReg, TempReg); @@ -13425,9 +13371,8 @@ /* check size and fail if not a +ve integer */ maxSlots = (numSlotsMask()) - 1; - - /* Is the class arg pointers with at least 3 fields? */ - jumpNElementsNonInt = genJumpNotSmallIntegerscratchReg(Arg1Reg, TempReg); + /* begin genJumpNotSmallInteger:scratchReg: */ + jumpNElementsNonInt = genJumpNotSmallInteger(Arg1Reg); jumpImmediate = genJumpImmediate(Arg0Reg); genGetRawSlotSizeOfNonImminto(Arg0Reg, TempReg); /* begin CmpCq:R: */ @@ -13864,9 +13809,8 @@ genGetHashFieldNonImmOfinto(ReceiverResultReg, headerReg); /* begin JumpZero: */ jumpUnhashed = genConditionalBranchoperand(JumpZero, ((sqInt)0)); - - /* get class's format inst var for inst spec (format field) */ - jumpNElementsNonInt = genJumpNotSmallIntegerscratchReg(Arg0Reg, TempReg); + /* begin genJumpNotSmallInteger:scratchReg: */ + jumpNElementsNonInt = genJumpNotSmallInteger(Arg0Reg); genLoadSlotsourceRegdestReg(InstanceSpecificationIndex, ReceiverResultReg, instSpecReg); /* begin LogicalShiftRightCq:R: */ quickConstant = (fixedFieldsFieldWidth()) + (numSmallIntegerTagBits()); @@ -14065,7 +14009,8 @@ assert(0 < (numRegArgs())); /* begin MoveR:R: */ genoperandoperand(MoveRR, Arg0Reg, Arg1Reg); - jumpBadIndex = genJumpNotSmallIntegerscratchReg(Arg0Reg, TempReg); + /* begin genJumpNotSmallInteger:scratchReg: */ + jumpBadIndex = genJumpNotSmallInteger(Arg0Reg); genConvertSmallIntegerToIntegerInReg(Arg1Reg); /* begin SubCq:R: */ anInstruction1 = genoperandoperand(SubCqR, 1, Arg1Reg); @@ -14203,8 +14148,8 @@ assert(1 < (numRegArgs())); /* begin genLoadArgAtDepth:into: */ assert(0 < (numRegArgs())); - jumpBadIndex = genJumpNotSmallIntegerscratchReg(Arg0Reg, TempReg); - jumpBadArg = genJumpNotCharacterscratchReg(Arg1Reg, TempReg); + jumpBadIndex = genJumpNotSmallInteger(Arg0Reg); + jumpBadArg = genJumpNotCharacter(Arg1Reg); genConvertSmallIntegerToIntegerInReg(Arg0Reg); /* begin SubCq:R: */ anInstruction11 = genoperandoperand(SubCqR, 1, Arg0Reg); @@ -15631,7 +15576,8 @@ reg = Arg0Reg; /* begin genLoadArgAtDepth:into: */ assert(0 < (numRegArgs())); - jumpNotInt = genJumpNotSmallIntegerscratchReg(reg, TempReg); + /* begin genJumpNotSmallInteger:scratchReg: */ + jumpNotInt = genJumpNotSmallInteger(reg); } /* begin MoveR:R: */ genoperandoperand(MoveRR, reg, TempReg); @@ -15711,7 +15657,8 @@ /* begin genLoadArgAtDepth:into: */ assert(0 < (numRegArgs())); - jumpBadIndex = genJumpNotSmallIntegerscratchReg(Arg0Reg, TempReg); + /* begin genJumpNotSmallInteger:scratchReg: */ + jumpBadIndex = genJumpNotSmallInteger(Arg0Reg); genGetMethodHeaderOfintoscratch(ReceiverResultReg, (headerReg = Arg1Reg), TempReg); /* begin CmpCq:R: */ anInstruction = genoperandoperand(CmpCqR, (((sqInt)1 << 3) | 1), Arg0Reg); @@ -25032,19 +24979,19 @@ } if (sendTable == selfSendTrampolines) { annotation = IsNSSelfSend; - goto l1; + goto l2; } if (sendTable == dynamicSuperSendTrampolines) { annotation = IsNSDynamicSuperSend; - goto l1; + goto l2; } if (sendTable == superSendTrampolines) { annotation = IsSuperSend; - goto l1; + goto l2; } assert(sendTable == ordinarySendTrampolines); annotation = IsSendCall; -l1: /* end annotationForSendTable: */; +l2: /* end annotationForSendTable: */; if ((annotation == IsSuperSend) || (0)) { genEnsureOopInRegNotForwardedscratchReg(ReceiverResultReg, TempReg); @@ -25402,7 +25349,7 @@ } genLoadSlotsourceRegdestReg(SenderIndex, ReceiverResultReg, TempReg); /* begin genJumpNotSmallIntegerInScratchReg: */ - jmpSingle = genJumpNotSmallIntegerscratchReg(TempReg, TempReg); + jmpSingle = genJumpNotSmallInteger(TempReg); /* begin MoveCq:R: */ anInstruction1 = genoperandoperand(MoveCqR, slotIndex, SendNumArgsReg); /* begin CallRT: */ @@ -25704,10 +25651,13 @@ if (argIsInt || (rcvrIsInt)) { /* begin genJumpNotSmallIntegerInScratchReg: */ - jumpNotSmallInts = genJumpNotSmallIntegerscratchReg(TempReg, TempReg); + jumpNotSmallInts = genJumpNotSmallInteger(TempReg); } else { - jumpNotSmallInts = genJumpNotSmallIntegersInandScratchscratch(ReceiverResultReg, TempReg, ClassReg); + /* begin genJumpNotSmallIntegersIn:andScratch:scratch: */ + genoperandoperand(AndRR, ReceiverResultReg, TempReg); + /* begin genJumpNotSmallIntegerInScratchReg: */ + jumpNotSmallInts = genJumpNotSmallInteger(TempReg); } switch ((primDescriptor->opcode)) { @@ -25922,10 +25872,13 @@ if (argIsInt || (rcvrIsInt)) { /* begin genJumpNotSmallIntegerInScratchReg: */ - jumpNotSmallInts = genJumpNotSmallIntegerscratchReg(TempReg, TempReg); + jumpNotSmallInts = genJumpNotSmallInteger(TempReg); } else { - jumpNotSmallInts = genJumpNotSmallIntegersInandScratchscratch(ReceiverResultReg, TempReg, ClassReg); + /* begin genJumpNotSmallIntegersIn:andScratch:scratch: */ + genoperandoperand(AndRR, ReceiverResultReg, TempReg); + /* begin genJumpNotSmallIntegerInScratchReg: */ + jumpNotSmallInts = genJumpNotSmallInteger(TempReg); } if (argIsInt) { if (annotateInst) { @@ -26436,7 +26389,7 @@ # endif /* IMMUTABILITY */ /* begin genJumpNotSmallIntegerInScratchReg: */ - jmpSingle = genJumpNotSmallIntegerscratchReg(TempReg, TempReg); + jmpSingle = genJumpNotSmallInteger(TempReg); /* begin MoveCq:R: */ anInstruction = genoperandoperand(MoveCqR, slotIndex, SendNumArgsReg); /* begin CallRT: */ Modified: branches/Cog/nsspur64src/vm/cointerp.c =================================================================== --- branches/Cog/nsspur64src/vm/cointerp.c 2016-03-09 09:00:31 UTC (rev 3642) +++ branches/Cog/nsspur64src/vm/cointerp.c 2016-03-11 01:42:54 UTC (rev 3643) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1716 uuid: 9115c93b-f425-4118-96e7-7130adeff1f2 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1722 uuid: e5c44d63-ba75-4cd1-bf4e-c92c4232bbfe from - CoInterpreter VMMaker.oscog-eem.1716 uuid: 9115c93b-f425-4118-96e7-7130adeff1f2 + CoInterpreter VMMaker.oscog-eem.1722 uuid: e5c44d63-ba75-4cd1-bf4e-c92c4232bbfe */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1716 uuid: 9115c93b-f425-4118-96e7-7130adeff1f2 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1722 uuid: e5c44d63-ba75-4cd1-bf4e-c92c4232bbfe " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -958,7 +958,6 @@ static sqInt allocationUnit(void); static sqInt NoDbgRegParms allStrongSlotsOfWeaklingAreMarked(sqInt aWeakling); static sqInt allUnscannedEphemeronsAreActive(void); -static sqInt arrayClassIndexPun(void); extern sqInt arrayFormat(void); static sqInt NoDbgRegParms becomeEffectFlagsFor(sqInt objOop); extern sqInt becomewith(sqInt array1, sqInt array2); @@ -1143,7 +1142,6 @@ static sqInt NoDbgRegParms isonObjStack(sqInt oop, sqInt objStack); static sqInt NoDbgRegParms keyOfEphemeron(sqInt objOop); static sqInt NoDbgRegParms knownClassAtIndex(sqInt classIndex); -static sqInt lastClassIndexPun(void); extern sqInt lastPointerOfWhileSwizzling(sqInt objOop); extern sqInt lastPointerOf(sqInt objOop); extern sqInt leakCheckBecome(void); @@ -1176,6 +1174,7 @@ static sqInt NoDbgRegParms noCheckPushonObjStack(sqInt objOop, sqInt objStack); static sqInt NoDbgRegParms noFixupFollowFieldofObject(sqInt fieldIndex, sqInt anObject); static sqInt NoDbgRegParms noInlineFollowForwarded(sqInt objOop); +static sqInt NoDbgRegParms noInlineObjectAfterlimit(sqInt objOop, sqInt limit); extern sqInt nonIndexablePointerFormat(void); static sqInt noUnscannedEphemerons(void); static sqInt NoDbgRegParms numBytesOfBytes(sqInt objOop); @@ -1384,7 +1383,6 @@ extern sqInt highBit(usqInt anUnsignedValue); static sqInt NoDbgRegParms ifCurrentStackPageHasValidHeadPointers(StackPage *thePage); static usqInt NoDbgRegParms iframeMethod(char *theFP); -static sqInt imageFormatVersion(void); extern sqInt includesBehaviorThatOf(sqInt aClass, sqInt aSuperclass); static sqInt NoDbgRegParms inlineLookupInNSMethodCacheSelclassTagmethodlookupRule(sqInt selector, sqInt classTag, sqInt callingMethod, sqInt lookupRule); extern sqInt integerArg(sqInt index); @@ -2441,7 +2439,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.1716"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.1722"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -2485,7 +2483,7 @@ #define smallFloatExponentBits() 8 #define smallFloatExponentOffset() 896 #define smallFloatMantissaBits() 52 -#define smallFloatTag() 3 +#define smallFloatTag() 4 #define tagMask() 0x7 #define wordSize() 8 #define eden() GIV(eden) @@ -2494,11 +2492,14 @@ #define pastSpace() GIV(pastSpace) #define rememberedSetLimit() GIV(rememberedSetLimit) #define rememberedSetSize() GIV(rememberedSetSize) +#define arrayClassIndexPun() 16 #define characterTag() 2 #define classIndexMask() 0x3FFFFF +#define classIsItselfClassIndexPun() 31 #define classTableMajorIndexShift() 10 #define endOfMemory() GIV(endOfMemory) #define firstByteFormat() 16 +#define firstClassIndexPun() 16 #define firstCompiledMethodFormat() 24 #define firstLongFormat() 10 #define firstShortFormat() 12 @@ -2510,6 +2511,8 @@ #define identityHashHalfWordMask() 0x3FFFFF #define indexablePointersFormat() 3 #define isForwardedObjectClassIndexPun() 8 +#define isFreeObjectClassIndexPun() 0 +#define lastClassIndexPun() 31 #define maxOldSpaceSize() maxOldSpaceSize #define memory() GIV(memory) #define newSpaceLimit() GIV(newSpaceLimit) @@ -2521,7 +2524,11 @@ #define rememberedBitShift() 29 #define rootTableCapacity() GIV(rememberedSetLimit) #define rootTableCount() GIV(rememberedSetSize) +#define segmentBridgePun() 3 #define sixtyFourBitIndexableFormat() 9 +#define sixtyFourBitLongsClassIndexPun() 19 +#define thirtyTwoBitLongsClassIndexPun() 18 +#define weakArrayClassIndexPun() 17 #define weakArrayFormat() 4 #define numSegments() GIV(numSegments) #define alternateHeaderNumLiteralsMask() 0x7FFF @@ -4727,7 +4734,7 @@ GIV(argumentCount) = 2; goto normalSend; /* return self */ - goto l1; + goto l8; } # endif /* IMMUTABILITY */ @@ -4746,7 +4753,7 @@ } } longAtput((rcvr + BaseHeaderSize) + (((long)instVarIndex) << (shiftForWord())), top); - l1: /* end storePointerImmutabilityCheck:ofObject:withValue: */; + l8: /* end storePointerImmutabilityCheck:ofObject:withValue: */; /* begin fetchNextBytecode */ currentBytecode = (byteAtPointer(++localIP)) + GIV(bytecodeSetSelector); @@ -5053,7 +5060,7 @@ frameToReturnTo = 0; if (!((byteAt((localFP + FoxIFrameFlags) + 3)) != 0)) { goto commonCallerReturn; - goto l154; + goto l413; } closure = longAt(localFP + (frameStackedReceiverOffsetNumArgs(((((usqInt)(longAt(localFP + FoxMethod)))) < (startOfMemory()) ? ((mframeCogMethod(localFP))->cmNumArgs) @@ -5103,10 +5110,10 @@ : (byteAt((localFP + FoxIFrameFlags) + 2)) != 0)) { assert(isContext(frameContext(localFP))); ourContext = longAt(localFP + FoxThisContext); - goto l158; + goto l419; } ourContext = marryFrameSP(localFP, localSP); - l158: /* end ensureFrameIsMarried:SP: */; + l419: /* end ensureFrameIsMarried:SP: */; /* begin internalPush: */ longAtPointerput((localSP -= BytesPerOop), ourContext); /* begin internalPush: */ @@ -5114,7 +5121,7 @@ GIV(messageSelector) = longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (((long)SelectorCannotReturn) << (shiftForWord()))); GIV(argumentCount) = 1; goto normalSend; - goto l154; + goto l413; } if (unwindContextOrNilOrZero != 0) { /* begin internalAboutToReturn:through: */ @@ -5123,10 +5130,10 @@ : (byteAt((localFP + FoxIFrameFlags) + 2)) != 0)) { assert(isContext(frameContext(localFP))); ourContext1 = longAt(localFP + FoxThisContext); - goto l155; + goto l416; } ourContext1 = marryFrameSP(localFP, localSP); - l155: /* end ensureFrameIsMarried:SP: */; + l416: /* end ensureFrameIsMarried:SP: */; /* begin internalPush: */ longAtPointerput((localSP -= BytesPerOop), ourContext1); /* begin internalPush: */ @@ -5136,7 +5143,7 @@ GIV(messageSelector) = longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (((long)SelectorAboutToReturn) << (shiftForWord()))); GIV(argumentCount) = 2; goto normalSend; - goto l154; + goto l413; } contextToReturnTo = null; if (((((longAt((home + BaseHeaderSize) + (((long)SenderIndex) << (shiftForWord()))))) & 7) == 1)) { @@ -5188,10 +5195,10 @@ : (byteAt((localFP + FoxIFrameFlags) + 2)) != 0)) { assert(isContext(frameContext(localFP))); ourContext2 = longAt(localFP + FoxThisContext); - goto l157; + goto l435; } ourContext2 = marryFrameSP(localFP, localSP); - l157: /* end ensureFrameIsMarried:SP: */; + l435: /* end ensureFrameIsMarried:SP: */; /* begin internalPush: */ longAtPointerput((localSP -= BytesPerOop), ourContext2); /* begin internalPush: */ @@ -5199,7 +5206,7 @@ GIV(messageSelector) = longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (((long)SelectorCannotReturn) << (shiftForWord()))); GIV(argumentCount) = 1; goto normalSend; - goto l154; + goto l413; } } assert(pageListIsWellFormed()); @@ -5304,11 +5311,11 @@ GIV(stackPointer) = localSP; GIV(framePointer) = localFP; ceEnterCogCodePopReceiverReg(); - goto l156; + goto l415; } localIP = pointerForOop(longAt(localFP + FoxIFSavedIP)); } - l156: /* end maybeReturnToMachineCodeFrame */; + l415: /* end maybeReturnToMachineCodeFrame */; /* begin setMethod: */ aMethodObj = longAt(localFP + FoxMethod); assert((((usqInt)aMethodObj)) >= (startOfMemory())); @@ -5323,7 +5330,7 @@ longAtPointerput(localSP, localReturnValue); } - l154: /* end case */; + l413: /* end case */; break; case 121: /* returnTrue */ @@ -5436,27 +5443,27 @@ fp = (thePage->headFP); if (fp == theFP) { frameAbove = 0; - goto l160; + goto l441; } while (((callerFP = pointerForOop(longAt(fp + FoxSavedFP)))) != 0) { if (callerFP == theFP) { frameAbove = fp; - goto l160; + goto l441; } fp = callerFP; } error("did not find theFP in stack page"); frameAbove = 0; - l160: /* end findFrameAbove:inPage: */; + l441: /* end findFrameAbove:inPage: */; /* begin newStackPage */ lruOrFree = (GIV(mostRecentlyUsedPage)->nextPage); if (((lruOrFree->baseFP)) == 0) { newPage = lruOrFree; - goto l161; + goto l445; } divorceFramesIn(lruOrFree); newPage = lruOrFree; - l161: /* end newStackPage */; + l445: /* end newStackPage */; assert(newPage == GIV(stackPage)); moveFramesInthroughtoPage(thePage, frameAbove, newPage); markStackPageMostRecentlyUsed(newPage); @@ -5479,7 +5486,7 @@ longAtput((sp2 = GIV(stackPointer) - BytesPerWord), GIV(instructionPointer)); GIV(stackPointer) = sp2; ceSendAborttonumArgs(longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (((long)SelectorCannotReturn) << (shiftForWord()))), contextToReturnFrom, 1); - goto l159; + goto l437; } GIV(instructionPointer) = 0; thePage = makeBaseFrameFor(contextToReturnTo); @@ -5515,7 +5522,7 @@ GIV(stackPointer) = localSP; GIV(framePointer) = localFP; ceEnterCogCodePopReceiverReg(); - goto l159; + goto l437; } localIP = pointerForOop(longAt(localFP + FoxIFSavedIP)); } @@ -5533,7 +5540,7 @@ /* begin fetchNextBytecode */ currentBytecode = (byteAtPointer(++localIP)) + GIV(bytecodeSetSelector); - goto l159; + goto l437; } localIP = pointerForOop(longAt(localFP + FoxCallerSavedIP)); localSP = localFP + (frameStackedReceiverOffsetNumArgs(((((usqInt)(longAt(localFP + FoxMethod)))) < (startOfMemory()) @@ -5558,7 +5565,7 @@ GIV(stackPointer) = localSP; GIV(framePointer) = localFP; ceEnterCogCodePopReceiverReg(); - goto l159; + goto l437; } localIP = pointerForOop(longAt(localFP + FoxIFSavedIP)); } @@ -5576,7 +5583,7 @@ longAtPointerput(localSP, localReturnValue); } - l159: /* end case */; + l437: /* end case */; break; case 126: case 127: @@ -5609,10 +5616,10 @@ : (byteAt((theFP + FoxIFrameFlags) + 2)) != 0)) { assert(isContext(frameContext(theFP))); ourContext = longAt(theFP + FoxThisContext); - goto l162; + goto l446; } ourContext = marryFrameSP(theFP, theSP); - l162: /* end ensureFrameIsMarried:SP: */; + l446: /* end ensureFrameIsMarried:SP: */; localIP -= 1; /* begin internalPush: */ longAtPointerput((localSP -= BytesPerOop), ourContext); @@ -5642,7 +5649,7 @@ if (variableType == 0) { /* begin pushReceiverVariable: */ longAtPointerput((localSP -= BytesPerOop), longAt(((longAt(localFP + FoxIFReceiver)) + BaseHeaderSize) + (((long)variableIndex) << (shiftForWord())))); - goto l2; + goto l10; } if (variableType == 1) { /* begin pushTemporaryVariable: */ @@ -5650,14 +5657,14 @@ ? longAt((localFP + FoxCallerSavedIP) + ((frameNumArgs - variableIndex) * BytesPerWord)) : longAt(((localFP + FoxIFReceiver) - BytesPerWord) + ((frameNumArgs - variableIndex) * BytesPerWord))); longAtPointerput((localSP -= BytesPerOop), object); - goto l2; + goto l10; } if (variableType == 2) { /* begin pushLiteralConstant: */ assert(GIV(method) == (iframeMethod(localFP))); object1 = longAt((GIV(method) + BaseHeaderSize) + (((long)(variableIndex + LiteralStart)) << (shiftForWord()))); longAtPointerput((localSP -= BytesPerOop), object1); - goto l2; + goto l10; } if (variableType == 3) { /* begin pushLiteralVariable: */ @@ -5682,10 +5689,10 @@ /* begin internalPush: */ longAtPointerput((localSP -= BytesPerOop), longAt((litVar + BaseHeaderSize) + (((long)ValueIndex) << (shiftForWord())))); - goto l2; + goto l10; } } - l2: /* end case */; + l10: /* end case */; break; case 129: /* extendedStoreBytecode */ @@ -5722,7 +5729,7 @@ GIV(argumentCount) = 2; goto normalSend; /* return self */ - goto l4; + goto l19; } # endif /* IMMUTABILITY */ @@ -5741,11 +5748,11 @@ } } longAtput((objOop + BaseHeaderSize) + (((long)variableIndex) << (shiftForWord())), value); - l4: /* end storePointerImmutabilityCheck:ofObject:withValue: */; + l19: /* end storePointerImmutabilityCheck:ofObject:withValue: */; /* begin fetchNextBytecode */ currentBytecode = (byteAtPointer(++localIP)) + GIV(bytecodeSetSelector); - goto l3; + goto l16; } if (variableType == 1) { /* begin fetchNextBytecode */ @@ -5757,7 +5764,7 @@ else { longAtput(((localFP + FoxIFReceiver) - BytesPerWord) + ((frameNumArgs - variableIndex) * BytesPerWord), value); } - goto l3; + goto l16; } if (variableType == 3) { /* begin storeLiteralVariable:withValue: */ @@ -5787,7 +5794,7 @@ GIV(messageSelector) = longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (((long)SelectorAttemptToAssign) << (shiftForWord()))); GIV(argumentCount) = 2; goto normalSend; - goto l5; + goto l20; } # endif /* IMMUTABILITY */ @@ -5806,14 +5813,14 @@ } } longAtput((litVar + BaseHeaderSize) + (((long)ValueIndex) << (shiftForWord())), value); - l5: /* end storeLiteralVariable:withValue: */; + l20: /* end storeLiteralVariable:withValue: */; /* begin fetchNextBytecode */ currentBytecode = (byteAtPointer(++localIP)) + GIV(bytecodeSetSelector); - goto l3; + goto l16; } error("illegal store"); - l3: /* end extendedStoreBytecodePop: */; + l16: /* end extendedStoreBytecodePop: */; } break; case 130: @@ -5854,7 +5861,7 @@ GIV(argumentCount) = 2; goto normalSend; /* return self */ - goto l7; + goto l26; } # endif /* IMMUTABILITY */ @@ -5873,11 +5880,11 @@ } } longAtput((objOop + BaseHeaderSize) + (((long)variableIndex) << (shiftForWord())), value); - l7: /* end storePointerImmutabilityCheck:ofObject:withValue: */; + l26: /* end storePointerImmutabilityCheck:ofObject:withValue: */; /* begin fetchNextBytecode */ currentBytecode = (byteAtPointer(++localIP)) + GIV(bytecodeSetSelector); - goto l6; + goto l23; } if (variableType == 1) { /* begin fetchNextBytecode */ @@ -5889,7 +5896,7 @@ else { longAtput(((localFP + FoxIFReceiver) - BytesPerWord) + ((frameNumArgs - variableIndex) * BytesPerWord), value); } - goto l6; + goto l23; } if (variableType == 3) { /* begin storeLiteralVariable:withValue: */ @@ -5919,7 +5926,7 @@ GIV(messageSelector) = longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (((long)SelectorAttemptToAssign) << (shiftForWord()))); GIV(argumentCount) = 2; goto normalSend; - goto l8; + goto l27; } # endif /* IMMUTABILITY */ @@ -5938,14 +5945,14 @@ } } longAtput((litVar + BaseHeaderSize) + (((long)ValueIndex) << (shiftForWord())), value); - l8: /* end storeLiteralVariable:withValue: */; + l27: /* end storeLiteralVariable:withValue: */; /* begin fetchNextBytecode */ currentBytecode = (byteAtPointer(++localIP)) + GIV(bytecodeSetSelector); - goto l6; + goto l23; } error("illegal store"); - l6: /* end extendedStoreBytecodePop: */; + l23: /* end extendedStoreBytecodePop: */; } break; case 131: @@ -6021,12 +6028,12 @@ classTablePage = longAt((GIV(hiddenRootsObj) + BaseHeaderSize) + (((long)fieldIndex) << (shiftForWord()))); if (classTablePage == GIV(nilObj)) { classOrInteger = null; - goto l166; + goto l456; } /* begin fetchPointer:ofObject: */ fieldIndex1 = GIV(lkupClassTag) & ((1LL << (classTableMajorIndexShift())) - 1); classOrInteger = longAt((classTablePage + BaseHeaderSize) + (((long)fieldIndex1) << (shiftForWord()))); - l166: /* end classAtIndex: */; + l456: /* end classAtIndex: */; GIV(traceLog)[GIV(traceLogIndex)] = classOrInteger; GIV(traceLog)[GIV(traceLogIndex) + 1] = GIV(messageSelector); GIV(traceLog)[GIV(traceLogIndex) + 2] = TraceIsFromInterpreter; @@ -6049,7 +6056,7 @@ GIV(newMethod) = GIV(methodCache)[probe + MethodCacheMethod]; primitiveFunctionPointer = ((void (*)()) (GIV(methodCache)[probe + MethodCachePrimFunction])); ok = 1; - goto l164; + goto l450; } /* second probe */ @@ -6059,7 +6066,7 @@ GIV(newMethod) = GIV(methodCache)[probe + MethodCacheMethod]; primitiveFunctionPointer = ((void (*)()) (GIV(methodCache)[probe + MethodCachePrimFunction])); ok = 1; - goto l164; + goto l450; } probe = (((usqInt) hash) >> 2) & MethodCacheMask; if (((GIV(methodCache)[probe + MethodCacheSelector]) == GIV(messageSelector)) @@ -6067,10 +6074,10 @@ GIV(newMethod) = GIV(methodCache)[probe + MethodCacheMethod]; primitiveFunctionPointer = ((void (*)()) (GIV(methodCache)[probe + MethodCachePrimFunction])); ok = 1; - goto l164; + goto l450; } ok = 0; - l164: /* end inlineLookupInMethodCacheSel:classTag: */; + l450: /* end inlineLookupInMethodCacheSel:classTag: */; if (ok) { /* begin ifAppropriateCompileToNativeCode:selector: */ methodHeader2 = longAt((GIV(newMethod) + BaseHeaderSize) + (((long)HeaderIndex) << (shiftForWord()))); @@ -6126,7 +6133,7 @@ maybeFlagMethodAsInterpreted(GIV(newMethod)); } } - goto l163; + goto l453; } } /* begin classAtIndex: */ @@ -6137,12 +6144,12 @@ classTablePage1 = longAt((GIV(hiddenRootsObj) + BaseHeaderSize) + (((long)fieldIndex2) << (shiftForWord()))); if (classTablePage1 == GIV(nilObj)) { GIV(lkupClass) = null; - goto l167; + goto l454; } /* begin fetchPointer:ofObject: */ fieldIndex11 = GIV(lkupClassTag) & ((1LL << (classTableMajorIndexShift())) - 1); GIV(lkupClass) = longAt((classTablePage1 + BaseHeaderSize) + (((long)fieldIndex11) << (shiftForWord()))); - l167: /* end classAtIndex: */; + l454: /* end classAtIndex: */; lookupOrdinarySend(); /* begin internalizeIPandSP */ @@ -6152,7 +6159,7 @@ localFP = pointerForOop(GIV(framePointer)); addNewMethodToCache(GIV(lkupClass)); } - l163: /* end internalFindNewMethodOrdinary */; + l453: /* end internalFindNewMethodOrdinary */; /* begin internalExecuteNewMethod */ if (primitiveFunctionPointer != 0) { if ((((unsigned long) primitiveFunctionPointer)) <= MaxQuickPrimitiveIndex) { @@ -6164,26 +6171,26 @@ if (localPrimIndex >= 264) { /* begin internalStackTopPut: */ longAtPointerput(localSP, longAt(((longAtPointer(localSP)) + BaseHeaderSize) + (((long)(localPrimIndex - 264)) << (shiftForWord())))); - goto l165; + goto l455; } if (localPrimIndex == 256) { - goto l165; + goto l455; } if (localPrimIndex == 257) { longAtPointerput(localSP, GIV(trueObj)); - goto l165; + goto l455; } if (localPrimIndex == 258) { longAtPointerput(localSP, GIV(falseObj)); - goto l165; + goto l455; } if (localPrimIndex == 259) { longAtPointerput(localSP, GIV(nilObj)); - goto l165; + goto l455; } longAtPointerput(localSP, (((localPrimIndex - 261) << 3) | 1)); - l165: /* end internalQuickPrimitiveResponse */; - goto l169; + l455: /* end internalQuickPrimitiveResponse */; + goto l452; } /* begin externalizeIPandSP */ assert((((usqInt)localIP)) != (ceReturnToInterpreterPC())); @@ -6245,7 +6252,7 @@ if (succeeded) { returntoExecutive(popStack(), 1); browserPluginReturnIfNeeded(); - goto l169; @@ Diff output truncated at 50000 characters. @@

1 0

VM Maker: VMMaker.oscog-eem.1722.mcz
by commits＠source.squeak.org 11 Mar '16

11 Mar '16

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.1722.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.1722 Author: eem Time: 10 March 2016, 5:29:23.250589 pm UUID: e5c44d63-ba75-4cd1-bf4e-c92c4232bbfe Ancestors: VMMaker.oscog-eem.1721 Revert the more flexible super expansion code. It produces an as-yet-undiagnosed lockup in generating the NewspeakSpurCogVM. =============== Diff against VMMaker.oscog-eem.1721 =============== Item was changed: ----- Method: MessageNode>>asTranslatorNodeIn: (in category '*VMMaker-C translation') ----- asTranslatorNodeIn: aTMethod "make a CCodeGenerator equivalent of me" "selector is sometimes a Symbol, sometimes a SelectorNode!! On top of this, numArgs is needed due to the (truly grody) use of arguments as a place to store the extra expressions needed to generate code for in-line to:by:do:, etc. see below, where it is used." + | rcvrOrNil sel args ifNotNilBlock | - | lastExpression rcvrOrNil sel args ifNotNilBlock | rcvrOrNil := receiver ifNotNil: [receiver asTranslatorNodeIn: aTMethod]. (rcvrOrNil notNil and: [rcvrOrNil isVariable and: [rcvrOrNil name = 'super']]) ifTrue: + [^aTMethod superExpansionNodeFor: selector key args: arguments]. - [lastExpression := aTMethod parseTree statements last. - ^aTMethod - superExpansionNodeFor: selector key - args: arguments - isResult: (lastExpression isReturn and: [lastExpression expr == self])]. sel := selector isSymbol ifTrue: [selector] ifFalse: [selector key]. ((sel == #cCode:inSmalltalk: "extracting here rather than in translation allows inlining in the block." or: [sel == #cCode:]) and: [arguments first isBlockNode]) ifTrue: [| block | ^(block := arguments first asTranslatorNodeIn: aTMethod) statements size = 1 ifTrue: [block statements first] ifFalse: [block]]. args := arguments select: [:arg| arg notNil] thenCollect: [:arg| arg asTranslatorNodeIn: aTMethod]. (sel = #to:by:do: and: [arguments size = 7 and: [(arguments at: 7) notNil]]) ifTrue: ["Restore limit expr that got moved by transformToDo:" args := {(arguments at: 7) value asTranslatorNodeIn: aTMethod. args second. args third. "add the limit var as a hidden extra argument; we may need it later" TVariableNode new setName: arguments first key}]. (sel == #ifTrue:ifFalse: and: [arguments first isJust: NodeNil]) ifTrue: [sel := #ifFalse:. args := {args last}]. (sel == #ifTrue:ifFalse: and: [arguments last isJust: NodeNil]) ifTrue: [sel := #ifTrue:. args := {args first}]. (sel == #ifFalse:ifTrue: and: [arguments first isJust: NodeNil]) ifTrue: [sel := #ifTrue:. args := {args last}]. (sel == #ifFalse:ifTrue: and: [arguments last isJust: NodeNil]) ifTrue: [sel := #ifTrue:. args := {args first}]. ((sel == #ifFalse: or: [sel == #or:]) and: [arguments size = 2 and: [(arguments at: 2) notNil]]) ifTrue: ["Restore argument block that got moved by transformOr: or transformIfFalse:" args := {(arguments at: 2) asTranslatorNodeIn: aTMethod}]. (args size > sel numArgs and: [sel ~~ #to:by:do:]) ifTrue: "to:by:do: has iLimiT hidden in last arg" ["prune the extra blocks left by ifTrue:, ifFalse:, and: & or:" self assert: args size - sel numArgs = 1. self assert: (args last isStmtList and: [args last statements size = 1 and: [(args last statements first isVariable or: [args last statements first isConstant]) and: [#('nil' true false) includes: args last statements first nameOrValue]]]). args := args first: sel numArgs]. "For the benefit of later passes, e.g. value: inlining, transform e ifNotNil: [:v| ...] into v := e. v ifNotNil: [...], which in fact means transforming (v := e) ifTrue: [:v|...] into v := e. v ifTrue: [...]." ((sel == #ifTrue: or: [sel == #ifFalse: or: [sel == #ifTrue:ifFalse: or: [sel == #ifFalse:ifTrue:]]]) and: [receiver notNil and: [receiver isAssignmentEqualsEqualsNil and: [(ifNotNilBlock := args detect: [:arg| arg isStmtList and: [arg args size = 1]] ifNone: []) notNil]]]) ifTrue: [ifNotNilBlock setArguments: #(). ^TStmtListNode new setArguments: #() statements: { receiver receiver asTranslatorNodeIn: aTMethod. TSendNode new setSelector: sel receiver: (TSendNode new setSelector: #== receiver: (receiver receiver variable asTranslatorNodeIn: aTMethod) arguments: {receiver arguments first asTranslatorNodeIn: aTMethod}) arguments: args }]. ^TSendNode new setSelector: sel receiver: rcvrOrNil arguments: args! Item was removed: - ----- Method: Spur64BitMemoryManager>>setHiddenRootsObj: (in category 'class table') ----- - setHiddenRootsObj: anOop - "Override to check for and abort old format 64-bit Spur images in which the smallFloatTag is 3." - super setHiddenRootsObj: anOop. - (self bootstrapping not - and: [self smallFloatTag ~= (self rawHashBitsOf: (self fetchPointer: self smallFloatTag - ofObject: classTableFirstPage))]) ifTrue: - [self error: 'This is an old-format 64-bit Spur image with smallFloatTag = 3. Aborting.']! Item was removed: - ----- Method: TMethod>>mapReturnsToGotos (in category 'transformations') ----- - mapReturnsToGotos - "For super expansions inner returns must be mapped to gotos to prevent premature exit. - But this only works if no value is being returned. - Anything meaningful in the returned expression must be retained." - - | map label | - map := Dictionary new. - parseTree nodesDo: - [:node| - node isReturn ifTrue: - [(node expression isVariable and: [#('self' 'nil') includes: node expression name]) - ifTrue: - [map at: node put: (TGoToNode new - setLabel: (label ifNil: [label := self unusedLabelForInlining: self]); - yourself)] - ifFalse: [self error: 'Cannot expand super node with inner return that answers a value!!']]]. - label ifNotNil: - [parseTree := parseTree replaceNodesIn: map. - parseTree setStatements: (parseTree statements asOrderedCollection - addLast: (TLabeledCommentNode new - setLabel: label; - yourself); - yourself)]! Item was added: + ----- Method: TMethod>>superExpansionNodeFor:args: (in category 'inlining') ----- + superExpansionNodeFor: aSelector args: argumentNodes + "Answer the expansion of a super send. Merge the super expansion's + locals, properties and comment into this method's properties." + (definingClass superclass lookupSelector: aSelector) + ifNil: [self error: 'superclass does not define super method'] + ifNotNil: + [:superMethod| | superTMethod commonVars varMap | + superTMethod := superMethod methodNode asTranslationMethodOfClass: self class. + ((argumentNodes allSatisfy: [:parseNode| parseNode isVariableNode]) + and: [(argumentNodes asOrderedCollection collect: [:parseNode| parseNode key]) = superTMethod args]) ifFalse: + [self error: definingClass name, '>>',selector, ' args ~= ', + superTMethod definingClass name, '>>', aSelector, + (String with: $. with: Character cr), + 'For super expansions to be translated correctly each argument must be a variable with the same name as the corresponding argument in the super method.']. + (commonVars := superTMethod locals intersection: self locals) notEmpty ifTrue: + [varMap := Dictionary new. + commonVars do: + [:k| varMap at: k put: (superTMethod unusedNamePrefixedBy: k avoiding: self allLocals)]. + superTMethod renameVariablesUsing: varMap]. + self mergePropertiesOfSuperMethod: superTMethod. + self assert: (superTMethod locals allSatisfy: [:var| (self locals includes: var) not]). + locals addAll: superTMethod locals. + superTMethod declarations keysAndValuesDo: + [:var :decl| + self declarationAt: var put: decl]. + superTMethod comment ifNotNil: + [:superComment| + comment := comment + ifNil: [superComment] + ifNotNil: [superComment, comment]]. + superTMethod extraVariableNumber ifNotNil: + [:scvn| + extraVariableNumber := extraVariableNumber ifNil: [scvn] ifNotNil: [:cvn| cvn + scvn]]. + superTMethod elideAnyFinalReturn. + ^superTMethod parseTree]! Item was removed: - ----- Method: TMethod>>superExpansionNodeFor:args:isResult: (in category 'inlining') ----- - superExpansionNodeFor: aSelector args: argumentNodes isResult: superExpansionIsResult - "Answer the expansion of a super send. Merge the super expansion's - locals, properties and comment into this method's properties." - (definingClass superclass lookupSelector: aSelector) - ifNil: [self error: 'superclass does not define super method'] - ifNotNil: - [:superMethod| | superTMethod commonVars varMap | - superTMethod := superMethod methodNode asTranslationMethodOfClass: self class. - ((argumentNodes allSatisfy: [:parseNode| parseNode isVariableNode]) - and: [(argumentNodes asOrderedCollection collect: [:parseNode| parseNode key]) = superTMethod args]) ifFalse: - [self error: definingClass name, '>>',selector, ' args ~= ', - superTMethod definingClass name, '>>', aSelector, - (String with: $. with: Character cr), - 'For super expansions to be translated correctly each argument must be a variable with the same name as the corresponding argument in the super method.']. - (commonVars := superTMethod locals intersection: self locals) notEmpty ifTrue: - [varMap := Dictionary new. - commonVars do: - [:k| varMap at: k put: (superTMethod unusedNamePrefixedBy: k avoiding: self allLocals)]. - superTMethod renameVariablesUsing: varMap]. - self mergePropertiesOfSuperMethod: superTMethod. - self assert: (superTMethod locals allSatisfy: [:var| (self locals includes: var) not]). - locals addAll: superTMethod locals. - superTMethod declarations keysAndValuesDo: - [:var :decl| - self declarationAt: var put: decl]. - superTMethod comment ifNotNil: - [:superComment| - comment := comment - ifNil: [superComment] - ifNotNil: [superComment, comment]]. - superTMethod extraVariableNumber ifNotNil: - [:scvn| - extraVariableNumber := extraVariableNumber ifNil: [scvn] ifNotNil: [:cvn| cvn + scvn]]. - superTMethod elideAnyFinalReturn. - superExpansionIsResult ifFalse: - [superTMethod mapReturnsToGotos. - labels addAll: superTMethod labels]. - ^superTMethod parseTree]!

1 0

VM Maker: VMMaker.oscog-eem.1721.mcz
by commits＠source.squeak.org 10 Mar '16

10 Mar '16

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.1721.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.1721 Author: eem Time: 10 March 2016, 2:10:47.278868 pm UUID: 0ff03e4d-2931-478e-93cc-4893234d94c0 Ancestors: VMMaker.oscog-tfel.1720 V3: Fix simulation of fetchLong64:ofObject: and hence in signed64BitValueOf: et al. Spur: resolve the conflict between 32-bit and 64-bit tag assignments. In 32-bits we have 1=even SmallIntegers, 2=Characters, 3=odd SmallIntegers, and in 64-bits we had 1=SmallIntegers, 2=Characters, 3=SmallFloats. hence we would want SmallFloat64's identityHash to be 3, which conflicts with 32 bits' odd SmallIntegers. Change is for 64-bits to use 1=SmallIntegers, 2=Characters, 4=SmallFloats. This also means single-bit tests in the Cogit, which produces better code, and no scratch registers to hold masked tags. Hence roll the 64-bit Spur image format version number from 68019 to 68021. Delegate to the object memories to determine the image format version number. Add noInlineObjectAfter:limit: for a slighly less verbose initializeObjectMemory: Turn the various class pun constants into macros for mor readable C. Slang: Allow super expansion to deal with methods with inner returns. Timestamp plugin generation start. Simulator: Add missing facade methods. Use the Squeak convention for window colours to eliminae the drab grey CoInterpreter simulation win dow (thanks Marcel!). =============== Diff against VMMaker.oscog-tfel.1720 =============== Item was changed: ----- Method: CoInterpreter>>setUpForUseByFacade: (in category 'debug support') ----- setUpForUseByFacade: aCurrentImageCoInterpreterFacade "Set up variables with default values so that other initializations work. numStackPages needs to be initialized so that interpreterAllocationReserveBytes can be computed." + <doNotGenerate> numStackPages := 0! Item was changed: ----- Method: CogObjectRepresentation>>genJumpSmallInteger:scratchReg: (in category 'compile abstract instructions') ----- genJumpSmallInteger: aRegister scratchReg: scratch "Generate a compare and branch to test if aRegister contains a SmallInteger. Answer the jump. Use scratch if required. Subclasses will override if scratch is needed." + <inline: true> ^self genJumpSmallInteger: aRegister! Item was changed: ----- Method: CogObjectRepresentationFor64BitSpur>>genConvertSmallFloatToSmallFloatHashAsIntegerInReg:scratch: (in category 'compile abstract instructions') ----- genConvertSmallFloatToSmallFloatHashAsIntegerInReg: reg scratch: scratch "Convert the SmallFloat in reg to its identityHash as a SmallInteger. + Rotate the sign bit from bit 3 (zero-relative) to the sign bit. + c.f. Spur64BitMemoryManager>>rotatedFloatBitsOf:" + self assert: objectMemory smallFloatTag >> 1 - objectMemory smallIntegerTag = objectMemory smallIntegerTag. - Rotate the sign bit from bit 3 (zero-relative) the sign bit. This implicitly sets - SmallInteger tags (3 >> 1 = 1). c.f. Spur64BitMemoryManager>>rotatedFloatBitsOf:" - self assert: objectMemory smallFloatTag >> 1 = objectMemory smallIntegerTag. cogit LogicalShiftRightCq: 1 R: reg; AndCq: 1 << (objectMemory numTagBits - 1) R: reg R: scratch; SubR: scratch R: reg; + SubCq: objectMemory smallFloatTag >> 1 - objectMemory smallIntegerTag R: reg; LogicalShiftLeftCq: 63 - (objectMemory numTagBits - 1) R: scratch; OrR: scratch R: reg. ^0! Item was changed: ----- Method: CogObjectRepresentationFor64BitSpur>>genFloatArithmetic:preOpCheck:boxed: (in category 'primitive generators') ----- genFloatArithmetic: arithmeticOperator preOpCheck: preOpCheckOrNil boxed: rcvrBoxed <var: #preOpCheckOrNil declareC: 'AbstractInstruction *(*preOpCheckOrNil)(int rcvrReg, int argReg)'> <inline: false> | jumpFailAlloc jumpFailCheck jumpImmediate jumpNotSmallFloat jumpNotSmallInteger jumpNotBoxedFloat doOp | <var: #jumpNotSmallInteger type: #'AbstractInstruction *'> <var: #jumpNotBoxedFloat type: #'AbstractInstruction *'> <var: #jumpNotSmallFloat type: #'AbstractInstruction *'> <var: #jumpImmediate type: #'AbstractInstruction *'> <var: #jumpFailCheck type: #'AbstractInstruction *'> <var: #jumpFailAlloc type: #'AbstractInstruction *'> <var: #doOp type: #'AbstractInstruction *'> cogit genLoadArgAtDepth: 0 into: Arg0Reg. rcvrBoxed ifTrue: [self genGetDoubleValueOf: ReceiverResultReg into: DPFPReg0] ifFalse: [self genGetSmallFloatValueOf: ReceiverResultReg scratch: TempReg into: DPFPReg0]. + jumpNotSmallFloat := self genJumpNotSmallFloat: Arg0Reg. - cogit - MoveR: Arg0Reg R: ClassReg; - AndCq: objectMemory tagMask R: ClassReg; - CmpCq: objectMemory smallFloatTag R: ClassReg. - jumpNotSmallFloat := cogit JumpNonZero: 0. self genGetSmallFloatValueOf: Arg0Reg scratch: TempReg into: DPFPReg1. doOp := cogit Label. preOpCheckOrNil ifNotNil: [jumpFailCheck := cogit perform: preOpCheckOrNil with: DPFPReg0 with: DPFPReg1]. cogit gen: arithmeticOperator operand: DPFPReg1 operand: DPFPReg0. jumpFailAlloc := self genAllocFloatValue: DPFPReg0 into: SendNumArgsReg scratchReg: ClassReg scratchReg: TempReg. cogit MoveR: SendNumArgsReg R: ReceiverResultReg. cogit genPrimReturn. + jumpNotSmallFloat jmpTarget: cogit Label. + jumpNotSmallInteger := self genJumpNotSmallInteger: Arg0Reg. - jumpNotSmallFloat jmpTarget: - (cogit CmpCq: objectMemory smallIntegerTag R: ClassReg). - jumpNotSmallInteger := cogit JumpNonZero: 0. cogit MoveR: Arg0Reg R: Arg1Reg. self genConvertSmallIntegerToIntegerInReg: Arg1Reg. cogit ConvertR: Arg1Reg Rd: DPFPReg1. cogit Jump: doOp. + jumpNotSmallInteger jmpTarget: cogit Label. + jumpImmediate := self genJumpImmediate: Arg0Reg. - jumpNotSmallInteger jmpTarget: (cogit CmpCq: 0 R: ClassReg). - jumpImmediate := cogit JumpNonZero: 0. self genGetCompactClassIndexNonImmOf: Arg0Reg into: SendNumArgsReg. self genCmpClassFloatCompactIndexR: SendNumArgsReg. jumpNotBoxedFloat := cogit JumpNonZero: 0. self genGetDoubleValueOf: Arg0Reg into: DPFPReg1. cogit Jump: doOp. jumpImmediate jmpTarget: (jumpNotBoxedFloat jmpTarget: (jumpNotSmallInteger jmpTarget: (jumpFailAlloc jmpTarget: cogit Label))). preOpCheckOrNil ifNotNil: [jumpFailCheck jmpTarget: jumpFailAlloc getJmpTarget]. ^0! Item was changed: ----- Method: CogObjectRepresentationFor64BitSpur>>genFloatComparison:invert:boxed: (in category 'primitive generators') ----- genFloatComparison: jumpOpcodeGenerator invert: invertComparison boxed: rcvrBoxed <var: #jumpOpcodeGenerator declareC: 'AbstractInstruction *(*jumpOpcodeGenerator)(void *)'> <inline: false> | jumpImmediate jumpNotSmallFloat jumpNotSmallInteger jumpNotBoxedFloat jumpCond compare | <var: #jumpNotSmallInteger type: #'AbstractInstruction *'> <var: #jumpNotBoxedFloat type: #'AbstractInstruction *'> <var: #jumpNotSmallFloat type: #'AbstractInstruction *'> <var: #jumpImmediate type: #'AbstractInstruction *'> <var: #jumpCond type: #'AbstractInstruction *'> cogit genLoadArgAtDepth: 0 into: Arg0Reg. rcvrBoxed ifTrue: [self genGetDoubleValueOf: ReceiverResultReg into: DPFPReg0] ifFalse: [self genGetSmallFloatValueOf: ReceiverResultReg scratch: TempReg into: DPFPReg0]. + jumpNotSmallFloat := self genJumpNotSmallFloat: Arg0Reg. - cogit - MoveR: Arg0Reg R: ClassReg; - AndCq: objectMemory tagMask R: ClassReg; - CmpCq: objectMemory smallFloatTag R: ClassReg. - jumpNotSmallFloat := cogit JumpNonZero: 0. self genGetSmallFloatValueOf: Arg0Reg scratch: TempReg into: DPFPReg1. compare := invertComparison "May need to invert for NaNs" ifTrue: [cogit CmpRd: DPFPReg0 Rd: DPFPReg1] ifFalse: [cogit CmpRd: DPFPReg1 Rd: DPFPReg0]. jumpCond := cogit perform: jumpOpcodeGenerator with: 0. "FP jumps are a little weird" cogit genMoveFalseR: ReceiverResultReg. cogit genPrimReturn. jumpCond jmpTarget: (cogit genMoveTrueR: ReceiverResultReg). cogit genPrimReturn. + jumpNotSmallFloat jmpTarget: cogit Label. + jumpNotSmallInteger := self genJumpNotSmallInteger: Arg0Reg. - jumpNotSmallFloat jmpTarget: - (cogit CmpCq: objectMemory smallIntegerTag R: ClassReg). - jumpNotSmallInteger := cogit JumpNonZero: 0. self genConvertSmallIntegerToIntegerInReg: Arg0Reg. cogit ConvertR: Arg0Reg Rd: DPFPReg1. cogit Jump: compare. + jumpNotSmallInteger jmpTarget: cogit Label. + jumpImmediate := self genJumpImmediate: Arg0Reg. - jumpNotSmallInteger jmpTarget: (cogit CmpCq: 0 R: ClassReg). - jumpImmediate := cogit JumpNonZero: 0. self genGetCompactClassIndexNonImmOf: Arg0Reg into: SendNumArgsReg. self genCmpClassFloatCompactIndexR: SendNumArgsReg. jumpNotBoxedFloat := cogit JumpNonZero: 0. self genGetDoubleValueOf: Arg0Reg into: DPFPReg1. cogit Jump: compare. jumpImmediate jmpTarget: (jumpNotBoxedFloat jmpTarget: cogit Label). ^CompletePrimitive! Item was added: + ----- Method: CogObjectRepresentationFor64BitSpur>>genJumpCharacter: (in category 'compile abstract instructions') ----- + genJumpCharacter: reg + "Generate a compare and branch to test if aRegister contains a Character." + ^cogit + TstCq: objectMemory characterTag R: reg; + JumpNonZero: 0! Item was removed: - ----- Method: CogObjectRepresentationFor64BitSpur>>genJumpCharacter:scratchReg: (in category 'compile abstract instructions') ----- - genJumpCharacter: reg scratchReg: scratch - "Generate a compare and branch to test if aRegister contains a Character. - Answer the jump. Override since scratch is needed." - <returnTypeC: #'AbstractInstruction *'> - ^cogit - AndCq: objectMemory tagMask R: reg R: scratch; - CmpCq: objectMemory characterTag R: scratch; - JumpZero: 0! Item was added: + ----- Method: CogObjectRepresentationFor64BitSpur>>genJumpCharacterInScratchReg: (in category 'compile abstract instructions') ----- + genJumpCharacterInScratchReg: aRegister + ^self genJumpCharacter: aRegister! Item was added: + ----- Method: CogObjectRepresentationFor64BitSpur>>genJumpNotCharacter: (in category 'compile abstract instructions') ----- + genJumpNotCharacter: reg + "Generate a compare and branch to test if aRegister contains other than a Character." + ^cogit + TstCq: objectMemory characterTag R: reg; + JumpZero: 0! Item was removed: - ----- Method: CogObjectRepresentationFor64BitSpur>>genJumpNotCharacter:scratchReg: (in category 'compile abstract instructions') ----- - genJumpNotCharacter: reg scratchReg: scratch - "Generate a compare and branch to test if aRegister contains other than a Character. - Answer the jump. Override since scratch is needed." - ^cogit - AndCq: objectMemory tagMask R: reg R: scratch; - CmpCq: objectMemory characterTag R: scratch; - JumpNonZero: 0! Item was added: + ----- Method: CogObjectRepresentationFor64BitSpur>>genJumpNotCharacterInScratchReg: (in category 'compile abstract instructions') ----- + genJumpNotCharacterInScratchReg: reg + <inline: true> + ^self genJumpNotCharacter: reg! Item was added: + ----- Method: CogObjectRepresentationFor64BitSpur>>genJumpNotSmallFloat: (in category 'compile abstract instructions') ----- + genJumpNotSmallFloat: reg + "Generate a compare and branch to test if aRegister contains other than a SmallFloat. + Answer the jump." + ^cogit + TstCq: objectMemory smallFloatTag R: reg; + JumpZero: 0! Item was removed: - ----- Method: CogObjectRepresentationFor64BitSpur>>genJumpNotSmallFloat:scratchReg: (in category 'compile abstract instructions') ----- - genJumpNotSmallFloat: reg scratchReg: scratch - "Generate a compare and branch to test if aRegister contains other than a SmallFloat. - Answer the jump." - ^cogit - AndCq: objectMemory tagMask R: reg R: scratch; - CmpCq: objectMemory smallFloatTag R: scratch; - JumpNonZero: 0! Item was changed: ----- Method: CogObjectRepresentationFor64BitSpur>>genJumpNotSmallFloatInScratchReg: (in category 'compile abstract instructions') ----- genJumpNotSmallFloatInScratchReg: aRegister <inline: true> + ^self genJumpNotSmallFloat: aRegister! - ^self genJumpNotSmallFloat: aRegister scratchReg: aRegister! Item was added: + ----- Method: CogObjectRepresentationFor64BitSpur>>genJumpNotSmallInteger: (in category 'compile abstract instructions') ----- + genJumpNotSmallInteger: reg + "Generate a compare and branch to test if aRegister contains other than a SmallInteger." + ^cogit + TstCq: objectMemory smallIntegerTag R: reg; + JumpZero: 0! Item was removed: - ----- Method: CogObjectRepresentationFor64BitSpur>>genJumpNotSmallInteger:scratchReg: (in category 'compile abstract instructions') ----- - genJumpNotSmallInteger: reg scratchReg: scratch - "Generate a compare and branch to test if aRegister contains other than a SmallInteger. - Answer the jump. Override since scratch is needed." - ^cogit - AndCq: objectMemory tagMask R: reg R: scratch; - CmpCq: objectMemory smallIntegerTag R: scratch; - JumpNonZero: 0! Item was changed: ----- Method: CogObjectRepresentationFor64BitSpur>>genJumpNotSmallIntegerInScratchReg: (in category 'compile abstract instructions') ----- genJumpNotSmallIntegerInScratchReg: aRegister <inline: true> + ^self genJumpNotSmallInteger: aRegister! - ^self genJumpNotSmallInteger: aRegister scratchReg: aRegister! Item was changed: ----- Method: CogObjectRepresentationFor64BitSpur>>genJumpNotSmallIntegersIn:andScratch:scratch: (in category 'compile abstract instructions') ----- genJumpNotSmallIntegersIn: aRegister andScratch: scratchA scratch: scratchB "Generate a compare and branch to test if aRegister and scratchA contains other than SmallIntegers, i.e. don't branch if both aRegister and scratchA contain SmallIntegers. Answer the jump. Destroy scratchA and scratchB if required." <returnTypeC: #'AbstractInstruction *'> + <inline: true> + cogit AndR: aRegister R: scratchA. + ^self genJumpNotSmallIntegerInScratchReg: scratchA! - "Straight-forward approach. Map SmallIntegers to 0 in scratchA & scratchB, add and jump non-zero." - cogit backEnd hasThreeAddressArithmetic - ifFalse: - [^cogit - MoveR: aRegister R: scratchB; - SubCq: objectMemory smallIntegerTag R: scratchA; - SubCq: objectMemory smallIntegerTag R: scratchB; - AndCq: objectMemory tagMask R: scratchA; - AndCq: objectMemory tagMask R: scratchB; - AddR: scratchA R: scratchB; - JumpNonZero: 0] - "Better approach; iff 3 address arithmetic. Because tag pattern 7 is unused the following selects only two SmallIntegers - | pairs | - pairs := OrderedCollection new. - 0 to: 7 do: [:r| 0 to: 7 do: [:a| pairs addLast: {r. a}]]. - pairs select: [:p| ([:r :a| (a - r bitAnd: 7) + a] valueWithArguments: p) = 1] - => an OrderedCollection(#(1 1) #(7 0)) - But if there is no three address arithmetic this also generates 7 instructions." - ifTrue: - [^cogit - AndCq: objectMemory tagMask R: scratchA R: scratchB; - SubR: aRegister R: scratchA; - AndCq: objectMemory tagMask R: scratchA; - AddCq: objectMemory smallIntegerTag negated R: scratchB R: scratchA; - JumpNonZero: 0]! Item was changed: ----- Method: CogObjectRepresentationFor64BitSpur>>genJumpSmallFloat: (in category 'compile abstract instructions') ----- genJumpSmallFloat: aRegister "Generate a compare and branch to test if aRegister contains a SmallFloat. Answer the jump, or UnimplementedOperation if this cannot be done with a single register." + ^cogit + TstCq: objectMemory smallFloatTag R: aRegister; + JumpNonZero: 0! - <returnTypeC: #'AbstractInstruction *'> - <inline: true> - ^cogit cCoerceSimple: UnimplementedOperation to: #'AbstractInstruction *'! Item was removed: - ----- Method: CogObjectRepresentationFor64BitSpur>>genJumpSmallFloat:scratchReg: (in category 'compile abstract instructions') ----- - genJumpSmallFloat: reg scratchReg: scratch - "Generate a compare and branch to test if aRegister contains a SmallFloat. - Answer the jump. Override since scratch is needed." - cogit AndCq: objectMemory tagMask R: reg R: scratch. - cogit CmpCq: objectMemory smallFloatTag R: scratch. - ^cogit JumpZero: 0! Item was changed: ----- Method: CogObjectRepresentationFor64BitSpur>>genJumpSmallFloatInScratchReg: (in category 'compile abstract instructions') ----- genJumpSmallFloatInScratchReg: aRegister + ^self genJumpSmallFloat: aRegister! - ^self genJumpSmallFloat: aRegister scratchReg: TempReg! Item was added: + ----- Method: CogObjectRepresentationFor64BitSpur>>genJumpSmallInteger: (in category 'compile abstract instructions') ----- + genJumpSmallInteger: aRegister + "Generate a compare and branch to test if aRegister contains a SmallInteger. + Answer the jump, or UnimplementedOperation if this cannot be done with + a single register." + ^cogit + TstCq: objectMemory smallIntegerTag R: aRegister; + JumpNonZero: 0! Item was removed: - ----- Method: CogObjectRepresentationFor64BitSpur>>genJumpSmallInteger:scratchReg: (in category 'compile abstract instructions') ----- - genJumpSmallInteger: reg scratchReg: scratch - "Generate a compare and branch to test if aRegister contains a SmallInteger. - Answer the jump. Override since scratch is needed." - <returnTypeC: #'AbstractInstruction *'> - ^cogit - AndCq: objectMemory tagMask R: reg R: scratch; - CmpCq: objectMemory smallIntegerTag R: scratch; - JumpZero: 0! Item was changed: ----- Method: CogObjectRepresentationFor64BitSpur>>genJumpSmallIntegerInScratchReg: (in category 'compile abstract instructions') ----- genJumpSmallIntegerInScratchReg: aRegister + ^self genJumpSmallInteger: aRegister! - ^self genJumpSmallInteger: aRegister scratchReg: TempReg! Item was changed: ----- Method: CogObjectRepresentationFor64BitSpur>>genPrimitiveStringAtPut (in category 'primitive generators') ----- genPrimitiveStringAtPut | formatReg jumpBadIndex jumpBadArg jumpImmutable jumpIsBytes jumpIsShorts jumpNotString jumpIsCompiledMethod jumpBytesOutOfRange jumpShortsOutOfRange jumpWordsOutOfRange jumpBytesOutOfBounds jumpWordsOutOfBounds jumpShortsOutOfBounds | "c.f. StackInterpreter>>stSizeOf: SpurMemoryManager>>lengthOf:format: fixedFieldsOf:format:length:" <var: #jumpBadArg type: #'AbstractInstruction *'> <var: #jumpIsBytes type: #'AbstractInstruction *'> <var: #jumpIsShorts type: #'AbstractInstruction *'> <var: #jumpBadIndex type: #'AbstractInstruction *'> <var: #jumpBytesOutOfRange type: #'AbstractInstruction *'> <var: #jumpShortsOutOfRange type: #'AbstractInstruction *'> <var: #jumpWordsOutOfRange type: #'AbstractInstruction *'> <var: #jumpBytesOutOfBounds type: #'AbstractInstruction *'> <var: #jumpShortsOutOfBounds type: #'AbstractInstruction *'> <var: #jumpWordsOutOfBounds type: #'AbstractInstruction *'> cogit genLoadArgAtDepth: 1 into: Arg0Reg. cogit genLoadArgAtDepth: 0 into: Arg1Reg. + jumpBadIndex := self genJumpNotSmallInteger: Arg0Reg. + jumpBadArg := self genJumpNotCharacter: Arg1Reg. - jumpBadIndex := self genJumpNotSmallInteger: Arg0Reg scratchReg: TempReg. - jumpBadArg := self genJumpNotCharacter: Arg1Reg scratchReg: TempReg. self genConvertSmallIntegerToIntegerInReg: Arg0Reg. cogit SubCq: 1 R: Arg0Reg. "1-rel => 0-rel" "formatReg := self formatOf: ReceiverResultReg" self cppIf: IMMUTABILITY ifTrue: [ self genGetFormatOf: ReceiverResultReg into: (formatReg := SendNumArgsReg) leastSignificantHalfOfBaseHeaderIntoScratch: TempReg. jumpImmutable := self genJumpBaseHeaderImmutable: TempReg ] ifFalse: [ self genGetFormatOf: ReceiverResultReg into: (formatReg := SendNumArgsReg) leastSignificantHalfOfBaseHeaderIntoScratch: NoReg ]. self genGetNumSlotsOf: ReceiverResultReg into: ClassReg. "dispatch on format; words and/or bytes. 0 to 8 = pointer objects, forwarders, reserved. 9 (?) 64-bit indexable 10 - 11 32-bit indexable 12 - 15 16-bit indexable 16 - 23 byte indexable 24 - 31 compiled method" cogit CmpCq: objectMemory firstLongFormat R: formatReg. jumpNotString := cogit JumpBelow: 0. cogit CmpCq: objectMemory firstCompiledMethodFormat R: formatReg. jumpIsCompiledMethod := cogit JumpAboveOrEqual: 0. cogit CmpCq: objectMemory firstByteFormat R: formatReg. jumpIsBytes := cogit JumpAboveOrEqual: 0. cogit CmpCq: objectMemory firstShortFormat R: formatReg. jumpIsShorts := cogit JumpAboveOrEqual: 0. "fall through to double words" cogit CmpCq: (objectMemory characterObjectOf: 1 << self numCharacterBits - 1) R: Arg1Reg. jumpWordsOutOfRange := cogit JumpAbove: 0. cogit LogicalShiftLeftCq: objectMemory shiftForWord - 2 R: ClassReg. cogit AndCq: objectMemory wordSize / 4 - 1 R: formatReg. cogit SubR: formatReg R: ClassReg. cogit CmpR: Arg0Reg R: ClassReg. jumpWordsOutOfBounds := cogit JumpBelowOrEqual: 0. cogit MoveR: Arg1Reg R: TempReg. self genConvertCharacterToCodeInReg: TempReg. cogit AddCq: objectMemory baseHeaderSize >> (objectMemory shiftForWord - 1) R: Arg0Reg. cogit MoveR: TempReg X32r: Arg0Reg R: ReceiverResultReg. cogit MoveR: Arg1Reg R: ReceiverResultReg. cogit genPrimReturn. jumpIsShorts jmpTarget: (cogit CmpCq: (objectMemory characterObjectOf: 65535) R: Arg1Reg). jumpShortsOutOfRange := cogit JumpAbove: 0. cogit LogicalShiftLeftCq: objectMemory shiftForWord - 1 R: ClassReg. cogit AndCq: objectMemory wordSize / 2 - 1 R: formatReg. cogit SubR: formatReg R: ClassReg. cogit CmpR: Arg0Reg R: ClassReg. jumpShortsOutOfBounds := cogit JumpBelowOrEqual: 0. cogit MoveR: Arg1Reg R: TempReg. self genConvertCharacterToCodeInReg: TempReg. cogit AddR: Arg0Reg R: ReceiverResultReg. cogit MoveR: TempReg M16: objectMemory baseHeaderSize r: ReceiverResultReg. cogit MoveR: Arg1Reg R: ReceiverResultReg. cogit genPrimReturn. jumpIsBytes jmpTarget: (cogit CmpCq: (objectMemory characterObjectOf: 255) R: Arg1Reg). jumpBytesOutOfRange := cogit JumpAbove: 0. cogit LogicalShiftLeftCq: objectMemory shiftForWord R: ClassReg. cogit AndCq: objectMemory wordSize - 1 R: formatReg. cogit SubR: formatReg R: ClassReg. cogit CmpR: Arg0Reg R: ClassReg. jumpBytesOutOfBounds := cogit JumpBelowOrEqual: 0. cogit MoveR: Arg1Reg R: TempReg. self genConvertCharacterToCodeInReg: TempReg. cogit AddCq: objectMemory baseHeaderSize R: Arg0Reg. cogit MoveR: TempReg Xbr: Arg0Reg R: ReceiverResultReg. cogit MoveR: Arg1Reg R: ReceiverResultReg. cogit genPrimReturn. jumpNotString jmpTarget: (jumpBytesOutOfRange jmpTarget: (jumpShortsOutOfRange jmpTarget: (jumpWordsOutOfRange jmpTarget: (jumpIsCompiledMethod jmpTarget: (jumpBytesOutOfBounds jmpTarget: (jumpShortsOutOfBounds jmpTarget: (jumpWordsOutOfBounds jmpTarget: cogit Label))))))). self cppIf: IMMUTABILITY ifTrue: [jumpImmutable jmpTarget: jumpNotString getJmpTarget]. cogit AddCq: 1 R: Arg0Reg. "0-rel => 1-rel" self genConvertIntegerToSmallIntegerInReg: Arg0Reg. jumpBadArg jmpTarget: (jumpBadIndex jmpTarget: cogit Label). ^CompletePrimitive! Item was changed: ----- Method: CogObjectRepresentationFor64BitSpur>>maybeGenConvertIfSmallFloatIn:scratchReg:into:andJumpTo: (in category 'primitive generators') ----- maybeGenConvertIfSmallFloatIn: oopReg scratchReg: scratch into: dpReg andJumpTo: targetInst "Generate a test for a smallFloat in oopReg, converting it to the float value in dpReg and jumping to targetInst. If oopReg does not contain a SmallFloat, fall through." <var: 'targetInst' type: #'AbstractInstruction *'> | jumpNotSF | <var: 'jumpNotSF' type: #'AbstractInstruction *'> + jumpNotSF := self genJumpNotSmallFloat: oopReg. - jumpNotSF := self genJumpNotSmallFloat: oopReg scratchReg: scratch. self genGetSmallFloatValueOf: oopReg scratch: scratch into: dpReg. cogit Jump: targetInst. jumpNotSF jmpTarget: cogit Label. ^0! Item was added: + ----- Method: InterpreterPrimitives class>>initialize (in category 'class initialization') ----- + initialize + "Initialize the window color. This is probably Squeak-specific, so..." + [Preferences + setWindowColorFor: #cogVirtualMachineSimulatorWindowColor + to: (Color colorFrom: InterpreterPrimitives windowColorSpecification brightColor)] + on: Error + do: [:ex| Transcript show: 'Failed to set window color preference in ', thisContext method methodReference asString]! Item was added: + ----- Method: InterpreterPrimitives class>>windowColorSpecification (in category 'window color') ----- + windowColorSpecification + "Answer a WindowColorSpec object that declares my preference" + "Preferences + setWindowColorFor: #cogVirtualMachineSimulatorWindowColor + to: (Color colorFrom: InterpreterPrimitives windowColorSpecification brightColor)" + ^WindowColorSpec + classSymbol: self name wording: 'Cog Virtual Machine Simulator' + brightColor: #(0.645 1.0 1.0) pastelColor: #(0.886 1.0 1.0) + helpMessage: 'A tool for simulating a virtual machine in the Cog family.'! Item was changed: ----- Method: MessageNode>>asTranslatorNodeIn: (in category '*VMMaker-C translation') ----- asTranslatorNodeIn: aTMethod "make a CCodeGenerator equivalent of me" "selector is sometimes a Symbol, sometimes a SelectorNode!! On top of this, numArgs is needed due to the (truly grody) use of arguments as a place to store the extra expressions needed to generate code for in-line to:by:do:, etc. see below, where it is used." + | lastExpression rcvrOrNil sel args ifNotNilBlock | - | rcvrOrNil sel args ifNotNilBlock | rcvrOrNil := receiver ifNotNil: [receiver asTranslatorNodeIn: aTMethod]. (rcvrOrNil notNil and: [rcvrOrNil isVariable and: [rcvrOrNil name = 'super']]) ifTrue: + [lastExpression := aTMethod parseTree statements last. + ^aTMethod + superExpansionNodeFor: selector key + args: arguments + isResult: (lastExpression isReturn and: [lastExpression expr == self])]. - [^aTMethod superExpansionNodeFor: selector key args: arguments]. sel := selector isSymbol ifTrue: [selector] ifFalse: [selector key]. ((sel == #cCode:inSmalltalk: "extracting here rather than in translation allows inlining in the block." or: [sel == #cCode:]) and: [arguments first isBlockNode]) ifTrue: [| block | ^(block := arguments first asTranslatorNodeIn: aTMethod) statements size = 1 ifTrue: [block statements first] ifFalse: [block]]. args := arguments select: [:arg| arg notNil] thenCollect: [:arg| arg asTranslatorNodeIn: aTMethod]. (sel = #to:by:do: and: [arguments size = 7 and: [(arguments at: 7) notNil]]) ifTrue: ["Restore limit expr that got moved by transformToDo:" args := {(arguments at: 7) value asTranslatorNodeIn: aTMethod. args second. args third. "add the limit var as a hidden extra argument; we may need it later" TVariableNode new setName: arguments first key}]. (sel == #ifTrue:ifFalse: and: [arguments first isJust: NodeNil]) ifTrue: [sel := #ifFalse:. args := {args last}]. (sel == #ifTrue:ifFalse: and: [arguments last isJust: NodeNil]) ifTrue: [sel := #ifTrue:. args := {args first}]. (sel == #ifFalse:ifTrue: and: [arguments first isJust: NodeNil]) ifTrue: [sel := #ifTrue:. args := {args last}]. (sel == #ifFalse:ifTrue: and: [arguments last isJust: NodeNil]) ifTrue: [sel := #ifTrue:. args := {args first}]. ((sel == #ifFalse: or: [sel == #or:]) and: [arguments size = 2 and: [(arguments at: 2) notNil]]) ifTrue: ["Restore argument block that got moved by transformOr: or transformIfFalse:" args := {(arguments at: 2) asTranslatorNodeIn: aTMethod}]. (args size > sel numArgs and: [sel ~~ #to:by:do:]) ifTrue: "to:by:do: has iLimiT hidden in last arg" ["prune the extra blocks left by ifTrue:, ifFalse:, and: & or:" self assert: args size - sel numArgs = 1. self assert: (args last isStmtList and: [args last statements size = 1 and: [(args last statements first isVariable or: [args last statements first isConstant]) and: [#('nil' true false) includes: args last statements first nameOrValue]]]). args := args first: sel numArgs]. "For the benefit of later passes, e.g. value: inlining, transform e ifNotNil: [:v| ...] into v := e. v ifNotNil: [...], which in fact means transforming (v := e) ifTrue: [:v|...] into v := e. v ifTrue: [...]." ((sel == #ifTrue: or: [sel == #ifFalse: or: [sel == #ifTrue:ifFalse: or: [sel == #ifFalse:ifTrue:]]]) and: [receiver notNil and: [receiver isAssignmentEqualsEqualsNil and: [(ifNotNilBlock := args detect: [:arg| arg isStmtList and: [arg args size = 1]] ifNone: []) notNil]]]) ifTrue: [ifNotNilBlock setArguments: #(). ^TStmtListNode new setArguments: #() statements: { receiver receiver asTranslatorNodeIn: aTMethod. TSendNode new setSelector: sel receiver: (TSendNode new setSelector: #== receiver: (receiver receiver variable asTranslatorNodeIn: aTMethod) arguments: {receiver arguments first asTranslatorNodeIn: aTMethod}) arguments: args }]. ^TSendNode new setSelector: sel receiver: rcvrOrNil arguments: args! Item was changed: ----- Method: NewCoObjectMemorySimulator>>setUpForUseByFacade: (in category 'debug support') ----- setUpForUseByFacade: aCurrentImageCoInterpreterFacade + "This is a noop" + <doNotGenerate>! - "This is a noop"! Item was changed: ----- Method: ObjectMemory>>fetchLong64:ofObject: (in category 'object access') ----- fetchLong64: longIndex ofObject: oop <returnTypeC: #sqLong> + ^self cppIf: BytesPerWord = 8 + ifTrue: [self long64At: oop + self baseHeaderSize + (longIndex << 3)] + ifFalse: + [self cppIf: VMBIGENDIAN + ifTrue: [((self long32At: oop + self baseHeaderSize + (longIndex << 3)) asUnsignedLongLong << 32) + + (self long32At: oop + self baseHeaderSize + (longIndex << 3 + 4))] + ifFalse: [(self long32At: oop + self baseHeaderSize + (longIndex << 3)) + + ((self long32At: oop + self baseHeaderSize + (longIndex << 3 + 4)) asUnsignedLongLong << 32)]]! - ^self long64At: oop + self baseHeaderSize + (longIndex << 3)! Item was added: + ----- Method: ObjectMemory>>imageFormatVersion (in category 'image save/restore') ----- + imageFormatVersion + "Return a magic constant that changes when the image format changes. + Since the image reading code uses this to detect byte ordering, one + must avoid version numbers that are invariant under byte reversal." + ^self wordSize = 4 ifTrue: [6505] ifFalse: [68003]! Item was changed: ----- Method: Spur32BitMMLECoSimulator>>setUpForUseByFacade: (in category 'debug support') ----- setUpForUseByFacade: aCurrentImageCoInterpreterFacade "Make sure that eden etc are initialized, so that methods can be printed. This is really to make addressCouldBeObj: et al work." + <doNotGenerate> self edenBytes: 0. self setHeapBase: self freeStart memoryLimit: self endOfMemory endOfMemory: self endOfMemory! Item was added: + ----- Method: Spur32BitMemoryManager>>imageFormatVersion (in category 'immediates') ----- + imageFormatVersion + "Return a magic constant that changes when the image format changes. + Since the image reading code uses this to detect byte ordering, one + must avoid version numbers that are invariant under byte reversal. + N.B. Bit 4 (=16) is the isSpur bit" + ^6521! Item was added: + ----- Method: Spur32BitMemoryManager>>isImmediateCharacter: (in category 'object testing') ----- + isImmediateCharacter: oop + <inline: true> + ^(oop bitAnd: self tagMask) = self characterTag! Item was changed: ----- Method: Spur32BitMemoryManager>>isIntegerObject: (in category 'object testing') ----- isIntegerObject: oop + ^(oop bitAnd: self smallIntegerTag) ~= 0! - ^(oop bitAnd: 1) ~= 0! Item was added: + ----- Method: Spur32BitMemoryManager>>smallIntegerTag (in category 'cog jit support') ----- + smallIntegerTag + "Beware, SmallInteger tags are 1 or 3. But SmallInteger's identityHash is 1." + <cmacro> + ^1! Item was added: + ----- Method: Spur64BitCoMemoryManager>>setUpForUseByFacade: (in category 'debug support') ----- + setUpForUseByFacade: aCurrentImageCoInterpreterFacade + "Make sure that eden etc are initialized, so that methods can be printed. + This is really to make addressCouldBeObj: et al work." + <doNotGenerate> + self edenBytes: 0. + self setHeapBase: self freeStart + memoryLimit: self endOfMemory + endOfMemory: self endOfMemory! Item was changed: ----- Method: Spur64BitMMLECoSimulator>>longAt:put: (in category 'memory access') ----- longAt: byteAddress put: a64BitValue + "Store the 64-bit value at byteAddress which must be 0 mod 8." - "Store the 64-bit value at byteAddress which must be 0 mod 4." "byteAddress = 16r1F5AE8 ifTrue: [self halt]." ^self long64At: byteAddress put: a64BitValue! Item was changed: ----- Method: Spur64BitMMLESimulator>>longAt:put: (in category 'memory access') ----- longAt: byteAddress put: a64BitValue + "Store the 64-bit value at byteAddress which must be 0 mod 8." + "byteAddress = 16r43C790 ifTrue: [self halt]." - "Store the 64-bit value at byteAddress which must be 0 mod 4." - "byteAddress = 16r1F5AE8 ifTrue: [self halt]." ^self long64At: byteAddress put: a64BitValue! Item was added: + ----- Method: Spur64BitMemoryManager>>imageFormatVersion (in category 'immediates') ----- + imageFormatVersion + "Return a magic constant that changes when the image format changes. + Since the image reading code uses this to detect byte ordering, one + must avoid version numbers that are invariant under byte reversal. + N.B. Bit 4 (=16) is the isSpur bit" + + "^68019" "The first 64-bit Spur format, which unfortunately chose SmallFloat64's tag to be 3." + ^68021! Item was added: + ----- Method: Spur64BitMemoryManager>>isImmediateCharacter: (in category 'object testing') ----- + isImmediateCharacter: oop + <inline: true> + ^oop anyMask: self characterTag! Item was changed: + ----- Method: Spur64BitMemoryManager>>isImmediateFloat: (in category 'object testing') ----- - ----- Method: Spur64BitMemoryManager>>isImmediateFloat: (in category 'interpreter access') ----- isImmediateFloat: oop <inline: true> + ^oop anyMask: self smallFloatTag! - ^(oop bitAnd: self tagMask) = self smallFloatTag! Item was changed: ----- Method: Spur64BitMemoryManager>>isIntegerObject: (in category 'object testing') ----- isIntegerObject: oop + ^oop anyMask: self smallIntegerTag! - ^(oop bitAnd: self tagMask) = 1! Item was changed: ----- Method: Spur64BitMemoryManager>>isNonIntegerObject: (in category 'object testing') ----- isNonIntegerObject: oop + ^oop noMask: self smallIntegerTag! - ^(oop bitAnd: self tagMask) ~= 1! Item was added: + ----- Method: Spur64BitMemoryManager>>oldSmallFloatTag (in category 'cog jit support') ----- + oldSmallFloatTag + ^3! Item was added: + ----- Method: Spur64BitMemoryManager>>setHiddenRootsObj: (in category 'class table') ----- + setHiddenRootsObj: anOop + "Override to check for and abort old format 64-bit Spur images in which the smallFloatTag is 3." + super setHiddenRootsObj: anOop. + (self bootstrapping not + and: [self smallFloatTag ~= (self rawHashBitsOf: (self fetchPointer: self smallFloatTag + ofObject: classTableFirstPage))]) ifTrue: + [self error: 'This is an old-format 64-bit Spur image with smallFloatTag = 3. Aborting.']! Item was changed: ----- Method: Spur64BitMemoryManager>>smallFloatTag (in category 'cog jit support') ----- smallFloatTag <api> <cmacro> + ^4! - ^3! Item was added: + ----- Method: Spur64BitMemoryManager>>smallIntegerTag (in category 'cog jit support') ----- + smallIntegerTag + <cmacro> + ^1! Item was changed: CogClass subclass: #SpurMemoryManager (excessive size, no diff calculated) Item was changed: ----- Method: SpurMemoryManager>>arrayClassIndexPun (in category 'class table puns') ----- arrayClassIndexPun "Class puns are class indices not used by any class. There is an entry for the pun that refers to the notional class of objects with this class index. But because the index doesn't match the class it won't show up in allInstances, hence hiding the object with a pun as its class index. The puns occupy indices 16 through 31." + <cmacro> ^16! Item was changed: ----- Method: SpurMemoryManager>>bootstrapping (in category 'accessing') ----- bootstrapping + <inline: true> ^false! Item was changed: ----- Method: SpurMemoryManager>>classIsItselfClassIndexPun (in category 'class table puns') ----- classIsItselfClassIndexPun "Class puns are class indices not used by any class. There is an entry for the pun that refers to the notional class of objects with this class index. But because the index doesn't match the class it won't show up in allInstances, hence hiding the object with a pun as its class index. The puns occupy indices 16 through 31." + <cmacro> ^31! Item was changed: ----- Method: SpurMemoryManager>>countNumClassPagesPreSwizzle: (in category 'class table') ----- countNumClassPagesPreSwizzle: bytesToShift "Compute the used size of the class table before swizzling. Needed to initialize the classTableBitmap which is populated during adjustAllOopsBy:" | firstObj classTableRoot nilObjPreSwizzle | firstObj := self objectStartingAt: oldSpaceStart. "a.k.a. nilObj" "first five objects are nilObj, falseObj, trueObj, freeListsObj, classTableRootObj" + classTableRoot := self noInlineObjectAfter: + (self noInlineObjectAfter: + (self noInlineObjectAfter: + (self noInlineObjectAfter: firstObj - classTableRoot := self objectAfter: - (self objectAfter: - (self objectAfter: - (self objectAfter: firstObj limit: endOfMemory) limit: endOfMemory) limit: endOfMemory) limit: endOfMemory. nilObjPreSwizzle := oldSpaceStart - bytesToShift. numClassTablePages := self numSlotsOf: classTableRoot. self assert: numClassTablePages = (self classTableRootSlots + self hiddenRootSlots). 2 to: numClassTablePages - 1 do: [:i| (self fetchPointer: i ofObject: classTableRoot) = nilObjPreSwizzle ifTrue: [numClassTablePages := i. ^self]] ! Item was changed: ----- Method: SpurMemoryManager>>firstClassIndexPun (in category 'class table puns') ----- firstClassIndexPun "Class puns are class indices not used by any class. There is an entry for the pun that refers to the notional class of objects with this class index. But because the index doesn't match the class it won't show up in allInstances, hence hiding the object with a pun as its class index. The puns occupy indices 16 through 31." + <cmacro> ^16! Item was added: + ----- Method: SpurMemoryManager>>imageFormatVersion (in category 'image segment in/out') ----- + imageFormatVersion + "Return a magic constant that changes when the image format changes. + Since the image reading code uses this to detect byte ordering, one + must avoid version numbers that are invariant under byte reversal." + ^self subclassResponsibility! Item was changed: ----- Method: SpurMemoryManager>>isFreeObjectClassIndexPun (in category 'class table puns') ----- isFreeObjectClassIndexPun + <cmacro> ^0! Item was changed: ----- Method: SpurMemoryManager>>isImmediate: (in category 'object testing') ----- isImmediate: oop <api> + ^oop anyMask: self tagMask! - ^(oop bitAnd: self tagMask) ~= 0! Item was changed: ----- Method: SpurMemoryManager>>isImmediateCharacter: (in category 'object testing') ----- isImmediateCharacter: oop + ^self subclassResponsibility! - ^(oop bitAnd: self tagMask) = 2! Item was changed: ----- Method: SpurMemoryManager>>isNonImmediate: (in category 'object testing') ----- isNonImmediate: oop <api> + ^oop noMask: self tagMask! - ^(oop bitAnd: self tagMask) = 0! Item was changed: ----- Method: SpurMemoryManager>>lastClassIndexPun (in category 'class table puns') ----- lastClassIndexPun "Class puns are class indices not used by any class. There is an entry for the pun that refers to the notional class of objects with this class index. But because the index doesn't match the class it won't show up in allInstances, hence hiding the object with a pun as its class index. The puns occupy indices 16 through 31." + <cmacro> ^31! Item was changed: ----- Method: SpurMemoryManager>>markAndTraceClassOf: (in category 'gc - global') ----- markAndTraceClassOf: objOop "Ensure the class of the argument is marked, pushing it on the markStack if not already marked. And for one-way become, which can create duplicate entries in the class table, make sure objOop's classIndex refers to the classObj's actual classIndex. Note that this is recursive, but the metaclass chain should terminate quickly." <inline: false> | classIndex classObj realClassIndex | classIndex := self classIndexOf: objOop. classObj := self classOrNilAtIndex: classIndex. self assert: (coInterpreter objCouldBeClassObj: classObj). realClassIndex := self rawHashBitsOf: classObj. (classIndex ~= realClassIndex + and: [classIndex > self lastClassIndexPun]) ifTrue: - and: [realClassIndex > self lastClassIndexPun]) ifTrue: [self setClassIndexOf: objOop to: realClassIndex]. (self isMarked: classObj) ifFalse: [self setIsMarkedOf: classObj to: true. self markAndTraceClassOf: classObj. self push: classObj onObjStack: markStack]! Item was added: + ----- Method: SpurMemoryManager>>noInlineObjectAfter:limit: (in category 'object enumeration') ----- + noInlineObjectAfter: objOop limit: limit + "Object parsing. + 1. all objects have at least a word following the header, for a forwarding pointer. + 2. objects with an overflow size have a preceeing word with a saturated numSlots. If the word + following an object doesn't have a saturated numSlots field it must be a single-header object. + If the word following does have a saturated numSlots it must be the overflow size word." + <inline: false> + ^self objectAfter: objOop limit: limit! Item was changed: ----- Method: SpurMemoryManager>>segmentBridgePun (in category 'class table puns') ----- segmentBridgePun + <cmacro> ^3! Item was changed: ----- Method: SpurMemoryManager>>sixtyFourBitLongsClassIndexPun (in category 'class table puns') ----- sixtyFourBitLongsClassIndexPun "Class puns are class indices not used by any class. There may be an entry for the pun that refers to the notional class of objects with this class index. But because the index doesn't match the class it won't show up in allInstances, hence hiding the object with a pun as its class index. The puns occupy indices 16 through 31." + <cmacro> ^19! Item was changed: ----- Method: SpurMemoryManager>>smallIntegerTag (in category 'cog jit support') ----- smallIntegerTag + ^self subclassResponsibility! - ^1! Item was changed: ----- Method: SpurMemoryManager>>thirtyTwoBitLongsClassIndexPun (in category 'class table puns') ----- thirtyTwoBitLongsClassIndexPun "Class puns are class indices not used by any class. There may be an entry for the pun that refers to the notional class of objects with this class index. But because the index doesn't match the class it won't show up in allInstances, hence hiding the object with a pun as its class index. The puns occupy indices 16 through 31." + <cmacro> ^18! Item was changed: ----- Method: SpurMemoryManager>>weakArrayClassIndexPun (in category 'class table puns') ----- weakArrayClassIndexPun "Class puns are class indices not used by any class. There is an entry for the pun that refers to the notional class of objects with this class index. But because the index doesn't match the class it won't show up in allInstances, hence hiding the object with a pun as its class index. The puns occupy indices 16 through 31." + <cmacro> ^17! Item was changed: ----- Method: StackInterpreter>>imageFormatVersion (in category 'image save/restore') ----- imageFormatVersion "Return a magic constant that changes when the image format changes. Since the image reading code uses this to detect byte ordering, one must avoid version numbers that are invariant under byte reversal." + <doNotGenerate> + self assert: (objectMemory imageFormatVersion anyMask: 16) = objectMemory hasSpurMemoryManagerAPI. + ^objectMemory imageFormatVersion! - | isSpurFlag | - isSpurFlag := objectMemory hasSpurMemoryManagerAPI ifTrue: [2r10000] ifFalse: [0]. - ^(objectMemory wordSize = 4 ifTrue: [6505] ifFalse: [68003]) - + isSpurFlag! Item was added: + ----- Method: TMethod>>mapReturnsToGotos (in category 'transformations') ----- + mapReturnsToGotos + "For super expansions inner returns must be mapped to gotos to prevent premature exit. + But this only works if no value is being returned. + Anything meaningful in the returned expression must be retained." + + | map label | + map := Dictionary new. + parseTree nodesDo: + [:node| + node isReturn ifTrue: + [(node expression isVariable and: [#('self' 'nil') includes: node expression name]) + ifTrue: + [map at: node put: (TGoToNode new + setLabel: (label ifNil: [label := self unusedLabelForInlining: self]); + yourself)] + ifFalse: [self error: 'Cannot expand super node with inner return that answers a value!!']]]. + label ifNotNil: + [parseTree := parseTree replaceNodesIn: map. + parseTree setStatements: (parseTree statements asOrderedCollection + addLast: (TLabeledCommentNode new + setLabel: label; + yourself); + yourself)]! Item was changed: ----- Method: TMethod>>setSelector:definingClass:args:locals:block:primitive:properties:comment: (in category 'initialization') ----- setSelector: sel definingClass: class args: argList locals: localList block: aBlockNode primitive: aNumber properties: methodProperties comment: aComment "Initialize this method using the given information." selector := sel. definingClass := class. args := argList asOrderedCollection collect: [:arg | arg key]. locals := (localList collect: [:arg | arg key]) asSet. declarations := Dictionary new. self addTypeForSelf. primitive := aNumber. properties := methodProperties. comment := aComment. + labels := Set new. parseTree := aBlockNode. "hack; allows nodes to find their parent, etc" parseTree := aBlockNode asTranslatorNodeIn: self. - labels := Set new. complete := false. "set to true when all possible inlining has been done" export := self extractExportDirective. static := self extractStaticDirective. self extractSharedCase. globalStructureBuildMethodHasFoo := false! Item was removed: - ----- Method: TMethod>>superExpansionNodeFor:args: (in category 'inlining') ----- - superExpansionNodeFor: aSelector args: argumentNodes - "Answer the expansion of a super send. Merge the super expansion's - locals, properties and comment into this method's properties." - (definingClass superclass lookupSelector: aSelector) - ifNil: [self error: 'superclass does not define super method'] - ifNotNil: - [:superMethod| | superTMethod commonVars varMap | - superTMethod := superMethod methodNode asTranslationMethodOfClass: self class. - ((argumentNodes allSatisfy: [:parseNode| parseNode isVariableNode]) - and: [(argumentNodes asOrderedCollection collect: [:parseNode| parseNode key]) = superTMethod args]) ifFalse: - [self error: definingClass name, '>>',selector, ' args ~= ', - superTMethod definingClass name, '>>', aSelector, - (String with: $. with: Character cr), - 'For super expansions to be translated correctly each argument must be a variable with the same name as the corresponding argument in the super method.']. - (commonVars := superTMethod locals intersection: self locals) notEmpty ifTrue: - [varMap := Dictionary new. - commonVars do: - [:k| varMap at: k put: (superTMethod unusedNamePrefixedBy: k avoiding: self allLocals)]. - superTMethod renameVariablesUsing: varMap]. - self mergePropertiesOfSuperMethod: superTMethod. - self assert: (superTMethod locals allSatisfy: [:var| (self locals includes: var) not]). - locals addAll: superTMethod locals. - superTMethod declarations keysAndValuesDo: - [:var :decl| - self declarationAt: var put: decl]. - superTMethod comment ifNotNil: - [:superComment| - comment := comment - ifNil: [superComment] - ifNotNil: [superComment, comment]]. - superTMethod extraVariableNumber ifNotNil: - [:scvn| - extraVariableNumber := extraVariableNumber ifNil: [scvn] ifNotNil: [:cvn| cvn + scvn]]. - superTMethod elideAnyFinalReturn. - ^superTMethod parseTree]! Item was added: + ----- Method: TMethod>>superExpansionNodeFor:args:isResult: (in category 'inlining') ----- + superExpansionNodeFor: aSelector args: argumentNodes isResult: superExpansionIsResult + "Answer the expansion of a super send. Merge the super expansion's + locals, properties and comment into this method's properties." + (definingClass superclass lookupSelector: aSelector) + ifNil: [self error: 'superclass does not define super method'] + ifNotNil: + [:superMethod| | superTMethod commonVars varMap | + superTMethod := superMethod methodNode asTranslationMethodOfClass: self class. + ((argumentNodes allSatisfy: [:parseNode| parseNode isVariableNode]) + and: [(argumentNodes asOrderedCollection collect: [:parseNode| parseNode key]) = superTMethod args]) ifFalse: + [self error: definingClass name, '>>',selector, ' args ~= ', + superTMethod definingClass name, '>>', aSelector, + (String with: $. with: Character cr), + 'For super expansions to be translated correctly each argument must be a variable with the same name as the corresponding argument in the super method.']. + (commonVars := superTMethod locals intersection: self locals) notEmpty ifTrue: + [varMap := Dictionary new. + commonVars do: + [:k| varMap at: k put: (superTMethod unusedNamePrefixedBy: k avoiding: self allLocals)]. + superTMethod renameVariablesUsing: varMap]. + self mergePropertiesOfSuperMethod: superTMethod. + self assert: (superTMethod locals allSatisfy: [:var| (self locals includes: var) not]). + locals addAll: superTMethod locals. + superTMethod declarations keysAndValuesDo: + [:var :decl| + self declarationAt: var put: decl]. + superTMethod comment ifNotNil: + [:superComment| + comment := comment + ifNil: [superComment] + ifNotNil: [superComment, comment]]. + superTMethod extraVariableNumber ifNotNil: + [:scvn| + extraVariableNumber := extraVariableNumber ifNil: [scvn] ifNotNil: [:cvn| cvn + scvn]]. + superTMethod elideAnyFinalReturn. + superExpansionIsResult ifFalse: + [superTMethod mapReturnsToGotos. + labels addAll: superTMethod labels]. + ^superTMethod parseTree]! Item was changed: ----- Method: TMethod>>unusedLabelForInliningInto: (in category 'inlining') ----- unusedLabelForInliningInto: targetMethod + ^self unusedNamePrefixedBy: 'l' avoiding: (targetMethod == self + ifTrue: [labels] + ifFalse: [labels copy + addAll: targetMethod labels; + yourself])! - - | usedLabels | - usedLabels := labels copy. - usedLabels addAll: targetMethod labels. - ^self unusedNamePrefixedBy: 'l' avoiding: usedLabels! Item was changed: ----- Method: TMethod>>unusedNamePrefixedBy:avoiding: (in category 'inlining support') ----- unusedNamePrefixedBy: aString avoiding: usedNames + "Choose a unique variable or label name with the given string as a prefix, avoiding + the names in the given collection. The selected name is added to usedNames." - "Choose a unique variable or label name with the given string as a prefix, avoiding the names in the given collection. The selected name is added to usedNames." | n newVarName | n := 1. + [newVarName := aString, n printString. + usedNames includes: newVarName] whileTrue: + [n := n + 1]. + ^usedNames add: newVarName! - newVarName := aString, n printString. - [usedNames includes: newVarName] whileTrue: [ - n := n + 1. - newVarName := aString, n printString. - ]. - usedNames add: newVarName. - ^ newVarName! Item was changed: ----- Method: VMMaker>>generateExternalPlugins (in category 'generate sources') ----- generateExternalPlugins "generate the external plugins" + self logDateAndTime. self deleteUnwantedExternalPluginDirectories. InterpreterPlugin initialize. self externalPluginsDo: [:plugin | self generateExternalPlugin: plugin]. self storeExternalPluginList. self logDateAndTime!

1 0

VM Maker: CMakeVMMaker-nice.283.mcz
by commits＠source.squeak.org 10 Mar '16

10 Mar '16

Nicolas Cellier uploaded a new version of CMakeVMMaker to project VM Maker: http://source.squeak.org/VMMaker/CMakeVMMaker-nice.283.mcz ==================== Summary ==================== Name: CMakeVMMaker-nice.283 Author: nice Time: 10 March 2016, 9:58:43.064 pm UUID: 638cfa96-bb41-4224-8aa4-c738240e89ad Ancestors: CMakeVMMaker-tty.215, CMakeVMMaker-jeanbaptistearnaud.282 merge CMakeVMMaker-tty.215: Modified class comment in CPlatformConfig to refer to the correct repository on github instead of gittorious =============== Diff against CMakeVMMaker-tty.215 =============== Item was changed: SystemOrganization addCategory: #CMakeVMMaker! + SystemOrganization addCategory: #'CMakeVMMaker-Android'! + SystemOrganization addCategory: #'CMakeVMMaker-Builder'! + SystemOrganization addCategory: #'CMakeVMMaker-FreeBSD'! + SystemOrganization addCategory: #'CMakeVMMaker-IOS'! + SystemOrganization addCategory: #'CMakeVMMaker-Libs'! + SystemOrganization addCategory: #'CMakeVMMaker-MacOS'! + SystemOrganization addCategory: #'CMakeVMMaker-Unix'! + SystemOrganization addCategory: #'CMakeVMMaker-Windows'! - SystemOrganization addCategory: 'CMakeVMMaker-Android'! - SystemOrganization addCategory: 'CMakeVMMaker-FreeBSD'! - SystemOrganization addCategory: 'CMakeVMMaker-IOS'! - SystemOrganization addCategory: 'CMakeVMMaker-Libs'! - SystemOrganization addCategory: 'CMakeVMMaker-MacOS'! - SystemOrganization addCategory: 'CMakeVMMaker-Unix'! - SystemOrganization addCategory: 'CMakeVMMaker-Windows'! Item was changed: ----- Method: CMIOSFreetype2>>defineGlobalTargets (in category 'generating actions') ----- defineGlobalTargets | var | var := self canonicalName , '_LIB'. vmGen set: var toString: self libraryFileName. " define a library as imported one and make it depend from it's build target " + vmGen puts: + ('add_library("\{{1}\}" STATIC IMPORTED GLOBAL) + set_target_properties("\{{1}\}" PROPERTIES IMPORTED_LOCATION "\{{1}\}") + add_dependencies("\{{1}\}" "{2}") + ' format: { var. self buildTarget } - ('add_library("{1}" STATIC IMPORTED GLOBAL) - set_target_properties("{1}" PROPERTIES IMPORTED_LOCATION "{1}") - add_dependencies("{1}" "{2}") - ' format: { '${',var, '}' . self buildTarget } ). vmGen cmd: 'add_dependencies' params: vmGen moduleName , ' ' , self buildTarget! Item was changed: ----- Method: CMIOSFreetype2>>includeDir (in category 'accessing') ----- includeDir "see setVariables" " `<prefix>/include/freetype2' must be in your current inclusion path " - ^ '"${thirdpartyDir}/freetype2/freetype-2.4.9/include"'! Item was changed: ----- Method: CMPkgConfig>>build (in category 'generating actions') ----- build gen puts: ' add_custom_command(OUTPUT "${pkgConfigBinary}" + COMMAND ./configure --prefix=''${installPrefix}'' CFLAGS=''-std=gnu89 -arch i386'' LDFLAGS=''-arch i386'' - COMMAND ./configure --prefix=''${installPrefix}'' CFLAGS=''-arch i386'' LDFLAGS=''-arch i386'' COMMAND make COMMAND make install WORKING_DIRECTORY "${libSourcesDir}" DEPENDS "${unpackTarget}" COMMENT "Building ${libName}" ) ' ! Item was changed: + ----- Method: CMThirdpartyLibrary>>archiveFileName (in category 'accessing') ----- - ----- Method: CMThirdpartyLibrary>>archiveFileName (in category 'as yet unclassified') ----- archiveFileName ^ self downloadURL asUrl fileName ! Item was changed: ----- Method: CMThirdpartyLibrary>>defaultConfigurationFlags (in category 'settings') ----- defaultConfigurationFlags ^#( + 'CFLAGS=''-arch i386''' - 'CFLAGS=''-arch i386''' 'LDFLAGS=''-arch i386''')! Item was changed: ----- Method: CMakeGenerator>>addExternalLibrary: (in category 'cmake commands') ----- addExternalLibrary: aLibrary - self cmd: 'list' params: 'APPEND LINKLIBS ' , aLibrary . " self cmd: 'target_link_libraries' params: self moduleName , ' ' , aLibrary. " ! Item was changed: ----- Method: CMakeGenerator>>linkDirectories: (in category 'cmake commands') ----- linkDirectories: aString ^ self cmd: 'link_directories' params: aString! Item was changed: CMakeGenerator subclass: #CMakePluginGenerator + instanceVariableNames: 'plugin vmGen internal extraRules doNotGenerate externalDependencies' - instanceVariableNames: 'plugin vmGen internal extraRules doNotGenerate' classVariableNames: '' poolDictionaries: '' category: 'CMakeVMMaker'! !CMakePluginGenerator commentStamp: 'Igor.Stasenko 12/25/2010 04:21' prior: 0! I am using for generating CMakeLists.txt (cmake config files) for specific plugin. The direct use of my instances is not recommended. Use CMakeVMGenerator and appropriate configuration to generate both VM and plugins cmake config files.! Item was changed: + ----- Method: CMakePluginGenerator>>addCrossSources: (in category 'accessing') ----- - ----- Method: CMakePluginGenerator>>addCrossSources: (in category 'as yet unclassified') ----- addCrossSources: sources ^ self addSources: sources prefixed: '${pluginCross}/' ! Item was added: + ----- Method: CMakePluginGenerator>>addExternalDependency: (in category 'accessing') ----- + addExternalDependency: aString + "We need to collect external dependencies to internal plugins because we need to force its + resolve before, and if we just add teh dependency in executable some times is not enough. + check StackIPhoneConfig>>#configureFT2Plugin: as an example" + externalDependencies := externalDependencies copyWith: aString.! Item was changed: + ----- Method: CMakePluginGenerator>>addExternalLibrary: (in category 'cmake commands') ----- - ----- Method: CMakePluginGenerator>>addExternalLibrary: (in category 'as yet unclassified') ----- addExternalLibrary: aLibrary + self isInternal + ifTrue: [ vmGen addExternalLibrary: aLibrary ] + ifFalse: [ super addExternalLibrary: aLibrary ].! - - self isInternal ifTrue: [ - vmGen addExternalLibrary: aLibrary - ] - ifFalse: [ super addExternalLibrary: aLibrary ] - ! Item was changed: + ----- Method: CMakePluginGenerator>>addPlatformSources: (in category 'accessing') ----- - ----- Method: CMakePluginGenerator>>addPlatformSources: (in category 'as yet unclassified') ----- addPlatformSources: sources ^ self addSources: sources prefixed: '${pluginPlatform}/' ! Item was changed: + ----- Method: CMakePluginGenerator>>config (in category 'accessing') ----- - ----- Method: CMakePluginGenerator>>config (in category 'as yet unclassified') ----- config ^ vmGen config! Item was changed: + ----- Method: CMakePluginGenerator>>configurationName (in category 'accessing') ----- - ----- Method: CMakePluginGenerator>>configurationName (in category 'as yet unclassified') ----- configurationName ^ vmGen configurationName! Item was added: + ----- Method: CMakePluginGenerator>>externalDependencies (in category 'accessing') ----- + externalDependencies + ^ externalDependencies! Item was changed: + ----- Method: CMakePluginGenerator>>generate:for:internal:extraRules: (in category 'code generation') ----- - ----- Method: CMakePluginGenerator>>generate:for:internal:extraRules: (in category 'as yet unclassified') ----- generate: aPlugin for: aCMakeVMGenerator internal: aBoolean extraRules: aBlock doNotGenerate := false. internal := aBoolean. plugin := aPlugin. vmGen := aCMakeVMGenerator. extraRules := aBlock. ^ self generate! Item was added: + ----- Method: CMakePluginGenerator>>initialize (in category 'initialization') ----- + initialize + super initialize. + externalDependencies := #().! Item was changed: + ----- Method: CMakePluginGenerator>>saveFile (in category 'accessing') ----- - ----- Method: CMakePluginGenerator>>saveFile (in category 'as yet unclassified') ----- saveFile | reference | reference := ((vmGen config dirFrom: vmGen buildDir) / plugin moduleName) ensureDirectory; yourself. (FileStream forceNewFileNamed: (reference / self outputFileName) fullName) nextPutAll: (self config fixLineEndsOf: output contents); close.! Item was changed: + ----- Method: CMakeVMGenerator>>configurationName (in category 'accessing') ----- - ----- Method: CMakeVMGenerator>>configurationName (in category 'as yet unclassified') ----- configurationName ^ config class name! Item was changed: ----- Method: CMakeVMGenerator>>generate (in category 'code generation') ----- generate | intPlugins extPlugins | output := String new writeStream. config setGlobalOptions: self. self printHeader; project: config executableName. config setGlobalOptionsAfterDetermineSystem: self. config setupDirectories: self. self message: '${CMAKE_MODULE_PATH}'. self set: 'CMAKE_CONFIGURATION_TYPES' to: 'Release'. config preferredIncludes do: [ :each | self includeDirectories: each ]. self includeDirectories: self includeDirs. config standardIncludes do: [:each | self includeDirectories: each ]. self addDefinitions: config compilerFlags. config extraVMSettings: self. self puts: 'add_executable(' , config executableName, ' ', config executableType, ' ' , self sources , ')'. intPlugins := self generatePluginConfigs: config internalPlugins internal: true. extPlugins := self generatePluginConfigs: config externalPlugins internal: false. + - self processThirdpartyLibraries. self processPlugins: intPlugins, extPlugins. config setExtraTargetProperties: self. self cmd: 'target_link_libraries' params: self moduleName , ' ${LINKLIBS}'. config postBuildActions: self. self saveFile. self generateBuildScript.! Item was changed: + ----- Method: CMakeVMGenerator>>generatePlugin:internal:extraRules: (in category 'plugins') ----- - ----- Method: CMakeVMGenerator>>generatePlugin:internal:extraRules: (in category 'as yet unclassified') ----- generatePlugin: aPlugin internal: aBoolean extraRules: aBlock " this method called back from plugin" ^ CMakePluginGenerator new generate: aPlugin for: self internal: aBoolean extraRules: aBlock! Item was changed: + ----- Method: CMakeVMGenerator>>includeDirs (in category 'sources management') ----- - ----- Method: CMakeVMGenerator>>includeDirs (in category 'as yet unclassified') ----- includeDirs ^ '${crossDir}/vm ${srcVMDir} ${targetPlatform}/vm ${buildDir}'.! Item was changed: ----- Method: CMakeVMGenerator>>processPlugins: (in category 'processing plugins') ----- processPlugins: pluginGenerators + | libs libDeps | - | libs | libs := OrderedCollection new. + libDeps := Dictionary new. - pluginGenerators do: [:gen | gen doNotGenerate ifFalse: [ + gen isInternal + ifTrue: [ + libs add: gen plugin moduleName ] + ifFalse: [ + "make main module to depend on external plugin, just to make sure it is built + before main module built" + self + cmd: 'add_dependencies' + params: config executableName, ' ' , gen plugin moduleName ]. + gen externalDependencies + ifNotEmpty: [ :deps | + libDeps + at: gen plugin moduleName + put: (deps fold: [ :a :b | a, ' ', b ]) ]. + self addSubdirectory: gen plugin moduleName ] ]. - gen isInternal ifTrue: [ - libs add: gen plugin moduleName ] - ifFalse: [ - "make main module to depend on external plugin, just to make sure it is built before main module built" - self cmd: 'add_dependencies' params: config executableName, ' ' , gen plugin moduleName - ]. - self addSubdirectory: gen plugin moduleName. - ]. - ]. self cmd: 'target_link_libraries' params: config executableName , ' ' , + (libs inject: '' into: [:res :ea | res, ' ' , ea ]). - (libs inject: '' into: [:res :ea | res, ' ' , ea ]) . + libDeps keysAndValuesDo: [ :moduleName :dependencies | + self + cmd: 'add_dependencies' + params: moduleName, ' ', dependencies ]. + + self generateExportsH: libs.! - self generateExportsH: libs. - ! Item was changed: + ----- Method: CMakeVMGenerator>>saveFile (in category 'accessing') ----- - ----- Method: CMakeVMGenerator>>saveFile (in category 'as yet unclassified') ----- saveFile config write: output contents toFile: (self outputFileName). ! Item was changed: Object subclass: #CPlatformConfig + instanceVariableNames: 'topDir buildDir srcDir platformsDir outputDir internalPlugins externalPlugins pluginsDir externalLibs thirdpartyLibs generateForRelease' - instanceVariableNames: 'topDir buildDir srcDir platformsDir outputDir internalPlugins externalPlugins pluginsDir externalLibs thirdpartyLibs' classVariableNames: '' poolDictionaries: '' category: 'CMakeVMMaker'! !CPlatformConfig commentStamp: 'tty 4/23/2014 16:30' prior: 0! Base class, defining some common properties and behavior for all kinds of VM build configurations. These classes are used to generate the VM sources and the CMMake files. Notice that this configuration classes expect that you have download the "platofroms code" which is hosted here: https://github.com/pharo-project/pharo-vm. You can clone it using this command: git clone https://github.com/pharo-project/pharo-vm Once that is done it should have created a directory /blessed. In order to get all the directories by default, place this image under /blessed/image To generate a sources/build configuration use one of my subclasses with: <config> generate. - to generate a build configuration <config> generateWithSources - to generate VMMaker sources and then build configuration. Once you do that, go to /blessed/build and execute: cmake . or cmake -G"MSYS Makefiles" if you are in Windows Since some plugins require extra settings (like additional source files etc), there is two ways to add that: - add custom rules on plugin class side: PluginClass>>generateFor: aCMakeVMGenerator internal: aBoolean ^ aCMakeVMGenerator generatePlugin: self internal: aBoolean extraRules: [:maker | ... your rules come here ... ] - define rules by adding #configure<PluginClass>: method in config class (see my 'plugin extra rules' category) The last one is more compact and also avoids inter-package dependency, so you can load and use CMakeVMMaker even if some 3rd-party plugins are not loaded into image. Links of interest: Official Cog Website: http://www.mirandabanda.org/cog Official Cog Blog: http://www.mirandabanda.org/cogblog Cog issue tracker: http://code.google.com/p/cog Cog Wiki: http://code.google.com/p/cog/w/list Cog binaries: http://www.mirandabanda.org/files/Cog/VM Cog binaries in Pharo Hudson server: https://pharo-ic.lille.inria.fr/hudson/view/Cog Cog SVN branch: http://squeakvm.org/svn/squeak/branches/Cog VM mailing list: http://lists.squeakfoundation.org/mailman/listinfo/vm-dev VM-beginners mailing list: http://lists.squeakfoundation.org/mailman/listinfo/vm-beginners Guide step by step about how to build the Cog VM using CMakeVMMaker and Git: http://code.google.com/p/cog/wiki/Guide ! Item was added: + ----- Method: CPlatformConfig>>addThirdpartyLibraries: (in category 'thirdparty libs') ----- + addThirdpartyLibraries: aCollection + aCollection do: [ :each | self addThirdpartyLibrary: each ]! Item was changed: ----- Method: CPlatformConfig>>addThirdpartyLibrary: (in category 'thirdparty libs') ----- addThirdpartyLibrary: libName | libs lib | libs := self thirdpartyLibs. lib := libs detect: [:each | each canonicalName = libName ] ifNone: [ nil ]. lib ifNil: [ + lib := CMThirdpartyLibrary named: libName config: self. + "add dependencies first, so thirpartyLibs collection will be naturally dependency sorted" + lib dependencies do: [:dep | self addThirdpartyLibrary: dep ]. + libs add: lib ]. - lib := (CMThirdpartyLibrary named: libName config: self). - "add dependencies first, so thirpartyLibs collection will be naturally dependency sorted" - lib dependencies do: [:dep | self addThirdpartyLibrary: dep ]. - libs add: lib ]. ^ lib! Item was changed: ----- Method: CPlatformConfig>>buildScript (in category 'build script') ----- buildScript "answer the build script for building everything" ^ + '#!!/usr/bin/env bash - '#!!bash cmake . make '! Item was added: + ----- Method: CPlatformConfig>>commonCompilerFlags (in category 'compiler flags') ----- + commonCompilerFlags + ^ #()! Item was added: + ----- Method: CPlatformConfig>>compilerFlags (in category 'compiler flags') ----- + compilerFlags + | releaseFlags | + + releaseFlags := self isGenerateForRelease + ifTrue: [ self compilerFlagsRelease ] + ifFalse: [ self compilerFlagsDebug ]. + + ^ String streamContents: [ :stream | + ((self commonCompilerFlags, releaseFlags) collect: #trimBoth as: Set) + asStringOn: stream + delimiter: ' ' ]! Item was added: + ----- Method: CPlatformConfig>>compilerFlagsDebug (in category 'compiler flags') ----- + compilerFlagsDebug + ^ #()! Item was added: + ----- Method: CPlatformConfig>>compilerFlagsRelease (in category 'compiler flags') ----- + compilerFlagsRelease + ^ #()! Item was added: + ----- Method: CPlatformConfig>>generateForDebug (in category 'accessing') ----- + generateForDebug + generateForRelease := false! Item was added: + ----- Method: CPlatformConfig>>generateForRelease (in category 'accessing') ----- + generateForRelease + generateForRelease := true! Item was added: + ----- Method: CPlatformConfig>>initialize (in category 'initialize-release') ----- + initialize + super initialize. + generateForRelease := true.! Item was added: + ----- Method: CPlatformConfig>>isGenerateForRelease (in category 'testing') ----- + isGenerateForRelease + ^generateForRelease! Item was changed: MacOSConfig subclass: #CocoaIOSConfig + instanceVariableNames: '' - instanceVariableNames: 'generateForRelease' classVariableNames: '' poolDictionaries: '' category: 'CMakeVMMaker-IOS'! !CocoaIOSConfig commentStamp: 'MarianoMartinezPeck 4/24/2011 15:34' prior: 0! This is an abstract class for all Mac Cocoa configurations. It is intended to share code between different concrete implementations. Fore more information, check the class comments of all the superclasses. ! Item was removed: - ----- Method: CocoaIOSConfig>>compilerFlags (in category 'accessing') ----- - compilerFlags - | releaseFlags | - - releaseFlags := self isGenerateForRelease - ifTrue: [ self compilerFlagsRelease ] - ifFalse: [ self compilerFlagsDebug ]. - - ^String streamContents: [ :stream | - (self commonCompilerFlags, releaseFlags) asSet - do: [ :each | stream nextPutAll: each ] - separatedBy: [ stream space ] ]! Item was changed: ----- Method: CocoaIOSConfig>>compilerFlagsRelease (in category 'accessing') ----- compilerFlagsRelease ^#( "'-fobjc-direct-dispatch'" '-msse3' "'-msse4.1'" "'-msse4.2'" "'-mdynamic-no-pic'" "'-fwritable-strings'" '-Os' + '-fvisibility=default' - '-fvisibility=hidden' '-funroll-loops' "'-fno-asm'" '-fasm-blocks' '-finline-functions' '-mfpmath=sse' '-fomit-frame-pointer' '-march=pentium-m' '-mtune=prescott' '-falign-functions=16' '-fno-gcse' - '-fno-cse-follow-jumps' '-std=gnu99' '-DBUILD_FOR_OSX' "'-DUSE_INLINE_MEMORY_ACCESSORS'" '-DLSB_FIRST' '-DUSE_INLINE_MEMORY_ACCESSORS' '-DHAVE_SYS_TIME_H' '-DHAVE_NANOSLEEP' '-DICC_DEBUG=0' '-DICC_OPTLEVEL="speedHLO"' '-DICC_OPT_IPO_FOR_SINGLE_FILE_COMPILATION=1' '-DICC_OPT_PARALLEL=0' '-DICC_OPT_PREFETCH_INSERTION=1' '-DICC_OPT_PROVIDE_FRAME_PTR=0' '-DICC_OPT_USE_ARCH_IA32="SSE42"')! Item was added: + ----- Method: CocoaIOSConfig>>configureMIDIPlugin: (in category 'plugin extra rules') ----- + configureMIDIPlugin: maker + "extra rules for MIDIPlugin" + + maker addPlatformSources: #( 'sqMacMIDI.m')! Item was changed: ----- Method: CocoaIOSConfig>>frameworks (in category 'accessing') ----- frameworks ^ #( Cocoa Foundation AudioToolbox CoreAudio SystemConfiguration ApplicationServices QuartzCore OpenGL + AGL + QuickTime)! - AGL)! Item was removed: - ----- Method: CocoaIOSConfig>>generateForDebug (in category 'accessing') ----- - generateForDebug - generateForRelease := false! Item was removed: - ----- Method: CocoaIOSConfig>>generateForRelease (in category 'accessing') ----- - generateForRelease - generateForRelease := true! Item was removed: - ----- Method: CocoaIOSConfig>>initialize (in category 'initialization') ----- - initialize - super initialize. - self generateForRelease! Item was removed: - ----- Method: CocoaIOSConfig>>isGenerateForRelease (in category 'testing') ----- - isGenerateForRelease - ^generateForRelease! Item was changed: ----- Method: CocoaIOSConfig>>setExtraTargetProperties: (in category 'settings') ----- setExtraTargetProperties: maker | plist precompiledHeaders | " generated and add Info.plist file " plist := self plistFile. (maker buildDir forceNewFileNamed: 'Info.plist') nextPutAll: plist; close. maker addProperty: 'MACOSX_BUNDLE_INFO_PLIST' value: '${buildDir}/Info.plist'. maker cmd: 'set_source_files_properties' params: '${resources} PROPERTIES MACOSX_PACKAGE_LOCATION Resources'. precompiledHeaders := (self executableName, '_Prefix.pch'). (maker buildDir forceNewFileNamed: precompiledHeaders) nextPutAll: self precompiledHeaders; close. maker addXCodeProperty: 'GCC_PREFIX_HEADER' value: '${buildDir}/', precompiledHeaders. "maker addXCodeProperty: 'GCC_ENABLE_SSE3_EXTENSIONS' value: 'YES'; addXCodeProperty: 'GCC_ENABLE_SSE41_EXTENSIONS' value: 'YES'; addXCodeProperty: 'GCC_ENABLE_SSE42_EXTENSIONS' value: 'YES'; addXCodeProperty: 'GCC_GENERATE_DEBUGGING_SYMBOLS' value: 'NO'; addXCodeProperty: 'GCC_INLINES_ARE_PRIVATE_EXTERN' value: 'YES'; addXCodeProperty: 'GCC_UNROLL_LOOPS' value: 'YES'. " "Extras" maker addXCodeProperty: 'ICC_DEBUG' value: 'NO'; addXCodeProperty: 'ICC_OPTLEVEL' value: 'speedHLO'; addXCodeProperty: 'ICC_OPT_IPO_FOR_SINGLE_FILE_COMPILATION' value: 'YES'; addXCodeProperty: 'ICC_OPT_PARALLEL' value: 'NO'; addXCodeProperty: 'ICC_OPT_PREFETCH_INSERTION' value: 'YES'; addXCodeProperty: 'ICC_OPT_PROVIDE_FRAME_PTR' value: 'NO'; addXCodeProperty: 'ICC_OPT_USE_ARCH_IA32' value: 'SSE41'; + addXCodeProperty: 'PER_ARCH_CFLAGS_i386' value: '-finline-functions -mfpmath=sse -march=pentium-m -mtune=prescott -falign-functions=16 -fno-gcse -DLSB_FIRST'; - addXCodeProperty: 'PER_ARCH_CFLAGS_i386' value: '-finline-functions -mfpmath=sse -march=pentium-m -mtune=prescott -falign-functions=16 -fno-gcse -fno-cse-follow-jumps -DLSB_FIRST'; addXCodeProperty: 'PER_ARCH_CFLAGS_ppc' value: '-fast -mtune=7450 -mcpu=7450 -D_BSD_SOCKLEN_T_=int'! Item was changed: ----- Method: CogFamilyCocoaIOSConfig>>commonCompilerFlags (in category 'settings') ----- commonCompilerFlags + ^super commonCompilerFlags, #( + "CLANG >>" + '-fwrapv' "Non optimization of stackoverflow (to allow number conversions)" + '-Wno-return-type' "to avoid clang to complain about plugins that do not return properly." + '-Qunused-arguments' + "CLANG <<" - ^super commonCompilerFlags, - #( '-funroll-loops' '-fasm-blocks' '-fno-inline-functions' '-mfpmath=sse' '-march=pentium-m' '-mtune=prescott' '-falign-functions=16' '-fno-gcse' - '-fno-cse-follow-jumps' '-std=gnu99' '-fmessage-length=0' '-fpascal-strings' '-DBUILD_FOR_OSX' "'-DUSE_INLINE_MEMORY_ACCESSORS=1' " '-DLSB_FIRST' '-DHAVE_SYS_TIME_H' '-DHAVE_NANOSLEEP' '-DCOGMTVM=0' '-DUSE_GLOBAL_STRUCT=0' '-DBASE_HEADER_SIZE=4' '-DENABLE_FAST_BLT')! Item was changed: ----- Method: CogFamilyCocoaIOSConfig>>defaultExternalPlugins (in category 'plugins') ----- defaultExternalPlugins ^(self versionExternalPlugins), #( UUIDPlugin FloatMathPlugin AsynchFilePlugin - SerialPlugin Mpeg3Plugin CroquetPlugin JoystickTabletPlugin - MIDIPlugin B3DAcceleratorPlugin JPEGReadWriter2Plugin JPEGReaderPlugin RePlugin LocalePlugin ObjectiveCPlugin QuicktimePlugin TestOSAPlugin SqueakSSLPlugin + SerialPlugin + MIDIPlugin - "UnixOSProcessPlugin" )! Item was changed: ----- Method: CogFamilyCocoaIOSConfig>>defaultInternalPlugins (in category 'plugins') ----- defaultInternalPlugins ^ #( ADPCMCodecPlugin BMPReadWriterPlugin BalloonEnginePlugin BitBltSimulation ClipboardExtendedPlugin DSAPlugin DeflatePlugin DropPlugin FFTPlugin FilePlugin FloatArrayPlugin GeniePlugin HostWindowPlugin "JPEGReadWriter2Plugin JPEGReaderPlugin" + KlattSynthesizerPlugin - KlattSynthesizerPlugin LargeIntegersPlugin - "MacMenubarPlugin" "This plugin is not yet ported" Matrix2x3Plugin MiscPrimitivePlugin "RePlugin" SecurityPlugin SocketPlugin SoundCodecPlugin SoundGenerationPlugin SoundPlugin StarSqueakPlugin SurfacePlugin UnixAioPlugin UnixOSProcessPlugin )! Item was changed: ----- Method: CogFamilyCocoaIOSConfig>>setExtraTargetProperties: (in category 'settings') ----- setExtraTargetProperties: maker | plist | maker addFrameworks: self frameworks. " generated and add Info.plist file " plist := self plistFile. (FileStream forceNewFileNamed: (maker buildDir / 'Info.plist') fullName) nextPutAll: plist; close. maker addProperty: 'MACOSX_BUNDLE_INFO_PLIST' value: '${buildDir}/Info.plist'. (FileStream forceNewFileNamed: (maker buildDir / self prefixHeaderFileName) fullName ) nextPutAll: self precompiledHeaders; close. maker addXCodeProperty: 'GCC_PREFIX_HEADER' value: '${buildDir}/', self prefixHeaderFileName. maker + addXCodeProperty: 'PER_ARCH_CFLAGS_i386' value: '-DLSB_FIRST -mfpmath=sse -finline-functions -fno-gcse -mtune=prescott -march=pentium-m -falign-functions=16'. - addXCodeProperty: 'PER_ARCH_CFLAGS_i386' value: '-DLSB_FIRST -mfpmath=sse -finline-functions -fno-cse-follow-jumps -fno-gcse -mtune=prescott -march=pentium-m -falign-functions=16'. "maker addXCodeProperty: 'GCC_VERSION' value: '4.3'." maker cmd: 'set_target_properties' params: self executableName, ' PROPERTIES COMPILE_FLAGS "-include \"', (self buildDir / self prefixHeaderFileName) fullName, '\""'. " maker set: 'CMAKE_C_COMPILER' to: '/usr/bin/gcc-4.2'. maker set: 'CMAKE_CXX_COMPILER' to: '/usr/bin/g++-4.2'. " maker set: 'EXECUTABLE_OUTPUT_PATH' toString: self outputDir fullName. maker set: 'RUNTIME_OUTPUT_DIRECTORY' toString: self outputDir fullName.! Item was changed: ----- Method: CogFamilyUnixConfig>>buildScript (in category 'build script') ----- buildScript "answer the build script for building everything" ^ + '#!!/usr/bin/env bash - '#!!bash if [ !! -e vmVersionInfo.h ]; then + ../scripts/extract-commit-info.sh - ../codegen-scripts/extract-commit-info.sh fi cmake . make '! Item was removed: - ----- Method: CogFamilyUnixConfig>>compilerFlags (in category 'compiler flags') ----- - compilerFlags - ^ self subclassResponsibility! Item was changed: ----- Method: CogFamilyUnixConfig>>configureSoundPlugin: (in category 'plugin extra rules') ----- configureSoundPlugin: maker "extra rules for SoundPlugin" + maker addPlatformSources: #( 'sqUnixSound'). + maker addExternalLibraries: #( 'asound' )! - maker addPlatformSources: #( 'sqUnixSound')! Item was added: + ----- Method: CogFamilyUnixConfig>>externalModulesDir (in category 'accessing') ----- + externalModulesDir + "answer the location in VM bundle, where plugins and rest of dynamic libs will be copied, + " + ^ '${outputDir}'! Item was added: + ----- Method: CogFamilyUnixConfig>>setupDirectories: (in category 'utils') ----- + setupDirectories: gen + super setupDirectories: gen. + gen set: #externalModulesDir toString: self externalModulesDir.! Item was changed: ----- Method: CogFamilyWindowsConfig>>buildScript (in category 'build script') ----- buildScript "answer the build script for building everything" ^ + '#!!/usr/bin/env bash - '#!!bash if [ !! -e vmVersionInfo.h ]; then + ../scripts/extract-commit-info.sh - ../codegen-scripts/extract-commit-info.sh fi cmake -G "MSYS Makefiles" . make '! Item was changed: ----- Method: CogFamilyWindowsConfig>>commonCompilerFlags (in category 'compiler flags') ----- commonCompilerFlags "omit -ggdb2 to prevent generating debug info" "Some flags explanation: STACK_ALIGN_BYTES=16 is needed in mingw and FFI (and I suppose on other modules too). DALLOCA_LIES_SO_USE_GETSP=0 Some compilers return the stack address+4 on alloca function, then FFI module needs to adjust that. It is NOT the case of mingw. For more information see this thread: http://forum.world.st/There-are-something-fishy-with-FFI-plugin-td4584226.h… " + ^ { + '-march=pentium4'. + '-mwindows'. + '-D_MT'. + '-msse2'. + '-mthreads'. + '-mwin32'. + '-mno-rtd'. + '-mms-bitfields'. + '-mno-accumulate-outgoing-args ', self winVer. + '-DWIN32'. + '-DWIN32_FILE_SUPPORT'. + '-DNO_ISNAN'. + '-DNO_SERVICE'. + '-DNO_STD_FILE_SUPPORT'. + '-DLSB_FIRST'. + '-DVM_NAME="', self executableName,'"'. + '-DX86 '. + '-DSTACK_ALIGN_BYTES=16'. + '-DALLOCA_LIES_SO_USE_GETSP=0'. + '-DENABLE_FAST_BLT ' }! - ^ '-march=pentium4 -mwindows -D_MT -msse2 -mthreads -mwin32 -mno-rtd -mms-bitfields -mno-accumulate-outgoing-args ', self winVer , - ' -DWIN32 -DWIN32_FILE_SUPPORT -DNO_ISNAN -DNO_SERVICE -DNO_STD_FILE_SUPPORT ', - '-DLSB_FIRST -DVM_NAME="', self executableName,'" -DX86 ', - '-DSTACK_ALIGN_BYTES=16 -DALLOCA_LIES_SO_USE_GETSP=0 -DENABLE_FAST_BLT '! Item was added: + ----- Method: CogFamilyWindowsConfig>>configureSoundPlugin: (in category 'plugin extra rules') ----- + configureSoundPlugin: maker + "extra rules for SoundPlugin" + + maker addPlatformSources: #( 'sqWin32Sound' )! Item was changed: ----- Method: CogFreeBSDConfig>>compilerFlagsDebug (in category 'as yet unclassified') ----- compilerFlagsDebug + ^ { + '-g3'. + '-O0'. + '-msse2'. + '-DITIMER_HEARTBEAT=1'. + '-DNO_VM_PROFILE=1'. + '-DDEBUGVM=1'. + '-DNOEXECINFO' }! - ^ '-g3 -O0 -msse2 -DITIMER_HEARTBEAT=1 - -DNO_VM_PROFILE=1 -DDEBUGVM=1 -DNOEXECINFO'! Item was changed: ----- Method: CogFreeBSDConfig>>compilerFlagsRelease (in category 'as yet unclassified') ----- compilerFlagsRelease + ^ { + '-g0'. + '-O2'. + '-msse2'. + '-DNDEBUG'. + '-DITIMER_HEARTBEAT=1'. + '-DNO_VM_PROFILE=1'. + '-DDEBUGVM=0'. + '-DNOEXECINFO' } - ^ '-g0 -O2 -msse2 -DNDEBUG -DITIMER_HEARTBEAT=1 - -DNO_VM_PROFILE=1 -DDEBUGVM=0 -DNOEXECINFO' ! Item was added: + Object subclass: #CogMTBuilder + instanceVariableNames: '' + classVariableNames: '' + poolDictionaries: '' + category: 'CMakeVMMaker-Builder'! Item was added: + ----- Method: CogMTBuilder class>>build (in category 'building') ----- + build + " self build " + "build for platform we're currently running on" + | platform | + + platform := Smalltalk os platformName. + + platform = 'Win32' ifTrue: [ ^ self buildWin32 ]. + platform = 'Mac OS' ifTrue: [ ^ self buildMacOSX32 ]. + platform = 'unix' ifTrue: [ ^ self buildUnix32 ].! Item was added: + ----- Method: CogMTBuilder class>>buildMacOSX32 (in category 'building') ----- + buildMacOSX32 + ^ self new buildMacOSX32! Item was added: + ----- Method: CogMTBuilder class>>buildOnJenkins: (in category 'building') ----- + buildOnJenkins: aPlatformName + "entry point for jenkins build jobs. + currently we use following names: + win + mac + linux + + " + + aPlatformName = 'win' ifTrue: [ ^ self buildWin32 ]. + aPlatformName = 'mac' ifTrue: [ ^ self buildMacOSX32 ]. + aPlatformName = 'linux' ifTrue: [ ^ self buildUnix32 ]. + + self error: 'no suitable platform'! Item was added: + ----- Method: CogMTBuilder class>>buildUnix32 (in category 'building') ----- + buildUnix32 + ^ self new buildUnix32! Item was added: + ----- Method: CogMTBuilder class>>buildWin32 (in category 'building') ----- + buildWin32 + ^ self new buildWin32! Item was added: + ----- Method: CogMTBuilder>>buildMacOSX32 (in category 'building') ----- + buildMacOSX32 + + CogMTCocoaIOSConfig new + generateForRelease; + "generateForDebug;" + addExternalPlugins: #( FT2Plugin ); + addInternalPlugins: #( UnixOSProcessPlugin ); + generateSources; generate. + ! Item was added: + ----- Method: CogMTBuilder>>buildUnix32 (in category 'building') ----- + buildUnix32 + + CogMTUnixConfig new + addExternalPlugins: #( FT2Plugin SqueakSSLPlugin ); + addInternalPlugins: #( UnixOSProcessPlugin ); + generateSources; generate. + ! Item was added: + ----- Method: CogMTBuilder>>buildWin32 (in category 'building') ----- + buildWin32 + + CogMTWindowsConfig new + + addExternalPlugins: #( FT2Plugin SqueakSSLPlugin ); + addInternalPlugins: #( Win32OSProcessPlugin ); + + generateSources; generate. + ! Item was added: + ----- Method: CogMTBuilder>>initialize (in category 'initialization') ----- + initialize + + "a stupid temporary hack to workaround initialization problems" + + Cogit allSubclassesDo: [ :each | each initializeWithOptions: (VMMaker new instVarNamed: 'optionsDictionary') ]! Item was changed: ----- Method: CogMTFreeBSDConfig>>commonCompilerFlags (in category 'compiler flags') ----- commonCompilerFlags "Common compiler flags LSB_FIRST=1 means that target platform is little endian. set it to 0 for big-endian platforms " + ^ { + '-DLSB_FIRST=1'. + '-DUSE_GLOBAL_STRUCT=0'. + '-DCOGMTVM=1' }! - ^ ' -DLSB_FIRST=1 -DUSE_GLOBAL_STRUCT=0 -DCOGMTVM=1' - ! Item was changed: ----- Method: CogMTMacOSConfig>>commonCompilerFlags (in category 'compiler flags') ----- commonCompilerFlags "Common compiler flags" + ^ { + '-fmessage-length=0'. + '-Wno-trigraphs'. + '-fpascal-strings'. + '-fasm-blocks'. + '-DCOGMTVM=1'. + '-DUSE_GLOBAL_STRUCT=0'. + '-DTARGET_API_MAC_CARBON'. + '-DHAVE_SYS_TIME_H'. + '-mmacosx-version-min=10.5' }! - ^ ' -fmessage-length=0 -Wno-trigraphs -fpascal-strings -fasm-blocks -DCOGMTVM=1 -DUSE_GLOBAL_STRUCT=0 -DTARGET_API_MAC_CARBON -DHAVE_SYS_TIME_H -mmacosx-version-min=10.5' - ! Item was changed: ----- Method: CogMTUnixConfig>>commonCompilerFlags (in category 'compiler flags') ----- commonCompilerFlags "Common compiler flags LSB_FIRST=1 means that target platform is little endian. set it to 0 for big-endian platforms " + ^ { + '-DLSB_FIRST=1'. + '-DUSE_GLOBAL_STRUCT=0'. + '-DCOGMTVM=1'. + '-m32' }! - ^ ' -DLSB_FIRST=1 -DUSE_GLOBAL_STRUCT=0 -DCOGMTVM=1 -m32' - ! Item was changed: ----- Method: CogMacOSConfig>>commonCompilerFlags (in category 'compiler flags') ----- commonCompilerFlags "Common compiler flags" + ^ { + '-fmessage-length=0'. + '-Wno-trigraphs'. + '-fpascal-strings'. + '-fasm-blocks'. + '-DCOGMTVM=0'. + '-DUSE_GLOBAL_STRUCT=0'. + '-DTARGET_API_MAC_CARBON'. + '-DBUILD_FOR_OSX'. + '-DHAVE_SYS_TIME_H'. + '-mmacosx-version-min=10.5' } + ! - ^ ' -fmessage-length=0 -Wno-trigraphs -fpascal-strings -fasm-blocks -DCOGMTVM=0 -DUSE_GLOBAL_STRUCT=0 -DTARGET_API_MAC_CARBON -DBUILD_FOR_OSX -DHAVE_SYS_TIME_H -mmacosx-version-min=10.5' - - " ^ '-arch i386 -fmessage-length=0 -Wno-trigraphs -fpascal-strings -fasm-blocks -DCOGMTVM=0 -DUSE_GLOBAL_STRUCT=0 -DTARGET_API_MAC_CARBON -DHAVE_SYS_TIME_H -mmacosx-version-min=10.5'"! Item was removed: - ----- Method: CogMacOSConfig>>compilerFlags (in category 'compiler flags') ----- - compilerFlags - "depends on config ..." - ^ self compilerFlagsRelease! Item was changed: ----- Method: CogMacOSConfig>>compilerFlagsDebug (in category 'compiler flags') ----- compilerFlagsDebug + ^ { + '-g3'. + '-O0'. + '-Wmissing-prototypes'. + '-Wmissing-braces'. + '-Wparentheses'. + '-Wunused-function'. + '-Wunused-label'. + '-Wunused-parameter'. + '-Wunused-variable'. + '-Wunused-value'. + '-Wsign-compare'. + '-DDEBUGVM=1'. + '-DEXTERNALPRIMSDEBUG=1'. + '-gdwarf-2' }! - ^ self commonCompilerFlags , ' -g3 -O0 -Wmissing-prototypes -Wmissing-braces -Wparentheses -Wunused-function -Wunused-label -Wunused-parameter -Wunused-variable -Wunused-value -Wsign-compare -DDEBUGVM=1 -DEXTERNALPRIMSDEBUG=1 -gdwarf-2 '! Item was changed: ----- Method: CogMacOSConfig>>compilerFlagsRelease (in category 'compiler flags') ----- compilerFlagsRelease " -mdynamic-no-pic " + ^ { + '-gdwarf-2'. + '-O3'. + '-funroll-loops'. + '-ftree-vectorize'. + '-msse3'. + '-DDEBUGVM=0'. + '-DNDEBUG'. + '-Wunused-value'. + '-Wuninitialized'. + '-falign-functions=16'. + '-fno-gcse'. + '-mtune=prescott'. + '-march=pentium-m'. + '-mfpmath=sse'. + '-finline-functions'. + '-Wall'. + '-DUSE_INLINE_MEMORY_ACCESSORS' }! - ^ self commonCompilerFlags , ' -gdwarf-2 -O3 -funroll-loops -ftree-vectorize -msse3 -DDEBUGVM=0 -DNDEBUG -Wunused-value -Wuninitialized -falign-functions=16 -fno-gcse -mtune=prescott -march=pentium-m -mfpmath=sse -finline-functions -Wall -DUSE_INLINE_MEMORY_ACCESSORS'! Item was changed: ----- Method: CogMacOSDebugConfig>>compilerFlags (in category 'compiler flags') ----- compilerFlags + ^ String streamContents: [ :stream | + self commonCompilerFlags asStringOn: stream delimiter: ' '. + self compilerFlagsDebug asStringOn: stream delimiter: ' ' ]! - - ^ self compilerFlagsDebug! Item was changed: ----- Method: CogOnDebian64Config>>commonCompilerFlags (in category 'accessing') ----- commonCompilerFlags + ^ super commonCompilerFlags , { '-L/usr/lib32' }! - ^ super commonCompilerFlags , ' -L/usr/lib32'! Item was changed: ----- Method: CogUnixConfig>>commonCompilerFlags (in category 'compiler flags') ----- commonCompilerFlags "Common compiler flags LSB_FIRST=1 means that target platform is little endian. set it to 0 for big-endian platforms " + ^ { + '-DLSB_FIRST=1'. + '-DUSE_GLOBAL_STRUCT=0'. + '-DCOGMTVM=0'. + '-m32'. + '-DENABLE_FAST_BLT ' } - ^ ' -DLSB_FIRST=1 -DUSE_GLOBAL_STRUCT=0 -DCOGMTVM=0 -m32 -DENABLE_FAST_BLT ' ! Item was removed: - ----- Method: CogUnixConfig>>compilerFlags (in category 'compiler flags') ----- - compilerFlags - "depends on config ..." - ^ self commonCompilerFlags, ' ' ,self compilerFlagsRelease! Item was changed: ----- Method: CogUnixConfig>>compilerFlagsDebug (in category 'compiler flags') ----- compilerFlagsDebug + ^ { + '-g3'. + '-O0'. + '-msse2'. + '-D_GNU_SOURCE'. + '-DITIMER_HEARTBEAT=1'. + '-DNO_VM_PROFILE=1'. + '-DDEBUGVM=1' }! - ^ '-g3 -O0 -msse2 -D_GNU_SOURCE -DITIMER_HEARTBEAT=1 -DNO_VM_PROFILE=1 -DDEBUGVM=1' - - ! Item was changed: ----- Method: CogUnixConfig>>compilerFlagsRelease (in category 'compiler flags') ----- compilerFlagsRelease " THIS FLAGS ARE CRASHING COMPILER -fschedule-insns2 -fschedule-insns THIS FLAGS ARE CRASHING VM -ftree-pre -fcaller-saves THIS FLAGS ARE WORKING -O1 -fthread-jumps -falign-functions -falign-jumps -falign-loops -falign-labels -fcrossjumping -fcse-follow-jumps -fcse-skip-blocks -fdelete-null-pointer-checks -fdevirtualize -fexpensive-optimizations -fgcse -fgcse-lm -finline-small-functions -findirect-inlining -fipa-sra -foptimize-sibling-calls -fpeephole2 -fregmove -freorder-blocks -frerun-cse-after-loop -freorder-functions -fsched-interblock -fsched-spec -fstrict-aliasing -fstrict-overflow -ftree-switch-conversion -ftree-vrp THIS IS LIKE: -O2 -fno-tree-pre -fno-caller-saves " + ^ { + '-g0'. + '-O2'. + '-fno-tree-pre'. + '-fno-caller-saves'. + '-msse2'. + '-D_GNU_SOURCE'. + '-DNDEBUG'. + '-DITIMER_HEARTBEAT=1'. + '-DNO_VM_PROFILE=1'. + '-DDEBUGVM=0' }! - ^ '-g0 -O2 -fno-tree-pre -fno-caller-saves -msse2 -D_GNU_SOURCE -DNDEBUG -DITIMER_HEARTBEAT=1 -DNO_VM_PROFILE=1 -DDEBUGVM=0'! Item was changed: ----- Method: CogUnixDebugConfig>>compilerFlags (in category 'as yet unclassified') ----- compilerFlags + ^ String streamContents: [ :stream | + self commonCompilerFlags asStringOn: stream delimiter: ' '. + self compilerFlagsDebug asStringOn: stream delimiter: ' ' ]! - - ^ self commonCompilerFlags, ' ' ,self compilerFlagsDebug! Item was removed: - ----- Method: CogWindowsConfig>>compilerFlags (in category 'compiler flags') ----- - compilerFlags - "depends on config ..." - ^ self commonCompilerFlags, ' ' , self compilerFlagsRelease! Item was changed: ----- Method: CogWindowsConfig>>compilerFlagsDebug (in category 'plugins') ----- compilerFlagsDebug "Define NDEBUG for production to exclude asserts " + ^ { + '-g3'. + '-O0'. + '-march=pentium4'. + '-momit-leaf-frame-pointer'. + '-maccumulate-outgoing-args'. + '-funroll-loops'. + '-DDEBUGVM=1' }! - ^ '-g3 -O0 -march=pentium4 -momit-leaf-frame-pointer -maccumulate-outgoing-args -funroll-loops -DDEBUGVM=1'! Item was changed: ----- Method: CogWindowsConfig>>compilerFlagsRelease (in category 'compiler flags') ----- compilerFlagsRelease "Define NDEBUG for production to exclude asserts " + ^ { + '-g0'. + '-O2'. + '-march=pentium4'. + '-momit-leaf-frame-pointer'. + '-maccumulate-outgoing-args'. + '-funroll-loops'. + '-DNDEBUG -DDEBUGVM=0'}! - ^ '-g0 -O2 -march=pentium4 -momit-leaf-frame-pointer -maccumulate-outgoing-args -funroll-loops ', - '-DNDEBUG -DDEBUGVM=0'! Item was changed: ----- Method: CogWindowsConfig>>defaultInternalPlugins (in category 'plugins') ----- defaultInternalPlugins ^ #( ADPCMCodecPlugin AsynchFilePlugin B3DAcceleratorPlugin BalloonEnginePlugin "B2DPlugin" BitBltSimulation "BitBltPlugin" BMPReadWriterPlugin CroquetPlugin DeflatePlugin "ZipPlugin" DropPlugin DSAPlugin "DSAPrims" FFTPlugin FilePlugin FloatArrayPlugin FloatMathPlugin HostWindowPlugin IA32ABIPlugin "IA32ABI" JoystickTabletPlugin JPEGReaderPlugin JPEGReadWriter2Plugin KlattSynthesizerPlugin "Klatt" LargeIntegersPlugin "LargeIntegers" LocalePlugin Matrix2x3Plugin MIDIPlugin MiscPrimitivePlugin Mpeg3Plugin RePlugin SecurityPlugin SerialPlugin SocketPlugin SoundCodecPlugin "SoundCodecPrims" SoundGenerationPlugin + SoundPlugin StarSqueakPlugin SurfacePlugin UUIDPlugin )! Item was changed: ----- Method: CogWindowsDebugConfig>>compilerFlags (in category 'as yet unclassified') ----- compilerFlags + ^ String streamContents: [ :stream | + self commonCompilerFlags asStringOn: stream delimiter: ' '. + self compilerFlagsDebug asStringOn: stream delimiter: ' ' ]! - "depends on config ..." - ^ self commonCompilerFlags, ' ' , self compilerFlagsDebug! Item was changed: ----- Method: MacOSConfig>>buildScript (in category 'build script') ----- buildScript "answer the build script for building everything" ^ + '#!!/usr/bin/env bash - '#!!bash if [ !! -e vmVersionInfo.h ]; then + ../scripts/extract-commit-info.sh - ../codegen-scripts/extract-commit-info.sh fi cmake . make make install '! Item was added: + ----- Method: StackCocoaIOSConfig>>commonCompilerFlags (in category 'settings') ----- + commonCompilerFlags + ^ super commonCompilerFlags! Item was removed: - ----- Method: StackCocoaIOSConfig>>compilerFlagsRelease (in category 'settings') ----- - compilerFlagsRelease - ^#( - '-g0' '-O0' '-DNDEBUG' '-DDEBUGVM=0' - '-fomit-frame-pointer' - '-fdefer-pop -fdelayed-branch -fguess-branch-probability -fcprop-registers -fif-conversion -fif-conversion2 -ftree-ccp -ftree-dce -ftree-dominator-opts -ftree-dse -ftree-ter -ftree-lrs -ftree-sra -ftree-copyrename -ftree-fre -ftree-ch -funit-at-a-time -fmerge-constants' - '-fthread-jumps -fcrossjumping -foptimize-sibling-calls -fcse-follow-jumps -fcse-skip-blocks -fgcse -fgcse-lm -fexpensive-optimizations -frerun-cse-after-loop -fcaller-saves -fpeephole2 -fschedule-insns -fschedule-insns2 -fsched-interblock -fsched-spec -fregmove -fstrict-aliasing -fstrict-overflow -fdelete-null-pointer-checks -freorder-blocks -freorder-functions -falign-functions -falign-jumps -falign-loops -falign-labels -ftree-vrp -ftree-pre' - '-finline-functions -funswitch-loops -fgcse-after-reload')! Item was added: + ----- Method: StackCocoaIOSConfig>>setGlobalOptions: (in category 'settings') ----- + setGlobalOptions: maker + super setGlobalOptions: maker. + maker set: 'CMAKE_C_COMPILER' to: 'clang'. + maker set: 'CMAKE_CXX_COMPILER' to: 'clang++'.! Item was added: + StackUnixConfig subclass: #StackCrossRaspbianConfig + instanceVariableNames: '' + classVariableNames: '' + poolDictionaries: '' + category: 'CMakeVMMaker-Unix'! + + !StackCrossRaspbianConfig commentStamp: '<historical>' prior: 0! + This is a concrete class which generates a StackVM for Raspbian (debian on RaspberryPi). But in cross compilation usage. + + + Usage: + StackCrossRaspbianConfig generateWithSources + + + Fore more information, check the class comments of all the superclasses. + ! Item was added: + ----- Method: StackCrossRaspbianConfig>>addDriver:sources:generator: (in category 'as yet unclassified') ----- + addDriver: name sources: aSources generator: cmakeGen + + | cfg srcs | + + srcs := aSources inject: '' into: [:res :each | res , ' "', each, '"' ]. + cfg := cmakeGen + captureOutputDuring: [ + cmakeGen printHeader; + project: name; + include: '../directories.cmake'; + + message: 'Adding module: ', name; + + addDefinitions: self compilerFlags; + addDefinitions: '-fPIC -DPIC'; + set: #sources to: srcs; + cmd: 'add_library' params: name, ' SHARED ${sources}'; + linkDirectories: '${CMAKE_FIND_ROOT_PATH}/usr/lib/arm-linux-gnueabihf/'; + includeDirectories: '${CMAKE_FIND_ROOT_PATH}/usr/include/'; + includeDirectories: '${crossDir}/plugins/FilePlugin'; + includeDirectories: '${targetPlatform}/plugins/B3DAcceleratorPlugin'; + includeDirectories: '${crossDir}/plugins/B3DAcceleratorPlugin'; + set: 'LIBRARY_OUTPUT_PATH' toString: self outputDir; + cmd: 'set_target_properties' params: name , ' PROPERTIES PREFIX "" SUFFIX "" + LINK_FLAGS "', self linkFlags , '"' + ]. + + + self write: cfg toFile: ((self buildDir / name) assureExistence / cmakeGen outputFileName) fullName. + cmakeGen addSubdirectory: name. + ! Item was added: + ----- Method: StackCrossRaspbianConfig>>addDriver:sources:generator:externalLibs: (in category 'as yet unclassified') ----- + addDriver: name sources: aSources generator: cmakeGen externalLibs: extLibs + + | cfg srcs | + + srcs := aSources inject: '' into: [:res :each | res , ' "', each, '"' ]. + cfg := cmakeGen + captureOutputDuring: [ + cmakeGen printHeader; + project: name; + include: '../directories.cmake'; + + message: 'Adding module: ', name; + + addDefinitions: self compilerFlags; + addDefinitions: '-fPIC -DPIC'; + set: #sources to: srcs; + + cmd: 'add_library' params: name, ' SHARED ${sources}'; + includeDirectories: '${CMAKE_FIND_ROOT_PATH}/usr/include'; + includeDirectories: '${crossDir}/plugins/FilePlugin'; + includeDirectories: '${targetPlatform}/plugins/B3DAcceleratorPlugin'; + includeDirectories: '${crossDir}/plugins/B3DAcceleratorPlugin'; + set: 'LIBRARY_OUTPUT_PATH' toString: self outputDir fullName; + linkDirectories: '${CMAKE_FIND_ROOT_PATH}/usr/lib/arm-linux-gnueabihf/'; + + addExternalLibraries: extLibs; + + cmd: 'target_link_libraries' params: name , ' ${LINKLIBS}'; + cmd: 'set_target_properties' params: name , ' PROPERTIES PREFIX "" SUFFIX "" ' + ]. + + (self buildDir / name) ensureDirectory. + self write: cfg toFile: name , '/', cmakeGen outputFileName. + cmakeGen addSubdirectory: name. + ! Item was added: + ----- Method: StackCrossRaspbianConfig>>commonCompilerFlags (in category 'as yet unclassified') ----- + commonCompilerFlags + + "Common compiler flags + + + LSB_FIRST=1 means that target platform is little endian. + set it to 0 for big-endian platforms + + " + + ^ { + '-DLSB_FIRST=1'. + '-DUSE_GLOBAL_STRUCT=0'. + '-DCOGMTVM=0' } + ! Item was added: + ----- Method: StackCrossRaspbianConfig>>compilerFlagsDebug (in category 'as yet unclassified') ----- + compilerFlagsDebug + + ^ { + '-g3'. + '-O0'. + '-D_GNU_SOURCE'. + '-DITIMER_HEARTBEAT=1'. + '-DNO_VM_PROFILE=1'. + '-DDEBUGVM=1' }! Item was added: + ----- Method: StackCrossRaspbianConfig>>compilerFlagsRelease (in category 'as yet unclassified') ----- + compilerFlagsRelease + " + THIS FLAGS ARE CRASHING COMPILER + -fschedule-insns2 + -fschedule-insns + + THIS FLAGS ARE CRASHING VM + -ftree-pre + -fcaller-saves + + THIS FLAGS ARE WORKING + -O1 -fthread-jumps -falign-functions -falign-jumps -falign-loops -falign-labels -fcrossjumping -fcse-follow-jumps -fcse-skip-blocks -fdelete-null-pointer-checks -fdevirtualize -fexpensive-optimizations -fgcse -fgcse-lm -finline-small-functions -findirect-inlining -fipa-sra -foptimize-sibling-calls -fpeephole2 -fregmove -freorder-blocks -frerun-cse-after-loop -freorder-functions -fsched-interblock -fsched-spec -fstrict-aliasing -fstrict-overflow -ftree-switch-conversion -ftree-vrp + + THIS IS LIKE: -O2 -fno-tree-pre -fno-caller-saves + + " + + ^ { + '-g0'. + '-O2'. + '-fno-tree-pre'. + '-fno-caller-saves'. + '-D_GNU_SOURCE'. + '-DNDEBUG'. + '-DITIMER_HEARTBEAT=1'. + '-DNO_VM_PROFILE=1'. + '-DDEBUGVM=0' }! Item was added: + ----- Method: StackCrossRaspbianConfig>>configH (in category 'as yet unclassified') ----- + configH + " right now its like that " + ^ ' + #ifndef __sq_config_h + #define __sq_config_h + + /* explicit image width */ + + #define HAVE_INTERP_H 1 + + /* package options */ + + #define USE_X11 1 + #define USE_X11_GLX 1 + /* #undef USE_QUARTZ */ + /* #undef USE_QUARTZ_CGL */ + /* #undef USE_RFB */ + + /* libraries */ + + /* #undef HAVE_LIBX11 */ + /* #undef HAVE_LIBXEXT */ + #define HAVE_LIBDL 1 + /* #undef HAVE_DYLD */ + /* #undef HAVE_LIBFFI */ + /* #undef HAVE_ICONV */ + + /* #undef USE_AUDIO_NONE */ + /* #undef USE_AUDIO_SUN */ + /* #undef USE_AUDIO_NAS */ + /* #undef USE_AUDIO_OSS */ + /* #undef USE_AUDIO_MACOSX */ + /* #undef OSS_DEVICE */ + + /* header files */ + + #define HAVE_UNISTD_H 1 + /* #undef NEED_GETHOSTNAME_P */ + + #define HAVE_DIRENT_H 1 + /* #undef HAVE_SYS_NDIR_H */ + /* #undef HAVE_SYS_DIR_H */ + /* #undef HAVE_NDIR_H */ + #define HAVE_DLFCN_H 1 + #define HAVE_ICONV_H 1 + + #define HAVE_SYS_TIME_H 1 + #define TIME_WITH_SYS_TIME 1 + + /* #undef HAVE_SYS_FILIO_H */ + + /* #undef HAVE_SYS_AUDIOIO_H */ + /* #undef HAVE_SUN_AUDIOIO_H */ + + #define HAVE_PTY_H 1 + /* #undef HAVE_UTIL_H */ + /* #undef HAVE_LIBUTIL_H */ + #define HAVE_STROPTS_H 1 + + #define HAVE_GL_GL_H 1 + /* #undef HAVE_OPENGL_GL_H */ + + /* #undef NEED_SUNOS_H */ + + /* system calls/library functions */ + + #define AT_EXIT atexit + + #define HAVE_TZSET 1 + + #define HAVE_OPENPTY 1 + /* #undef HAVE_UNIX98_PTYS */ + + #define HAVE_SNPRINTF 1 + /* #undef HAVE___SNPRINTF */ + + #define HAVE_MMAP 1 + + /* #undef HAVE_DYLD */ + + #define HAVE_LANGINFO_CODESET 1 + + #define HAVE_ALLOCA 1 + #define HAVE_ALLOCA_H 1 + + #define HAVE_UNSETENV 1 + + #define HAVE_NANOSLEEP 1 + + /* widths of primitive types */ + + #define SIZEOF_INT 4 + #define SIZEOF_LONG 4 + #define SIZEOF_LONG_LONG 8 + #define SIZEOF_VOID_P 4 + + /* structures */ + + #define HAVE_TM_GMTOFF 1 + #define HAVE_TIMEZONE 1 + + /* typedefs */ + + /* #undef size_t */ + /* #undef socklen_t */ + + #define ENABLE_FAST_BLT 1 + #define squeakInt64 long long + + /* architecture */ + + #define OS_TYPE "unix" + #define __arm__ 1 + #define __ARM_ARCH_6__ 1 + #define VM_HOST "arm-pc-linux-gnu" + #define VM_HOST_CPU "arm" + /* #undef VM_HOST_VENDOR */ + #define VM_HOST_OS "linux-gnu" + #define VM_BUILD_STRING "Unix built on "__DATE__ " "__TIME__" Compiler: "__VERSION__ + + /* #undef WORDS_BIGENDIAN */ + /* #undef DOUBLE_WORD_ALIGNMENT */ + + /* damage containment */ + + /* #undef DARWIN */ + + #ifdef NEED_SUNOS_H + # include "sunos.h" + #endif + + /* other configured variables */ + + #define SQ_VERSION "3.9a-7024" + #define VM_VERSION "3.9-7" + #define VM_MODULE_PREFIX "" + /* #undef VM_DLSYM_PREFIX */ + #define VM_X11DIR "" + + /* avoid dependencies on glibc2.3 */ + + #define HAVE_FEATURES_H 1 + + #if defined(HAVE_FEATURES_H) + # include "glibc.h" + #endif + + + /* used by UUID plugin: */ + + #define HAVE_UUID_H 1 + + #endif /* __sq_config_h */ + + '! Item was added: + ----- Method: StackCrossRaspbianConfig>>configureB3DAcceleratorPlugin: (in category 'as yet unclassified') ----- + configureB3DAcceleratorPlugin: maker + "extra rules for B3DAcceleratorPlugin" + + super configureB3DAcceleratorPlugin: maker. + maker includeDirectories: '${CMAKE_FIND_ROOT_PATH}/usr/include/'.! Item was added: + ----- Method: StackCrossRaspbianConfig>>configureBitBltSimulation: (in category 'as yet unclassified') ----- + configureBitBltSimulation: maker + "extra rules for BitBltSimulation" + + maker includeDirectories: '${pluginCross}'. + + maker addCrossSources: #( + 'BitBltGeneric.c' + 'BitBltDispatch.c' + ). + ! Item was added: + ----- Method: StackCrossRaspbianConfig>>defaultExternalPlugins (in category 'as yet unclassified') ----- + defaultExternalPlugins + ^ #( + B3DAcceleratorPlugin + JPEGReaderPlugin + JPEGReadWriter2Plugin + RePlugin + InternetConfigPlugin + )! Item was added: + ----- Method: StackCrossRaspbianConfig>>defaultInternalPlugins (in category 'as yet unclassified') ----- + defaultInternalPlugins + " took from unixbuild/bld/plugins.int" + ^ #( + ADPCMCodecPlugin + AsynchFilePlugin + BalloonEnginePlugin "B2DPlugin" + BitBltSimulation "BitBltPlugin" + BMPReadWriterPlugin + CroquetPlugin + DeflatePlugin "ZipPlugin" + DropPlugin + DSAPlugin "DSAPrims" + FFTPlugin + FileCopyPlugin + FilePlugin + FloatArrayPlugin + FloatMathPlugin + JoystickTabletPlugin + KlattSynthesizerPlugin "Klatt" + LargeIntegersPlugin "LargeIntegers" + Matrix2x3Plugin + MIDIPlugin + MiscPrimitivePlugin + Mpeg3Plugin + SecurityPlugin + SerialPlugin + SocketPlugin + SoundCodecPlugin "SoundCodecPrims" + SoundGenerationPlugin + "SoundPlugin" + StarSqueakPlugin + SurfacePlugin + LocalePlugin + )! Item was added: + ----- Method: StackCrossRaspbianConfig>>executableName (in category 'as yet unclassified') ----- + executableName + ^ 'PharoS'! Item was added: + ----- Method: StackCrossRaspbianConfig>>extraPluginSettings: (in category 'as yet unclassified') ----- + extraPluginSettings: maker + + maker isExternal ifTrue: [ + "copy lib to results dir " + maker set: 'LIBRARY_OUTPUT_PATH' to: '${outputDir}' + ]. + + maker set: #linkFlags toString: '${linkFlags}' + ! Item was added: + ----- Method: StackCrossRaspbianConfig>>linkFlags (in category 'as yet unclassified') ----- + linkFlags + ^ '-lSM -lICE -ldl -lGL -lpthread -lm -lnsl -lX11'! Item was added: + ----- Method: StackCrossRaspbianConfig>>preferredIncludes (in category 'as yet unclassified') ----- + preferredIncludes + ^ #('${CMAKE_FIND_ROOT_PATH}/usr/include/' + '${targetPlatform}/plugins/B3DAcceleratorPlugin') + ! Item was added: + ----- Method: StackCrossRaspbianConfig>>setExtraTargetProperties: (in category 'as yet unclassified') ----- + setExtraTargetProperties: maker + + "maker setTargetProperties: 'LINK_FLAGS ""'." + + maker puts: 'set_source_files_properties( ${srcVMDir}/cogit.c PROPERTIES + COMPILE_FLAGS "-O1 -fno-omit-frame-pointer -momit-leaf-frame-pointer")'. + + + maker + cmd: 'set_source_files_properties' + params: ' ${targetPlatform}/vm/sqUnixHeartbeat.c PROPERTIES + COMPILE_FLAGS "-O1 -fno-omit-frame-pointer"'. + + maker linkDirectories: '${CMAKE_FIND_ROOT_PATH}/usr/lib/arm-linux-gnueabihf/'. + + maker addExternalLibraries: + #( + 'm' "math lib" + 'dl' "dynamic loader" + 'pthread' "posix threads" + ). + + maker set: 'EXECUTABLE_OUTPUT_PATH' toString: self outputDir fullName. + self addVMDrivers: maker.! Item was added: + StackCrossRaspbianConfig subclass: #StackCrossRaspbianFastBltConfig + instanceVariableNames: '' + classVariableNames: '' + poolDictionaries: '' + category: 'CMakeVMMaker-Unix'! + + !StackCrossRaspbianFastBltConfig commentStamp: '<historical>' prior: 0! + This is a concrete class which generates a StackVM for Raspbian (debian on RaspberryPi). But in cross compilation usage. + + + Usage: + StackCrossRaspbianFastBltConfig generateWithSources + + + Fore more information, check the class comments of all the superclasses. + ! Item was added: + ----- Method: StackCrossRaspbianFastBltConfig>>commonCompilerFlags (in category 'as yet unclassified') ----- + commonCompilerFlags + ^ super commonCompilerFlags, { '-DENABLE_FAST_BLT' }.! Item was added: + ----- Method: StackCrossRaspbianFastBltConfig>>compilerFlagsDebug (in category 'as yet unclassified') ----- + compilerFlagsDebug + + ^ { + '-g3'. + '-D_GNU_SOURCE'. + '-DITIMER_HEARTBEAT=1'. + '-DNO_VM_PROFILE=1'. + '-DDEBUGVM=1' }! Item was added: + ----- Method: StackCrossRaspbianFastBltConfig>>compilerFlagsRelease (in category 'as yet unclassified') ----- + compilerFlagsRelease + " + THIS FLAGS ARE CRASHING COMPILER + -fschedule-insns2 + -fschedule-insns + + THIS FLAGS ARE CRASHING VM + -ftree-pre + -fcaller-saves + + THIS FLAGS ARE WORKING + -O1 -fthread-jumps -falign-functions -falign-jumps -falign-loops -falign-labels -fcrossjumping -fcse-follow-jumps -fcse-skip-blocks -fdelete-null-pointer-checks -fdevirtualize -fexpensive-optimizations -fgcse -fgcse-lm -finline-small-functions -findirect-inlining -fipa-sra -foptimize-sibling-calls -fpeephole2 -fregmove -freorder-blocks -frerun-cse-after-loop -freorder-functions -fsched-interblock -fsched-spec -fstrict-aliasing -fstrict-overflow -ftree-switch-conversion -ftree-vrp + + THIS IS LIKE: -O2 -fno-tree-pre -fno-caller-saves + + " + + ^ { + '-g0'. + '-D_GNU_SOURCE'. + '-DNDEBUG'. + '-DITIMER_HEARTBEAT=1'. + '-DNO_VM_PROFILE=1'. + '-DDEBUGVM=0' }! Item was added: + ----- Method: StackCrossRaspbianFastBltConfig>>configH (in category 'as yet unclassified') ----- + configH + " right now its like that " + ^ ' + #ifndef __sq_config_h + #define __sq_config_h + + /* explicit image width */ + + #define HAVE_INTERP_H 1 + + /* package options */ + + #define USE_X11 1 + #define USE_X11_GLX 1 + /* #undef USE_QUARTZ */ + /* #undef USE_QUARTZ_CGL */ + /* #undef USE_RFB */ + + /* libraries */ + + /* #undef HAVE_LIBX11 */ + /* #undef HAVE_LIBXEXT */ + #define HAVE_LIBDL 1 + /* #undef HAVE_DYLD */ + /* #undef HAVE_LIBFFI */ + /* #undef HAVE_ICONV */ + + /* #undef USE_AUDIO_NONE */ + /* #undef USE_AUDIO_SUN */ + /* #undef USE_AUDIO_NAS */ + /* #undef USE_AUDIO_OSS */ + /* #undef USE_AUDIO_MACOSX */ + /* #undef OSS_DEVICE */ + + /* header files */ + + #define HAVE_UNISTD_H 1 + /* #undef NEED_GETHOSTNAME_P */ + + #define HAVE_DIRENT_H 1 + /* #undef HAVE_SYS_NDIR_H */ + /* #undef HAVE_SYS_DIR_H */ + /* #undef HAVE_NDIR_H */ + #define HAVE_DLFCN_H 1 + #define HAVE_ICONV_H 1 + + #define HAVE_SYS_TIME_H 1 + #define TIME_WITH_SYS_TIME 1 + + /* #undef HAVE_SYS_FILIO_H */ + + /* #undef HAVE_SYS_AUDIOIO_H */ + /* #undef HAVE_SUN_AUDIOIO_H */ + + #define HAVE_PTY_H 1 + /* #undef HAVE_UTIL_H */ + /* #undef HAVE_LIBUTIL_H */ + #define HAVE_STROPTS_H 1 + + #define HAVE_GL_GL_H 1 + /* #undef HAVE_OPENGL_GL_H */ + + /* #undef NEED_SUNOS_H */ + + /* system calls/library functions */ + + #define AT_EXIT atexit + + #define HAVE_TZSET 1 + + #define HAVE_OPENPTY 1 + /* #undef HAVE_UNIX98_PTYS */ + + #define HAVE_SNPRINTF 1 + /* #undef HAVE___SNPRINTF */ + + #define HAVE_MMAP 1 + + /* #undef HAVE_DYLD */ + + #define HAVE_LANGINFO_CODESET 1 + + #define HAVE_ALLOCA 1 + #define HAVE_ALLOCA_H 1 + + #define HAVE_UNSETENV 1 + + #define HAVE_NANOSLEEP 1 + + /* widths of primitive types */ + + #define SIZEOF_INT 4 + #define SIZEOF_LONG 4 + #define SIZEOF_LONG_LONG 8 + #define SIZEOF_VOID_P 4 + + /* structures */ + + #define HAVE_TM_GMTOFF 1 + #define HAVE_TIMEZONE 1 + + /* typedefs */ + + /* #undef size_t */ + /* #undef socklen_t */ + + #define ENABLE_FAST_BLT 1 + #define squeakInt64 long long + + /* architecture */ + + #define OS_TYPE "unix" + + #define VM_HOST "i686-pc-linux-gnu" + #define VM_HOST_CPU "i686" + /* #undef VM_HOST_VENDOR */ + #define VM_HOST_OS "linux-gnu" + #define VM_BUILD_STRING "Unix built on "__DATE__ " "__TIME__" Compiler: "__VERSION__ + + /* #undef WORDS_BIGENDIAN */ + /* #undef DOUBLE_WORD_ALIGNMENT */ + + /* damage containment */ + + /* #undef DARWIN */ + + #ifdef NEED_SUNOS_H + # include "sunos.h" + #endif + + /* other configured variables */ + + #define SQ_VERSION "3.9a-7024" + #define VM_VERSION "3.9-7" + #define VM_MODULE_PREFIX "" + /* #undef VM_DLSYM_PREFIX */ + #define VM_X11DIR "" + + /* avoid dependencies on glibc2.3 */ + + #define HAVE_FEATURES_H 1 + + #if defined(HAVE_FEATURES_H) + # include "glibc.h" + #endif + + + /* used by UUID plugin: */ + + #define HAVE_UUID_H 1 + + #endif /* __sq_config_h */ + + '! Item was added: + ----- Method: StackCrossRaspbianFastBltConfig>>configureBitBltSimulation: (in category 'as yet unclassified') ----- + configureBitBltSimulation: maker + "extra rules for BitBltSimulation" + + maker includeDirectories: '${pluginCross}'. + maker set: 'can_use_assembler' to: 'TRUE'. + maker cmd: 'enable_language' params: 'ASM'. + maker set: 'CMAKE_ASM_COMPILE_OBJECT' to: '"asasm -cpu 6 -I ${pluginCross} -o <OBJECT> <SOURCE>"'. + + maker addCrossSources: #( + 'BitBltArm.c' + 'BitBltArmSimd.c' + 'BitBltDispatch.c' + 'BitBltGeneric.c' + 'BitBltArmLinux.c' + 'BitBltArmSimdAlphaBlend.s' + 'BitBltArmSimdBitLogical.s' + 'BitBltArmSimdPixPaint.s' + 'BitBltArmSimdSourceWord.s' + ). + ! Item was changed: ----- Method: StackEvtUnixDebugConfig>>compilerFlags (in category 'compiler flags') ----- compilerFlags + ^ String streamContents: [ :stream | + self commonCompilerFlags asStringOn: stream delimiter: ' '. + self compilerFlagsDebug asStringOn: stream delimiter: ' ' ]! - - ^ self commonCompilerFlags, ' ' ,self compilerFlagsDebug! Item was changed: ----- Method: StackIPhoneConfig>>buildScript (in category 'build script') ----- buildScript "answer the build script for building everything" ^ + '#!!/usr/bin/env bash - '#!!bash + set -e + if [ !! -e vmVersionInfo.h ]; then + ../scripts/extract-commit-info.sh - ../codegen-scripts/extract-commit-info.sh fi + cmake . + make + find ../{1}/{2}.app/Contents -type f -exec mv ''\{\}'' ../{1}/{2}.app \\; + rm -Rf ../{1}/{2}.app/Contents + ' format: { self outputDirName. self executableName }! - cmake -G Xcode . - xcodebuild -sdk {2} -configuration Release -target {1} - - ' format: {self executableName. self sdkTarget}! Item was changed: ----- Method: StackIPhoneConfig>>commonCompilerFlags (in category 'settings') ----- commonCompilerFlags "Common compiler flags" ^{ + '-arch {1}' format: { self architecture }. + "CLANG >>" + '-fwrapv'. "Non optimization of stackoverflow (to allow number conversions)" + '-Wno-return-type'. "to avoid clang to complain about plugins that do not return properly." + '-Qunused-arguments'. + "CLANG <<" + '-isysroot {1}' format: { self sysroot }. - "'-miphoneos-version-min=4.3'. " - '-isysroot /Applications/Xcode.app/Contents/Developer/Platforms/{1}.platform/Developer/SDKs/{1}{2}.sdk' format: { self targetDevice. self sdkVersion}. '-x objective-c'. '-std=gnu99'. '-falign-functions=16'. '-fno-gcse'. - '-fno-cse-follow-jumps'. '-fvisibility=hidden'. '-funroll-loops'. '-finline-functions'. '-mno-thumb'. - '-fwrapv'. '-DSTACKVM=1'. '-DCOGMTVM=0'. '-DUSE_GLOBAL_STRUCT=0'. '-DBASE_HEADER_SIZE=4'. '-DTARGET_OS_IS_IPHONE'. '-DHAVE_UUID_GENERATE'. - "'-DUSE_INLINE_MEMORY_ACCESSORS'. " '-DHAVE_SYS_TIME_H'. '-DLSB_FIRST'. '-DHAVE_NANOSLEEP'. + '-DISQUEAK_IMAGE={1}' format: { self imageName }. - '-DISQUEAK_IMAGE=', self imageName. '-DISQUEAK_SOURCES=PharoV10'. '-DSTACKVM'}! Item was changed: ----- Method: StackIPhoneConfig>>configureFT2Plugin: (in category 'plugin extra rules') ----- configureFT2Plugin: maker "extra rules for Freetype plugin. a custom rule to build freetype library" + | lib | - | lib devRoot sdkRoot | - devRoot := '/Applications/Xcode.app/Contents/Developer/Platforms/{1}.platform/Developer' - format: { self targetDevice}. - sdkRoot := '{1}/SDKs/{2}{3}.sdk' - format: { devRoot. self targetDevice. self sdkVersion}. - "add freetype library into loop" lib := self addThirdpartyLibrary: 'freetype2'. + lib configurationFlags: self ft2PluginConfigurationFlags. - lib configurationFlags: ({ - '--without-zlib'. - '--without-bzip2'. - '--host=arm-apple-darwin'. - '--enable-static=yes'. - '--enable-shared=no'. - 'CC={3}/usr/bin/gcc'. - 'CXX={3}/usr/bin/g++'. - 'CFLAGS=\\"-arch {1} -std=c99 -Wno-trigraphs -O2 -fwrapv -Wreturn-type -Wunused-variable -fmessage-length=0 -miphoneos-version-min=4.0 -I{2}/usr/include/libxml2 -isysroot {2}\\"'. - 'LDFLAGS=\\"-arch {1} -isysroot {2}\\"'} - collect: [ :each | each format: { self architecture. sdkRoot. devRoot} ]). "link plugin with freetype lib" + maker includeDirectories: lib includeDir. maker addExternalLibrary: '${thirdpartyDir}/out/lib/', lib libraryFileName. + maker addExternalDependency: 'freetype2'. + ! - maker includeDirectories: lib includeDir. ! Item was added: + ----- Method: StackIPhoneConfig>>ft2PluginConfigurationFlags (in category 'plugin extra rules') ----- + ft2PluginConfigurationFlags + ^ {'--without-zlib'. + '--without-bzip2'. + '--host=arm-apple-darwin'. + '--enable-static=yes'. + '--enable-shared=no'. + 'CFLAGS=\\"-arch {1} -std=c99 -Wno-trigraphs -O2 -fpascal-strings -fwrapv -Wreturn-type -Wunused-variable -fvisibility=hidden -fmessage-length=0 -miphoneos-version-min={3} -I{2}/usr/include/libxml2 -isysroot {2}\\"'. + 'LDFLAGS=\\"-arch {1} -miphoneos-version-min={3} -isysroot {2}\\"' } + collect: [ :each | + each format: { + self architecture. + self sysroot. + self sdkVersion } ]! Item was changed: ----- Method: StackIPhoneConfig>>sdkVersion (in category 'accessing') ----- sdkVersion + ^'7.0'! - ^'6.1'! Item was changed: ----- Method: StackIPhoneConfig>>setCommonProperties: (in category 'settings') ----- setCommonProperties: maker maker set: 'CMAKE_CROSSCOMPILING' to: 'TRUE'. maker set: 'CMAKE_SYSTEM_NAME' to: 'Darwin'. maker set: 'CMAKE_SYSTEM_PROCESSOR' to: 'arm'. maker set: 'SDKVER' toString: self sdkVersion. + maker + set: 'DEVROOT' + toString: ('/Applications/Xcode.app/Contents/Developer/Platforms/{1}.platform/Developer' + format: { self targetDevice }). + maker + set: 'SDKROOT' + toString: '${DEVROOT}/SDKs/', self targetDevice,'${SDKVER}.sdk'. - maker set: 'DEVROOT' toString: ('/Applications/Xcode.app/Contents/Developer/Platforms/{1}.platform/Developer' - format: { self targetDevice }). - maker set: 'SDKROOT' toString: '${DEVROOT}/SDKs/', self targetDevice,'${SDKVER}.sdk'. maker set: 'CMAKE_OSX_SYSROOT' to: 'iphoneos${SDKVER}'. maker set: 'CMAKE_FIND_ROOT_PATH' to: '"${SDKROOT}" "${DEVROOT}"'. maker set: 'CMAKE_FIND_ROOT_PATH_MODE_PROGRAM' to: 'ONLY'. maker set: 'CMAKE_FIND_ROOT_PATH_MODE_LIBRARY' to: 'ONLY'. maker set: 'CMAKE_FIND_ROOT_PATH_MODE_INCLUDE' to: 'ONLY'. maker set: 'CMAKE_EXE_LINKER_FLAGS' toString: '--sysroot ${SDKROOT} -L${SDKROOT}/usr/lib -L${SDKROOT}/usr/lib/system'. maker set: 'CMAKE_C_FLAGS' toString: '--sysroot ${SDKROOT} -L${SDKROOT}/usr/lib -L${SDKROOT}/usr/lib/system'. maker set: 'CMAKE_CXX_FLAGS' toString: '--sysroot ${SDKROOT} -L${SDKROOT}/usr/lib -L${SDKROOT}/usr/lib/system'. maker addFrameworks: self frameworks.! Item was changed: ----- Method: StackIPhoneConfig>>setExtraTargetProperties: (in category 'settings') ----- setExtraTargetProperties: maker "super setExtraTargetProperties: maker." | precompiledHeaders plist | precompiledHeaders := (self executableName, '_Prefix.pch'). (FileStream forceNewFileNamed: (maker buildDir / precompiledHeaders) fullName) nextPutAll: self precompiledHeaders; close. maker addXCodeProperty: 'GCC_PREFIX_HEADER' value: '${buildDir}/', precompiledHeaders. self setCommonProperties: maker. " generated and add Info.plist file " plist := self plistFile. (FileStream forceNewFileNamed: (maker buildDir / 'Info.plist') fullName) nextPutAll: plist; close. maker addProperty: 'MACOSX_BUNDLE_INFO_PLIST' value: '${buildDir}/Info.plist'. maker cmd: 'set_target_properties' params: self executableName, ' PROPERTIES COMPILE_FLAGS "-include \"', (self buildDir / self prefixHeaderFileName) fullName, '\""'. + maker + set: 'CMAKE_XCODE_ATTRIBUTE_CODE_SIGN_IDENTITY' - maker set: 'CMAKE_XCODE_ATTRIBUTE_CODE_SIGN_IDENTITY' toString: self codeSignIdentity. + maker + set: 'CMAKE_XCODE_ATTRIBUTE_TARGETED_DEVICE_FAMILY' - maker set: 'CMAKE_XCODE_ATTRIBUTE_TARGETED_DEVICE_FAMILY' toString: self targetedDeviceFamilyAsString. + maker + set: 'CMAKE_XCODE_ATTRIBUTE_IPHONEOS_DEPLOYMENT_TARGET' - maker set: 'CMAKE_XCODE_ATTRIBUTE_IPHONEOS_DEPLOYMENT_TARGET' to: self deploymentTargetVersion. + maker + set: 'CMAKE_XCODE_ATTRIBUTE_CONFIGURATION_BUILD_DIR' - maker set: 'CMAKE_XCODE_ATTRIBUTE_CONFIGURATION_BUILD_DIR' toString: '$(BUILD_DIR)/$(CONFIGURATION)'. + maker + set: 'CMAKE_XCODE_ATTRIBUTE_CONFIGURATION_TEMP_DIR' - maker set: 'CMAKE_XCODE_ATTRIBUTE_CONFIGURATION_TEMP_DIR' toString: '$(BUILD_DIR)/$(CONFIGURATION)'. maker set: 'EXECUTABLE_OUTPUT_PATH' toString: self outputDir fullName. + maker puts: 'set_source_files_properties(${srcVMDir}/gcc3x-cointerp.c PROPERTIES COMPILE_FLAGS -O0)'. + + - maker puts: 'set_source_files_properties(${srcVMDir}/gcc3x-cointerp.c PROPERTIES COMPILE_FLAGS -O0)' ! Item was added: + ----- Method: StackIPhoneConfig>>sysroot (in category 'accessing') ----- + sysroot + ^ '/Applications/Xcode.app/Contents/Developer/Platforms/{1}.platform/Developer/SDKs/{1}{2}.sdk' + format: { + self targetDevice. + self sdkVersion }! Item was changed: ----- Method: StackMacOSDebugConfig>>compilerFlags (in category 'compiler flags') ----- compilerFlags + ^ String streamContents: [ :stream | + self commonCompilerFlags asStringOn: stream delimiter: ' '. + self compilerFlagsDebug asStringOn: stream delimiter: ' ' ]! - - ^ self compilerFlagsDebug! Item was added: + StackUnixConfig subclass: #StackRaspbianConfig + instanceVariableNames: '' + classVariableNames: '' + poolDictionaries: '' + category: 'CMakeVMMaker-Unix'! + + !StackRaspbianConfig commentStamp: '<historical>' prior: 0! + This is a concrete class which generates a StackVM for Raspbian (debian on RaspberryPi). + + Usage: + StackRaspbianConfig generateWithSources + + + Fore more information, check the class comments of all the superclasses. + ! Item was added: + ----- Method: StackRaspbianConfig>>addDriver:sources:generator:externalLibs: (in category 'as yet unclassified') ----- + addDriver: name sources: aSources generator: cmakeGen externalLibs: extLibs + + | cfg srcs | + + srcs := aSources inject: '' into: [:res :each | res , ' "', each, '"' ]. + cfg := cmakeGen + captureOutputDuring: [ + cmakeGen printHeader; + project: name; + include: '../directories.cmake'; + + message: 'Adding module: ', name; + + addDefinitions: self compilerFlags; + addDefinitions: '-fPIC -DPIC'; + set: #sources to: srcs; + cmd: 'add_library' params: name, ' SHARED ${sources}'; + includeDirectories: '${crossDir}/plugins/FilePlugin'; + includeDirectories: '${targetPlatform}/plugins/B3DAcceleratorPlugin'; + includeDirectories: '${crossDir}/plugins/B3DAcceleratorPlugin'; + set: 'LIBRARY_OUTPUT_PATH' toString: self outputDir fullName; + addExternalLibraries: extLibs; + cmd: 'target_link_libraries' params: name , ' ${LINKLIBS}'; + cmd: 'set_target_properties' params: name , ' PROPERTIES PREFIX "" SUFFIX "" ' + ]. + + (self buildDir / name) ensureDirectory. + self write: cfg toFile: name , '/', cmakeGen outputFileName. + cmakeGen addSubdirectory: name. + ! Item was added: + ----- Method: StackRaspbianConfig>>commonCompilerFlags (in category 'as yet unclassified') ----- + commonCompilerFlags + + "Common compiler flags + + + LSB_FIRST=1 means that target platform is little endian. + set it to 0 for big-endian platforms + + " + + ^ { + '-DLSB_FIRST=1'. + '-DUSE_GLOBAL_STRUCT=0'. + '-DCOGMTVM=0' } ! Item was added: + ----- Method: StackRaspbianConfig>>compilerFlagsDebug (in category 'as yet unclassified') ----- + compilerFlagsDebug + + ^ { + '-g3'. + '-O0'. + '-D_GNU_SOURCE'. + '-DITIMER_HEARTBEAT=1'. + '-DNO_VM_PROFILE=1'. + '-DDEBUGVM=1' }! Item was added: + ----- Method: StackRaspbianConfig>>compilerFlagsRelease (in category 'as yet unclassified') ----- + compilerFlagsRelease + " + THIS FLAGS ARE CRASHING COMPILER + -fschedule-insns2 + -fschedule-insns + + THIS FLAGS ARE CRASHING VM + -ftree-pre + -fcaller-saves + + THIS FLAGS ARE WORKING + -O1 -fthread-jumps -falign-functions -falign-jumps -falign-loops -falign-labels -fcrossjumping -fcse-follow-jumps -fcse-skip-blocks -fdelete-null-pointer-checks -fdevirtualize -fexpensive-optimizations -fgcse -fgcse-lm -finline-small-functions -findirect-inlining -fipa-sra -foptimize-sibling-calls -fpeephole2 -fregmove -freorder-blocks -frerun-cse-after-loop -freorder-functions -fsched-interblock -fsched-spec -fstrict-aliasing -fstrict-overflow -ftree-switch-conversion -ftree-vrp + + THIS IS LIKE: -O2 -fno-tree-pre -fno-caller-saves + + " + + ^ { + '-g0'. + '-O2'. + '-fno-tree-pre'. + '-fno-caller-saves'. + '-D_GNU_SOURCE'. + '-DNDEBUG'. + '-DITIMER_HEARTBEAT=1'. + '-DNO_VM_PROFILE=1'. + '-DDEBUGVM=0' }! Item was added: + ----- Method: StackRaspbianConfig>>configureBitBltSimulation: (in category 'as yet unclassified') ----- + configureBitBltSimulation: maker + "extra rules for BitBltSimulation" + + maker includeDirectories: '${pluginCross}'. + + maker addCrossSources: #( + 'BitBltGeneric.c' + 'BitBltDispatch.c' + ). + ! Item was added: + ----- Method: StackRaspbianConfig>>defaultExternalPlugins (in category 'as yet unclassified') ----- + defaultExternalPlugins + ^ #( + B3DAcceleratorPlugin + JPEGReaderPlugin + JPEGReadWriter2Plugin + RePlugin + InternetConfigPlugin + )! Item was added: + ----- Method: StackRaspbianConfig>>defaultInternalPlugins (in category 'as yet unclassified') ----- + defaultInternalPlugins + " took from unixbuild/bld/plugins.int" + ^ #( + ADPCMCodecPlugin + AsynchFilePlugin + BalloonEnginePlugin "B2DPlugin" + BitBltSimulation "BitBltPlugin" + BMPReadWriterPlugin + CroquetPlugin + DeflatePlugin "ZipPlugin" + DropPlugin + DSAPlugin "DSAPrims" + FFTPlugin + FileCopyPlugin + FilePlugin + FloatArrayPlugin + FloatMathPlugin + JoystickTabletPlugin + KlattSynthesizerPlugin "Klatt" + LargeIntegersPlugin "LargeIntegers" + Matrix2x3Plugin + MIDIPlugin + MiscPrimitivePlugin + Mpeg3Plugin + SecurityPlugin + SerialPlugin + SocketPlugin + SoundCodecPlugin "SoundCodecPrims" + SoundGenerationPlugin + SoundPlugin + StarSqueakPlugin + SurfacePlugin + LocalePlugin + )! Item was added: + ----- Method: StackRaspbianConfig>>executableName (in category 'as yet unclassified') ----- + executableName + ^ 'PharoS'! Item was added: + ----- Method: StackRaspbianConfig>>extraPluginSettings: (in category 'as yet unclassified') ----- + extraPluginSettings: maker + + maker isExternal ifTrue: [ + "copy lib to results dir " + maker set: 'LIBRARY_OUTPUT_PATH' to: '${outputDir}' + ]. + + maker set: #linkFlags toString: '${linkFlags}' + ! Item was added: + ----- Method: StackRaspbianConfig>>linkFlags (in category 'as yet unclassified') ----- + linkFlags + ^ '-lSM -lICE -ldl -lGL -lpthread -lm -lnsl -lX11'! Item was added: + ----- Method: StackRaspbianConfig>>setExtraTargetProperties: (in category 'as yet unclassified') ----- + setExtraTargetProperties: maker + + "maker setTargetProperties: 'LINK_FLAGS ""'." + + maker puts: 'set_source_files_properties( ${srcVMDir}/cogit.c PROPERTIES + COMPILE_FLAGS "-O1 -fno-omit-frame-pointer -momit-leaf-frame-pointer")'. + + + maker + cmd: 'set_source_files_properties' + params: ' ${targetPlatform}/vm/sqUnixHeartbeat.c PROPERTIES + COMPILE_FLAGS "-O1 -fno-omit-frame-pointer"'. + + + maker addExternalLibraries: + #( + 'm' "math lib" + 'dl' "dynamic loader" + 'pthread' "posix threads" + ). + + maker set: 'EXECUTABLE_OUTPUT_PATH' toString: self outputDir fullName. + self addVMDrivers: maker.! Item was added: + StackRaspbianConfig subclass: #StackRaspbianFastBltConfig + instanceVariableNames: '' + classVariableNames: '' + poolDictionaries: '' + category: 'CMakeVMMaker-Unix'! + + !StackRaspbianFastBltConfig commentStamp: '<historical>' prior: 0! + http://www.cmake.org/Wiki/CMake/Assembler! Item was added: + ----- Method: StackRaspbianFastBltConfig>>commonCompilerFlags (in category 'as yet unclassified') ----- + commonCompilerFlags + ^ super commonCompilerFlags, { '-DENABLE_FAST_BLT' }.! Item was added: + ----- Method: StackRaspbianFastBltConfig>>configureBitBltSimulation: (in category 'as yet unclassified') ----- + configureBitBltSimulation: maker + "extra rules for BitBltSimulation" + + maker includeDirectories: '${pluginCross}'. + + maker set: 'can_use_assembler' to: 'TRUE'. + + maker addCrossSources: #( + 'BitBltArm.c' + 'BitBltArmSimd.c' + 'BitBltDispatch.c' + 'BitBltGeneric.c' + 'BitBltArmLinux.c' + 'BitBltArmSimdAlphaBlend.s' + 'BitBltArmSimdBitLogical.s' + 'BitBltArmSimdPixPaint.s' + 'BitBltArmSimdSourceWord.s' + ). + ! Item was added: + ----- Method: StackSimulatorConfig>>commonCompilerFlags (in category 'accessing') ----- + commonCompilerFlags + ^ super commonCompilerFlags, { + '-mios-simulator-version-min={1}' format: { self sdkVersion } }! Item was added: + ----- Method: StackSimulatorConfig>>ft2PluginConfigurationFlags (in category 'plugin extra rules') ----- + ft2PluginConfigurationFlags + ^ {'--without-zlib'. + '--without-bzip2'. + '--host=i386-apple-darwin'. + '--enable-static=yes'. + '--enable-shared=no'. + 'CFLAGS=\\"-arch {1} -pipe -std=c99 -Wno-trigraphs -O2 -fpascal-strings -fwrapv -Wreturn-type -Wunused-variable -fvisibility=hidden -fmessage-length=0 -mios-simulator-version-min={3} -I{2}/usr/include/libxml2 -isysroot {2}\\"'. + 'LDFLAGS=\\"-arch {1} -mios-simulator-version-min={3} -isysroot {2}\\"' } + collect: [ :each | + each format: { + self architecture. + self sysroot. + self sdkVersion } ]! Item was added: + ----- Method: StackSimulatorConfig>>setCommonProperties: (in category 'settings') ----- + setCommonProperties: maker + maker set: 'CMAKE_CROSSCOMPILING' to: 'TRUE'. + maker set: 'CMAKE_SYSTEM_NAME' to: 'Darwin'. + maker set: 'CMAKE_SYSTEM_PROCESSOR' to: 'i386'. + + maker + set: 'SDKVER' + toString: self sdkVersion. + maker + set: 'DEVROOT' + toString: ('/Applications/Xcode.app/Contents/Developer/Platforms/{1}.platform/Developer' + format: { self targetDevice }). + maker + set: 'SDKROOT' + toString: ('$\{DEVROOT\}/SDKs/{1}$\{SDKVER\}.sdk' format: { self targetDevice }). + + maker set: 'CMAKE_OSX_SYSROOT' to: self sysroot. + + maker set: 'CMAKE_FIND_ROOT_PATH' to: '"${SDKROOT}" "${DEVROOT}"'. + maker set: 'CMAKE_FIND_ROOT_PATH_MODE_PROGRAM' to: 'ONLY'. + maker set: 'CMAKE_FIND_ROOT_PATH_MODE_LIBRARY' to: 'ONLY'. + maker set: 'CMAKE_FIND_ROOT_PATH_MODE_INCLUDE' to: 'ONLY'. + + maker + set: 'CMAKE_EXE_LINKER_FLAGS' + toString: '-mios-simulator-version-min=${SDKVER} --sysroot ${SDKROOT} -L${SDKROOT}/usr/lib -L${SDKROOT}/usr/lib/system'. + maker + set: 'CMAKE_C_FLAGS' + toString: '--sysroot ${SDKROOT} -L${SDKROOT}/usr/lib -L${SDKROOT}/usr/lib/system'. + maker + set: 'CMAKE_CXX_FLAGS' + toString: '--sysroot ${SDKROOT} -L${SDKROOT}/usr/lib -L${SDKROOT}/usr/lib/system'. + + maker addFrameworks: self frameworks.! Item was changed: ----- Method: StackSimulatorConfig>>standardIncludes (in category 'source files') ----- standardIncludes + ^super standardIncludes, { + '/Applications/Xcode.app/Contents/Developer/Platforms/{1}.platform/Developer/SDKs/{1}{2}.sdk/usr/include/' + format: { + self targetDevice. + self sdkVersion} } - ^super standardIncludes, {'/Applications/Xcode.app/Contents/Developer/Platforms/{1}.platform/Developer/SDKs/{1}{2}.sdk/usr/include/' - format: { self targetDevice. self sdkVersion} } ! Item was changed: ----- Method: StackUnixDebugConfig>>compilerFlags (in category 'compiler flags') ----- compilerFlags + ^ String streamContents: [ :stream | + self commonCompilerFlags asStringOn: stream delimiter: ' '. + self compilerFlagsDebug asStringOn: stream delimiter: ' ' ]! - - ^ self commonCompilerFlags, ' ' ,self compilerFlagsDebug! Item was changed: ----- Method: StackUnixDebugFixedVerSIConfig>>compilerFlagsDebug (in category 'as yet unclassified') ----- compilerFlagsDebug + ^ { + '-g3'. + '-O0'. + '-msse2'. + '-save-temps'. + '-D_GNU_SOURCE'. + '-DITIMER_HEARTBEAT=1'. + '-DNO_VM_PROFILE=1'. + '-DCOGMTVM=0'. + '-DDEBUGVM=1' }! - ^ '-g3 -O0 -msse2 -save-temps -D_GNU_SOURCE -DITIMER_HEARTBEAT=1 -DNO_VM_PROFILE=1 -DCOGMTVM=0 -DDEBUGVM=1' - - !

1 0

VM Maker: VMMaker.oscog-tfel.1720.mcz
by commits＠source.squeak.org 09 Mar '16

09 Mar '16

Tim Felgentreff uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-tfel.1720.mcz ==================== Summary ==================== Name: VMMaker.oscog-tfel.1720 Author: tfrel Time: 9 March 2016, 11:02:57.505428 pm UUID: e9aa577d-1e78-4d24-aab6-9e91764f86ee Ancestors: VMMaker.oscog-tfrel.1719 Fix the last commit: I got confused during code cleanup. =============== Diff against VMMaker.oscog-tfrel.1719 =============== Item was changed: ----- Method: BitBltSimulator>>incDestIndex: (in category 'memory access') ----- incDestIndex: offset "if offset is a CObject, this avoids a copy, making the simulation massively faster" + ^ destIndex isCObjectAccessor - ^ offset isCObjectAccessor ifTrue: [destIndex += offset] ifFalse: [super incDestIndex: offset] ! Item was changed: ----- Method: BitBltSimulator>>incSrcIndex: (in category 'memory access') ----- incSrcIndex: offset "if offset is a CObject, this avoids a copy, making the simulation massively faster" + ^ sourceIndex isCObjectAccessor - ^ offset isCObjectAccessor ifTrue: [sourceIndex += offset] ifFalse: [super incSrcIndex: offset] !

1 0

VM Maker: VMMaker.oscog-tfrel.1719.mcz
by commits＠source.squeak.org 09 Mar '16

09 Mar '16

Tim Felgentreff uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-tfrel.1719.mcz ==================== Summary ==================== Name: VMMaker.oscog-tfrel.1719 Author: tfrel Time: 9 March 2016, 10:35:56.474573 pm UUID: b09bd0a2-7d2a-41d2-9794-b83f2881c59e Ancestors: VMMaker.oscog-eem.1718 Improve the performance of BitBltSimulator by using += rather than + and new assignment for the src and dest index pointers if they are CObjectAccessors. This avoids creating many copies of CObjectAccessors in the inner BitBlt loops, and thus improves simulation performance dramatically. For the generator, the code is the same as previously, but now in an inlined method, so nothing changes in C-land. =============== Diff against VMMaker.oscog-eem.1718 =============== Item was changed: ----- Method: BitBltSimulation>>copyLoop (in category 'inner loop') ----- copyLoop | prevWord thisWord skewWord halftoneWord mergeWord hInc y unskew skewMask notSkewMask mergeFnwith destWord | "This version of the inner loop assumes noSource = false." <inline: false> <var: #mergeFnwith declareC: 'sqInt (*mergeFnwith)(sqInt, sqInt)'> mergeFnwith := self cCoerce: (opTable at: combinationRule+1) to: 'sqInt (*)(sqInt, sqInt)'. mergeFnwith. "null ref for compiler" hInc := hDir*4. "Byte delta" "degenerate skew fixed for Sparc. 10/20/96 ikp" skew == -32 ifTrue: [skew := unskew := skewMask := 0] ifFalse: [skew < 0 ifTrue: [unskew := skew+32. skewMask := AllOnes << (0-skew)] ifFalse: [skew = 0 ifTrue: [unskew := 0. skewMask := AllOnes] ifFalse: [unskew := skew-32. skewMask := AllOnes >> skew]]]. notSkewMask := skewMask bitInvert32. noHalftone ifTrue: [halftoneWord := AllOnes. halftoneHeight := 0] ifFalse: [halftoneWord := self halftoneAt: 0]. y := dy. 1 to: bbH do: "here is the vertical loop" [ :i | halftoneHeight > 1 ifTrue: "Otherwise, its always the same" [halftoneWord := self halftoneAt: y. y := y + vDir]. preload ifTrue: ["load the 64-bit shifter" prevWord := self srcLongAt: sourceIndex. + self incSrcIndex: hInc] - sourceIndex := sourceIndex + hInc] ifFalse: [prevWord := 0]. "Note: the horizontal loop has been expanded into three parts for speed:" "This first section requires masking of the destination store..." destMask := mask1. thisWord := self srcLongAt: sourceIndex. "pick up next word" + self incSrcIndex: hInc. - sourceIndex := sourceIndex + hInc. skewWord := ((prevWord bitAnd: notSkewMask) bitShift: unskew) bitOr: "32-bit rotate" ((thisWord bitAnd: skewMask) bitShift: skew). prevWord := thisWord. destWord := self dstLongAt: destIndex. mergeWord := self mergeFn: (skewWord bitAnd: halftoneWord) with: destWord. destWord := (destMask bitAnd: mergeWord) bitOr: (destWord bitAnd: destMask bitInvert32). self dstLongAt: destIndex put: destWord. + self incDestIndex: hInc. - destIndex := destIndex + hInc. "This central horizontal loop requires no store masking" destMask := AllOnes. combinationRule = 3 ifTrue: [(skew = 0) & (halftoneWord = AllOnes) ifTrue: ["Very special inner loop for STORE mode with no skew -- just move words" hDir = -1 ifTrue: ["Woeful patch: revert to older code for hDir = -1" 2 to: nWords-1 do: [ :word | thisWord := self srcLongAt: sourceIndex. + self incSrcIndex: hInc. - sourceIndex := sourceIndex + hInc. self dstLongAt: destIndex put: thisWord. + self incDestIndex: hInc]] - destIndex := destIndex + hInc]] ifFalse: [2 to: nWords-1 do: [ :word | "Note loop starts with prevWord loaded (due to preload)" self dstLongAt: destIndex put: prevWord. + self incDestIndex: hInc. - destIndex := destIndex + hInc. prevWord := self srcLongAt: sourceIndex. + self incSrcIndex: hInc]]] - sourceIndex := sourceIndex + hInc]]] ifFalse: ["Special inner loop for STORE mode -- no need to call merge" 2 to: nWords-1 do: [ :word | thisWord := self srcLongAt: sourceIndex. + self incSrcIndex: hInc. - sourceIndex := sourceIndex + hInc. skewWord := ((prevWord bitAnd: notSkewMask) bitShift: unskew) bitOr: "32-bit rotate" ((thisWord bitAnd: skewMask) bitShift: skew). prevWord := thisWord. self dstLongAt: destIndex put: (skewWord bitAnd: halftoneWord). + self incDestIndex: hInc]] - destIndex := destIndex + hInc]] ] ifFalse: [2 to: nWords-1 do: "Normal inner loop does merge:" [ :word | thisWord := self srcLongAt: sourceIndex. "pick up next word" + self incSrcIndex: hInc. - sourceIndex := sourceIndex + hInc. skewWord := ((prevWord bitAnd: notSkewMask) bitShift: unskew) bitOr: "32-bit rotate" ((thisWord bitAnd: skewMask) bitShift: skew). prevWord := thisWord. mergeWord := self mergeFn: (skewWord bitAnd: halftoneWord) with: (self dstLongAt: destIndex). self dstLongAt: destIndex put: mergeWord. + self incDestIndex: hInc] - destIndex := destIndex + hInc] ]. "This last section, if used, requires masking of the destination store..." nWords > 1 ifTrue: [destMask := mask2. thisWord := self srcLongAt: sourceIndex. "pick up next word" + self incSrcIndex: hInc. - sourceIndex := sourceIndex + hInc. skewWord := ((prevWord bitAnd: notSkewMask) bitShift: unskew) bitOr: "32-bit rotate" ((thisWord bitAnd: skewMask) bitShift: skew). destWord := self dstLongAt: destIndex. mergeWord := self mergeFn: (skewWord bitAnd: halftoneWord) with: destWord. destWord := (destMask bitAnd: mergeWord) bitOr: (destWord bitAnd: destMask bitInvert32). self dstLongAt: destIndex put: destWord. + self incDestIndex: hInc]. - destIndex := destIndex + hInc]. + self incSrcIndex: sourceDelta. + self incDestIndex: destDelta]! - sourceIndex := sourceIndex + sourceDelta. - destIndex := destIndex + destDelta]! Item was changed: ----- Method: BitBltSimulation>>copyLoopNoSource (in category 'inner loop') ----- copyLoopNoSource "Faster copyLoop when source not used. hDir and vDir are both positive, and perload and skew are unused" | halftoneWord mergeWord mergeFnwith destWord | <inline: false> <var: #mergeFnwith declareC: 'sqInt (*mergeFnwith)(sqInt, sqInt)'> mergeFnwith := self cCoerce: (opTable at: combinationRule+1) to: 'sqInt (*)(sqInt, sqInt)'. mergeFnwith. "null ref for compiler" 1 to: bbH do: "here is the vertical loop" [ :i | noHalftone ifTrue: [halftoneWord := AllOnes] ifFalse: [halftoneWord := self halftoneAt: dy+i-1]. "Note: the horizontal loop has been expanded into three parts for speed:" "This first section requires masking of the destination store..." destMask := mask1. destWord := self dstLongAt: destIndex. mergeWord := self mergeFn: halftoneWord with: destWord. destWord := (destMask bitAnd: mergeWord) bitOr: (destWord bitAnd: destMask bitInvert32). self dstLongAt: destIndex put: destWord. + self incDestIndex: 4. - destIndex := destIndex + 4. "This central horizontal loop requires no store masking" destMask := AllOnes. combinationRule = 3 ifTrue: ["Special inner loop for STORE" destWord := halftoneWord. 2 to: nWords-1 do:[ :word | self dstLongAt: destIndex put: destWord. + self incDestIndex: 4]. - destIndex := destIndex + 4]. ] ifFalse:[ "Normal inner loop does merge" 2 to: nWords-1 do:[ :word | "Normal inner loop does merge" destWord := self dstLongAt: destIndex. mergeWord := self mergeFn: halftoneWord with: destWord. self dstLongAt: destIndex put: mergeWord. + self incDestIndex: 4]. - destIndex := destIndex + 4]. ]. "This last section, if used, requires masking of the destination store..." nWords > 1 ifTrue: [destMask := mask2. destWord := self dstLongAt: destIndex. mergeWord := self mergeFn: halftoneWord with: destWord. destWord := (destMask bitAnd: mergeWord) bitOr: (destWord bitAnd: destMask bitInvert32). self dstLongAt: destIndex put: destWord. + self incDestIndex: 4]. - destIndex := destIndex + 4]. + self incDestIndex: destDelta]! - destIndex := destIndex + destDelta]! Item was changed: ----- Method: BitBltSimulation>>copyLoopPixMap (in category 'inner loop') ----- copyLoopPixMap "This version of the inner loop maps source pixels to a destination form with different depth. Because it is already unweildy, the loop is not unrolled as in the other versions. Preload, skew and skewMask are all overlooked, since pickSourcePixels delivers its destination word already properly aligned. Note that pickSourcePixels could be copied in-line at the top of the horizontal loop, and some of its inits moved out of the loop." "ar 12/7/1999: The loop has been rewritten to use only one pickSourcePixels call. The idea is that the call itself could be inlined. If we decide not to inline pickSourcePixels we could optimize the loop instead." | skewWord halftoneWord mergeWord scrStartBits nSourceIncs startBits endBits sourcePixMask destPixMask mergeFnwith nPix srcShift dstShift destWord words srcShiftInc dstShiftInc dstShiftLeft mapperFlags | <inline: false> <var: #mergeFnwith declareC: 'sqInt (*mergeFnwith)(sqInt, sqInt)'> mergeFnwith := self cCoerce: (opTable at: combinationRule+1) to: 'sqInt (*)(sqInt, sqInt)'. mergeFnwith. "null ref for compiler" "Additional inits peculiar to unequal source and dest pix size..." sourcePPW := 32//sourceDepth. sourcePixMask := maskTable at: sourceDepth. destPixMask := maskTable at: destDepth. mapperFlags := cmFlags bitAnd: ColorMapNewStyle bitInvert32. sourceIndex := sourceBits + (sy * sourcePitch) + ((sx // sourcePPW) *4). scrStartBits := sourcePPW - (sx bitAnd: sourcePPW-1). bbW < scrStartBits ifTrue: [nSourceIncs := 0] ifFalse: [nSourceIncs := (bbW - scrStartBits)//sourcePPW + 1]. sourceDelta := sourcePitch - (nSourceIncs * 4). "Note following two items were already calculated in destmask setup!!" startBits := destPPW - (dx bitAnd: destPPW-1). endBits := ((dx + bbW - 1) bitAnd: destPPW-1) + 1. bbW < startBits ifTrue:[startBits := bbW]. "Precomputed shifts for pickSourcePixels" srcShift := ((sx bitAnd: sourcePPW - 1) * sourceDepth). dstShift := ((dx bitAnd: destPPW - 1) * destDepth). srcShiftInc := sourceDepth. dstShiftInc := destDepth. dstShiftLeft := 0. sourceMSB ifTrue:[ srcShift := 32 - sourceDepth - srcShift. srcShiftInc := 0 - srcShiftInc]. destMSB ifTrue:[ dstShift := 32 - destDepth - dstShift. dstShiftInc := 0 - dstShiftInc. dstShiftLeft := 32 - destDepth]. 1 to: bbH do: "here is the vertical loop" [ :i | "*** is it possible at all that noHalftone == false? ***" noHalftone ifTrue:[halftoneWord := AllOnes] ifFalse: [halftoneWord := self halftoneAt: dy+i-1]. "setup first load" srcBitShift := srcShift. dstBitShift := dstShift. destMask := mask1. nPix := startBits. "Here is the horizontal loop..." words := nWords. ["pick up the word" skewWord := self pickSourcePixels: nPix flags: mapperFlags srcMask: sourcePixMask destMask: destPixMask srcShiftInc: srcShiftInc dstShiftInc: dstShiftInc. "align next word to leftmost pixel" dstBitShift := dstShiftLeft. destMask = AllOnes ifTrue:["avoid read-modify-write" mergeWord := self mergeFn: (skewWord bitAnd: halftoneWord) with: (self dstLongAt: destIndex). self dstLongAt: destIndex put: (destMask bitAnd: mergeWord). ] ifFalse:[ "General version using dest masking" destWord := self dstLongAt: destIndex. mergeWord := self mergeFn: (skewWord bitAnd: halftoneWord) with: (destWord bitAnd: destMask). destWord := (destMask bitAnd: mergeWord) bitOr: (destWord bitAnd: destMask bitInvert32). self dstLongAt: destIndex put: destWord. ]. + self incDestIndex: 4. - destIndex := destIndex + 4. words = 2 "e.g., is the next word the last word?" ifTrue:["set mask for last word in this row" destMask := mask2. nPix := endBits] ifFalse:["use fullword mask for inner loop" destMask := AllOnes. nPix := destPPW]. (words := words - 1) = 0] whileFalse. "--- end of inner loop ---" + self incSrcIndex: sourceDelta. + self incDestIndex: destDelta] - sourceIndex := sourceIndex + sourceDelta. - destIndex := destIndex + destDelta] ! Item was added: + ----- Method: BitBltSimulation>>incDestIndex: (in category 'memory access') ----- + incDestIndex: offset + <inline: true> + ^ destIndex := destIndex + offset + ! Item was added: + ----- Method: BitBltSimulation>>incSrcIndex: (in category 'memory access') ----- + incSrcIndex: offset + <inline: true> + ^ sourceIndex := sourceIndex + offset + ! Item was changed: ----- Method: BitBltSimulation>>pickSourcePixels:flags:srcMask:destMask:srcShiftInc:dstShiftInc: (in category 'combination rules') ----- pickSourcePixels: nPixels flags: mapperFlags srcMask: srcMask destMask: dstMask srcShiftInc: srcShiftInc dstShiftInc: dstShiftInc "Pick nPix pixels starting at srcBitIndex from the source, map by the color map, and justify them according to dstBitIndex in the resulting destWord." | sourceWord destWord sourcePix destPix srcShift dstShift nPix | <inline: true> "oh please" sourceWord := self srcLongAt: sourceIndex. destWord := 0. srcShift := srcBitShift. "Hint: Keep in register" dstShift := dstBitShift. "Hint: Keep in register" nPix := nPixels. "always > 0 so we can use do { } while(--nPix);" (mapperFlags = (ColorMapPresent bitOr: ColorMapIndexedPart)) ifTrue:[ "a little optimization for (pretty crucial) blits using indexed lookups only" [ "grab, colormap and mix in pixel" sourcePix := sourceWord >> srcShift bitAnd: srcMask. destPix := cmLookupTable at: (sourcePix bitAnd: cmMask). destWord := destWord bitOr: (destPix bitAnd: dstMask) << dstShift. "adjust dest pix index" dstShift := dstShift + dstShiftInc. "adjust source pix index" ((srcShift := srcShift + srcShiftInc) bitAnd: 16rFFFFFFE0) = 0 ifFalse:[ sourceMSB ifTrue:[srcShift := srcShift + 32] ifFalse:[srcShift := srcShift - 32]. + sourceWord := self srcLongAt: (self incSrcIndex: 4)]. - sourceWord := self srcLongAt: (sourceIndex := sourceIndex + 4)]. (nPix := nPix - 1) = 0] whileFalse. ] ifFalse:[ [ "grab, colormap and mix in pixel" sourcePix := sourceWord >> srcShift bitAnd: srcMask. destPix := self mapPixel: sourcePix flags: mapperFlags. destWord := destWord bitOr: (destPix bitAnd: dstMask) << dstShift. "adjust dest pix index" dstShift := dstShift + dstShiftInc. "adjust source pix index" ((srcShift := srcShift + srcShiftInc) bitAnd: 16rFFFFFFE0) = 0 ifFalse:[ sourceMSB ifTrue:[srcShift := srcShift + 32] ifFalse:[srcShift := srcShift - 32]. + sourceWord := self srcLongAt: (self incSrcIndex: 4)]. - sourceWord := self srcLongAt: (sourceIndex := sourceIndex + 4)]. (nPix := nPix - 1) = 0] whileFalse. ]. srcBitShift := srcShift. "Store back" ^destWord ! Item was changed: ----- Method: BitBltSimulation>>warpLoop (in category 'inner loop') ----- warpLoop "This version of the inner loop traverses an arbirary quadrilateral source, thus producing a general affine transformation." | skewWord halftoneWord mergeWord startBits deltaP12x deltaP12y deltaP43x deltaP43y pAx pAy pBx pBy xDelta yDelta smoothingCount sourceMapOop nSteps nPix words destWord endBits mergeFnwith dstShiftInc dstShiftLeft mapperFlags | <inline: false> <var: #mergeFnwith declareC: 'sqInt (*mergeFnwith)(sqInt, sqInt)'> mergeFnwith := self cCoerce: (opTable at: combinationRule+1) to: 'sqInt (*)(sqInt, sqInt)'. mergeFnwith. "null ref for compiler" (interpreterProxy slotSizeOf: bitBltOop) >= (BBWarpBase+12) ifFalse: [^ interpreterProxy primitiveFail]. nSteps := height-1. nSteps <= 0 ifTrue: [nSteps := 1]. pAx := self fetchIntOrFloat: BBWarpBase ofObject: bitBltOop. words := self fetchIntOrFloat: BBWarpBase+3 ofObject: bitBltOop. deltaP12x := self deltaFrom: pAx to: words nSteps: nSteps. deltaP12x < 0 ifTrue: [pAx := words - (nSteps*deltaP12x)]. pAy := self fetchIntOrFloat: BBWarpBase+1 ofObject: bitBltOop. words := self fetchIntOrFloat: BBWarpBase+4 ofObject: bitBltOop. deltaP12y := self deltaFrom: pAy to: words nSteps: nSteps. deltaP12y < 0 ifTrue: [pAy := words - (nSteps*deltaP12y)]. pBx := self fetchIntOrFloat: BBWarpBase+9 ofObject: bitBltOop. words := self fetchIntOrFloat: BBWarpBase+6 ofObject: bitBltOop. deltaP43x := self deltaFrom: pBx to: words nSteps: nSteps. deltaP43x < 0 ifTrue: [pBx := words - (nSteps*deltaP43x)]. pBy := self fetchIntOrFloat: BBWarpBase+10 ofObject: bitBltOop. words := self fetchIntOrFloat: BBWarpBase+7 ofObject: bitBltOop. deltaP43y := self deltaFrom: pBy to: words nSteps: nSteps. deltaP43y < 0 ifTrue: [pBy := words - (nSteps*deltaP43y)]. interpreterProxy failed ifTrue: [^ false]. "ie if non-integers above" interpreterProxy methodArgumentCount = 2 ifTrue: [smoothingCount := interpreterProxy stackIntegerValue: 1. sourceMapOop := interpreterProxy stackValue: 0. sourceMapOop = interpreterProxy nilObject ifTrue: [sourceDepth < 16 ifTrue: ["color map is required to smooth non-RGB dest" ^ interpreterProxy primitiveFail]] ifFalse: [(interpreterProxy slotSizeOf: sourceMapOop) < (1 << sourceDepth) ifTrue: ["sourceMap must be long enough for sourceDepth" ^ interpreterProxy primitiveFail]. sourceMapOop := self oopForPointer: (interpreterProxy firstIndexableField: sourceMapOop)]] ifFalse: [smoothingCount := 1. sourceMapOop := interpreterProxy nilObject]. nSteps := width-1. nSteps <= 0 ifTrue: [nSteps := 1]. startBits := destPPW - (dx bitAnd: destPPW-1). endBits := ((dx + bbW - 1) bitAnd: destPPW-1) + 1. bbW < startBits ifTrue:[startBits := bbW]. destY < clipY ifTrue:[ "Advance increments if there was clipping in y" pAx := pAx + (clipY - destY * deltaP12x). pAy := pAy + (clipY - destY * deltaP12y). pBx := pBx + (clipY - destY * deltaP43x). pBy := pBy + (clipY - destY * deltaP43y)]. "Setup values for faster pixel fetching." self warpLoopSetup. "Setup color mapping if not provided" (smoothingCount > 1 and:[(cmFlags bitAnd: ColorMapNewStyle) = 0]) ifTrue:[ cmLookupTable == nil ifTrue:[ destDepth = 16 ifTrue:[self setupColorMasksFrom: 8 to: 5]. ] ifFalse:[ self setupColorMasksFrom: 8 to: cmBitsPerColor. ]. ]. mapperFlags := cmFlags bitAnd: ColorMapNewStyle bitInvert32. destMSB ifTrue:[ dstShiftInc := 0 - destDepth. dstShiftLeft := 32 - destDepth] ifFalse:[ dstShiftInc := destDepth. dstShiftLeft := 0]. 1 to: bbH do: [ :i | "here is the vertical loop..." xDelta := self deltaFrom: pAx to: pBx nSteps: nSteps. xDelta >= 0 ifTrue: [sx := pAx] ifFalse: [sx := pBx - (nSteps*xDelta)]. yDelta := self deltaFrom: pAy to: pBy nSteps: nSteps. yDelta >= 0 ifTrue: [sy := pAy] ifFalse: [sy := pBy - (nSteps*yDelta)]. destMSB ifTrue:[dstBitShift := 32 - ((dx bitAnd: destPPW - 1) + 1 * destDepth)] ifFalse:[dstBitShift := (dx bitAnd: destPPW - 1) * destDepth]. (destX < clipX) ifTrue:[ "Advance increments if there was clipping in x" sx := sx + (clipX - destX * xDelta). sy := sy + (clipX - destX * yDelta). ]. noHalftone ifTrue: [halftoneWord := AllOnes] ifFalse: [halftoneWord := self halftoneAt: dy+i-1]. destMask := mask1. nPix := startBits. "Here is the inner loop..." words := nWords. ["pick up word" smoothingCount = 1 ifTrue:["Faster if not smoothing" skewWord := self warpPickSourcePixels: nPix xDeltah: xDelta yDeltah: yDelta xDeltav: deltaP12x yDeltav: deltaP12y dstShiftInc: dstShiftInc flags: mapperFlags. ] ifFalse:["more difficult with smoothing" skewWord := self warpPickSmoothPixels: nPix xDeltah: xDelta yDeltah: yDelta xDeltav: deltaP12x yDeltav: deltaP12y sourceMap: sourceMapOop smoothing: smoothingCount dstShiftInc: dstShiftInc. ]. "align next word access to left most pixel" dstBitShift := dstShiftLeft. destMask = AllOnes ifTrue:["avoid read-modify-write" mergeWord := self mergeFn: (skewWord bitAnd: halftoneWord) with: (self dstLongAt: destIndex). self dstLongAt: destIndex put: (destMask bitAnd: mergeWord). ] ifFalse:[ "General version using dest masking" destWord := self dstLongAt: destIndex. mergeWord := self mergeFn: (skewWord bitAnd: halftoneWord) with: (destWord bitAnd: destMask). destWord := (destMask bitAnd: mergeWord) bitOr: (destWord bitAnd: destMask bitInvert32). self dstLongAt: destIndex put: destWord. ]. + self incDestIndex: 4. - destIndex := destIndex + 4. words = 2 "e.g., is the next word the last word?" ifTrue:["set mask for last word in this row" destMask := mask2. nPix := endBits] ifFalse:["use fullword mask for inner loop" destMask := AllOnes. nPix := destPPW]. (words := words - 1) = 0] whileFalse. "--- end of inner loop ---" pAx := pAx + deltaP12x. pAy := pAy + deltaP12y. pBx := pBx + deltaP43x. pBy := pBy + deltaP43y. + self incDestIndex: destDelta]! - destIndex := destIndex + destDelta]! Item was added: + ----- Method: BitBltSimulator>>incDestIndex: (in category 'memory access') ----- + incDestIndex: offset + "if offset is a CObject, this avoids a copy, making the simulation massively faster" + ^ offset isCObjectAccessor + ifTrue: [destIndex += offset] + ifFalse: [super incDestIndex: offset] + ! Item was added: + ----- Method: BitBltSimulator>>incSrcIndex: (in category 'memory access') ----- + incSrcIndex: offset + "if offset is a CObject, this avoids a copy, making the simulation massively faster" + ^ offset isCObjectAccessor + ifTrue: [sourceIndex += offset] + ifFalse: [super incSrcIndex: offset] + !

1 0

Re: [squeak-dev] Re: [Vm-dev] [Pharo-dev] strange array instance
by Eliot Miranda 09 Mar '16

09 Mar '16

On Wed, Mar 9, 2016 at 3:08 AM, Stéphane Ducasse <stephane.ducasse(a)inria.fr> wrote: > Hi eliot > > Do not worry. > Now would it be possible to have a test or something like that that would > help us > to > - document this part of the system > - check that the system is in a coherent state > > Stef > Yes, watch this space. I should have the work done by tomorrow. And the 64-bit system will be a tiny bit smaller and faster :-) On 09 Mar 2016, at 10:26, Eliot Miranda <eliot.miranda(a)gmail.com> wrote: > > Um, under /no/ circumstances do what I'm suggesting below. It will screw > up 320bit images completely. I've just turned odd SmallIntegers into > SmallFloat54's in 32-bit Squeak. I hope I won't destroy too many people's > images. This is perhaps my worst blunder. > > On Tue, Mar 8, 2016 at 10:38 AM, Eliot Miranda <eliot.miranda(a)gmail.com> > wrote: > >> Hi Pavel, >> >> On Tue, Mar 8, 2016 at 1:40 AM, Pavel Krivanek <pavel.krivanek(a)gmail.com> >> wrote: >> >>> Hi, >>> >>> there is a strange array of size 1024 in the Pharo image that is not >>> eaten by garbage collector even if no object points to it. I guess it is >>> related to Spur. >>> >>> ((Array allInstances select: [ :i | i size = 1024 ]) >>> select: [ :a | a second = SmallInteger ]) pointersTo >>> >>> What is it and is it accessible somehow? >>> >> >> It is indeed the first class table page. It looks like an old bug. The >> oldest Spur image I can start up has the problem. The way that class >> table pages are hidden is that they have a class index which is not that of >> Array. Array is at index 52 in the class table (51 zero-relative, Array >> identityHash = 51), but it is also at index 17 (16 zero-relative). Array >> allInstances looks for objects whose class index is 51, hence not seeing >> the class table pages, which all (but the first) have class index 16. >> >> Luckily we can fix the problem easily, and we can fix another problem at >> the same time, which is that SmallFloat64 has the wrong hash. >> >> The class table is two-level; a (hidden) array of Arrays. Classes are in >> the class table at their identityHashes (so that to instantiate a class one >> copies the class's identity hash into the classIndex of the new instance >> instead of having to search the class table). But when SmallFloat64 was >> created in the 32-bit image I forgot to give it the right hash and store it >> in the class table. (there are no SmallFloat64 instances in a 32-bit >> image, only in 64-bits). >> >> So we can first change SmallFloat64's hash to 3, which is what the Spur >> 64-bit VM and image require, and enter it into the first class table page, >> and then we can make the first class table page disappear. >> >> >> | firstClassTablePage clone | >> "The first class table page is the first Array instance. Of course this >> is a bug." >> firstClassTablePage := Array someInstance. >> >> "It should contain only nil and classes." >> self assert: (firstClassTablePage allSatisfy: [:e| e == nil or: [e >> isBehavior]]). >> >> "And its first 17 elements should only be the immediate classes and >> Array, since Array is used as the class pun for class table pages, with >> index 17 (16 zero-relative)" >> self assert: (firstClassTablePage first: 17) asSet = {nil. SmallInteger. >> Character. Array} asSet. >> >> "It just so happens that the second Array is the specialSelectors" >> self assert: Array someInstance nextInstance == Smalltalk >> specialSelectors. >> >> "Store SmallFloat64 in the first class table page at index 4 (3 >> zero-relative)." >> firstClassTablePage at: 4 put: SmallFloat64. >> >> "Use the secret set identity hash primitive to set SmallFloat64's >> identityHash to 3." >> SmallFloat64 tryPrimitive: 161 withArgs: #(3). >> >> "Now create an object that looks like Array class, but has identityHash >> 16." >> "Take a shallow copy of Array class." >> clone := Array shallowCopy. >> "Change it into an Array." >> Array adoptInstance: clone. >> "Set its identityHash to 16." >> clone tryPrimitive: 161 withArgs: #(16). >> "Use the adoptInstance: primitive to ``set the class of the >> firstClassTablePage to the cone''. >> or, more accurately, to set the firstClassTablePage's class index to 16." >> clone tryPrimitive: 160 withArgs: {firstClassTablePage} >> >> >> With the above done, we can check that everything is ok." >> self assert: SmallFloat64 identityHash = 3. >> self assert: Array someInstance == Smalltalk specialSelectors. >> "A class table page is 1024 slots, contains only nil or behaviours, and >> contains at least one behaviour (is not all nils). There shouldn't be any >> that we can find." >> self assert: (self systemNavigation allObjects select: [:o| o isArray >> and: [o size = 1024 and: [(o allSatisfy: [:e| e == nil or: [e isBehavior]]) >> and: [o anySatisfy: [:e| e isBehavior]]]]]) size = 0 >> >> >> I recommend you create an update map. Then create a version of kernel >> with a post-load action, written something like this: >> >> >> (Array someInstance size = 1014 >> and: [(Array someInstance allSatisfy: [:e| e == nil or: [e isBehavior]]) >> and: [(firstClassTablePage first: 17) asSet = {nil. SmallInteger. >> Character. Array} asSet]]) ifTrue: >> [| firstClassTablePage clone | >> firstClassTablePage := Array someInstance. >> self assert: (firstClassTablePage allSatisfy: [:e| e == nil or: [e >> isBehavior]]). >> self assert: (firstClassTablePage first: 17) asSet = {nil. SmallInteger. >> Character. Array} asSet. >> firstClassTablePage at: 4 put: SmallFloat64. >> SmallFloat64 tryPrimitive: 161 withArgs: #(3). >> clone := Array shallowCopy. >> Array adoptInstance: clone. >> clone tryPrimitive: 161 withArgs: #(16). >> clone tryPrimitive: 160 withArgs: {Array someInstance} >> self assert: SmallFloat64 identityHash = 3. >> self assert: (Array someInstance first: 4) = {nil. SmallInteger. >> Character. SmallFloat64}] >> >> Then create a second update map to ensure that that version of Kernel is >> loaded. >> >> I will do this for Squeak immediately. >> >> >> Apologies. >> >> P.S. Interestingly enough, it shows what a horrible security hole the >> debugger primitives tryPrimitive:withArgs: and tryNamedPrimitive:withArgs: >> are. >> >> Cheers, >>> -- Pavel >>> >> >> _,,,^..^,,,_ >> best, Eliot >> > > > > -- > _,,,^..^,,,_ > best, Eliot > > > -------------------------------------------- > Stéphane Ducasse > http://stephane.ducasse.free.fr > http://www.synectique.eu / http://www.pharo.org > 03 59 35 87 52 > Assistant: Julie Jonas > 03 59 57 78 50 > 03 59 35 86 16 > > S. Ducasse - Inria > 40, avenue Halley, > Parc Scientifique de la Haute Borne, Bât.A, Park Plaza > Villeneuve d'Ascq 59650 > France > > > > > -- _,,,^..^,,,_ best, Eliot

1 0

Re: [Pharo-dev] strange array instance
by Eliot Miranda 09 Mar '16

09 Mar '16

Hi Pavel, On Tue, Mar 8, 2016 at 1:40 AM, Pavel Krivanek <pavel.krivanek(a)gmail.com> wrote: > Hi, > > there is a strange array of size 1024 in the Pharo image that is not eaten > by garbage collector even if no object points to it. I guess it is related > to Spur. > > ((Array allInstances select: [ :i | i size = 1024 ]) > select: [ :a | a second = SmallInteger ]) pointersTo > > What is it and is it accessible somehow? > It is indeed the first class table page. It looks like an old bug. The oldest Spur image I can start up has the problem. The way that class table pages are hidden is that they have a class index which is not that of Array. Array is at index 52 in the class table (51 zero-relative, Array identityHash = 51), but it is also at index 17 (16 zero-relative). Array allInstances looks for objects whose class index is 51, hence not seeing the class table pages, which all (but the first) have class index 16. Luckily we can fix the problem easily, and we can fix another problem at the same time, which is that SmallFloat64 has the wrong hash. The class table is two-level; a (hidden) array of Arrays. Classes are in the class table at their identityHashes (so that to instantiate a class one copies the class's identity hash into the classIndex of the new instance instead of having to search the class table). But when SmallFloat64 was created in the 32-bit image I forgot to give it the right hash and store it in the class table. (there are no SmallFloat64 instances in a 32-bit image, only in 64-bits). So we can first change SmallFloat64's hash to 3, which is what the Spur 64-bit VM and image require, and enter it into the first class table page, and then we can make the first class table page disappear. | firstClassTablePage clone | "The first class table page is the first Array instance. Of course this is a bug." firstClassTablePage := Array someInstance. "It should contain only nil and classes." self assert: (firstClassTablePage allSatisfy: [:e| e == nil or: [e isBehavior]]). "And its first 17 elements should only be the immediate classes and Array, since Array is used as the class pun for class table pages, with index 17 (16 zero-relative)" self assert: (firstClassTablePage first: 17) asSet = {nil. SmallInteger. Character. Array} asSet. "It just so happens that the second Array is the specialSelectors" self assert: Array someInstance nextInstance == Smalltalk specialSelectors. "Store SmallFloat64 in the first class table page at index 4 (3 zero-relative)." firstClassTablePage at: 4 put: SmallFloat64. "Use the secret set identity hash primitive to set SmallFloat64's identityHash to 3." SmallFloat64 tryPrimitive: 161 withArgs: #(3). "Now create an object that looks like Array class, but has identityHash 16." "Take a shallow copy of Array class." clone := Array shallowCopy. "Change it into an Array." Array adoptInstance: clone. "Set its identityHash to 16." clone tryPrimitive: 161 withArgs: #(16). "Use the adoptInstance: primitive to ``set the class of the firstClassTablePage to the cone''. or, more accurately, to set the firstClassTablePage's class index to 16." clone tryPrimitive: 160 withArgs: {firstClassTablePage} With the above done, we can check that everything is ok." self assert: SmallFloat64 identityHash = 3. self assert: Array someInstance == Smalltalk specialSelectors. "A class table page is 1024 slots, contains only nil or behaviours, and contains at least one behaviour (is not all nils). There shouldn't be any that we can find." self assert: (self systemNavigation allObjects select: [:o| o isArray and: [o size = 1024 and: [(o allSatisfy: [:e| e == nil or: [e isBehavior]]) and: [o anySatisfy: [:e| e isBehavior]]]]]) size = 0 I recommend you create an update map. Then create a version of kernel with a post-load action, written something like this: (Array someInstance size = 1014 and: [(Array someInstance allSatisfy: [:e| e == nil or: [e isBehavior]]) and: [(firstClassTablePage first: 17) asSet = {nil. SmallInteger. Character. Array} asSet]]) ifTrue: [| firstClassTablePage clone | firstClassTablePage := Array someInstance. self assert: (firstClassTablePage allSatisfy: [:e| e == nil or: [e isBehavior]]). self assert: (firstClassTablePage first: 17) asSet = {nil. SmallInteger. Character. Array} asSet. firstClassTablePage at: 4 put: SmallFloat64. SmallFloat64 tryPrimitive: 161 withArgs: #(3). clone := Array shallowCopy. Array adoptInstance: clone. clone tryPrimitive: 161 withArgs: #(16). clone tryPrimitive: 160 withArgs: {Array someInstance} self assert: SmallFloat64 identityHash = 3. self assert: (Array someInstance first: 4) = {nil. SmallInteger. Character. SmallFloat64}] Then create a second update map to ensure that that version of Kernel is loaded. I will do this for Squeak immediately. Apologies. P.S. Interestingly enough, it shows what a horrible security hole the debugger primitives tryPrimitive:withArgs: and tryNamedPrimitive:withArgs: are. Cheers, > -- Pavel > _,,,^..^,,,_ best, Eliot

2 3

[commit][3642] CogVM source as per VMMaker.oscog-eem.1718
by commits＠squeakvm.org 09 Mar '16

09 Mar '16

Revision: 3642 Author: eliot Date: 2016-03-09 01:00:31 -0800 (Wed, 09 Mar 2016) Log Message: ----------- CogVM source as per VMMaker.oscog-eem.1718 Spur: Fix the bug in markAndTraceClassOf: that causes the first class table page to become a visible array. Add a hack fix on initialization. Since we /can/ fix the image manually this hack isn't necessary, but the manual fix won't work until the markAndTraceClassOf: bug is fixed. Sigh... Ensure purgeDuplicateClassTableEntriesFor: will not destroy class pun entries. Plugins: Fix primitiveFFIIntegerAt for signed 4-byte results. Wuth the support for 64-bit results, signed 4-byte results must be sign-extended to 64-bits. Don't use cCode: pointer aliasing for storing/fetching float/double in FFI primitives. Replace with a call to mem:cp:y: - the first one is dangerous with modern C compilers - while the second is optimized away (no call to memcpy) Fix a missing guard in SmartSyntaxPlugin like explained at http://forum.world.st/VM-safety-missing-failing-guards-in-SmartSyntaxPlugin… Fix two missing guards in VM profiling primitives: one should not use the result of stackObjectValue: before checking for success, otherwise a null pointer exception will occur in case of failure. Make the MacMenubarPlugin 64bits aware: the menuHandle does not necessarily fit in a 32bits int. Slang: The size of [unsigned] long long was not infered... 3 minor fixes for type inference: 1) remove unecessary block argument assignment 2) infer type of allMask: 3) infer type of rem: instead of mod: (mod: does not exist) Modified Paths: -------------- branches/Cog/nsspur64src/vm/cogit.h branches/Cog/nsspur64src/vm/cointerp.c branches/Cog/nsspur64src/vm/cointerp.h branches/Cog/nsspur64src/vm/gcc3x-cointerp.c branches/Cog/nsspursrc/vm/cogit.h branches/Cog/nsspursrc/vm/cointerp.c branches/Cog/nsspursrc/vm/cointerp.h branches/Cog/nsspursrc/vm/gcc3x-cointerp.c branches/Cog/nsspurstack64src/vm/gcc3x-interp.c branches/Cog/nsspurstack64src/vm/interp.c branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c branches/Cog/nsspurstacksrc/vm/interp.c branches/Cog/spur64src/vm/cogit.h branches/Cog/spur64src/vm/cointerp.c branches/Cog/spur64src/vm/cointerp.h branches/Cog/spur64src/vm/gcc3x-cointerp.c branches/Cog/spursistasrc/vm/cogit.h branches/Cog/spursistasrc/vm/cointerp.c branches/Cog/spursistasrc/vm/cointerp.h branches/Cog/spursistasrc/vm/gcc3x-cointerp.c branches/Cog/spursrc/vm/cogit.h 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/plugins/AsynchFilePlugin/AsynchFilePlugin.c branches/Cog/src/plugins/BitBltPlugin/BitBltPlugin.c branches/Cog/src/plugins/GeniePlugin/GeniePlugin.c branches/Cog/src/plugins/HostWindowPlugin/HostWindowPlugin.c branches/Cog/src/plugins/IA32ABI/IA32ABI.c branches/Cog/src/plugins/ImmX11Plugin/ImmX11Plugin.c branches/Cog/src/plugins/JPEGReadWriter2Plugin/JPEGReadWriter2Plugin.c branches/Cog/src/plugins/JoystickTabletPlugin/JoystickTabletPlugin.c branches/Cog/src/plugins/LargeIntegers/LargeIntegers.c branches/Cog/src/plugins/LocalePlugin/LocalePlugin.c branches/Cog/src/plugins/MIDIPlugin/MIDIPlugin.c branches/Cog/src/plugins/MacMenubarPlugin/MacMenubarPlugin.c branches/Cog/src/plugins/Mpeg3Plugin/Mpeg3Plugin.c branches/Cog/src/plugins/QuicktimePlugin/QuicktimePlugin.c branches/Cog/src/plugins/SerialPlugin/SerialPlugin.c branches/Cog/src/plugins/SocketPlugin/SocketPlugin.c branches/Cog/src/plugins/SoundPlugin/SoundPlugin.c branches/Cog/src/plugins/SqueakFFIPrims/ARM32FFIPlugin.c branches/Cog/src/plugins/SqueakFFIPrims/IA32FFIPlugin.c branches/Cog/src/plugins/SqueakFFIPrims/X64SysVFFIPlugin.c branches/Cog/src/plugins/SqueakFFIPrims/X64Win64FFIPlugin.c branches/Cog/src/vm/cogit.h branches/Cog/src/vm/cointerp.c branches/Cog/src/vm/cointerp.h branches/Cog/src/vm/cointerpmt.c branches/Cog/src/vm/cointerpmt.h branches/Cog/src/vm/gcc3x-cointerp.c branches/Cog/src/vm/gcc3x-cointerpmt.c branches/Cog/stacksrc/vm/gcc3x-interp.c branches/Cog/stacksrc/vm/interp.c Property Changed: ---------------- branches/Cog/platforms/Cross/vm/sqSCCSVersion.h Modified: branches/Cog/nsspur64src/vm/cogit.h =================================================================== --- branches/Cog/nsspur64src/vm/cogit.h 2016-03-08 22:21:51 UTC (rev 3641) +++ branches/Cog/nsspur64src/vm/cogit.h 2016-03-09 09:00:31 UTC (rev 3642) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.1709 uuid: 10ded6ee-4717-4e34-84d0-9c501aed252b + CCodeGenerator VMMaker.oscog-eem.1716 uuid: 9115c93b-f425-4118-96e7-7130adeff1f2 */ Modified: branches/Cog/nsspur64src/vm/cointerp.c =================================================================== --- branches/Cog/nsspur64src/vm/cointerp.c 2016-03-08 22:21:51 UTC (rev 3641) +++ branches/Cog/nsspur64src/vm/cointerp.c 2016-03-09 09:00:31 UTC (rev 3642) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1709 uuid: 10ded6ee-4717-4e34-84d0-9c501aed252b + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1716 uuid: 9115c93b-f425-4118-96e7-7130adeff1f2 from - CoInterpreter VMMaker.oscog-eem.1709 uuid: 10ded6ee-4717-4e34-84d0-9c501aed252b + CoInterpreter VMMaker.oscog-eem.1716 uuid: 9115c93b-f425-4118-96e7-7130adeff1f2 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1709 uuid: 10ded6ee-4717-4e34-84d0-9c501aed252b " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1716 uuid: 9115c93b-f425-4118-96e7-7130adeff1f2 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2441,7 +2441,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.1709"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.1716"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -41748,6 +41748,8 @@ } sampleBuffer = oop; l1: /* end stackObjectValue: */; + } + if (!GIV(primFailCode)) { /* begin assertClassOf:is: */ ok = (sampleBuffer & (tagMask())) == 0; if (ok) { @@ -46015,7 +46017,8 @@ if (classOrNil != GIV(nilObj)) { index = (((long)i1) << (classTableMajorIndexShift())) + j; if ((classOrNil == aClass) - && (index != expectedIndex1)) { + && ((index != expectedIndex1) + && (index > 0x1F))) { classAtIndexput(index, GIV(nilObj)); if (index < GIV(classTableIndex)) { GIV(classTableIndex) = index; @@ -52764,10 +52767,16 @@ assert(validClassTableRootPages()); GIV(classTableFirstPage) = longAt((GIV(hiddenRootsObj) + BaseHeaderSize) + (0LL << (shiftForWord()))); assert(((numSlotsOf(GIV(classTableFirstPage))) - 1) == (classTableMinorIndexMask())); + flag("remove at some stage"); + if (((longAt(GIV(classTableFirstPage))) & (classIndexMask())) != 16) { + /* begin setClassIndexOf:to: */ + assert(((16 >= 0) && (16 <= (classIndexMask())))); + longAtput(GIV(classTableFirstPage), ((longAt(GIV(classTableFirstPage))) & (~(classIndexMask()))) + 16); + } GIV(numClassTablePages) = 1LL << (22 - (classTableMajorIndexShift())); - for (i = 2; i < GIV(numClassTablePages); i += 1) { - if ((longAt((GIV(hiddenRootsObj) + BaseHeaderSize) + (((long)i) << (shiftForWord())))) == GIV(nilObj)) { - GIV(numClassTablePages) = i; + for (i1 = 2; i1 < GIV(numClassTablePages); i1 += 1) { + if ((longAt((GIV(hiddenRootsObj) + BaseHeaderSize) + (((long)i1) << (shiftForWord())))) == GIV(nilObj)) { + GIV(numClassTablePages) = i1; GIV(classTableIndex) = ((long)((((GIV(numClassTablePages) - 1) < 1) ? 1 : (GIV(numClassTablePages) - 1)))) << (classTableMajorIndexShift()); goto l1; } @@ -52785,10 +52794,10 @@ assert((formatOf(freeListObj)) == (wordIndexableFormat())); GIV(freeLists) = firstIndexableField(freeListObj); GIV(freeListsMask) = 0; - for (i1 = 0, iLimiT = (64 - 1); i1 <= iLimiT; i1 += 1) { - if ((GIV(freeLists)[i1]) != 0) { - GIV(freeListsMask) = GIV(freeListsMask) | (1LL << i1); - GIV(freeLists)[i1] = (swizzleObj(GIV(freeLists)[i1])); + for (i = 0, iLimiT = (64 - 1); i <= iLimiT; i += 1) { + if ((GIV(freeLists)[i]) != 0) { + GIV(freeListsMask) = GIV(freeListsMask) | (1LL << i); + GIV(freeLists)[i] = (swizzleObj(GIV(freeLists)[i])); } } collapseSegmentsPostSwizzle(); @@ -55286,7 +55295,8 @@ l1: /* end classOrNilAtIndex: */; assert(objCouldBeClassObj(classObj)); realClassIndex = (long32At(classObj + 4)) & (identityHashHalfWordMask()); - if (classIndex != realClassIndex) { + if ((classIndex != realClassIndex) + && (realClassIndex > 0x1F)) { /* begin setClassIndexOf:to: */ assert(((realClassIndex >= 0) && (realClassIndex <= (classIndexMask())))); longAtput(objOop, ((longAt(objOop)) & (~(classIndexMask()))) + realClassIndex); @@ -66997,7 +67007,7 @@ sqInt limit; sqInt newEndOfMemory; sqInt next; - usqInt node; + sqInt node; usqInt numSlots; usqInt numSlots1; SpurSegmentInfo *seg; @@ -67126,7 +67136,7 @@ static sqInt NoDbgRegParms readHeapFromImageFiledataBytes(sqImageFile f, sqInt numBytes) { DECL_MAYBE_SQ_GLOBAL_STRUCT - usqInt bridge; + sqInt bridge; usqInt bridgehead; usqLong bridgeSpan; sqInt bytesRead; Modified: branches/Cog/nsspur64src/vm/cointerp.h =================================================================== --- branches/Cog/nsspur64src/vm/cointerp.h 2016-03-08 22:21:51 UTC (rev 3641) +++ branches/Cog/nsspur64src/vm/cointerp.h 2016-03-09 09:00:31 UTC (rev 3642) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1709 uuid: 10ded6ee-4717-4e34-84d0-9c501aed252b + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1716 uuid: 9115c93b-f425-4118-96e7-7130adeff1f2 */ Modified: branches/Cog/nsspur64src/vm/gcc3x-cointerp.c =================================================================== --- branches/Cog/nsspur64src/vm/gcc3x-cointerp.c 2016-03-08 22:21:51 UTC (rev 3641) +++ branches/Cog/nsspur64src/vm/gcc3x-cointerp.c 2016-03-09 09:00:31 UTC (rev 3642) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1709 uuid: 10ded6ee-4717-4e34-84d0-9c501aed252b + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1716 uuid: 9115c93b-f425-4118-96e7-7130adeff1f2 from - CoInterpreter VMMaker.oscog-eem.1709 uuid: 10ded6ee-4717-4e34-84d0-9c501aed252b + CoInterpreter VMMaker.oscog-eem.1716 uuid: 9115c93b-f425-4118-96e7-7130adeff1f2 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1709 uuid: 10ded6ee-4717-4e34-84d0-9c501aed252b " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1716 uuid: 9115c93b-f425-4118-96e7-7130adeff1f2 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2444,7 +2444,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.1709"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.1716"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -41757,6 +41757,8 @@ } sampleBuffer = oop; l1: /* end stackObjectValue: */; + } + if (!GIV(primFailCode)) { /* begin assertClassOf:is: */ ok = (sampleBuffer & (tagMask())) == 0; if (ok) { @@ -46024,7 +46026,8 @@ if (classOrNil != GIV(nilObj)) { index = (((long)i1) << (classTableMajorIndexShift())) + j; if ((classOrNil == aClass) - && (index != expectedIndex1)) { + && ((index != expectedIndex1) + && (index > 0x1F))) { classAtIndexput(index, GIV(nilObj)); if (index < GIV(classTableIndex)) { GIV(classTableIndex) = index; @@ -52773,10 +52776,16 @@ assert(validClassTableRootPages()); GIV(classTableFirstPage) = longAt((GIV(hiddenRootsObj) + BaseHeaderSize) + (0LL << (shiftForWord()))); assert(((numSlotsOf(GIV(classTableFirstPage))) - 1) == (classTableMinorIndexMask())); + flag("remove at some stage"); + if (((longAt(GIV(classTableFirstPage))) & (classIndexMask())) != 16) { + /* begin setClassIndexOf:to: */ + assert(((16 >= 0) && (16 <= (classIndexMask())))); + longAtput(GIV(classTableFirstPage), ((longAt(GIV(classTableFirstPage))) & (~(classIndexMask()))) + 16); + } GIV(numClassTablePages) = 1LL << (22 - (classTableMajorIndexShift())); - for (i = 2; i < GIV(numClassTablePages); i += 1) { - if ((longAt((GIV(hiddenRootsObj) + BaseHeaderSize) + (((long)i) << (shiftForWord())))) == GIV(nilObj)) { - GIV(numClassTablePages) = i; + for (i1 = 2; i1 < GIV(numClassTablePages); i1 += 1) { + if ((longAt((GIV(hiddenRootsObj) + BaseHeaderSize) + (((long)i1) << (shiftForWord())))) == GIV(nilObj)) { + GIV(numClassTablePages) = i1; GIV(classTableIndex) = ((long)((((GIV(numClassTablePages) - 1) < 1) ? 1 : (GIV(numClassTablePages) - 1)))) << (classTableMajorIndexShift()); goto l1; } @@ -52794,10 +52803,10 @@ assert((formatOf(freeListObj)) == (wordIndexableFormat())); GIV(freeLists) = firstIndexableField(freeListObj); GIV(freeListsMask) = 0; - for (i1 = 0, iLimiT = (64 - 1); i1 <= iLimiT; i1 += 1) { - if ((GIV(freeLists)[i1]) != 0) { - GIV(freeListsMask) = GIV(freeListsMask) | (1LL << i1); - GIV(freeLists)[i1] = (swizzleObj(GIV(freeLists)[i1])); + for (i = 0, iLimiT = (64 - 1); i <= iLimiT; i += 1) { + if ((GIV(freeLists)[i]) != 0) { + GIV(freeListsMask) = GIV(freeListsMask) | (1LL << i); + GIV(freeLists)[i] = (swizzleObj(GIV(freeLists)[i])); } } collapseSegmentsPostSwizzle(); @@ -55295,7 +55304,8 @@ l1: /* end classOrNilAtIndex: */; assert(objCouldBeClassObj(classObj)); realClassIndex = (long32At(classObj + 4)) & (identityHashHalfWordMask()); - if (classIndex != realClassIndex) { + if ((classIndex != realClassIndex) + && (realClassIndex > 0x1F)) { /* begin setClassIndexOf:to: */ assert(((realClassIndex >= 0) && (realClassIndex <= (classIndexMask())))); longAtput(objOop, ((longAt(objOop)) & (~(classIndexMask()))) + realClassIndex); @@ -67006,7 +67016,7 @@ sqInt limit; sqInt newEndOfMemory; sqInt next; - usqInt node; + sqInt node; usqInt numSlots; usqInt numSlots1; SpurSegmentInfo *seg; @@ -67135,7 +67145,7 @@ static sqInt NoDbgRegParms readHeapFromImageFiledataBytes(sqImageFile f, sqInt numBytes) { DECL_MAYBE_SQ_GLOBAL_STRUCT - usqInt bridge; + sqInt bridge; usqInt bridgehead; usqLong bridgeSpan; sqInt bytesRead; Modified: branches/Cog/nsspursrc/vm/cogit.h =================================================================== --- branches/Cog/nsspursrc/vm/cogit.h 2016-03-08 22:21:51 UTC (rev 3641) +++ branches/Cog/nsspursrc/vm/cogit.h 2016-03-09 09:00:31 UTC (rev 3642) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.1709 uuid: 10ded6ee-4717-4e34-84d0-9c501aed252b + CCodeGenerator VMMaker.oscog-eem.1716 uuid: 9115c93b-f425-4118-96e7-7130adeff1f2 */ Modified: branches/Cog/nsspursrc/vm/cointerp.c =================================================================== --- branches/Cog/nsspursrc/vm/cointerp.c 2016-03-08 22:21:51 UTC (rev 3641) +++ branches/Cog/nsspursrc/vm/cointerp.c 2016-03-09 09:00:31 UTC (rev 3642) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1709 uuid: 10ded6ee-4717-4e34-84d0-9c501aed252b + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1716 uuid: 9115c93b-f425-4118-96e7-7130adeff1f2 from - CoInterpreter VMMaker.oscog-eem.1709 uuid: 10ded6ee-4717-4e34-84d0-9c501aed252b + CoInterpreter VMMaker.oscog-eem.1716 uuid: 9115c93b-f425-4118-96e7-7130adeff1f2 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1709 uuid: 10ded6ee-4717-4e34-84d0-9c501aed252b " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1716 uuid: 9115c93b-f425-4118-96e7-7130adeff1f2 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -1608,8 +1608,8 @@ _iss sqInt bytesPerPage; _iss sqInt numSegments; _iss sqInt localAbsentReceiver; +_iss sqInt classTableFirstPage; _iss sqInt traceLogIndex; -_iss sqInt classTableFirstPage; _iss sqInt * freeLists; _iss char * stackLimit; _iss sqInt lkupClass; @@ -2410,7 +2410,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.1709"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.1716"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -41102,6 +41102,8 @@ } sampleBuffer = oop; l1: /* end stackObjectValue: */; + } + if (!GIV(primFailCode)) { /* begin assertClassOf:is: */ ok = (sampleBuffer & (tagMask())) == 0; if (ok) { @@ -45304,7 +45306,8 @@ if (classOrNil != GIV(nilObj)) { index = (i1 << (classTableMajorIndexShift())) + j; if ((classOrNil == aClass) - && (index != expectedIndex1)) { + && ((index != expectedIndex1) + && (index > 0x1F))) { classAtIndexput(index, GIV(nilObj)); if (index < GIV(classTableIndex)) { GIV(classTableIndex) = index; @@ -52030,10 +52033,17 @@ assert(validClassTableRootPages()); GIV(classTableFirstPage) = longAt((GIV(hiddenRootsObj) + BaseHeaderSize) + (0L << (shiftForWord()))); assert(((numSlotsOf(GIV(classTableFirstPage))) - 1) == (classTableMinorIndexMask())); + flag("remove at some stage"); + if (((longAt(GIV(classTableFirstPage))) & (classIndexMask())) != 16) { + /* begin setClassIndexOf:to: */ + assert(((16 >= 0) && (16 <= (classIndexMask())))); + flag("endianness"); + longAtput(GIV(classTableFirstPage), ((longAt(GIV(classTableFirstPage))) & ((unsigned int)~(classIndexMask()))) + 16); + } GIV(numClassTablePages) = 1L << (22 - (classTableMajorIndexShift())); - for (i = 2; i < GIV(numClassTablePages); i += 1) { - if ((longAt((GIV(hiddenRootsObj) + BaseHeaderSize) + (i << (shiftForWord())))) == GIV(nilObj)) { - GIV(numClassTablePages) = i; + for (i1 = 2; i1 < GIV(numClassTablePages); i1 += 1) { + if ((longAt((GIV(hiddenRootsObj) + BaseHeaderSize) + (i1 << (shiftForWord())))) == GIV(nilObj)) { + GIV(numClassTablePages) = i1; GIV(classTableIndex) = ((((GIV(numClassTablePages) - 1) < 1) ? 1 : (GIV(numClassTablePages) - 1))) << (classTableMajorIndexShift()); goto l1; } @@ -52051,10 +52061,10 @@ assert((formatOf(freeListObj)) == (wordIndexableFormat())); GIV(freeLists) = firstIndexableField(freeListObj); GIV(freeListsMask) = 0; - for (i1 = 0, iLimiT = (32 - 1); i1 <= iLimiT; i1 += 1) { - if ((GIV(freeLists)[i1]) != 0) { - GIV(freeListsMask) = GIV(freeListsMask) | (1L << i1); - GIV(freeLists)[i1] = (swizzleObj(GIV(freeLists)[i1])); + for (i = 0, iLimiT = (32 - 1); i <= iLimiT; i += 1) { + if ((GIV(freeLists)[i]) != 0) { + GIV(freeListsMask) = GIV(freeListsMask) | (1L << i); + GIV(freeLists)[i] = (swizzleObj(GIV(freeLists)[i])); } } collapseSegmentsPostSwizzle(); @@ -54548,7 +54558,8 @@ l1: /* end classOrNilAtIndex: */; assert(objCouldBeClassObj(classObj)); realClassIndex = (long32At(classObj + 4)) & (identityHashHalfWordMask()); - if (classIndex != realClassIndex) { + if ((classIndex != realClassIndex) + && (realClassIndex > 0x1F)) { /* begin setClassIndexOf:to: */ assert(((realClassIndex >= 0) && (realClassIndex <= (classIndexMask())))); flag("endianness"); @@ -66087,7 +66098,7 @@ sqInt limit; sqInt newEndOfMemory; sqInt next; - usqInt node; + sqInt node; usqInt numSlots; usqInt numSlots1; SpurSegmentInfo *seg; Modified: branches/Cog/nsspursrc/vm/cointerp.h =================================================================== --- branches/Cog/nsspursrc/vm/cointerp.h 2016-03-08 22:21:51 UTC (rev 3641) +++ branches/Cog/nsspursrc/vm/cointerp.h 2016-03-09 09:00:31 UTC (rev 3642) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1709 uuid: 10ded6ee-4717-4e34-84d0-9c501aed252b + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1716 uuid: 9115c93b-f425-4118-96e7-7130adeff1f2 */ Modified: branches/Cog/nsspursrc/vm/gcc3x-cointerp.c =================================================================== --- branches/Cog/nsspursrc/vm/gcc3x-cointerp.c 2016-03-08 22:21:51 UTC (rev 3641) +++ branches/Cog/nsspursrc/vm/gcc3x-cointerp.c 2016-03-09 09:00:31 UTC (rev 3642) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1709 uuid: 10ded6ee-4717-4e34-84d0-9c501aed252b + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1716 uuid: 9115c93b-f425-4118-96e7-7130adeff1f2 from - CoInterpreter VMMaker.oscog-eem.1709 uuid: 10ded6ee-4717-4e34-84d0-9c501aed252b + CoInterpreter VMMaker.oscog-eem.1716 uuid: 9115c93b-f425-4118-96e7-7130adeff1f2 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1709 uuid: 10ded6ee-4717-4e34-84d0-9c501aed252b " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1716 uuid: 9115c93b-f425-4118-96e7-7130adeff1f2 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -1611,8 +1611,8 @@ _iss sqInt bytesPerPage; _iss sqInt numSegments; _iss sqInt localAbsentReceiver; +_iss sqInt classTableFirstPage; _iss sqInt traceLogIndex; -_iss sqInt classTableFirstPage; _iss sqInt * freeLists; _iss char * stackLimit; _iss sqInt lkupClass; @@ -2413,7 +2413,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.1709"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.1716"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -41111,6 +41111,8 @@ } sampleBuffer = oop; l1: /* end stackObjectValue: */; + } + if (!GIV(primFailCode)) { /* begin assertClassOf:is: */ ok = (sampleBuffer & (tagMask())) == 0; if (ok) { @@ -45313,7 +45315,8 @@ if (classOrNil != GIV(nilObj)) { index = (i1 << (classTableMajorIndexShift())) + j; if ((classOrNil == aClass) - && (index != expectedIndex1)) { + && ((index != expectedIndex1) + && (index > 0x1F))) { classAtIndexput(index, GIV(nilObj)); if (index < GIV(classTableIndex)) { GIV(classTableIndex) = index; @@ -52039,10 +52042,17 @@ assert(validClassTableRootPages()); GIV(classTableFirstPage) = longAt((GIV(hiddenRootsObj) + BaseHeaderSize) + (0L << (shiftForWord()))); assert(((numSlotsOf(GIV(classTableFirstPage))) - 1) == (classTableMinorIndexMask())); + flag("remove at some stage"); + if (((longAt(GIV(classTableFirstPage))) & (classIndexMask())) != 16) { + /* begin setClassIndexOf:to: */ + assert(((16 >= 0) && (16 <= (classIndexMask())))); + flag("endianness"); + longAtput(GIV(classTableFirstPage), ((longAt(GIV(classTableFirstPage))) & ((unsigned int)~(classIndexMask()))) + 16); + } GIV(numClassTablePages) = 1L << (22 - (classTableMajorIndexShift())); - for (i = 2; i < GIV(numClassTablePages); i += 1) { - if ((longAt((GIV(hiddenRootsObj) + BaseHeaderSize) + (i << (shiftForWord())))) == GIV(nilObj)) { - GIV(numClassTablePages) = i; + for (i1 = 2; i1 < GIV(numClassTablePages); i1 += 1) { + if ((longAt((GIV(hiddenRootsObj) + BaseHeaderSize) + (i1 << (shiftForWord())))) == GIV(nilObj)) { + GIV(numClassTablePages) = i1; GIV(classTableIndex) = ((((GIV(numClassTablePages) - 1) < 1) ? 1 : (GIV(numClassTablePages) - 1))) << (classTableMajorIndexShift()); goto l1; } @@ -52060,10 +52070,10 @@ assert((formatOf(freeListObj)) == (wordIndexableFormat())); GIV(freeLists) = firstIndexableField(freeListObj); GIV(freeListsMask) = 0; - for (i1 = 0, iLimiT = (32 - 1); i1 <= iLimiT; i1 += 1) { - if ((GIV(freeLists)[i1]) != 0) { - GIV(freeListsMask) = GIV(freeListsMask) | (1L << i1); - GIV(freeLists)[i1] = (swizzleObj(GIV(freeLists)[i1])); + for (i = 0, iLimiT = (32 - 1); i <= iLimiT; i += 1) { + if ((GIV(freeLists)[i]) != 0) { + GIV(freeListsMask) = GIV(freeListsMask) | (1L << i); + GIV(freeLists)[i] = (swizzleObj(GIV(freeLists)[i])); } } collapseSegmentsPostSwizzle(); @@ -54557,7 +54567,8 @@ l1: /* end classOrNilAtIndex: */; assert(objCouldBeClassObj(classObj)); realClassIndex = (long32At(classObj + 4)) & (identityHashHalfWordMask()); - if (classIndex != realClassIndex) { + if ((classIndex != realClassIndex) + && (realClassIndex > 0x1F)) { /* begin setClassIndexOf:to: */ assert(((realClassIndex >= 0) && (realClassIndex <= (classIndexMask())))); flag("endianness"); @@ -66096,7 +66107,7 @@ sqInt limit; sqInt newEndOfMemory; sqInt next; - usqInt node; + sqInt node; usqInt numSlots; usqInt numSlots1; SpurSegmentInfo *seg; Modified: branches/Cog/nsspurstack64src/vm/gcc3x-interp.c =================================================================== --- branches/Cog/nsspurstack64src/vm/gcc3x-interp.c 2016-03-08 22:21:51 UTC (rev 3641) +++ branches/Cog/nsspurstack64src/vm/gcc3x-interp.c 2016-03-09 09:00:31 UTC (rev 3642) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1709 uuid: 10ded6ee-4717-4e34-84d0-9c501aed252b + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1716 uuid: 9115c93b-f425-4118-96e7-7130adeff1f2 from - StackInterpreter VMMaker.oscog-eem.1709 uuid: 10ded6ee-4717-4e34-84d0-9c501aed252b + StackInterpreter VMMaker.oscog-eem.1716 uuid: 9115c93b-f425-4118-96e7-7130adeff1f2 */ -static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1709 uuid: 10ded6ee-4717-4e34-84d0-9c501aed252b " __DATE__ ; +static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1716 uuid: 9115c93b-f425-4118-96e7-7130adeff1f2 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2185,7 +2185,7 @@ /* 575 */ (void (*)(void))0, 0 }; char expensiveAsserts = 0; -const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscog-eem.1709"; +const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscog-eem.1716"; volatile int sendTrace; sqInt suppressHeartbeatFlag; @@ -28470,6 +28470,8 @@ } sampleBuffer = oop; l1: /* end stackObjectValue: */; + } + if (!GIV(primFailCode)) { /* begin assertClassOf:is: */ ok = (sampleBuffer & (tagMask())) == 0; if (ok) { @@ -32582,7 +32584,8 @@ if (classOrNil != GIV(nilObj)) { index = (((long)i1) << (classTableMajorIndexShift())) + j; if ((classOrNil == aClass) - && (index != expectedIndex1)) { + && ((index != expectedIndex1) + && (index > 0x1F))) { classAtIndexput(index, GIV(nilObj)); if (index < GIV(classTableIndex)) { GIV(classTableIndex) = index; @@ -39443,10 +39446,16 @@ assert(validClassTableRootPages()); GIV(classTableFirstPage) = longAt((GIV(hiddenRootsObj) + BaseHeaderSize) + (0LL << (shiftForWord()))); assert(((numSlotsOf(GIV(classTableFirstPage))) - 1) == (classTableMinorIndexMask())); + flag("remove at some stage"); + if (((longAt(GIV(classTableFirstPage))) & (classIndexMask())) != 16) { + /* begin setClassIndexOf:to: */ + assert(((16 >= 0) && (16 <= (classIndexMask())))); + longAtput(GIV(classTableFirstPage), ((longAt(GIV(classTableFirstPage))) & (~(classIndexMask()))) + 16); + } GIV(numClassTablePages) = 1LL << (22 - (classTableMajorIndexShift())); - for (i = 2; i < GIV(numClassTablePages); i += 1) { - if ((longAt((GIV(hiddenRootsObj) + BaseHeaderSize) + (((long)i) << (shiftForWord())))) == GIV(nilObj)) { - GIV(numClassTablePages) = i; + for (i1 = 2; i1 < GIV(numClassTablePages); i1 += 1) { + if ((longAt((GIV(hiddenRootsObj) + BaseHeaderSize) + (((long)i1) << (shiftForWord())))) == GIV(nilObj)) { + GIV(numClassTablePages) = i1; GIV(classTableIndex) = ((long)((((GIV(numClassTablePages) - 1) < 1) ? 1 : (GIV(numClassTablePages) - 1)))) << (classTableMajorIndexShift()); goto l1; } @@ -39464,10 +39473,10 @@ assert((formatOf(freeListObj)) == (wordIndexableFormat())); GIV(freeLists) = firstIndexableField(freeListObj); GIV(freeListsMask) = 0; - for (i1 = 0, iLimiT = (64 - 1); i1 <= iLimiT; i1 += 1) { - if ((GIV(freeLists)[i1]) != 0) { - GIV(freeListsMask) = GIV(freeListsMask) | (1LL << i1); - GIV(freeLists)[i1] = (swizzleObj(GIV(freeLists)[i1])); + for (i = 0, iLimiT = (64 - 1); i <= iLimiT; i += 1) { + if ((GIV(freeLists)[i]) != 0) { + GIV(freeListsMask) = GIV(freeListsMask) | (1LL << i); + GIV(freeLists)[i] = (swizzleObj(GIV(freeLists)[i])); } } collapseSegmentsPostSwizzle(); @@ -41940,7 +41949,8 @@ l1: /* end classOrNilAtIndex: */; assert(objCouldBeClassObj(classObj)); realClassIndex = (long32At(classObj + 4)) & (identityHashHalfWordMask()); - if (classIndex != realClassIndex) { + if ((classIndex != realClassIndex) + && (realClassIndex > 0x1F)) { /* begin setClassIndexOf:to: */ assert(((realClassIndex >= 0) && (realClassIndex <= (classIndexMask())))); longAtput(objOop, ((longAt(objOop)) & (~(classIndexMask()))) + realClassIndex); Modified: branches/Cog/nsspurstack64src/vm/interp.c =================================================================== --- branches/Cog/nsspurstack64src/vm/interp.c 2016-03-08 22:21:51 UTC (rev 3641) +++ branches/Cog/nsspurstack64src/vm/interp.c 2016-03-09 09:00:31 UTC (rev 3642) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1709 uuid: 10ded6ee-4717-4e34-84d0-9c501aed252b + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1716 uuid: 9115c93b-f425-4118-96e7-7130adeff1f2 from - StackInterpreter VMMaker.oscog-eem.1709 uuid: 10ded6ee-4717-4e34-84d0-9c501aed252b + StackInterpreter VMMaker.oscog-eem.1716 uuid: 9115c93b-f425-4118-96e7-7130adeff1f2 */ -static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1709 uuid: 10ded6ee-4717-4e34-84d0-9c501aed252b " __DATE__ ; +static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1716 uuid: 9115c93b-f425-4118-96e7-7130adeff1f2 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2182,7 +2182,7 @@ /* 575 */ (void (*)(void))0, 0 }; char expensiveAsserts = 0; -const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscog-eem.1709"; +const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscog-eem.1716"; volatile int sendTrace; sqInt suppressHeartbeatFlag; @@ -28461,6 +28461,8 @@ } sampleBuffer = oop; l1: /* end stackObjectValue: */; + } + if (!GIV(primFailCode)) { /* begin assertClassOf:is: */ ok = (sampleBuffer & (tagMask())) == 0; if (ok) { @@ -32573,7 +32575,8 @@ if (classOrNil != GIV(nilObj)) { index = (((long)i1) << (classTableMajorIndexShift())) + j; if ((classOrNil == aClass) - && (index != expectedIndex1)) { + && ((index != expectedIndex1) + && (index > 0x1F))) { classAtIndexput(index, GIV(nilObj)); if (index < GIV(classTableIndex)) { GIV(classTableIndex) = index; @@ -39434,10 +39437,16 @@ assert(validClassTableRootPages()); GIV(classTableFirstPage) = longAt((GIV(hiddenRootsObj) + BaseHeaderSize) + (0LL << (shiftForWord()))); assert(((numSlotsOf(GIV(classTableFirstPage))) - 1) == (classTableMinorIndexMask())); + flag("remove at some stage"); + if (((longAt(GIV(classTableFirstPage))) & (classIndexMask())) != 16) { + /* begin setClassIndexOf:to: */ + assert(((16 >= 0) && (16 <= (classIndexMask())))); + longAtput(GIV(classTableFirstPage), ((longAt(GIV(classTableFirstPage))) & (~(classIndexMask()))) + 16); + } GIV(numClassTablePages) = 1LL << (22 - (classTableMajorIndexShift())); - for (i = 2; i < GIV(numClassTablePages); i += 1) { - if ((longAt((GIV(hiddenRootsObj) + BaseHeaderSize) + (((long)i) << (shiftForWord())))) == GIV(nilObj)) { - GIV(numClassTablePages) = i; + for (i1 = 2; i1 < GIV(numClassTablePages); i1 += 1) { + if ((longAt((GIV(hiddenRootsObj) + BaseHeaderSize) + (((long)i1) << (shiftForWord())))) == GIV(nilObj)) { + GIV(numClassTablePages) = i1; GIV(classTableIndex) = ((long)((((GIV(numClassTablePages) - 1) < 1) ? 1 : (GIV(numClassTablePages) - 1)))) << (classTableMajorIndexShift()); goto l1; } @@ -39455,10 +39464,10 @@ assert((formatOf(freeListObj)) == (wordIndexableFormat())); GIV(freeLists) = firstIndexableField(freeListObj); GIV(freeListsMask) = 0; - for (i1 = 0, iLimiT = (64 - 1); i1 <= iLimiT; i1 += 1) { - if ((GIV(freeLists)[i1]) != 0) { - GIV(freeListsMask) = GIV(freeListsMask) | (1LL << i1); - GIV(freeLists)[i1] = (swizzleObj(GIV(freeLists)[i1])); + for (i = 0, iLimiT = (64 - 1); i <= iLimiT; i += 1) { + if ((GIV(freeLists)[i]) != 0) { + GIV(freeListsMask) = GIV(freeListsMask) | (1LL << i); + GIV(freeLists)[i] = (swizzleObj(GIV(freeLists)[i])); } } collapseSegmentsPostSwizzle(); @@ -41931,7 +41940,8 @@ l1: /* end classOrNilAtIndex: */; assert(objCouldBeClassObj(classObj)); realClassIndex = (long32At(classObj + 4)) & (identityHashHalfWordMask()); - if (classIndex != realClassIndex) { + if ((classIndex != realClassIndex) + && (realClassIndex > 0x1F)) { /* begin setClassIndexOf:to: */ assert(((realClassIndex >= 0) && (realClassIndex <= (classIndexMask())))); longAtput(objOop, ((longAt(objOop)) & (~(classIndexMask()))) + realClassIndex); Modified: branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c =================================================================== --- branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c 2016-03-08 22:21:51 UTC (rev 3641) +++ branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c 2016-03-09 09:00:31 UTC (rev 3642) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1709 uuid: 10ded6ee-4717-4e34-84d0-9c501aed252b + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1716 uuid: 9115c93b-f425-4118-96e7-7130adeff1f2 from - StackInterpreter VMMaker.oscog-eem.1709 uuid: 10ded6ee-4717-4e34-84d0-9c501aed252b + StackInterpreter VMMaker.oscog-eem.1716 uuid: 9115c93b-f425-4118-96e7-7130adeff1f2 */ -static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1709 uuid: 10ded6ee-4717-4e34-84d0-9c501aed252b " __DATE__ ; +static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1716 uuid: 9115c93b-f425-4118-96e7-7130adeff1f2 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -1400,8 +1400,8 @@ _iss sqInt numSegments; _iss char * stackMemory; _iss sqInt * freeLists; +_iss sqInt classTableFirstPage; _iss sqInt rememberedSetSize; -_iss sqInt classTableFirstPage; _iss char * stackLimit; _iss sqInt tempOop; _iss sqInt * rememberedSet; @@ -2155,7 +2155,7 @@ /* 575 */ (void (*)(void))0, 0 }; char expensiveAsserts = 0; -const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscog-eem.1709"; +const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscog-eem.1716"; volatile int sendTrace; sqInt suppressHeartbeatFlag; @@ -27456,6 +27456,8 @@ } sampleBuffer = oop; l1: /* end stackObjectValue: */; + } + if (!GIV(primFailCode)) { /* begin assertClassOf:is: */ ok = (sampleBuffer & (tagMask())) == 0; if (ok) { @@ -31510,7 +31512,8 @@ if (classOrNil != GIV(nilObj)) { index = (i1 << (classTableMajorIndexShift())) + j; if ((classOrNil == aClass) - && (index != expectedIndex1)) { + && ((index != expectedIndex1) + && (index > 0x1F))) { classAtIndexput(index, GIV(nilObj)); if (index < GIV(classTableIndex)) { GIV(classTableIndex) = index; @@ -38348,10 +38351,17 @@ assert(validClassTableRootPages()); GIV(classTableFirstPage) = longAt((GIV(hiddenRootsObj) + BaseHeaderSize) + (0L << (shiftForWord()))); assert(((numSlotsOf(GIV(classTableFirstPage))) - 1) == (classTableMinorIndexMask())); + flag("remove at some stage"); + if (((longAt(GIV(classTableFirstPage))) & (classIndexMask())) != 16) { + /* begin setClassIndexOf:to: */ + assert(((16 >= 0) && (16 <= (classIndexMask())))); + flag("endianness"); + longAtput(GIV(classTableFirstPage), ((longAt(GIV(classTableFirstPage))) & ((unsigned int)~(classIndexMask()))) + 16); + } GIV(numClassTablePages) = 1L << (22 - (classTableMajorIndexShift())); - for (i = 2; i < GIV(numClassTablePages); i += 1) { - if ((longAt((GIV(hiddenRootsObj) + BaseHeaderSize) + (i << (shiftForWord())))) == GIV(nilObj)) { - GIV(numClassTablePages) = i; + for (i1 = 2; i1 < GIV(numClassTablePages); i1 += 1) { + if ((longAt((GIV(hiddenRootsObj) + BaseHeaderSize) + (i1 << (shiftForWord())))) == GIV(nilObj)) { + GIV(numClassTablePages) = i1; GIV(classTableIndex) = ((((GIV(numClassTablePages) - 1) < 1) ? 1 : (GIV(numClassTablePages) - 1))) << (classTableMajorIndexShift()); goto l1; } @@ -38369,10 +38379,10 @@ assert((formatOf(freeListObj)) == (wordIndexableFormat())); GIV(freeLists) = firstIndexableField(freeListObj); GIV(freeListsMask) = 0; - for (i1 = 0, iLimiT = (32 - 1); i1 <= iLimiT; i1 += 1) { - if ((GIV(freeLists)[i1]) != 0) { - GIV(freeListsMask) = GIV(freeListsMask) | (1L << i1); - GIV(freeLists)[i1] = (swizzleObj(GIV(freeLists)[i1])); + for (i = 0, iLimiT = (32 - 1); i <= iLimiT; i += 1) { + if ((GIV(freeLists)[i]) != 0) { + GIV(freeListsMask) = GIV(freeListsMask) | (1L << i); + GIV(freeLists)[i] = (swizzleObj(GIV(freeLists)[i])); } } collapseSegmentsPostSwizzle(); @@ -40841,7 +40851,8 @@ l1: /* end classOrNilAtIndex: */; assert(objCouldBeClassObj(classObj)); realClassIndex = (long32At(classObj + 4)) & (identityHashHalfWordMask()); - if (classIndex != realClassIndex) { + if ((classIndex != realClassIndex) + && (realClassIndex > 0x1F)) { /* begin setClassIndexOf:to: */ assert(((realClassIndex >= 0) && (realClassIndex <= (classIndexMask())))); flag("endianness"); Modified: branches/Cog/nsspurstacksrc/vm/interp.c =================================================================== --- branches/Cog/nsspurstacksrc/vm/interp.c 2016-03-08 22:21:51 UTC (rev 3641) +++ branches/Cog/nsspurstacksrc/vm/interp.c 2016-03-09 09:00:31 UTC (rev 3642) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1709 uuid: 10ded6ee-4717-4e34-84d0-9c501aed252b + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1716 uuid: 9115c93b-f425-4118-96e7-7130adeff1f2 from - StackInterpreter VMMaker.oscog-eem.1709 uuid: 10ded6ee-4717-4e34-84d0-9c501aed252b + StackInterpreter VMMaker.oscog-eem.1716 uuid: 9115c93b-f425-4118-96e7-7130adeff1f2 */ -static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1709 uuid: 10ded6ee-4717-4e34-84d0-9c501aed252b " __DATE__ ; +static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1716 uuid: 9115c93b-f425-4118-96e7-7130adeff1f2 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -1397,8 +1397,8 @@ _iss sqInt numSegments; _iss char * stackMemory; _iss sqInt * freeLists; +_iss sqInt classTableFirstPage; _iss sqInt rememberedSetSize; -_iss sqInt classTableFirstPage; _iss char * stackLimit; _iss sqInt tempOop; _iss sqInt * rememberedSet; @@ -2152,7 +2152,7 @@ /* 575 */ (void (*)(void))0, 0 }; char expensiveAsserts = 0; -const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscog-eem.1709"; +const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscog-eem.1716"; volatile int sendTrace; sqInt suppressHeartbeatFlag; @@ -27447,6 +27447,8 @@ } sampleBuffer = oop; l1: /* end stackObjectValue: */; + } + if (!GIV(primFailCode)) { /* begin assertClassOf:is: */ ok = (sampleBuffer & (tagMask())) == 0; if (ok) { @@ -31501,7 +31503,8 @@ if (classOrNil != GIV(nilObj)) { index = (i1 << (classTableMajorIndexShift())) + j; if ((classOrNil == aClass) - && (index != expectedIndex1)) { + && ((index != expectedIndex1) + && (index > 0x1F))) { classAtIndexput(index, GIV(nilObj)); if (index < GIV(classTableIndex)) { GIV(classTableIndex) = index; @@ -38339,10 +38342,17 @@ assert(validClassTableRootPages()); GIV(classTableFirstPage) = longAt((GIV(hiddenRootsObj) + BaseHeaderSize) + (0L << (shiftForWord()))); assert(((numSlotsOf(GIV(classTableFirstPage))) - 1) == (classTableMinorIndexMask())); + flag("remove at some stage"); + if (((longAt(GIV(classTableFirstPage))) & (classIndexMask())) != 16) { + /* begin setClassIndexOf:to: */ + assert(((16 >= 0) && (16 <= (classIndexMask())))); + flag("endianness"); + longAtput(GIV(classTableFirstPage), ((longAt(GIV(classTableFirstPage))) & ((unsigned int)~(classIndexMask()))) + 16); + } GIV(numClassTablePages) = 1L << (22 - (classTableMajorIndexShift())); - for (i = 2; i < GIV(numClassTablePages); i += 1) { - if ((longAt((GIV(hiddenRootsObj) + BaseHeaderSize) + (i << (shiftForWord())))) == GIV(nilObj)) { - GIV(numClassTablePages) = i; + for (i1 = 2; i1 < GIV(numClassTablePages); i1 += 1) { + if ((longAt((GIV(hiddenRootsObj) + BaseHeaderSize) + (i1 << (shiftForWord())))) == GIV(nilObj)) { + GIV(numClassTablePages) = i1; GIV(classTableIndex) = ((((GIV(numClassTablePages) - 1) < 1) ? 1 : (GIV(numClassTablePages) - 1))) << (classTableMajorIndexShift()); goto l1; } @@ -38360,10 +38370,10 @@ assert((formatOf(freeListObj)) == (wordIndexableFormat())); GIV(freeLists) = firstIndexableField(freeListObj); GIV(freeListsMask) = 0; - for (i1 = 0, iLimiT = (32 - 1); i1 <= iLimiT; i1 += 1) { - if ((GIV(freeLists)[i1]) != 0) { - GIV(freeListsMask) = GIV(freeListsMask) | (1L << i1); - GIV(freeLists)[i1] = (swizzleObj(GIV(freeLists)[i1])); + for (i = 0, iLimiT = (32 - 1); i <= iLimiT; i += 1) { + if ((GIV(freeLists)[i]) != 0) { + GIV(freeListsMask) = GIV(freeListsMask) | (1L << i); + GIV(freeLists)[i] = (swizzleObj(GIV(freeLists)[i])); } } collapseSegmentsPostSwizzle(); @@ -40832,7 +40842,8 @@ l1: /* end classOrNilAtIndex: */; assert(objCouldBeClassObj(classObj)); realClassIndex = (long32At(classObj + 4)) & (identityHashHalfWordMask()); - if (classIndex != realClassIndex) { + if ((classIndex != realClassIndex) + && (realClassIndex > 0x1F)) { /* begin setClassIndexOf:to: */ assert(((realClassIndex >= 0) && (realClassIndex <= (classIndexMask())))); flag("endianness"); Property changes on: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h ___________________________________________________________________ Modified: checkindate - Fri Mar 4 17:02:37 PST 2016 + Wed Mar 9 00:58:46 PST 2016 Modified: branches/Cog/spur64src/vm/cogit.h =================================================================== --- branches/Cog/spur64src/vm/cogit.h 2016-03-08 22:21:51 UTC (rev 3641) +++ branches/Cog/spur64src/vm/cogit.h 2016-03-09 09:00:31 UTC (rev 3642) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.1709 uuid: 10ded6ee-4717-4e34-84d0-9c501aed252b + CCodeGenerator VMMaker.oscog-eem.1716 uuid: 9115c93b-f425-4118-96e7-7130adeff1f2 */ Modified: branches/Cog/spur64src/vm/cointerp.c =================================================================== --- branches/Cog/spur64src/vm/cointerp.c 2016-03-08 22:21:51 UTC (rev 3641) +++ branches/Cog/spur64src/vm/cointerp.c 2016-03-09 09:00:31 UTC (rev 3642) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1709 uuid: 10ded6ee-4717-4e34-84d0-9c501aed252b + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1716 uuid: 9115c93b-f425-4118-96e7-7130adeff1f2 from - CoInterpreter VMMaker.oscog-eem.1709 uuid: 10ded6ee-4717-4e34-84d0-9c501aed252b + CoInterpreter VMMaker.oscog-eem.1716 uuid: 9115c93b-f425-4118-96e7-7130adeff1f2 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1709 uuid: 10ded6ee-4717-4e34-84d0-9c501aed252b " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1716 uuid: 9115c93b-f425-4118-96e7-7130adeff1f2 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -1604,9 +1604,9 @@ _iss sqInt needGCFlag; _iss sqInt * freeLists; _iss sqInt traceLogIndex; +_iss sqInt classTableFirstPage; _iss sqInt rememberedSetSize; _iss char * stackLimit; -_iss sqInt classTableFirstPage; _iss usqInt scavengeThreshold; _iss sqInt * rememberedSet; _iss sqInt remapBufferCount; @@ -2404,7 +2404,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[Spur] VM [CoInterpreterPrimitives VMMaker.oscog-eem.1709]"; +const char *interpreterVersion = "Croquet Closure Cog[Spur] VM [CoInterpreterPrimitives VMMaker.oscog-eem.1716]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -36918,6 +36918,8 @@ } sampleBuffer = oop; l1: /* end stackObjectValue: */; + } + if (!GIV(primFailCode)) { /* begin assertClassOf:is: */ ok = (sampleBuffer & (tagMask())) == 0; if (ok) { @@ -41185,7 +41187,8 @@ if (classOrNil != GIV(nilObj)) { index = (((long)i1) << (classTableMajorIndexShift())) + j; if ((classOrNil == aClass) - && (index != expectedIndex1)) { + && ((index != expectedIndex1) + && (index > 0x1F))) { classAtIndexput(index, GIV(nilObj)); if (index < GIV(classTableIndex)) { GIV(classTableIndex) = index; @@ -47934,10 +47937,16 @@ assert(validClassTableRootPages()); GIV(classTableFirstPage) = longAt((GIV(hiddenRootsObj) + BaseHeaderSize) + (0LL << (shiftForWord()))); assert(((numSlotsOf(GIV(classTableFirstPage))) - 1) == (classTableMinorIndexMask())); + flag("remove at some stage"); + if (((longAt(GIV(classTableFirstPage))) & (classIndexMask())) != 16) { + /* begin setClassIndexOf:to: */ + assert(((16 >= 0) && (16 <= (classIndexMask())))); + longAtput(GIV(classTableFirstPage), ((longAt(GIV(classTableFirstPage))) & (~(classIndexMask()))) + 16); + } GIV(numClassTablePages) = 1LL << (22 - (classTableMajorIndexShift())); - for (i = 2; i < GIV(numClassTablePages); i += 1) { - if ((longAt((GIV(hiddenRootsObj) + BaseHeaderSize) + (((long)i) << (shiftForWord())))) == GIV(nilObj)) { - GIV(numClassTablePages) = i; + for (i1 = 2; i1 < GIV(numClassTablePages); i1 += 1) { + if ((longAt((GIV(hiddenRootsObj) + BaseHeaderSize) + (((long)i1) << (shiftForWord())))) == GIV(nilObj)) { + GIV(numClassTablePages) = i1; GIV(classTableIndex) = ((long)((((GIV(numClassTablePages) - 1) < 1) ? 1 : (GIV(numClassTablePages) - 1)))) << (classTableMajorIndexShift()); goto l1; } @@ -47955,10 +47964,10 @@ assert((formatOf(freeListObj)) == (wordIndexableFormat())); GIV(freeLists) = firstIndexableField(freeListObj); GIV(freeListsMask) = 0; - for (i1 = 0, iLimiT = (64 - 1); i1 <= iLimiT; i1 += 1) { - if ((GIV(freeLists)[i1]) != 0) { - GIV(freeListsMask) = GIV(freeListsMask) | (1LL << i1); - GIV(freeLists)[i1] = (swizzleObj(GIV(freeLists)[i1])); + for (i = 0, iLimiT = (64 - 1); i <= iLimiT; i += 1) { + if ((GIV(freeLists)[i]) != 0) { + GIV(freeListsMask) = GIV(freeListsMask) | (1LL << i); + GIV(freeLists)[i] = (swizzleObj(GIV(freeLists)[i])); } } collapseSegmentsPostSwizzle(); @@ -50456,7 +50465,8 @@ l1: /* end classOrNilAtIndex: */; assert(objCouldBeClassObj(classObj)); realClassIndex = (long32At(classObj + 4)) & (identityHashHalfWordMask()); - if (classIndex != realClassIndex) { + if ((classIndex != realClassIndex) + && (realClassIndex > 0x1F)) { /* begin setClassIndexOf:to: */ assert(((realClassIndex >= 0) && (realClassIndex <= (classIndexMask())))); longAtput(objOop, ((longAt(objOop)) & (~(classIndexMask()))) + realClassIndex); @@ -56558,7 +56568,7 @@ usqInt prevFree; usqInt prevFreeChunk; usqInt prevPrevFree; - usqInt prevPrevFreeChunk; + sqInt prevPrevFreeChunk; sqInt slotBytes; sqInt slotBytes1; usqInt there; @@ -61903,7 +61913,7 @@ bridgeFromto(SpurSegmentInfo *aSegment, SpurSegmentInfo *nextSegmentOrNil) { usqInt bridgeSpan; - sqInt clifton; + usqInt clifton; usqInt segEnd; segEnd = ((aSegment->segSize)) + ((aSegment->segStart)); @@ -62147,7 +62157,7 @@ sqInt limit; sqInt newEndOfMemory; sqInt next; - sqInt node; + usqInt node; usqInt numSlots; usqInt numSlots1; SpurSegmentInfo *seg; @@ -62276,7 +62286,7 @@ static sqInt NoDbgRegParms readHeapFromImageFiledataBytes(sqImageFile f, sqInt numBytes) { DECL_MAYBE_SQ_GLOBAL_STRUCT - usqInt bridge; + sqInt bridge; usqInt bridgehead; usqLong bridgeSpan; sqInt bytesRead; Modified: branches/Cog/spur64src/vm/cointerp.h =================================================================== --- branches/Cog/spur64src/vm/cointerp.h 2016-03-08 22:21:51 UTC (rev 3641) +++ branches/Cog/spur64src/vm/cointerp.h 2016-03-09 09:00:31 UTC (rev 3642) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1709 uuid: 10ded6ee-4717-4e34-84d0-9c501aed252b + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1716 uuid: 9115c93b-f425-4118-96e7-7130adeff1f2 */ Modified: branches/Cog/spur64src/vm/gcc3x-cointerp.c =================================================================== --- branches/Cog/spur64src/vm/gcc3x-cointerp.c 2016-03-08 22:21:51 UTC (rev 3641) +++ branches/Cog/spur64src/vm/gcc3x-cointerp.c 2016-03-09 09:00:31 UTC (rev 3642) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1709 uuid: 10ded6ee-4717-4e34-84d0-9c501aed252b + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1716 uuid: 9115c93b-f425-4118-96e7-7130adeff1f2 from - CoInterpreter VMMaker.oscog-eem.1709 uuid: 10ded6ee-4717-4e34-84d0-9c501aed252b + CoInterpreter VMMaker.oscog-eem.1716 uuid: 9115c93b-f425-4118-96e7-7130adeff1f2 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1709 uuid: 10ded6ee-4717-4e34-84d0-9c501aed252b " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1716 uuid: 9115c93b-f425-4118-96e7-7130adeff1f2 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -1607,9 +1607,9 @@ _iss sqInt needGCFlag; _iss sqInt * freeLists; _iss sqInt traceLogIndex; +_iss sqInt classTableFirstPage; _iss sqInt rememberedSetSize; _iss char * stackLimit; -_iss sqInt classTableFirstPage; _iss usqInt scavengeThreshold; _iss sqInt * rememberedSet; _iss sqInt remapBufferCount; @@ -2407,7 +2407,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[Spur] VM [CoInterpreterPrimitives VMMaker.oscog-eem.1709]"; +const char *interpreterVersion = "Croquet Closure Cog[Spur] VM [CoInterpreterPrimitives VMMaker.oscog-eem.1716]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -36927,6 +36927,8 @@ } sampleBuffer = oop; l1: /* end stackObjectValue: */; + } + if (!GIV(primFailCode)) { /* begin assertClassOf:is: */ ok = (sampleBuffer & (tagMask())) == 0; if (ok) { @@ -41194,7 +41196,8 @@ if (classOrNil != GIV(nilObj)) { index = (((long)i1) << (classTableMajorIndexShift())) + j; if ((classOrNil == aClass) - && (index != expectedIndex1)) { + && ((index != expectedIndex1) + && (index > 0x1F))) { classAtIndexput(index, GIV(nilObj)); if (index < GIV(classTableIndex)) { GIV(classTableIndex) = index; @@ -47943,10 +47946,16 @@ assert(validClassTableRootPages()); GIV(classTableFirstPage) = longAt((GIV(hiddenRootsObj) + BaseHeaderSize) + (0LL << (shiftForWord()))); assert(((numSlotsOf(GIV(classTableFirstPage))) - 1) == (classTableMinorIndexMask())); + flag("remove at some stage"); + if (((longAt(GIV(classTableFirstPage))) & (classIndexMask())) != 16) { + /* begin setClassIndexOf:to: */ + assert(((16 >= 0) && (16 <= (classIndexMask())))); + longAtput(GIV(classTableFirstPage), ((longAt(GIV(classTableFirstPage))) & (~(classIndexMask()))) + 16); + } GIV(numClassTablePages) = 1LL << (22 - (classTableMajorIndexShift())); - for (i = 2; i < GIV(numClassTablePages); i += 1) { - if ((longAt((GIV(hiddenRootsObj) + BaseHeaderSize) + (((long)i) << (shiftForWord())))) == GIV(nilObj)) { - GIV(numClassTablePages) = i; + for (i1 = 2; i1 < GIV(numClassTablePages); i1 += 1) { + if ((longAt((GIV(hiddenRootsObj) + BaseHeaderSize) + (((long)i1) << (shiftForWord())))) == GIV(nilObj)) { + GIV(numClassTablePages) = i1; GIV(classTableIndex) = ((long)((((GIV(numClassTablePages) - 1) < 1) ? 1 : (GIV(numClassTablePages) - 1)))) << (classTableMajorIndexShift()); goto l1; } @@ -47964,10 +47973,10 @@ assert((formatOf(freeListObj)) == (wordIndexableFormat())); GIV(freeLists) = firstIndexableField(freeListObj); GIV(freeListsMask) = 0; - for (i1 = 0, iLimiT = (64 - 1); i1 <= iLimiT; i1 += 1) { - if ((GIV(freeLists)[i1]) != 0) { - GIV(freeListsMask) = GIV(freeListsMask) | (1LL << i1); - GIV(freeLists)[i1] = (swizzleObj(GIV(freeLists)[i1])); + for (i = 0, iLimiT = (64 - 1); i <= iLimiT; i += 1) { + if ((GIV(freeLists)[i]) != 0) { + GIV(freeListsMask) = GIV(freeListsMask) | (1LL << i); + GIV(freeLists)[i] = (swizzleObj(GIV(freeLists)[i])); } } collapseSegmentsPostSwizzle(); @@ -50465,7 +50474,8 @@ l1: /* end classOrNilAtIndex: */; assert(objCouldBeClassObj(classObj)); realClassIndex = (long32At(classObj + 4)) & (identityHashHalfWordMask()); - if (classIndex != realClassIndex) { + if ((classIndex != realClassIndex) + && (realClassIndex > 0x1F)) { /* begin setClassIndexOf:to: */ assert(((realClassIndex >= 0) && (realClassIndex <= (classIndexMask())))); longAtput(objOop, ((longAt(objOop)) & (~(classIndexMask()))) + realClassIndex); @@ -56567,7 +56577,7 @@ usqInt prevFree; usqInt prevFreeChunk; usqInt prevPrevFree; - usqInt prevPrevFreeChunk; + sqInt prevPrevFreeChunk; sqInt slotBytes; sqInt slotBytes1; usqInt there; @@ -61912,7 +61922,7 @@ bridgeFromto(SpurSegmentInfo *aSegment, SpurSegmentInfo *nextSegmentOrNil) { usqInt bridgeSpan; - sqInt clifton; + usqInt clifton; usqInt segEnd; segEnd = ((aSegment->segSize)) + ((aSegment->segStart)); @@ -62156,7 +62166,7 @@ sqInt limit; sqInt newEndOfMemory; sqInt next; - sqInt node; + usqInt node; usqInt numSlots; usqInt numSlots1; SpurSegmentInfo *seg; @@ -62285,7 +62295,7 @@ static sqInt NoDbgRegParms readHeapFromImageFiledataBytes(sqImageFile f, sqInt numBytes) { DECL_MAYBE_SQ_GLOBAL_STRUCT - usqInt bridge; + sqInt bridge; usqInt bridgehead; usqLong bridgeSpan; sqInt bytesRead; Modified: branches/Cog/spursistasrc/vm/cogit.h =================================================================== --- branches/Cog/spursistasrc/vm/cogit.h 2016-03-08 22:21:51 UTC (rev 3641) @@ Diff output truncated at 50000 characters. @@

1 0

VM Maker: VMMaker.oscog-eem.1718.mcz
by commits＠source.squeak.org 09 Mar '16

09 Mar '16

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.1718.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.1718 Author: eem Time: 9 March 2016, 12:52:15.359129 am UUID: cd0ee6db-bf03-4a36-9019-2a6dcfd82cf1 Ancestors: VMMaker.oscog-EstebanLorenzano.1717 Fix primitiveFFIIntegerAt for signed 4-byte results. Wuth the support for 64-bit results, signed 4-byte results must be sign-extended to 64-bits. =============== Diff against VMMaker.oscog-EstebanLorenzano.1717 =============== Item was changed: ----- Method: ThreadedFFIPlugin>>primitiveFFIIntegerAt (in category 'primitives') ----- primitiveFFIIntegerAt "Answer a (signed or unsigned) n byte integer from the given byte offset in the receiver, using the platform's endianness." | isSigned byteSize byteOffset rcvr addr value mask valueOop | <var: 'value' type: #usqLong> <var: 'mask' type: #usqLong> <export: true> <inline: false> isSigned := interpreterProxy booleanValueOf: (interpreterProxy stackValue: 0). byteSize := interpreterProxy stackIntegerValue: 1. byteOffset := interpreterProxy stackIntegerValue: 2. rcvr := interpreterProxy stackObjectValue: 3. interpreterProxy failed ifTrue:[^0]. (byteOffset > 0 and: [(byteSize between: 1 and: 8) and: [(byteSize bitAnd: byteSize - 1) = 0 "a.k.a. isPowerOfTwo"]]) ifFalse: [^interpreterProxy primitiveFail]. addr := self ffiAddressOf: rcvr startingAt: byteOffset size: byteSize. interpreterProxy failed ifTrue:[^0]. byteSize <= 2 ifTrue: [byteSize = 1 ifTrue: [value := self cCoerceSimple: (interpreterProxy byteAt: addr) to: #'unsigned char'] ifFalse: [value := self cCoerceSimple: (interpreterProxy shortAt: addr) to: #'unsigned short']] ifFalse: [byteSize = 4 ifTrue: [value := self cCoerceSimple: (interpreterProxy long32At: addr) to: #'unsigned int'] ifFalse: [value := interpreterProxy long64At: addr]]. byteSize < BytesPerWord ifTrue: [isSigned ifTrue: "sign extend value" [mask := 1 << (byteSize * 8 - 1). value := (value bitAnd: mask-1) - (value bitAnd: mask)]. "note: byte/short (&long if BytesPerWord=8) never exceed SmallInteger range" valueOop := interpreterProxy integerObjectOf: value] ifFalse: "general 64 bit integer; note these never fail" + [isSigned + ifTrue: + [byteSize < 8 ifTrue: "sign extend value" + [mask := 1 << (byteSize * 8 - 1). + value := (value bitAnd: mask-1) - (value bitAnd: mask)]. + valueOop := interpreterProxy signed64BitIntegerFor: value] + ifFalse:[valueOop := interpreterProxy positive64BitIntegerFor: value]]. - [valueOop := isSigned - ifTrue:[interpreterProxy signedMachineIntegerFor: value] - ifFalse:[interpreterProxy positiveMachineIntegerFor: value]]. ^interpreterProxy pop: 4 thenPush: valueOop!

1 0

← Newer
1
...
7
8
9
10
11
12
13
14
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

Vm-dev March 2016