Vm-dev November 2016

vm-dev@lists.squeakfoundation.org

34 participants
155 discussions

Benchmarks on Cuis 5.0 Spur + newest Cog VM
by Luciano Notarfrancesco 19 Nov '16

19 Nov '16

Wow, the new VM is faaast! (I know, I'm a little late on the game, I just finished migrating my code to a new image.) I'm comparing Cuis 5.0 Spur + newest Cog VM (32 bits) against Cuis 4.5 Cog r3370 from 2015-6. Soon we'll see how things go with 64 bits too. All my benchmarks run faster. Integer arithmetic has improved (the simplest benchmark of '1000!' get speedup by 4.5x). Other more complex benchmarks that don't depend on large integer arithmetic run much faster too, like Groebner bases over Z/p with small p, as well as computing with permutation groups. Overall, the speedup is 1.5x to 5x, in some cases more. In one particular case (cyclic 7 Groebner basis over the prime field Z/32003, a standard benchmark for computer algebra systems) the speedup factor is 600x. But this seems to be a bug, either in the old VM/image combo or the new one, or something in my code that behaves differently in the new VM/image, because they don't produce the same output. I'll investigate it. Other than that, over 400 tests passed without problem. So, thanks to all that made this possible, specially Eliot and the vm-dev team, and Juan for migrating Cuis to Spur. Awesome work! Luciano

2 2

[OpenSmalltalk/opensmalltalk-vm] 21986b: CogVM source as per VMMaker.oscog-eem.1995
by GitHub 19 Nov '16

19 Nov '16

Branch: refs/heads/Cog Home: https://github.com/OpenSmalltalk/opensmalltalk-vm Commit: 21986baddc511c73b5895a1fd4b37e589262e548 https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/21986baddc511c73b5… Author: Eliot Miranda <eliot.miranda(a)gmail.com> Date: 2016-11-19 (Sat, 19 Nov 2016) Changed paths: M src/plugins/FilePlugin/FilePlugin.c Log Message: ----------- CogVM source as per VMMaker.oscog-eem.1995 Fix the FilePlugin for Spur 64-bit and 16-bit integer arrays. Commit: 1b04efca3f83bd8a732178ba6a569bfaee7b8b8a https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/1b04efca3f83bd8a73… Author: Eliot Miranda <eliot.miranda(a)gmail.com> Date: 2016-11-19 (Sat, 19 Nov 2016) Changed paths: M platforms/Cross/vm/sqMemoryAccess.h M platforms/iOS/vm/Common/sqMacV2Memory.c M platforms/unix/vm/sqUnixMemory.c Log Message: ----------- Merge branch 'Cog' of http://github.com/OpenSmalltalk/vm into Cog Compare: https://github.com/OpenSmalltalk/opensmalltalk-vm/compare/72275392e600...1b…

1 0

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

19 Nov '16

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.1996.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.1996 Author: eem Time: 19 November 2016, 10:00:32.110085 am UUID: 5494face-981d-4da2-bb0a-d10df419ec65 Ancestors: VMMaker.oscog-eem.1995 Simulation: Add support for 64-bit simulation using DoubleWordArray as the memroy class. Rewrite the byte and short accessors to use arithmetic rather than caseOf:. Move write-protect and convertToArray memory access into the Objectmemory classes out of StackInterpreter. Provide a cCoerceSimple:to: to allow the LargeIntegersPlugin to simulate. Provide memory tests for short and byte access in the object memory simulators. =============== Diff against VMMaker.oscog-eem.1995 =============== Item was removed: - ----- Method: CogVMSimulator>>convertToArray (in category 'initialization') ----- - convertToArray - "This won't work for the Cog VM because the processor simulators need raw bytes for the memory." - - self shouldNotImplement! Item was changed: ----- Method: CogVMSimulator>>openOn:extraMemory: (in category 'initialization') ----- openOn: fileName extraMemory: extraBytes "CogVMSimulator new openOn: 'clone.im' extraMemory: 100000" | f version headerSize dataSize count oldBaseAddr bytesToShift swapBytes headerFlags firstSegSize heapSize hdrNumStackPages hdrEdenBytes hdrMaxExtSemTabSize hdrCogCodeSize stackZoneSize methodCacheSize primTraceLogSize allocationReserve | "open image file and read the header" f := FileStream readOnlyFileNamed: fileName. f ifNil: [^self error: 'no image found']. "Set the image name and the first argument; there are no arguments during simulation unless set explicitly." systemAttributes at: 1 put: fileName; at: 2 put: nil. ["begin ensure block..." imageName := f fullName. f binary. version := self getWord32FromFile: f swap: false. "current version: 16r1968 (=6504) vive la revolucion!!" (self readableFormat: version) ifTrue: [swapBytes := false] ifFalse: [(version := version byteSwap32) = self imageFormatVersion ifTrue: [swapBytes := true] ifFalse: [self error: 'incomaptible image format']]. headerSize := self getWord32FromFile: f swap: swapBytes. dataSize := self getLongFromFile: f swap: swapBytes. "length of heap in file" oldBaseAddr := self getLongFromFile: f swap: swapBytes. "object memory base address of image" objectMemory specialObjectsOop: (self getLongFromFile: f swap: swapBytes). objectMemory lastHash: (self getLongFromFile: f swap: swapBytes). "Should be loaded from, and saved to the image header" savedWindowSize := self getLongFromFile: f swap: swapBytes. headerFlags := self getLongFromFile: f swap: swapBytes. self setImageHeaderFlagsFrom: headerFlags. extraVMMemory := self getWord32FromFile: f swap: swapBytes. hdrNumStackPages := self getShortFromFile: f swap: swapBytes. "4 stack pages is small. Should be able to run with as few as three. 4 should be comfortable but slow. 8 is a reasonable default. Can be changed via vmParameterAt: 43 put: n" numStackPages := desiredNumStackPages ~= 0 ifTrue: [desiredNumStackPages] ifFalse: [hdrNumStackPages = 0 ifTrue: [self defaultNumStackPages] ifFalse: [hdrNumStackPages]]. desiredNumStackPages := hdrNumStackPages. stackZoneSize := self computeStackZoneSize. "This slot holds the size of the native method zone in 1k units. (pad to word boundary)." hdrCogCodeSize := (self getShortFromFile: f swap: swapBytes) * 1024. cogCodeSize := desiredCogCodeSize ~= 0 ifTrue: [desiredCogCodeSize] ifFalse: [hdrCogCodeSize = 0 ifTrue: [cogit defaultCogCodeSize] ifFalse: [hdrCogCodeSize]]. desiredCogCodeSize := hdrCogCodeSize. self assert: f position = (objectMemory wordSize = 4 ifTrue: [40] ifFalse: [64]). hdrEdenBytes := self getWord32FromFile: f swap: swapBytes. objectMemory edenBytes: (desiredEdenBytes ~= 0 ifTrue: [desiredEdenBytes] ifFalse: [hdrEdenBytes = 0 ifTrue: [objectMemory defaultEdenBytes] ifFalse: [hdrEdenBytes]]). desiredEdenBytes := hdrEdenBytes. hdrMaxExtSemTabSize := self getShortFromFile: f swap: swapBytes. hdrMaxExtSemTabSize ~= 0 ifTrue: [self setMaxExtSemSizeTo: hdrMaxExtSemTabSize]. "pad to word boundary. This slot can be used for anything else that will fit in 16 bits. Preserve it to be polite to other VMs." the2ndUnknownShort := self getShortFromFile: f swap: swapBytes. self assert: f position = (objectMemory wordSize = 4 ifTrue: [48] ifFalse: [72]). firstSegSize := self getLongFromFile: f swap: swapBytes. objectMemory firstSegmentSize: firstSegSize. "For Open PICs to be able to probe the method cache during simulation the methodCache must be relocated to memory." methodCacheSize := methodCache size * objectMemory wordSize. primTraceLogSize := primTraceLog size * objectMemory wordSize. "allocate interpreter memory. This list is in address order, low to high. In the actual VM the stack zone exists on the C stack." heapBase := (Cogit guardPageSize + cogCodeSize + stackZoneSize + methodCacheSize + primTraceLogSize + self rumpCStackSize) roundUpTo: objectMemory allocationUnit. "compare memory requirements with availability" allocationReserve := self interpreterAllocationReserveBytes. objectMemory hasSpurMemoryManagerAPI ifTrue: [| freeOldSpaceInImage headroom | freeOldSpaceInImage := self getLongFromFile: f swap: swapBytes. headroom := objectMemory initialHeadroom: extraVMMemory givenFreeOldSpaceInImage: freeOldSpaceInImage. heapSize := objectMemory roundUpHeapSize: dataSize + headroom + objectMemory newSpaceBytes + (headroom > allocationReserve ifTrue: [0] ifFalse: [allocationReserve])] ifFalse: [heapSize := dataSize + extraBytes + objectMemory newSpaceBytes + (extraBytes > allocationReserve ifTrue: [0] ifFalse: [allocationReserve])]. heapBase := objectMemory setHeapBase: heapBase memoryLimit: heapBase + heapSize endOfMemory: heapBase + dataSize. self assert: cogCodeSize \\ 4 = 0. self assert: objectMemory memoryLimit \\ 4 = 0. self assert: self rumpCStackSize \\ 4 = 0. + objectMemory allocateMemoryOfSize: objectMemory memoryLimit. "read in the image in bulk, then swap the bytes if necessary" f position: headerSize. - objectMemory memory: ((cogit processor endianness == #little - ifTrue: [LittleEndianBitmap] - ifFalse: [Bitmap]) new: objectMemory memoryLimit // 4). count := objectMemory readHeapFromImageFile: f dataBytes: dataSize. + count ~= dataSize ifTrue: [self halt]] - count ~= dataSize ifTrue: [self halt]. - ] ensure: [f close]. self moveMethodCacheToMemoryAt: objectMemory cogCodeBase + cogCodeSize + stackZoneSize. self movePrimTraceLogToMemoryAt: objectMemory cogCodeBase + cogCodeSize + stackZoneSize + methodCacheSize. self ensureImageFormatIsUpToDate: swapBytes. bytesToShift := objectMemory memoryBaseForImageRead - oldBaseAddr. "adjust pointers for zero base address" Utilities informUser: 'Relocating object pointers...' during: [self initializeInterpreter: bytesToShift]. self initializeCodeGenerator! Item was changed: ----- Method: CogVMSimulator>>withMemoryProtectionDo: (in category 'debug printing') ----- withMemoryProtectionDo: aBlock + objectMemory writeProtectMemory. - self writeProtectMemory. stackPages writeProtectMemory. ^aBlock ensure: + [objectMemory writeEnableMemory. - [self writeEnableMemory. stackPages writeEnableMemory]! Item was changed: ----- Method: CurrentImageCoInterpreterFacade>>initialize (in category 'initialize-release') ----- initialize - memory := (VMBIGENDIAN - ifTrue: [Bitmap] - ifFalse: [LittleEndianBitmap]) new: 1024*1024/4. objectMemory := self class objectMemoryClass simulatorClass new. + objectMemory allocateMemoryOfSize: 1024*1024. - objectMemory memory: memory. objectMemory initializeFreeSpaceForFacadeFrom: self startOfMemory to: self variablesBase. + memory := objectMemory memory. coInterpreter := CoInterpreter new. coInterpreter instVarNamed: 'objectMemory' put: objectMemory; instVarNamed: 'primitiveTable' put: (CArrayAccessor on: CoInterpreter primitiveTable copy). variables := Dictionary new! Item was added: + ----- Method: InterpreterPlugin>>cCoerceSimple:to: (in category 'simulation') ----- + cCoerceSimple: value to: cType + "Coercion without type mapping. Don't even bother to check for valid types..." + ^value! Item was removed: - ----- Method: InterpreterSimulator>>convertToArray (in category 'initialization') ----- - convertToArray - "I dont believe it -- this *just works*" - - memory := memory as: Array! Item was added: + ----- Method: NewObjectMemory>>allocateMemoryOfSize: (in category 'simulation') ----- + allocateMemoryOfSize: limit + <doNotGenerate> + super allocateMemoryOfSize: limit. + freeStart := memoryLimit! Item was added: + ----- Method: ObjectMemory>>convertToArray (in category 'simulation') ----- + convertToArray + <doNotGenerate> + "I dont believe it -- this *just works*" + + memory:= memory as: Array! Item was added: + ----- Method: ObjectMemory>>writeEnableMemory (in category 'simulation') ----- + writeEnableMemory + <doNotGenerate> + memory class == ReadOnlyArrayWrapper ifTrue: + [memory := memory array]! Item was added: + ----- Method: ObjectMemory>>writeProtectMemory (in category 'simulation') ----- + writeProtectMemory + <doNotGenerate> + memory class ~~ ReadOnlyArrayWrapper ifTrue: + [memory := ReadOnlyArrayWrapper around: memory]! Item was changed: ----- Method: Spur32BitMMLECoSimulator>>byteAt: (in category 'memory access') ----- byteAt: byteAddress + | lowBits long32 | - | lowBits long | lowBits := byteAddress bitAnd: 3. + long32 := self long32At: byteAddress - lowBits. + ^(long32 bitShift: -8 * lowBits) bitAnd: 16rFF! - long := self longAt: byteAddress - lowBits. - ^(lowBits caseOf: { - [0] -> [ long ]. - [1] -> [ long bitShift: -8 ]. - [2] -> [ long bitShift: -16 ]. - [3] -> [ long bitShift: -24 ] - }) bitAnd: 16rFF! Item was changed: ----- Method: Spur32BitMMLECoSimulator>>byteAt:put: (in category 'memory access') ----- byteAt: byteAddress put: byte + | lowBits long32 longAddress mask value | - | lowBits long longAddress | lowBits := byteAddress bitAnd: 3. longAddress := byteAddress - lowBits. + long32 := self long32At: longAddress. + mask := (16rFF bitShift: 8 * lowBits) bitInvert. + value := byte bitShift: 8 * lowBits. + self long32At: longAddress put: ((long32 bitAnd: mask) bitOr: value). - long := self longAt: longAddress. - long := (lowBits caseOf: { - [0] -> [ (long bitAnd: 16rFFFFFF00) bitOr: byte ]. - [1] -> [ (long bitAnd: 16rFFFF00FF) bitOr: (byte bitShift: 8) ]. - [2] -> [ (long bitAnd: 16rFF00FFFF) bitOr: (byte bitShift: 16) ]. - [3] -> [ (long bitAnd: 16r00FFFFFF) bitOr: (byte bitShift: 24) ] - }). - self longAt: longAddress put: long. ^byte! Item was changed: ----- Method: Spur32BitMMLESimulator>>byteAt: (in category 'memory access') ----- byteAt: byteAddress + | lowBits long32 | - | lowBits long | lowBits := byteAddress bitAnd: 3. + long32 := self long32At: byteAddress - lowBits. + ^(long32 bitShift: -8 * lowBits) bitAnd: 16rFF! - long := self longAt: byteAddress - lowBits. - ^(lowBits caseOf: { - [0] -> [ long ]. - [1] -> [ long bitShift: -8 ]. - [2] -> [ long bitShift: -16 ]. - [3] -> [ long bitShift: -24 ] - }) bitAnd: 16rFF! Item was changed: ----- Method: Spur32BitMMLESimulator>>byteAt:put: (in category 'memory access') ----- byteAt: byteAddress put: byte + | lowBits long32 longAddress mask value | - | lowBits long longAddress | lowBits := byteAddress bitAnd: 3. longAddress := byteAddress - lowBits. + long32 := self long32At: longAddress. + mask := (16rFF bitShift: 8 * lowBits) bitInvert. + value := byte bitShift: 8 * lowBits. + self long32At: longAddress put: ((long32 bitAnd: mask) bitOr: value). - long := self longAt: longAddress. - long := (lowBits caseOf: { - [0] -> [ (long bitAnd: 16rFFFFFF00) bitOr: byte ]. - [1] -> [ (long bitAnd: 16rFFFF00FF) bitOr: (byte bitShift: 8) ]. - [2] -> [ (long bitAnd: 16rFF00FFFF) bitOr: (byte bitShift: 16) ]. - [3] -> [ (long bitAnd: 16r00FFFFFF) bitOr: (byte bitShift: 24) ] - }). - self longAt: longAddress put: long. ^byte! Item was added: + ----- Method: Spur32BitMemoryManager>>memoryClass (in category 'simulation') ----- + memoryClass + <doNotGenerate> + ^self endianness == #little + ifTrue: [LittleEndianBitmap] + ifFalse: [Bitmap]! Item was changed: ----- Method: Spur64BitMMLECoSimulator>>byteAt: (in category 'memory access') ----- byteAt: byteAddress | lowBits long32 | lowBits := byteAddress bitAnd: 3. long32 := self long32At: byteAddress - lowBits. + ^(long32 bitShift: -8 * lowBits) bitAnd: 16rFF! - ^(lowBits caseOf: { - [0] -> [ long32 ]. - [1] -> [ long32 bitShift: -8 ]. - [2] -> [ long32 bitShift: -16 ]. - [3] -> [ long32 bitShift: -24 ]. - }) bitAnd: 16rFF! Item was changed: ----- Method: Spur64BitMMLECoSimulator>>byteAt:put: (in category 'memory access') ----- byteAt: byteAddress put: byte + | lowBits long32 longAddress mask value | - | lowBits long32 longAddress | lowBits := byteAddress bitAnd: 3. longAddress := byteAddress - lowBits. long32 := self long32At: longAddress. + mask := (16rFF bitShift: 8 * lowBits) bitInvert. + value := byte bitShift: 8 * lowBits. + self long32At: longAddress put: ((long32 bitAnd: mask) bitOr: value). - long32 := (lowBits caseOf: { - [0] -> [ (long32 bitAnd: 16rFFFFFF00) bitOr: byte ]. - [1] -> [ (long32 bitAnd: 16rFFFF00FF) bitOr: (byte bitShift: 8) ]. - [2] -> [ (long32 bitAnd: 16rFF00FFFF) bitOr: (byte bitShift: 16) ]. - [3] -> [ (long32 bitAnd: 16r00FFFFFF) bitOr: (byte bitShift: 24) ]. - }). - self long32At: longAddress put: long32. ^byte! Item was added: + Spur64BitMMLECoSimulator subclass: #Spur64BitMMLECoSimulatorFor64Bits + instanceVariableNames: '' + classVariableNames: '' + poolDictionaries: '' + category: 'VMMaker-SpurMemoryManagerSimulation'! Item was added: + ----- Method: Spur64BitMMLECoSimulatorFor64Bits>>byteAt: (in category 'memory access') ----- + byteAt: byteAddress + | lowBits long64 | + lowBits := byteAddress bitAnd: 7. + long64 := self long64At: byteAddress - lowBits. + ^(long64 bitShift: -8 * lowBits) bitAnd: 16rFF! Item was added: + ----- Method: Spur64BitMMLECoSimulatorFor64Bits>>byteAt:put: (in category 'memory access') ----- + byteAt: byteAddress put: byte + | lowBits long64 longAddress mask value | + lowBits := byteAddress bitAnd: 7. + longAddress := byteAddress - lowBits. + long64 := self long64At: longAddress. + mask := (16rFF bitShift: 8 * lowBits) bitInvert. + value := byte bitShift: 8 * lowBits. + self long64At: longAddress put: ((long64 bitAnd: mask) bitOr: value). + ^byte! Item was added: + ----- Method: Spur64BitMMLECoSimulatorFor64Bits>>long32At: (in category 'memory access') ----- + long32At: byteAddress + "Answer the 32-bit word at byteAddress which must be a multiple of four." + | lowBits long | + lowBits := byteAddress bitAnd: 4. + long := self long64At: byteAddress - lowBits. + ^lowBits = 4 + ifTrue: [long bitShift: -32] + ifFalse: [long bitAnd: 16rFFFFFFFF]! Item was added: + ----- Method: Spur64BitMMLECoSimulatorFor64Bits>>long32At:put: (in category 'memory access') ----- + long32At: byteAddress put: a32BitValue + "Store the 32-bit word at byteAddress which must be a multiple of four." + | lowBits long longAddress | + lowBits := byteAddress bitAnd: 4. + lowBits = 0 + ifTrue: "storing into LS word" + [long := self long64At: byteAddress. + self long64At: byteAddress + put: ((long bitAnd: 16rFFFFFFFF00000000) bitOr: a32BitValue)] + ifFalse: "storing into MS word" + [longAddress := byteAddress - 4. + long := self long64At: longAddress. + self long64At: longAddress + put: ((long bitAnd: 16rFFFFFFFF) bitOr: (a32BitValue bitShift: 32))]. + ^a32BitValue! Item was added: + ----- Method: Spur64BitMMLECoSimulatorFor64Bits>>long64At: (in category 'memory access') ----- + long64At: byteAddress + "memory is a DobleWordArray, a 64-bit indexable array of bits" + byteAddress \\ 8 ~= 0 ifTrue: [self unalignedAccessError]. + ^memory at: byteAddress // 8 + 1! Item was added: + ----- Method: Spur64BitMMLECoSimulatorFor64Bits>>long64At:put: (in category 'memory access') ----- + long64At: byteAddress put: a64BitValue + "memory is a DobleWordArray, a 64-bit indexable array of bits" + byteAddress \\ 8 ~= 0 ifTrue: [self unalignedAccessError]. + ^memory at: byteAddress // 8 + 1 put: a64BitValue! Item was added: + ----- Method: Spur64BitMMLECoSimulatorFor64Bits>>memoryClass (in category 'simulation') ----- + memoryClass + "Answer the class to use for the memory inst var in simulation. + Answer nil if a suitable class isn't available. This version uses a 64-bit element class if available." + <doNotGenerate> + ^Smalltalk classNamed: #DoubleWordArray! Item was added: + ----- Method: Spur64BitMMLECoSimulatorFor64Bits>>shortAt: (in category 'memory access') ----- + shortAt: byteAddress + | lowBits long64 | + lowBits := byteAddress bitAnd: 6. + long64 := self long64At: byteAddress - lowBits. + ^(long64 bitShift: -8 * lowBits) bitAnd: 16rFFFF! Item was added: + ----- Method: Spur64BitMMLECoSimulatorFor64Bits>>shortAt:put: (in category 'memory access') ----- + shortAt: byteAddress put: short + | lowBits long64 longAddress mask value | + lowBits := byteAddress bitAnd: 6. + longAddress := byteAddress - lowBits. + long64 := self long64At: longAddress. + mask := (16rFFFF bitShift: 8 * lowBits) bitInvert. + value := short bitShift: 8 * lowBits. + self long64At: longAddress put: ((long64 bitAnd: mask) bitOr: value). + ^short! Item was changed: ----- Method: Spur64BitMMLESimulator>>byteAt: (in category 'memory access') ----- byteAt: byteAddress | lowBits long32 | lowBits := byteAddress bitAnd: 3. long32 := self long32At: byteAddress - lowBits. + ^(long32 bitShift: -8 * lowBits) bitAnd: 16rFF! - ^(lowBits caseOf: { - [0] -> [ long32 ]. - [1] -> [ long32 bitShift: -8 ]. - [2] -> [ long32 bitShift: -16 ]. - [3] -> [ long32 bitShift: -24 ]. - }) bitAnd: 16rFF! Item was changed: ----- Method: Spur64BitMMLESimulator>>byteAt:put: (in category 'memory access') ----- byteAt: byteAddress put: byte + | lowBits long32 longAddress mask value | - | lowBits long32 longAddress | lowBits := byteAddress bitAnd: 3. longAddress := byteAddress - lowBits. long32 := self long32At: longAddress. + mask := (16rFF bitShift: 8 * lowBits) bitInvert. + value := byte bitShift: 8 * lowBits. + self long32At: longAddress put: ((long32 bitAnd: mask) bitOr: value). - long32 := (lowBits caseOf: { - [0] -> [ (long32 bitAnd: 16rFFFFFF00) bitOr: byte ]. - [1] -> [ (long32 bitAnd: 16rFFFF00FF) bitOr: (byte bitShift: 8) ]. - [2] -> [ (long32 bitAnd: 16rFF00FFFF) bitOr: (byte bitShift: 16) ]. - [3] -> [ (long32 bitAnd: 16r00FFFFFF) bitOr: (byte bitShift: 24) ]. - }). - self long32At: longAddress put: long32. ^byte! Item was added: + Spur64BitMMLESimulator subclass: #Spur64BitMMLESimulatorFor64Bits + instanceVariableNames: '' + classVariableNames: '' + poolDictionaries: '' + category: 'VMMaker-SpurMemoryManagerSimulation'! Item was added: + ----- Method: Spur64BitMMLESimulatorFor64Bits>>byteAt: (in category 'memory access') ----- + byteAt: byteAddress + | lowBits long64 | + lowBits := byteAddress bitAnd: 7. + long64 := self long64At: byteAddress - lowBits. + ^(long64 bitShift: -8 * lowBits) bitAnd: 16rFF! Item was added: + ----- Method: Spur64BitMMLESimulatorFor64Bits>>byteAt:put: (in category 'memory access') ----- + byteAt: byteAddress put: byte + | lowBits long64 longAddress mask value | + lowBits := byteAddress bitAnd: 7. + longAddress := byteAddress - lowBits. + long64 := self long64At: longAddress. + mask := (16rFF bitShift: 8 * lowBits) bitInvert. + value := byte bitShift: 8 * lowBits. + self long64At: longAddress put: ((long64 bitAnd: mask) bitOr: value). + ^byte! Item was added: + ----- Method: Spur64BitMMLESimulatorFor64Bits>>long32At: (in category 'memory access') ----- + long32At: byteAddress + "Answer the 32-bit word at byteAddress which must be a multiple of four." + | lowBits long | + lowBits := byteAddress bitAnd: 4. + long := self long64At: byteAddress - lowBits. + ^lowBits = 4 + ifTrue: [long bitShift: -32] + ifFalse: [long bitAnd: 16rFFFFFFFF]! Item was added: + ----- Method: Spur64BitMMLESimulatorFor64Bits>>long32At:put: (in category 'memory access') ----- + long32At: byteAddress put: a32BitValue + "Store the 32-bit word at byteAddress which must be a multiple of four." + | lowBits long longAddress | + lowBits := byteAddress bitAnd: 4. + lowBits = 0 + ifTrue: "storing into LS word" + [long := self long64At: byteAddress. + self long64At: byteAddress + put: ((long bitAnd: 16rFFFFFFFF00000000) bitOr: a32BitValue)] + ifFalse: "storing into MS word" + [longAddress := byteAddress - 4. + long := self long64At: longAddress. + self long64At: longAddress + put: ((long bitAnd: 16rFFFFFFFF) bitOr: (a32BitValue bitShift: 32))]. + ^a32BitValue! Item was added: + ----- Method: Spur64BitMMLESimulatorFor64Bits>>long64At: (in category 'memory access') ----- + long64At: byteAddress + "memory is a DobleWordArray, a 64-bit indexable array of bits" + byteAddress \\ 8 ~= 0 ifTrue: [self unalignedAccessError]. + ^memory at: byteAddress // 8 + 1! Item was added: + ----- Method: Spur64BitMMLESimulatorFor64Bits>>long64At:put: (in category 'memory access') ----- + long64At: byteAddress put: a64BitValue + "memory is a DobleWordArray, a 64-bit indexable array of bits" + byteAddress \\ 8 ~= 0 ifTrue: [self unalignedAccessError]. + ^memory at: byteAddress // 8 + 1 put: a64BitValue! Item was added: + ----- Method: Spur64BitMMLESimulatorFor64Bits>>memoryClass (in category 'simulation') ----- + memoryClass + "Answer the class to use for the memory inst var in simulation. + Answer nil if a suitable class isn't available. This version uses a 64-bit element class if available." + <doNotGenerate> + ^Smalltalk classNamed: #DoubleWordArray! Item was added: + ----- Method: Spur64BitMMLESimulatorFor64Bits>>shortAt: (in category 'memory access') ----- + shortAt: byteAddress + | lowBits long64 | + lowBits := byteAddress bitAnd: 6. + long64 := self long64At: byteAddress - lowBits. + ^(long64 bitShift: -8 * lowBits) bitAnd: 16rFFFF! Item was added: + ----- Method: Spur64BitMMLESimulatorFor64Bits>>shortAt:put: (in category 'memory access') ----- + shortAt: byteAddress put: short + | lowBits long64 longAddress mask value | + lowBits := byteAddress bitAnd: 6. + longAddress := byteAddress - lowBits. + long64 := self long64At: longAddress. + mask := (16rFFFF bitShift: 8 * lowBits) bitInvert. + value := short bitShift: 8 * lowBits. + self long64At: longAddress put: ((long64 bitAnd: mask) bitOr: value). + ^short! Item was changed: ----- Method: Spur64BitMemoryManager class>>simulatorClass (in category 'simulation only') ----- simulatorClass + ^Spur64BitMMLESimulatorFor64Bits basicNew memoryClass + ifNil: [Spur64BitMMLESimulator] + ifNotNil: [Spur64BitMMLESimulatorFor64Bits]! - ^Spur64BitMMLESimulator! Item was added: + ----- Method: Spur64BitMemoryManager>>memoryClass (in category 'simulation') ----- + memoryClass + "Answer the class to use for the memory inst var in simulation. + Answer nil if a suitable class isn't available. This version emulates 64-bit access given a 32-bit element array." + <doNotGenerate> + ^self endianness == #little + ifTrue: [LittleEndianBitmap] + ifFalse: [Bitmap]! Item was added: + ----- Method: SpurMemoryManager class>>simulatorClass (in category 'simulation only') ----- + simulatorClass + ^self subclassResponsibility! Item was changed: ----- Method: SpurMemoryManager>>allocateMemoryOfSize: (in category 'testing') ----- + allocateMemoryOfSize: memoryBytes - allocateMemoryOfSize: limit <doNotGenerate> + | bytesPerElement | + bytesPerElement := (self memoryClass basicNew: 0) bytesPerElement. + memory := self memoryClass new: memoryBytes + bytesPerElement - 1 // bytesPerElement! - memory := (self endianness == #little - ifTrue: [LittleEndianBitmap] - ifFalse: [Bitmap]) new: limit // 4! Item was changed: ----- Method: SpurMemoryManager>>allocateMemoryOfSize:newSpaceSize:stackSize:codeSize: (in category 'spur bootstrap') ----- allocateMemoryOfSize: memoryBytes newSpaceSize: newSpaceBytes stackSize: stackBytes codeSize: codeBytes "Intialize the receiver for bootsraping an image. Set up a large oldSpace and an empty newSpace and set-up freeStart and scavengeThreshold to allocate in oldSpace. Later on (in initializePostBootstrap) freeStart and scavengeThreshold will be set to sane values." <doNotGenerate> self assert: (memoryBytes \\ self allocationUnit = 0 and: [newSpaceBytes \\ self allocationUnit = 0 and: [codeBytes \\ self allocationUnit = 0]]). + self allocateMemoryOfSize: memoryBytes + newSpaceBytes + codeBytes + stackBytes. - memory := (self endianness == #little - ifTrue: [LittleEndianBitmap] - ifFalse: [Bitmap]) new: (memoryBytes + newSpaceBytes + codeBytes + stackBytes) // 4. newSpaceStart := codeBytes + stackBytes. endOfMemory := freeOldSpaceStart := memoryBytes + newSpaceBytes + codeBytes + stackBytes. "leave newSpace empty for the bootstrap" freeStart := newSpaceBytes + newSpaceStart. oldSpaceStart := newSpaceLimit := newSpaceBytes + newSpaceStart. + scavengeThreshold := memory size * memory bytesPerElement. "i.e. /don't/ scavenge." - scavengeThreshold := memory size * 4. "Bitmap is a 4-byte per word array" scavenger := SpurGenerationScavengerSimulator new. scavenger manager: self. scavenger newSpaceStart: newSpaceStart newSpaceBytes: newSpaceBytes survivorBytes: newSpaceBytes // self scavengerDenominator! Item was added: + ----- Method: SpurMemoryManager>>convertToArray (in category 'simulation') ----- + convertToArray + <doNotGenerate> + "I dont believe it -- this *just works*" + + memory:= memory as: Array! Item was added: + ----- Method: SpurMemoryManager>>memoryClass (in category 'simulation') ----- + memoryClass + "Answer the class to use for the memory inst var in simulation. + Answer nil if a suitable class isn't available." + <doNotGenerate> + ^self subclassResponsibility! Item was added: + ----- Method: SpurMemoryManager>>positiveMachineIntegerFor: (in category 'simulation only') ----- + positiveMachineIntegerFor: integerValue + "hack around the CoInterpreter/ObjectMemory split refactoring" + <doNotGenerate> + ^coInterpreter positiveMachineIntegerFor: integerValue! Item was added: + ----- Method: SpurMemoryManager>>positiveMachineIntegerValueOf: (in category 'simulation only') ----- + positiveMachineIntegerValueOf: integerValue + "hack around the CoInterpreter/ObjectMemory split refactoring" + <doNotGenerate> + ^coInterpreter positiveMachineIntegerValueOf: integerValue! Item was changed: ----- Method: SpurMemoryManager>>sqAllocateMemorySegmentOfSize:Above:AllocatedSizeInto: (in category 'simulation only') ----- sqAllocateMemorySegmentOfSize: segmentSize Above: minAddress AllocatedSizeInto: allocSizePtrOrBlock <doNotGenerate> "Simulate heap growth by growing memory by segmentSize + a delta. To test bridges alternate the delta between 0 bytes and 1M bytes depending on the number of segments. The delta will be the distance between segments to be bridged." | delta newMemory start | + self assert: segmentSize \\ memory bytesPerElement = 0. delta := segmentManager numSegments odd ifTrue: [1024 * 1024] ifFalse: [0]. "A previous shrink may have freed up memory. Don't bother to grow if there's already room." + segmentManager lastSegment segLimit + segmentSize + delta <= (memory size * memory bytesPerElement) ifTrue: - segmentManager lastSegment segLimit + segmentSize + delta <= (memory size * 4) ifTrue: [allocSizePtrOrBlock value: segmentSize. ^minAddress + delta]. + start := memory size * memory bytesPerElement + delta. + newMemory := memory class new: memory size + (segmentSize + delta / memory bytesPerElement). - start := memory size * 4 + delta. - newMemory := memory class new: memory size + (segmentSize + delta / 4). newMemory replaceFrom: 1 to: memory size with: memory startingAt: 1. memory := newMemory. allocSizePtrOrBlock value: segmentSize. ^start! Item was added: + ----- Method: SpurMemoryManager>>writeEnableMemory (in category 'simulation') ----- + writeEnableMemory + <doNotGenerate> + memory class == ReadOnlyArrayWrapper ifTrue: + [memory := memory array]! Item was added: + ----- Method: SpurMemoryManager>>writeProtectMemory (in category 'simulation') ----- + writeProtectMemory + <doNotGenerate> + memory class ~~ ReadOnlyArrayWrapper ifTrue: + [memory := ReadOnlyArrayWrapper around: memory]! Item was changed: ----- Method: SpurSegmentManager>>readHeapFrom:at:dataBytes: (in category 'private') ----- readHeapFrom: f at: location dataBytes: numBytes "Read numBytes from f into mmory at location. Answer the number of bytes read." ^self cCode: [self sq: (self pointerForOop: location) Image: (self sizeof: #char) File: numBytes Read: f] inSmalltalk: + [| bytesPerElement | + bytesPerElement := manager memory bytesPerElement. + (f readInto: manager memory + startingAt: location // bytesPerElement + 1 + count: numBytes // bytesPerElement) + * bytesPerElement]! - [(f readInto: manager memory - startingAt: location // 4 + 1 - count: numBytes // 4) - * 4]! Item was changed: ----- Method: StackInterpreterSimulator>>byteAt: (in category 'memory access') ----- byteAt: byteAddress + self deprecated. ^objectMemory byteAt: byteAddress! Item was changed: ----- Method: StackInterpreterSimulator>>byteAt:put: (in category 'memory access') ----- byteAt: byteAddress put: byte + self deprecated. ^objectMemory byteAt: byteAddress put: byte! Item was removed: - ----- Method: StackInterpreterSimulator>>convertToArray (in category 'initialization') ----- - convertToArray - "I dont believe it -- this *just works*" - - objectMemory memory: (objectMemory memory as: Array)! Item was changed: ----- Method: StackInterpreterSimulator>>integerAt: (in category 'memory access') ----- integerAt: byteAddress "Note: Adjusted for Smalltalk's 1-based array indexing." + self deprecated. ^objectMemory memory integerAt: (byteAddress // 4) + 1! Item was changed: ----- Method: StackInterpreterSimulator>>integerAt:put: (in category 'memory access') ----- integerAt: byteAddress put: a32BitValue "Note: Adjusted for Smalltalk's 1-based array indexing." + self deprecated. ^objectMemory memory integerAt: (byteAddress // 4) + 1 put: a32BitValue! Item was changed: ----- Method: StackInterpreterSimulator>>longAt: (in category 'memory access') ----- longAt: byteAddress + self deprecated. ^objectMemory longAt: byteAddress! Item was changed: ----- Method: StackInterpreterSimulator>>longAt:put: (in category 'memory access') ----- longAt: byteAddress put: a32BitValue + self deprecated. ^objectMemory longAt: byteAddress put: a32BitValue! Item was changed: ----- Method: StackInterpreterSimulator>>openOn:extraMemory: (in category 'initialization') ----- openOn: fileName extraMemory: extraBytes "StackInterpreterSimulator new openOn: 'clone.im' extraMemory: 100000" | f version headerSize dataSize count oldBaseAddr bytesToShift swapBytes headerFlags heapBase firstSegSize heapSize hdrNumStackPages hdrEdenBytes hdrMaxExtSemTabSize allocationReserve | "open image file and read the header" f := FileStream readOnlyFileNamed: fileName. f ifNil: [^self error: 'no image found']. "Set the image name and the first argument; there are no arguments during simulation unless set explicitly." systemAttributes at: 1 put: fileName; at: 2 put: nil. ["begin ensure block..." imageName := f fullName. f binary. version := self getWord32FromFile: f swap: false. "current version: 16r1968 (=6504) vive la revolucion!!" (self readableFormat: version) ifTrue: [swapBytes := false] ifFalse: [(version := objectMemory byteSwapped: version) = self imageFormatVersion ifTrue: [swapBytes := true] ifFalse: [self error: 'incomaptible image format']]. headerSize := self getWord32FromFile: f swap: swapBytes. dataSize := self getLongFromFile: f swap: swapBytes. "length of heap in file" oldBaseAddr := self getLongFromFile: f swap: swapBytes. "object memory base address of image" objectMemory specialObjectsOop: (self getLongFromFile: f swap: swapBytes). objectMemory lastHash: (self getLongFromFile: f swap: swapBytes). "Should be loaded from, and saved to the image header" savedWindowSize := self getLongFromFile: f swap: swapBytes. headerFlags := self getLongFromFile: f swap: swapBytes. self setImageHeaderFlagsFrom: headerFlags. extraVMMemory := self getWord32FromFile: f swap: swapBytes. hdrNumStackPages := self getShortFromFile: f swap: swapBytes. "4 stack pages is small. Should be able to run with as few as three. 4 should be comfortable but slow. 8 is a reasonable default. Can be changed via vmParameterAt: 43 put: n" numStackPages := desiredNumStackPages ~= 0 ifTrue: [desiredNumStackPages] ifFalse: [hdrNumStackPages = 0 ifTrue: [self defaultNumStackPages] ifFalse: [hdrNumStackPages]]. desiredNumStackPages := hdrNumStackPages. "pad to word boundary. This slot can be used for anything else that will fit in 16 bits. It is used for the cog code size in Cog. Preserve it to be polite to other VMs." theUnknownShort := self getShortFromFile: f swap: swapBytes. self assert: f position = (objectMemory wordSize = 4 ifTrue: [40] ifFalse: [64]). hdrEdenBytes := self getWord32FromFile: f swap: swapBytes. objectMemory edenBytes: (hdrEdenBytes = 0 ifTrue: [objectMemory defaultEdenBytes] ifFalse: [hdrEdenBytes]). desiredEdenBytes := hdrEdenBytes. hdrMaxExtSemTabSize := self getShortFromFile: f swap: swapBytes. hdrMaxExtSemTabSize ~= 0 ifTrue: [self setMaxExtSemSizeTo: hdrMaxExtSemTabSize]. "pad to word boundary. This slot can be used for anything else that will fit in 16 bits. Preserve it to be polite to other VMs." the2ndUnknownShort := self getShortFromFile: f swap: swapBytes. self assert: f position = (objectMemory wordSize = 4 ifTrue: [48] ifFalse: [72]). firstSegSize := self getLongFromFile: f swap: swapBytes. objectMemory firstSegmentSize: firstSegSize. "compare memory requirements with availability" allocationReserve := self interpreterAllocationReserveBytes. objectMemory hasSpurMemoryManagerAPI ifTrue: [| freeOldSpaceInImage headroom | freeOldSpaceInImage := self getLongFromFile: f swap: swapBytes. headroom := objectMemory initialHeadroom: extraVMMemory givenFreeOldSpaceInImage: freeOldSpaceInImage. heapSize := objectMemory roundUpHeapSize: dataSize + headroom + objectMemory newSpaceBytes + (headroom > allocationReserve ifTrue: [0] ifFalse: [allocationReserve])] ifFalse: [heapSize := dataSize + extraBytes + objectMemory newSpaceBytes + (extraBytes > allocationReserve ifTrue: [0] ifFalse: [allocationReserve])]. "allocate interpreter memory" heapBase := objectMemory startOfMemory. objectMemory setHeapBase: heapBase memoryLimit: heapBase + heapSize endOfMemory: heapBase + dataSize. "bogus for Spur" + objectMemory allocateMemoryOfSize: objectMemory memoryLimit. - objectMemory memory: ((objectMemory endianness == #little - ifTrue: [LittleEndianBitmap] - ifFalse: [Bitmap]) new: objectMemory memoryLimit // 4). - "read in the image in bulk, then swap the bytes if necessary" f position: headerSize. count := objectMemory readHeapFromImageFile: f dataBytes: dataSize. + count ~= dataSize ifTrue: [self halt]] - count ~= dataSize ifTrue: [self halt]. - ] ensure: [f close]. self ensureImageFormatIsUpToDate: swapBytes. bytesToShift := objectMemory memoryBaseForImageRead - oldBaseAddr. "adjust pointers for zero base address" Utilities informUser: 'Relocating object pointers...' during: [self initializeInterpreter: bytesToShift]! Item was changed: ----- Method: StackInterpreterSimulator>>withMemoryProtectionDo: (in category 'debug printing') ----- withMemoryProtectionDo: aBlock + objectMemory writeProtectMemory. - self writeProtectMemory. stackPages writeProtectMemory. ^aBlock ensure: + [objectMemory writeEnableMemory. - [self writeEnableMemory. stackPages writeEnableMemory]! Item was removed: - ----- Method: StackInterpreterSimulator>>writeEnableMemory (in category 'debug printing') ----- - writeEnableMemory - objectMemory memory: objectMemory memory array! Item was removed: - ----- Method: StackInterpreterSimulator>>writeProtectMemory (in category 'debug printing') ----- - writeProtectMemory - objectMemory memory: (ReadOnlyArrayWrapper around: objectMemory memory)! Item was added: + ----- Method: StackInterpreterTests>>testByteMemoryAccess (in category 'tests') ----- + testByteMemoryAccess + "self new testByteMemoryAccess" + | om | + om := NewCoObjectMemorySimulator new allocateMemoryOfSize: 16. + om byteAt: 0 put: 16r11. + om byteAt: 1 put: 16r22. + om byteAt: 2 put: 16r33. + om byteAt: 3 put: 16r44. + self assert: (om longAt: 0) equals: 16r44332211. + self assert: (om byteAt: 0) equals: 16r11. + self assert: (om byteAt: 1) equals: 16r22. + self assert: (om byteAt: 2) equals: 16r33. + self assert: (om byteAt: 3) equals: 16r44. + om := Spur32BitMMLECoSimulator new allocateMemoryOfSize: 16. + om byteAt: 0 put: 16r11. + om byteAt: 1 put: 16r22. + om byteAt: 2 put: 16r33. + om byteAt: 3 put: 16r44. + self assert: (om longAt: 0) equals: 16r44332211. + self assert: (om byteAt: 0) equals: 16r11. + self assert: (om byteAt: 1) equals: 16r22. + self assert: (om byteAt: 2) equals: 16r33. + self assert: (om byteAt: 3) equals: 16r44. + om := Spur64BitMMLECoSimulator new allocateMemoryOfSize: 32. + om byteAt: 0 put: 16r11. + om byteAt: 1 put: 16r22. + om byteAt: 2 put: 16r33. + om byteAt: 3 put: 16r44. + om byteAt: 4 put: 16r55. + om byteAt: 5 put: 16r66. + om byteAt: 6 put: 16r77. + om byteAt: 7 put: 16r88. + self assert: (om longAt: 0) equals: 16r8877665544332211. + self assert: (om byteAt: 0) equals: 16r11. + self assert: (om byteAt: 1) equals: 16r22. + self assert: (om byteAt: 2) equals: 16r33. + self assert: (om byteAt: 3) equals: 16r44. + self assert: (om byteAt: 4) equals: 16r55. + self assert: (om byteAt: 5) equals: 16r66. + self assert: (om byteAt: 6) equals: 16r77. + self assert: (om byteAt: 7) equals: 16r88. + (Smalltalk classNamed: #DoubleWordArray) ifNotNil: + [om := Spur64BitMMLECoSimulatorFor64Bits new allocateMemoryOfSize: 32. + om byteAt: 0 put: 16r11. + om byteAt: 1 put: 16r22. + om byteAt: 2 put: 16r33. + om byteAt: 3 put: 16r44. + om byteAt: 4 put: 16r55. + om byteAt: 5 put: 16r66. + om byteAt: 6 put: 16r77. + om byteAt: 7 put: 16r88. + self assert: (om longAt: 0) equals: 16r8877665544332211. + self assert: (om byteAt: 0) equals: 16r11. + self assert: (om byteAt: 1) equals: 16r22. + self assert: (om byteAt: 2) equals: 16r33. + self assert: (om byteAt: 3) equals: 16r44. + self assert: (om byteAt: 4) equals: 16r55. + self assert: (om byteAt: 5) equals: 16r66. + self assert: (om byteAt: 6) equals: 16r77. + self assert: (om byteAt: 7) equals: 16r88]! Item was added: + ----- Method: StackInterpreterTests>>testShortMemoryAccess (in category 'tests') ----- + testShortMemoryAccess + "self new testShortMemoryAccess" + | om | + om := NewCoObjectMemorySimulator new allocateMemoryOfSize: 16. + om shortAt: 0 put: 16r2211. + om shortAt: 2 put: 16r4433. + self assert: (om longAt: 0) equals: 16r44332211. + self assert: (om shortAt: 0) equals: 16r2211. + self assert: (om shortAt: 2) equals: 16r4433. + om := Spur32BitMMLECoSimulator new allocateMemoryOfSize: 16. + om shortAt: 0 put: 16r2211. + om shortAt: 2 put: 16r4433. + self assert: (om longAt: 0) equals: 16r44332211. + self assert: (om shortAt: 0) equals: 16r2211. + self assert: (om shortAt: 2) equals: 16r4433. + om := Spur64BitMMLECoSimulator new allocateMemoryOfSize: 32. + om shortAt: 0 put: 16r2211. + om shortAt: 2 put: 16r4433. + om shortAt: 4 put: 16r6655. + om shortAt: 6 put: 16r8877. + self assert: (om longAt: 0) equals: 16r8877665544332211. + self assert: (om shortAt: 0) equals: 16r2211. + self assert: (om shortAt: 2) equals: 16r4433. + self assert: (om shortAt: 4) equals: 16r6655. + self assert: (om shortAt: 6) equals: 16r8877. + (Smalltalk classNamed: #DoubleWordArray) ifNotNil: + [om := Spur64BitMMLECoSimulatorFor64Bits new allocateMemoryOfSize: 32. + om shortAt: 0 put: 16r2211. + om shortAt: 2 put: 16r4433. + om shortAt: 4 put: 16r6655. + om shortAt: 6 put: 16r8877. + self assert: (om longAt: 0) equals: 16r8877665544332211. + self assert: (om shortAt: 0) equals: 16r2211. + self assert: (om shortAt: 2) equals: 16r4433. + self assert: (om shortAt: 4) equals: 16r6655. + self assert: (om shortAt: 6) equals: 16r8877]! Item was changed: ----- Method: StackInterpreterTests>>testUnalignedMemoryAccess (in category 'tests') ----- testUnalignedMemoryAccess "self new testUnalignedMemoryAccess" | om | om := NewCoObjectMemorySimulator new allocateMemoryOfSize: 16. om unalignedLongAt: 1 put: 16r11223344. self assert: (om unalignedLongAt: 0) equals: 16r22334400. self assert: (om unalignedLongAt: 4) equals: 16r11. self assert: (om unalignedLongAt: 1) equals: 16r11223344. om longAt: 0 put: 16rAAAAAAAA. om longAt: 4 put: 16rAAAAAAAA. om unalignedLongAt: 1 put: 16r11223344. self assert: (om unalignedLongAt: 0) equals: 16r223344AA. self assert: (om unalignedLongAt: 4) equals: 16rAAAAAA11. self assert: (om unalignedLongAt: 1) equals: 16r11223344. om := Spur32BitMMLECoSimulator new allocateMemoryOfSize: 16. om unalignedLongAt: 3 put: 16r11223344. self assert: (om unalignedLongAt: 0) equals: 16r44000000. self assert: (om unalignedLongAt: 4) equals: 16r112233. self assert: (om unalignedLongAt: 3) equals: 16r11223344. om longAt: 0 put: 16rAAAAAAAA. om longAt: 4 put: 16rAAAAAAAA. om unalignedLongAt: 3 put: 16r11223344. self assert: (om unalignedLongAt: 0) equals: 16r44AAAAAA. self assert: (om unalignedLongAt: 4) equals: 16rAA112233. self assert: (om unalignedLongAt: 3) equals: 16r11223344. om := Spur64BitMMLECoSimulator new allocateMemoryOfSize: 32. om unalignedLongAt: 3 put: 16r1122334455667788. self assert: (om unalignedLongAt: 0) equals: 16r4455667788000000. self assert: (om unalignedLongAt: 8) equals: 16r112233. self assert: (om unalignedLongAt: 3) equals: 16r1122334455667788. om longAt: 0 put: 16rAAAAAAAAAAAAAAAA. om longAt: 8 put: 16rAAAAAAAAAAAAAAAA. om unalignedLongAt: 3 put: 16r1122334455667788. self assert: (om unalignedLongAt: 0) equals: 16r4455667788AAAAAA. self assert: (om unalignedLongAt: 8) equals: 16rAAAAAAAAAA112233. + self assert: (om unalignedLongAt: 3) equals: 16r1122334455667788. + (Smalltalk classNamed: #DoubleWordArray) ifNotNil: + [om := Spur64BitMMLECoSimulatorFor64Bits new allocateMemoryOfSize: 32. + om unalignedLongAt: 3 put: 16r1122334455667788. + self assert: (om unalignedLongAt: 0) equals: 16r4455667788000000. + self assert: (om unalignedLongAt: 8) equals: 16r112233. + self assert: (om unalignedLongAt: 3) equals: 16r1122334455667788. + om longAt: 0 put: 16rAAAAAAAAAAAAAAAA. + om longAt: 8 put: 16rAAAAAAAAAAAAAAAA. + om unalignedLongAt: 3 put: 16r1122334455667788. + self assert: (om unalignedLongAt: 0) equals: 16r4455667788AAAAAA. + self assert: (om unalignedLongAt: 8) equals: 16rAAAAAAAAAA112233. + self assert: (om unalignedLongAt: 3) equals: 16r1122334455667788]! - self assert: (om unalignedLongAt: 3) equals: 16r1122334455667788.!

1 0

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

19 Nov '16

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.1995.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.1995 Author: eem Time: 19 November 2016, 9:55:59.802779 am UUID: 39c0e7ea-03ef-453e-b7d1-5570ab78dede Ancestors: VMMaker.oscog-nice.1994 Fix the FilePlugin for Spur 32-bit and 16-bit integer arrays. =============== Diff against VMMaker.oscog-nice.1994 =============== Item was changed: ----- Method: FilePlugin>>primitiveFileReadWithPinning (in category 'file primitives') ----- primitiveFileReadWithPinning "This version of primitiveFileRead is for garbage collectors that support pinning." + | count startIndex array file slotSize elementSize bytesRead | - | count startIndex array file elementSize bytesRead | <inline: true> <var: 'file' type: #'SQFile *'> <var: 'count' type: #'size_t'> <var: 'startIndex' type: #'size_t'> + <var: 'slotSize' type: #'size_t'> <var: 'elementSize' type: #'size_t'> + count := interpreterProxy positiveMachineIntegerValueOf: (interpreterProxy stackValue: 0). + startIndex := interpreterProxy positiveMachineIntegerValueOf: (interpreterProxy stackValue: 1). - count := interpreterProxy positive32BitValueOf: (interpreterProxy stackValue: 0). - startIndex := interpreterProxy positive32BitValueOf: (interpreterProxy stackValue: 1). array := interpreterProxy stackValue: 2. file := self fileValueOf: (interpreterProxy stackValue: 3). (interpreterProxy failed "buffer can be any indexable words or bytes object except CompiledMethod" or: [(interpreterProxy isWordsOrBytes: array) not]) ifTrue: [^interpreterProxy primitiveFailFor: PrimErrBadArgument]. + slotSize := interpreterProxy slotSizeOf: array. + (startIndex >= 1 and: [startIndex + count - 1 <= slotSize]) ifFalse: - elementSize := (interpreterProxy isWords: array) ifTrue: [4] ifFalse: [1]. - (startIndex >= 1 - and: [(startIndex + count - 1) <= (interpreterProxy slotSizeOf: array)]) ifFalse: [^interpreterProxy primitiveFailFor: PrimErrBadIndex]. + "Note: adjust startIndex for zero-origin byte indexing" + elementSize := (interpreterProxy byteSizeOf: array) // slotSize. - "Note: adjust startIndex for zero-origin indexing" bytesRead := self sqFile: file Read: count * elementSize Into: (interpreterProxy cCoerce: (interpreterProxy firstIndexableField: array) to: #'char *') + At: startIndex - 1 * elementSize. - At: (startIndex - 1) * elementSize. interpreterProxy failed ifFalse: [interpreterProxy pop: 5 "pop rcvr, file, array, startIndex, count" thenPush:(interpreterProxy integerObjectOf: bytesRead // elementSize) "push # of elements read"]! Item was changed: ----- Method: FilePlugin>>primitiveFileWrite (in category 'file primitives') ----- primitiveFileWrite + | count startIndex array file slotSize elementSize bytesWritten | - | count startIndex array file elementSize bytesWritten | <var: 'file' type: 'SQFile *'> <var: 'count' type: 'size_t'> <var: 'startIndex' type: 'size_t'> + <var: 'slotSize' type: #'size_t'> + <var: 'elementSize' type: #'size_t'> - <var: 'elementSize' type: 'size_t'> <export: true> + count := interpreterProxy positiveMachineIntegerValueOf: (interpreterProxy stackValue: 0). + startIndex := interpreterProxy positiveMachineIntegerValueOf: (interpreterProxy stackValue: 1). + array := interpreterProxy stackValue: 2. + file := self fileValueOf: (interpreterProxy stackValue: 3). - count := interpreterProxy positive32BitValueOf: (interpreterProxy stackValue: 0). - startIndex := interpreterProxy positive32BitValueOf: (interpreterProxy stackValue: 1). - array := interpreterProxy stackValue: 2. - file := self fileValueOf: (interpreterProxy stackValue: 3). (interpreterProxy failed "buffer can be any indexable words or bytes object except CompiledMethod" or: [(interpreterProxy isWordsOrBytes: array) not]) ifTrue: [^interpreterProxy primitiveFailFor: PrimErrBadArgument]. + slotSize := interpreterProxy slotSizeOf: array. + (startIndex >= 1 and: [startIndex + count - 1 <= slotSize]) ifFalse: - elementSize := (interpreterProxy isWords: array) ifTrue: [4] ifFalse: [1]. - (startIndex >= 1 - and: [(startIndex + count - 1) <= (interpreterProxy slotSizeOf: array)]) ifFalse: [^interpreterProxy primitiveFailFor: PrimErrBadIndex]. + "Note: adjust startIndex for zero-origin byte indexing" + elementSize := (interpreterProxy byteSizeOf: array) // slotSize. - "Note: adjust startIndex for zero-origin indexing" bytesWritten := self sqFile: file Write: count * elementSize From: (interpreterProxy cCoerce: (interpreterProxy firstIndexableField: array) to: #'char *') At: startIndex - 1 * elementSize. interpreterProxy failed ifFalse: [interpreterProxy pop: 5 thenPush: (interpreterProxy integerObjectOf: bytesWritten // elementSize)]!

1 0

[OpenSmalltalk/opensmalltalk-vm] 722753: Eliminate any use of defined(SQ_HOST64), defined(S...
by GitHub 18 Nov '16

18 Nov '16

Branch: refs/heads/Cog Home: https://github.com/OpenSmalltalk/opensmalltalk-vm Commit: 72275392e600a06a520e35cb2a00f13b3b6301c7 https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/72275392e600a06a52… Author: Eliot Miranda <eliot.miranda(a)gmail.com> Date: 2016-11-18 (Fri, 18 Nov 2016) Changed paths: M platforms/Cross/vm/sqMemoryAccess.h M platforms/iOS/vm/Common/sqMacV2Memory.c M platforms/unix/vm/sqUnixMemory.c Log Message: ----------- Eliminate any use of defined(SQ_HOST64), defined(SQ_HOST32), defined(SQ_IMAGE32) and defined(SQ_IMAGE64) in favour of the names themselves. Then in sqMemoryAccess.h define SQ_IMAGE32 as 1 and SQ_IMAGE64 as 0, or vice verce so that code that needs to can test SQ_IMAGE32 or SQ_IMAGE64 without having to use an #ifdef.

1 0

[OpenSmalltalk/opensmalltalk-vm] 4bd2f7: CogVM source as per VMMaker.oscog-eem.1993 & Cog-e...
by GitHub 18 Nov '16

18 Nov '16

Branch: refs/heads/Cog Home: https://github.com/OpenSmalltalk/opensmalltalk-vm Commit: 4bd2f7695384cb9beb37d24f2063825d57f83094 https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/4bd2f7695384cb9beb… Author: Eliot Miranda <eliot.miranda(a)gmail.com> Date: 2016-11-17 (Thu, 17 Nov 2016) Changed paths: 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/unix/plugins/SocketPlugin/sqUnixSocket.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/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: ----------- CogVM source as per VMMaker.oscog-eem.1993 & Cog-eem.330 Fix primitiveIntegerAt in Spur 64-bits by always using signed32BitIntegerFor: to obtain the result object. Refactor signed32BitIntegerFor: into an inlineable part that cvhecks for isIntegerValue: and a non-inlined part (noInlineSigned32BitIntegerGutsFor:) that constructs a LargeInteger object. Fix accesss to DoubleByte integer arrays: fetchShort16:ofObject: is signed and we want an unsigned short. Note: most memory access should be unsigned and extension to sqInt is also unnecessary: we have improving slang type inference now. Non counting the divergence with VM simulator which provides mostly unsigned memory access! But for now, do the minimal change that could possibly work, not the right one. Fix passing 64bits args thru LLP64 FFI. Plugins: Fix integerValueOf: & integerObjectOf: in 64-bit plugins. Since CCodeGenerator generates the shifts directly it must use a #define for the number of tag bits to shift by since in 64-bit Spur we use three tag bits, not one. Fix prototype of various SurfaceFn again to match those of platforms/Corss/plugins/SurfacePlugin/SurfacePlugin.h These should be matching the prototypes: fn_getSurfaceFormat fn_lockSurface fn_unlockSurface fn_showSurface The CPU Alien processor creation primitives should be 64-bit aware, including LLP64. The Win32OSPorcessPlugin needs a 64-bit variable for its handle on 64-bits. Fix debug printing formats in sqUnixSocket.c for 64-bits (SOCKET(s) is int). Commit: ffc25509cf023a9b3e90b85c00ec53cc3eb9a8fd https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/ffc25509cf023a9b3e… Author: Eliot Miranda <eliot.miranda(a)gmail.com> Date: 2016-11-17 (Thu, 17 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' as per 1993 of http://www.github.com/opensmalltalk/vm as per 1988 into Cog Compare: https://github.com/OpenSmalltalk/opensmalltalk-vm/compare/87cf968fcd6f...ff…

1 0

VM Maker: VMMaker.oscog-nice.1994.mcz
by commits＠source.squeak.org 18 Nov '16

18 Nov '16

Nicolas Cellier uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-nice.1994.mcz ==================== Summary ==================== Name: VMMaker.oscog-nice.1994 Author: nice Time: 18 November 2016, 4:21:24.158309 am UUID: f00dbc12-d05a-4c73-b825-6281ee7ec54f Ancestors: VMMaker.oscog-eem.1993 Fix an unused value warning in Balloon/Bezier I think that the intention was to use 2nd derivative to decide direction when 1st derivative is null. Fix a typo in tempolines comment. Fix primitiveBeCursor - generated code could dereference a null pointer offsetObj due to misplaced block end. Also a null pointer cursorObj could be dereferenced if 2 arguments or more were passed to the primitive. =============== Diff against VMMaker.oscog-eem.1993 =============== Item was changed: ----- Method: BalloonEnginePlugin>>stepToFirstWideBezierIn:at: (in category 'beziers-wide') ----- stepToFirstWideBezierIn: bezier at: yValue "Initialize the bezier at yValue" | lineWidth startY nLines yEntry yExit lineOffset endX xDir | <inline: false> "Get some values" lineWidth := self wideBezierExtentOf: bezier. lineOffset := self offsetFromWidth: lineWidth. "Compute the incremental values of the bezier" endX := self bezierEndXOf: bezier. startY := self edgeYValueOf: bezier. self stepToFirstBezierIn: bezier at: startY. nLines := (self edgeNumLinesOf: bezier). "Copy the incremental update data" 0 to: 5 do:[:i| (self wideBezierUpdateDataOf: bezier) at: i put: ((self bezierUpdateDataOf: bezier) at: i). ]. "Compute primary x direction of curve (e.g., 1: left to right; -1: right to left)." xDir := ((self bezierUpdateDataOf: bezier) at: GBUpdateDX). + xDir = 0 ifTrue:[xDir := ((self bezierUpdateDataOf: bezier) at: GBUpdateDDX)]. - xDir = 0 ifTrue:[((self bezierUpdateDataOf: bezier) at: GBUpdateDDX)]. xDir >= 0 ifTrue:[xDir := 1] ifFalse:[xDir := -1]. "Adjust the curve to start/end at the right position" xDir < 0 ifTrue:[self adjustWideBezierLeft: bezier width: lineWidth offset: lineOffset endX: endX] ifFalse:[self adjustWideBezierRight: bezier width: lineWidth offset: lineOffset endX: endX]. "Adjust the last value for horizontal lines" nLines = 0 ifTrue:[(self bezierUpdateDataOf: bezier) at: GBUpdateX put: (self bezierFinalXOf: bezier) * 256]. "Adjust the number of lines to include the lineWidth" self edgeNumLinesOf: bezier put: nLines + lineWidth. "Compute the points where we have to turn on/off the fills" yEntry := 0. "turned on at lineOffset" yExit := 0 - nLines - lineOffset. "turned off at zero" self wideBezierEntryOf: bezier put: yEntry. self wideBezierExitOf: bezier put: yExit. "Turn the fills on/off as necessary" (yEntry >= lineOffset and:[yExit < 0]) ifTrue:[self edgeFillsValidate: bezier] ifFalse:[self edgeFillsInvalidate: bezier]. self computeFinalWideBezierValues: bezier width: lineWidth. "And step to the first scan line" startY = yValue ifFalse:[ "Note: Must single step here so that entry/exit works" startY to: yValue-1 do:[:i| self stepToNextWideBezierIn: bezier at: i]. "Adjust number of lines remaining" self edgeNumLinesOf: bezier put: (self edgeNumLinesOf: bezier) - (yValue - startY). ].! Item was changed: ----- Method: Cogit class>>trampolines (in category 'documentation') ----- trampolines "Trampolines are called from machine-code for a number of tasks (e.g. doing an unlinked send, creating a closure, doing a non-local return, etc, etc. Some trampolines save their return pc on the Smalltalk stack, and some pop it into instructionPointer, depending on whether the trampoline always returns or whether control might transfer elsewhere, or depending on whether the callee run-time routine expects to see a normal Smalltalk stack. This documents which trampolines do what and why. ceSend0Args .. ceSendNArgs, ceSuperSend0Args..ceSuperSendNArgs return pc left on stack because it is the return pc of the send and must be there ceMethodAbort, cePICAbort return pc left on stack because it is used to locate the failing send target method/PIC of a linked send ceClosureCopyTrampoline return pc left on stack because ceClosureCopy:... always returns directly cePushActiveContextTrampoline return pc left on stack because cePushActiveContext always returns directly ceNonLocalReturnTrampoline pops return pc into instructionPointer ceBaseFrameReturnTrampoline this is returned-to and never called; i.e. it is the return pc of a base machine-code frame ceCreateNewArrayTrampoline return pc left on stack because ceNewArraySlotSize always returns directly ceSendMustBeBooleanTrampoline return pc left on stack because it is the return pc of the send and must be there ceCheckForInterruptsTrampoline pops return pc into instructionPointer ceCPICMissTrampoline return pc left on stack because it is used to locate the failing send target PIC of a linked send ceSendFromInLineCacheMissTrampoline + not used, but its address is used as a key in the simulator. An open PIC calls ceSendFromInLineCacheMiss + after it has switched from the Smalltalk to the C stack (an inline trampoline) hence there is no return pc - not used, but its addres is used as a key in the simulator. An open PIC calls ceSendFromInLineCacheMiss - after it has switched from the Smalltalk to teh C stack (an inline trampoline) hence there is no return pc left on the Smalltalk stack (except that of the send that invoked the open PIC). ceStoreCheckTrampoline return pc left on stack because ceStoreCheck always returns directly ceFetchContextInstVarTrampoline return pc left on stack because ceContextInstVar always returns directly. ceContextInstVar manages popping the pc into instructionPointer if necessary. ceStoreContextInstVarTrampoline return pc left on stack because ceContextInstVarvalue always returns directly. ceContextInstVarvalue manages popping the pc into instructionPointer if necessary. cePositive32BitIntegerTrampoline return pc left on stack because cePositive32BitInteger always returns directly ceReturnToInterpreterTrampoline this is returned-to and never called; i.e. it is the return pc of a machine-code frame with an interpreted callee ceResendCannotReturnTrampoline this is returned-to and never called; it is the pc for a machine-code frame which has been returned from ceEnterCogCodePopReceiverReg this is an enilopmart and not called from machine code cePrimReturnEnterCogCode this is an enilopmart and not called from machine code ceTraceLinkedSendTrampoline return pc left on stack because ceTraceLinkedSend always returns directly ceTraceBlockActivationTrampoline return pc left on stack because ceTraceBlockActivation always returns directly ceTraceStoreTrampoline return pc left on stack because ceTraceStore always returns directly"! Item was changed: ----- Method: InterpreterPrimitives>>primitiveBeCursor (in category 'I/O primitives') ----- primitiveBeCursor "Set the cursor to the given shape. The Mac only supports 16x16 pixel cursors. Cursor offsets are handled by Smalltalk." | cursorObj maskBitsIndex maskObj bitsObj extentX extentY depth offsetObj offsetX offsetY cursorBitsIndex ourCursor | argumentCount = 0 ifTrue: [ cursorObj := self stackTop. maskBitsIndex := nil]. argumentCount = 1 ifTrue: [ cursorObj := self stackValue: 1. maskObj := self stackTop]. self success: argumentCount < 2. - self success: ((objectMemory isPointers: cursorObj) and: [(objectMemory lengthOf: cursorObj) >= 5]). self successful ifTrue: [ + self success: ((objectMemory isPointers: cursorObj) and: [(objectMemory lengthOf: cursorObj) >= 5])]. + self successful ifTrue: [ bitsObj := objectMemory fetchPointer: 0 ofObject: cursorObj. extentX := self fetchInteger: 1 ofObject: cursorObj. extentY := self fetchInteger: 2 ofObject: cursorObj. depth := self fetchInteger: 3 ofObject: cursorObj. + offsetObj := objectMemory fetchPointer: 4 ofObject: cursorObj. + self success: ((objectMemory isPointers: offsetObj) and: [(objectMemory lengthOf: offsetObj) >= 2])]. - offsetObj := objectMemory fetchPointer: 4 ofObject: cursorObj]. - self success: ((objectMemory isPointers: offsetObj) and: [(objectMemory lengthOf: offsetObj) >= 2]). self successful ifTrue: [ offsetX := self fetchInteger: 0 ofObject: offsetObj. offsetY := self fetchInteger: 1 ofObject: offsetObj. (argumentCount = 0 and: [depth = 32]) ifTrue: [ "Support arbitrary-sized 32 bit ARGB forms --bf 3/1/2007 23:51" self success: ((extentX > 0) and: [extentY > 0]). self success: ((offsetX >= (extentX * -1)) and: [offsetX <= 0]). self success: ((offsetY >= (extentY * -1)) and: [offsetY <= 0]). self success: ((objectMemory isWords: bitsObj) and: [(objectMemory lengthOf: bitsObj) = (extentX * extentY)]). cursorBitsIndex := bitsObj + objectMemory baseHeaderSize. self cCode: '' inSmalltalk: [ourCursor := Cursor extent: extentX @ extentY depth: 32 fromArray: ((1 to: extentX * extentY) collect: [:i | objectMemory fetchLong32: i-1 ofObject: bitsObj]) offset: offsetX @ offsetY]] ifFalse: [ self success: ((extentX = 16) and: [extentY = 16 and: [depth = 1]]). self success: ((offsetX >= -16) and: [offsetX <= 0]). self success: ((offsetY >= -16) and: [offsetY <= 0]). self success: ((objectMemory isWords: bitsObj) and: [(objectMemory lengthOf: bitsObj) = 16]). cursorBitsIndex := bitsObj + objectMemory baseHeaderSize. self cCode: '' inSmalltalk: [ourCursor := Cursor extent: extentX @ extentY fromArray: ((1 to: 16) collect: [:i | ((objectMemory fetchLong32: i-1 ofObject: bitsObj) >> (objectMemory wordSize*8 - 16)) bitAnd: 16rFFFF]) offset: offsetX @ offsetY]]]. argumentCount = 1 ifTrue: [ self success: ((objectMemory isPointers: maskObj) and: [(objectMemory lengthOf: maskObj) >= 5]). self successful ifTrue: [ bitsObj := objectMemory fetchPointer: 0 ofObject: maskObj. extentX := self fetchInteger: 1 ofObject: maskObj. extentY := self fetchInteger: 2 ofObject: maskObj. depth := self fetchInteger: 3 ofObject: maskObj]. self successful ifTrue: [ self success: ((extentX = 16) and: [extentY = 16 and: [depth = 1]]). self success: ((objectMemory isWords: bitsObj) and: [(objectMemory lengthOf: bitsObj) = 16]). maskBitsIndex := bitsObj + objectMemory baseHeaderSize]]. self successful ifTrue: [ argumentCount = 0 ifTrue: [ depth = 32 ifTrue: [(self cCode: 'ioSetCursorARGB(cursorBitsIndex, extentX, extentY, offsetX, offsetY)' inSmalltalk: [ourCursor show. Cursor currentCursor == ourCursor]) ifFalse: [^self success: false]] ifFalse: [self cCode: 'ioSetCursor(cursorBitsIndex, offsetX, offsetY)' inSmalltalk: [ourCursor show]]] ifFalse: [self cCode: 'ioSetCursorWithMask(cursorBitsIndex, maskBitsIndex, offsetX, offsetY)' inSmalltalk: [cursorBitsIndex == maskBitsIndex. "placate compiler" ourCursor show]]. self pop: argumentCount]!

1 0

VM Maker: Cog-eem.330.mcz
by commits＠source.squeak.org 18 Nov '16

18 Nov '16

Eliot Miranda uploaded a new version of Cog to project VM Maker: http://source.squeak.org/VMMaker/Cog-eem.330.mcz ==================== Summary ==================== Name: Cog-eem.330 Author: eem Time: 17 November 2016, 3:48:02.648024 pm UUID: 8b567319-9510-4c15-9a7b-80ebd88ce0bf Ancestors: Cog-eem.329 The processor creation primitives should be 64-bit aware, including LLP64. =============== Diff against Cog-eem.329 =============== Item was changed: ----- Method: BochsPlugin>>primitiveNewCPU (in category 'primitives') ----- primitiveNewCPU | cpu | <var: #cpu type: #'void *'> self primitive: #primitiveNewCPU parameters: #(). cpu := self newCPU. cpu = 0 ifTrue: [^interpreterProxy primitiveFail]. interpreterProxy pop: 1 thenPush: (interpreterProxy positiveMachineIntegerFor: (self cCoerceSimple: cpu + to: 'usqIntptr_t'))! - to: 'unsigned long'))! Item was changed: ----- Method: GdbARMPlugin>>primitiveNewCPU (in category 'primitives') ----- primitiveNewCPU | cpu | <var: #cpu type: 'void *'> self primitive: #primitiveNewCPU parameters: #(). cpu := self cCode: 'newCPU()' inSmalltalk: [0]. cpu = 0 ifTrue: [^interpreterProxy primitiveFail]. interpreterProxy pop: 1 + thenPush: (interpreterProxy positiveMachineIntegerFor: - thenPush: (interpreterProxy positive32BitIntegerFor: (self cCoerceSimple: cpu + to: 'usqIntptr_t'))! - to: 'unsigned long'))!

1 0

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

17 Nov '16

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

1 0

[OpenSmalltalk/opensmalltalk-vm] 58bd6b: Fix the protoypes of Win32 stubs: don't pass a poi...
by GitHub 17 Nov '16

17 Nov '16

Branch: refs/heads/Cog Home: https://github.com/OpenSmalltalk/opensmalltalk-vm Commit: 58bd6b5b35c6c2ec45d44ebbc0263a63e7884347 https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/58bd6b5b35c6c2ec45… Author: nicolas-cellier-aka-nice <nicolas.cellier.aka.nice(a)gmail.com> Date: 2016-11-17 (Thu, 17 Nov 2016) Changed paths: M platforms/win32/vm/sqWin32Stubs.c Log Message: ----------- Fix the protoypes of Win32 stubs: don't pass a pointer via an int, just pass the pointer. Commit: 17b35b598f7c02654f784640346d77b94c9505b8 https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/17b35b598f7c02654f… Author: nicolas-cellier-aka-nice <nicolas.cellier.aka.nice(a)gmail.com> Date: 2016-11-17 (Thu, 17 Nov 2016) Changed paths: M platforms/win32/vm/sqWin32Heartbeat.c Log Message: ----------- Fix MSVC branch of heartbeat - time was 1000x too fast. Commit: c42b364d4b4a09884e5f9c875ad659673d2424c7 https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/c42b364d4b4a09884e… Author: nicolas-cellier-aka-nice <nicolas.cellier.aka.nice(a)gmail.com> Date: 2016-11-17 (Thu, 17 Nov 2016) Changed paths: M .appveyor.yml M build.win64x64/common/Makefile.tools Log Message: ----------- Use clang for Win64 build to avoid FFI crash Commit: 87cf968fcd6f297af4a4f1bc697ab2a0981bfdc8 https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/87cf968fcd6f297af4… Author: Nicolas Cellier <nicolas.cellier.aka.nice(a)gmail.com> Date: 2016-11-17 (Thu, 17 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 pull request #99 from OpenSmalltalk/Use_clang_for_Win64 Use clang for win64 Compare: https://github.com/OpenSmalltalk/opensmalltalk-vm/compare/6cb6cae0cd81...87…

1 0

← Newer
1
...
4
5
6
7
8
9
10
...
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