Vm-dev November 2016

vm-dev@lists.squeakfoundation.org

34 participants
155 discussions

[OpenSmalltalk/opensmalltalk-vm] 8f92ba: try to build 64bit windows
by GitHub 16 Nov '16

16 Nov '16

Branch: refs/heads/tim/win64 Home: https://github.com/OpenSmalltalk/opensmalltalk-vm Commit: 8f92ba2f07559115b73dcbed8744091ebb00c227 https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/8f92ba2f07559115b7… Author: Tim Felgentreff <timfelgentreff(a)gmail.com> Date: 2016-11-16 (Wed, 16 Nov 2016) Changed paths: M .appveyor.yml M .travis_build.sh Log Message: ----------- try to build 64bit windows

1 0

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

15 Nov '16

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

1 0

[OpenSmalltalk/opensmalltalk-vm] ca08c9: try to build sista on windows, too
by GitHub 15 Nov '16

15 Nov '16

Branch: refs/heads/Cog Home: https://github.com/OpenSmalltalk/opensmalltalk-vm Commit: ca08c9bc68a35246c7c0f052bbf289a56d4c8283 https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/ca08c9bc68a35246c7… Author: Tim Felgentreff <timfelgentreff(a)gmail.com> Date: 2016-11-15 (Tue, 15 Nov 2016) Changed paths: M .appveyor.yml A build.win32x86/squeak.sista.spur/Croquet.def.in A build.win32x86/squeak.sista.spur/Croquet.exe.manifest A build.win32x86/squeak.sista.spur/Croquet.ico A build.win32x86/squeak.sista.spur/Croquet.rc A build.win32x86/squeak.sista.spur/GreenCogSqueak.ico A build.win32x86/squeak.sista.spur/Makefile R build.win32x86/squeak.sista.spur/NotYetImplemented A build.win32x86/squeak.sista.spur/Squeak.def.in A build.win32x86/squeak.sista.spur/Squeak.exe.manifest A build.win32x86/squeak.sista.spur/Squeak.rc A build.win32x86/squeak.sista.spur/mvm A build.win32x86/squeak.sista.spur/plugins.ext A build.win32x86/squeak.sista.spur/plugins.int A build.win32x86/squeak.sista.spur/squeak.ico Log Message: ----------- try to build sista on windows, too Commit: b08f0593a75b06631b681a3cc4650344882c05fb https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/b08f0593a75b06631b… Author: Tim Felgentreff <timfelgentreff(a)gmail.com> Date: 2016-11-15 (Tue, 15 Nov 2016) Changed paths: M .appveyor.yml A build.win32x86/squeak.sista.spur/Croquet.def.in A build.win32x86/squeak.sista.spur/Croquet.exe.manifest A build.win32x86/squeak.sista.spur/Croquet.ico A build.win32x86/squeak.sista.spur/Croquet.rc A build.win32x86/squeak.sista.spur/GreenCogSqueak.ico A build.win32x86/squeak.sista.spur/Makefile R build.win32x86/squeak.sista.spur/NotYetImplemented A build.win32x86/squeak.sista.spur/Squeak.def.in A build.win32x86/squeak.sista.spur/Squeak.exe.manifest A build.win32x86/squeak.sista.spur/Squeak.rc A build.win32x86/squeak.sista.spur/mvm A build.win32x86/squeak.sista.spur/plugins.ext A build.win32x86/squeak.sista.spur/plugins.int A build.win32x86/squeak.sista.spur/squeak.ico Log Message: ----------- Merge pull request #97 from OpenSmalltalk/tim/winsista Build sista on windows, too Compare: https://github.com/OpenSmalltalk/opensmalltalk-vm/compare/b07b562e165f...b0…

1 0

[OpenSmalltalk/opensmalltalk-vm] ca08c9: try to build sista on windows, too
by GitHub 15 Nov '16

15 Nov '16

Branch: refs/heads/tim/winsista Home: https://github.com/OpenSmalltalk/opensmalltalk-vm Commit: ca08c9bc68a35246c7c0f052bbf289a56d4c8283 https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/ca08c9bc68a35246c7… Author: Tim Felgentreff <timfelgentreff(a)gmail.com> Date: 2016-11-15 (Tue, 15 Nov 2016) Changed paths: M .appveyor.yml A build.win32x86/squeak.sista.spur/Croquet.def.in A build.win32x86/squeak.sista.spur/Croquet.exe.manifest A build.win32x86/squeak.sista.spur/Croquet.ico A build.win32x86/squeak.sista.spur/Croquet.rc A build.win32x86/squeak.sista.spur/GreenCogSqueak.ico A build.win32x86/squeak.sista.spur/Makefile R build.win32x86/squeak.sista.spur/NotYetImplemented A build.win32x86/squeak.sista.spur/Squeak.def.in A build.win32x86/squeak.sista.spur/Squeak.exe.manifest A build.win32x86/squeak.sista.spur/Squeak.rc A build.win32x86/squeak.sista.spur/mvm A build.win32x86/squeak.sista.spur/plugins.ext A build.win32x86/squeak.sista.spur/plugins.int A build.win32x86/squeak.sista.spur/squeak.ico Log Message: ----------- try to build sista on windows, too

1 0

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

15 Nov '16

