Vm-dev December 2020

vm-dev@lists.squeakfoundation.org

19 participants
80 discussions

VM Maker: VMMaker.oscog-nice.2914.mcz
by commits＠source.squeak.org 31 Dec '20

31 Dec '20

Nicolas Cellier uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-nice.2914.mcz ==================== Summary ==================== Name: VMMaker.oscog-nice.2914 Author: nice Time: 31 December 2020, 10:06:40.613299 am UUID: 0e1f0f1f-96ba-41ec-8f4f-c0d2fb618a21 Ancestors: VMMaker.oscog-nice.2913 A few fixes for the VM tests - enable using a WordArray as simulation memory - concretizeAt: does not answer the instruction size but the next address =============== Diff against VMMaker.oscog-nice.2913 =============== Item was changed: ----- Method: AbstractInstructionTests>>generateInstructions (in category 'generating machine code') ----- generateInstructions "See Cogit>>computeMaximumSizes, generateInstructionsAt: & outputInstructionsAt:. This is a pure Smalltalk (non-Slang) version of that trio of methods." | address pcDependentInstructions instructions | address := 0. pcDependentInstructions := OrderedCollection new. opcodes do: [:abstractInstruction| abstractInstruction address: address; maxSize: abstractInstruction computeMaximumSize. address := address + abstractInstruction maxSize]. address := 0. opcodes do: [:abstractInstruction| abstractInstruction isPCDependent ifTrue: [abstractInstruction sizePCDependentInstructionAt: address. pcDependentInstructions addLast: abstractInstruction. address := address + abstractInstruction machineCodeSize] ifFalse: [address := abstractInstruction concretizeAt: address]]. pcDependentInstructions do: [:abstractInstruction| abstractInstruction concretizeAt: abstractInstruction address]. instructions := ByteArray new: address. address := 0. opcodes do: [:abstractInstruction| | machineCodeBytes | self assert: abstractInstruction address = address. machineCodeBytes := self memoryAsBytes: abstractInstruction machineCode object. 1 to: abstractInstruction machineCodeSize do: [:j| + instructions at: address + 1 put: (machineCodeBytes byteAt: j). - instructions at: address + 1 put: (machineCodeBytes at: j). address := address + 1]]. ^instructions! Item was changed: ----- Method: AbstractInstructionTests>>runAddCwR: (in category 'running') ----- runAddCwR: assertPrintBar "self defaultTester runAddCwR: false" self concreteCompilerClass dataRegistersWithAccessorsDo: [:reg :rgetter :rsetter| self pairs: (-2 to: 2) do: [:a :b| | inst len bogus memory | inst := self gen: AddCwR operand: a operand: reg. len := inst concretizeAt: 0. memory := self memoryAsBytes: inst machineCode. self processor reset; perform: rsetter with: (self processor convertIntegerToInternal: b). [[processor pc < len] whileTrue: + [processor singleStepIn: memory]] - [self processor singleStepIn: memory]] on: Error do: [:ex| ]. "self processor printRegistersOn: Transcript. Transcript show: (self processor disassembleInstructionAt: 0 In: memory); cr" assertPrintBar ifTrue: [self assert: processor pc = inst machineCodeSize. self assertCheckLongArithOpCodeSize: inst machineCodeSize] ifFalse: [bogus := processor pc ~= inst machineCodeSize]. self concreteCompilerClass dataRegistersWithAccessorsDo: [:ireg :getter :setter| | expected | (self concreteCompilerClass isRISCTempRegister: ireg) ifFalse: [expected := getter == rgetter ifTrue: [b + a] ifFalse: [0]. assertPrintBar ifTrue: [self assert: (self processor convertInternalToInteger: (self processor perform: getter)) equals: expected] ifFalse: [(self processor convertInternalToInteger: (self processor perform: getter)) ~= expected ifTrue: [bogus := true]]]. assertPrintBar ifFalse: [Transcript nextPutAll: rgetter; nextPut: $(; print: b; nextPutAll: ') + '; print: a; nextPutAll: ' = '; print: (self processor convertInternalToInteger: (self processor perform: rgetter)); cr; flush. bogus ifTrue: [self processor printRegistersOn: Transcript. Transcript show: (self processor disassembleInstructionAt: 0 In: memory); cr]]]]]! Item was changed: ----- Method: AbstractInstructionTests>>testNegateR (in category 'running') ----- testNegateR "self defaultTester testNegateR" self concreteCompilerClass dataRegistersWithAccessorsDo: [:reg :rgetter :rsetter| -2 to: 2 do: [:a| | inst len memory | inst := self gen: NegateR operand: reg. len := inst concretizeAt: 0. memory := self memoryAsBytes: inst machineCode. self processor reset; perform: rsetter with: (processor convertIntegerToInternal: a). [[processor pc < len] whileTrue: + [processor singleStepIn: memory]] - [self processor singleStepIn: memory]] on: Error do: [:ex| ]. "self processor printRegistersOn: Transcript. Transcript show: (self processor disassembleInstructionAt: 0 In: memory); cr" self assert: processor pc equals: inst machineCodeSize. self concreteCompilerClass dataRegistersWithAccessorsDo: [:ireg :getter :setter| | expected | expected := getter == rgetter ifTrue: [ a negated ] ifFalse: [0]. self assert: (processor convertInternalToInteger: (processor perform: getter)) equals: expected]]]! Item was changed: ----- Method: CogARMCompilerForTests>>concretizeAt: (in category 'generate machine code') ----- concretizeAt: actualAddress "Override to check maxSize and machineCodeSize" + | maxAddress nextAddress | - | size | maxSize ifNil: [maxSize := self computeMaximumSize]. + maxAddress := actualAddress + maxSize. + nextAddress := super concretizeAt: actualAddress. - size := super concretizeAt: actualAddress. self assert: (maxSize notNil and: [self isPCDependent + ifTrue: [maxAddress >= nextAddress] + ifFalse: [maxAddress = nextAddress]]). + ^nextAddress! - ifTrue: [maxSize >= size] - ifFalse: [maxSize = size]]). - ^size! Item was changed: ----- Method: CogIA32CompilerForTests>>concretizeAt: (in category 'generate machine code') ----- concretizeAt: actualAddress "Override to check maxSize and machineCodeSize" + | maxAddress nextAddress | - | size | maxSize ifNil: [maxSize := self computeMaximumSize]. + maxAddress := actualAddress + maxSize. + nextAddress := super concretizeAt: actualAddress. - size := super concretizeAt: actualAddress. self assert: (maxSize notNil and: [self isPCDependent + ifTrue: [maxAddress >= nextAddress] + ifFalse: [maxAddress = nextAddress]]). + ^nextAddress! - ifTrue: [maxSize >= size] - ifFalse: [maxSize = size]]). - ^size! Item was changed: ----- Method: CogX64CompilerForTests>>concretizeAt: (in category 'generate machine code') ----- concretizeAt: actualAddress "Override to check maxSize and machineCodeSize" + | maxAddress nextAddress | - | size | maxSize ifNil: [maxSize := self computeMaximumSize]. + maxAddress := actualAddress + maxSize. + nextAddress := super concretizeAt: actualAddress. - size := super concretizeAt: actualAddress. self assert: (maxSize notNil and: [self isPCDependent + ifTrue: [maxAddress >= nextAddress] + ifFalse: [maxAddress = nextAddress]]). + ^nextAddress! - ifTrue: [maxSize >= size] - ifFalse: [maxSize = size]]). - ^size! Item was changed: VMClass subclass: #OutOfLineLiteralsManager instanceVariableNames: 'cogit objectMemory objectRepresentation firstOpcodeIndex nextLiteralIndex lastDumpedLiteralIndex literals literalsSize savedFirstOpcodeIndex savedNextLiteralIndex savedLastDumpedLiteralIndex' classVariableNames: '' poolDictionaries: 'CogAbstractRegisters CogCompilationConstants CogRTLOpcodes' category: 'VMMaker-JIT'! + !OutOfLineLiteralsManager commentStamp: 'nice 12/31/2020 09:14' prior: 0! + An OutOfLineLiteralsManager manages the dumping of literals for backends that want to keep literals out-of-line, accessed by pc-relative addressing. - !OutOfLineLiteralsManager commentStamp: 'eem 6/7/2015 12:10' prior: 0! - An OutOfLineLiteralsManager manages the dumping of literals for backends that wat to keep literals out-of-line, accessed by pc-relative addressing. Instance Variables cogit: <Cogit>! Item was added: + ----- Method: RawBitsArray>>byteAt: (in category '*VMMaker-simulation') ----- + byteAt: anInteger + "emulate an access to raw (unsigned) bytes, as if the receiver was a ByteArray" + + | element p | + p := self bytesPerBasicElement. + p = 1 ifTrue: [^self basicAt: 1]. + element := self basicAt: anInteger + p - 1 // p. + ^Smalltalk isLittleEndian + ifTrue: [element digitAt: anInteger - 1 \\ p + 1] + ifFalse: [element digitAt: p - (anInteger \\ p)] + ! Item was added: + ----- Method: WordArray>>unsignedLongAt:bigEndian: (in category '*VMMaker-JITsimulation') ----- + unsignedLongAt: byteIndex bigEndian: bigEndian + "Compatiblity with the ByteArray & Alien methods of the same name." + | wordIndex lowBits word hiWord | + wordIndex := byteIndex - 1 // 4 + 1. + lowBits := byteIndex - 1 bitAnd: 3. + word := self at: wordIndex. + lowBits > 0 ifTrue: "access straddles two words" + [hiWord := self at: wordIndex + 1. + word := (word bitShift: lowBits * -8) + (hiWord bitShift: 4 - lowBits * 8)]. + word := word bitAnd: 16rFFFFFFFF. + bigEndian + ifTrue: + [word := ((word bitShift: -24) bitAnd: 16rFF) + + ((word bitShift: -8) bitAnd: 16rFF00) + + ((word bitAnd: 16rFF00) bitShift: 8) + + ((word bitAnd: 16rFF) bitShift: 24)]. + ^word!

