Vm-dev July 2013

vm-dev@lists.squeakfoundation.org

20 participants
104 discussions

VM Maker: VMMaker-oscog-EstebanLorenzano.302.mcz
by commits＠source.squeak.org 10 Jul '13

10 Jul '13

Esteban Lorenzano uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker-oscog-EstebanLorenzano.302.mcz ==================== Summary ==================== Name: VMMaker-oscog-EstebanLorenzano.302 Author: EstebanLorenzano Time: 10 July 2013, 2:35:56.127 pm UUID: 99d6632c-06ac-4f19-b842-b6807ad969e9 Ancestors: VMMaker-oscog-GuillermoPolito.243, VMMaker.oscog-tpr.301 - merged with Eliot's =============== Diff against VMMaker-oscog-GuillermoPolito.243 =============== Item was changed: ----- Method: BitBltSimulation class>>declareCVarsIn: (in category 'translation') ----- declareCVarsIn: aCCodeGenerator + + "add option of fast path BitBLT code header" + aCCodeGenerator + addHeaderFile:'#ifdef ENABLE_FAST_BLT + #include "BitBltDispatch.h" + #else + // to handle the unavoidable decl in the spec of copyBitsFallback(); + #define operation_t void + #endif'. + aCCodeGenerator var: 'opTable' declareC: 'void *opTable[' , OpTableSize printString , ']'. aCCodeGenerator var: 'maskTable' declareC:'int maskTable[33] = { 0, 1, 3, 0, 15, 31, 0, 0, 255, 0, 0, 0, 0, 0, 0, 0, 65535, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -1 }'. aCCodeGenerator var: 'ditherMatrix4x4' declareC:'const int ditherMatrix4x4[16] = { 0, 8, 2, 10, 12, 4, 14, 6, 3, 11, 1, 9, 15, 7, 13, 5 }'. aCCodeGenerator var: 'ditherThresholds16' declareC:'const int ditherThresholds16[8] = { 0, 2, 4, 6, 8, 12, 14, 16 }'. aCCodeGenerator var: 'ditherValues16' declareC:'const int ditherValues16[32] = { 0, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30 }'. aCCodeGenerator var: 'warpBitShiftTable' declareC:'int warpBitShiftTable[32]'. aCCodeGenerator var:'cmShiftTable' type:'int *'. aCCodeGenerator var:'cmMaskTable' type:'unsigned int *'. aCCodeGenerator var:'cmLookupTable' type:'unsigned int *'. aCCodeGenerator var: 'dither8Lookup' declareC:' unsigned char dither8Lookup[4096]'. aCCodeGenerator var:'ungammaLookupTable' type: 'unsigned char *'. aCCodeGenerator var:'gammaLookupTable' type: 'unsigned char *'. aCCodeGenerator var: 'querySurfaceFn' type: 'void *'. aCCodeGenerator var: 'lockSurfaceFn' type: 'void *'. aCCodeGenerator var: 'unlockSurfaceFn' type: 'void *'! Item was changed: ----- Method: BitBltSimulation>>copyBits (in category 'setup') ----- copyBits "This function is exported for the Balloon engine" <export: true> <inline: false> self clipRange. (bbW <= 0 or: [bbH <= 0]) ifTrue: ["zero width or height; noop" affectedL := affectedR := affectedT := affectedB := 0. ^ nil]. "Lock the surfaces" self lockSurfaces ifFalse:[^interpreterProxy primitiveFail]. + + self + cppIf: #'ENABLE_FAST_BLT' + ifTrue:["you really, really mustn't call this unless you have the rest of the code to link to" + self copyBitsFastPathSpecialised] + ifFalse:[self copyBitsLockedAndClipped]. + - self copyBitsLockedAndClipped. self unlockSurfaces.! Item was added: + ----- Method: BitBltSimulation>>copyBits:Fallback: (in category 'setup') ----- + copyBits: op Fallback: flags + "Recover from the fast path specialised code saying Help-I-cant-cope" + |done | + <static: false> + <returnTypeC: 'void'> + <inline: false> + <var: #op type: 'operation_t *'> + <var: #flags type:'unsigned int'> + self cppIf: #'ENABLE_FAST_BLT' + ifTrue:[ + "recover values from the operation struct used by the fast ARM code" + self cCode:' + combinationRule = op->combinationRule; + noSource = op->noSource; + sourceBits = (sqInt) op->src.bits; + sourcePitch = op->src.pitch; + sourceDepth = op->src.depth; + sourceMSB = op->src.msb; + sx = op->src.x; + sy = op->src.y; + destBits = (sqInt) op->dest.bits; + destPitch = op->dest.pitch; + destDepth = op->dest.depth; + destMSB = op->dest.msb; + dx = op->dest.x; + dy = op->dest.y; + bbW = op->width; + bbH = op->height; + cmFlags = op->cmFlags; + cmShiftTable = (void *) op->cmShiftTable; + cmMaskTable = (void *) op->cmMaskTable; + cmMask = op->cmMask; + cmLookupTable = (void *) op->cmLookupTable; + noHalftone = op->noHalftone; + halftoneHeight = op->halftoneHeight; + halftoneBase = (sqInt) op->halftoneBase; + if (combinationRule == 30 || combinationRule == 31) { + sourceAlpha = op->opt.sourceAlpha; + } + if (combinationRule == 41) { + componentAlphaModeColor = op->opt.componentAlpha.componentAlphaModeColor; + componentAlphaModeAlpha = op->opt.componentAlpha.componentAlphaModeAlpha; + gammaLookupTable = (void *) op->opt.componentAlpha.gammaLookupTable; + ungammaLookupTable = (void *) op->opt.componentAlpha.ungammaLookupTable; + }'. + + destPPW := 32 / destDepth. + cmBitsPerColor := 0. + cmMask = 16r1FF ifTrue: [cmBitsPerColor := 3]. + cmMask = 16rFFF ifTrue: [cmBitsPerColor := 4]. + cmMask = 16r3FFF ifTrue: [cmBitsPerColor := 5]. + + "Try a shortcut for stuff that should be run as quickly as possible" + done := self tryCopyingBitsQuickly. + done ifTrue:[^nil]. + + bitCount := 0. + "Choose and perform the actual copy loop." + self performCopyLoop] + + + + + ! Item was added: + ----- Method: BitBltSimulation>>copyBitsFastPathSpecialised (in category 'setup') ----- + copyBitsFastPathSpecialised + "Perform the actual copyBits operation using the fast path specialised code; fail some cases by falling back to normal code. + Assume: Surfaces have been locked and clipping was performed." + <inline: false> + + self + cppIf: #'ENABLE_FAST_BLT' + ifTrue:[ + "set the affected area to 0 first" + affectedL := affectedR := affectedT := affectedB := 0. + + self copyBitsRule41Test. + (interpreterProxy failed not) + ifFalse: [^ interpreterProxy primitiveFail]. + + "we skip the tryCopyingBitsQuickly and leave that to falback code" + + (combinationRule = 30) | (combinationRule = 31) ifTrue: + ["Check and fetch source alpha parameter for alpha blend" + interpreterProxy methodArgumentCount = 1 + ifTrue: [sourceAlpha := interpreterProxy stackIntegerValue: 0. + (interpreterProxy failed not and: [(sourceAlpha >= 0) & (sourceAlpha <= 255)]) + ifFalse: [^ interpreterProxy primitiveFail]] + ifFalse: [^ interpreterProxy primitiveFail]]. + + "we don't worry about bitCount" + "bitCount := 0." + + "We don't do - Choose and perform the actual copy loop." + "self performCopyLoop." + + "this is done inversely to plain copyBitsLockedAndClipped" + (combinationRule ~= 22) & (combinationRule ~= 32) ifTrue: + ["zero width and height; return the count" + affectedL := dx. + affectedR := dx + bbW. + affectedT := dy. + affectedB := dy + bbH]. + + "Now we fill the 'operation' structure and pass it to the sneaky ARM code" + self cCode:' + // fill the operation structure + operation_t op; + op.combinationRule = combinationRule; + op.noSource = noSource; + op.src.bits = (void *) sourceBits; + op.src.pitch = sourcePitch; + op.src.depth = sourceDepth; + op.src.msb = sourceMSB; + op.src.x = sx; + op.src.y = sy; + op.dest.bits = (void *) destBits; + op.dest.pitch = destPitch; + op.dest.depth = destDepth; + op.dest.msb = destMSB; + op.dest.x = dx; + op.dest.y = dy; + op.width = bbW; + op.height = bbH; + op.cmFlags = cmFlags; + op.cmShiftTable = (void *) cmShiftTable; + op.cmMaskTable = (void *) cmMaskTable; + op.cmMask = cmMask; + op.cmLookupTable = (void *) cmLookupTable; + op.noHalftone = noHalftone; + op.halftoneHeight = halftoneHeight; + op.halftoneBase = (void *) halftoneBase; + if (combinationRule == 30 || combinationRule == 31) { + op.opt.sourceAlpha = sourceAlpha; + } + if (combinationRule == 41) { + op.opt.componentAlpha.componentAlphaModeColor = componentAlphaModeColor; + op.opt.componentAlpha.componentAlphaModeAlpha = componentAlphaModeAlpha; + op.opt.componentAlpha.gammaLookupTable = (void *) gammaLookupTable; + op.opt.componentAlpha.ungammaLookupTable = (void *) ungammaLookupTable; + } + // call the sneaky code + copyBitsDispatch(&op)' + ]! Item was changed: ----- Method: BitBltSimulation>>copyBitsLockedAndClipped (in category 'setup') ----- copyBitsLockedAndClipped "Perform the actual copyBits operation. Assume: Surfaces have been locked and clipping was performed." + | done | + <inline: false> - | done gammaLookupTableOop ungammaLookupTableOop | - <inline: true> - "Try a shortcut for stuff that should be run as quickly as possible" + self copyBitsRule41Test. + (interpreterProxy failed not) + ifFalse: [^ interpreterProxy primitiveFail]. + + "Try a shortcut for stuff that should be run as quickly as possible" + done := self tryCopyingBitsQuickly. - combinationRule = 41 - ifTrue:["fetch the forecolor into componentAlphaModeColor." - componentAlphaModeAlpha := 255. - componentAlphaModeColor := 16777215. - gammaLookupTable := nil. - ungammaLookupTable := nil. - interpreterProxy methodArgumentCount >= 2 - ifTrue:[ - componentAlphaModeAlpha := interpreterProxy stackIntegerValue: (interpreterProxy methodArgumentCount - 2). - (interpreterProxy failed not) - ifFalse: [^ interpreterProxy primitiveFail]. - componentAlphaModeColor := interpreterProxy stackIntegerValue: (interpreterProxy methodArgumentCount - 1). - (interpreterProxy failed not) - ifFalse: [^ interpreterProxy primitiveFail]. - interpreterProxy methodArgumentCount = 4 - ifTrue:[ - gammaLookupTableOop := interpreterProxy stackObjectValue: 1. - (interpreterProxy isBytes: gammaLookupTableOop) - ifTrue:[gammaLookupTable := interpreterProxy firstIndexableField: gammaLookupTableOop.]. - ungammaLookupTableOop := interpreterProxy stackObjectValue: 0. - (interpreterProxy isBytes: ungammaLookupTableOop) - ifTrue:[ungammaLookupTable := interpreterProxy firstIndexableField: ungammaLookupTableOop]]] - ifFalse:[ - interpreterProxy methodArgumentCount = 1 - ifTrue: [ - componentAlphaModeColor := interpreterProxy stackIntegerValue: 0. - (interpreterProxy failed not) - ifFalse: [^ interpreterProxy primitiveFail]] - ifFalse:[^ interpreterProxy primitiveFail]]]. - - done := self tryCopyingBitsQuickly. done ifTrue:[^nil]. (combinationRule = 30) | (combinationRule = 31) ifTrue: ["Check and fetch source alpha parameter for alpha blend" interpreterProxy methodArgumentCount = 1 ifTrue: [sourceAlpha := interpreterProxy stackIntegerValue: 0. (interpreterProxy failed not and: [(sourceAlpha >= 0) & (sourceAlpha <= 255)]) ifFalse: [^ interpreterProxy primitiveFail]] ifFalse: [^ interpreterProxy primitiveFail]]. bitCount := 0. "Choose and perform the actual copy loop." self performCopyLoop. (combinationRule = 22) | (combinationRule = 32) ifTrue: ["zero width and height; return the count" affectedL := affectedR := affectedT := affectedB := 0]. hDir > 0 ifTrue: [affectedL := dx. affectedR := dx + bbW] ifFalse: [affectedL := dx - bbW + 1. affectedR := dx + 1]. vDir > 0 ifTrue: [affectedT := dy. affectedB := dy + bbH] ifFalse: [affectedT := dy - bbH + 1. affectedB := dy + 1]! Item was added: + ----- Method: BitBltSimulation>>copyBitsRule41Test (in category 'setup') ----- + copyBitsRule41Test + "Test possible use of rule 41, rgbComponentAlpha:with: Nothing to return, just set up some variables" + | gammaLookupTableOop ungammaLookupTableOop | + <inline: false> + + combinationRule = 41 + ifTrue:["fetch the forecolor into componentAlphaModeColor." + componentAlphaModeAlpha := 255. + componentAlphaModeColor := 16777215. + gammaLookupTable := nil. + ungammaLookupTable := nil. + interpreterProxy methodArgumentCount >= 2 + ifTrue:[ + componentAlphaModeAlpha := interpreterProxy stackIntegerValue: (interpreterProxy methodArgumentCount - 2). + (interpreterProxy failed not) + ifFalse: [^ interpreterProxy primitiveFail]. + componentAlphaModeColor := interpreterProxy stackIntegerValue: (interpreterProxy methodArgumentCount - 1). + (interpreterProxy failed not) + ifFalse: [^ interpreterProxy primitiveFail]. + interpreterProxy methodArgumentCount = 4 + ifTrue:[ + gammaLookupTableOop := interpreterProxy stackObjectValue: 1. + (interpreterProxy isBytes: gammaLookupTableOop) + ifTrue:[gammaLookupTable := interpreterProxy firstIndexableField: gammaLookupTableOop.]. + ungammaLookupTableOop := interpreterProxy stackObjectValue: 0. + (interpreterProxy isBytes: ungammaLookupTableOop) + ifTrue:[ungammaLookupTable := interpreterProxy firstIndexableField: ungammaLookupTableOop]]] + ifFalse:[ + interpreterProxy methodArgumentCount = 1 + ifTrue: [ + componentAlphaModeColor := interpreterProxy stackIntegerValue: 0. + (interpreterProxy failed not) + ifFalse: [^ interpreterProxy primitiveFail]] + ifFalse:[^ interpreterProxy primitiveFail]]]. + + + ! Item was changed: ----- Method: CogARMCompiler>>sizePCDependentInstructionAt: (in category 'generate machine code') ----- sizePCDependentInstructionAt: eventualAbsoluteAddress "Size a jump and set its address. The target may be another instruction or an absolute address. On entry the address inst var holds our virtual address. On exit address is set to eventualAbsoluteAddress, which is where this instruction will be output. The span of a jump to a following instruction is therefore between that instruction's address and this instruction's address ((which are both still their virtual addresses), but the span of a jump to a preceeding instruction or to an absolute address is between that instruction's address (which by now is its eventual absolute address) or absolute address and eventualAbsoluteAddress." + | target maximumSpan abstractInstruction | - | target maximumSpan | <var: #abstractInstruction type: #'AbstractInstruction *'> opcode = AlignmentNops ifTrue: [| alignment | address := eventualAbsoluteAddress. alignment := operands at: 0. ^machineCodeSize := (eventualAbsoluteAddress + (alignment - 1) bitAnd: alignment negated) - eventualAbsoluteAddress]. self assert: (self isJump or: [opcode = Call]). self isJump ifTrue: [self resolveJumpTarget]. target := operands at: 0. + abstractInstruction := cogit cCoerceSimple: target to: #'AbstractInstruction *'. "maximumSpan calculation copied from CogIA32Compiler TODO: extract method?" + (self isAnInstruction: abstractInstruction) - (self isAnInstruction: (cogit cCoerceSimple: target to: #'void *')) ifTrue: + [maximumSpan := abstractInstruction address - [| abstractInstruction | - abstractInstruction := cogit cCoerceSimple: target to: #'AbstractInstruction *'. - maximumSpan := abstractInstruction address - (((cogit abstractInstruction: self follows: abstractInstruction) ifTrue: [eventualAbsoluteAddress] ifFalse: [address]) + 2)] ifFalse: [maximumSpan := target - (eventualAbsoluteAddress + 2)]. address := eventualAbsoluteAddress. ^machineCodeSize := opcode = Call ifTrue: [(self isQuick: maximumSpan) ifTrue: [4] ifFalse: [20]] ifFalse: [(self isLongJump not and: [self isQuick: maximumSpan]) ifTrue: [4] ifFalse: [16]] "load address to register, add"! Item was changed: ----- Method: CogARMCompilerTests>>assertSaneJumpTarget: (in category 'cogit compiler compatibility') ----- assertSaneJumpTarget: jumpTarget + <var: #jumpTarget type: #'AbstractInstruction *'> - <var: #jumpTarget type: #'void *'> self assert: (self addressIsInInstructions: jumpTarget)! Item was changed: ----- Method: CogAbstractInstruction>>isAnInstruction: (in category 'testing') ----- isAnInstruction: addressOrInstruction + <var: #addressOrInstruction type: #'AbstractInstruction *'> - <var: #addressOrInstruction type: #'void *'> ^cogit addressIsInInstructions: addressOrInstruction! Item was changed: ----- Method: CogIA32Compiler>>concretizeMoveAwR (in category 'generate machine code') ----- concretizeMoveAwR "Will get inlined into concretizeAt: switch." <inline: true> | addressOperand reg | addressOperand := operands at: 0. + (self isAnInstruction: (cogit cCoerceSimple: addressOperand to: #'AbstractInstruction *')) ifTrue: - (self isAnInstruction: (cogit cCoerceSimple: addressOperand to: #'void *')) ifTrue: [addressOperand := (cogit cCoerceSimple: addressOperand to: #'AbstractInstruction *') address]. reg := self concreteRegister: (operands at: 1). reg = EAX ifTrue: [machineCode at: 0 put: 16rA1; at: 1 put: (addressOperand bitAnd: 16rFF); at: 2 put: (addressOperand >> 8 bitAnd: 16rFF); at: 3 put: (addressOperand >> 16 bitAnd: 16rFF); at: 4 put: (addressOperand >> 24 bitAnd: 16rFF). ^machineCodeSize := 5]. machineCode at: 0 put: 16r8B; at: 1 put: (self mod: ModRegInd RM: 5 RO: reg); at: 2 put: (addressOperand bitAnd: 16rFF); at: 3 put: (addressOperand >> 8 bitAnd: 16rFF); at: 4 put: (addressOperand >> 16 bitAnd: 16rFF); at: 5 put: (addressOperand >> 24 bitAnd: 16rFF). ^machineCodeSize := 6! Item was changed: ----- Method: CogIA32Compiler>>concretizeMoveRAw (in category 'generate machine code') ----- concretizeMoveRAw "Will get inlined into concretizeAt: switch." <inline: true> | addressOperand reg | reg := self concreteRegister: (operands at: 0). addressOperand := operands at: 1. + (self isAnInstruction: (cogit cCoerceSimple: addressOperand to: #'AbstractInstruction *')) ifTrue: - (self isAnInstruction: (cogit cCoerceSimple: addressOperand to: #'void *')) ifTrue: [addressOperand := (cogit cCoerceSimple: addressOperand to: #'AbstractInstruction *') address]. reg = EAX ifTrue: [machineCode at: 0 put: 16rA3; at: 1 put: (addressOperand bitAnd: 16rFF); at: 2 put: (addressOperand >> 8 bitAnd: 16rFF); at: 3 put: (addressOperand >> 16 bitAnd: 16rFF); at: 4 put: (addressOperand >> 24 bitAnd: 16rFF). ^machineCodeSize := 5]. machineCode at: 0 put: 16r89; at: 1 put: (self mod: ModRegInd RM: 5 RO: reg); at: 2 put: (addressOperand bitAnd: 16rFF); at: 3 put: (addressOperand >> 8 bitAnd: 16rFF); at: 4 put: (addressOperand >> 16 bitAnd: 16rFF); at: 5 put: (addressOperand >> 24 bitAnd: 16rFF). ^machineCodeSize := 6! Item was changed: ----- Method: CogIA32Compiler>>sizePCDependentInstructionAt: (in category 'generate machine code') ----- sizePCDependentInstructionAt: eventualAbsoluteAddress "Size a jump and set its address. The target may be another instruction or an absolute address. On entry the address inst var holds our virtual address. On exit address is set to eventualAbsoluteAddress, which is where this instruction will be output. The span of a jump to a following instruction is therefore between that instruction's address and this instruction's address ((which are both still their virtual addresses), but the span of a jump to a preceeding instruction or to an absolute address is between that instruction's address (which by now is its eventual absolute address) or absolute address and eventualAbsoluteAddress." + | target maximumSpan abstractInstruction | - | target maximumSpan | <var: #abstractInstruction type: #'AbstractInstruction *'> opcode = AlignmentNops ifTrue: [| alignment | address := eventualAbsoluteAddress. alignment := operands at: 0. ^machineCodeSize := (eventualAbsoluteAddress + (alignment - 1) bitAnd: alignment negated) - eventualAbsoluteAddress]. self assert: self isJump. target := operands at: 0. + abstractInstruction := cogit cCoerceSimple: target to: #'AbstractInstruction *'. + (self isAnInstruction: abstractInstruction) - (self isAnInstruction: (cogit cCoerceSimple: target to: #'void *')) ifTrue: + [maximumSpan := abstractInstruction address - [| abstractInstruction | - abstractInstruction := cogit cCoerceSimple: target to: #'AbstractInstruction *'. - maximumSpan := abstractInstruction address - (((cogit abstractInstruction: self follows: abstractInstruction) ifTrue: [eventualAbsoluteAddress] ifFalse: [address]) + 2)] ifFalse: [maximumSpan := target - (eventualAbsoluteAddress + 2)]. address := eventualAbsoluteAddress. ^machineCodeSize := opcode >= FirstShortJump ifTrue: [(self isQuick: maximumSpan) ifTrue: [2] ifFalse: [opcode = Jump ifTrue: [5] ifFalse: [6]]] ifFalse: [opcode = JumpLong ifTrue: [5] ifFalse: [6]]! Item was changed: ----- Method: CogIA32CompilerTests>>assertSaneJumpTarget: (in category 'cogit compatibility') ----- assertSaneJumpTarget: jumpTarget + <var: #jumpTarget type: #'AbstractInstruction *'> - <var: #jumpTarget type: #'void *'> self assert: (self addressIsInInstructions: jumpTarget)! Item was changed: ----- Method: CogMethodZone>>methodFor: (in category 'jit - api') ----- methodFor: address <api> <returnTypeC: #'CogMethod *'> <var: #address type: #'void *'> | cogMethod nextMethod | <var: #cogMethod type: #'CogMethod *'> <var: #nextMethod type: #'CogMethod *'> cogMethod := coInterpreter cCoerceSimple: baseAddress to: #'CogMethod *'. [cogMethod < self limitZony + and: [cogMethod asUnsignedInteger <= address asUnsignedInteger]] whileTrue: - and: [(self cCoerceSimple: cogMethod to: #'void *') <= address]] whileTrue: [nextMethod := self methodAfter: cogMethod. nextMethod = cogMethod ifTrue: [^0]. + (address asUnsignedInteger >= cogMethod asUnsignedInteger + and: [address asUnsignedInteger < nextMethod asUnsignedInteger]) ifTrue: - (address >= (self cCoerceSimple: cogMethod to: #'void *') - and: [address < (self cCoerceSimple: nextMethod to: #'void *')]) ifTrue: [^cogMethod]. cogMethod := nextMethod]. ^0! Item was changed: ----- Method: Cogit>>addressIsInFixups: (in category 'testing') ----- addressIsInFixups: address + <var: #address type: #'AbstractInstruction *'> + ^self cCode: 'address >= (AbstractInstruction *)&fixups[0] && address < (AbstractInstruction *)&fixups[numAbstractOpcodes]' - <var: #address type: #'void *'> - ^self cCode: 'address >= (void *)&fixups[0] && address < (void *)&fixups[numAbstractOpcodes]' inSmalltalk: [fixups notNil and: [(fixups object identityIndexOf: address) between: 1 and: numAbstractOpcodes]]! Item was changed: ----- Method: Cogit>>addressIsInInstructions: (in category 'testing') ----- addressIsInInstructions: address + <var: #address type: #'AbstractInstruction *'> + ^self cCode: 'address >= &abstractOpcodes[0] && address < &abstractOpcodes[opcodeIndex]' - <var: #address type: #'void *'> - ^self cCode: 'address >= (void *)&abstractOpcodes[0] && address < (void *)&abstractOpcodes[opcodeIndex]' inSmalltalk: [(abstractOpcodes object identityIndexOf: address) between: 1 and: opcodeIndex]! Item was changed: ----- Method: Cogit>>assertSaneJumpTarget: (in category 'debugging') ----- assertSaneJumpTarget: jumpTarget + <var: #jumpTarget type: #'AbstractInstruction *'> - <var: #jumpTarget type: #'void *'> self assert: (closedPICSize isNil "don't whinge when producing the PIC prototypes" or: [openPICSize isNil or: [(self addressIsInInstructions: jumpTarget) + or: [(jumpTarget asUnsignedInteger - or: [(jumpTarget asInteger between: codeBase and: methodZone limitZony asInteger + (closedPICSize max: openPICSize))]]])! Item was changed: ----- Method: Cogit>>ceSICMiss: (in category 'in-line cacheing') ----- ceSICMiss: receiver "An in-line cache check in a method has failed. The failing entry check has jumped to the ceMethodAbort abort call at the start of the method which has called this routine. If possible allocate a closed PIC for the current and existing classes. The stack looks like: receiver args sender return address sp=> ceMethodAbort call return address So we can find the method that did the failing entry check at ceMethodAbort call return address - missOffset and we can find the send site from the outer return address." <api> | pic innerReturn outerReturn entryPoint targetMethod newTargetMethodOrNil errorSelectorOrNil cacheTag extent result | <var: #pic type: #'CogMethod *'> <var: #targetMethod type: #'CogMethod *'> "Whether we can relink to a PIC or not we need to pop off the inner return and identify the target method." innerReturn := coInterpreter popStack. targetMethod := self cCoerceSimple: innerReturn - missOffset to: #'CogMethod *'. outerReturn := coInterpreter stackTop. self assert: (outerReturn between: methodZoneBase and: methodZone freeStart). entryPoint := backEnd callTargetFromReturnAddress: outerReturn. self assert: targetMethod selector ~= objectMemory nilObject. self cppIf: NewspeakVM ifTrue: [self assert: (targetMethod asInteger + cmEntryOffset = entryPoint or: [targetMethod asInteger + cmDynSuperEntryOffset = entryPoint]). "Avoid the effort of implementing PICs for the relatively low dynamic frequency dynamic super send and simply rebind the send site." targetMethod asInteger + cmDynSuperEntryOffset = entryPoint ifTrue: [^coInterpreter ceDynamicSuperSend: targetMethod selector to: receiver numArgs: targetMethod cmNumArgs]]. self assert: targetMethod asInteger + cmEntryOffset = entryPoint. self lookup: targetMethod selector for: receiver methodAndErrorSelectorInto: [:method :errsel| newTargetMethodOrNil := method. errorSelectorOrNil := errsel]. "We assume lookupAndCog:for: will *not* reclaim the method zone" self assert: outerReturn = coInterpreter stackTop. cacheTag := objectRepresentation inlineCacheTagForInstance: receiver. ((errorSelectorOrNil notNil and: [errorSelectorOrNil ~= SelectorDoesNotUnderstand]) or: [(objectRepresentation inlineCacheTagIsYoung: cacheTag) or: [newTargetMethodOrNil isNil or: [objectMemory isYoung: newTargetMethodOrNil]]]) ifTrue: [result := self patchToOpenPICFor: targetMethod selector numArgs: targetMethod cmNumArgs receiver: receiver. self assert: result not. "If patchToOpenPICFor:.. returns we're out of code memory" ^coInterpreter ceSendFromInLineCacheMiss: targetMethod]. "See if an Open PIC is already available." pic := methodZone openPICWithSelector: targetMethod selector. pic isNil ifTrue: ["otherwise attempt to create a closed PIC for the two cases." pic := self cogPICSelector: targetMethod selector numArgs: targetMethod cmNumArgs Case0Method: targetMethod Case1Method: newTargetMethodOrNil tag: cacheTag isMNUCase: errorSelectorOrNil = SelectorDoesNotUnderstand. + (pic asInteger between: MaxNegativeErrorCode and: -1) ifTrue: - pic asInteger < 0 ifTrue: ["For some reason the PIC couldn't be generated, most likely a lack of code memory. Continue as if this is an unlinked send." pic asInteger = InsufficientCodeSpace ifTrue: [coInterpreter callForCogCompiledCodeCompaction]. ^coInterpreter ceSendFromInLineCacheMiss: targetMethod]. processor flushICacheFrom: pic asInteger to: pic asInteger + closedPICSize]. "Relink the send site to the pic." extent := backEnd rewriteCallAt: outerReturn target: pic asInteger + cmEntryOffset. processor flushICacheFrom: outerReturn - 1 - extent to: outerReturn - 1. "Jump back into the pic at its entry in case this is an MNU (newTargetMethodOrNil is nil)" coInterpreter executeCogMethodFromLinkedSend: pic withReceiver: receiver andCacheTag: (backEnd inlineCacheTagAt: outerReturn). "NOTREACHED" ^nil! Item was changed: ----- Method: ObjectMemory>>fetchPointer:ofObject: (in category 'interpreter access') ----- fetchPointer: fieldIndex ofObject: oop "index by word size, and return a pointer as long as the word size" + <api> + ^self longAt: oop + BaseHeaderSize + (fieldIndex << ShiftForWord)! - - ^ self longAt: oop + BaseHeaderSize + (fieldIndex << ShiftForWord)! Item was changed: ----- Method: ObjectMemory>>isIntegerValue: (in category 'interpreter access') ----- isIntegerValue: intValue "Answer if the given value can be represented as a Smalltalk integer value. In C, use a shift and XOR to set the sign bit if and only if the top two bits of the given value are the same, then test the sign bit. Note that the top two bits are equal for exactly those integers in the range that can be represented in 31-bits or 63-bits." <api> ^self cCode: [(intValue bitXor: (intValue << 1)) >= 0] inSmalltalk: [intValue >= 16r-40000000 and: [intValue <= 16r3FFFFFFF]]! Item was changed: ----- Method: SistaStackToRegisterMappingCogit>>addressIsInInstructions: (in category 'testing') ----- addressIsInInstructions: address + <var: #address type: #'AbstractInstruction *'> - <var: #address type: #'void *'> ^self cCode: + 'address >= &abstractOpcodes[0] && address < &abstractOpcodes[opcodeIndex] + || address >= &counters[0] && address < &counters[counterIndex]' - 'address >= (void *)&abstractOpcodes[0] && address < (void *)&abstractOpcodes[opcodeIndex] - || address >= (void *)&counters[0] && address < (void *)&counters[counterIndex]' inSmalltalk: [((abstractOpcodes object identityIndexOf: address) between: 1 and: opcodeIndex) or: [(counters object identityIndexOf: address) between: 1 and: counterIndex]]! Item was changed: ----- Method: VMMakerTool>>generateSelectedInternalPlugin (in category 'generate sources') ----- generateSelectedInternalPlugin | pluginName | pluginName := self internalModules + at: self currentInternalModuleIndex - at: self currentExternalModuleIndex ifAbsent: [^self inform: 'no such plugin']. vmMaker interpreterClass ifNil: [^self inform: 'please set an interpreter class'] ifNotNil: [:interpreterClass| interpreterClass initialize]. self checkOK ifTrue: [[(Smalltalk classNamed: pluginName) touch. vmMaker generateInternalPlugin: pluginName] on: VMMakerException do: [:ex| self inform: ex messageText]]!

