Vm-dev November 2016

vm-dev@lists.squeakfoundation.org

34 participants
155 discussions

VM Maker: VMMaker.oscog-eem.2005.mcz
by commits＠source.squeak.org 26 Nov '16

26 Nov '16

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.2005.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.2005 Author: eem Time: 25 November 2016, 6:03:49.367116 pm UUID: 27cfed36-5d69-48ea-87c2-ed2b87686075 Ancestors: VMMaker.oscog-eem.2004 RegisterAllocatingCogit & SistaCogit Refactor StackToRegisterMappingCogit>>compileBlockBodies to eliminate SistaCogit>>compileBlockBodies (now stale because it was missing the literalsManager save/resetForBlockCompile sends)). Refactor simStack printing to allow CogRASSBytecodeFixup>>printStateOn: to print its simStack on an arbitrary stream. The only change in semantics: I *think* RegisterAllocatingCogit>>ensureFixupAt: needs to set the mergeSimStack of a fixup if the fixup needsFixup and doesn't have a mergeSimStack. =============== Diff against VMMaker.oscog-eem.2004 =============== Item was changed: ----- Method: CogRASSBytecodeFixup>>printSimStack (in category 'debug printing') ----- printSimStack <doNotGenerate> self notAFixup ifFalse: + [cogit printSimStack: mergeSimStack toDepth: simStackPtr spillBase: -1 on: cogit coInterpreter transcript]! - [cogit printSimStack: mergeSimStack toDepth: simStackPtr spillBase: -1]! Item was added: + ----- Method: CogRASSBytecodeFixup>>printStateOn: (in category 'debug printing') ----- + printStateOn: aStream + <doNotGenerate> + (targetInstruction isNil and: [simStackPtr isNil]) ifTrue: + [^self]. + super printStateOn: aStream. + mergeSimStack ifNotNil: + [aStream skip: -1; space; nextPut: $(. + cogit printSimStack: mergeSimStack toDepth: simStackPtr spillBase: -1 on: aStream. + aStream nextPut: $); nextPut: $)]! Item was changed: ----- Method: CogRegisterAllocatingSimStackEntry>>popToReg: (in category 'compile abstract instructions') ----- popToReg: reg - | inst | <var: #inst type: #'AbstractInstruction *'> liveRegister ~= NoReg ifTrue: + [self deny: spilled. + reg ~= liveRegister - [inst := reg ~= liveRegister ifTrue: [cogit MoveR: liveRegister R: reg] ifFalse: [cogit Label] ] ifFalse: [spilled ifTrue: + [cogit PopR: reg] - [inst := cogit PopR: reg] ifFalse: [type caseOf: { + [SSBaseOffset] -> [cogit MoveMw: offset r: register R: reg]. + [SSConstant] -> [cogit genMoveConstant: constant R: reg]. + [SSRegister] -> [reg ~= register + ifTrue: [cogit MoveR: register R: reg] + ifFalse: [cogit Label]] }]]. - [SSBaseOffset] -> [inst := cogit MoveMw: offset r: register R: reg]. - [SSConstant] -> [inst := cogit genMoveConstant: constant R: reg]. - [SSRegister] -> [inst := reg ~= register - ifTrue: [cogit MoveR: register R: reg] - ifFalse: [cogit Label]] }]]. reg ~= TempReg ifTrue: [liveRegister := reg. cogit observeLiveRegisterIn: self]! Item was changed: ----- Method: RegisterAllocatingCogit>>ensureFixupAt: (in category 'bytecode generator support') ----- ensureFixupAt: targetIndex | fixup | <var: #fixup type: #'BytecodeFixup *'> fixup := self fixupAt: targetIndex. fixup needsFixup + ifTrue: + [fixup mergeSimStack + ifNil: [self setMergeSimStackOf: fixup] + ifNotNil: [self mergeCurrentSimStackWith: fixup mergeSimStack]] - ifTrue: [self mergeCurrentSimStackWith: fixup mergeSimStack ] ifFalse: [self assert: fixup mergeSimStack isNil. self moveSimStackConstantsToRegisters. self setMergeSimStackOf: fixup ]. ^super ensureFixupAt: targetIndex. ! Item was changed: ----- Method: RegisterAllocatingCogit>>restoreSimStackAtMergePoint: (in category 'simulation stack') ----- restoreSimStackAtMergePoint: fixup <inline: true> "All the execution paths reaching a merge point expect everything to be spilled on stack and the optStatus is unknown. If the merge point follows a return, it isn't a merge, but a sdkip past a return. If it is a real merge point then throw away all simStack and optStatus optimization state." fixup mergeSimStack ifNotNil: [simSpillBase := methodOrBlockNumTemps. + self flag: 'try and maintain this through the merge'. optStatus isReceiverResultRegLive: false. 0 to: simStackPtr do: [:i| self cCode: [simStack at: i put: (fixup mergeSimStack at: i)] inSmalltalk: [(simStack at: i) copyFrom: (fixup mergeSimStack at: i)]]]. ^0! Item was changed: ----- Method: RegisterAllocatingCogit>>setMergeSimStackOf: (in category 'bytecode generator support') ----- setMergeSimStackOf: fixup <var: #fixup type: #'BytecodeFixup *'> self assert: nextFixup <= numFixups. self moveSimStackConstantsToRegisters. self cCode: [fixup mergeSimStack: mergeSimStacksBase + (nextFixup * self simStackSlots * (self sizeof: CogSimStackEntry))]. + fixup simStackPtr: simStackPtr. nextFixup := nextFixup + 1. self cCode: [self mem: fixup mergeSimStack cp: simStack y: self simStackSlots * (self sizeof: CogSimStackEntry)] inSmalltalk: [fixup mergeSimStack: self copySimStack]! Item was removed: - ----- Method: SistaCogit>>compileBlockBodies (in category 'compile abstract instructions') ----- - compileBlockBodies - "override to maintain counterIndex when recompiling blocks; sigh." - <inline: false> - | result compiledBlocksCount blockStart savedNeedsFrame savedNumArgs savedNumTemps - initialStackPtr initialOpcodeIndex initialCounterIndex initialIndexOfIRC | - <var: #blockStart type: #'BlockStart *'> - self assert: blockCount > 0. - "scanBlock: in compileBlockEntry: sets both of these appropriately for each block." - savedNeedsFrame := needsFrame. - savedNumArgs := methodOrBlockNumArgs. - savedNumTemps := methodOrBlockNumTemps. - inBlock := InVanillaBlock. - compiledBlocksCount := 0. - [compiledBlocksCount < blockCount] whileTrue: - [blockStart := self blockStartAt: compiledBlocksCount. - (result := self scanBlock: blockStart) < 0 ifTrue: [^result]. - initialOpcodeIndex := opcodeIndex. - initialCounterIndex := counterIndex. - NewspeakVM ifTrue: - [initialIndexOfIRC := indexOfIRC]. - [self compileBlockEntry: blockStart. - initialStackPtr := simStackPtr. - (result := self compileAbstractInstructionsFrom: blockStart startpc + (self pushNilSize: methodObj numInitialNils: blockStart numInitialNils) - through: blockStart startpc + blockStart span - 1) < 0 ifTrue: - [^result]. - "If the final simStackPtr is less than the initial simStackPtr then scanBlock: over- - estimated the number of initial nils (because it assumed one or more pushNils to - produce an operand were pushNils to initialize temps. This is very rare, so - compensate by checking, adjusting numInitialNils and recompiling the block body. - N.B. No need to reinitialize the literalsManager because it answers existing literals." - initialStackPtr = simStackPtr] - whileFalse: - [self assert: initialStackPtr > simStackPtr. - blockStart numInitialNils: blockStart numInitialNils + simStackPtr - initialStackPtr. - blockStart fakeHeader dependent: nil. - self reinitializeFixupsFrom: blockStart startpc + blockStart numInitialNils - through: blockStart startpc + blockStart span - 1. - self cCode: 'bzero(abstractOpcodes + initialOpcodeIndex, - (opcodeIndex - initialOpcodeIndex) * sizeof(AbstractInstruction))' - inSmalltalk: [initialOpcodeIndex to: opcodeIndex - 1 do: - [:i| abstractOpcodes at: i put: (CogCompilerClass for: self)]]. - opcodeIndex := initialOpcodeIndex. - counterIndex := initialCounterIndex. - NewspeakVM ifTrue: - [indexOfIRC := initialIndexOfIRC]]. - compiledBlocksCount := compiledBlocksCount + 1]. - needsFrame := savedNeedsFrame. - methodOrBlockNumArgs := savedNumArgs. - methodOrBlockNumTemps := savedNumTemps. - ^0! Item was added: + ----- Method: SistaCogit>>maybeCounterIndex (in category 'compile abstract instructions') ----- + maybeCounterIndex + <inline: true> + ^counterIndex! Item was added: + ----- Method: SistaCogit>>maybeSetCounterIndex: (in category 'compile abstract instructions') ----- + maybeSetCounterIndex: value + <inline: true> + counterIndex := value! Item was changed: ----- Method: StackToRegisterMappingCogit>>compileBlockBodies (in category 'compile abstract instructions') ----- compileBlockBodies <inline: false> | result compiledBlocksCount blockStart savedNeedsFrame savedNumArgs savedNumTemps + initialStackPtr initialOpcodeIndex initialIndexOfIRC initialCounterIndex | - initialStackPtr initialOpcodeIndex initialIndexOfIRC | <var: #blockStart type: #'BlockStart *'> self assert: blockCount > 0. "scanBlock: in compileBlockEntry: sets both of these appropriately for each block." savedNeedsFrame := needsFrame. savedNumArgs := methodOrBlockNumArgs. savedNumTemps := methodOrBlockNumTemps. inBlock := InVanillaBlock. compiledBlocksCount := 0. [compiledBlocksCount < blockCount] whileTrue: [blockStart := self blockStartAt: compiledBlocksCount. + (result := self scanBlock: blockStart) < 0 ifTrue: [^result]. - (result := self scanBlock: blockStart) < 0 ifTrue: [^result]. initialOpcodeIndex := opcodeIndex. + initialCounterIndex := self maybeCounterIndex."for SistaCogit" literalsManager saveForBlockCompile. NewspeakVM ifTrue: [initialIndexOfIRC := indexOfIRC]. [self compileBlockEntry: blockStart. initialStackPtr := simStackPtr. (result := self compileAbstractInstructionsFrom: blockStart startpc + (self pushNilSize: methodObj numInitialNils: blockStart numInitialNils) through: blockStart startpc + blockStart span - 1) < 0 ifTrue: [^result]. "If the final simStackPtr is less than the initial simStackPtr then scanBlock: over- estimated the number of initial nils (because it assumed one or more pushNils to produce an operand were pushNils to initialize temps. This is very rare, so compensate by checking, adjusting numInitialNils and recompiling the block body. N.B. No need to reinitialize the literalsManager because it answers existing literals." initialStackPtr = simStackPtr] whileFalse: [self assert: initialStackPtr > simStackPtr. blockStart numInitialNils: blockStart numInitialNils + simStackPtr - initialStackPtr. blockStart fakeHeader dependent: nil. self reinitializeFixupsFrom: blockStart startpc + blockStart numInitialNils through: blockStart startpc + blockStart span - 1. self cCode: 'bzero(abstractOpcodes + initialOpcodeIndex, (opcodeIndex - initialOpcodeIndex) * sizeof(AbstractInstruction))' inSmalltalk: [initialOpcodeIndex to: opcodeIndex - 1 do: [:i| abstractOpcodes at: i put: (CogCompilerClass for: self)]]. opcodeIndex := initialOpcodeIndex. + self maybeSetCounterIndex: initialCounterIndex. "For SistaCogit" literalsManager resetForBlockCompile. NewspeakVM ifTrue: [indexOfIRC := initialIndexOfIRC]]. compiledBlocksCount := compiledBlocksCount + 1]. needsFrame := savedNeedsFrame. methodOrBlockNumArgs := savedNumArgs. methodOrBlockNumTemps := savedNumTemps. ^0! Item was added: + ----- Method: StackToRegisterMappingCogit>>maybeCounterIndex (in category 'compile abstract instructions') ----- + maybeCounterIndex + "Hook for SistaCogit to allow it to reuse compileBlockBodies" + <inline: true> + ^0! Item was added: + ----- Method: StackToRegisterMappingCogit>>maybeSetCounterIndex: (in category 'compile abstract instructions') ----- + maybeSetCounterIndex: value + "Hook for SistaCogit to allow it to reuse compileBlockBodies" + <inline: true>! Item was changed: ----- Method: StackToRegisterMappingCogit>>printSimStack (in category 'simulation only') ----- printSimStack <doNotGenerate> + self printSimStack: simStack toDepth: simStackPtr spillBase: simSpillBase on: coInterpreter transcript! - self printSimStack: simStack toDepth: simStackPtr spillBase: simSpillBase! Item was removed: - ----- Method: StackToRegisterMappingCogit>>printSimStack:toDepth:spillBase: (in category 'simulation only') ----- - printSimStack: aSimStack toDepth: limit spillBase: spillBase - <doNotGenerate> - coInterpreter transcript ensureCr. - limit < 0 ifTrue: - [^coInterpreter transcript nextPutAll: 'simStackEmpty'; cr; flush]. - 0 to: limit do: - [:i| - coInterpreter transcript print: i. - i = spillBase - ifTrue: [coInterpreter transcript nextPutAll: ' sb'; tab] - ifFalse: [coInterpreter transcript tab; tab]. - (aSimStack at: i) printStateOn: coInterpreter transcript. - coInterpreter transcript cr; flush]! Item was added: + ----- Method: StackToRegisterMappingCogit>>printSimStack:toDepth:spillBase:on: (in category 'simulation only') ----- + printSimStack: aSimStack toDepth: limit spillBase: spillBase on: aStream + <doNotGenerate> + aStream ensureCr. + limit < 0 ifTrue: + [^aStream nextPutAll: 'simStackEmpty'; cr; flush]. + 0 to: limit do: + [:i| + aStream print: i. + i = spillBase + ifTrue: [aStream nextPutAll: ' sb'; tab] + ifFalse: [aStream tab; tab]. + (aSimStack at: i) printStateOn: aStream. + aStream cr; flush]!

1 0

[OpenSmalltalk/opensmalltalk-vm] 83dfa3: add external plugins for win32
by GitHub 25 Nov '16

25 Nov '16

Branch: refs/heads/Cog Home: https://github.com/OpenSmalltalk/opensmalltalk-vm Commit: 83dfa331caeca7df16d1dc50a669afe62610ca4c https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/83dfa331caeca7df16… Author: Esteban Lorenzano <estebanlm(a)gmail.com> Date: 2016-11-25 (Fri, 25 Nov 2016) Changed paths: M build.win32x86/common/Makefile M build.win32x86/pharo.cog.spur/Makefile M build.win32x86/pharo.cog.spur/plugins.ext M build.win32x86/pharo.cog.spur/plugins.int M platforms/win32/plugins/FT2Plugin/Makefile.plugin A platforms/win32/plugins/SDL2DisplayPlugin/Makefile.plugin M platforms/win32/plugins/SqueakSSL/Makefile.plugin Log Message: ----------- add external plugins for win32 Commit: a04b8f07add56cb234feb29d92509ae6380151c9 https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/a04b8f07add56cb234… Author: Esteban Lorenzano <estebanlm(a)gmail.com> Date: 2016-11-25 (Fri, 25 Nov 2016) Changed paths: M build.macos32x86/common/Makefile.lib.extra M build.macos32x86/third-party/libgit2/Makefile.lib Log Message: ----------- restore libgit2 0.23 (for the moment) Commit: 3ade24a5dc77a316a0fa69b6d84f457b067192fe https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/3ade24a5dc77a316a0… Author: Esteban Lorenzano <estebanlm(a)gmail.com> Date: 2016-11-25 (Fri, 25 Nov 2016) Changed paths: M build.linux32x86/pharo.cog.spur/build.assert/mvm M build.linux32x86/pharo.cog.spur/build.itimerheartbeat/mvm M build.linux32x86/pharo.cog.spur/build/mvm M build.linux64x64/pharo.cog.spur/build.assert/mvm M build.linux64x64/pharo.cog.spur/build.itimerheartbeat/mvm M build.linux64x64/pharo.cog.spur/build/mvm M build.macos32x86/pharo.cog.spur/Makefile M build.macos64x64/pharo.cog.spur/Makefile Log Message: ----------- add IMMUTABILITY=1 to PharoVM Commit: 662dc144a946d3e71c571b86f0a8ecb397efdfaf https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/662dc144a946d3e71c… Author: Nicolas Cellier <nicolas.cellier.aka.nice(a)gmail.com> Date: 2016-11-25 (Fri, 25 Nov 2016) Changed paths: M build.linux32x86/pharo.cog.spur/build.assert/mvm M build.linux32x86/pharo.cog.spur/build.itimerheartbeat/mvm M build.linux32x86/pharo.cog.spur/build/mvm M build.linux64x64/pharo.cog.spur/build.assert/mvm M build.linux64x64/pharo.cog.spur/build.itimerheartbeat/mvm M build.linux64x64/pharo.cog.spur/build/mvm M build.macos32x86/common/Makefile.lib.extra M build.macos32x86/pharo.cog.spur/Makefile M build.macos32x86/third-party/libgit2/Makefile.lib M build.macos64x64/pharo.cog.spur/Makefile M build.win32x86/common/Makefile M build.win32x86/pharo.cog.spur/Makefile M build.win32x86/pharo.cog.spur/plugins.ext M build.win32x86/pharo.cog.spur/plugins.int M platforms/win32/plugins/FT2Plugin/Makefile.plugin A platforms/win32/plugins/SDL2DisplayPlugin/Makefile.plugin M platforms/win32/plugins/SqueakSSL/Makefile.plugin Log Message: ----------- Merge pull request #103 from estebanlm/merge-with-pharo add IMMUTABILITY as default for PharoVM Compare: https://github.com/OpenSmalltalk/opensmalltalk-vm/compare/a124f3c8c8e0...66…

1 0

VM Maker: VMMaker.oscog-eem.2004.mcz
by commits＠source.squeak.org 25 Nov '16

25 Nov '16

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.2004.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.2004 Author: eem Time: 25 November 2016, 12:27:17.318388 pm UUID: 2611a673-7341-4feb-b642-20dd06d9ae87 Ancestors: VMMaker.oscog-cb.2003 RegisterAllocatingCogit: Compile readStream>>#next correctly, i.e. compile the inlined + in "^collection at: (position := position + 1)" in the context of colleciton on the stack. Also keep receiverResultRegLive. Alas these changes cause IdentityDictionary>scanFor: to blow up again, sending \\ to the key. =============== Diff against VMMaker.oscog-cb.2003 =============== Item was changed: ----- Method: CogRegisterAllocatingSimStackEntry>>reconcileWith: (in category 'compile abstract instructions') ----- reconcileWith: simStackEntry + "Make the state of each simStackEntry, a stack entry along the non-inlined special selector path, + the same as the corresponding simStackEntry along the inlined path (the receiver)." <var: #simStackEntry type: #'SimStackEntry *'> type = SSConstant ifTrue: [cogit AddCw: BytesPerWord R: SPReg. ^self]. liveRegister ~= NoReg ifTrue: [simStackEntry popToReg: liveRegister. ^self]. type = SSRegister ifTrue: [simStackEntry popToReg: register. ^self]. self halt! Item was changed: StackToRegisterMappingCogit subclass: #RegisterAllocatingCogit + instanceVariableNames: 'numFixups mergeSimStacksBase nextFixup scratchSimStack scratchSpillBase scratchOptStatus' - instanceVariableNames: 'numFixups mergeSimStacksBase nextFixup scratchSimStack scratchSpillBase' classVariableNames: '' poolDictionaries: '' category: 'VMMaker-JIT'! !RegisterAllocatingCogit commentStamp: 'cb 4/15/2016 14:58' prior: 0! RegisterAllocatingCogit is an optimizing code generator that is specialized in register allocation.. On the contrary to StackToRegisterMappingCogit, RegisterAllocatingCogit keeps at each control flow merge point the state of the simulated stack to merge into and not only an integer fixup. Each branch and jump record the current state of the simulated stack, and each fixup is responsible for merging this state into the saved simulated stack. ! Item was changed: ----- Method: RegisterAllocatingCogit class>>declareCVarsIn: (in category 'C translation') ----- declareCVarsIn: aCodeGen + aCodeGen + var: #scratchSimStack + type: #'CogSimStackEntry *'; + var: #scratchOptStatus + type: #CogSSOptStatus! - aCodeGen var: #scratchSimStack type: #'CogSimStackEntry *'! Item was added: + ----- Method: RegisterAllocatingCogit>>captureUnspilledSpillsForSpecialSelectorSend: (in category 'bytecode generator support') ----- + captureUnspilledSpillsForSpecialSelectorSend: liveRegisterMask + "Since we're allocating values in registers we would like to keep those registers live on the inlined path + and reload registers along the non-inlined send path. But any values that would need to be spilled + along the non-inlined path must be captured before the split so that both paths can join. If we don't + capture the values on the non-inlined path we could access stale values. So for all stack entries that + would be spilled along the non-inlined path, assign them to registers, or spill if none are available." + | i liveRegs reg | + liveRegs := liveRegisterMask. + optStatus isReceiverResultRegLive ifTrue: + [liveRegs := liveRegs + (self registerMaskFor: ReceiverResultReg)]. + reg := TempReg. "Anything but NoReg" + i := simStackPtr + 1. "We must spill a contiguous range at the hot top of stack, so we assign coldest first :-(" + [reg ~= NoReg and: [i > simSpillBase and: [i > 0]]] whileTrue: + [i := i - 1. + self deny: ((self simStackAt: i) spilled and: [(self simStackAt: i) type = SSBaseOffset]). + ((self simStackAt: i) spilled not + and: [(self simStackAt: i) type = SSBaseOffset]) ifTrue: + [reg := self allocateRegNotConflictingWith: liveRegs. + reg ~= NoReg ifTrue: + [(self simStackAt: i) storeToReg: reg]]]. + reg = NoReg ifTrue: + [self ssFlushTo: i]! Item was changed: ----- Method: RegisterAllocatingCogit>>copySimStackToScratch: (in category 'bytecode generator support') ----- copySimStackToScratch: spillBase <inline: true> self cCode: [self mem: scratchSimStack cp: simStack y: self simStackSlots * (self sizeof: CogSimStackEntry)] inSmalltalk: [0 to: simStackPtr do: [:i| scratchSimStack at: i put: (simStack at: i) copy]]. + scratchSpillBase := spillBase. + scratchOptStatus := self cCode: [optStatus] inSmalltalk: [optStatus copy]! - scratchSpillBase := spillBase! Item was changed: ----- Method: RegisterAllocatingCogit>>flushLiveRegistersForSend (in category 'bytecode generator support') ----- flushLiveRegistersForSend <inline: true> self assert: simSelf type = SSBaseOffset. simSelf liveRegister: NoReg. 0 to: simStackPtr do: [:i| self assert: ((self simStackAt: i) spilled + and: [(self simStackAt: i) type = SSConstant + or: [((self simStackAt: i) type = SSBaseOffset - and: [((self simStackAt: i) type = SSBaseOffset or: [i >= methodOrBlockNumTemps and: (self simStackAt: i) type = SSSpill]) + and: [(self simStackAt: i) register = FPReg + and: [(self simStackAt: i) offset = (self frameOffsetOfTemporary: i)]]]]). - and: [(self simStackAt: i) register = FPReg - and: [(self simStackAt: i) offset = (self frameOffsetOfTemporary: i)]]]). (self simStackAt: i) liveRegister: NoReg]! Item was added: + ----- Method: RegisterAllocatingCogit>>freeAnyRegNotConflictingWith: (in category 'simulation stack') ----- + freeAnyRegNotConflictingWith: regMask + "Spill the closest register on stack not conflicting with regMask. + Override so no assertion failure if no register can be allocated." + <var: #desc type: #'CogSimStackEntry *'> + | reg index | + self assert: needsFrame. + reg := NoReg. + index := simSpillBase max: 0. + [reg = NoReg and: [index < simStackPtr]] whileTrue: + [ | desc | + desc := self simStackAt: index. + desc type = SSRegister ifTrue: + [(regMask anyMask: (self registerMaskFor: desc register)) ifFalse: + [reg := desc register]]. + index := index + 1]. + reg ~= NoReg ifTrue: + [self ssAllocateRequiredReg: reg]. + ^reg! Item was changed: ----- Method: RegisterAllocatingCogit>>genSpecialSelectorArithmetic (in category 'bytecode generators') ----- genSpecialSelectorArithmetic | primDescriptor rcvrIsConst argIsConst rcvrIsInt argIsInt rcvrInt argInt result + jumpNotSmallInts jumpContinue index rcvrReg argReg regMask | - jumpNotSmallInts jumpContinue index rcvrReg argReg | <var: #jumpContinue type: #'AbstractInstruction *'> <var: #primDescriptor type: #'BytecodeDescriptor *'> <var: #jumpNotSmallInts type: #'AbstractInstruction *'> primDescriptor := self generatorAt: byte0. argIsInt := (argIsConst := self ssTop type = SSConstant) and: [objectMemory isIntegerObject: (argInt := self ssTop constant)]. rcvrIsInt := (rcvrIsConst := (self ssValue: 1) type = SSConstant) and: [objectMemory isIntegerObject: (rcvrInt := (self ssValue: 1) constant)]. (argIsInt and: [rcvrIsInt]) ifTrue: [rcvrInt := objectMemory integerValueOf: rcvrInt. argInt := objectMemory integerValueOf: argInt. primDescriptor opcode caseOf: { [AddRR] -> [result := rcvrInt + argInt]. [SubRR] -> [result := rcvrInt - argInt]. [AndRR] -> [result := rcvrInt bitAnd: argInt]. [OrRR] -> [result := rcvrInt bitOr: argInt] }. (objectMemory isIntegerValue: result) ifTrue: ["Must annotate the bytecode for correct pc mapping." ^self ssPop: 2; ssPushAnnotatedConstant: (objectMemory integerObjectOf: result)]. ^self genSpecialSelectorSend]. "If there's any constant involved other than a SmallInteger don't attempt to inline." ((rcvrIsConst and: [rcvrIsInt not]) or: [argIsConst and: [argIsInt not]]) ifTrue: [^self genSpecialSelectorSend]. "If we know nothing about the types then better not to inline as the inline cache and primitive code is not terribly slow so wasting time on duplicating tag tests is pointless." (argIsInt or: [rcvrIsInt]) ifFalse: [^self genSpecialSelectorSend]. + "Since one or other of the arguments is an integer we can very likely profit from inlining. + But if the other type is not SmallInteger or if the operation overflows then we will need to do a send. + Since we're allocating values in registers we would like to keep those registers live on the inlined path + and reload registers along the non-inlined send path. But any values that would need to be spilled + along the non-inlined path must be captured before the split so that both paths can join. If we don't + capture the values on the non-iblined path we could access stale values. So for all stack entries that + would be spilled along the non-inlined path, assign them to registers, or spill if none are available." argIsInt ifTrue: [rcvrReg := self allocateRegForStackEntryAt: 1. (self ssValue: 1) popToReg: rcvrReg. + self MoveR: rcvrReg R: TempReg. + regMask := self registerMaskFor: rcvrReg] - self MoveR: rcvrReg R: TempReg] ifFalse: [self allocateRegForStackTopTwoEntriesInto: [:rTop :rNext| argReg := rTop. rcvrReg := rNext]. self ssTop popToReg: argReg. (self ssValue: 1) popToReg: rcvrReg. + self MoveR: argReg R: TempReg. + regMask := self registerMaskFor: rcvrReg and: argReg]. - self MoveR: argReg R: TempReg]. self ssPop: 2. + self captureUnspilledSpillsForSpecialSelectorSend: regMask. jumpNotSmallInts := (argIsInt or: [rcvrIsInt]) ifTrue: [objectRepresentation genJumpNotSmallIntegerInScratchReg: TempReg] ifFalse: [objectRepresentation genJumpNotSmallIntegersIn: rcvrReg andScratch: TempReg scratch: ClassReg]. primDescriptor opcode caseOf: { [AddRR] -> [argIsInt ifTrue: [self AddCq: argInt - ConstZero R: rcvrReg. jumpContinue := self JumpNoOverflow: 0. "overflow; must undo the damage before continuing" self SubCq: argInt - ConstZero R: rcvrReg] ifFalse: [objectRepresentation genRemoveSmallIntegerTagsInScratchReg: rcvrReg. self AddR: argReg R: rcvrReg. jumpContinue := self JumpNoOverflow: 0. "overflow; must undo the damage before continuing" rcvrIsInt ifTrue: [self MoveCq: rcvrInt R: rcvrReg] ifFalse: [self SubR: argReg R: rcvrReg. objectRepresentation genSetSmallIntegerTagsIn: rcvrReg]]]. [SubRR] -> [argIsInt ifTrue: [self SubCq: argInt - ConstZero R: rcvrReg. jumpContinue := self JumpNoOverflow: 0. "overflow; must undo the damage before continuing" self AddCq: argInt - ConstZero R: rcvrReg] ifFalse: [objectRepresentation genRemoveSmallIntegerTagsInScratchReg: argReg. self SubR: argReg R: rcvrReg. jumpContinue := self JumpNoOverflow: 0. "overflow; must undo the damage before continuing" self AddR: argReg R: rcvrReg. objectRepresentation genSetSmallIntegerTagsIn: argReg]]. [AndRR] -> [argIsInt ifTrue: [self AndCq: argInt R: rcvrReg] ifFalse: [self AndR: argReg R: rcvrReg]. jumpContinue := self Jump: 0]. [OrRR] -> [argIsInt ifTrue: [self OrCq: argInt R: rcvrReg] ifFalse: [self OrR: argReg R: rcvrReg]. jumpContinue := self Jump: 0] }. jumpNotSmallInts jmpTarget: self Label. self ssPushRegister: rcvrReg. self copySimStackToScratch: (simSpillBase min: simStackPtr - 1). self ssPop: 1. self ssFlushTo: simStackPtr. self deny: rcvrReg = Arg0Reg. argIsInt ifTrue: [self MoveCq: argInt R: Arg0Reg] ifFalse: [argReg ~= Arg0Reg ifTrue: [self MoveR: argReg R: Arg0Reg]]. rcvrReg ~= ReceiverResultReg ifTrue: [self MoveR: rcvrReg R: ReceiverResultReg]. index := byte0 - self firstSpecialSelectorBytecodeOffset. self genMarshalledSend: index negated - 1 numArgs: 1 sendTable: ordinarySendTrampolines. self reconcileRegisterStateForJoinAfterSpecialSelectorSend. jumpContinue jmpTarget: self Label. ^0! Item was added: + ----- Method: RegisterAllocatingCogit>>receiverRefOnScratchSimStack (in category 'bytecode generator support') ----- + receiverRefOnScratchSimStack + simStackPtr to: (0 max: scratchSpillBase) by: -1 do: + [:i| + ((self addressOf: (scratchSimStack at: i)) register = ReceiverResultReg + and: [(self addressOf: (scratchSimStack at: i)) type = SSBaseOffset]) ifTrue: + [^true]]. + ^false! Item was changed: + ----- Method: RegisterAllocatingCogit>>reconcileRegisterStateForJoinAfterSpecialSelectorSend (in category 'bytecode generator support') ----- - ----- Method: RegisterAllocatingCogit>>reconcileRegisterStateForJoinAfterSpecialSelectorSend (in category 'bytecode generators') ----- reconcileRegisterStateForJoinAfterSpecialSelectorSend "When the control flow from the inlined special selector code (e.g. add or comparison) joins the control flow from the send, taken when the inlined code fails, we should decide whether to reload any registers known to contain useful values or mark them as dead." "If ReceiverResultReg is live along the inlined path, and is used before the next full send, reload it on the uncommon path." + scratchOptStatus isReceiverResultRegLive ifTrue: + [(self existsInstVarRefBeforeSendOrReturn + or: [self receiverRefOnScratchSimStack]) + ifTrue: + [optStatus isReceiverResultRegLive: true. + optStatus ssEntry storeToReg: ReceiverResultReg] - optStatus isReceiverResultRegLive ifTrue: - [self existsInstVarRefBeforeSendOrReturn - ifTrue: [optStatus ssEntry storeToReg: ReceiverResultReg] ifFalse: [optStatus isReceiverResultRegLive: false]]. "Restore the simStack to that in scratchSimStack, popping any spilled state back into allocated registers." simSpillBase := scratchSpillBase. + simStackPtr to: 0 by: -1 do: - simStackPtr to: simSpillBase + 1 by: -1 do: [:i| self assert: (i = simStackPtr ifTrue: [(self simStackAt: i) type = SSRegister] ifFalse: [(self simStackAt: i) spilled]). + (self addressOf: (scratchSimStack at: i)) spilled ifTrue: + [self assert: ((scratchSimStack at: i) isSameEntryAs: (self simStackAt: i)). + ^self]. (self addressOf: (scratchSimStack at: i)) reconcileWith: (self simStackAt: i). simStack at: i put: (self cCode: [scratchSimStack at: i] inSmalltalk: [(scratchSimStack at: i) copy])]!

1 0

[OpenSmalltalk/opensmalltalk-vm] a124f3: Substitute realpath by wildcard in win64 build too
by GitHub 25 Nov '16

25 Nov '16

Branch: refs/heads/Cog Home: https://github.com/OpenSmalltalk/opensmalltalk-vm Commit: a124f3c8c8e0ed5c58ae2ae92c88e50d9319873a https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/a124f3c8c8e0ed5c58… Author: Nicolas Cellier <nicolas.cellier(a)sirehna.com> Date: 2016-11-25 (Fri, 25 Nov 2016) Changed paths: M build.win64x64/common/Makefile Log Message: ----------- Substitute realpath by wildcard in win64 build too realpath does not work in the gnumake version provided with MSYS Also apply some of the changes made to win32 for compiling win32 pharo (TODO apply the other changes related to THIRDPARTYLIBS)

1 0

[OpenSmalltalk/opensmalltalk-vm] e959fa: using $wildcard instead $realpath to detect plugin...
by GitHub 25 Nov '16

25 Nov '16

Branch: refs/heads/Cog Home: https://github.com/OpenSmalltalk/opensmalltalk-vm Commit: e959fa6329c4dd0b4d3c5bb83203090f33b9029a https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/e959fa6329c4dd0b4d… Author: Esteban Lorenzano <estebanlm(a)gmail.com> Date: 2016-11-14 (Mon, 14 Nov 2016) Changed paths: M build.win32x86/common/Makefile Log Message: ----------- using $wildcard instead $realpath to detect plugin Makefile.plugin because $realpath is not working in mingw Commit: 3dc5d6ceebc25528e8cf9d22f4fd581db57915e2 https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/3dc5d6ceebc25528e8… Author: Esteban Lorenzano <estebanlm(a)gmail.com> Date: 2016-11-16 (Wed, 16 Nov 2016) Changed paths: M .appveyor.yml M .travis_build.sh A build.win32x86/squeak.sista.spur/Croquet.def.in A build.win32x86/squeak.sista.spur/Croquet.exe.manifest A build.win32x86/squeak.sista.spur/Croquet.ico A build.win32x86/squeak.sista.spur/Croquet.rc A build.win32x86/squeak.sista.spur/GreenCogSqueak.ico A build.win32x86/squeak.sista.spur/Makefile R build.win32x86/squeak.sista.spur/NotYetImplemented A build.win32x86/squeak.sista.spur/Squeak.def.in A build.win32x86/squeak.sista.spur/Squeak.exe.manifest A build.win32x86/squeak.sista.spur/Squeak.rc A build.win32x86/squeak.sista.spur/mvm A build.win32x86/squeak.sista.spur/plugins.ext A build.win32x86/squeak.sista.spur/plugins.int A build.win32x86/squeak.sista.spur/squeak.ico M build.win64x64/squeak.stack.spur/plugins.ext M nsspur64src/vm/cogit.h M nsspur64src/vm/cogitX64.c M nsspur64src/vm/cointerp.c M nsspur64src/vm/cointerp.h M nsspur64src/vm/gcc3x-cointerp.c M nsspur64src/vm/vmCallback.h M nsspursrc/vm/cogit.h M nsspursrc/vm/cogitARMv5.c M nsspursrc/vm/cogitIA32.c M nsspursrc/vm/cogitMIPSEL.c M nsspursrc/vm/cointerp.c M nsspursrc/vm/cointerp.h M nsspursrc/vm/gcc3x-cointerp.c M nsspursrc/vm/vmCallback.h M nsspurstack64src/vm/gcc3x-interp.c M nsspurstack64src/vm/interp.c M nsspurstack64src/vm/vmCallback.h M nsspurstacksrc/vm/gcc3x-interp.c M nsspurstacksrc/vm/interp.c M nsspurstacksrc/vm/vmCallback.h M platforms/Cross/plugins/BitBltPlugin/BitBltGeneric.c M platforms/Cross/plugins/ExampleSurfacePlugin/sqMemorySurface.c M platforms/Cross/plugins/IA32ABI/x64win64ia32abicc.c M platforms/Cross/plugins/SqueakFFIPrims/sqFFI.h M platforms/Cross/plugins/SqueakFFIPrims/sqManualSurface.c M platforms/Cross/plugins/SurfacePlugin/SurfacePlugin.c M platforms/Cross/plugins/SurfacePlugin/SurfacePlugin.h M platforms/Cross/vm/dispdbg.h M platforms/Cross/vm/sqSCCSVersion.h M platforms/Mac OS/plugins/QuicktimePlugin/sqMacQuicktimeInteface.c M platforms/Mac OS/vm/sqMacWindow.c M platforms/iOS/plugins/QuicktimePlugin/sqMacQuicktimeInteface.c M platforms/unix/vm/sqUnixCharConv.c M platforms/unix/vm/sqUnixExternalPrims.c M platforms/unix/vm/sqUnixMain.c M platforms/win32/plugins/B3DAcceleratorPlugin/sqWin32D3D.c M platforms/win32/plugins/DropPlugin/sqWin32Drop.c M platforms/win32/plugins/HostWindowPlugin/sqWin32HostWindowPlugin.c M platforms/win32/plugins/JoystickTabletPlugin/sqWin32Joystick.c M platforms/win32/plugins/MIDIPlugin/sqWin32MIDI.c M platforms/win32/plugins/SecurityPlugin/sqWin32Security.c M platforms/win32/plugins/SocketPlugin/sqWin32NewNet.c M platforms/win32/plugins/SoundPlugin/sqWin32Sound.c M platforms/win32/vm/sqWin32Backtrace.c M platforms/win32/vm/sqWin32Window.c M spur64src/vm/cogit.h M spur64src/vm/cogitX64.c M spur64src/vm/cointerp.c M spur64src/vm/cointerp.h M spur64src/vm/gcc3x-cointerp.c M spur64src/vm/vmCallback.h M spursista64src/vm/cogit.h M spursista64src/vm/cogitX64.c M spursista64src/vm/cointerp.c M spursista64src/vm/cointerp.h M spursista64src/vm/gcc3x-cointerp.c M spursista64src/vm/vmCallback.h M spursistasrc/vm/cogit.h M spursistasrc/vm/cogitARMv5.c M spursistasrc/vm/cogitIA32.c M spursistasrc/vm/cogitMIPSEL.c M spursistasrc/vm/cointerp.c M spursistasrc/vm/cointerp.h M spursistasrc/vm/gcc3x-cointerp.c M spursistasrc/vm/vmCallback.h M spursrc/vm/cogit.h M spursrc/vm/cogitARMv5.c M spursrc/vm/cogitIA32.c M spursrc/vm/cogitMIPSEL.c M spursrc/vm/cointerp.c M spursrc/vm/cointerp.h M spursrc/vm/gcc3x-cointerp.c M spursrc/vm/vmCallback.h M spurstack64src/vm/gcc3x-interp.c M spurstack64src/vm/interp.c M spurstack64src/vm/vmCallback.h M spurstacksrc/vm/gcc3x-interp.c M spurstacksrc/vm/interp.c M spurstacksrc/vm/vmCallback.h M src/plugins/AioPlugin/AioPlugin.c M src/plugins/BitBltPlugin/BitBltPlugin.c M src/plugins/BochsIA32Plugin/BochsIA32Plugin.c M src/plugins/BochsX64Plugin/BochsX64Plugin.c M src/plugins/FileCopyPlugin/FileCopyPlugin.c M src/plugins/FilePlugin/FilePlugin.c M src/plugins/GdbARMPlugin/GdbARMPlugin.c M src/plugins/HostWindowPlugin/HostWindowPlugin.c M src/plugins/IA32ABI/IA32ABI.c M src/plugins/InternetConfigPlugin/InternetConfigPlugin.c M src/plugins/LargeIntegers/LargeIntegers.c M src/plugins/MIDIPlugin/MIDIPlugin.c M src/plugins/MacMenubarPlugin/MacMenubarPlugin.c M src/plugins/Mpeg3Plugin/Mpeg3Plugin.c M src/plugins/QuicktimePlugin/QuicktimePlugin.c M src/plugins/SerialPlugin/SerialPlugin.c M src/plugins/SocketPlugin/SocketPlugin.c M src/plugins/SoundPlugin/SoundPlugin.c M src/plugins/SqueakFFIPrims/ARM32FFIPlugin.c M src/plugins/SqueakFFIPrims/IA32FFIPlugin.c M src/plugins/SqueakFFIPrims/SqueakFFIPrims.c M src/plugins/SqueakFFIPrims/X64SysVFFIPlugin.c M src/plugins/SqueakFFIPrims/X64Win64FFIPlugin.c M src/plugins/UnixOSProcessPlugin/UnixOSProcessPlugin.c M src/plugins/VMProfileLinuxSupportPlugin/VMProfileLinuxSupportPlugin.c M src/plugins/VMProfileMacSupportPlugin/VMProfileMacSupportPlugin.c M src/plugins/Win32OSProcessPlugin/Win32OSProcessPlugin.c M src/vm/cogit.h M src/vm/cogitARMv5.c M src/vm/cogitIA32.c M src/vm/cogitMIPSEL.c M src/vm/cointerp.c M src/vm/cointerp.h M src/vm/cointerpmt.c M src/vm/cointerpmt.h M src/vm/gcc3x-cointerp.c M src/vm/gcc3x-cointerpmt.c M src/vm/vmCallback.h M stacksrc/vm/gcc3x-interp.c M stacksrc/vm/interp.c M stacksrc/vm/vmCallback.h M tests/smalltalk.ston Log Message: ----------- Merge branch 'Cog' of github.com:OpenSmalltalk/opensmalltalk-vm into merge-with-pharo-win32 Commit: 65d7ebdcf40b06efeda914a64f7a8605ef85add2 https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/65d7ebdcf40b06efed… Author: Esteban Lorenzano <estebanlm(a)gmail.com> Date: 2016-11-17 (Thu, 17 Nov 2016) Changed paths: A build.linux64x64/nsnac.cog.spur/build.assert.itimerheartbeat/mvm A build.linux64x64/nsnac.cog.spur/build.assert/mvm A build.linux64x64/nsnac.cog.spur/build.debug.itimerheartbeat/mvm A build.linux64x64/nsnac.cog.spur/build.debug/mvm A build.linux64x64/nsnac.cog.spur/build.itimerheartbeat/mvm A build.linux64x64/nsnac.cog.spur/build/mvm A build.linux64x64/nsnac.cog.spur/makeallclean A build.linux64x64/nsnac.cog.spur/makealldirty A build.linux64x64/nsnac.cog.spur/plugins.ext A build.linux64x64/nsnac.cog.spur/plugins.int M platforms/unix/config/make.cfg.in Log Message: ----------- Merge branch 'Cog' of github.com:OpenSmalltalk/opensmalltalk-vm into merge-with-pharo-win32 Commit: db1a0e9d828755cf4a68c7c4b58f51346a9fe174 https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/db1a0e9d828755cf4a… Author: Esteban Lorenzano <estebanlm(a)gmail.com> Date: 2016-11-18 (Fri, 18 Nov 2016) Changed paths: M .travis_build.sh Log Message: ----------- just verify gcc for windows when using cygwin Commit: 3aa8b3e280aae02d9f5ba136b07986e6163c153c https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/3aa8b3e280aae02d9f… Author: Esteban Lorenzano <estebanlm(a)gmail.com> Date: 2016-11-18 (Fri, 18 Nov 2016) Changed paths: M .travis_build.sh Log Message: ----------- Revert "just verify gcc for windows when using cygwin" This reverts commit db1a0e9d828755cf4a68c7c4b58f51346a9fe174. Commit: 760288d18644b1ad3e67b606c661b1f529a59152 https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/760288d18644b1ad3e… Author: Esteban Lorenzano <estebanlm(a)gmail.com> Date: 2016-11-18 (Fri, 18 Nov 2016) Changed paths: M .appveyor.yml M build.win64x64/common/Makefile.tools M platforms/win32/vm/sqWin32Heartbeat.c M platforms/win32/vm/sqWin32Stubs.c Log Message: ----------- Merge branch 'Cog' of github.com:OpenSmalltalk/opensmalltalk-vm into merge-with-pharo Commit: 61f9e31a2c9ba68ccbd6da4450c9745691d55e67 https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/61f9e31a2c9ba68ccb… Author: Esteban Lorenzano <estebanlm(a)gmail.com> Date: 2016-11-18 (Fri, 18 Nov 2016) Changed paths: M build.macos32x86/third-party/libgit2/Makefile.lib M build.win32x86/pharo.cog.spur/Makefile Log Message: ----------- starting to recover some changes Commit: 570844b5a5053b59eac5fa9a4dc746f93b76dd08 https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/570844b5a5053b59ea… Author: Esteban Lorenzano <estebanlm(a)gmail.com> Date: 2016-11-18 (Fri, 18 Nov 2016) Changed paths: M build.win32x86/common/Makefile A build.win32x86/common/Makefile.lib.extra M build.win32x86/pharo.cog.spur/Makefile A build.win32x86/third-party/cairo/Makefile A build.win32x86/third-party/cairo/Makefile.lib A build.win32x86/third-party/freetype2/Makefile A build.win32x86/third-party/freetype2/Makefile.lib A build.win32x86/third-party/libgit2/Makefile A build.win32x86/third-party/libgit2/Makefile.lib A build.win32x86/third-party/libpng/Makefile A build.win32x86/third-party/libpng/Makefile.lib A build.win32x86/third-party/libsdl2/Makefile A build.win32x86/third-party/libsdl2/Makefile.lib A build.win32x86/third-party/libssh2/Makefile A build.win32x86/third-party/libssh2/Makefile.lib A build.win32x86/third-party/openssl/Makefile A build.win32x86/third-party/openssl/Makefile.lib A build.win32x86/third-party/pixman/Makefile A build.win32x86/third-party/pixman/Makefile.lib A build.win32x86/third-party/pkgconfig/Makefile A build.win32x86/third-party/pkgconfig/Makefile.lib A build.win32x86/third-party/zlib/Makefile A build.win32x86/third-party/zlib/Makefile.lib Log Message: ----------- recover changes from commit 1b6abd7 Commit: 414da7b69cb5035c20c93e0afbd4a2b8ef62dd97 https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/414da7b69cb5035c20… Author: Esteban Lorenzano <estebanlm(a)gmail.com> Date: 2016-11-18 (Fri, 18 Nov 2016) Changed paths: M build.macos32x86/third-party/libgit2/Makefile.lib M build.win32x86/common/Makefile A build.win32x86/common/Makefile.lib.extra M build.win32x86/pharo.cog.spur/Makefile A build.win32x86/third-party/cairo/Makefile A build.win32x86/third-party/cairo/Makefile.lib A build.win32x86/third-party/freetype2/Makefile A build.win32x86/third-party/freetype2/Makefile.lib A build.win32x86/third-party/libgit2/Makefile A build.win32x86/third-party/libgit2/Makefile.lib A build.win32x86/third-party/libpng/Makefile A build.win32x86/third-party/libpng/Makefile.lib A build.win32x86/third-party/libsdl2/Makefile A build.win32x86/third-party/libsdl2/Makefile.lib A build.win32x86/third-party/libssh2/Makefile A build.win32x86/third-party/libssh2/Makefile.lib A build.win32x86/third-party/openssl/Makefile A build.win32x86/third-party/openssl/Makefile.lib A build.win32x86/third-party/pixman/Makefile A build.win32x86/third-party/pixman/Makefile.lib A build.win32x86/third-party/pkgconfig/Makefile A build.win32x86/third-party/pkgconfig/Makefile.lib A build.win32x86/third-party/zlib/Makefile A build.win32x86/third-party/zlib/Makefile.lib Log Message: ----------- Merge branch 'merge-with-pharo-win32' into merge-with-pharo Commit: 1917ecfa749c2a7b9a7c4c1c7c51bc7a8da0dbfe https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/1917ecfa749c2a7b9a… Author: Esteban Lorenzano <estebanlm(a)gmail.com> Date: 2016-11-19 (Sat, 19 Nov 2016) Changed paths: M build.win32x86/common/Makefile Log Message: ----------- in fact, I need to create the build directory before the third-party pre-requisites Commit: 41aad25ccd60dd4683e9ba1ed388fb39641dee45 https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/41aad25ccd60dd4683… Author: Esteban Lorenzano <estebanlm(a)gmail.com> Date: 2016-11-21 (Mon, 21 Nov 2016) Changed paths: M build.win32x86/common/Makefile M build.win32x86/common/Makefile.lib.extra M build.win32x86/third-party/cairo/Makefile.lib M build.win32x86/third-party/freetype2/Makefile.lib M build.win32x86/third-party/libgit2/Makefile.lib M build.win32x86/third-party/libpng/Makefile.lib M build.win32x86/third-party/libsdl2/Makefile.lib M build.win32x86/third-party/libssh2/Makefile.lib M build.win32x86/third-party/openssl/Makefile.lib M build.win32x86/third-party/pixman/Makefile.lib M build.win32x86/third-party/pkgconfig/Makefile.lib M build.win32x86/third-party/zlib/Makefile.lib Log Message: ----------- make win32 build with dependencies Commit: 45a7861672be66daaed3e0e0baf93ff8464c4038 https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/45a7861672be66daae… Author: Esteban Lorenzano <estebanlm(a)gmail.com> Date: 2016-11-24 (Thu, 24 Nov 2016) Changed paths: M build.macos32x86/third-party/libgit2/Makefile.lib Log Message: ----------- update libgit2 to 0.25rc1 Commit: fe092267f012c51acbd6fdc037221476312c7a0e https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/fe092267f012c51acb… Author: Esteban Lorenzano <estebanlm(a)gmail.com> Date: 2016-11-24 (Thu, 24 Nov 2016) Changed paths: M image/getGoodSpurVM.sh M image/updatespurimage.sh M nsspur64src/vm/cogit.h M nsspur64src/vm/cogitX64.c M nsspur64src/vm/cointerp.c M nsspur64src/vm/cointerp.h M nsspur64src/vm/gcc3x-cointerp.c M nsspur64src/vm/interp.h M nsspur64src/vm/vmCallback.h M nsspursrc/vm/cogit.h M nsspursrc/vm/cogitARMv5.c M nsspursrc/vm/cogitIA32.c M nsspursrc/vm/cogitMIPSEL.c M nsspursrc/vm/cointerp.c M nsspursrc/vm/cointerp.h M nsspursrc/vm/gcc3x-cointerp.c M nsspursrc/vm/interp.h M nsspursrc/vm/vmCallback.h M nsspurstack64src/vm/gcc3x-interp.c M nsspurstack64src/vm/interp.c M nsspurstack64src/vm/interp.h M nsspurstack64src/vm/vmCallback.h M nsspurstacksrc/vm/gcc3x-interp.c M nsspurstacksrc/vm/interp.c M nsspurstacksrc/vm/interp.h M nsspurstacksrc/vm/vmCallback.h M platforms/Cross/vm/sqMemoryAccess.h M platforms/Mac OS/plugins/FilePlugin/sqMacUnixFileInterface.c M platforms/Mac OS/plugins/FilePlugin/sqMacUnixFileInterface.h M platforms/Mac OS/plugins/JoystickTabletPlugin/HID_Name_Lookup.c M platforms/Mac OS/plugins/JoystickTabletPlugin/HID_Utilities.c M platforms/Mac OS/plugins/MIDIPlugin/sqMacMIDI.c M platforms/Mac OS/vm/sqMacMain.c M platforms/Mac OS/vm/sqMacNSPluginUILogic2.c M platforms/Mac OS/vm/sqMacUIClipBoard.c M platforms/Mac OS/vm/sqMacUnixCommandLineInterface.c M platforms/Mac OS/vm/sqMacUnixExternalPrims.c M platforms/Mac OS/vm/sqMacWindowUniversal.c M platforms/iOS/vm/Common/sqMacV2Memory.c M platforms/unix/plugins/SocketPlugin/sqUnixSocket.c M platforms/unix/vm/sqUnixMemory.c M platforms/unix/vm/sqUnixSpurMemory.c M spur64src/vm/cogit.h M spur64src/vm/cogitX64.c M spur64src/vm/cointerp.c M spur64src/vm/cointerp.h M spur64src/vm/gcc3x-cointerp.c M spur64src/vm/interp.h M spur64src/vm/vmCallback.h M spursista64src/vm/cogit.h M spursista64src/vm/cogitX64.c M spursista64src/vm/cointerp.c M spursista64src/vm/cointerp.h M spursista64src/vm/gcc3x-cointerp.c M spursista64src/vm/interp.h M spursista64src/vm/vmCallback.h M spursistasrc/vm/cogit.h M spursistasrc/vm/cogitARMv5.c M spursistasrc/vm/cogitIA32.c M spursistasrc/vm/cogitMIPSEL.c M spursistasrc/vm/cointerp.c M spursistasrc/vm/cointerp.h M spursistasrc/vm/gcc3x-cointerp.c M spursistasrc/vm/interp.h M spursistasrc/vm/vmCallback.h M spursrc/vm/cogit.h M spursrc/vm/cogitARMv5.c M spursrc/vm/cogitIA32.c M spursrc/vm/cogitMIPSEL.c M spursrc/vm/cointerp.c M spursrc/vm/cointerp.h M spursrc/vm/gcc3x-cointerp.c M spursrc/vm/interp.h M spursrc/vm/vmCallback.h M spurstack64src/vm/gcc3x-interp.c M spurstack64src/vm/interp.c M spurstack64src/vm/interp.h M spurstack64src/vm/vmCallback.h M spurstacksrc/vm/gcc3x-interp.c M spurstacksrc/vm/interp.c M spurstacksrc/vm/interp.h M spurstacksrc/vm/vmCallback.h M src/plugins/BochsIA32Plugin/BochsIA32Plugin.c M src/plugins/BochsX64Plugin/BochsX64Plugin.c M src/plugins/FilePlugin/FilePlugin.c M src/plugins/GdbARMPlugin/GdbARMPlugin.c M src/plugins/Win32OSProcessPlugin/Win32OSProcessPlugin.c M src/vm/cogit.h M src/vm/cogitARMv5.c M src/vm/cogitIA32.c M src/vm/cogitMIPSEL.c M src/vm/cointerp.c M src/vm/cointerp.h M src/vm/cointerpmt.c M src/vm/cointerpmt.h M src/vm/gcc3x-cointerp.c M src/vm/gcc3x-cointerpmt.c M src/vm/interp.h M stacksrc/vm/gcc3x-interp.c M stacksrc/vm/interp.c M stacksrc/vm/interp.h M stacksrc/vm/vmCallback.h Log Message: ----------- Merge branch 'Cog' of github.com:OpenSmalltalk/opensmalltalk-vm into merge-with-pharo Commit: c2f22c60abb26730e1b66c41f603867c5b53ae2c https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/c2f22c60abb26730e1… Author: Esteban Lorenzano <estebanlm(a)gmail.com> Date: 2016-11-24 (Thu, 24 Nov 2016) Changed paths: M .appveyor.yml M .travis.yml Log Message: ----------- adding cache of .thirdparty-cache dir Commit: 409bf001265dc3b84e725402c5619355ade56d12 https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/409bf001265dc3b84e… Author: Esteban Lorenzano <estebanlm(a)gmail.com> Date: 2016-11-25 (Fri, 25 Nov 2016) Changed paths: M .appveyor.yml M .travis.yml M build.macos32x86/third-party/libgit2/Makefile.lib M build.win32x86/common/Makefile A build.win32x86/common/Makefile.lib.extra M build.win32x86/pharo.cog.spur/Makefile A build.win32x86/third-party/cairo/Makefile A build.win32x86/third-party/cairo/Makefile.lib A build.win32x86/third-party/freetype2/Makefile A build.win32x86/third-party/freetype2/Makefile.lib A build.win32x86/third-party/libgit2/Makefile A build.win32x86/third-party/libgit2/Makefile.lib A build.win32x86/third-party/libpng/Makefile A build.win32x86/third-party/libpng/Makefile.lib A build.win32x86/third-party/libsdl2/Makefile A build.win32x86/third-party/libsdl2/Makefile.lib A build.win32x86/third-party/libssh2/Makefile A build.win32x86/third-party/libssh2/Makefile.lib A build.win32x86/third-party/openssl/Makefile A build.win32x86/third-party/openssl/Makefile.lib A build.win32x86/third-party/pixman/Makefile A build.win32x86/third-party/pixman/Makefile.lib A build.win32x86/third-party/pkgconfig/Makefile A build.win32x86/third-party/pkgconfig/Makefile.lib A build.win32x86/third-party/zlib/Makefile A build.win32x86/third-party/zlib/Makefile.lib Log Message: ----------- Merge pull request #101 from estebanlm/merge-with-pharo add win32 build rules Compare: https://github.com/OpenSmalltalk/opensmalltalk-vm/compare/145b6a7a11d8...40…

1 0

[OpenSmalltalk/opensmalltalk-vm]
by GitHub 24 Nov '16

24 Nov '16

Branch: refs/heads/warning_fix_2016_11_21 Home: https://github.com/OpenSmalltalk/opensmalltalk-vm

1 0

[OpenSmalltalk/opensmalltalk-vm] a61902: Avoid a warning about losing const-ness
by GitHub 24 Nov '16

24 Nov '16

Branch: refs/heads/Cog Home: https://github.com/OpenSmalltalk/opensmalltalk-vm Commit: a61902474fc179877b22f8a1c6b99db8f84495bd https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/a61902474fc179877b… Author: Nicolas Cellier <nicolas.cellier.aka.nice(a)gmail.com> Date: 2016-11-24 (Thu, 24 Nov 2016) Changed paths: M platforms/unix/plugins/LocalePlugin/sqUnixLocale.c Log Message: ----------- Avoid a warning about losing const-ness Commit: 1f1533b12906292c35086f45553041a5ef516e68 https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/1f1533b12906292c35… Author: Nicolas Cellier <nicolas.cellier.aka.nice(a)gmail.com> Date: 2016-11-24 (Thu, 24 Nov 2016) Changed paths: M platforms/Cross/plugins/SqueakFFIPrims/sqFFI.h M platforms/Mac OS/plugins/SqueakFFIPrims/ppc-darwin-Carbon-UI.c M platforms/Mac OS/plugins/SqueakFFIPrims/sqMacFFIPPC.c M platforms/Mac OS/plugins/SqueakFFIPrims/sqMacIntel-Win32.c M platforms/Mac OS/plugins/SqueakFFIPrims/x86-sysv-MacIntel.c M platforms/iOS/plugins/SqueakFFIPrims/dummyFFI.c M platforms/iOS/vm/iPhone/plugins/SqueakFFIPrims/dummyFFI.c M platforms/unix/plugins/SqueakFFIPrims/any-libffi.c M platforms/unix/plugins/SqueakFFIPrims/ppc-darwin.c M platforms/unix/plugins/SqueakFFIPrims/ppc-sysv.c M platforms/unix/plugins/SqueakFFIPrims/x86-sysv.c M platforms/win32/plugins/SqueakFFIPrims/sqWin32FFI.c Log Message: ----------- Fix ffiFree arg must be large enough to hold a pointer Thus we use explicitly sqIntptr_t everywhere. Commit: 145b6a7a11d8c00d31912277042b1b3ea0cd1797 https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/145b6a7a11d8c00d31… Author: Nicolas Cellier <nicolas.cellier.aka.nice(a)gmail.com> Date: 2016-11-25 (Fri, 25 Nov 2016) Changed paths: M platforms/Cross/plugins/SqueakFFIPrims/sqFFI.h M platforms/Mac OS/plugins/SqueakFFIPrims/ppc-darwin-Carbon-UI.c M platforms/Mac OS/plugins/SqueakFFIPrims/sqMacFFIPPC.c M platforms/Mac OS/plugins/SqueakFFIPrims/sqMacIntel-Win32.c M platforms/Mac OS/plugins/SqueakFFIPrims/x86-sysv-MacIntel.c M platforms/iOS/plugins/SqueakFFIPrims/dummyFFI.c M platforms/iOS/vm/iPhone/plugins/SqueakFFIPrims/dummyFFI.c M platforms/unix/plugins/LocalePlugin/sqUnixLocale.c M platforms/unix/plugins/SqueakFFIPrims/any-libffi.c M platforms/unix/plugins/SqueakFFIPrims/ppc-darwin.c M platforms/unix/plugins/SqueakFFIPrims/ppc-sysv.c M platforms/unix/plugins/SqueakFFIPrims/x86-sysv.c M platforms/win32/plugins/SqueakFFIPrims/sqWin32FFI.c Log Message: ----------- Merge pull request #102 from OpenSmalltalk/warning_fix_2016_11_21 Warning fix 2016 11 21 Compare: https://github.com/OpenSmalltalk/opensmalltalk-vm/compare/cc4b5105b396...14…

1 0

[OpenSmalltalk/opensmalltalk-vm] a61902: Avoid a warning about losing const-ness
by GitHub 24 Nov '16

24 Nov '16

Branch: refs/heads/warning_fix_2016_11_21 Home: https://github.com/OpenSmalltalk/opensmalltalk-vm Commit: a61902474fc179877b22f8a1c6b99db8f84495bd https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/a61902474fc179877b… Author: Nicolas Cellier <nicolas.cellier.aka.nice(a)gmail.com> Date: 2016-11-24 (Thu, 24 Nov 2016) Changed paths: M platforms/unix/plugins/LocalePlugin/sqUnixLocale.c Log Message: ----------- Avoid a warning about losing const-ness Commit: 1f1533b12906292c35086f45553041a5ef516e68 https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/1f1533b12906292c35… Author: Nicolas Cellier <nicolas.cellier.aka.nice(a)gmail.com> Date: 2016-11-24 (Thu, 24 Nov 2016) Changed paths: M platforms/Cross/plugins/SqueakFFIPrims/sqFFI.h M platforms/Mac OS/plugins/SqueakFFIPrims/ppc-darwin-Carbon-UI.c M platforms/Mac OS/plugins/SqueakFFIPrims/sqMacFFIPPC.c M platforms/Mac OS/plugins/SqueakFFIPrims/sqMacIntel-Win32.c M platforms/Mac OS/plugins/SqueakFFIPrims/x86-sysv-MacIntel.c M platforms/iOS/plugins/SqueakFFIPrims/dummyFFI.c M platforms/iOS/vm/iPhone/plugins/SqueakFFIPrims/dummyFFI.c M platforms/unix/plugins/SqueakFFIPrims/any-libffi.c M platforms/unix/plugins/SqueakFFIPrims/ppc-darwin.c M platforms/unix/plugins/SqueakFFIPrims/ppc-sysv.c M platforms/unix/plugins/SqueakFFIPrims/x86-sysv.c M platforms/win32/plugins/SqueakFFIPrims/sqWin32FFI.c Log Message: ----------- Fix ffiFree arg must be large enough to hold a pointer Thus we use explicitly sqIntptr_t everywhere. Compare: https://github.com/OpenSmalltalk/opensmalltalk-vm/compare/a61902474fc1^...1…

1 0

[OpenSmalltalk/opensmalltalk-vm] cc4b51: $TRAVIS_OS_NAME set to `osx` instead of `darwin`
by GitHub 24 Nov '16

24 Nov '16

Branch: refs/heads/Cog Home: https://github.com/OpenSmalltalk/opensmalltalk-vm Commit: cc4b5105b396b7058da50653080f868adef9c001 https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/cc4b5105b396b7058d… Author: Fabio Niephaus <code(a)fniephaus.com> Date: 2016-11-24 (Thu, 24 Nov 2016) Changed paths: M .travis_build.sh Log Message: ----------- $TRAVIS_OS_NAME set to `osx` instead of `darwin`

1 0

[OpenSmalltalk/opensmalltalk-vm] 94aa23: Fix tar_linux_product()
by GitHub 24 Nov '16

24 Nov '16

Branch: refs/heads/Cog Home: https://github.com/OpenSmalltalk/opensmalltalk-vm Commit: 94aa23c7496c9604ffffca9b32fe7021e156c274 https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/94aa23c7496c9604ff… Author: Fabio Niephaus <code(a)fniephaus.com> Date: 2016-11-24 (Thu, 24 Nov 2016) Changed paths: M .travis_build.sh Log Message: ----------- Fix tar_linux_product()

1 0

← Newer
1
2
3
4
5
6
7
...
16
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 November 2016