1 0

Another NuScratch issue
by Yoshiki Ohshima 30 Dec '20

30 Dec '20

So I built a new VM with a fix for the input method change. I did not fully test the other things but Scratch on the VM does not do animations. It updates screen only when mouse is moved, or some slower interval: https://photos.app.goo.gl/QHgKCeeP2bnQGESu5 I suspect that there might have been some options I needed to pass in to specify some timers? Can you think of other reasons why this might happen and where to look to fix it? -- -- Yoshiki

4 15

Build failed: opensmalltalk-vm 1.0.2333
by AppVeyor 30 Dec '20

30 Dec '20

1 0

[OpenSmalltalk/opensmalltalk-vm] 564777: Win32 SoundPlugin:
by Eliot Miranda 30 Dec '20

30 Dec '20

Branch: refs/heads/Cog Home: https://github.com/OpenSmalltalk/opensmalltalk-vm Commit: 564777b9465f67aea28888f290e14caf509560f2 https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/564777b9465f67aea2… Author: Eliot Miranda <eliot.miranda(a)gmail.com> Date: 2020-12-30 (Wed, 30 Dec 2020) Changed paths: M platforms/win32/plugins/SoundPlugin/sqWin32DPRINTF.h M platforms/win32/plugins/SoundPlugin/sqWin32Sound.c Log Message: ----------- Win32 SoundPlugin: Do not release and recreate the DirectSoundCapture8 instance and CaptureBuffer on start/stop recording. Do release them on plugin shutdown. If interperating with the Terf AEC code do make sure that both the DirectX and the AEC recording state is shutdown on stop recording. Complexify the logging support to separate logging of input/microphone from that of output/speaker, and to separate out verbose logging from state change logging. The macrology for this is still in progress cuz one has to control it with the SOundPlugin Makefile. If the DirectSoundCapture8 instance and CaptureBuffer are released and recreated on stop recording then after only a handful of sutch releases CaptureBuffer allocation fails once. It can be fixed by subsequent release/recreation after a few minutes, but there is a debilitating period when input is broken. Commit: 85708ef49584576d6ddbc575c068b044eaf19108 https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/85708ef49584576d6d… Author: Eliot Miranda <eliot.miranda(a)gmail.com> Date: 2020-12-30 (Wed, 30 Dec 2020) Changed paths: M platforms/iOS/vm/OSX/sqSqueakOSXApplication.m Log Message: ----------- Merge branch 'Cog' of https://github.com/OpenSmalltalk/opensmalltalk-vm into Cog Compare: https://github.com/OpenSmalltalk/opensmalltalk-vm/compare/5479a787d03b...85…