1 0

VM Maker: CMakeVMMaker-EstebanLorenzano.212.mcz
by commits＠source.squeak.org 10 Jul '13

10 Jul '13

Esteban Lorenzano uploaded a new version of CMakeVMMaker to project VM Maker: http://source.squeak.org/VMMaker/CMakeVMMaker-EstebanLorenzano.212.mcz ==================== Summary ==================== Name: CMakeVMMaker-EstebanLorenzano.212 Author: EstebanLorenzano Time: 10 July 2013, 2:38:10.569 pm UUID: 343629c9-047f-421b-bfca-8066e78ffd0b Ancestors: CMakeVMMaker-EstebanLorenzano.211 - added #configureBitBltSimulation: for BitBlt external dependencies. =============== Diff against CMakeVMMaker-EstebanLorenzano.211 =============== Item was added: + ----- Method: CPlatformConfig>>configureBitBltSimulation: (in category 'plugin extra rules') ----- + configureBitBltSimulation: maker + "extra rules for BitBltSimulation" + + maker includeDirectories: '${pluginCross}'. + + maker addCrossSources: #( + 'BitBltGeneric.c' + 'BitBltDispatch.c' + ). + ! Item was changed: ----- Method: CogFamilyCocoaIOSConfig>>commonCompilerFlags (in category 'settings') ----- commonCompilerFlags ^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')! - '-DBASE_HEADER_SIZE=4')! Item was changed: + ----- Method: CogFamilyUnixConfig>>configureAsynchFilePlugin: (in category 'plugin extra rules') ----- - ----- Method: CogFamilyUnixConfig>>configureAsynchFilePlugin: (in category 'as yet unclassified') ----- configureAsynchFilePlugin: maker maker addPlatformSources: #( 'sqUnixAsynchFile.c' ) ! Item was changed: + ----- Method: CogFamilyUnixConfig>>configureFileCopyPlugin: (in category 'plugin extra rules') ----- - ----- Method: CogFamilyUnixConfig>>configureFileCopyPlugin: (in category 'as yet unclassified') ----- configureFileCopyPlugin: maker "extra rules for DropPlugin" maker addPlatformSources: #( 'sqUnixFileCopyPlugin') ! Item was changed: + ----- Method: CogFamilyUnixConfig>>extraVMSettings: (in category 'settings') ----- - ----- Method: CogFamilyUnixConfig>>extraVMSettings: (in category 'as yet unclassified') ----- extraVMSettings: maker | versionC | self generateConfigH. "add a generated version.c" versionC := 'version.c'. maker cmd: 'add_custom_command' params: 'OUTPUT ', versionC , ' COMMAND ${platformsDir}/unix/config/verstamp ',versionC,' gcc COMMENT "Generating version.c" '. ! Item was changed: + ----- Method: CogFamilyUnixConfig>>platformName (in category 'accessing') ----- - ----- Method: CogFamilyUnixConfig>>platformName (in category 'as yet unclassified') ----- platformName ^ 'unix'! Item was changed: + ----- Method: CogFamilyWindowsConfig>>buildScript (in category 'build script') ----- - ----- Method: CogFamilyWindowsConfig>>buildScript (in category 'as yet unclassified') ----- buildScript "answer the build script for building everything" ^ '#!!bash if [ !! -e vmVersionInfo.h ]; then ../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 '! - '-DSTACK_ALIGN_BYTES=16 -DALLOCA_LIES_SO_USE_GETSP=0 '! Item was changed: + ----- Method: CogFamilyWindowsConfig>>executableType (in category 'accessing') ----- - ----- Method: CogFamilyWindowsConfig>>executableType (in category 'as yet unclassified') ----- executableType ^ 'WIN32'! Item was changed: + ----- Method: CogFamilyWindowsConfig>>externalModulesDir (in category 'accessing') ----- - ----- Method: CogFamilyWindowsConfig>>externalModulesDir (in category 'as yet unclassified') ----- externalModulesDir "answer the location in VM bundle, where plugins and rest of dynamic libs will be copied, " ^ '${outputDir}'! Item was changed: + ----- Method: CogFamilyWindowsConfig>>fixLineEndsOf: (in category 'utils') ----- - ----- Method: CogFamilyWindowsConfig>>fixLineEndsOf: (in category 'as yet unclassified') ----- fixLineEndsOf: string ^ string copyReplaceAll: String cr with: String crlf! Item was changed: + ----- Method: CogFamilyWindowsConfig>>msysPathFor: (in category 'accessing') ----- - ----- Method: CogFamilyWindowsConfig>>msysPathFor: (in category 'as yet unclassified') ----- msysPathFor: aPath | path | path := aPath asFileReference fullName. path := path copyReplaceAll: '\' with: '/'. ^ path " copyReplaceAll: '\' with: '\\'"! Item was changed: + ----- Method: CogFamilyWindowsConfig>>platformName (in category 'accessing') ----- - ----- Method: CogFamilyWindowsConfig>>platformName (in category 'as yet unclassified') ----- platformName ^ 'win32'! Item was changed: + ----- Method: CogFamilyWindowsConfig>>setupDirectories: (in category 'directories') ----- - ----- Method: CogFamilyWindowsConfig>>setupDirectories: (in category 'as yet unclassified') ----- setupDirectories: gen "we have to override that, because we need to convert windoze paths to msys ones" | dirsInclude | " write the directories in separate include file" dirsInclude := gen captureOutputDuring: [ gen set: #topDir toString: (self msysPathFor: self topDir fullName); set: #buildDir toString: (self buildDir ifNil: ['${topDir}/build'] ifNotNil:[ self msysPathFor: self buildDir fullName ]); set: #thirdpartyDir toString: '${buildDir}/thirdparty'; set: #platformsDir toString: (self msysPathFor: self platformsDir); set: #srcDir toString: (self msysPathFor: self srcDir); set: #srcPluginsDir toString: (pluginsDir ifNil: [ '${srcDir}/plugins' ]); set: #srcVMDir toString: '${srcDir}/vm'; set: #platformName toString: self platformName; set: #targetPlatform to: '${platformsDir}/${platformName}'; set: #crossDir toString: '${platformsDir}/Cross'; set: #platformVMDir toString: '${targetPlatform}/vm'; set: #outputDir toString: (self msysPathFor: self outputDir). ]. self write: dirsInclude toFile: 'directories.cmake'. gen include: 'directories.cmake'. gen set: #externalModulesDir toString: self externalModulesDir. ! Item was changed: + ----- Method: CogFamilyWindowsConfig>>winVer (in category 'accessing') ----- - ----- Method: CogFamilyWindowsConfig>>winVer (in category 'as yet unclassified') ----- winVer "Set minimum version to WindowsXP (see /cygwin/usr/include//w32api/w32api.h)" ^ '-D_WIN32_WINNT=0x0501 -DWINVER=0x0501'! 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' !