Nicolas Cellier uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-nice.1988.mcz ==================== Summary ==================== Name: VMMaker.oscog-nice.1988 Author: nice Time: 13 November 2016, 10:26:14.021969 am UUID: 01ed55f2-205d-441f-b4f6-4a8607b3327d Ancestors: VMMaker.oscog-nice.1987 Fix inlining problem of shortPrintContext: - a side effect was eliminated on stack flavour. Fix prototype of unlockSurfaceFn after recent platforms source file revision. Also, the surfceID returned by primitiveCreateManualSurface is an int, so fits in signed32BitIntegerFor:. Avoid passing a sqInt to Serial and Midi external functions when they expect a pointer. Explicit a few conversions 64->32 bits to avoid compiler warnings in LargeIntegers. =============== Diff against VMMaker.oscog-nice.1987 =============== Item was changed: ----- Method: BitBltSimulation>>unlockSurfaces (in category 'surface support') ----- unlockSurfaces "Unlock the bits of any OS surfaces." "See the comment in lockSurfaces. Similar rules apply. That is, the area provided in ioUnlockSurface can be used to determine the dirty region after drawing. If a source is unlocked, then the area will be (0,0,0,0) to indicate that no portion is dirty." | sourceHandle destHandle destLocked fn | + <var: #fn declareC:'int (*fn)(int, int, int, int, int)'> - <var: #fn declareC:'sqInt (*fn)(sqInt, sqInt, sqInt, sqInt, sqInt)'> hasSurfaceLock ifTrue:[ unlockSurfaceFn = 0 ifTrue:[self loadSurfacePlugin ifFalse:[^nil]]. + fn := self cCoerce: unlockSurfaceFn to: 'int (*)(int, int, int, int, int)'. - fn := self cCoerce: unlockSurfaceFn to: 'sqInt (*)(sqInt, sqInt, sqInt, sqInt, sqInt)'. destLocked := false. destHandle := interpreterProxy fetchPointer: FormBitsIndex ofObject: destForm. (interpreterProxy isIntegerObject: destHandle) ifTrue:[ destHandle := interpreterProxy integerValueOf: destHandle. "The destBits are always assumed to be dirty" self cCode:'fn(destHandle, affectedL, affectedT, affectedR-affectedL, affectedB-affectedT)'. destBits := destPitch := 0. destLocked := true. ]. noSource ifFalse:[ sourceHandle := interpreterProxy fetchPointer: FormBitsIndex ofObject: sourceForm. (interpreterProxy isIntegerObject: sourceHandle) ifTrue:[ sourceHandle := interpreterProxy integerValueOf: sourceHandle. "Only unlock sourceHandle if different from destHandle" (destLocked and:[sourceHandle = destHandle]) ifFalse:[self cCode: 'fn(sourceHandle, 0, 0, 0, 0)']. sourceBits := sourcePitch := 0. ]. ]. hasSurfaceLock := false. self cCode: [] inSmalltalk: [self touch: fn. interpreterProxy displayObject = destForm ifTrue: [interpreterProxy getDeferDisplayUpdates "for some reason this is true..." ifTrue: [interpreterProxy fullDisplayUpdate] ifFalse: [interpreterProxy fullDisplayUpdate]]]. ].! Item was changed: ----- Method: LargeIntegersPlugin>>cDigitDiv:len:rem:len:quo:len: (in category 'C core') ----- cDigitDiv: pDiv len: divLen rem: pRem len: remLen quo: pQuo len: quoLen | dl ql dh dnh j t hi lo r3 l a b cond q r1r2 mul | <var: #pDiv type: #'unsigned int *'> <var: #pRem type: #'unsigned int *'> <var: #pQuo type: #'unsigned int *'> <var: #dh type: #'unsigned int'> <var: #dnh type: #'unsigned int'> <var: #r3 type: #'unsigned int'> <var: #q type: #'unsigned long long'> <var: #a type: #'unsigned long long'> <var: #b type: #'unsigned long long'> <var: #t type: #'unsigned long long'> <var: #mul type: #'unsigned long long'> <var: #hi type: #'unsigned long long'> <var: #lo type: #'unsigned long long'> <var: #r1r2 type: #'unsigned long long'> dl := divLen - 1. "Last actual byte of data (ST ix)" ql := quoLen. dh := self cDigitOf: pDiv at: dl - 1. dl = 1 ifTrue: [dnh := 0] ifFalse: [dnh := self cDigitOf: pDiv at: dl - 2]. 1 to: ql do: [:k | "maintain quo*arg+rem=self" "Estimate rem/div by dividing the leading two unint32 of rem by dh." "The estimate is q = qhi*16r100000000+qlo, where qhi and qlo are uint32." j := remLen + 1 - k. "r1 := rem digitAt: j." (self cDigitOf: pRem at: j - 1) = dh ifTrue: [q := 16rFFFFFFFF] ifFalse: ["Compute q = (r1,r2)//dh, t = (r1,r2)\\dh. Note that r1,r2 are uint64, not uint32." "r2 := (rem digitAt: j - 2)." r1r2 := self cDigitOf: pRem at: j - 1. r1r2 := (r1r2 << 32) + (self cDigitOf: pRem at: j - 2). t := r1r2 \\ dh. q := r1r2 // dh. "Next compute (hi,lo) := q*dnh" mul := q * dnh. hi := mul >> 32. lo := mul bitAnd: 16rFFFFFFFF. "Correct overestimate of q. Max of 2 iterations through loop -- see Knuth vol. 2" j < 3 ifTrue: [r3 := 0] ifFalse: [r3 := self cDigitOf: pRem at: j - 3]. [(t < hi or: [t = hi and: [r3 < lo]]) ifTrue: ["i.e. (t,r3) < (hi,lo)" q := q - 1. hi = 0 "since hi is unsigned we must have this guard" ifTrue: [cond := false] ifFalse: [lo < dnh ifTrue: [hi := hi - 1. lo := lo + 16r100000000 - dnh] ifFalse: [lo := lo - dnh]. cond := hi >= dh]] ifFalse: [cond := false]. cond] whileTrue: [hi := hi - dh]]. "Subtract q*div from rem" l := j - dl. a := 0. 1 to: divLen do: [:i | hi := (self cDigitOf: pDiv at: i - 1) * (q >> 32). lo := (self cDigitOf: pDiv at: i - 1) * (q bitAnd: 16rFFFFFFFF). b := (self cDigitOf: pRem at: l - 1) - a - (lo bitAnd: 16rFFFFFFFF). self cDigitOf: pRem at: l - 1 put: (b bitAnd: 16rFFFFFFFF). "simulate arithmetic shift (preserving sign of b)" b := b >> 32 bitOr: (0 - (b >> 63) bitAnd: 16rFFFFFFFF00000000). a := hi + (lo >> 32) - b. l := l + 1]. a > 0 ifTrue: ["Add div back into rem, decrease q by 1" q := q - 1. l := j - dl. a := 0. 1 to: divLen do: [:i | a := (a >> 32) + (self cDigitOf: pRem at: l - 1) + (self cDigitOf: pDiv at: i - 1). self cDigitOf: pRem at: l - 1 put: (a bitAnd: 16rFFFFFFFF). l := l + 1]]. + self cDigitOf: pQuo at: quoLen - k put: (self cCoerceSimple: q to: #'unsigned int')]. - self cDigitOf: pQuo at: quoLen - k put: q]. ^0! Item was changed: ----- Method: LargeIntegersPlugin>>normalizePositive: (in category 'oop functions') ----- normalizePositive: aLargePositiveInteger "Check for leading zeroes and return shortened copy if so." "First establish len = significant length." | val val2 sLen digitLen byteLen oldByteLen maxVal | <var: #val type: #usqInt> <var: #val2 type: #usqInt> <var: #maxVal type: #usqInt> digitLen := self digitSizeOfLargeInt: aLargePositiveInteger. [digitLen ~= 0 and: [(self unsafeDigitOfLargeInt: aLargePositiveInteger at: digitLen) = 0]] whileTrue: [digitLen := digitLen - 1]. digitLen = 0 ifTrue: [^ 0 asOop: SmallInteger]. "Now check if in SmallInteger range" val := self unsafeDigitOfLargeInt: aLargePositiveInteger at: digitLen. sLen := interpreterProxy maxSmallInteger > 16r3FFFFFFF ifTrue: [2] ifFalse: [1]. "SmallInteger maxVal digitLength" digitLen <= sLen ifTrue: [maxVal := interpreterProxy maxSmallInteger. val2 := val. + digitLen > 1 ifTrue: + ["Note: asUnsignedLongLong is not necessary because this branch is for 64 bits only. + but we want to avoid a C Compiler warning on 32 bits" + val2 := val2 asUnsignedLongLong << 32 + (self unsafeDigitOfLargeInt: aLargePositiveInteger at: 1)]. - digitLen > 1 ifTrue: [val2 := val2 << 32 + (self unsafeDigitOfLargeInt: aLargePositiveInteger at: 1)]. val2 <= maxVal ifTrue: [^val2 asOop: SmallInteger]]. "Return self, or a shortened copy" byteLen := digitLen * 4. val <= 16rFFFF ifTrue: [byteLen := byteLen - 2] ifFalse: [val := val >> 16]. val <= 16rFF ifTrue: [byteLen := byteLen - 1]. oldByteLen := self byteSizeOfLargeInt: aLargePositiveInteger. byteLen < oldByteLen ifTrue: [^ self largeInt: aLargePositiveInteger growTo: byteLen] ifFalse: [^ aLargePositiveInteger]! Item was changed: ----- Method: MIDIPlugin>>primitiveMIDIRead:into: (in category 'primitives') ----- primitiveMIDIRead: portNum into: array | arrayLength bytesRead | self primitive: 'primitiveMIDIRead' parameters: #(SmallInteger ByteArray). arrayLength := interpreterProxy byteSizeOf: array cPtrAsOop. bytesRead := self sqMIDIPort: portNum Read: arrayLength + Into: array. - Into: array asInteger. ^bytesRead asSmallIntegerObj! Item was changed: ----- Method: MIDIPlugin>>primitiveMIDIWrite:from:at: (in category 'primitives') ----- primitiveMIDIWrite: portNum from: array at: time | arrayLength bytesWritten | self primitive: 'primitiveMIDIWrite' parameters: #(SmallInteger ByteArray SmallInteger). arrayLength := interpreterProxy byteSizeOf: array cPtrAsOop. bytesWritten := self sqMIDIPort: portNum Write: arrayLength + From: array - From: array asInteger At: time. ^bytesWritten asSmallIntegerObj! Item was changed: ----- Method: SerialPlugin>>primitiveSerialPortReadByName:into:startingAt:count: (in category 'primitives') ----- primitiveSerialPortReadByName: portName into: array startingAt: startIndex count: count <option: #PharoVM> <var: #port type: 'char *'> | port portNameSize bytesRead arrayPtr | self primitive: 'primitiveSerialPortReadByName' parameters: #(String ByteArray SmallInteger SmallInteger ). interpreterProxy success: (startIndex >= 1 and: [startIndex + count - 1 <= (interpreterProxy byteSizeOf: array cPtrAsOop)]). "adjust for zero-origin indexing" portNameSize := interpreterProxy slotSizeOf: (portName asOop: String). port := self cCode: 'calloc(portNameSize+1, sizeof(char))'. self cCode: 'memcpy(port, portName, portNameSize)'. + arrayPtr := array + startIndex - 1. - arrayPtr := array asInteger + startIndex - 1. bytesRead := self cCode: 'serialPortReadIntoByName( port, count, arrayPtr)'. self free: port. ^ bytesRead asSmallIntegerObj! Item was changed: ----- Method: SerialPlugin>>primitiveSerialPortWrite:from:startingAt:count: (in category 'primitives') ----- primitiveSerialPortWrite: portNum from: array startingAt: startIndex count: count | bytesWritten arrayPtr | self primitive: 'primitiveSerialPortWrite' parameters: #(SmallInteger ByteArray SmallInteger SmallInteger ). interpreterProxy success: (startIndex >= 1 and: [startIndex + count - 1 <= (interpreterProxy byteSizeOf: array cPtrAsOop)]). interpreterProxy failed + ifFalse: [arrayPtr := array + startIndex - 1. - ifFalse: [arrayPtr := array asInteger + startIndex - 1. bytesWritten := self serialPort: portNum Write: count From: arrayPtr]. ^ bytesWritten asSmallIntegerObj! Item was changed: ----- Method: SerialPlugin>>primitiveSerialPortWriteByName:from:startingAt:count: (in category 'primitives') ----- primitiveSerialPortWriteByName: portName from: array startingAt: startIndex count: count <option: #PharoVM> <var: #port type: 'char *'> | bytesWritten arrayPtr portNameSize port | self primitive: 'primitiveSerialPortWriteByName' parameters: #(String ByteArray SmallInteger SmallInteger ). portNameSize := interpreterProxy slotSizeOf: (portName asOop: String). port := self cCode: 'calloc(portNameSize+1, sizeof(char))'. self cCode: 'memcpy(port, portName, portNameSize)'. interpreterProxy success: (startIndex >= 1 and: [startIndex + count - 1 <= (interpreterProxy byteSizeOf: array cPtrAsOop)]). interpreterProxy failed + ifFalse: [arrayPtr := array + startIndex - 1. - ifFalse: [arrayPtr := array asInteger + startIndex - 1. bytesWritten := self cCode: 'serialPortWriteFromByName(port, count, arrayPtr)' ]. self free: port. ^ bytesWritten asSmallIntegerObj! Item was changed: ----- Method: Spur32BitMemoryManager>>integerValueOf: (in category 'immediates') ----- integerValueOf: oop "Translator produces 'oop >> 1'" + ^(oop >> 31) = 1 "tests top bit" - ^(oop bitShift: -31) = 1 "tests top bit" ifTrue: "negative" + [((oop >> 1) bitAnd: 16r3FFFFFFF) - 16r3FFFFFFF - 1 "Faster than -16r40000000 (a LgInt)"] - [((oop bitShift: -1) bitAnd: 16r3FFFFFFF) - 16r3FFFFFFF - 1 "Faster than -16r40000000 (a LgInt)"] ifFalse: "positive" + [oop >> 1]! - [oop bitShift: -1]! Item was changed: ----- Method: Spur64BitMemoryManager>>integerValueOf: (in category 'immediates') ----- integerValueOf: oop "Translator produces 'oop >> 3'" + ^(oop >> 63) = 1 "tests top bit" - ^(oop bitShift: -63) = 1 "tests top bit" ifTrue: "negative" + [((oop >> self numTagBits) bitAnd: 16r1FFFFFFFFFFFFFFF) - 16r1FFFFFFFFFFFFFFF - 1 "Faster than -16r4000000000000000 (a LgInt)"] - [((oop bitShift: self numTagBits negated) bitAnd: 16r1FFFFFFFFFFFFFFF) - 16r1FFFFFFFFFFFFFFF - 1 "Faster than -16r4000000000000000 (a LgInt)"] ifFalse: "positive" + [oop >> self numTagBits]! - [oop bitShift: self numTagBits negated]! Item was changed: ----- Method: StackInterpreter>>shortPrintContext: (in category 'debug printing') ----- shortPrintContext: aContext | theFP | <inline: false> <var: #theFP type: #'char *'> (objectMemory isContext: aContext) ifFalse: [self printHex: aContext; print: ' is not a context'; cr. ^nil]. self printHex: aContext. (self isMarriedOrWidowedContext: aContext) ifTrue: [(self checkIsStillMarriedContext: aContext currentFP: framePointer) ifTrue: + [theFP := self frameOfMarriedContext: aContext. + (self isMachineCodeFrame: theFP) - [(self isMachineCodeFrame: (theFP := self frameOfMarriedContext: aContext)) ifTrue: [self print: ' M ('] ifFalse: [self print: ' I (']. + self printHex: theFP asUnsignedIntegerPtr; print: ') '] - self printHex: theFP asUnsignedInteger; print: ') '] ifFalse: [self print: ' w ']] ifFalse: [self print: ' s ']. (self findHomeForContext: aContext) ifNil: [self print: ' BOGUS CONTEXT (can''t determine home)'] ifNotNil: [:home| self printActivationNameFor: (objectMemory fetchPointer: MethodIndex ofObject: (home ifNil: [aContext])) receiver: (home ifNil: [objectMemory nilObject] ifNotNil: [objectMemory fetchPointer: ReceiverIndex ofObject: home]) isBlock: home ~= aContext firstTemporary: (objectMemory fetchPointer: 0 + CtxtTempFrameStart ofObject: home)]. self cr! Item was changed: ----- Method: ThreadedFFIPlugin>>primitiveCreateManualSurface (in category 'primitives - surfaces') ----- primitiveCreateManualSurface "arguments: name(type, stack offset) width(Integer, 4) height(Integer, 3) rowPitch(Integer, 2) depth(Integer, 1) isMSB(Boolean, 0)" | width height rowPitch depth isMSB result | <export: true> interpreterProxy methodArgumentCount = 5 ifFalse: [^interpreterProxy primitiveFailFor: PrimErrBadNumArgs]. width := interpreterProxy stackIntegerValue: 4. height := interpreterProxy stackIntegerValue: 3. rowPitch := interpreterProxy stackIntegerValue: 2. depth := interpreterProxy stackIntegerValue: 1. isMSB := interpreterProxy stackObjectValue: 0. isMSB := interpreterProxy booleanValueOf: isMSB. interpreterProxy failed ifTrue: [^nil]. result := self cCode: 'createManualSurface(width, height, rowPitch, depth, isMSB)' inSmalltalk: [self create: width Man: height ual: rowPitch Surf: depth ace: isMSB]. result < 0 ifTrue: [^interpreterProxy primitiveFail]. + result := interpreterProxy signed32BitIntegerFor: result. - result := interpreterProxy signedMachineIntegerFor: result. ^interpreterProxy pop: 6 thenPush: result !