1 0

[OpenSmalltalk/opensmalltalk-vm] 5479a7: Add command line arg (so far on iOS only) to speci...
by Eliot Miranda 29 Dec '20

29 Dec '20

Branch: refs/heads/Cog Home: https://github.com/OpenSmalltalk/opensmalltalk-vm Commit: 5479a787d03b8140c4398c2b8088d0002901045f https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/5479a787d03b8140c4… Author: Eliot Miranda <eliot.miranda(a)gmail.com> Date: 2020-12-29 (Tue, 29 Dec 2020) Changed paths: M platforms/iOS/vm/OSX/sqSqueakOSXApplication.m Log Message: ----------- Add command line arg (so far on iOS only) to specify event tracing mask. So now via e.g. open --stderr `tty` `pwd`/Squeak.app --args -eventtrace -4 one can see input events coming into the system. [ci skip]

1 0

VM Maker: VMMaker.oscog-nice.2913.mcz
by commits＠source.squeak.org 29 Dec '20

29 Dec '20

Nicolas Cellier uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-nice.2913.mcz ==================== Summary ==================== Name: VMMaker.oscog-nice.2913 Author: nice Time: 29 December 2020, 2:35:15.410054 pm UUID: 7424bace-30d6-4cff-87e5-8bed5d7709fc Ancestors: VMMaker.oscog-nice.2910 Complexify the rule for generating hex literal constants when more intellegible than decimal. This is useful for having a chance to decipher generated code for bit tricks. Document the intended behavior with a small test. This replaces VMMaker.oscog-nice.2912 that screwed things up (had a copy/paste bug). VMMaker.oscog-nice.2912 should be thrown away as well as previus attempt VMMaker.oscog-nice.2911 =============== Diff against VMMaker.oscog-nice.2910 =============== Item was changed: ----- Method: CCodeGenerator>>cLiteralFor: (in category 'C code generator') ----- cLiteralFor: anObject "Return a string representing the C literal value for the given object." + anObject isNumber ifTrue: [anObject isInteger ifTrue: + [| hex dec useHexa | + hex := anObject printStringBase: 16. + dec := anObject printStringBase: 10. + useHexa := (anObject > 255 + and: [(hex asSet size * 3) <= (dec asSet size * 2) + or: [((hex as: RunArray) runs size * 4) < ((dec as: RunArray) runs size * 3)]]) + or: [anObject > 0 - [| hex | - hex := (anObject > 0 and: [(anObject >> anObject lowBit + 1) isPowerOfTwo and: [(anObject highBit = anObject lowBit and: [anObject > 65536]) + or: [anObject highBit - anObject lowBit >= 4]]]]. + ^self cLiteralForInteger: anObject hex: useHexa]. - or: [anObject highBit - anObject lowBit >= 4]]]). - ^self cLiteralForInteger: anObject hex: hex]. anObject isFloat ifTrue: [^anObject printString]] ifFalse: [anObject isSymbol ifTrue: [^self cFunctionNameFor: anObject]. anObject isString ifTrue: [^'"', (anObject copyReplaceAll: (String with: Character cr) with: '\n') , '"']. anObject == nil ifTrue: [^ 'null' ]. anObject == true ifTrue: [^ '1' ]. anObject == false ifTrue: [^ '0' ]. anObject isCharacter ifTrue: [^anObject == $' ifTrue: ['''\'''''] "i.e. '\''" ifFalse: [anObject asString printString]]]. self error: 'Warning: A Smalltalk literal could not be translated into a C constant: ', anObject printString. ^'"XXX UNTRANSLATABLE CONSTANT XXX"'! Item was changed: ----- Method: CCodeGeneratorTests>>testIntegerGeneration (in category 'tests') ----- testIntegerGeneration + "Test the 32-bit integers. They need to be marked as unsigned. - "Test the 32-bit integers. They need to be marked as unsigned longs. Test 16rFFFFFFFF, 16rFFFFFFFE, ... through to ..., 16rC0000000, 16r80000000" ((0 to: 31) collect: [:shift| 16rFFFFFFFF bitClear: (1 bitShift: shift) - 1]) do: + [:number| | literal isHex isDec | - [:number| | literal | literal := self cg cLiteralFor: number. + isHex := (literal beginsWith: '0x') and: [((literal allButFirst: 2) allButLast: 1) allSatisfy: [:c| '0123456789CEF' includes: c]]. + isDec := (literal allButLast: 1) allSatisfy: [:c| c isDigit]. + self assert: isHex | isDec. + self assert: (literal endsWith: 'U'). - self assert: ((literal allButLast: 2) allSatisfy: [:c| c isDigit]). - self assert: (literal endsWith: 'UL'). literal := self cg cLiteralFor: number name: 'Mask'. self assert: (literal beginsWith: '0x'). + self assert: (((literal allButFirst: 2) allButLast: 1) allSatisfy: [:c| '0123456789CEF' includes: c]). + self assert: (literal endsWith: 'U')]. - self assert: (((literal allButFirst: 2) allButLast: 2) allSatisfy: [:c| '0123456789CEF' includes: c]). - self assert: (literal endsWith: 'UL')]. "Test the 64-bit integers. They need to be marked as unsigned long longs." ((32 to: 63) collect: [:shift| 16rFFFFFFFFFFFFFFFF bitClear: (1 bitShift: shift) - 1]) do: + [:number| | literal isHex isDec | - [:number| | literal | literal := self cg cLiteralFor: number. + isHex := (literal beginsWith: '0x') and: [((literal allButFirst: 2) allButLast: 3) allSatisfy: [:c| '0123456789CEF' includes: c]]. + isDec := (literal allButLast: 3) allSatisfy: [:c| c isDigit]. + self assert: isHex | isDec. - self assert: ((literal allButLast: 3) allSatisfy: [:c| c isDigit]). self assert: (literal endsWith: 'ULL'). literal := self cg cLiteralFor: number name: 'Mask'. self assert: (literal beginsWith: '0x'). self assert: (((literal allButFirst: 2) allButLast: 3) allSatisfy: [:c| '0123456789CEF' includes: c]). self assert: (literal endsWith: 'ULL')]! Item was added: + ----- Method: CCodeGeneratorTests>>testIntegerGenerationHexOrDec (in category 'tests') ----- + testIntegerGenerationHexOrDec + | decPrefered hexPrefered | + hexPrefered := #( + 16r100 16r400 16r10000 "powers of two (more than 8 bits)" + 16r1F 16r3FF 16rFFFF "powers of two minus 1 - with at least 5 bits set" + 16r3E 16r3FF00 16r1FE0 "shifted powers of two minus 1 - wih at least 5 bit set..." + 16r38000 "... or having highBit >= 16" + 16rC00 "... or requiring 1.5 times less different characters than decimal form - here 2 instead of 4" + 16r1F1F 16rCCCC 16r112233 "some regular bit patterns" + 2r111000111000111000111 "not necessarily falling on 4 bits boundaries" + ). + decPrefered := #( + 0 1 2 3 4 5 6 7 8 9 "single digit" + 10 100 1000 10000 "powers of ten" + 9 99 999 9999 "powers of ten minus 1" + 16r10 16r20 16r40 16r80 "small powers of two" + 16r60 16rC0 16rF0 16r1E00 "shifted powers of two minus 1 - with less than 5 bits set" + 112233 15341 "random patterns when no hex rule apply" + 2r1111100000111110000011111000001111100000 "regular bit pattern if the decimal form appear somehow also regular - here it uses a pattern of only 4 different digits : 1066193093600"). + hexPrefered do: [:number || literal | + literal := self cg cLiteralFor: number. + self assert: (literal beginsWith: '0x')]. + decPrefered do: [:number || literal | + literal := self cg cLiteralFor: number. + self deny: (literal beginsWith: '0x')].! Item was changed: ----- Method: SlangTests>>testSimpleMethod (in category 'tests') ----- testSimpleMethod | codeGenerator tMethod code | codeGenerator := CCodeGenerator new. tMethod := codeGenerator compileToTMethodSelector: #extBBytecode in: StackInterpreter. self assert: #( #'[' byte #':=' self fetchByte #'.' self fetchNextBytecode #'.' extB #':=' #(numExtB #= 0 and: #'[' byte #> 127 #']') ifTrue: #'[' byte #- 256 #']' ifFalse: #'[' #(extB bitShift: 8) #+ byte #']' #'.' numExtB #':=' numExtB #+ 1 #'.' #'^' self #']') equals: (Scanner new scanTokens: tMethod parseTree printString). code := String streamContents: [:s| tMethod emitCCodeOn: s generator: codeGenerator]. code := code allButFirst: (code indexOfSubCollection: 'sqInt') - 1. self assert: #('sqInt' 'extBBytecode(void)' '{' 'sqInt' 'byte;' 'byte' '=' 'fetchByte();' 'fetchNextBytecode();' 'extB' '=' '((numExtB' '==' '0)' '&&' '(byte' '>' '0x7F)' + '?' 'byte' '-' '0x100' + ':' '((((sqInt)((usqInt)(extB)' '<<' '8))))' '+' 'byte);' - '?' 'byte' '-' '256' - ':' '(((usqInt)' 'extB' '<<' '8))' '+' 'byte);' 'numExtB' '+=' '1;' 'return' 'self;' '}') equals: (code findTokens: Character separators) asArray !

1 0

VM Maker: VMMaker.oscog-nice.2912.mcz
by commits＠source.squeak.org 29 Dec '20

29 Dec '20

Nicolas Cellier uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-nice.2912.mcz ==================== Summary ==================== Name: VMMaker.oscog-nice.2912 Author: nice Time: 27 December 2020, 4:21:39.377922 pm UUID: 607e7bf3-9cd1-4a6b-ac0c-7261a969519b Ancestors: VMMaker.oscog-nice.2910 Complexify the rule for generating hex literal constants when more intellegible than decimal. This is useful for having a chance to decipher generated code for bit tricks. This replaces VMMaker.oscog-nice.2911 that screwed things up (hex generates the radix 16r). VMMaker.oscog-nice.2911 should be thrown away. =============== Diff against VMMaker.oscog-nice.2910 =============== Item was changed: ----- Method: CCodeGenerator>>cLiteralFor: (in category 'C code generator') ----- cLiteralFor: anObject "Return a string representing the C literal value for the given object." + anObject isNumber ifTrue: [anObject isInteger ifTrue: + [| hex dec useHexa | + hex := anObject printStringBase: 16. + dec := anObject printStringBase: 10. + useHexa := (anObject > 255 + and: [(hex asSet size * 3) <= (dec asSet size * 2) + or: [((hex as: RunArray) runs size * 4) < ((hex as: RunArray) runs size * 3)]]) + or: [anObject > 0 - [| hex | - hex := (anObject > 0 and: [(anObject >> anObject lowBit + 1) isPowerOfTwo and: [(anObject highBit = anObject lowBit and: [anObject > 65536]) + or: [anObject highBit - anObject lowBit >= 4]]]]. + ^self cLiteralForInteger: anObject hex: useHexa]. - or: [anObject highBit - anObject lowBit >= 4]]]). - ^self cLiteralForInteger: anObject hex: hex]. anObject isFloat ifTrue: [^anObject printString]] ifFalse: [anObject isSymbol ifTrue: [^self cFunctionNameFor: anObject]. anObject isString ifTrue: [^'"', (anObject copyReplaceAll: (String with: Character cr) with: '\n') , '"']. anObject == nil ifTrue: [^ 'null' ]. anObject == true ifTrue: [^ '1' ]. anObject == false ifTrue: [^ '0' ]. anObject isCharacter ifTrue: [^anObject == $' ifTrue: ['''\'''''] "i.e. '\''" ifFalse: [anObject asString printString]]]. self error: 'Warning: A Smalltalk literal could not be translated into a C constant: ', anObject printString. ^'"XXX UNTRANSLATABLE CONSTANT XXX"'!

4 3

[OpenSmalltalk/opensmalltalk-vm] 509468: Salvage the stack builds
by Nicolas Cellier 29 Dec '20

29 Dec '20

Branch: refs/heads/Cog Home: https://github.com/OpenSmalltalk/opensmalltalk-vm Commit: 5094685a21c0c283228b5246855084e4e91c3e8f https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/5094685a21c0c28322… Author: Nicolas Cellier <nicolas.cellier.aka.nice(a)gmail.com> Date: 2020-12-27 (Sun, 27 Dec 2020) Changed paths: M platforms/Mac OS/vm/sqPlatformSpecific.h M platforms/iOS/vm/OSX/sqPlatformSpecific.h M platforms/iOS/vm/iPhone/sqPlatformSpecific.h M platforms/minheadless/unix/sqPlatformSpecific-Unix.h M platforms/minheadless/windows/sqPlatformSpecific-Win32.h M platforms/unix/vm/sqPlatformSpecific.h M platforms/win32/vm/sqPlatformSpecific.h Log Message: ----------- Salvage the stack builds For some reasons (?) the VM_LABEL macro is now barking like this: >../../spurstack64src/vm/gcc3x-interp.c:9419:5: error: invalid symbol redefinition > VM_LABEL(extPushPseudoVariable); > ^ >In file included from ../../spurstack64src/vm/gcc3x-interp.c:29: >In file included from ../../platforms/iOS/vm/Common/sqGnu.h:46: >In file included from ../../platforms/Cross/vm/sq.h:252: >../../platforms/iOS/vm/OSX/sqPlatformSpecific.h:174:52: note: expanded from macro 'VM_LABEL' ># define VM_LABEL(foo) asm("\n.globl _L" #foo "\n_L" #foo ":") > ^ ><inline asm>:3:1: note: instantiated into assembly here >_LextPushPseudoVariable: >^ Since this does not happen in cog builds, avoid brainstorming and just use the same workaround.

2 1

CompiledCodeInspectorTest>>testValuePaneModifyLiteral crashes the VM
by Fabio Niephaus 28 Dec '20

28 Dec '20

Hi all, I'm not sure this is already known, but CompiledCodeInspectorTest>>testValuePaneModifyLiteral reproducibly crashes the VM on macOS. I tried it with an older VM from last year and the latest bleeding edge (202012050134). Best, Fabio

3 6

VM Maker: VMMaker.oscog-nice.2909.mcz
by commits＠source.squeak.org 27 Dec '20

27 Dec '20

Nicolas Cellier uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-nice.2909.mcz ==================== Summary ==================== Name: VMMaker.oscog-nice.2909 Author: nice Time: 23 December 2020, 9:54:51.201058 pm UUID: 6869c4f1-9d80-40c3-8409-7c05e087edf5 Ancestors: VMMaker.oscog-eem.2908 WIP: implement new BitBlt ops (rules) for alpha compositing "42" alphaScale:with: "43" alphaUnscale:with: "44" alphaBlendUnscaled:with: This is a proposal implementation for https://github.com/OpenSmalltalk/opensmalltalk-vm/issues/505 The generated C code compiles, but it's otherwise mostly yet unused and untested code. I commit it before I loose it. There's probably more to do for letting accelerated code work (PI). =============== Diff against VMMaker.oscog-eem.2908 =============== Item was changed: SmartSyntaxInterpreterPlugin subclass: #BitBltSimulation instanceVariableNames: 'destForm sourceForm halftoneForm combinationRule destX destY width height sourceX sourceY clipX clipY clipWidth clipHeight sourceWidth sourceHeight sourceDepth sourcePitch sourceBits sourcePPW sourceMSB destWidth destHeight destDepth destPitch destBits destPPW destMSB bitCount skew mask1 mask2 preload nWords destMask hDir vDir sourceIndex sourceDelta destIndex destDelta sx sy dx dy bbW bbH halftoneHeight noSource noHalftone halftoneBase sourceAlpha srcBitShift dstBitShift bitBltOop affectedL affectedR affectedT affectedB opTable maskTable ditherMatrix4x4 ditherThresholds16 ditherValues16 hasSurfaceLock warpSrcShift warpSrcMask warpAlignShift warpAlignMask warpBitShiftTable querySurfaceFn lockSurfaceFn unlockSurfaceFn isWarping cmFlags cmMask cmShiftTable cmMaskTable cmLookupTable cmBitsPerColor dither8Lookup componentAlphaModeColor componentAlphaModeAlpha ungammaLookupTable gammaLookupTable numGCsOnInvocation bitBltIsReceiver endOfDestination endOfSource' classVariableNames: 'AllOnes AlphaIndex BBClipHeightIndex BBClipWidthIndex BBClipXIndex BBClipYIndex BBColorMapIndex BBDestFormIndex BBDestXIndex BBDestYIndex BBHalftoneFormIndex BBHeightIndex BBLastIndex BBRuleIndex BBSourceFormIndex BBSourceXIndex BBSourceYIndex BBWarpBase BBWidthIndex BBXTableIndex BEBitBltIndex BinaryPoint BlueIndex ColorMapFixedPart ColorMapIndexedPart ColorMapNewStyle ColorMapPresent CrossedX EndOfRun FixedPt1 FormBitsIndex FormDepthIndex FormHeightIndex FormWidthIndex GreenIndex OpTable OpTableSize RedIndex' poolDictionaries: '' category: 'VMMaker-Interpreter'! + !BitBltSimulation commentStamp: 'nice 10/31/2020 23:39' prior: 0! - !BitBltSimulation commentStamp: 'tpr 3/25/2013 16:50' prior: 0! This class implements BitBlt, much as specified in the Blue Book spec. Performance has been enhanced through the use of pointer variables such as sourceIndex and destIndex, and by separating several special cases of the inner loop. Operation has been extended to color, with support for 1, 2, 4, 8, 16, and 32-bit pixel sizes. Conversion between different pixel sizes is facilitated by accepting an optional color map. In addition to the original 16 combination rules, this BitBlt supports 16 fail (for old paint mode) 17 fail (for old mask mode) 18 sourceWord + destinationWord 19 sourceWord - destinationWord 20 rgbAdd: sourceWord with: destinationWord 21 rgbSub: sourceWord with: destinationWord 22 OLDrgbDiff: sourceWord with: destinationWord 23 OLDtallyIntoMap: destinationWord -- old vers doesn't clip to bit boundary 24 alphaBlend: sourceWord with: destinationWord 25 pixPaint: sourceWord with: destinationWord 26 pixMask: sourceWord with: destinationWord 27 rgbMax: sourceWord with: destinationWord 28 rgbMin: sourceWord with: destinationWord 29 rgbMin: sourceWord bitInvert32 with: destinationWord 30 alphaBlendConst: sourceWord with: destinationWord -- alpha passed as an arg 31 alphaPaintConst: sourceWord with: destinationWord -- alpha passed as an arg 32 rgbDiff: sourceWord with: destinationWord 33 tallyIntoMap: destinationWord 34 alphaBlendScaled: sourceWord with: destinationWord 35 alphaBlendScaled: sourceWord with: "unused here - only used by FXBlt" 36 alphaBlendScaled: sourceWord with: "unused here - only used by FXBlt" 37 rgbMul: sourceWord with: destinationWord 38 pixSwap: sourceWord with: destinationWord 39 pixClear: sourceWord with: destinationWord 40 fixAlpha: sourceWord with: destinationWord 41 rgbComponentAlpha: sourceWord with: destinationWord + 42 alphaScale: ignoredSourceWord with: destinationWord + 43 alphaUnscale: ignoredSourceWord with: destinationWord + 44 alphaBlendUnscaled: sourceWord with: destinationWord This implementation has also been fitted with an experimental "warp drive" that allows abritrary scaling and rotation (and even limited affine deformations) with all BitBlt storage modes supported. To add a new rule to BitBlt... 1. add the new rule method or methods in the category 'combination rules' of BBSim 2. describe it in the class comment of BBSim and in the class comment for BitBlt 3. add refs to initializeRuleTable in proper positions 4. add refs to initBBOpTable, following the pattern ! Item was changed: ----- Method: BitBltSimulation class>>initializeRuleTable (in category 'initialization') ----- initializeRuleTable "BitBltSimulation initializeRuleTable" "**WARNING** You MUST change initBBOpTable if you change this" OpTable := #( "0" clearWord:with: "1" bitAnd:with: "2" bitAndInvert:with: "3" sourceWord:with: "4" bitInvertAnd:with: "5" destinationWord:with: "6" bitXor:with: "7" bitOr:with: "8" bitInvertAndInvert:with: "9" bitInvertXor:with: "10" bitInvertDestination:with: "11" bitOrInvert:with: "12" bitInvertSource:with: "13" bitInvertOr:with: "14" bitInvertOrInvert:with: "15" destinationWord:with: "16" destinationWord:with: "unused - was old paint" "17" destinationWord:with: "unused - was old mask" "18" addWord:with: "19" subWord:with: "20" rgbAdd:with: "21" rgbSub:with: "22" OLDrgbDiff:with: "23" OLDtallyIntoMap:with: "24" alphaBlend:with: "25" pixPaint:with: "26" pixMask:with: "27" rgbMax:with: "28" rgbMin:with: "29" rgbMinInvert:with: "30" alphaBlendConst:with: "31" alphaPaintConst:with: "32" rgbDiff:with: "33" tallyIntoMap:with: "34" alphaBlendScaled:with: "35" alphaBlendScaled:with: "unused here - only used by FXBlt" "36" alphaBlendScaled:with: "unused here - only used by FXBlt" "37" rgbMul:with: "38" pixSwap:with: "39" pixClear:with: "40" fixAlpha:with: "41" rgbComponentAlpha:with: + "42" alphaScale:with: + "43" alphaUnscale:with: + "44" alphaBlendUnscaled:with: ). OpTableSize := OpTable size + 1. "0-origin indexing" ! Item was added: + ----- Method: BitBltSimulation>>alphaBlendUnscaled:with: (in category 'combination rules') ----- + alphaBlendUnscaled: sourceWord with: destinationWord + "Blend sourceWord with destinationWord using the alpha value from both sourceWord and destinationWord. + Alpha is encoded as 0 meaning 0.0, and 255 meaning 1.0. + The alpha channel and color produced are + + srcAlpha + (destAlpha*(1-srcAlpha)) + (srcAlpha*srcColor + (destAlpha*(1-srcAlpha)*dstColor)) / (srcAlpha + (destAlpha*(1-srcAlpha))) + + In contrast to alphaBlend:with: the method does not assume that destination form is opaque. + In contrast to alphaBlendScaled:with: the method does not assume that colors have been pre-scaled (muliplied) by alpha channel." + | alpha blendA result blendRB blendG | + <inline: false> + <returnTypeC: 'unsigned int'> + <var: #sourceWord type: 'unsigned int'> + <var: #destinationWord type: 'unsigned int'> + <var: #blendRB type: 'unsigned int'> + <var: #blendG type: 'unsigned int'> + <var: #result type: 'unsigned int'> + <var: #alpha type: 'unsigned int'> + <var: #blendA type: 'unsigned int'> + alpha := sourceWord >> 24. "High 8 bits of source pixel, assuming ARGB encoding" + alpha = 0 ifTrue: [ ^ destinationWord ]. + alpha = 255 ifTrue: [ ^ sourceWord ]. + + blendA := 16rFF * alpha + (16rFF - alpha * (destinationWord >> 24)) + 16rFF. "blend alpha channels" + blendA := blendA + (blendA - 1 >> 8 bitAnd: 16rFF) >> 8 bitAnd: 16rFF. "divide by 255" + + blendRB := ((sourceWord bitAnd: 16rFF00FF) * alpha) + + ((destinationWord bitAnd: 16rFF00FF) * (blendA-alpha)) + / blendA. "blend red and blue" + + blendG := ((sourceWord bitAnd: 16r00FF00) * alpha) + + ((destinationWord bitAnd: 16r00FF00) * (blendA-alpha)) + / blendA. "blend green" + result := (blendRB bitOr: blendG) bitOr: blendA << 24. + ^ result + ! Item was added: + ----- Method: BitBltSimulation>>alphaScale:with: (in category 'combination rules') ----- + alphaScale: sourceWord with: destinationWord + "Scale (premultiply) the destination with its alpha channel. + Note that sourceWord is ignored." + | alpha rb g | + <inline: false> "Do NOT inline this into optimized loops" + <returnTypeC: 'unsigned int'> + <var: #sourceWord type: 'unsigned int'> + <var: #destinationWord type: 'unsigned int'> + <var: #rb type: 'unsigned int'> + <var: #g type: 'unsigned int'> + <var: #alpha type: 'unsigned int'> + alpha := destinationWord >> 24. "High 8 bits is opacity (ARGB format)" + rb := ((destinationWord bitAnd: 16rFF00FF) * alpha >> 8 bitAnd: 16rFF00FF). "scale red and blue components" + g := ((destinationWord bitAnd: 16r00FF00) * alpha >> 8 bitAnd: 16r00FF00). "scale green component" + ^(g bitOr: rb) bitOr: (destinationWord bitAnd: 16rFF000000) "recompose"! Item was added: + ----- Method: BitBltSimulation>>alphaUnscale:with: (in category 'combination rules') ----- + alphaUnscale: sourceWord with: destinationWord + "Unscale (divide) the destination with its alpha channel. + Note that sourceWord is ignored." + | alpha rb g rgb carry | + <inline: false> "Do NOT inline this into optimized loops" + <returnTypeC: 'unsigned int'> + <var: #sourceWord type: 'unsigned int'> + <var: #destinationWord type: 'unsigned int'> + <var: #rb type: 'unsigned int'> + <var: #g type: 'unsigned int'> + <var: #rgb type: 'unsigned int'> + <var: #alpha type: 'unsigned int'> + <var: #carry type: 'unsigned int'> + alpha := destinationWord >> 24. "High 8 bits is opacity (ARGB format)" + alpha = 0 ifTrue: [^0]. + rb := (destinationWord bitAnd: 16rFF00FF) << 8 / alpha. "unscale red and blue components" + g := (destinationWord bitAnd: 16r00FF00) / alpha. "unscale green component" + carry := ((rb >> 8 bitAnd: 16rAA00AA) >> 1 bitOr: (rb >> 8 bitAnd: 16r550055) << 1) + bitOr: ((g bitAnd: 16r00AA00) >> 1 bitOr: (g bitAnd: 16r005500) << 1). + carry := (carry bitAnd: 16rCCCCCC) >> 2 bitOr: (carry bitAnd: 16r333333) << 2. + carry := (carry bitAnd: 16rF0F0F0) >> 4 bitOr: (carry bitAnd: 16r0F0F0F) << 4. + rgb := (rb bitAnd: 16rFF00FF) bitOr: (g << 8 bitAnd: 16r00FF00). + rgb := rgb bitOr: carry. "saturate RGB components if division overflows" + ^rgb bitOr: (destinationWord bitAnd: 16rFF000000) "restore alpha"! Item was changed: ----- Method: BitBltSimulation>>initBBOpTable (in category 'initialize-release') ----- initBBOpTable self cCode: 'opTable[0+1] = (void *)clearWordwith'. self cCode: 'opTable[1+1] = (void *)bitAndwith'. self cCode: 'opTable[2+1] = (void *)bitAndInvertwith'. self cCode: 'opTable[3+1] = (void *)sourceWordwith'. self cCode: 'opTable[4+1] = (void *)bitInvertAndwith'. self cCode: 'opTable[5+1] = (void *)destinationWordwith'. self cCode: 'opTable[6+1] = (void *)bitXorwith'. self cCode: 'opTable[7+1] = (void *)bitOrwith'. self cCode: 'opTable[8+1] = (void *)bitInvertAndInvertwith'. self cCode: 'opTable[9+1] = (void *)bitInvertXorwith'. self cCode: 'opTable[10+1] = (void *)bitInvertDestinationwith'. self cCode: 'opTable[11+1] = (void *)bitOrInvertwith'. self cCode: 'opTable[12+1] = (void *)bitInvertSourcewith'. self cCode: 'opTable[13+1] = (void *)bitInvertOrwith'. self cCode: 'opTable[14+1] = (void *)bitInvertOrInvertwith'. self cCode: 'opTable[15+1] = (void *)destinationWordwith'. self cCode: 'opTable[16+1] = (void *)destinationWordwith'. self cCode: 'opTable[17+1] = (void *)destinationWordwith'. self cCode: 'opTable[18+1] = (void *)addWordwith'. self cCode: 'opTable[19+1] = (void *)subWordwith'. self cCode: 'opTable[20+1] = (void *)rgbAddwith'. self cCode: 'opTable[21+1] = (void *)rgbSubwith'. self cCode: 'opTable[22+1] = (void *)OLDrgbDiffwith'. self cCode: 'opTable[23+1] = (void *)OLDtallyIntoMapwith'. self cCode: 'opTable[24+1] = (void *)alphaBlendwith'. self cCode: 'opTable[25+1] = (void *)pixPaintwith'. self cCode: 'opTable[26+1] = (void *)pixMaskwith'. self cCode: 'opTable[27+1] = (void *)rgbMaxwith'. self cCode: 'opTable[28+1] = (void *)rgbMinwith'. self cCode: 'opTable[29+1] = (void *)rgbMinInvertwith'. self cCode: 'opTable[30+1] = (void *)alphaBlendConstwith'. self cCode: 'opTable[31+1] = (void *)alphaPaintConstwith'. self cCode: 'opTable[32+1] = (void *)rgbDiffwith'. self cCode: 'opTable[33+1] = (void *)tallyIntoMapwith'. self cCode: 'opTable[34+1] = (void *)alphaBlendScaledwith'. self cCode: 'opTable[35+1] = (void *)alphaBlendScaledwith'. self cCode: 'opTable[36+1] = (void *)alphaBlendScaledwith'. self cCode: 'opTable[37+1] = (void *)rgbMulwith'. self cCode: 'opTable[38+1] = (void *)pixSwapwith'. self cCode: 'opTable[39+1] = (void *)pixClearwith'. self cCode: 'opTable[40+1] = (void *)fixAlphawith'. + self cCode: 'opTable[41+1] = (void *)rgbComponentAlphawith'. + self cCode: 'opTable[42+1] = (void *)alphaScalewith'. + self cCode: 'opTable[43+1] = (void *)alphaUnscalewith'. + self cCode: 'opTable[44+1] = (void *)alphaBlendUnscaledwith'.! - self cCode: 'opTable[41+1] = (void *)rgbComponentAlphawith'.!

3 2

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

Vm-dev December 2020