1 0

VM Maker: CMakeVMMaker-EstebanLorenzano.211.mcz
by commits＠source.squeak.org 10 Jul '13

10 Jul '13

Esteban Lorenzano uploaded a new version of CMakeVMMaker to project VM Maker: http://source.squeak.org/VMMaker/CMakeVMMaker-EstebanLorenzano.211.mcz ==================== Summary ==================== Name: CMakeVMMaker-EstebanLorenzano.211 Author: EstebanLorenzano Time: 10 July 2013, 12:55:47.047 pm UUID: a8ca745d-b095-4e54-a231-d81692523ba0 Ancestors: CMakeVMMaker-EstebanLorenzano.210 - fixes for building iOS in 2.0 =============== Diff against CMakeVMMaker-EstebanLorenzano.210 =============== Item was changed: ----- Method: StackIPhoneConfig>>buildScript (in category 'build script') ----- buildScript "answer the build script for building everything" ^ '#!!bash if [ !! -e vmVersionInfo.h ]; then ../codegen-scripts/extract-commit-info.sh fi cmake -G Xcode . + xcodebuild -sdk {2} -configuration Release -target {1} - xcodebuild -sdk {sdk} -configuration Release -target {name} + ' format: {self executableName. self sdkTarget}! - ' nameFormat: {#name->self executableName. #sdk->self sdkTarget} asDictionary! Item was changed: ----- Method: StackIPhoneConfig>>commonCompilerFlags (in category 'settings') ----- commonCompilerFlags "Common compiler flags" ^{ "'-miphoneos-version-min=4.3'. " + '-isysroot /Applications/Xcode.app/Contents/Developer/Platforms/{1}.platform/Developer/SDKs/{1}{2}.sdk' format: { self targetDevice. self sdkVersion}. - '-isysroot /Applications/Xcode.app/Contents/Developer/Platforms/{target}.platform/Developer/SDKs/{target}{sdkVersion}.sdk' nameFormat: { 'target'-> self targetDevice. 'sdkVersion'->self sdkVersion} asDictionary. '-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=', 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 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}. - devRoot := '/Applications/Xcode.app/Contents/Developer/Platforms/{target}.platform/Developer' - nameFormat: { 'target'->self targetDevice} asDictionary. - sdkRoot := '{devRoot}/SDKs/{target}{sdkVersion}.sdk' - nameFormat: { - 'devRoot'->devRoot. - 'target'->self targetDevice. - 'sdkVersion'->self sdkVersion} asDictionary. "add freetype library into loop" lib := self addThirdpartyLibrary: 'freetype2'. 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} ]). - 'CC={devRoot}/usr/bin/gcc'. - 'CXX={devRoot}/usr/bin/g++'. - 'CFLAGS=\\"-arch {architecture} -std=c99 -Wno-trigraphs -O2 -fwrapv -Wreturn-type -Wunused-variable -fmessage-length=0 -miphoneos-version-min=4.0 -I{sdkRoot}/usr/include/libxml2 -isysroot {sdkRoot}\\"'. - 'LDFLAGS=\\"-arch {architecture} -isysroot {sdkRoot}\\"'} - collect: [ :each | each nameFormat: { - 'architecture'->self architecture. - 'sdkRoot'->sdkRoot. - 'devRoot'->devRoot} asDictionary ]). "link plugin with freetype lib" maker addExternalLibrary: '${thirdpartyDir}/out/lib/', lib libraryFileName. maker includeDirectories: lib includeDir. ! 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: 'DEVROOT' toString: ('/Applications/Xcode.app/Contents/Developer/Platforms/{target}.platform/Developer' - nameFormat: {'target'->self targetDevice} asDictionary). 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) - (maker buildDir forceNewFileNamed: precompiledHeaders) 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) - (maker buildDir forceNewFileNamed: 'Info.plist') 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' toString: self codeSignIdentity. maker set: 'CMAKE_XCODE_ATTRIBUTE_TARGETED_DEVICE_FAMILY' toString: self targetedDeviceFamilyAsString. maker set: 'CMAKE_XCODE_ATTRIBUTE_IPHONEOS_DEPLOYMENT_TARGET' to: self deploymentTargetVersion. maker set: 'CMAKE_XCODE_ATTRIBUTE_CONFIGURATION_BUILD_DIR' toString: '$(BUILD_DIR)/$(CONFIGURATION)'. maker set: 'CMAKE_XCODE_ATTRIBUTE_CONFIGURATION_TEMP_DIR' toString: '$(BUILD_DIR)/$(CONFIGURATION)'. + maker set: 'EXECUTABLE_OUTPUT_PATH' toString: self outputDir fullName. - maker set: 'EXECUTABLE_OUTPUT_PATH' toString: self outputDir. maker puts: 'set_source_files_properties(${srcVMDir}/gcc3x-cointerp.c PROPERTIES COMPILE_FLAGS -O0)' ! Item was changed: ----- Method: StackIPhoneConfig>>setGlobalOptionsAfterDetermineSystem: (in category 'utils') ----- setGlobalOptionsAfterDetermineSystem: maker self setGlobalOptions: maker. maker set: 'CMAKE_OSX_SYSROOT' + to: ('/Applications/Xcode.app/Contents/Developer/Platforms/{1}.platform/Developer/SDKs/{1}{2}.sdk' + format: { self targetDevice. self sdkVersion })! - to: ('/Applications/Xcode.app/Contents/Developer/Platforms/{target}.platform/Developer/SDKs/{target}{sdkVersion}.sdk' - nameFormat: { 'target'->self targetDevice. 'sdkVersion'->self sdkVersion } asDictionary)! 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/{target}.platform/Developer/SDKs/{target}{sdkVersion}.sdk/usr/include/' - nameFormat: {'target'->self targetDevice. 'sdkVersion'->self sdkVersion} asDictionary} ! Item was removed: - ----- Method: String>>nameFormat: (in category '*cmakevmmaker-extensions') ----- - nameFormat: aDictionary - "format the receiver with aDictionary - - simplest example: - 'foo {name} bar' format: {'name'->value}. - " - | result stream | - result := String new writeStream. - stream := self readStream. - - [stream atEnd] - whileFalse: [| currentChar | - currentChar := stream next. - currentChar == ${ - ifTrue: [| expression | - expression := self getEnclosedExpressionFrom: stream. - result nextPutAll: (aDictionary at: expression ifAbsent: [ 'UNDEFINED' ]) asString ] - ifFalse: [ - currentChar == $\ - ifTrue: [ - stream atEnd - ifFalse: [result nextPut: stream next]] - ifFalse: [result nextPut: currentChar]]]. - - ^ result contents!