2 3

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

15 Nov '16

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.1992.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.1992 Author: eem Time: 14 November 2016, 3:20:23.186309 pm UUID: 6feb3008-c996-4d53-b572-55c31a5b58dc Ancestors: VMMaker.oscog-nice.1991 Fix integerValueOf: & integerObjectOf: in plugins for 64-bits. Since the 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. Simulator: Revert changes to SpurNBitMemoryManager>>integerValueOf: which use bitShift: for simulation. Fix coercions for usqIntptr_t (*)(void). =============== Diff against VMMaker.oscog-nice.1991 =============== Item was changed: ----- Method: CogClass>>cCoerceSimple:to: (in category 'translation support') ----- cCoerceSimple: value to: cTypeString <doNotGenerate> "Type coercion for translation and simulation. For simulation answer a suitable surrogate for the struct types" ^cTypeString caseOf: { [#'unsigned long'] -> [value]. [#'unsigned int'] -> [value]. [#sqInt] -> [value]. [#'sqIntptr_t'] -> [value]. [#'usqIntptr_t'] -> [value]. [#usqInt] -> [value]. [#sqLong] -> [value]. [#usqLong] -> [value]. [#'AbstractInstruction *'] -> [value]. [#'BytecodeFixup *'] -> [value]. [#'CogMethod *'] -> [value]. [#'char *'] -> [value]. [#'sqInt *'] -> [value]. [#'void *'] -> [value]. [#void] -> [value]. [#'void (*)()'] -> [value]. [#'void (*)(void)'] -> [value]. [#'unsigned long (*)(void)'] -> [value]. + [#'void (*)(unsigned long,unsigned long)'] -> [value]. + [#'usqIntptr_t (*)(void)'] -> [value] }! - [#'void (*)(unsigned long,unsigned long)'] -> [value] }! Item was changed: ----- Method: Spur32BitMemoryManager>>integerValueOf: (in category 'immediates') ----- integerValueOf: oop "Translator produces 'oop >> 1'" + ^(oop bitShift: -31) = 1 "tests top bit" - ^(oop >> 31) = 1 "tests top bit" ifTrue: "negative" + [((oop bitShift: -1) bitAnd: 16r3FFFFFFF) - 16r3FFFFFFF - 1 "Faster than -16r40000000 (a LgInt)"] - [((oop >> 1) bitAnd: 16r3FFFFFFF) - 16r3FFFFFFF - 1 "Faster than -16r40000000 (a LgInt)"] ifFalse: "positive" + [oop bitShift: -1]! - [oop >> 1]! Item was changed: ----- Method: Spur64BitMemoryManager>>integerValueOf: (in category 'immediates') ----- integerValueOf: oop "Translator produces 'oop >> 3'" + ^(oop bitShift: -63) = 1 "tests top bit" - ^(oop >> 63) = 1 "tests top bit" ifTrue: "negative" + [((oop bitShift: self numTagBits negated) bitAnd: 16r1FFFFFFFFFFFFFFF) - 16r1FFFFFFFFFFFFFFF - 1 "Faster than -16r4000000000000000 (a LgInt)"] - [((oop >> self numTagBits) bitAnd: 16r1FFFFFFFFFFFFFFF) - 16r1FFFFFFFFFFFFFFF - 1 "Faster than -16r4000000000000000 (a LgInt)"] ifFalse: "positive" + [oop bitShift: self numTagBits negated]! - [oop >> self numTagBits]! Item was changed: ----- Method: VMClass class>>writeVMHeaderTo:bytesPerWord: (in category 'translation') ----- writeVMHeaderTo: aStream bytesPerWord: bytesPerWord "Generate the contents of interp.h on aStream. Specific Interpreter subclasses override to add more stuff." aStream nextPutAll: '#define VM_PROXY_MAJOR '; print: self vmProxyMajorVersion; cr; nextPutAll: '#define VM_PROXY_MINOR '; print: self vmProxyMinorVersion; cr; cr; nextPutAll: '#define SQ_VI_BYTES_PER_WORD '; print: bytesPerWord; cr; cr. "The most basic constants must be defined here, not in e.g. the plugin sources, so allow those other sources to be shared between different builds (Spur vs SqueakV3, 32-bit vs 64-bit, etc)" VMBasicConstants mostBasicConstantNames asSet asArray sort do: [:constName| (VMBasicConstants classPool at: constName ifAbsent: []) ifNotNil: [:const| aStream nextPutAll: '#define '; nextPutAll: constName; space; print: const; cr]]. aStream cr. ((VMBasicConstants classPool associations select: [:a| a key beginsWith: 'PrimErr']) asSortedCollection: [:a1 :a2| a1 value <= a2 value]) do: [:a| aStream nextPutAll: '#define '; nextPutAll: a key; space; print: a value; cr]. aStream cr. aStream nextPutAll: '#define MinSmallInteger '; print: self objectMemoryClass minSmallInteger; cr; nextPutAll: '#define MaxSmallInteger '; print: self objectMemoryClass maxSmallInteger; cr; + nextPutAll: '#define NumSmallIntegerTagBits '; print: self objectMemoryClass numSmallIntegerTagBits; cr; cr.! Item was added: + ----- Method: VMPluginCodeGenerator>>generateIntegerObjectOf:on:indent: (in category 'C translation') ----- + generateIntegerObjectOf: msgNode on: aStream indent: level + "Generate the C code for this message onto the given stream." + | expr mustCastToUnsigned type typeIsUnsigned | + expr := msgNode args first. + aStream nextPutAll: '(('. + "Note that the default type of an integer constant in C is int. Hence we /must/ + cast expression to long if in the 64-bit world, since e.g. in 64-bits + (int)(16r1FFFFF << 3) = (int)16rFFFFFFF8 = -8 + whereas + (long)(16r1FFFFF << 3) = (long)16rFFFFFFF8 = 4294967288." + type := self typeFor: expr in: currentMethod. + typeIsUnsigned := type first = $u. + mustCastToUnsigned := typeIsUnsigned not + or: [(self sizeOfIntegralCType: type) < (self sizeOfIntegralCType: #usqInt)]. + mustCastToUnsigned ifTrue: + [aStream nextPutAll: '(usqInt)']. + self emitCExpression: expr on: aStream. + aStream nextPutAll: ' << NumSmallIntegerTagBits) | 1)'! Item was added: + ----- Method: VMPluginCodeGenerator>>generateIntegerValueOf:on:indent: (in category 'C translation') ----- + generateIntegerValueOf: msgNode on: aStream indent: level + "Generate the C code for this message onto the given stream." + + aStream nextPut: $(. + self emitCExpression: msgNode args first on: aStream. + aStream nextPutAll: ' >> NumSmallIntegerTagBits)'!

1 0

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

14 Nov '16

Nicolas Cellier uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-nice.1991.mcz ==================== Summary ==================== Name: VMMaker.oscog-nice.1991 Author: nice Time: 14 November 2016, 11:38:31.514998 pm UUID: 370028ef-d566-4f45-be6a-39fb21bde0a4 Ancestors: VMMaker.oscog-nice.1990 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 unecessary: 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. =============== Diff against VMMaker.oscog-nice.1990 =============== Item was changed: ----- Method: InterpreterPrimitives>>primitiveSlotAt (in category 'object access primitives') ----- primitiveSlotAt "Answer a slot in an object. This numbers all slots from 1, ignoring the distinction between named and indexed inst vars. In objects with both named and indexed inst vars, the named inst vars precede the indexed ones. In non-object indexed objects (objects that contain bits, not object references) this primitive answers the raw integral value at each slot. e.g. for Strings it answers the character code, not the Character object at each slot." | index rcvr fmt numSlots | index := self stackTop. rcvr := self stackValue: 1. (objectMemory isIntegerObject: index) ifFalse: [^self primitiveFailFor: PrimErrBadArgument]. (objectMemory isImmediate: rcvr) ifTrue: [^self primitiveFailFor: PrimErrBadReceiver]. fmt := objectMemory formatOf: rcvr. index := (objectMemory integerValueOf: index) - 1. fmt <= objectMemory lastPointerFormat ifTrue: [numSlots := objectMemory numSlotsOf: rcvr. (self asUnsigned: index) < numSlots ifTrue: [self pop: argumentCount + 1 thenPush: (objectMemory fetchPointer: index ofObject: rcvr). ^0]. ^self primitiveFailFor: PrimErrBadIndex]. fmt >= objectMemory firstByteFormat ifTrue: [fmt >= objectMemory firstCompiledMethodFormat ifTrue: [^self primitiveFailFor: PrimErrUnsupported]. numSlots := objectMemory numBytesOfBytes: rcvr. (self asUnsigned: index) < numSlots ifTrue: [self pop: argumentCount + 1 thenPushInteger: (objectMemory fetchByte: index ofObject: rcvr). ^0]. ^self primitiveFailFor: PrimErrBadIndex]. (objectMemory hasSpurMemoryManagerAPI and: [fmt >= objectMemory firstShortFormat]) ifTrue: [numSlots := objectMemory num16BitUnitsOf: rcvr. (self asUnsigned: index) < numSlots ifTrue: + [self pop: argumentCount + 1 thenPushInteger: (objectMemory fetchUnsignedShort16: index ofObject: rcvr). - [self pop: argumentCount + 1 thenPushInteger: (objectMemory fetchShort16: index ofObject: rcvr). ^0]. ^self primitiveFailFor: PrimErrBadIndex]. fmt = objectMemory sixtyFourBitIndexableFormat ifTrue: [numSlots := objectMemory num64BitUnitsOf: rcvr. (self asUnsigned: index) < numSlots ifTrue: [self pop: argumentCount + 1 thenPush: (self positive64BitIntegerFor: (objectMemory fetchLong64: index ofObject: rcvr)). ^0]. ^self primitiveFailFor: PrimErrBadIndex]. fmt >= objectMemory firstLongFormat ifTrue: [numSlots := objectMemory num32BitUnitsOf: rcvr. (self asUnsigned: index) < numSlots ifTrue: [self pop: argumentCount + 1 thenPush: (objectMemory bytesPerOop = 8 ifTrue: [objectMemory integerObjectOf: (objectMemory fetchLong32: index ofObject: rcvr)] ifFalse: [self positive32BitIntegerFor: (objectMemory fetchLong32: index ofObject: rcvr)]). ^0]. ^self primitiveFailFor: PrimErrBadIndex]. ^self primitiveFailFor: PrimErrBadReceiver! Item was added: + ----- Method: ObjectMemory>>fetchUnsignedShort16:ofObject: (in category 'object access') ----- + fetchUnsignedShort16: shortIndex ofObject: oop + ^self cCoerceSimple: (self shortAt: oop + self baseHeaderSize + (shortIndex << 1)) to: #'unsigned short'! Item was added: + ----- Method: SpurMemoryManager>>fetchUnsignedShort16:ofObject: (in category 'object access') ----- + fetchUnsignedShort16: shortIndex ofObject: objOop + ^self cCoerceSimple: (self shortAt: objOop + self baseHeaderSize + (shortIndex << 1)) to: #'unsigned short'! Item was changed: ----- Method: StackInterpreter>>commonVariable:at:cacheIndex: (in category 'indexing primitive support') ----- commonVariable: rcvr at: index cacheIndex: atIx "This code assumes the receiver has been identified at location atIx in the atCache." | stSize fmt fixedFields result | <inline: true> stSize := atCache at: atIx+AtCacheSize. ((self oop: index isGreaterThanOrEqualTo: 1) and: [self oop: index isLessThanOrEqualTo: stSize]) ifTrue: [fmt := atCache at: atIx+AtCacheFmt. fmt <= objectMemory weakArrayFormat ifTrue: [self assert: (objectMemory isContextNonImm: rcvr) not. fixedFields := atCache at: atIx+AtCacheFixedFields. ^objectMemory fetchPointer: index + fixedFields - 1 ofObject: rcvr]. fmt < objectMemory firstByteFormat ifTrue: "64, 32, & 16 bits" [objectMemory hasSpurMemoryManagerAPI ifTrue: [fmt >= objectMemory firstShortFormat ifTrue: [^objectMemory integerObjectOf: + (objectMemory fetchUnsignedShort16: index - 1 ofObject: rcvr)]. - (objectMemory fetchShort16: index - 1 ofObject: rcvr)]. fmt = objectMemory sixtyFourBitIndexableFormat ifTrue: [^self positive64BitIntegerFor: (objectMemory fetchLong64: index - 1 ofObject: rcvr)]]. result := objectMemory fetchLong32: index - 1 ofObject: rcvr. ^self positive32BitIntegerFor: result]. fmt >= objectMemory firstStringyFakeFormat "Note fmt >= firstStringyFormat is an artificial flag for strings" ifTrue: "String" ["Spur supports the String at:[put:] primitives on WideString and DoubleByteString" result := (objectMemory hasSpurMemoryManagerAPI and: [fmt < (objectMemory firstByteFormat + objectMemory firstStringyFakeFormat)]) ifTrue: [fmt < (objectMemory firstShortFormat + objectMemory firstStringyFakeFormat) ifTrue: [objectMemory fetchLong32: index - 1 ofObject: rcvr] + ifFalse: [objectMemory fetchUnsignedShort16: index - 1 ofObject: rcvr]] - ifFalse: [objectMemory fetchShort16: index - 1 ofObject: rcvr]] ifFalse: [objectMemory fetchByte: index - 1 ofObject: rcvr]. ^self characterForAscii: result] ifFalse: [(fmt < objectMemory firstCompiledMethodFormat "ByteArray" or: [index >= (self firstByteIndexOfMethod: rcvr) "CompiledMethod"]) ifTrue: [^objectMemory integerObjectOf: (objectMemory fetchByte: index - 1 ofObject: rcvr)]]]. ^self primitiveFailFor: ((objectMemory isIndexable: rcvr) ifFalse: [PrimErrBadReceiver] ifTrue: [PrimErrBadIndex])! Item was changed: ----- Method: StackInterpreter>>subscript:with:format: (in category 'indexing primitive support') ----- subscript: array with: index format: fmt "Note: This method assumes that the index is within bounds!!" <inline: true> fmt <= objectMemory lastPointerFormat ifTrue: [^objectMemory fetchPointer: index - 1 ofObject: array]. fmt >= objectMemory firstByteFormat ifTrue: [^objectMemory integerObjectOf: (objectMemory fetchByte: index - 1 ofObject: array)]. objectMemory hasSpurMemoryManagerAPI ifTrue: [fmt >= objectMemory firstShortFormat ifTrue: [^objectMemory integerObjectOf: + (objectMemory fetchUnsignedShort16: index - 1 ofObject: array)]. - (objectMemory fetchShort16: index - 1 ofObject: array)]. fmt = objectMemory sixtyFourBitIndexableFormat ifTrue: [^self positive64BitIntegerFor: (objectMemory fetchLong64: index - 1 ofObject: array)]]. "32bit-word type objects; for now assume no 64-bit indexable objects" ^self positive32BitIntegerFor: (objectMemory fetchLong32: index - 1 ofObject: array)! Item was changed: ----- Method: StackInterpreterPrimitives>>primitiveSlotAt (in category 'object access primitives') ----- primitiveSlotAt "Answer a slot in an object. This numbers all slots from 1, ignoring the distinction between named and indexed inst vars. In objects with both named and indexed inst vars, the named inst vars precede the indexed ones. In non-object indexed objects (objects that contain bits, not object references) this primitive answers the raw integral value at each slot. e.g. for Strings it answers the character code, not the Character object at each slot." | index rcvr fmt numSlots | index := self stackTop. rcvr := self stackValue: 1. (objectMemory isIntegerObject: index) ifFalse: [^self primitiveFailFor: PrimErrBadArgument]. (objectMemory isImmediate: rcvr) ifTrue: [^self primitiveFailFor: PrimErrBadReceiver]. fmt := objectMemory formatOf: rcvr. index := (objectMemory integerValueOf: index) - 1. fmt <= objectMemory lastPointerFormat ifTrue: [numSlots := objectMemory numSlotsOf: rcvr. (self asUnsigned: index) < numSlots ifTrue: [| value numLiveSlots | (objectMemory isContextNonImm: rcvr) ifTrue: [self externalWriteBackHeadFramePointers. numLiveSlots := (self stackPointerForMaybeMarriedContext: rcvr) + CtxtTempFrameStart. value := (self asUnsigned: index) < numLiveSlots ifTrue: [self externalInstVar: index ofContext: rcvr] ifFalse: [objectMemory nilObject]] ifFalse: [value := objectMemory fetchPointer: index ofObject: rcvr]. self pop: argumentCount + 1 thenPush: value. ^0]. ^self primitiveFailFor: PrimErrBadIndex]. fmt >= objectMemory firstByteFormat ifTrue: [fmt >= objectMemory firstCompiledMethodFormat ifTrue: [^self primitiveFailFor: PrimErrUnsupported]. numSlots := objectMemory numBytesOfBytes: rcvr. (self asUnsigned: index) < numSlots ifTrue: [self pop: argumentCount + 1 thenPushInteger: (objectMemory fetchByte: index ofObject: rcvr). ^0]. ^self primitiveFailFor: PrimErrBadIndex]. (objectMemory hasSpurMemoryManagerAPI and: [fmt >= objectMemory firstShortFormat]) ifTrue: [numSlots := objectMemory num16BitUnitsOf: rcvr. (self asUnsigned: index) < numSlots ifTrue: + [self pop: argumentCount + 1 thenPushInteger: (objectMemory fetchUnsignedShort16: index ofObject: rcvr). - [self pop: argumentCount + 1 thenPushInteger: (objectMemory fetchShort16: index ofObject: rcvr). ^0]. ^self primitiveFailFor: PrimErrBadIndex]. fmt = objectMemory sixtyFourBitIndexableFormat ifTrue: [numSlots := objectMemory num64BitUnitsOf: rcvr. (self asUnsigned: index) < numSlots ifTrue: [self pop: argumentCount + 1 thenPush: (self positive64BitIntegerFor: (objectMemory fetchLong64: index ofObject: rcvr)). ^0]. ^self primitiveFailFor: PrimErrBadIndex]. fmt >= objectMemory firstLongFormat ifTrue: [numSlots := objectMemory num32BitUnitsOf: rcvr. (self asUnsigned: index) < numSlots ifTrue: [self pop: argumentCount + 1 thenPush: (self positive32BitIntegerFor: (objectMemory fetchLong32: index ofObject: rcvr)). ^0]. ^self primitiveFailFor: PrimErrBadIndex]. ^self primitiveFailFor: PrimErrBadReceiver!

1 0

[OpenSmalltalk/opensmalltalk-vm] d61f19: replaces most sprintf with snprintf
by GitHub 14 Nov '16

14 Nov '16

Branch: refs/heads/Cog Home: https://github.com/OpenSmalltalk/opensmalltalk-vm Commit: d61f194ece483184af003a75f829711b5182ee59 https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/d61f194ece483184af… Author: Gerardo Santana <geardo.santana(a)gmail.com> Date: 2016-10-09 (Sun, 09 Oct 2016) Changed paths: M platforms/unix/vm/sqUnixCharConv.c M platforms/unix/vm/sqUnixExternalPrims.c M platforms/unix/vm/sqUnixMain.c Log Message: ----------- replaces most sprintf with snprintf Commit: 88d70051e36a8ec05efaf0a50ff18e065d8792ce https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/88d70051e36a8ec05e… Author: Gerardo Santana <geardo.santana(a)gmail.com> Date: 2016-10-09 (Sun, 09 Oct 2016) Changed paths: M platforms/Cross/vm/dispdbg.h M platforms/Cross/vm/sqSCCSVersion.h Log Message: ----------- replaces sprintf with snprintf Commit: b07b562e165f502b96ef8ea6eba1297e94cc1a29 https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/b07b562e165f502b96… Author: Nicolas Cellier <nicolas.cellier.aka.nice(a)gmail.com> Date: 2016-11-14 (Mon, 14 Nov 2016) Changed paths: M platforms/Cross/vm/dispdbg.h M platforms/Cross/vm/sqSCCSVersion.h M platforms/unix/vm/sqUnixCharConv.c M platforms/unix/vm/sqUnixExternalPrims.c M platforms/unix/vm/sqUnixMain.c Log Message: ----------- Merge pull request #81 from santana/snprintf replaces sprintf with snprintf Compare: https://github.com/OpenSmalltalk/opensmalltalk-vm/compare/b6c01efc5289...b0…

1 0

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

14 Nov '16

Branch: refs/heads/tim/fix-updateSCCSVersions-for-branch-change-and-old-git-versions Home: https://github.com/OpenSmalltalk/opensmalltalk-vm

1 0

restarting failed PR builds
by Ben Coman 14 Nov '16

14 Nov '16

Hi Nicolas, Thanks for looking at Gerardo's snprintf PR. Now I think its build failures were due to something else happening a month ago (as you commented), but the snprintf PR doesn't get rebuilt after those were fixed. Several other PRs seem in the same boat - but then I think the red cross discourages people from reviewing them. I read [1] that one way to retrigger a build is to close and re-open the PR. Maybe you could test that? Ideally there would be green ticks before merging, rather than ignoring the red crosses since we "know" they are unrelated. I'd do it but I think repo write permission is needed. cheers -ben [1] http://stackoverflow.com/questions/17606874/trigger-a-travis-ci-rebuild-wit…

2 1

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