1 0

Can we avoid using symlinks?
by Igor Stasenko 10 Jul '13

10 Jul '13

Because there is no way to represent them on windows: tar -xzf cog.tar.gz tar: cog/nscogbuild/cygwinbuild/installer/onebuild: Cannot create symlink to `/Users/eliot/Newspeak/closurevm/onebuild/': No such file or directory tar: Exiting with failure status due to previous errors -- Best regards, Igor Stasenko.

3 4

Re: [Pharo-dev] thisContext usecases
by Eliot Miranda 09 Jul '13

09 Jul '13

Hi Clément, this is a bug. Thanks for finding it. On Tue, Jul 9, 2013 at 1:15 AM, Clément Bera <bera.clement(a)gmail.com> wrote: > Hello pharoers, > > Recently I have been looking at the Pharo thisContext capabilities, in > order to perhaps one day in the far future edit its implementation with the > Pharo dev team. Nothing is planned or confirmed, it is just to discuss. > > A context has instances variables (method closureOrNil > receiver stackp sender pc) and holds the arguments and temporaries. > > Now I'd like to know what context's state do we modify, and what states > are just internal representations ? > > For example, it seems that you can do 'thisContext receiver: #foo', but > you cannot with Cog. > > SomeClass>>foo > thisContext receiver: #foo. > ^ self > > In workspace, evaluating: > 1 to: 5 do: [:i | Transcript show: SomeClass new foo ] > > Transcript result (with Cog): > foo > foo > a SomeClass > a SomeClass > a SomeClass > > Transcript result (with Stack or Vanilla): > foo > foo > foo > foo > foo > > Now as no one has ever complained, I guess this feature is not used. > > As far as I know, the real use cases of the context seems to be: > - setting and gettings temporaries > - setting and getting the sender of a context > - setting and getting the pc > - getting method, closureOrNil, receiver, stackp, arguments but NOT > setting them > > Now setting the sender of a context seems to be used only in two cases: > - continuations (as seaside continuations) > - exception implementation > > So imagine that in the future you would have a context that can be > accessed in read-only, where you could only: > - set the temporaries (but not arguments) > - set the pc (or something equivalent, as set the currently executed ast > node) > - use continuations (exceptions can be implemented on top of continuations) > > I would like to know if there are things that you do now and that you > would not be able to do with a context like that. For non meta developer > (like enterprise app developer) I guess it will not change anything, but I > want to know if you implemented a framework as seaside, does it requires > other things from the context and why ? > > Thanks for answering, > -- best, Eliot

1 0

VM Maker: CMakeVMMaker-EstebanLorenzano.210.mcz
by commits＠source.squeak.org 09 Jul '13

09 Jul '13

Esteban Lorenzano uploaded a new version of CMakeVMMaker to project VM Maker: http://source.squeak.org/VMMaker/CMakeVMMaker-EstebanLorenzano.210.mcz ==================== Summary ==================== Name: CMakeVMMaker-EstebanLorenzano.210 Author: EstebanLorenzano Time: 9 July 2013, 4:31:03.459 pm UUID: 0b263acc-bb9a-4c00-abd8-71339a236f08 Ancestors: CMakeVMMaker-GuillermoPolito.209 - fix msysPathFor:, needed for windows. =============== Diff against CMakeVMMaker-GuillermoPolito.209 =============== Item was changed: ----- Method: CogFamilyWindowsConfig>>msysPathFor: (in category 'as yet unclassified') ----- msysPathFor: aPath | path | + path := aPath asFileReference fullName. - path := aPath. path := path copyReplaceAll: '\' with: '/'. ^ path " copyReplaceAll: '\' with: '\\'"!

1 0

Cog VMMaker (mis)uses NewsqueakIA32ABIPluginAttic ?
by tim Rowledge 05 Jul '13

05 Jul '13

Just the name makes it sound lie a dead chunk of code not intended for use; if you generate sources excluding IA32ABIPlugin you get a directory with the output of this named 'IA32ABIPlugin', which is a big confusing when it's right there in your exclusion list. So, is it code that should be excised? Is it live code that ought to be incorporated into NewsqueakIA32ABIPlugin properly? tim -- tim Rowledge; tim(a)rowledge.org; http://www.rowledge.org/tim Useful random insult:- He hasn't a single redeeming vice.

1 0

ObjectMemory>initBytesPerWord: not called correctly
by tim Rowledge 05 Jul '13

05 Jul '13

Whilst getting back to generating sources to make the stack vm for Pi, I stumbled across this problem; during VMMaker>generateInterpreterFile the #buildCodeGeneratorForInterpreter method did not result in initBytesPerWord: running. Thus when actually generating code for ObjectMemory>byteSwapped: which uses Byte3ShiftNegated we get a dNu because Byte3ShiftNegated is actually nil. It's a bit of a rat's nest in there these days so following the code is a bit tricky. In the debugger at VMMaker>generateInterpreterFile I did a restart and went to trace things but it then actually did the job perfectly. Weird. Anybody else been bitten? I'm using VMMaker.oscog-tpr.301 tim -- tim Rowledge; tim(a)rowledge.org; http://www.rowledge.org/tim When you earnestly believe you can compensate for a lack of skill by doubling your efforts, there's no end to what you can't do

2 3

BalloonEngineConstants is in two different repository/packages?
by tim Rowledge 05 Jul '13

05 Jul '13

I couldn't get B2DPlugin to make, which came as a surprise, since it worked last week. IT turned out that the BalloonEngineConstants shared pool class was missing a few class vars, like GEFEngineStopped. There was no evidence of such variables ever existing in the copy of BalloonEngineConstants that is part if the trunk/Balloon-nice.21.mcz nor its ancestors. I eventually found it in a separate version of the class kept in the VMMaker/Balloon-Engine-Pools-JB.2.mcz package. Is that really how it is supposed to be? It doesn't seem like a very good idea to me…. tim -- tim Rowledge; tim(a)rowledge.org; http://www.rowledge.org/tim Useful Latin Phrases:- Nihil est--in vita priore ego imperator Romanus fui = That's nothing--in a previous life I was a Roman Emperor.

1 0

FT2Plugin for Freetype: Freetype-Plugin-IgorStasenko.64.mcz
by squeak-dev-noreply＠lists.squeakfoundation.org 04 Jul '13

04 Jul '13

A new version of Freetype-Plugin was added to project FT2Plugin for Freetype: http://www.squeaksource.com/FreetypePlugin/Freetype-Plugin-IgorStasenko.64.… ==================== Summary ==================== Name: Freetype-Plugin-IgorStasenko.64 Author: IgorStasenko Time: 30 May 2013, 4:10:21 am UUID: 958b30c7-6b34-4c72-ab55-507c60b6d188 Ancestors: Freetype-Plugin-dtl.63 - fix bug in #primitiveLoadOutlineSizesFrom:

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

Vm-dev July 2013