Vm-dev November 2014

vm-dev@lists.squeakfoundation.org

36 participants
165 discussions

New Cog VMs available
by Eliot Miranda 24 Nov '14

24 Nov '14

... at http://www.mirandabanda.org/files/Cog/VM/VM.r3144. Apologies; the 3143 VMs were broken. CogVM binaries as per VMMaker.oscog-eem.950/r3144 Fix regression in new primitiveBitShift. Introduce >>> as an explicitly signed shift. 64-bit ize magnitude64BitIntegerFor:neg:, positive64BitIntegerFor: & signed64BitIntegerFor: -- best, Eliot

2 2

[commit][3146] update BitBltGeneric. c to mask out the alpha channel in the pxiel compare routine; this makes it possible to test colors without regard to the translucency
by commits＠squeakvm.org 24 Nov '14

24 Nov '14

Revision: 3146 Author: rowledge Date: 2014-11-23 18:12:04 -0800 (Sun, 23 Nov 2014) Log Message: ----------- update BitBltGeneric.c to mask out the alpha channel in the pxiel compare routine; this makes it possible to test colors without regard to the translucency Modified Paths: -------------- trunk/platforms/Cross/plugins/BitBltPlugin/BitBltGeneric.c Modified: trunk/platforms/Cross/plugins/BitBltPlugin/BitBltGeneric.c =================================================================== --- trunk/platforms/Cross/plugins/BitBltPlugin/BitBltGeneric.c 2014-11-22 02:27:30 UTC (rev 3145) +++ trunk/platforms/Cross/plugins/BitBltPlugin/BitBltGeneric.c 2014-11-24 02:12:04 UTC (rev 3146) @@ -484,8 +484,8 @@ b32 >>= bppB * (pixelIndexes >> 27); while (width > 0) { - uint32_t a = msbA ? a32 >> (32-bppA) : a32 & ((1<<bppA)-1); - uint32_t b = msbB ? b32 >> (32-bppB) : b32 & ((1<<bppB)-1); + uint32_t a = (msbA ? a32 >> (32-bppA) : a32 & ((1<<bppA)-1)) & 0xFFFFFF; + uint32_t b = (msbB ? b32 >> (32-bppB) : b32 & ((1<<bppB)-1)) & 0xFFFFFF; uint32_t nextPixelIndexes; if (matchRule == MR_pixelMatch) count += a == colorA && b == colorB;

1 0

SqueakJS
by Jerry Bell 23 Nov '14

23 Nov '14

I've been playing around with SqueakJS and it is simply amazing! I found the paper "SqueakJS : A Modern and Practical Smalltalk That Runs in Any Browser" at: http://www.freudenbergs.de/bert/publications/Freudenberg-2014-SqueakJS.pdf. That paper helped fill in some details about the implementation. Bert, do you have updated performance numbers for the new JIT version? I'm personally interested in this for web development, specifically for "single page applications". I've always thought that working in a system built on top of HTML5 Canvas + JavaScript would be much easier and cleaner than working with a standard web development stack. SqueakJS looks like a great way to get started without building up a complete system from scratch on top of Amber or pure JavaScript. I believe that a simple MVC image will be more than fast enough for some proof of concepts. Since SqueakJS is built on JavaScript, it should be easy to incorporate existing web technologies and libraries such as socket.io as VM plugins. But of course those plugins would only work with SqueakJS running in a browser. But if someone were to build a plugin for Squeak that embedded a JavaScript engine (similar to Node.JS embedding the V8 engine), would it be possible to build JavaScript based plugins that work in regular Squeak as well as SqueakJS? That might be useful for day to day Squeakers as well as SqueakJS users, since there really are a lot of great JavaScript libraries out there. Anyway, thanks for building SqueakJS! Jerry

4 14

VM Maker: VMMaker.oscog-eem.953.mcz
by commits＠source.squeak.org 22 Nov '14

22 Nov '14

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.953.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.953 Author: eem Time: 22 November 2014, 1:10:42.674 pm UUID: 62e5308c-b39a-464e-a2d5-ce7b6573d462 Ancestors: VMMaker.oscog-eem.952 Implement SmallFloat primitives. Fix code generator to allow <option: #Spur64BitMemoryManager> Implement exponentOfSmallFloat:. Correctly define smallFloatExponentOffset. Fix smallFloatObjectOf: for simulation. Avoid cCode: '... modf(...' in two prims using self mod: f: instead. =============== Diff against VMMaker.oscog-eem.952 =============== Item was changed: ----- Method: CCodeGenerator>>shouldIncludeMethodFor:selector: (in category 'utilities') ----- shouldIncludeMethodFor: aClass selector: selector "Answer whether a method shoud be translated. Process optional methods by interpreting the argument to the option: pragma as either a Cogit class name or a class variable name or a variable name in VMBasicConstants. Exclude methods with the doNotGenerate pragma." | pragmas | "where is pragmasAt: ??" (pragmas := (aClass >> selector) pragmas select: [:p| p keyword == #option:]) notEmpty ifTrue: [pragmas do: [:pragma| | key | key := pragma argumentAt: 1. "If the option is the name of a subclass of Cogit, include it if it inherits from the Cogit class." (Smalltalk classNamed: key) ifNotNil: [:optionClass| aClass cogitClass ifNotNil: [:cogitClass| + (optionClass includesBehavior: Cogit) ifTrue: + [^cogitClass includesBehavior: optionClass]]. + aClass objectMemoryClass ifNotNil: + [:objectMemoryClass| + ((optionClass includesBehavior: ObjectMemory) + or: [optionClass includesBehavior: SpurMemoryManager]) ifTrue: + [^objectMemoryClass includesBehavior: optionClass]]]. - (Cogit withAllSubclasses anySatisfy: [:c| c = cogitClass]) ifTrue: - [^cogitClass includesBehavior: optionClass]]]. "Lookup options in options, class variables of the defining class, VMBasicConstants, the interpreterClass and the objectMemoryClass" {aClass initializationOptions. aClass. VMBasicConstants. aClass interpreterClass. aClass objectMemoryClass} do: [:scopeOrNil| scopeOrNil ifNotNil: [:scope| (scope bindingOf: key) ifNotNil: [:binding| binding value ~~ false ifTrue: [^true]]]]]. ^false]. ^(aClass >> selector pragmaAt: #doNotGenerate) isNil! Item was changed: ----- Method: InterpreterPrimitives>>primitiveFractionalPart (in category 'arithmetic float primitives') ----- primitiveFractionalPart | rcvr frac trunc | <var: #rcvr type: #double> <var: #frac type: #double> <var: #trunc type: #double> rcvr := self popFloat. self successful + ifTrue: [frac := self cCode: [self mod: rcvr f: (self addressOf: trunc)] + inSmalltalk: [rcvr fractionPart]. - ifTrue: [self cCode: 'frac = modf(rcvr, &trunc)' inSmalltalk: [frac := rcvr fractionPart]. self pushFloat: frac] ifFalse: [self unPop: 1]! Item was added: + ----- Method: InterpreterPrimitives>>primitiveSmallFloatAdd (in category 'arithmetic float primitives') ----- + primitiveSmallFloatAdd + <option: #Spur64BitMemoryManager> + | rcvr arg | + <var: #rcvr type: #double> + <var: #arg type: #double> + + rcvr := objectMemory smallFloatValueOf: (self stackValue: 1). + arg := self loadFloatOrIntFrom: self stackTop. + self successful ifTrue: + [self pop: 2 thenPushFloat: rcvr + arg]! Item was added: + ----- Method: InterpreterPrimitives>>primitiveSmallFloatArctan (in category 'arithmetic float primitives') ----- + primitiveSmallFloatArctan + <option: #Spur64BitMemoryManager> + | rcvr | + <var: #rcvr type: #double> + rcvr := objectMemory smallFloatValueOf: self stackTop. + self pop: 1 + thenPushFloat: (self cCode: [rcvr atan] + inSmalltalk: [rcvr = rcvr + ifTrue: [rcvr arcTan] + ifFalse: [Float nan]])! Item was added: + ----- Method: InterpreterPrimitives>>primitiveSmallFloatDivide (in category 'arithmetic float primitives') ----- + primitiveSmallFloatDivide + <option: #Spur64BitMemoryManager> + | rcvr arg | + <var: #rcvr type: #double> + <var: #arg type: #double> + + rcvr := objectMemory smallFloatValueOf: (self stackValue: 1). + arg := self loadFloatOrIntFrom: self stackTop. + self successful ifTrue: + [self pop: 2 thenPushFloat: rcvr / arg]! Item was added: + ----- Method: InterpreterPrimitives>>primitiveSmallFloatEqual (in category 'arithmetic float primitives') ----- + primitiveSmallFloatEqual + <option: #Spur64BitMemoryManager> + | rcvr arg | + <var: #rcvr type: #double> + <var: #arg type: #double> + + rcvr := objectMemory smallFloatValueOf: (self stackValue: 1). + arg := self loadFloatOrIntFrom: self stackTop. + self successful ifTrue: + [self pop: 2 thenPushBool: rcvr = arg]! Item was added: + ----- Method: InterpreterPrimitives>>primitiveSmallFloatExp (in category 'arithmetic float primitives') ----- + primitiveSmallFloatExp + "Computes E raised to the receiver power. + Since SmallFloats cannot represent NaNs there's no need to special case." + <option: #Spur64BitMemoryManager> + + self pop: 1 thenPushFloat: (objectMemory smallFloatValueOf: self stackTop) exp! Item was added: + ----- Method: InterpreterPrimitives>>primitiveSmallFloatExponent (in category 'arithmetic float primitives') ----- + primitiveSmallFloatExponent + "Answer the exponent part of this float." + <option: #Spur64BitMemoryManager> + + self pop: 1 thenPushInteger: (objectMemory exponentOfSmallFloat: self stackTop) - 1! Item was added: + ----- Method: InterpreterPrimitives>>primitiveSmallFloatFractionalPart (in category 'arithmetic float primitives') ----- + primitiveSmallFloatFractionalPart + <option: #Spur64BitMemoryManager> + | rcvr frac trunc | + <var: #rcvr type: #double> + <var: #frac type: #double> + <var: #trunc type: #double> + rcvr := objectMemory smallFloatValueOf: self stackTop. + frac := self cCode: [self mod: rcvr f: (self addressOf: trunc)] + inSmalltalk: [rcvr fractionPart]. + self pop: 1 thenPushFloat: frac! Item was added: + ----- Method: InterpreterPrimitives>>primitiveSmallFloatGreaterOrEqual (in category 'arithmetic float primitives') ----- + primitiveSmallFloatGreaterOrEqual + <option: #Spur64BitMemoryManager> + | rcvr arg | + <var: #rcvr type: #double> + <var: #arg type: #double> + + rcvr := objectMemory smallFloatValueOf: (self stackValue: 1). + arg := self loadFloatOrIntFrom: self stackTop. + self successful ifTrue: + [self pop: 2 thenPushBool: rcvr >= arg]! Item was added: + ----- Method: InterpreterPrimitives>>primitiveSmallFloatGreaterThan (in category 'arithmetic float primitives') ----- + primitiveSmallFloatGreaterThan + <option: #Spur64BitMemoryManager> + | rcvr arg | + <var: #rcvr type: #double> + <var: #arg type: #double> + + rcvr := objectMemory smallFloatValueOf: (self stackValue: 1). + arg := self loadFloatOrIntFrom: self stackTop. + self successful ifTrue: + [self pop: 2 thenPushBool: rcvr > arg]! Item was added: + ----- Method: InterpreterPrimitives>>primitiveSmallFloatLessOrEqual (in category 'arithmetic float primitives') ----- + primitiveSmallFloatLessOrEqual + <option: #Spur64BitMemoryManager> + | rcvr arg | + <var: #rcvr type: #double> + <var: #arg type: #double> + + rcvr := objectMemory smallFloatValueOf: (self stackValue: 1). + arg := self loadFloatOrIntFrom: self stackTop. + self successful ifTrue: + [self pop: 2 thenPushBool: rcvr <= arg]! Item was added: + ----- Method: InterpreterPrimitives>>primitiveSmallFloatLessThan (in category 'arithmetic float primitives') ----- + primitiveSmallFloatLessThan + <option: #Spur64BitMemoryManager> + | rcvr arg | + <var: #rcvr type: #double> + <var: #arg type: #double> + + rcvr := objectMemory smallFloatValueOf: (self stackValue: 1). + arg := self loadFloatOrIntFrom: self stackTop. + self successful ifTrue: + [self pop: 2 thenPushBool: rcvr < arg]! Item was added: + ----- Method: InterpreterPrimitives>>primitiveSmallFloatLogN (in category 'arithmetic float primitives') ----- + primitiveSmallFloatLogN + "Natural log." + <option: #Spur64BitMemoryManager> + | rcvr | + <var: #rcvr type: #double> + rcvr := objectMemory smallFloatValueOf: self stackTop. + self pop: 1 + thenPushFloat: (self cCode: [rcvr log] + inSmalltalk: [rcvr = rcvr + ifTrue: [rcvr ln] + ifFalse: [Float nan]])! Item was added: + ----- Method: InterpreterPrimitives>>primitiveSmallFloatMultiply (in category 'arithmetic float primitives') ----- + primitiveSmallFloatMultiply + <option: #Spur64BitMemoryManager> + | rcvr arg | + <var: #rcvr type: #double> + <var: #arg type: #double> + + rcvr := objectMemory smallFloatValueOf: (self stackValue: 1). + arg := self loadFloatOrIntFrom: self stackTop. + self successful ifTrue: + [self pop: 2 thenPushFloat: rcvr * arg]! Item was added: + ----- Method: InterpreterPrimitives>>primitiveSmallFloatNotEqual (in category 'arithmetic float primitives') ----- + primitiveSmallFloatNotEqual + <option: #Spur64BitMemoryManager> + | rcvr arg | + <var: #rcvr type: #double> + <var: #arg type: #double> + + rcvr := objectMemory smallFloatValueOf: (self stackValue: 1). + arg := self loadFloatOrIntFrom: self stackTop. + self successful ifTrue: + [self pop: 2 thenPushBool: (rcvr = arg) not]! Item was added: + ----- Method: InterpreterPrimitives>>primitiveSmallFloatSine (in category 'arithmetic float primitives') ----- + primitiveSmallFloatSine + <option: #Spur64BitMemoryManager> + | rcvr | + <var: #rcvr type: #double> + rcvr := objectMemory smallFloatValueOf: self stackTop. + self pop: 1 + thenPushFloat: (self cCode: [rcvr sin] + inSmalltalk: [rcvr = rcvr + ifTrue: [rcvr sin] + ifFalse: [Float nan]])! Item was added: + ----- Method: InterpreterPrimitives>>primitiveSmallFloatSquareRoot (in category 'arithmetic float primitives') ----- + primitiveSmallFloatSquareRoot + <option: #Spur64BitMemoryManager> + + self pop: 1 thenPushFloat: (objectMemory smallFloatValueOf: self stackTop) sqrt! Item was added: + ----- Method: InterpreterPrimitives>>primitiveSmallFloatSubtract (in category 'arithmetic float primitives') ----- + primitiveSmallFloatSubtract + <option: #Spur64BitMemoryManager> + | rcvr arg | + <var: #rcvr type: #double> + <var: #arg type: #double> + + rcvr := objectMemory smallFloatValueOf: (self stackValue: 1). + arg := self loadFloatOrIntFrom: self stackTop. + self successful ifTrue: + [self pop: 2 thenPushFloat: rcvr - arg]! Item was added: + ----- Method: InterpreterPrimitives>>primitiveSmallFloatTimesTwoPower (in category 'arithmetic float primitives') ----- + primitiveSmallFloatTimesTwoPower + <option: #Spur64BitMemoryManager> + | rcvr arg | + <var: #rcvr type: #double> + arg := self stackTop. + (objectMemory isIntegerObject: arg) + ifTrue: + [rcvr := objectMemory smallFloatValueOf: (self stackValue: 1). + arg := objectMemory integerValueOf: arg. + self pop: 1 + thenPushFloat: (self cCode: [self ld: rcvr exp: arg] + inSmalltalk: [rcvr timesTwoPower: arg])] + ifFalse: + [self primitiveFail]! Item was added: + ----- Method: InterpreterPrimitives>>primitiveSmallFloatTruncated (in category 'arithmetic float primitives') ----- + primitiveSmallFloatTruncated + <option: #Spur64BitMemoryManager> + | rcvr trunc | + <var: #rcvr type: #double> + <var: #trunc type: #double> + rcvr := self smallFloatValueOf: self stackTop. + self cCode: [self mod: rcvr f: (self addressOf: trunc)] + inSmalltalk: [trunc := rcvr truncated]. + (trunc between: SmallInteger minVal asFloat and: SmallInteger maxVal asFloat) + ifTrue: [self pop: 1 thenPushInteger: trunc asInteger] + ifFalse: [self primitiveFail]! Item was changed: ----- Method: InterpreterPrimitives>>primitiveTruncated (in category 'arithmetic float primitives') ----- primitiveTruncated + | rcvr trunc | - | rcvr frac trunc | <var: #rcvr type: #double> - <var: #frac type: #double> <var: #trunc type: #double> rcvr := self popFloat. self successful ifTrue: + [self cCode: [self mod: rcvr f: (self addressOf: trunc)] - [self cCode: 'frac = modf(rcvr, &trunc)' inSmalltalk: [trunc := rcvr truncated]. + self success: (trunc between: SmallInteger minVal asFloat and: SmallInteger maxVal asFloat)]. - self flag: #Dan. "The ranges are INCORRECT if SmallIntegers are wider than 31 bits." - self cCode: 'success((-1073741824.0 <= trunc) && (trunc <= 1073741823.0))' - inSmalltalk: [self success: (trunc between: SmallInteger minVal and: SmallInteger maxVal)]]. self successful + ifTrue: [self pushInteger: trunc asInteger] - ifTrue: [self cCode: 'pushInteger((sqInt) trunc)' inSmalltalk: [self pushInteger: trunc]] ifFalse: [self unPop: 1]! Item was added: + ----- Method: Spur64BitMemoryManager>>exponentOfSmallFloat: (in category 'interpreter access') ----- + exponentOfSmallFloat: oop + "Answer the exponent of the argument, a SmallFloat. + See section 61-bit Immediate Floats in the SpurMemoryManager class comment. + msb lsb + [8expsubset][52mantissa][1s][3tags]" + | exp | + self assert: (oop bitAnd: self tagMask) = self smallFloatTag. + ^oop <= 15 + ifTrue: [0] + ifFalse: + [exp := oop >> (self numTagBits + self smallFloatMantissaBits + 1). + exp + self smallFloatExponentOffset - 1022]! Item was changed: ----- Method: Spur64BitMemoryManager>>smallFloatExponentOffset (in category 'interpreter access') ----- smallFloatExponentOffset + "896 is 1023 - 127, where 1023 is the mid-point of the 11-bit double precision exponent range, + and 127 is the mid-point of the 8-bit SmallDouble exponent range." + ^896! - ^128! Item was changed: ----- Method: Spur64BitMemoryManager>>smallFloatObjectOf: (in category 'interpreter access') ----- smallFloatObjectOf: aFloat "Encode the argument, aFloat in the SmallFloat range, as a tagged small float. See section 61-bit Immediate Floats in the SpurMemoryManager class comment. + Encode: [1s][ 11 exponent ][52mantissa] - Encode: [1s][ 11 exponent ][52mantissa] rot sign: [ 11 exponent ][52mantissa][1s] sub exponent offset: [ 000 ][8expsubset][52 mantissa][1s] shift: [8expsubset][52 mantissa][1s][ 000 ] or/add tags: [8expsubset][52mantissa][1s][3tags]" <inline: true> <var: #aFloat type: #double> | rawFloat rot | + self assert: (self isSmallFloatValue: aFloat). + rawFloat := self cCode: [(self cCoerce: (self addressOf: aFloat) to: 'sqLong *') at: 0] - rawFloat := self - cCode: - [(self cCoerce: (self addressOf: aFloat) to: 'sqLong *') at: 0] inSmalltalk: [(aFloat at: 1) << 32 + (aFloat at: 2)]. rot := self rotateLeft: rawFloat. rot > 1 ifTrue: [rot := rot - (self smallFloatExponentOffset << (self smallFloatMantissaBits + 1)). self assert: rot > 0]. + ^self cCode: [rot << self numTagBits + self smallFloatTag] + inSmalltalk: [((rot << self numTagBits) bitAnd: 16rFFFFFFFFFFFFFFFF) + self smallFloatTag]! - ^rot << self numTagBits + self smallFloatTag!

1 0

VM Maker: VMMaker.oscog-eem.952.mcz
by commits＠source.squeak.org 22 Nov '14

22 Nov '14

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.952.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.952 Author: eem Time: 21 November 2014, 6:40:00.246 pm UUID: c6647828-7baa-4c80-8f8f-1cfb627e2b84 Ancestors: VMMaker.oscog-eem.951 Implement SmallFloat/SmallDouble encode/decode. Rename isInstanceOfClassFloat: to isFloatInstance: Refactor floatObjectOf:, floatValueOf: and isFloatInstance: into the ObjectMemory hierarchies. =============== Diff against VMMaker.oscog-eem.951 =============== Item was removed: - ----- Method: Interpreter>>floatObjectOf: (in category 'object format') ----- - floatObjectOf: aFloat - | newFloatObj | - <inline: false> - <var: #aFloat type: 'double '> - self flag: #Dan. - newFloatObj := self instantiateSmallClass: (self splObj: ClassFloat) sizeInBytes: 8+self baseHeaderSize. - self storeFloatAt: newFloatObj + self baseHeaderSize from: aFloat. - ^ newFloatObj. - ! Item was removed: - ----- Method: Interpreter>>floatValueOf: (in category 'utilities') ----- - floatValueOf: oop - "Answer the C double precision floating point value of the argument, - or fail if it is not a Float, and answer 0. - Note: May be called by translated primitive code." - - | isFloat result | - <returnTypeC: #double> - <var: #result type: #double> - isFloat := self isInstanceOfClassFloat: oop. - isFloat ifTrue: - [self cCode: '' inSmalltalk: [result := Float new: 2]. - self fetchFloatAt: oop + self baseHeaderSize into: result. - ^result]. - self primitiveFail. - ^0.0! Item was changed: ----- Method: Interpreter>>primitiveAsFloat (in category 'arithmetic float primitives') ----- primitiveAsFloat | arg | arg := self popInteger. + self successful + ifTrue: [self pushFloat: arg asFloat] + ifFalse: [self unPop: 1]! - successFlag - ifTrue: [ self pushFloat: (self cCode: '((double) arg)' inSmalltalk: [arg asFloat]) ] - ifFalse: [ self unPop: 1 ].! Item was removed: - ----- Method: InterpreterPrimitives>>isInstanceOfClassFloat: (in category 'primitive support') ----- - isInstanceOfClassFloat: oop - <inline: true> - "N.B. Because Slang always inlines is:instanceOf:compactClassIndex: - (because is:instanceOf:compactClassIndex: has an inline: pragma) the - phrase (objectMemory splObj: ClassFloat) is expanded in-place and is - _not_ evaluated if oop has a non-zero CompactClassIndex." - ^objectMemory - is: oop - instanceOf: (objectMemory splObj: ClassFloat) - compactClassIndex: ClassFloatCompactIndex! Item was changed: ----- Method: InterpreterPrimitives>>primitiveAsFloat (in category 'arithmetic float primitives') ----- primitiveAsFloat | arg | arg := self popInteger. self successful + ifTrue: [self pushFloat: arg asFloat] + ifFalse: [self unPop: 1]! - ifTrue: [ self pushFloat: (self cCode: '((double) arg)' inSmalltalk: [arg asFloat]) ] - ifFalse: [ self unPop: 1 ]! Item was changed: ----- Method: InterpreterPrimitives>>primitiveFormPrint (in category 'I/O primitives') ----- primitiveFormPrint "On platforms that support it, this primitive prints the receiver, assumed to be a Form, to the default printer." | landscapeFlag vScale hScale rcvr bitsArray w h depth pixelsPerWord wordsPerLine bitsArraySize ok | + <var: #vScale type: #double> + <var: #hScale type: #double> - <var: #vScale type: 'double '> - <var: #hScale type: 'double '> landscapeFlag := self booleanValueOf: self stackTop. + vScale := objectMemory floatValueOf: (self stackValue: 1). + hScale := objectMemory floatValueOf: (self stackValue: 2). - vScale := self floatValueOf: (self stackValue: 1). - hScale := self floatValueOf: (self stackValue: 2). rcvr := self stackValue: 3. + ((objectMemory isPointers: rcvr) - ((objectMemory isPointers: rcvr) and: [(objectMemory lengthOf: rcvr) >= 4]) ifFalse: [self success: false]. self successful ifTrue: [bitsArray := objectMemory fetchPointer: 0 ofObject: rcvr. w := self fetchInteger: 1 ofObject: rcvr. h := self fetchInteger: 2 ofObject: rcvr. depth := self fetchInteger: 3 ofObject: rcvr. (w > 0 and: [h > 0]) ifFalse: [self success: false]. pixelsPerWord := 32 // depth. wordsPerLine := (w + (pixelsPerWord - 1)) // pixelsPerWord. (objectMemory isWordsOrBytes: bitsArray) ifTrue: [bitsArraySize := objectMemory numBytesOf: bitsArray. self success: (bitsArraySize = (wordsPerLine * h * 4))] ifFalse: [self success: false]]. self successful ifTrue: [ok := self cCode: 'ioFormPrint(bitsArray + BaseHeaderSize, w, h, depth, hScale, vScale, landscapeFlag)'. self success: ok]. self successful ifTrue: [self pop: 3] "pop hScale, vScale, and landscapeFlag; leave rcvr on stack"! Item was removed: - ----- Method: NewCoObjectMemorySimulator>>floatValueOf: (in category 'simulation only') ----- - floatValueOf: obj - "hack around the CoInterpreter/ObjectMemory split refactoring" - ^coInterpreter floatValueOf: obj! Item was added: + ----- Method: NewObjectMemory>>floatObjectOf: (in category 'interpreter access') ----- + floatObjectOf: aFloat + | newFloatObj | + <inline: false> + <var: #aFloat type: #double> + newFloatObj := self + eeInstantiateSmallClassIndex: ClassFloatCompactIndex + format: self firstLongFormat + numSlots: (self sizeof: #double) / self bytesPerOop. + self storeFloatAt: newFloatObj + self baseHeaderSize from: aFloat. + ^newFloatObj! Item was added: + ----- Method: NewObjectMemory>>floatValueOf: (in category 'interpreter access') ----- + floatValueOf: oop + "Answer the C double precision floating point value of the argument, + or fail if it is not a Float, and answer 0. + Note: May be called by translated primitive code." + + | isFloat result | + <returnTypeC: #double> + <var: #result type: #double> + isFloat := self isFloatInstance: oop. + isFloat ifTrue: + [self cCode: '' inSmalltalk: [result := Float new: 2]. + self fetchFloatAt: oop + self baseHeaderSize into: result. + ^result]. + coInterpreter primitiveFail. + ^0.0! Item was removed: - ----- Method: NewObjectMemorySimulator>>floatValueOf: (in category 'simulation only') ----- - floatValueOf: obj - "hack around the CoInterpreter/ObjectMemory split refactoring" - ^coInterpreter floatValueOf: obj! Item was removed: - ----- Method: NewspeakInterpreter>>floatObjectOf: (in category 'object format') ----- - floatObjectOf: aFloat - | newFloatObj | - <var: #aFloat type: #double> - <inline: false> "because storeFloatAt:from: insists that its last arg is a variable" - self flag: #Dan. "None of the float stuff has been converted for 64 bits" - newFloatObj := self instantiateSmallClass: (self splObj: ClassFloat) sizeInBytes: 8+self baseHeaderSize. - self storeFloatAt: newFloatObj + self baseHeaderSize from: aFloat. - ^newFloatObj! Item was removed: - ----- Method: NewspeakInterpreter>>floatValueOf: (in category 'utilities') ----- - floatValueOf: oop - "Answer the C double precision floating point value of the argument, - or fail if it is not a Float, and answer 0. - Note: May be called by translated primitive code." - - | isFloat result | - <returnTypeC: #double> - <var: #result type: #double> - isFloat := self isInstanceOfClassFloat: oop. - isFloat ifTrue: - [self cCode: '' inSmalltalk: [result := Float new: 2]. - self fetchFloatAt: oop + self baseHeaderSize into: result. - ^result]. - self primitiveFail. - ^0.0! Item was changed: ----- Method: NewspeakInterpreter>>primitiveAsFloat (in category 'float primitives') ----- primitiveAsFloat | arg | arg := self popInteger. self successful + ifTrue: [self pushFloat: arg asFloat] + ifFalse: [self unPop: 1]! - ifTrue: [ self pushFloat: (self cCode: '((double) arg)' inSmalltalk: [arg asFloat]) ] - ifFalse: [ self unPop: 1 ].! Item was added: + ----- Method: ObjectMemory>>floatObjectOf: (in category 'interpreter access') ----- + floatObjectOf: aFloat + | newFloatObj | + <inline: false> + <var: #aFloat type: #double> + newFloatObj := self instantiateSmallClass: (self splObj: ClassFloat) sizeInBytes: (self sizeof: #double)+self baseHeaderSize. + self storeFloatAt: newFloatObj + self baseHeaderSize from: aFloat. + ^newFloatObj! Item was added: + ----- Method: ObjectMemory>>floatValueOf: (in category 'interpreter access') ----- + floatValueOf: oop + "Answer the C double precision floating point value of the argument, + or fail if it is not a Float, and answer 0. + Note: May be called by translated primitive code." + + | isFloat result | + <returnTypeC: #double> + <var: #result type: #double> + isFloat := self isFloatInstance: oop. + isFloat ifTrue: + [self cCode: '' inSmalltalk: [result := Float new: 2]. + self fetchFloatAt: oop + self baseHeaderSize into: result. + ^result]. + self primitiveFail. + ^0.0! Item was added: + ----- Method: ObjectMemory>>isFloatInstance: (in category 'interpreter access') ----- + isFloatInstance: oop + <inline: true> + "N.B. Because Slang always inlines is:instanceOf:compactClassIndex: + (because is:instanceOf:compactClassIndex: has an inline: pragma) the + phrase (objectMemory splObj: ClassFloat) is expanded in-place and is + _not_ evaluated if oop has a non-zero CompactClassIndex." + ^self + is: oop + instanceOf: (self splObj: ClassFloat) + compactClassIndex: ClassFloatCompactIndex! Item was added: + ----- Method: Spur32BitMemoryManager>>floatObjectOf: (in category 'interpreter access') ----- + floatObjectOf: aFloat + | newFloatObj | + <inline: false> + <var: #aFloat type: #double> + newFloatObj := self + eeInstantiateSmallClassIndex: ClassFloatCompactIndex + format: self firstLongFormat + numSlots: (self sizeof: #double) / self bytesPerOop. + self storeFloatAt: newFloatObj + self baseHeaderSize from: aFloat. + ^newFloatObj! Item was added: + ----- Method: Spur32BitMemoryManager>>floatValueOf: (in category 'interpreter access') ----- + floatValueOf: oop + "Answer the C double precision floating point value of the argument, + or fail if it is not a Float, and answer 0. + Note: May be called by translated primitive code." + + | isFloat result | + <returnTypeC: #double> + <var: #result type: #double> + isFloat := self isFloatInstance: oop. + isFloat ifTrue: + [self cCode: '' inSmalltalk: [result := Float new: 2]. + self fetchFloatAt: oop + self baseHeaderSize into: result. + ^result]. + coInterpreter primitiveFail. + ^0.0! Item was added: + ----- Method: Spur32BitMemoryManager>>isFloatInstance: (in category 'interpreter access') ----- + isFloatInstance: oop + <inline: true> + ^(self isNonImmediate: oop) + and: [(self classIndexOf: oop) = ClassFloatCompactIndex]! Item was added: + ----- Method: Spur64BitMemoryManager>>floatObjectOf: (in category 'interpreter access') ----- + floatObjectOf: aFloat + | newFloatObj | + <inline: false> + <var: #aFloat type: #double> + (self isSmallFloatValue: aFloat) ifTrue: + [^self smallFloatObjectOf: aFloat]. + newFloatObj := self + eeInstantiateSmallClassIndex: ClassFloatCompactIndex + format: self firstLongFormat + numSlots: (self sizeof: #double) / self bytesPerOop. + self storeFloatAt: newFloatObj + self baseHeaderSize from: aFloat. + ^newFloatObj! Item was added: + ----- Method: Spur64BitMemoryManager>>floatValueOf: (in category 'interpreter access') ----- + floatValueOf: oop + "Answer the C double precision floating point value of the argument, + or fail if it is not a Float, and answer 0. + Note: May be called by translated primitive code." + + | result tagBits | + <returnTypeC: #double> + <var: #result type: #double> + (tagBits := oop bitAnd: self tagMask) ~= 0 + ifTrue: + [tagBits = self smallFloatTag ifTrue: + [^self smallFloatValueOf: oop]] + ifFalse: + [(self classIndexOf: oop) = ClassFloatCompactIndex ifTrue: + [self cCode: '' inSmalltalk: [result := Float new: 2]. + self fetchFloatAt: oop + self baseHeaderSize into: result. + ^result]]. + coInterpreter primitiveFail. + ^0.0! Item was added: + ----- Method: Spur64BitMemoryManager>>isFloatInstance: (in category 'interpreter access') ----- + isFloatInstance: oop + <inline: true> + | tagBits | + ^(tagBits := oop bitAnd: self tagMask) ~= 0 + ifTrue: [tagBits = self smallFloatTag] + ifFalse: [(self classIndexOf: oop) = ClassFloatCompactIndex]! Item was added: + ----- Method: Spur64BitMemoryManager>>isSmallFloatValue: (in category 'interpreter access') ----- + isSmallFloatValue: aFloat + <inline: true> + <var: #aFloat type: #double> + | exponent | + exponent := self + cCode: + [| rawFloat | + rawFloat := (self cCoerce: (self addressOf: aFloat) to: 'sqLong *') at: 0. + rawFloat >> 52 bitAnd: 16r7FF] + inSmalltalk: [aFloat exponent]. + ^exponent between: -127 and: 127! Item was added: + ----- Method: Spur64BitMemoryManager>>rotateLeft: (in category 'interpreter access') ----- + rotateLeft: anInteger + ^(anInteger >> 63 bitAnd: 1) + ((self cCode: [anInteger] inSmalltalk: [anInteger bitAnd: 16r7FFFFFFFFFFFFFFF]) << 1)! Item was added: + ----- Method: Spur64BitMemoryManager>>rotateRight: (in category 'interpreter access') ----- + rotateRight: anInteger + ^(self cCode: [anInteger] inSmalltalk: [anInteger bitAnd: 1]) << 63 + (anInteger asUnsignedLong >> 1)! Item was added: + ----- Method: Spur64BitMemoryManager>>smallFloatExponentOffset (in category 'interpreter access') ----- + smallFloatExponentOffset + ^128! Item was added: + ----- Method: Spur64BitMemoryManager>>smallFloatMantissaBits (in category 'interpreter access') ----- + smallFloatMantissaBits + ^52! Item was added: + ----- Method: Spur64BitMemoryManager>>smallFloatObjectOf: (in category 'interpreter access') ----- + smallFloatObjectOf: aFloat + "Encode the argument, aFloat in the SmallFloat range, as a tagged small float. + See section 61-bit Immediate Floats in the SpurMemoryManager class comment. + + Encode: [1s][ 11 exponent ][52mantissa] + rot sign: [ 11 exponent ][52mantissa][1s] + sub exponent offset: [ 000 ][8expsubset][52 mantissa][1s] + shift: [8expsubset][52 mantissa][1s][ 000 ] + or/add tags: [8expsubset][52mantissa][1s][3tags]" + <inline: true> + <var: #aFloat type: #double> + | rawFloat rot | + rawFloat := self + cCode: + [(self cCoerce: (self addressOf: aFloat) to: 'sqLong *') at: 0] + inSmalltalk: [(aFloat at: 1) << 32 + (aFloat at: 2)]. + rot := self rotateLeft: rawFloat. + rot > 1 ifTrue: + [rot := rot - (self smallFloatExponentOffset << (self smallFloatMantissaBits + 1)). + self assert: rot > 0]. + ^rot << self numTagBits + self smallFloatTag! Item was added: + ----- Method: Spur64BitMemoryManager>>smallFloatTag (in category 'cog jit support') ----- + smallFloatTag + ^3! Item was added: + ----- Method: Spur64BitMemoryManager>>smallFloatValueOf: (in category 'interpreter access') ----- + smallFloatValueOf: oop + "Answer the C double precision floating point value of the argument, a SmallFloat. + See section 61-bit Immediate Floats in the SpurMemoryManager class comment. + msb lsb + Decode: [8expsubset][52mantissa][1s][3tags] + shift away tags: [ 000 ][8expsubset][52mantissa][1s] + add exponent offset: [ 11 exponent ][52mantissa][1s] + rot sign: [1s][ 11 exponent ][52mantissa]" + | rot | + <returnTypeC: #double> + <var: #result type: #double> + self assert: (oop bitAnd: self tagMask) = self smallFloatTag. + rot := oop >> self numTagBits. + rot > 1 ifTrue: + [rot := rot + (self smallFloatExponentOffset << (self smallFloatMantissaBits + 1))]. + rot := self rotateRight: rot. + ^self cCode: [(self cCoerce: (self addressOf: rot) to: #'double *') at: 0] + inSmalltalk: + [(Float new: 2) + at: 1 put: rot >> 32; + at: 2 put: (rot bitAnd: 16rFFFFFFFF); + yourself]! Item was added: + ----- Method: SpurMemoryManager>>floatObjectOf: (in category 'interpreter access') ----- + floatObjectOf: aFloat + self subclassResponsibility! Item was changed: + ----- Method: SpurMemoryManager>>floatValueOf: (in category 'interpreter access') ----- + floatValueOf: oop + "Answer the C double precision floating point value of the argument, + or fail if it is not a Float, and answer 0. + Note: May be called by translated primitive code." + + self subclassResponsibility! - ----- Method: SpurMemoryManager>>floatValueOf: (in category 'simulation only') ----- - floatValueOf: obj - "hack around the CoInterpreter/ObjectMemory split refactoring" - <doNotGenerate> - ^coInterpreter floatValueOf: obj! Item was added: + ----- Method: SpurMemoryManager>>isFloatInstance: (in category 'interpreter access') ----- + isFloatInstance: oop + self subclassResponsibility! Item was changed: ----- Method: StackInterpreter>>fetchFloat:ofObject: (in category 'utilities') ----- fetchFloat: fieldIndex ofObject: objectPointer "Fetch the instance variable at the given index of the given object. Return the C double precision floating point value of that instance variable, or fail if it is not a Float." "Note: May be called by translated primitive code." | floatOop | + <returnTypeC: #double> - <returnTypeC: 'double'> floatOop := objectMemory fetchPointer: fieldIndex ofObject: objectPointer. + ^objectMemory floatValueOf: floatOop! - ^ self floatValueOf: floatOop! Item was changed: ----- Method: StackInterpreter>>floatArg: (in category 'plugin primitive support') ----- floatArg: index "Like #stackFloatValue: but access method arguments left-to-right" | oop | <returnTypeC: #double> oop := self methodArg: index. oop = 0 ifTrue:[^0.0]. "methodArg: failed" + ^objectMemory floatValueOf: oop! - ^self floatValueOf: oop! Item was removed: - ----- Method: StackInterpreter>>floatObjectOf: (in category 'object format') ----- - floatObjectOf: aFloat - | newFloatObj | - <inline: false> - <var: #aFloat type: #double> - newFloatObj := objectMemory - eeInstantiateSmallClassIndex: ClassFloatCompactIndex - format: objectMemory firstLongFormat - numSlots: (self sizeof: #double) / objectMemory bytesPerOop. - objectMemory storeFloatAt: newFloatObj + objectMemory baseHeaderSize from: aFloat. - ^newFloatObj! Item was removed: - ----- Method: StackInterpreter>>floatValueOf: (in category 'utilities') ----- - floatValueOf: oop - "Answer the C double precision floating point value of the argument, - or fail if it is not a Float, and answer 0. - Note: May be called by translated primitive code." - - | isFloat result | - <returnTypeC: #double> - <var: #result type: #double> - isFloat := self isInstanceOfClassFloat: oop. - isFloat ifTrue: - [self cCode: '' inSmalltalk: [result := Float new: 2]. - objectMemory fetchFloatAt: oop + objectMemory baseHeaderSize into: result. - ^result]. - self primitiveFail. - ^0.0! Item was changed: ----- Method: StackInterpreter>>loadFloatOrIntFrom: (in category 'utilities') ----- loadFloatOrIntFrom: floatOrInt "If floatOrInt is an integer, then convert it to a C double float and return it. If it is a Float, then load its value and return it. Otherwise fail -- ie return with primErrorCode non-zero." <inline: true> <returnTypeC: #double> (objectMemory isIntegerObject: floatOrInt) ifTrue: [^(objectMemory integerValueOf: floatOrInt) asFloat]. + ^objectMemory floatValueOf: floatOrInt! - ^self floatValueOf: floatOrInt! Item was changed: ----- Method: StackInterpreter>>pop:thenPushFloat: (in category 'internal interpreter access') ----- pop: nItems thenPushFloat: f "In the StackInterpreter stacks grow down." | sp | <inline: true> <var: #f type: #double> <var: #sp type: #'char *'> stackPages longAt: (sp := stackPointer + ((nItems - 1) * objectMemory wordSize)) + put: (objectMemory floatObjectOf: f). - put: (self floatObjectOf: f). stackPointer := sp! Item was changed: ----- Method: StackInterpreter>>popFloat (in category 'primitive support') ----- popFloat <returnTypeC: #double> + ^objectMemory floatValueOf: self popStack! - ^self floatValueOf: self popStack! Item was changed: ----- Method: StackInterpreter>>pushFloat: (in category 'primitive support') ----- pushFloat: f <var: #f type: #double> + self push: (objectMemory floatObjectOf: f).! - self push: (self floatObjectOf: f).! Item was changed: ----- Method: StackInterpreter>>stackFloatValue: (in category 'stack access') ----- stackFloatValue: offset "In the StackInterpreter stacks grow down." <returnTypeC: #double> + ^objectMemory floatValueOf: (stackPages longAt: stackPointer + (offset*objectMemory wordSize))! - ^self floatValueOf: (stackPages longAt: stackPointer + (offset*objectMemory wordSize))! Item was changed: ----- Method: StackInterpreterPrimitives>>primitiveVMParameter (in category 'system control primitives') ----- (excessive size, no diff calculated)

1 0

[commit][3145] CogVM source as per VMMaker.oscog-eem.951
by commits＠squeakvm.org 22 Nov '14

22 Nov '14

Revision: 3145 Author: eliot Date: 2014-11-21 18:27:30 -0800 (Fri, 21 Nov 2014) Log Message: ----------- CogVM source as per VMMaker.oscog-eem.951 Fix positive64BitIntegerFor: by fixing new generateSignedShiftRight:on:indent:. Symptom is LargePositiveInteger results from primGetPosition: for SmallInteger values. Modified Paths: -------------- branches/Cog/nscogsrc/vm/cointerp.c branches/Cog/nscogsrc/vm/cointerp.h branches/Cog/nscogsrc/vm/gcc3x-cointerp.c branches/Cog/nsspursrc/vm/cointerp.c branches/Cog/nsspursrc/vm/cointerp.h branches/Cog/nsspursrc/vm/gcc3x-cointerp.c branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c branches/Cog/nsspurstacksrc/vm/interp.c branches/Cog/sistasrc/vm/cointerp.c branches/Cog/sistasrc/vm/cointerp.h branches/Cog/sistasrc/vm/gcc3x-cointerp.c branches/Cog/spursistasrc/vm/cointerp.c branches/Cog/spursistasrc/vm/cointerp.h branches/Cog/spursistasrc/vm/gcc3x-cointerp.c branches/Cog/spursrc/vm/cointerp.c branches/Cog/spursrc/vm/cointerp.h branches/Cog/spursrc/vm/gcc3x-cointerp.c branches/Cog/spurstacksrc/vm/gcc3x-interp.c branches/Cog/spurstacksrc/vm/interp.c branches/Cog/src/vm/cointerp.c branches/Cog/src/vm/cointerp.h branches/Cog/src/vm/cointerpmt.c branches/Cog/src/vm/cointerpmt.h branches/Cog/src/vm/gcc3x-cointerp.c branches/Cog/src/vm/gcc3x-cointerpmt.c branches/Cog/stacksrc/vm/gcc3x-interp.c branches/Cog/stacksrc/vm/interp.c Property Changed: ---------------- branches/Cog/platforms/Cross/vm/sqSCCSVersion.h Modified: branches/Cog/nscogsrc/vm/cointerp.c =================================================================== --- branches/Cog/nscogsrc/vm/cointerp.c 2014-11-21 23:07:35 UTC (rev 3144) +++ branches/Cog/nscogsrc/vm/cointerp.c 2014-11-22 02:27:30 UTC (rev 3145) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.950 uuid: d4d2d679-fd90-48f5-a47a-ebae021776e7 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.951 uuid: f669df37-8b1c-41de-b9ab-a6626a19f914 from - CoInterpreter VMMaker.oscog-eem.950 uuid: d4d2d679-fd90-48f5-a47a-ebae021776e7 + CoInterpreter VMMaker.oscog-eem.951 uuid: f669df37-8b1c-41de-b9ab-a6626a19f914 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.950 uuid: d4d2d679-fd90-48f5-a47a-ebae021776e7 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.951 uuid: f669df37-8b1c-41de-b9ab-a6626a19f914 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2093,7 +2093,7 @@ /* 574 */ (void (*)(void))0, /* 575 */ (void (*)(void))0, 0 }; -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.950"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.951"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -48452,7 +48452,7 @@ sqInt newLargeInteger; sqInt sz; - if (((highWord = ((sqInt) integerValue) >> 32)) == 0) { + if (((highWord = ((sqLong) integerValue) >> 32)) == 0) { return positive32BitIntegerFor(integerValue); } sz = 5; Modified: branches/Cog/nscogsrc/vm/cointerp.h =================================================================== --- branches/Cog/nscogsrc/vm/cointerp.h 2014-11-21 23:07:35 UTC (rev 3144) +++ branches/Cog/nscogsrc/vm/cointerp.h 2014-11-22 02:27:30 UTC (rev 3145) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.950 uuid: d4d2d679-fd90-48f5-a47a-ebae021776e7 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.951 uuid: f669df37-8b1c-41de-b9ab-a6626a19f914 */ Modified: branches/Cog/nscogsrc/vm/gcc3x-cointerp.c =================================================================== --- branches/Cog/nscogsrc/vm/gcc3x-cointerp.c 2014-11-21 23:07:35 UTC (rev 3144) +++ branches/Cog/nscogsrc/vm/gcc3x-cointerp.c 2014-11-22 02:27:30 UTC (rev 3145) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.950 uuid: d4d2d679-fd90-48f5-a47a-ebae021776e7 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.951 uuid: f669df37-8b1c-41de-b9ab-a6626a19f914 from - CoInterpreter VMMaker.oscog-eem.950 uuid: d4d2d679-fd90-48f5-a47a-ebae021776e7 + CoInterpreter VMMaker.oscog-eem.951 uuid: f669df37-8b1c-41de-b9ab-a6626a19f914 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.950 uuid: d4d2d679-fd90-48f5-a47a-ebae021776e7 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.951 uuid: f669df37-8b1c-41de-b9ab-a6626a19f914 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2096,7 +2096,7 @@ /* 574 */ (void (*)(void))0, /* 575 */ (void (*)(void))0, 0 }; -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.950"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.951"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -48461,7 +48461,7 @@ sqInt newLargeInteger; sqInt sz; - if (((highWord = ((sqInt) integerValue) >> 32)) == 0) { + if (((highWord = ((sqLong) integerValue) >> 32)) == 0) { return positive32BitIntegerFor(integerValue); } sz = 5; Modified: branches/Cog/nsspursrc/vm/cointerp.c =================================================================== --- branches/Cog/nsspursrc/vm/cointerp.c 2014-11-21 23:07:35 UTC (rev 3144) +++ branches/Cog/nsspursrc/vm/cointerp.c 2014-11-22 02:27:30 UTC (rev 3145) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.950 uuid: d4d2d679-fd90-48f5-a47a-ebae021776e7 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.951 uuid: f669df37-8b1c-41de-b9ab-a6626a19f914 from - CoInterpreter VMMaker.oscog-eem.950 uuid: d4d2d679-fd90-48f5-a47a-ebae021776e7 + CoInterpreter VMMaker.oscog-eem.951 uuid: f669df37-8b1c-41de-b9ab-a6626a19f914 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.950 uuid: d4d2d679-fd90-48f5-a47a-ebae021776e7 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.951 uuid: f669df37-8b1c-41de-b9ab-a6626a19f914 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2343,7 +2343,7 @@ /*540*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, /*560*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, 0, 0, 0,-1,-1 }; -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.950"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.951"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -69040,7 +69040,7 @@ sqInt objFormat; sqInt sz; - if (((highWord = ((sqInt) integerValue) >> 32)) == 0) { + if (((highWord = ((sqLong) integerValue) >> 32)) == 0) { return positive32BitIntegerFor(integerValue); } sz = 5; Modified: branches/Cog/nsspursrc/vm/cointerp.h =================================================================== --- branches/Cog/nsspursrc/vm/cointerp.h 2014-11-21 23:07:35 UTC (rev 3144) +++ branches/Cog/nsspursrc/vm/cointerp.h 2014-11-22 02:27:30 UTC (rev 3145) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.950 uuid: d4d2d679-fd90-48f5-a47a-ebae021776e7 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.951 uuid: f669df37-8b1c-41de-b9ab-a6626a19f914 */ Modified: branches/Cog/nsspursrc/vm/gcc3x-cointerp.c =================================================================== --- branches/Cog/nsspursrc/vm/gcc3x-cointerp.c 2014-11-21 23:07:35 UTC (rev 3144) +++ branches/Cog/nsspursrc/vm/gcc3x-cointerp.c 2014-11-22 02:27:30 UTC (rev 3145) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.950 uuid: d4d2d679-fd90-48f5-a47a-ebae021776e7 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.951 uuid: f669df37-8b1c-41de-b9ab-a6626a19f914 from - CoInterpreter VMMaker.oscog-eem.950 uuid: d4d2d679-fd90-48f5-a47a-ebae021776e7 + CoInterpreter VMMaker.oscog-eem.951 uuid: f669df37-8b1c-41de-b9ab-a6626a19f914 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.950 uuid: d4d2d679-fd90-48f5-a47a-ebae021776e7 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.951 uuid: f669df37-8b1c-41de-b9ab-a6626a19f914 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2346,7 +2346,7 @@ /*540*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, /*560*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, 0, 0, 0,-1,-1 }; -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.950"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.951"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -69049,7 +69049,7 @@ sqInt objFormat; sqInt sz; - if (((highWord = ((sqInt) integerValue) >> 32)) == 0) { + if (((highWord = ((sqLong) integerValue) >> 32)) == 0) { return positive32BitIntegerFor(integerValue); } sz = 5; Modified: branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c =================================================================== --- branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c 2014-11-21 23:07:35 UTC (rev 3144) +++ branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c 2014-11-22 02:27:30 UTC (rev 3145) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.950 uuid: d4d2d679-fd90-48f5-a47a-ebae021776e7 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.951 uuid: f669df37-8b1c-41de-b9ab-a6626a19f914 from - StackInterpreter VMMaker.oscog-eem.950 uuid: d4d2d679-fd90-48f5-a47a-ebae021776e7 + StackInterpreter VMMaker.oscog-eem.951 uuid: f669df37-8b1c-41de-b9ab-a6626a19f914 */ -static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.950 uuid: d4d2d679-fd90-48f5-a47a-ebae021776e7 " __DATE__ ; +static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.951 uuid: f669df37-8b1c-41de-b9ab-a6626a19f914 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2093,7 +2093,7 @@ 0 }; char * breakSelector; sqInt breakSelectorLength = -1; -const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscog-eem.950"; +const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscog-eem.951"; volatile int sendTrace; sqInt suppressHeartbeatFlag; @@ -57323,7 +57323,7 @@ sqInt objFormat; sqInt sz; - if (((highWord = ((sqInt) integerValue) >> 32)) == 0) { + if (((highWord = ((sqLong) integerValue) >> 32)) == 0) { return positive32BitIntegerFor(integerValue); } sz = 5; Modified: branches/Cog/nsspurstacksrc/vm/interp.c =================================================================== --- branches/Cog/nsspurstacksrc/vm/interp.c 2014-11-21 23:07:35 UTC (rev 3144) +++ branches/Cog/nsspurstacksrc/vm/interp.c 2014-11-22 02:27:30 UTC (rev 3145) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.950 uuid: d4d2d679-fd90-48f5-a47a-ebae021776e7 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.951 uuid: f669df37-8b1c-41de-b9ab-a6626a19f914 from - StackInterpreter VMMaker.oscog-eem.950 uuid: d4d2d679-fd90-48f5-a47a-ebae021776e7 + StackInterpreter VMMaker.oscog-eem.951 uuid: f669df37-8b1c-41de-b9ab-a6626a19f914 */ -static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.950 uuid: d4d2d679-fd90-48f5-a47a-ebae021776e7 " __DATE__ ; +static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.951 uuid: f669df37-8b1c-41de-b9ab-a6626a19f914 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2090,7 +2090,7 @@ 0 }; char * breakSelector; sqInt breakSelectorLength = -1; -const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscog-eem.950"; +const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscog-eem.951"; volatile int sendTrace; sqInt suppressHeartbeatFlag; @@ -57314,7 +57314,7 @@ sqInt objFormat; sqInt sz; - if (((highWord = ((sqInt) integerValue) >> 32)) == 0) { + if (((highWord = ((sqLong) integerValue) >> 32)) == 0) { return positive32BitIntegerFor(integerValue); } sz = 5; Property changes on: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h ___________________________________________________________________ Modified: checkindate - Fri Nov 21 15:06:48 PST 2014 + Fri Nov 21 18:27:16 PST 2014 Modified: branches/Cog/sistasrc/vm/cointerp.c =================================================================== --- branches/Cog/sistasrc/vm/cointerp.c 2014-11-21 23:07:35 UTC (rev 3144) +++ branches/Cog/sistasrc/vm/cointerp.c 2014-11-22 02:27:30 UTC (rev 3145) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.950 uuid: d4d2d679-fd90-48f5-a47a-ebae021776e7 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.951 uuid: f669df37-8b1c-41de-b9ab-a6626a19f914 from - CoInterpreter VMMaker.oscog-eem.950 uuid: d4d2d679-fd90-48f5-a47a-ebae021776e7 + CoInterpreter VMMaker.oscog-eem.951 uuid: f669df37-8b1c-41de-b9ab-a6626a19f914 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.950 uuid: d4d2d679-fd90-48f5-a47a-ebae021776e7 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.951 uuid: f669df37-8b1c-41de-b9ab-a6626a19f914 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2090,7 +2090,7 @@ /* 574 */ (void (*)(void))0, /* 575 */ (void (*)(void))0, 0 }; -const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreterPrimitives VMMaker.oscog-eem.950]"; +const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreterPrimitives VMMaker.oscog-eem.951]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -7925,7 +7925,7 @@ /* bytecodePrimBitShift */ { sqInt integerArgument; - sqLong integerReceiver; + usqInt integerReceiver; sqInt shifted; char *sp; @@ -7985,7 +7985,7 @@ null; goto l88; } - shifted = ((unsigned sqLong)integerReceiver) >> (0 - integerArgument); + shifted = ((usqInt) integerReceiver) >> (0 - integerArgument); } shifted = positive32BitIntegerFor(shifted); /* begin pop:thenPush: */ @@ -10891,7 +10891,7 @@ /* bytecodePrimBitShift */ { sqInt integerArgument; - sqLong integerReceiver; + usqInt integerReceiver; sqInt shifted; char *sp; @@ -10951,7 +10951,7 @@ null; goto l202; } - shifted = ((unsigned sqLong)integerReceiver) >> (0 - integerArgument); + shifted = ((usqInt) integerReceiver) >> (0 - integerArgument); } shifted = positive32BitIntegerFor(shifted); /* begin pop:thenPush: */ @@ -24535,7 +24535,7 @@ primitiveBitShift(void) { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt integerArgument; - sqLong integerReceiver; + usqInt integerReceiver; sqInt shifted; char *sp; @@ -24582,7 +24582,7 @@ } return; } - shifted = ((unsigned sqLong)integerReceiver) >> (0 - integerArgument); + shifted = ((usqInt) integerReceiver) >> (0 - integerArgument); } shifted = positive32BitIntegerFor(shifted); /* begin pop:thenPush: */ @@ -48429,7 +48429,7 @@ sqInt newLargeInteger; sqInt sz; - if (((highWord = ((sqInt) integerValue) >> 32)) == 0) { + if (((highWord = ((sqLong) integerValue) >> 32)) == 0) { return positive32BitIntegerFor(integerValue); } sz = 5; Modified: branches/Cog/sistasrc/vm/cointerp.h =================================================================== --- branches/Cog/sistasrc/vm/cointerp.h 2014-11-21 23:07:35 UTC (rev 3144) +++ branches/Cog/sistasrc/vm/cointerp.h 2014-11-22 02:27:30 UTC (rev 3145) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.950 uuid: d4d2d679-fd90-48f5-a47a-ebae021776e7 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.951 uuid: f669df37-8b1c-41de-b9ab-a6626a19f914 */ Modified: branches/Cog/sistasrc/vm/gcc3x-cointerp.c =================================================================== --- branches/Cog/sistasrc/vm/gcc3x-cointerp.c 2014-11-21 23:07:35 UTC (rev 3144) +++ branches/Cog/sistasrc/vm/gcc3x-cointerp.c 2014-11-22 02:27:30 UTC (rev 3145) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.950 uuid: d4d2d679-fd90-48f5-a47a-ebae021776e7 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.951 uuid: f669df37-8b1c-41de-b9ab-a6626a19f914 from - CoInterpreter VMMaker.oscog-eem.950 uuid: d4d2d679-fd90-48f5-a47a-ebae021776e7 + CoInterpreter VMMaker.oscog-eem.951 uuid: f669df37-8b1c-41de-b9ab-a6626a19f914 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.950 uuid: d4d2d679-fd90-48f5-a47a-ebae021776e7 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.951 uuid: f669df37-8b1c-41de-b9ab-a6626a19f914 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2093,7 +2093,7 @@ /* 574 */ (void (*)(void))0, /* 575 */ (void (*)(void))0, 0 }; -const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreterPrimitives VMMaker.oscog-eem.950]"; +const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreterPrimitives VMMaker.oscog-eem.951]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -7934,7 +7934,7 @@ /* bytecodePrimBitShift */ { sqInt integerArgument; - sqLong integerReceiver; + usqInt integerReceiver; sqInt shifted; char *sp; @@ -7994,7 +7994,7 @@ null; goto l88; } - shifted = ((unsigned sqLong)integerReceiver) >> (0 - integerArgument); + shifted = ((usqInt) integerReceiver) >> (0 - integerArgument); } shifted = positive32BitIntegerFor(shifted); /* begin pop:thenPush: */ @@ -10900,7 +10900,7 @@ /* bytecodePrimBitShift */ { sqInt integerArgument; - sqLong integerReceiver; + usqInt integerReceiver; sqInt shifted; char *sp; @@ -10960,7 +10960,7 @@ null; goto l202; } - shifted = ((unsigned sqLong)integerReceiver) >> (0 - integerArgument); + shifted = ((usqInt) integerReceiver) >> (0 - integerArgument); } shifted = positive32BitIntegerFor(shifted); /* begin pop:thenPush: */ @@ -24544,7 +24544,7 @@ primitiveBitShift(void) { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt integerArgument; - sqLong integerReceiver; + usqInt integerReceiver; sqInt shifted; char *sp; @@ -24591,7 +24591,7 @@ } return; } - shifted = ((unsigned sqLong)integerReceiver) >> (0 - integerArgument); + shifted = ((usqInt) integerReceiver) >> (0 - integerArgument); } shifted = positive32BitIntegerFor(shifted); /* begin pop:thenPush: */ @@ -48438,7 +48438,7 @@ sqInt newLargeInteger; sqInt sz; - if (((highWord = ((sqInt) integerValue) >> 32)) == 0) { + if (((highWord = ((sqLong) integerValue) >> 32)) == 0) { return positive32BitIntegerFor(integerValue); } sz = 5; Modified: branches/Cog/spursistasrc/vm/cointerp.c =================================================================== --- branches/Cog/spursistasrc/vm/cointerp.c 2014-11-21 23:07:35 UTC (rev 3144) +++ branches/Cog/spursistasrc/vm/cointerp.c 2014-11-22 02:27:30 UTC (rev 3145) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.950 uuid: d4d2d679-fd90-48f5-a47a-ebae021776e7 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.951 uuid: f669df37-8b1c-41de-b9ab-a6626a19f914 from - CoInterpreter VMMaker.oscog-eem.950 uuid: d4d2d679-fd90-48f5-a47a-ebae021776e7 + CoInterpreter VMMaker.oscog-eem.951 uuid: f669df37-8b1c-41de-b9ab-a6626a19f914 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.950 uuid: d4d2d679-fd90-48f5-a47a-ebae021776e7 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.951 uuid: f669df37-8b1c-41de-b9ab-a6626a19f914 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2339,7 +2339,7 @@ /*540*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, /*560*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, 0, 0, 0,-1,-1 }; -const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreterPrimitives VMMaker.oscog-eem.950]"; +const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreterPrimitives VMMaker.oscog-eem.951]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -9389,7 +9389,7 @@ /* bytecodePrimBitShift */ { sqInt integerArgument; - usqInt integerReceiver; + sqLong integerReceiver; sqInt shifted; char *sp; @@ -9449,7 +9449,7 @@ null; goto l97; } - shifted = ((usqInt) integerReceiver) >> (0 - integerArgument); + shifted = ((unsigned sqLong)integerReceiver) >> (0 - integerArgument); } shifted = positive32BitIntegerFor(shifted); /* begin pop:thenPush: */ @@ -12426,7 +12426,7 @@ /* bytecodePrimBitShift */ { sqInt integerArgument; - usqInt integerReceiver; + sqLong integerReceiver; sqInt shifted; char *sp; @@ -12486,7 +12486,7 @@ null; goto l223; } - shifted = ((usqInt) integerReceiver) >> (0 - integerArgument); + shifted = ((unsigned sqLong)integerReceiver) >> (0 - integerArgument); } shifted = positive32BitIntegerFor(shifted); /* begin pop:thenPush: */ @@ -30129,7 +30129,7 @@ primitiveBitShift(void) { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt integerArgument; - usqInt integerReceiver; + sqLong integerReceiver; sqInt shifted; char *sp; @@ -30176,7 +30176,7 @@ } return; } - shifted = ((usqInt) integerReceiver) >> (0 - integerArgument); + shifted = ((unsigned sqLong)integerReceiver) >> (0 - integerArgument); } shifted = positive32BitIntegerFor(shifted); /* begin pop:thenPush: */ @@ -69155,7 +69155,7 @@ sqInt objFormat; sqInt sz; - if (((highWord = ((sqInt) integerValue) >> 32)) == 0) { + if (((highWord = ((sqLong) integerValue) >> 32)) == 0) { return positive32BitIntegerFor(integerValue); } sz = 5; Modified: branches/Cog/spursistasrc/vm/cointerp.h =================================================================== --- branches/Cog/spursistasrc/vm/cointerp.h 2014-11-21 23:07:35 UTC (rev 3144) +++ branches/Cog/spursistasrc/vm/cointerp.h 2014-11-22 02:27:30 UTC (rev 3145) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.950 uuid: d4d2d679-fd90-48f5-a47a-ebae021776e7 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.951 uuid: f669df37-8b1c-41de-b9ab-a6626a19f914 */ Modified: branches/Cog/spursistasrc/vm/gcc3x-cointerp.c =================================================================== --- branches/Cog/spursistasrc/vm/gcc3x-cointerp.c 2014-11-21 23:07:35 UTC (rev 3144) +++ branches/Cog/spursistasrc/vm/gcc3x-cointerp.c 2014-11-22 02:27:30 UTC (rev 3145) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.950 uuid: d4d2d679-fd90-48f5-a47a-ebae021776e7 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.951 uuid: f669df37-8b1c-41de-b9ab-a6626a19f914 from - CoInterpreter VMMaker.oscog-eem.950 uuid: d4d2d679-fd90-48f5-a47a-ebae021776e7 + CoInterpreter VMMaker.oscog-eem.951 uuid: f669df37-8b1c-41de-b9ab-a6626a19f914 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.950 uuid: d4d2d679-fd90-48f5-a47a-ebae021776e7 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.951 uuid: f669df37-8b1c-41de-b9ab-a6626a19f914 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2342,7 +2342,7 @@ /*540*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, /*560*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, 0, 0, 0,-1,-1 }; -const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreterPrimitives VMMaker.oscog-eem.950]"; +const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreterPrimitives VMMaker.oscog-eem.951]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -9398,7 +9398,7 @@ /* bytecodePrimBitShift */ { sqInt integerArgument; - usqInt integerReceiver; + sqLong integerReceiver; sqInt shifted; char *sp; @@ -9458,7 +9458,7 @@ null; goto l97; } - shifted = ((usqInt) integerReceiver) >> (0 - integerArgument); + shifted = ((unsigned sqLong)integerReceiver) >> (0 - integerArgument); } shifted = positive32BitIntegerFor(shifted); /* begin pop:thenPush: */ @@ -12435,7 +12435,7 @@ /* bytecodePrimBitShift */ { sqInt integerArgument; - usqInt integerReceiver; + sqLong integerReceiver; sqInt shifted; char *sp; @@ -12495,7 +12495,7 @@ null; goto l223; } - shifted = ((usqInt) integerReceiver) >> (0 - integerArgument); + shifted = ((unsigned sqLong)integerReceiver) >> (0 - integerArgument); } shifted = positive32BitIntegerFor(shifted); /* begin pop:thenPush: */ @@ -30138,7 +30138,7 @@ primitiveBitShift(void) { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt integerArgument; - usqInt integerReceiver; + sqLong integerReceiver; sqInt shifted; char *sp; @@ -30185,7 +30185,7 @@ } return; } - shifted = ((usqInt) integerReceiver) >> (0 - integerArgument); + shifted = ((unsigned sqLong)integerReceiver) >> (0 - integerArgument); } shifted = positive32BitIntegerFor(shifted); /* begin pop:thenPush: */ @@ -69164,7 +69164,7 @@ sqInt objFormat; sqInt sz; - if (((highWord = ((sqInt) integerValue) >> 32)) == 0) { + if (((highWord = ((sqLong) integerValue) >> 32)) == 0) { return positive32BitIntegerFor(integerValue); } sz = 5; Modified: branches/Cog/spursrc/vm/cointerp.c =================================================================== --- branches/Cog/spursrc/vm/cointerp.c 2014-11-21 23:07:35 UTC (rev 3144) +++ branches/Cog/spursrc/vm/cointerp.c 2014-11-22 02:27:30 UTC (rev 3145) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.950 uuid: d4d2d679-fd90-48f5-a47a-ebae021776e7 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.951 uuid: f669df37-8b1c-41de-b9ab-a6626a19f914 from - CoInterpreter VMMaker.oscog-eem.950 uuid: d4d2d679-fd90-48f5-a47a-ebae021776e7 + CoInterpreter VMMaker.oscog-eem.951 uuid: f669df37-8b1c-41de-b9ab-a6626a19f914 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.950 uuid: d4d2d679-fd90-48f5-a47a-ebae021776e7 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.951 uuid: f669df37-8b1c-41de-b9ab-a6626a19f914 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2330,7 +2330,7 @@ /*540*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, /*560*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, 0, 0, 0,-1,-1 }; -const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreterPrimitives VMMaker.oscog-eem.950]"; +const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreterPrimitives VMMaker.oscog-eem.951]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -18912,12 +18912,12 @@ sqInt classTablePage; size_t dataSize; sqInt edenBytes; - sqInt firstSegSize; + long firstSegSize; sqInt hdrCogCodeSize; sqInt hdrEdenBytes; sqInt hdrMaxExtSemTabSize; sqInt hdrNumStackPages; - sqInt headerFlags; + long headerFlags; sqInt headerSize; squeakFileOffsetType headerStart; usqInt heapSize; @@ -18936,7 +18936,7 @@ usqInt minimumMemory; usqInt numSlots; sqInt objOop; - sqInt oldBaseAddr; + long oldBaseAddr; sqInt oldStart; sqInt oop; sqInt p; @@ -18979,9 +18979,9 @@ /* begin getLongFromFile:swap: */ w1 = 0; sqImageFileRead((&w1), sizeof(long), 1, f); - dataSize = (swapBytes - ? ((((((usqInt) w1 >> 24)) & Byte0Mask) + ((((usqInt) w1 >> 8)) & Byte1Mask)) + ((((usqInt) w1 << 8)) & Byte2Mask)) + ((((usqInt) w1 << 24)) & Byte3Mask) - : w1); + dataSize = ((long) ((swapBytes + ? ((((((usqInt) w1 >> 24)) & Byte0Mask) + ((((usqInt) w1 >> 8)) & Byte1Mask)) + ((((usqInt) w1 << 8)) & Byte2Mask)) + ((((usqInt) w1 << 24)) & Byte3Mask) + : w1))); /* begin getLongFromFile:swap: */ w2 = 0; sqImageFileRead((&w2), sizeof(long), 1, f); @@ -18992,24 +18992,24 @@ /* begin getLongFromFile:swap: */ w3 = 0; sqImageFileRead((&w3), sizeof(long), 1, f); - anObject = (swapBytes - ? ((((((usqInt) w3 >> 24)) & Byte0Mask) + ((((usqInt) w3 >> 8)) & Byte1Mask)) + ((((usqInt) w3 << 8)) & Byte2Mask)) + ((((usqInt) w3 << 24)) & Byte3Mask) - : w3); + anObject = ((long) ((swapBytes + ? ((((((usqInt) w3 >> 24)) & Byte0Mask) + ((((usqInt) w3 >> 8)) & Byte1Mask)) + ((((usqInt) w3 << 8)) & Byte2Mask)) + ((((usqInt) w3 << 24)) & Byte3Mask) + : w3))); GIV(specialObjectsOop) = anObject; /* begin lastHash: */ /* begin getLongFromFile:swap: */ w4 = 0; sqImageFileRead((&w4), sizeof(long), 1, f); - seed = (swapBytes - ? ((((((usqInt) w4 >> 24)) & Byte0Mask) + ((((usqInt) w4 >> 8)) & Byte1Mask)) + ((((usqInt) w4 << 8)) & Byte2Mask)) + ((((usqInt) w4 << 24)) & Byte3Mask) - : w4); + seed = ((long) ((swapBytes + ? ((((((usqInt) w4 >> 24)) & Byte0Mask) + ((((usqInt) w4 >> 8)) & Byte1Mask)) + ((((usqInt) w4 << 8)) & Byte2Mask)) + ((((usqInt) w4 << 24)) & Byte3Mask) + : w4))); GIV(lastHash) = seed; /* begin getLongFromFile:swap: */ w5 = 0; sqImageFileRead((&w5), sizeof(long), 1, f); - GIV(savedWindowSize) = (swapBytes - ? ((((((usqInt) w5 >> 24)) & Byte0Mask) + ((((usqInt) w5 >> 8)) & Byte1Mask)) + ((((usqInt) w5 << 8)) & Byte2Mask)) + ((((usqInt) w5 << 24)) & Byte3Mask) - : w5); + GIV(savedWindowSize) = ((long) ((swapBytes + ? ((((((usqInt) w5 >> 24)) & Byte0Mask) + ((((usqInt) w5 >> 8)) & Byte1Mask)) + ((((usqInt) w5 << 8)) & Byte2Mask)) + ((((usqInt) w5 << 24)) & Byte3Mask) + : w5))); /* begin getLongFromFile:swap: */ w6 = 0; sqImageFileRead((&w6), sizeof(long), 1, f); @@ -63799,7 +63799,7 @@ sqInt objFormat; sqInt sz; - if (((highWord = ((sqInt) integerValue) >> 32)) == 0) { + if (((highWord = ((sqLong) integerValue) >> 32)) == 0) { return positive32BitIntegerFor(integerValue); } sz = 5; Modified: branches/Cog/spursrc/vm/cointerp.h =================================================================== --- branches/Cog/spursrc/vm/cointerp.h 2014-11-21 23:07:35 UTC (rev 3144) +++ branches/Cog/spursrc/vm/cointerp.h 2014-11-22 02:27:30 UTC (rev 3145) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.950 uuid: d4d2d679-fd90-48f5-a47a-ebae021776e7 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.951 uuid: f669df37-8b1c-41de-b9ab-a6626a19f914 */ Modified: branches/Cog/spursrc/vm/gcc3x-cointerp.c =================================================================== --- branches/Cog/spursrc/vm/gcc3x-cointerp.c 2014-11-21 23:07:35 UTC (rev 3144) +++ branches/Cog/spursrc/vm/gcc3x-cointerp.c 2014-11-22 02:27:30 UTC (rev 3145) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.950 uuid: d4d2d679-fd90-48f5-a47a-ebae021776e7 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.951 uuid: f669df37-8b1c-41de-b9ab-a6626a19f914 from - CoInterpreter VMMaker.oscog-eem.950 uuid: d4d2d679-fd90-48f5-a47a-ebae021776e7 + CoInterpreter VMMaker.oscog-eem.951 uuid: f669df37-8b1c-41de-b9ab-a6626a19f914 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.950 uuid: d4d2d679-fd90-48f5-a47a-ebae021776e7 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.951 uuid: f669df37-8b1c-41de-b9ab-a6626a19f914 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2333,7 +2333,7 @@ /*540*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, /*560*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, 0, 0, 0,-1,-1 }; -const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreterPrimitives VMMaker.oscog-eem.950]"; +const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreterPrimitives VMMaker.oscog-eem.951]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -18921,12 +18921,12 @@ sqInt classTablePage; size_t dataSize; sqInt edenBytes; - sqInt firstSegSize; + long firstSegSize; sqInt hdrCogCodeSize; sqInt hdrEdenBytes; sqInt hdrMaxExtSemTabSize; sqInt hdrNumStackPages; - sqInt headerFlags; + long headerFlags; sqInt headerSize; squeakFileOffsetType headerStart; usqInt heapSize; @@ -18945,7 +18945,7 @@ usqInt minimumMemory; usqInt numSlots; sqInt objOop; - sqInt oldBaseAddr; + long oldBaseAddr; sqInt oldStart; sqInt oop; sqInt p; @@ -18988,9 +18988,9 @@ /* begin getLongFromFile:swap: */ w1 = 0; sqImageFileRead((&w1), sizeof(long), 1, f); - dataSize = (swapBytes - ? ((((((usqInt) w1 >> 24)) & Byte0Mask) + ((((usqInt) w1 >> 8)) & Byte1Mask)) + ((((usqInt) w1 << 8)) & Byte2Mask)) + ((((usqInt) w1 << 24)) & Byte3Mask) - : w1); + dataSize = ((long) ((swapBytes + ? ((((((usqInt) w1 >> 24)) & Byte0Mask) + ((((usqInt) w1 >> 8)) & Byte1Mask)) + ((((usqInt) w1 << 8)) & Byte2Mask)) + ((((usqInt) w1 << 24)) & Byte3Mask) + : w1))); /* begin getLongFromFile:swap: */ w2 = 0; sqImageFileRead((&w2), sizeof(long), 1, f); @@ -19001,24 +19001,24 @@ /* begin getLongFromFile:swap: */ w3 = 0; sqImageFileRead((&w3), sizeof(long), 1, f); - anObject = (swapBytes - ? ((((((usqInt) w3 >> 24)) & Byte0Mask) + ((((usqInt) w3 >> 8)) & Byte1Mask)) + ((((usqInt) w3 << 8)) & Byte2Mask)) + ((((usqInt) w3 << 24)) & Byte3Mask) - : w3); + anObject = ((long) ((swapBytes + ? ((((((usqInt) w3 >> 24)) & Byte0Mask) + ((((usqInt) w3 >> 8)) & Byte1Mask)) + ((((usqInt) w3 << 8)) & Byte2Mask)) + ((((usqInt) w3 << 24)) & Byte3Mask) + : w3))); GIV(specialObjectsOop) = anObject; /* begin lastHash: */ /* begin getLongFromFile:swap: */ w4 = 0; sqImageFileRead((&w4), sizeof(long), 1, f); - seed = (swapBytes - ? ((((((usqInt) w4 >> 24)) & Byte0Mask) + ((((usqInt) w4 >> 8)) & Byte1Mask)) + ((((usqInt) w4 << 8)) & Byte2Mask)) + ((((usqInt) w4 << 24)) & Byte3Mask) - : w4); + seed = ((long) ((swapBytes + ? ((((((usqInt) w4 >> 24)) & Byte0Mask) + ((((usqInt) w4 >> 8)) & Byte1Mask)) + ((((usqInt) w4 << 8)) & Byte2Mask)) + ((((usqInt) w4 << 24)) & Byte3Mask) + : w4))); GIV(lastHash) = seed; /* begin getLongFromFile:swap: */ w5 = 0; sqImageFileRead((&w5), sizeof(long), 1, f); - GIV(savedWindowSize) = (swapBytes - ? ((((((usqInt) w5 >> 24)) & Byte0Mask) + ((((usqInt) w5 >> 8)) & Byte1Mask)) + ((((usqInt) w5 << 8)) & Byte2Mask)) + ((((usqInt) w5 << 24)) & Byte3Mask) - : w5); + GIV(savedWindowSize) = ((long) ((swapBytes + ? ((((((usqInt) w5 >> 24)) & Byte0Mask) + ((((usqInt) w5 >> 8)) & Byte1Mask)) + ((((usqInt) w5 << 8)) & Byte2Mask)) + ((((usqInt) w5 << 24)) & Byte3Mask) + : w5))); /* begin getLongFromFile:swap: */ w6 = 0; sqImageFileRead((&w6), sizeof(long), 1, f); @@ -63808,7 +63808,7 @@ sqInt objFormat; sqInt sz; - if (((highWord = ((sqInt) integerValue) >> 32)) == 0) { + if (((highWord = ((sqLong) integerValue) >> 32)) == 0) { return positive32BitIntegerFor(integerValue); } sz = 5; Modified: branches/Cog/spurstacksrc/vm/gcc3x-interp.c =================================================================== --- branches/Cog/spurstacksrc/vm/gcc3x-interp.c 2014-11-21 23:07:35 UTC (rev 3144) +++ branches/Cog/spurstacksrc/vm/gcc3x-interp.c 2014-11-22 02:27:30 UTC (rev 3145) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.950 uuid: d4d2d679-fd90-48f5-a47a-ebae021776e7 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.951 uuid: f669df37-8b1c-41de-b9ab-a6626a19f914 from - StackInterpreter VMMaker.oscog-eem.950 uuid: d4d2d679-fd90-48f5-a47a-ebae021776e7 + StackInterpreter VMMaker.oscog-eem.951 uuid: f669df37-8b1c-41de-b9ab-a6626a19f914 */ -static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.950 uuid: d4d2d679-fd90-48f5-a47a-ebae021776e7 " __DATE__ ; +static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.951 uuid: f669df37-8b1c-41de-b9ab-a6626a19f914 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2083,7 +2083,7 @@ 0 }; char * breakSelector; sqInt breakSelectorLength = -1; -const char *interpreterVersion = "Croquet Closure Stack VM [StackInterpreterPrimitives VMMaker.oscog-eem.950]"; +const char *interpreterVersion = "Croquet Closure Stack VM [StackInterpreterPrimitives VMMaker.oscog-eem.951]"; volatile int sendTrace; sqInt suppressHeartbeatFlag; @@ -52428,7 +52428,7 @@ sqInt objFormat; sqInt sz; - if (((highWord = ((sqInt) integerValue) >> 32)) == 0) { + if (((highWord = ((sqLong) integerValue) >> 32)) == 0) { return positive32BitIntegerFor(integerValue); } sz = 5; Modified: branches/Cog/spurstacksrc/vm/interp.c =================================================================== --- branches/Cog/spurstacksrc/vm/interp.c 2014-11-21 23:07:35 UTC (rev 3144) +++ branches/Cog/spurstacksrc/vm/interp.c 2014-11-22 02:27:30 UTC (rev 3145) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.950 uuid: d4d2d679-fd90-48f5-a47a-ebae021776e7 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.951 uuid: f669df37-8b1c-41de-b9ab-a6626a19f914 from - StackInterpreter VMMaker.oscog-eem.950 uuid: d4d2d679-fd90-48f5-a47a-ebae021776e7 + StackInterpreter VMMaker.oscog-eem.951 uuid: f669df37-8b1c-41de-b9ab-a6626a19f914 */ -static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.950 uuid: d4d2d679-fd90-48f5-a47a-ebae021776e7 " __DATE__ ; +static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.951 uuid: f669df37-8b1c-41de-b9ab-a6626a19f914 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2080,7 +2080,7 @@ 0 }; char * breakSelector; sqInt breakSelectorLength = -1; -const char *interpreterVersion = "Croquet Closure Stack VM [StackInterpreterPrimitives VMMaker.oscog-eem.950]"; +const char *interpreterVersion = "Croquet Closure Stack VM [StackInterpreterPrimitives VMMaker.oscog-eem.951]"; volatile int sendTrace; sqInt suppressHeartbeatFlag; @@ -52419,7 +52419,7 @@ sqInt objFormat; sqInt sz; - if (((highWord = ((sqInt) integerValue) >> 32)) == 0) { + if (((highWord = ((sqLong) integerValue) >> 32)) == 0) { return positive32BitIntegerFor(integerValue); } sz = 5; Modified: branches/Cog/src/vm/cointerp.c =================================================================== --- branches/Cog/src/vm/cointerp.c 2014-11-21 23:07:35 UTC (rev 3144) +++ branches/Cog/src/vm/cointerp.c 2014-11-22 02:27:30 UTC (rev 3145) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.950 uuid: d4d2d679-fd90-48f5-a47a-ebae021776e7 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.951 uuid: f669df37-8b1c-41de-b9ab-a6626a19f914 from - CoInterpreter VMMaker.oscog-eem.950 uuid: d4d2d679-fd90-48f5-a47a-ebae021776e7 + CoInterpreter VMMaker.oscog-eem.951 uuid: f669df37-8b1c-41de-b9ab-a6626a19f914 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.950 uuid: d4d2d679-fd90-48f5-a47a-ebae021776e7 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.951 uuid: f669df37-8b1c-41de-b9ab-a6626a19f914 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -846,7 +846,7 @@ void printWronglySizedContexts(sqInt printContexts); static void restoreHeadersFromtofromandtofrom(sqInt firstIn, sqInt lastIn, sqInt hdrBaseIn, sqInt firstOut, sqInt lastOut, sqInt hdrBaseOut) NoDbgRegParms; static void runLeakCheckerForFullGC(sqInt fullGCFlag) NoDbgRegParms; -static usqInt safeObjectAfter(sqInt oop) NoDbgRegParms; +static sqInt safeObjectAfter(sqInt oop) NoDbgRegParms; static sqInt safePrintStringOf(sqInt oop) NoDbgRegParms; static sqInt shortentoIndexableSize(sqInt obj, sqInt nSlots) NoDbgRegParms; static sqInt sizeBitsOfSafe(sqInt oop) NoDbgRegParms; @@ -2081,7 +2081,7 @@ /* 574 */ (void (*)(void))0, /* 575 */ (void (*)(void))0, 0 }; -const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreterPrimitives VMMaker.oscog-eem.950]"; +const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreterPrimitives VMMaker.oscog-eem.951]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -14648,13 +14648,13 @@ sqInt classArrayClass; sqInt classArrayObj; size_t dataSize; - sqInt firstSegSize; + long firstSegSize; sqInt hdrCogCodeSize; sqInt hdrEdenBytes; sqInt hdrMaxExtSemTabSize; sqInt hdrNumStackPages; sqInt header; - sqInt headerFlags; + long headerFlags; sqInt headerSize; squeakFileOffsetType headerStart; usqInt heapSize; @@ -14671,7 +14671,7 @@ sqInt memEnd; sqInt memLimit; usqInt minimumMemory; - sqInt oldBaseAddr; + long oldBaseAddr; sqInt oop; sqInt swapBytes; sqInt sz; @@ -14711,9 +14711,9 @@ /* begin getLongFromFile:swap: */ w1 = 0; sqImageFileRead((&w1), sizeof(long), 1, f); - dataSize = (swapBytes - ? byteSwapped(w1) - : w1); + dataSize = ((long) ((swapBytes + ? byteSwapped(w1) + : w1))); /* begin getLongFromFile:swap: */ w2 = 0; sqImageFileRead((&w2), sizeof(long), 1, f); @@ -14724,24 +14724,24 @@ /* begin getLongFromFile:swap: */ w11 = 0; sqImageFileRead((&w11), sizeof(long), 1, f); - anObject = (swapBytes - ? byteSwapped(w11) - : w11); + anObject = ((long) ((swapBytes + ? byteSwapped(w11) + : w11))); GIV(specialObjectsOop) = anObject; /* begin lastHash: */ /* begin getLongFromFile:swap: */ w12 = 0; sqImageFileRead((&w12), sizeof(long), 1, f); - aValue = (swapBytes - ? byteSwapped(w12) - : w12); + aValue = ((long) ((swapBytes + ? byteSwapped(w12) + : w12))); lastHash = aValue; /* begin getLongFromFile:swap: */ w3 = 0; sqImageFileRead((&w3), sizeof(long), 1, f); - GIV(savedWindowSize) = (swapBytes - ? byteSwapped(w3) - : w3); + GIV(savedWindowSize) = ((long) ((swapBytes + ? byteSwapped(w3) + : w3))); /* begin getLongFromFile:swap: */ w4 = 0; sqImageFileRead((&w4), sizeof(long), 1, f); @@ -32243,15 +32243,17 @@ sqInt header1; sqInt header2; sqInt header3; + sqInt header4; usqInt lastWord; sqInt newFreeChunk; sqInt newOop; - usqInt next; + sqInt next; sqInt oop; sqInt realHeader; sqInt sz; sqInt sz1; sqInt sz2; + sqInt sz3; sqInt target; usqInt w; @@ -32262,7 +32264,21 @@ /* begin objectAfterWhileForwarding: */ header2 = longAt(oop); if ((header2 & MarkBit) == 0) { - next = ((sqInt) (objectAfter(oop))); + /* begin objectAfter: */ + if (!(asserta(oopisLessThan(oop, GIV(freeStart))))) { + error("no objects after the end of memory"); + } + if (((longAt(oop)) & TypeMask) == HeaderTypeFree) { + sz2 = (longAt(oop)) & AllButTypeMask; + } + else { + /* begin sizeBitsOf: */ + header3 = longAt(oop); + sz2 = ((header3 & TypeMask) == HeaderTypeSizeAndClass + ? (longAt(oop - (BytesPerWord * 2))) & LongSizeMask + : header3 & SizeMask); + } + next = (oop + sz2) + (headerTypeBytes[(longAt(oop + sz2)) & TypeMask]); goto l1; } fwdBlock1 = (header2 & AllButMarkBitAndTypeMask) << 1; @@ -32277,7 +32293,7 @@ else { sz1 = realHeader & SizeMask; } - next = ((sqInt) ((oop + sz1) + (headerTypeBytes[(longAt(oop + sz1)) & TypeMask]))); + next = (oop + sz1) + (headerTypeBytes[(longAt(oop + sz1)) & TypeMask]); l1: /* end objectAfterWhileForwarding: */; if (!(((longAt(oop)) & TypeMask) == HeaderTypeFree)) { @@ -32331,18 +32347,18 @@ } /* begin safeObjectAfter: */ if (((longAt(newFreeChunk)) & TypeMask) == HeaderTypeFree) { - sz2 = (longAt(newFreeChunk)) & AllButTypeMask; + sz3 = (longAt(newFreeChunk)) & AllButTypeMask; } else { /* begin sizeBitsOf: */ - header3 = longAt(newFreeChunk); - sz2 = ((header3 & TypeMask) == HeaderTypeSizeAndClass + header4 = longAt(newFreeChunk); + sz3 = ((header4 & TypeMask) == HeaderTypeSizeAndClass ? (longAt(newFreeChunk - (BytesPerWord * 2))) & LongSizeMask - : header3 & SizeMask); + : header4 & SizeMask); } - next = ((((usqInt)(newFreeChunk + sz2))) >= GIV(freeStart) + next = ((((usqInt)(newFreeChunk + sz3))) >= GIV(freeStart) ? GIV(freeStart) - : (newFreeChunk + sz2) + (headerTypeBytes[(longAt(newFreeChunk + sz2)) & TypeMask])); + : (newFreeChunk + sz3) + (headerTypeBytes[(longAt(newFreeChunk + sz3)) & TypeMask])); assert((next == GIV(freeStart)) || (next == (oopFromChunk(GIV(compEnd))))); if (next == GIV(freeStart)) { @@ -34219,7 +34235,7 @@ given object or free chunk in memory. Return freeStart when enumeration is complete. This is for assertion checking only. */ -static usqInt +static sqInt safeObjectAfter(sqInt oop) { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt header; @@ -43790,7 +43806,7 @@ sqInt newLargeInteger; sqInt sz; - if (((highWord = ((sqInt) integerValue) >> 32)) == 0) { + if (((highWord = ((sqLong) integerValue) >> 32)) == 0) { return positive32BitIntegerFor(integerValue); } sz = 5; Modified: branches/Cog/src/vm/cointerp.h =================================================================== --- branches/Cog/src/vm/cointerp.h 2014-11-21 23:07:35 UTC (rev 3144) +++ branches/Cog/src/vm/cointerp.h 2014-11-22 02:27:30 UTC (rev 3145) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.950 uuid: d4d2d679-fd90-48f5-a47a-ebae021776e7 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.951 uuid: f669df37-8b1c-41de-b9ab-a6626a19f914 */ Modified: branches/Cog/src/vm/cointerpmt.c =================================================================== --- branches/Cog/src/vm/cointerpmt.c 2014-11-21 23:07:35 UTC (rev 3144) +++ branches/Cog/src/vm/cointerpmt.c 2014-11-22 02:27:30 UTC (rev 3145) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.950 uuid: d4d2d679-fd90-48f5-a47a-ebae021776e7 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.951 uuid: f669df37-8b1c-41de-b9ab-a6626a19f914 from - CoInterpreterMT VMMaker.oscog-eem.950 uuid: d4d2d679-fd90-48f5-a47a-ebae021776e7 + CoInterpreterMT VMMaker.oscog-eem.951 uuid: f669df37-8b1c-41de-b9ab-a6626a19f914 */ -static char __buildInfo[] = "CoInterpreterMT VMMaker.oscog-eem.950 uuid: d4d2d679-fd90-48f5-a47a-ebae021776e7 " __DATE__ ; +static char __buildInfo[] = "CoInterpreterMT VMMaker.oscog-eem.951 uuid: f669df37-8b1c-41de-b9ab-a6626a19f914 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2178,7 +2178,7 @@ /* 574 */ (void (*)(void))0, /* 575 */ (void (*)(void))0, 0 }; -const char *interpreterVersion = "Croquet Closure Cog MT VM [CoInterpreterMT VMMaker.oscog-eem.950]"; +const char *interpreterVersion = "Croquet Closure Cog MT VM [CoInterpreterMT VMMaker.oscog-eem.951]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; sqInt willNotThreadWarnCount; @@ -4815,6 +4815,7 @@ GIV(framePointer) = localFP; ceEnterCogCodePopReceiverReg(); + null; goto l133; } localIP = pointerForOop(longAt(localFP + FoxIFSavedIP)); @@ -4829,7 +4830,7 @@ /* begin fetchNextBytecode */ currentBytecode = byteAtPointer(++localIP); - /* return self */ + null; l133: /* end baseFrameReturn */; goto l132; } @@ -7862,7 +7863,7 @@ /* bytecodePrimBitShift */ { sqInt integerArgument; - sqLong integerReceiver; + usqInt integerReceiver; sqInt shifted; char *sp; @@ -7922,7 +7923,7 @@ null; goto l88; } - shifted = ((unsigned sqLong)integerReceiver) >> (0 - integerArgument); + shifted = ((usqInt) integerReceiver) >> (0 - integerArgument); } shifted = positive32BitIntegerFor(shifted); /* begin pop:thenPush: */ @@ -14936,13 +14937,13 @@ sqInt classArrayClass; sqInt classArrayObj; size_t dataSize; - sqInt firstSegSize; + long firstSegSize; sqInt hdrCogCodeSize; sqInt hdrEdenBytes; sqInt hdrMaxExtSemTabSize; sqInt hdrNumStackPages; sqInt header; - sqInt headerFlags; + long headerFlags; sqInt headerSize; squeakFileOffsetType headerStart; usqInt heapSize; @@ -14959,7 +14960,7 @@ sqInt memEnd; sqInt memLimit; usqInt minimumMemory; - sqInt oldBaseAddr; + long oldBaseAddr; sqInt oop; sqInt swapBytes; sqInt sz; @@ -14999,9 +15000,9 @@ /* begin getLongFromFile:swap: */ w1 = 0; sqImageFileRead((&w1), sizeof(long), 1, f); - dataSize = (swapBytes - ? byteSwapped(w1) - : w1); + dataSize = ((long) ((swapBytes + ? byteSwapped(w1) + : w1))); /* begin getLongFromFile:swap: */ w2 = 0; sqImageFileRead((&w2), sizeof(long), 1, f); @@ -15012,24 +15013,24 @@ /* begin getLongFromFile:swap: */ w11 = 0; sqImageFileRead((&w11), sizeof(long), 1, f); - anObject = (swapBytes - ? byteSwapped(w11) - : w11); + anObject = ((long) ((swapBytes + ? byteSwapped(w11) + : w11))); GIV(specialObjectsOop) = anObject; /* begin lastHash: */ /* begin getLongFromFile:swap: */ w12 = 0; sqImageFileRead((&w12), sizeof(long), 1, f); - aValue = (swapBytes - ? byteSwapped(w12) - : w12); + aValue = ((long) ((swapBytes + ? byteSwapped(w12) + : w12))); lastHash = aValue; /* begin getLongFromFile:swap: */ w3 = 0; sqImageFileRead((&w3), sizeof(long), 1, f); - GIV(savedWindowSize) = (swapBytes - ? byteSwapped(w3) - : w3); + GIV(savedWindowSize) = ((long) ((swapBytes + ? byteSwapped(w3) + : w3))); /* begin getLongFromFile:swap: */ w4 = 0; sqImageFileRead((&w4), sizeof(long), 1, f); @@ -22377,7 +22378,7 @@ primitiveBitShift(void) { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt integerArgument; - sqLong integerReceiver; + usqInt integerReceiver; sqInt shifted; char *sp; @@ -22424,7 +22425,7 @@ } return; } - shifted = ((unsigned sqLong)integerReceiver) >> (0 - integerArgument); + shifted = ((usqInt) integerReceiver) >> (0 - integerArgument); } shifted = positive32BitIntegerFor(shifted); /* begin pop:thenPush: */ @@ -45878,7 +45879,7 @@ sqInt newLargeInteger; sqInt sz; - if (((highWord = ((sqInt) integerValue) >> 32)) == 0) { + if (((highWord = ((sqLong) integerValue) >> 32)) == 0) { return positive32BitIntegerFor(integerValue); } sz = 5; Modified: branches/Cog/src/vm/cointerpmt.h =================================================================== --- branches/Cog/src/vm/cointerpmt.h 2014-11-21 23:07:35 UTC (rev 3144) +++ branches/Cog/src/vm/cointerpmt.h 2014-11-22 02:27:30 UTC (rev 3145) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.950 uuid: d4d2d679-fd90-48f5-a47a-ebae021776e7 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.951 uuid: f669df37-8b1c-41de-b9ab-a6626a19f914 */ Modified: branches/Cog/src/vm/gcc3x-cointerp.c =================================================================== --- branches/Cog/src/vm/gcc3x-cointerp.c 2014-11-21 23:07:35 UTC (rev 3144) +++ branches/Cog/src/vm/gcc3x-cointerp.c 2014-11-22 02:27:30 UTC (rev 3145) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.950 uuid: d4d2d679-fd90-48f5-a47a-ebae021776e7 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.951 uuid: f669df37-8b1c-41de-b9ab-a6626a19f914 from - CoInterpreter VMMaker.oscog-eem.950 uuid: d4d2d679-fd90-48f5-a47a-ebae021776e7 + CoInterpreter VMMaker.oscog-eem.951 uuid: f669df37-8b1c-41de-b9ab-a6626a19f914 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.950 uuid: d4d2d679-fd90-48f5-a47a-ebae021776e7 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.951 uuid: f669df37-8b1c-41de-b9ab-a6626a19f914 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -849,7 +849,7 @@ void printWronglySizedContexts(sqInt printContexts); @@ Diff output truncated at 50000 characters. @@

1 0

VM Maker: VMMaker.oscog-eem.951.mcz
by commits＠source.squeak.org 22 Nov '14

22 Nov '14

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.951.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.951 Author: eem Time: 21 November 2014, 6:14:25.455 pm UUID: f669df37-8b1c-41de-b9ab-a6626a19f914 Ancestors: VMMaker.oscog-eem.950 Fix positive64BitIntegerFor: by fixing new generateSignedShiftRight:on:indent:. Symptom is LargePositiveInteger results from primGetPosition: for SmallInteger values. =============== Diff against VMMaker.oscog-eem.950 =============== Item was changed: ----- Method: CCodeGenerator>>generateSignedShiftRight:on:indent: (in category 'C translation') ----- generateSignedShiftRight: msgNode on: aStream indent: level "Generate the C code for >>> onto the given stream." + (self is64BitIntegralVariable: msgNode receiver typeInto: [:t|]) + ifTrue: + [aStream nextPutAll: '((sqLong) '] + ifFalse: + [aStream nextPutAll: '((sqInt) ']. - aStream nextPutAll: '((sqInt) '. self emitCExpression: msgNode receiver on: aStream. aStream nextPutAll: ') >> '. self emitCExpression: msgNode args first on: aStream!

1 0

[commit][3144] CogVM source as per VMMaker.oscog-eem.950
by commits＠squeakvm.org 22 Nov '14

22 Nov '14

Revision: 3144 Author: eliot Date: 2014-11-21 15:07:35 -0800 (Fri, 21 Nov 2014) Log Message: ----------- CogVM source as per VMMaker.oscog-eem.950 Fix regression in new primitiveBitShift. Introduce >>> as an explicitly signed shift. 64-bit ize magnitude64BitIntegerFor:neg:, positive64BitIntegerFor: & signed64BitIntegerFor: Modified Paths: -------------- branches/Cog/nscogsrc/vm/cointerp.c branches/Cog/nscogsrc/vm/cointerp.h branches/Cog/nscogsrc/vm/gcc3x-cointerp.c branches/Cog/nsspursrc/vm/cointerp.c branches/Cog/nsspursrc/vm/cointerp.h branches/Cog/nsspursrc/vm/gcc3x-cointerp.c branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c branches/Cog/nsspurstacksrc/vm/interp.c branches/Cog/sistasrc/vm/cointerp.c branches/Cog/sistasrc/vm/cointerp.h branches/Cog/sistasrc/vm/gcc3x-cointerp.c branches/Cog/spursistasrc/vm/cointerp.c branches/Cog/spursistasrc/vm/cointerp.h branches/Cog/spursistasrc/vm/gcc3x-cointerp.c branches/Cog/spursrc/vm/cointerp.c branches/Cog/spursrc/vm/cointerp.h branches/Cog/spursrc/vm/gcc3x-cointerp.c branches/Cog/spurstacksrc/vm/gcc3x-interp.c branches/Cog/spurstacksrc/vm/interp.c branches/Cog/src/vm/cointerp.c branches/Cog/src/vm/cointerp.h branches/Cog/src/vm/cointerpmt.c branches/Cog/src/vm/cointerpmt.h branches/Cog/src/vm/gcc3x-cointerp.c branches/Cog/src/vm/gcc3x-cointerpmt.c branches/Cog/stacksrc/vm/gcc3x-interp.c branches/Cog/stacksrc/vm/interp.c Property Changed: ---------------- branches/Cog/platforms/Cross/vm/sqSCCSVersion.h Modified: branches/Cog/nscogsrc/vm/cointerp.c =================================================================== --- branches/Cog/nscogsrc/vm/cointerp.c 2014-11-21 05:05:31 UTC (rev 3143) +++ branches/Cog/nscogsrc/vm/cointerp.c 2014-11-21 23:07:35 UTC (rev 3144) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.948 uuid: 9323b2ad-f5cf-4aca-8f31-67eb5616ccca + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.950 uuid: d4d2d679-fd90-48f5-a47a-ebae021776e7 from - CoInterpreter VMMaker.oscog-eem.948 uuid: 9323b2ad-f5cf-4aca-8f31-67eb5616ccca + CoInterpreter VMMaker.oscog-eem.950 uuid: d4d2d679-fd90-48f5-a47a-ebae021776e7 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.948 uuid: 9323b2ad-f5cf-4aca-8f31-67eb5616ccca " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.950 uuid: d4d2d679-fd90-48f5-a47a-ebae021776e7 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2093,7 +2093,7 @@ /* 574 */ (void (*)(void))0, /* 575 */ (void (*)(void))0, 0 }; -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.948"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.950"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -7931,7 +7931,7 @@ /* bytecodePrimBitShift */ { sqInt integerArgument; - sqLong integerReceiver; + usqInt integerReceiver; sqInt shifted; char *sp; @@ -7959,7 +7959,7 @@ if (!GIV(primFailCode)) { if (((integerArgument = (integerArgument >> 1))) >= 0) { - /* Left shift -- must fail if we lose bits beyond 32 */ + /* Left shift -- must fail bits would be lost */ if (!(integerArgument <= 0x1F)) { /* begin primitiveFail */ @@ -7970,7 +7970,7 @@ goto l88; } shifted = integerReceiver << integerArgument; - if (!((((usqInt) shifted) >> integerArgument) == integerReceiver)) { + if (!(integerReceiver == (((usqInt) shifted) >> integerArgument))) { /* begin primitiveFail */ if (!GIV(primFailCode)) { GIV(primFailCode) = 1; @@ -7991,11 +7991,9 @@ null; goto l88; } - shifted = ((unsigned sqLong)integerReceiver) >> (0 - integerArgument); + shifted = ((usqInt) integerReceiver) >> (0 - integerArgument); } - shifted = ((shifted ^ (shifted << 1)) >= 0 - ? ((shifted << 1) | 1) - : positive32BitIntegerFor(shifted)); + shifted = positive32BitIntegerFor(shifted); /* begin pop:thenPush: */ longAtput((sp = GIV(stackPointer) + ((2 - 1) * BytesPerWord)), shifted); GIV(stackPointer) = sp; @@ -10868,7 +10866,7 @@ /* bytecodePrimBitShift */ { sqInt integerArgument; - sqLong integerReceiver; + usqInt integerReceiver; sqInt shifted; char *sp; @@ -10896,7 +10894,7 @@ if (!GIV(primFailCode)) { if (((integerArgument = (integerArgument >> 1))) >= 0) { - /* Left shift -- must fail if we lose bits beyond 32 */ + /* Left shift -- must fail bits would be lost */ if (!(integerArgument <= 0x1F)) { /* begin primitiveFail */ @@ -10907,7 +10905,7 @@ goto l203; } shifted = integerReceiver << integerArgument; - if (!((((usqInt) shifted) >> integerArgument) == integerReceiver)) { + if (!(integerReceiver == (((usqInt) shifted) >> integerArgument))) { /* begin primitiveFail */ if (!GIV(primFailCode)) { GIV(primFailCode) = 1; @@ -10928,11 +10926,9 @@ null; goto l203; } - shifted = ((unsigned sqLong)integerReceiver) >> (0 - integerArgument); + shifted = ((usqInt) integerReceiver) >> (0 - integerArgument); } - shifted = ((shifted ^ (shifted << 1)) >= 0 - ? ((shifted << 1) | 1) - : positive32BitIntegerFor(shifted)); + shifted = positive32BitIntegerFor(shifted); /* begin pop:thenPush: */ longAtput((sp = GIV(stackPointer) + ((2 - 1) * BytesPerWord)), shifted); GIV(stackPointer) = sp; @@ -19113,13 +19109,13 @@ sqInt classArrayClass; sqInt classArrayObj; size_t dataSize; - long firstSegSize; + sqInt firstSegSize; sqInt hdrCogCodeSize; sqInt hdrEdenBytes; sqInt hdrMaxExtSemTabSize; sqInt hdrNumStackPages; sqInt header; - long headerFlags; + sqInt headerFlags; sqInt headerSize; squeakFileOffsetType headerStart; usqInt heapSize; @@ -19136,7 +19132,7 @@ sqInt memEnd; sqInt memLimit; usqInt minimumMemory; - long oldBaseAddr; + sqInt oldBaseAddr; sqInt oop; sqInt swapBytes; sqInt sz; @@ -19176,9 +19172,9 @@ /* begin getLongFromFile:swap: */ w1 = 0; sqImageFileRead((&w1), sizeof(long), 1, f); - dataSize = ((long) ((swapBytes - ? byteSwapped(w1) - : w1))); + dataSize = (swapBytes + ? byteSwapped(w1) + : w1); /* begin getLongFromFile:swap: */ w2 = 0; sqImageFileRead((&w2), sizeof(long), 1, f); @@ -19189,24 +19185,24 @@ /* begin getLongFromFile:swap: */ w11 = 0; sqImageFileRead((&w11), sizeof(long), 1, f); - anObject = ((long) ((swapBytes - ? byteSwapped(w11) - : w11))); + anObject = (swapBytes + ? byteSwapped(w11) + : w11); GIV(specialObjectsOop) = anObject; /* begin lastHash: */ /* begin getLongFromFile:swap: */ w12 = 0; sqImageFileRead((&w12), sizeof(long), 1, f); - aValue = ((long) ((swapBytes - ? byteSwapped(w12) - : w12))); + aValue = (swapBytes + ? byteSwapped(w12) + : w12); lastHash = aValue; /* begin getLongFromFile:swap: */ w3 = 0; sqImageFileRead((&w3), sizeof(long), 1, f); - GIV(savedWindowSize) = ((long) ((swapBytes - ? byteSwapped(w3) - : w3))); + GIV(savedWindowSize) = (swapBytes + ? byteSwapped(w3) + : w3); /* begin getLongFromFile:swap: */ w4 = 0; sqImageFileRead((&w4), sizeof(long), 1, f); @@ -22976,7 +22972,7 @@ sqInt sz; isSmall = (isNegative - ? magnitude <= ((MaxSmallInteger) + 1) + ? magnitude < (MaxSmallInteger) : magnitude < ((MaxSmallInteger) + 1)); if (isSmall) { smallVal = ((sqInt) magnitude); @@ -22988,22 +22984,22 @@ largeClass = (isNegative ? longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassLargeNegativeInteger << (shiftForWord()))) : longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassLargePositiveInteger << (shiftForWord())))); - highWord = magnitude >> 32; - if (highWord == 0) { + if (((highWord = magnitude >> 32)) == 0) { sz = 4; } else { sz = 5; if (!(((highWord = ((usqInt) highWord) >> 8)) == 0)) { sz += 1; + if (!(((highWord = ((usqInt) highWord) >> 8)) == 0)) { + sz += 1; + if (!(((highWord = ((usqInt) highWord) >> 8)) == 0)) { + sz += 1; + } + } } - if (!(((highWord = ((usqInt) highWord) >> 8)) == 0)) { - sz += 1; - } - if (!(((highWord = ((usqInt) highWord) >> 8)) == 0)) { - sz += 1; - } } + newLargeInteger = instantiateClassindexableSize(largeClass, sz); for (i = 0; i < sz; i += 1) { intValue = (magnitude >> (i * 8)) & 0xFF; @@ -24471,7 +24467,7 @@ primitiveBitShift(void) { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt integerArgument; - sqLong integerReceiver; + usqInt integerReceiver; sqInt shifted; char *sp; @@ -24489,7 +24485,7 @@ if (!GIV(primFailCode)) { if (((integerArgument = (integerArgument >> 1))) >= 0) { - /* Left shift -- must fail if we lose bits beyond 32 */ + /* Left shift -- must fail bits would be lost */ if (!(integerArgument <= 0x1F)) { /* begin primitiveFail */ @@ -24499,7 +24495,7 @@ return; } shifted = integerReceiver << integerArgument; - if (!((((usqInt) shifted) >> integerArgument) == integerReceiver)) { + if (!(integerReceiver == (((usqInt) shifted) >> integerArgument))) { /* begin primitiveFail */ if (!GIV(primFailCode)) { GIV(primFailCode) = 1; @@ -24518,11 +24514,9 @@ } return; } - shifted = ((unsigned sqLong)integerReceiver) >> (0 - integerArgument); + shifted = ((usqInt) integerReceiver) >> (0 - integerArgument); } - shifted = ((shifted ^ (shifted << 1)) >= 0 - ? ((shifted << 1) | 1) - : positive32BitIntegerFor(shifted)); + shifted = positive32BitIntegerFor(shifted); /* begin pop:thenPush: */ longAtput((sp = GIV(stackPointer) + ((2 - 1) * BytesPerWord)), shifted); GIV(stackPointer) = sp; @@ -48458,23 +48452,20 @@ sqInt newLargeInteger; sqInt sz; - - /* shift is coerced to usqInt otherwise */ - - highWord = integerValue >> 32; - if (highWord == 0) { + if (((highWord = ((sqInt) integerValue) >> 32)) == 0) { return positive32BitIntegerFor(integerValue); } sz = 5; if (!(((highWord = ((usqInt) highWord) >> 8)) == 0)) { sz += 1; + if (!(((highWord = ((usqInt) highWord) >> 8)) == 0)) { + sz += 1; + if (!(((highWord = ((usqInt) highWord) >> 8)) == 0)) { + sz += 1; + } + } } - if (!(((highWord = ((usqInt) highWord) >> 8)) == 0)) { - sz += 1; - } - if (!(((highWord = ((usqInt) highWord) >> 8)) == 0)) { - sz += 1; - } + newLargeInteger = eeInstantiateSmallClassIndexformatnumSlots(ClassLargePositiveIntegerCompactIndex, 8 + ((4 - sz) & 3), 8 / BytesPerOop); byteAtput((newLargeInteger + BaseHeaderSize) + 7, (((unsigned sqLong)integerValue) >> 56) & 0xFF); byteAtput((newLargeInteger + BaseHeaderSize) + 6, (((unsigned sqLong)integerValue) >> 48) & 0xFF); @@ -51395,6 +51386,7 @@ sqInt newLargeInteger; sqInt sz; + if (integerValue < 0) { largeClass = ClassLargeNegativeIntegerCompactIndex; magnitude = 0 - integerValue; @@ -51408,22 +51400,22 @@ || (0 != (integerValue << 1)))) { return signed32BitIntegerFor(integerValue); } - highWord = ((unsigned sqLong)magnitude) >> 32; - if (highWord == 0) { + if (((highWord = ((unsigned sqLong)magnitude) >> 32)) == 0) { sz = 4; } else { sz = 5; if (!(((highWord = ((usqInt) highWord) >> 8)) == 0)) { sz += 1; + if (!(((highWord = ((usqInt) highWord) >> 8)) == 0)) { + sz += 1; + if (!(((highWord = ((usqInt) highWord) >> 8)) == 0)) { + sz += 1; + } + } } - if (!(((highWord = ((usqInt) highWord) >> 8)) == 0)) { - sz += 1; - } - if (!(((highWord = ((usqInt) highWord) >> 8)) == 0)) { - sz += 1; - } } + newLargeInteger = eeInstantiateSmallClassIndexformatnumSlots(largeClass, 8 + ((4 - sz) & 3), (sz + 3) / BytesPerOop); if (sz > 4) { byteAtput((newLargeInteger + BaseHeaderSize) + 7, (((unsigned sqLong)magnitude) >> 56) & 0xFF); Modified: branches/Cog/nscogsrc/vm/cointerp.h =================================================================== --- branches/Cog/nscogsrc/vm/cointerp.h 2014-11-21 05:05:31 UTC (rev 3143) +++ branches/Cog/nscogsrc/vm/cointerp.h 2014-11-21 23:07:35 UTC (rev 3144) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.948 uuid: 9323b2ad-f5cf-4aca-8f31-67eb5616ccca + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.950 uuid: d4d2d679-fd90-48f5-a47a-ebae021776e7 */ Modified: branches/Cog/nscogsrc/vm/gcc3x-cointerp.c =================================================================== --- branches/Cog/nscogsrc/vm/gcc3x-cointerp.c 2014-11-21 05:05:31 UTC (rev 3143) +++ branches/Cog/nscogsrc/vm/gcc3x-cointerp.c 2014-11-21 23:07:35 UTC (rev 3144) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.948 uuid: 9323b2ad-f5cf-4aca-8f31-67eb5616ccca + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.950 uuid: d4d2d679-fd90-48f5-a47a-ebae021776e7 from - CoInterpreter VMMaker.oscog-eem.948 uuid: 9323b2ad-f5cf-4aca-8f31-67eb5616ccca + CoInterpreter VMMaker.oscog-eem.950 uuid: d4d2d679-fd90-48f5-a47a-ebae021776e7 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.948 uuid: 9323b2ad-f5cf-4aca-8f31-67eb5616ccca " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.950 uuid: d4d2d679-fd90-48f5-a47a-ebae021776e7 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2096,7 +2096,7 @@ /* 574 */ (void (*)(void))0, /* 575 */ (void (*)(void))0, 0 }; -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.948"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.950"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -7940,7 +7940,7 @@ /* bytecodePrimBitShift */ { sqInt integerArgument; - sqLong integerReceiver; + usqInt integerReceiver; sqInt shifted; char *sp; @@ -7968,7 +7968,7 @@ if (!GIV(primFailCode)) { if (((integerArgument = (integerArgument >> 1))) >= 0) { - /* Left shift -- must fail if we lose bits beyond 32 */ + /* Left shift -- must fail bits would be lost */ if (!(integerArgument <= 0x1F)) { /* begin primitiveFail */ @@ -7979,7 +7979,7 @@ goto l88; } shifted = integerReceiver << integerArgument; - if (!((((usqInt) shifted) >> integerArgument) == integerReceiver)) { + if (!(integerReceiver == (((usqInt) shifted) >> integerArgument))) { /* begin primitiveFail */ if (!GIV(primFailCode)) { GIV(primFailCode) = 1; @@ -8000,11 +8000,9 @@ null; goto l88; } - shifted = ((unsigned sqLong)integerReceiver) >> (0 - integerArgument); + shifted = ((usqInt) integerReceiver) >> (0 - integerArgument); } - shifted = ((shifted ^ (shifted << 1)) >= 0 - ? ((shifted << 1) | 1) - : positive32BitIntegerFor(shifted)); + shifted = positive32BitIntegerFor(shifted); /* begin pop:thenPush: */ longAtput((sp = GIV(stackPointer) + ((2 - 1) * BytesPerWord)), shifted); GIV(stackPointer) = sp; @@ -10877,7 +10875,7 @@ /* bytecodePrimBitShift */ { sqInt integerArgument; - sqLong integerReceiver; + usqInt integerReceiver; sqInt shifted; char *sp; @@ -10905,7 +10903,7 @@ if (!GIV(primFailCode)) { if (((integerArgument = (integerArgument >> 1))) >= 0) { - /* Left shift -- must fail if we lose bits beyond 32 */ + /* Left shift -- must fail bits would be lost */ if (!(integerArgument <= 0x1F)) { /* begin primitiveFail */ @@ -10916,7 +10914,7 @@ goto l203; } shifted = integerReceiver << integerArgument; - if (!((((usqInt) shifted) >> integerArgument) == integerReceiver)) { + if (!(integerReceiver == (((usqInt) shifted) >> integerArgument))) { /* begin primitiveFail */ if (!GIV(primFailCode)) { GIV(primFailCode) = 1; @@ -10937,11 +10935,9 @@ null; goto l203; } - shifted = ((unsigned sqLong)integerReceiver) >> (0 - integerArgument); + shifted = ((usqInt) integerReceiver) >> (0 - integerArgument); } - shifted = ((shifted ^ (shifted << 1)) >= 0 - ? ((shifted << 1) | 1) - : positive32BitIntegerFor(shifted)); + shifted = positive32BitIntegerFor(shifted); /* begin pop:thenPush: */ longAtput((sp = GIV(stackPointer) + ((2 - 1) * BytesPerWord)), shifted); GIV(stackPointer) = sp; @@ -19122,13 +19118,13 @@ sqInt classArrayClass; sqInt classArrayObj; size_t dataSize; - long firstSegSize; + sqInt firstSegSize; sqInt hdrCogCodeSize; sqInt hdrEdenBytes; sqInt hdrMaxExtSemTabSize; sqInt hdrNumStackPages; sqInt header; - long headerFlags; + sqInt headerFlags; sqInt headerSize; squeakFileOffsetType headerStart; usqInt heapSize; @@ -19145,7 +19141,7 @@ sqInt memEnd; sqInt memLimit; usqInt minimumMemory; - long oldBaseAddr; + sqInt oldBaseAddr; sqInt oop; sqInt swapBytes; sqInt sz; @@ -19185,9 +19181,9 @@ /* begin getLongFromFile:swap: */ w1 = 0; sqImageFileRead((&w1), sizeof(long), 1, f); - dataSize = ((long) ((swapBytes - ? byteSwapped(w1) - : w1))); + dataSize = (swapBytes + ? byteSwapped(w1) + : w1); /* begin getLongFromFile:swap: */ w2 = 0; sqImageFileRead((&w2), sizeof(long), 1, f); @@ -19198,24 +19194,24 @@ /* begin getLongFromFile:swap: */ w11 = 0; sqImageFileRead((&w11), sizeof(long), 1, f); - anObject = ((long) ((swapBytes - ? byteSwapped(w11) - : w11))); + anObject = (swapBytes + ? byteSwapped(w11) + : w11); GIV(specialObjectsOop) = anObject; /* begin lastHash: */ /* begin getLongFromFile:swap: */ w12 = 0; sqImageFileRead((&w12), sizeof(long), 1, f); - aValue = ((long) ((swapBytes - ? byteSwapped(w12) - : w12))); + aValue = (swapBytes + ? byteSwapped(w12) + : w12); lastHash = aValue; /* begin getLongFromFile:swap: */ w3 = 0; sqImageFileRead((&w3), sizeof(long), 1, f); - GIV(savedWindowSize) = ((long) ((swapBytes - ? byteSwapped(w3) - : w3))); + GIV(savedWindowSize) = (swapBytes + ? byteSwapped(w3) + : w3); /* begin getLongFromFile:swap: */ w4 = 0; sqImageFileRead((&w4), sizeof(long), 1, f); @@ -22985,7 +22981,7 @@ sqInt sz; isSmall = (isNegative - ? magnitude <= ((MaxSmallInteger) + 1) + ? magnitude < (MaxSmallInteger) : magnitude < ((MaxSmallInteger) + 1)); if (isSmall) { smallVal = ((sqInt) magnitude); @@ -22997,22 +22993,22 @@ largeClass = (isNegative ? longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassLargeNegativeInteger << (shiftForWord()))) : longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassLargePositiveInteger << (shiftForWord())))); - highWord = magnitude >> 32; - if (highWord == 0) { + if (((highWord = magnitude >> 32)) == 0) { sz = 4; } else { sz = 5; if (!(((highWord = ((usqInt) highWord) >> 8)) == 0)) { sz += 1; + if (!(((highWord = ((usqInt) highWord) >> 8)) == 0)) { + sz += 1; + if (!(((highWord = ((usqInt) highWord) >> 8)) == 0)) { + sz += 1; + } + } } - if (!(((highWord = ((usqInt) highWord) >> 8)) == 0)) { - sz += 1; - } - if (!(((highWord = ((usqInt) highWord) >> 8)) == 0)) { - sz += 1; - } } + newLargeInteger = instantiateClassindexableSize(largeClass, sz); for (i = 0; i < sz; i += 1) { intValue = (magnitude >> (i * 8)) & 0xFF; @@ -24480,7 +24476,7 @@ primitiveBitShift(void) { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt integerArgument; - sqLong integerReceiver; + usqInt integerReceiver; sqInt shifted; char *sp; @@ -24498,7 +24494,7 @@ if (!GIV(primFailCode)) { if (((integerArgument = (integerArgument >> 1))) >= 0) { - /* Left shift -- must fail if we lose bits beyond 32 */ + /* Left shift -- must fail bits would be lost */ if (!(integerArgument <= 0x1F)) { /* begin primitiveFail */ @@ -24508,7 +24504,7 @@ return; } shifted = integerReceiver << integerArgument; - if (!((((usqInt) shifted) >> integerArgument) == integerReceiver)) { + if (!(integerReceiver == (((usqInt) shifted) >> integerArgument))) { /* begin primitiveFail */ if (!GIV(primFailCode)) { GIV(primFailCode) = 1; @@ -24527,11 +24523,9 @@ } return; } - shifted = ((unsigned sqLong)integerReceiver) >> (0 - integerArgument); + shifted = ((usqInt) integerReceiver) >> (0 - integerArgument); } - shifted = ((shifted ^ (shifted << 1)) >= 0 - ? ((shifted << 1) | 1) - : positive32BitIntegerFor(shifted)); + shifted = positive32BitIntegerFor(shifted); /* begin pop:thenPush: */ longAtput((sp = GIV(stackPointer) + ((2 - 1) * BytesPerWord)), shifted); GIV(stackPointer) = sp; @@ -48467,23 +48461,20 @@ sqInt newLargeInteger; sqInt sz; - - /* shift is coerced to usqInt otherwise */ - - highWord = integerValue >> 32; - if (highWord == 0) { + if (((highWord = ((sqInt) integerValue) >> 32)) == 0) { return positive32BitIntegerFor(integerValue); } sz = 5; if (!(((highWord = ((usqInt) highWord) >> 8)) == 0)) { sz += 1; + if (!(((highWord = ((usqInt) highWord) >> 8)) == 0)) { + sz += 1; + if (!(((highWord = ((usqInt) highWord) >> 8)) == 0)) { + sz += 1; + } + } } - if (!(((highWord = ((usqInt) highWord) >> 8)) == 0)) { - sz += 1; - } - if (!(((highWord = ((usqInt) highWord) >> 8)) == 0)) { - sz += 1; - } + newLargeInteger = eeInstantiateSmallClassIndexformatnumSlots(ClassLargePositiveIntegerCompactIndex, 8 + ((4 - sz) & 3), 8 / BytesPerOop); byteAtput((newLargeInteger + BaseHeaderSize) + 7, (((unsigned sqLong)integerValue) >> 56) & 0xFF); byteAtput((newLargeInteger + BaseHeaderSize) + 6, (((unsigned sqLong)integerValue) >> 48) & 0xFF); @@ -51404,6 +51395,7 @@ sqInt newLargeInteger; sqInt sz; + if (integerValue < 0) { largeClass = ClassLargeNegativeIntegerCompactIndex; magnitude = 0 - integerValue; @@ -51417,22 +51409,22 @@ || (0 != (integerValue << 1)))) { return signed32BitIntegerFor(integerValue); } - highWord = ((unsigned sqLong)magnitude) >> 32; - if (highWord == 0) { + if (((highWord = ((unsigned sqLong)magnitude) >> 32)) == 0) { sz = 4; } else { sz = 5; if (!(((highWord = ((usqInt) highWord) >> 8)) == 0)) { sz += 1; + if (!(((highWord = ((usqInt) highWord) >> 8)) == 0)) { + sz += 1; + if (!(((highWord = ((usqInt) highWord) >> 8)) == 0)) { + sz += 1; + } + } } - if (!(((highWord = ((usqInt) highWord) >> 8)) == 0)) { - sz += 1; - } - if (!(((highWord = ((usqInt) highWord) >> 8)) == 0)) { - sz += 1; - } } + newLargeInteger = eeInstantiateSmallClassIndexformatnumSlots(largeClass, 8 + ((4 - sz) & 3), (sz + 3) / BytesPerOop); if (sz > 4) { byteAtput((newLargeInteger + BaseHeaderSize) + 7, (((unsigned sqLong)magnitude) >> 56) & 0xFF); Modified: branches/Cog/nsspursrc/vm/cointerp.c =================================================================== --- branches/Cog/nsspursrc/vm/cointerp.c 2014-11-21 05:05:31 UTC (rev 3143) +++ branches/Cog/nsspursrc/vm/cointerp.c 2014-11-21 23:07:35 UTC (rev 3144) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.948 uuid: 9323b2ad-f5cf-4aca-8f31-67eb5616ccca + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.950 uuid: d4d2d679-fd90-48f5-a47a-ebae021776e7 from - CoInterpreter VMMaker.oscog-eem.948 uuid: 9323b2ad-f5cf-4aca-8f31-67eb5616ccca + CoInterpreter VMMaker.oscog-eem.950 uuid: d4d2d679-fd90-48f5-a47a-ebae021776e7 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.948 uuid: 9323b2ad-f5cf-4aca-8f31-67eb5616ccca " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.950 uuid: d4d2d679-fd90-48f5-a47a-ebae021776e7 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2343,7 +2343,7 @@ /*540*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, /*560*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, 0, 0, 0,-1,-1 }; -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.948"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.950"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -9113,7 +9113,7 @@ if (!GIV(primFailCode)) { if (((integerArgument = (integerArgument >> 1))) >= 0) { - /* Left shift -- must fail if we lose bits beyond 32 */ + /* Left shift -- must fail bits would be lost */ if (!(integerArgument <= 0x1F)) { /* begin primitiveFail */ @@ -9124,7 +9124,7 @@ goto l96; } shifted = integerReceiver << integerArgument; - if (!((((usqInt) shifted) >> integerArgument) == integerReceiver)) { + if (!(integerReceiver == (((usqInt) shifted) >> integerArgument))) { /* begin primitiveFail */ if (!GIV(primFailCode)) { GIV(primFailCode) = 1; @@ -9147,9 +9147,7 @@ } shifted = ((usqInt) integerReceiver) >> (0 - integerArgument); } - shifted = ((shifted ^ (shifted << 1)) >= 0 - ? ((shifted << 1) | 1) - : positive32BitIntegerFor(shifted)); + shifted = positive32BitIntegerFor(shifted); /* begin pop:thenPush: */ longAtput((sp = GIV(stackPointer) + ((2 - 1) * BytesPerWord)), shifted); GIV(stackPointer) = sp; @@ -12103,7 +12101,7 @@ if (!GIV(primFailCode)) { if (((integerArgument = (integerArgument >> 1))) >= 0) { - /* Left shift -- must fail if we lose bits beyond 32 */ + /* Left shift -- must fail bits would be lost */ if (!(integerArgument <= 0x1F)) { /* begin primitiveFail */ @@ -12114,7 +12112,7 @@ goto l223; } shifted = integerReceiver << integerArgument; - if (!((((usqInt) shifted) >> integerArgument) == integerReceiver)) { + if (!(integerReceiver == (((usqInt) shifted) >> integerArgument))) { /* begin primitiveFail */ if (!GIV(primFailCode)) { GIV(primFailCode) = 1; @@ -12137,9 +12135,7 @@ } shifted = ((usqInt) integerReceiver) >> (0 - integerArgument); } - shifted = ((shifted ^ (shifted << 1)) >= 0 - ? ((shifted << 1) | 1) - : positive32BitIntegerFor(shifted)); + shifted = positive32BitIntegerFor(shifted); /* begin pop:thenPush: */ longAtput((sp = GIV(stackPointer) + ((2 - 1) * BytesPerWord)), shifted); GIV(stackPointer) = sp; @@ -23965,12 +23961,12 @@ sqInt classTablePage; size_t dataSize; sqInt edenBytes; - long firstSegSize; + sqInt firstSegSize; sqInt hdrCogCodeSize; sqInt hdrEdenBytes; sqInt hdrMaxExtSemTabSize; sqInt hdrNumStackPages; - long headerFlags; + sqInt headerFlags; sqInt headerSize; squeakFileOffsetType headerStart; usqInt heapSize; @@ -23989,7 +23985,7 @@ usqInt minimumMemory; usqInt numSlots; sqInt objOop; - long oldBaseAddr; + sqInt oldBaseAddr; sqInt oldStart; sqInt oop; sqInt p; @@ -24032,9 +24028,9 @@ /* begin getLongFromFile:swap: */ w1 = 0; sqImageFileRead((&w1), sizeof(long), 1, f); - dataSize = ((long) ((swapBytes - ? ((((((usqInt) w1 >> 24)) & Byte0Mask) + ((((usqInt) w1 >> 8)) & Byte1Mask)) + ((((usqInt) w1 << 8)) & Byte2Mask)) + ((((usqInt) w1 << 24)) & Byte3Mask) - : w1))); + dataSize = (swapBytes + ? ((((((usqInt) w1 >> 24)) & Byte0Mask) + ((((usqInt) w1 >> 8)) & Byte1Mask)) + ((((usqInt) w1 << 8)) & Byte2Mask)) + ((((usqInt) w1 << 24)) & Byte3Mask) + : w1); /* begin getLongFromFile:swap: */ w2 = 0; sqImageFileRead((&w2), sizeof(long), 1, f); @@ -24045,24 +24041,24 @@ /* begin getLongFromFile:swap: */ w3 = 0; sqImageFileRead((&w3), sizeof(long), 1, f); - anObject = ((long) ((swapBytes - ? ((((((usqInt) w3 >> 24)) & Byte0Mask) + ((((usqInt) w3 >> 8)) & Byte1Mask)) + ((((usqInt) w3 << 8)) & Byte2Mask)) + ((((usqInt) w3 << 24)) & Byte3Mask) - : w3))); + anObject = (swapBytes + ? ((((((usqInt) w3 >> 24)) & Byte0Mask) + ((((usqInt) w3 >> 8)) & Byte1Mask)) + ((((usqInt) w3 << 8)) & Byte2Mask)) + ((((usqInt) w3 << 24)) & Byte3Mask) + : w3); GIV(specialObjectsOop) = anObject; /* begin lastHash: */ /* begin getLongFromFile:swap: */ w4 = 0; sqImageFileRead((&w4), sizeof(long), 1, f); - seed = ((long) ((swapBytes - ? ((((((usqInt) w4 >> 24)) & Byte0Mask) + ((((usqInt) w4 >> 8)) & Byte1Mask)) + ((((usqInt) w4 << 8)) & Byte2Mask)) + ((((usqInt) w4 << 24)) & Byte3Mask) - : w4))); + seed = (swapBytes + ? ((((((usqInt) w4 >> 24)) & Byte0Mask) + ((((usqInt) w4 >> 8)) & Byte1Mask)) + ((((usqInt) w4 << 8)) & Byte2Mask)) + ((((usqInt) w4 << 24)) & Byte3Mask) + : w4); GIV(lastHash) = seed; /* begin getLongFromFile:swap: */ w5 = 0; sqImageFileRead((&w5), sizeof(long), 1, f); - GIV(savedWindowSize) = ((long) ((swapBytes - ? ((((((usqInt) w5 >> 24)) & Byte0Mask) + ((((usqInt) w5 >> 8)) & Byte1Mask)) + ((((usqInt) w5 << 8)) & Byte2Mask)) + ((((usqInt) w5 << 24)) & Byte3Mask) - : w5))); + GIV(savedWindowSize) = (swapBytes + ? ((((((usqInt) w5 >> 24)) & Byte0Mask) + ((((usqInt) w5 >> 8)) & Byte1Mask)) + ((((usqInt) w5 << 8)) & Byte2Mask)) + ((((usqInt) w5 << 24)) & Byte3Mask) + : w5); /* begin getLongFromFile:swap: */ w6 = 0; sqImageFileRead((&w6), sizeof(long), 1, f); @@ -28293,7 +28289,7 @@ sqInt sz; isSmall = (isNegative - ? magnitude <= ((MaxSmallInteger) + 1) + ? magnitude < (MaxSmallInteger) : magnitude < ((MaxSmallInteger) + 1)); if (isSmall) { smallVal = ((sqInt) magnitude); @@ -28309,22 +28305,22 @@ : (/* begin knownClassAtIndex: */ assert(((ClassLargePositiveIntegerCompactIndex >= 1) && (ClassLargePositiveIntegerCompactIndex <= (classTablePageSize())))), longAt((GIV(classTableFirstPage) + BaseHeaderSize) + (ClassLargePositiveIntegerCompactIndex << (shiftForWord()))))); - highWord = magnitude >> 32; - if (highWord == 0) { + if (((highWord = magnitude >> 32)) == 0) { sz = 4; } else { sz = 5; if (!(((highWord = ((usqInt) highWord) >> 8)) == 0)) { sz += 1; + if (!(((highWord = ((usqInt) highWord) >> 8)) == 0)) { + sz += 1; + if (!(((highWord = ((usqInt) highWord) >> 8)) == 0)) { + sz += 1; + } + } } - if (!(((highWord = ((usqInt) highWord) >> 8)) == 0)) { - sz += 1; - } - if (!(((highWord = ((usqInt) highWord) >> 8)) == 0)) { - sz += 1; - } } + newLargeInteger = instantiateClassindexableSize(largeClass, sz); for (i = 0; i < sz; i += 1) { intValue = (magnitude >> (i * 8)) & 0xFF; @@ -29898,7 +29894,7 @@ if (!GIV(primFailCode)) { if (((integerArgument = (integerArgument >> 1))) >= 0) { - /* Left shift -- must fail if we lose bits beyond 32 */ + /* Left shift -- must fail bits would be lost */ if (!(integerArgument <= 0x1F)) { /* begin primitiveFail */ @@ -29908,7 +29904,7 @@ return; } shifted = integerReceiver << integerArgument; - if (!((((usqInt) shifted) >> integerArgument) == integerReceiver)) { + if (!(integerReceiver == (((usqInt) shifted) >> integerArgument))) { /* begin primitiveFail */ if (!GIV(primFailCode)) { GIV(primFailCode) = 1; @@ -29929,9 +29925,7 @@ } shifted = ((usqInt) integerReceiver) >> (0 - integerArgument); } - shifted = ((shifted ^ (shifted << 1)) >= 0 - ? ((shifted << 1) | 1) - : positive32BitIntegerFor(shifted)); + shifted = positive32BitIntegerFor(shifted); /* begin pop:thenPush: */ longAtput((sp = GIV(stackPointer) + ((2 - 1) * BytesPerWord)), shifted); GIV(stackPointer) = sp; @@ -69046,23 +69040,20 @@ sqInt objFormat; sqInt sz; - - /* shift is coerced to usqInt otherwise */ - - highWord = integerValue >> 32; - if (highWord == 0) { + if (((highWord = ((sqInt) integerValue) >> 32)) == 0) { return positive32BitIntegerFor(integerValue); } sz = 5; if (!(((highWord = ((usqInt) highWord) >> 8)) == 0)) { sz += 1; + if (!(((highWord = ((usqInt) highWord) >> 8)) == 0)) { + sz += 1; + if (!(((highWord = ((usqInt) highWord) >> 8)) == 0)) { + sz += 1; + } + } } - if (!(((highWord = ((usqInt) highWord) >> 8)) == 0)) { - sz += 1; - } - if (!(((highWord = ((usqInt) highWord) >> 8)) == 0)) { - sz += 1; - } + /* begin eeInstantiateSmallClassIndex:format:numSlots: */ objFormat = 16 + ((8 - sz) & (BytesPerWord - 1)); assert(((8 / BytesPerOop) >= 0) @@ -72874,6 +72865,7 @@ sqInt objFormat; sqInt sz; + if (integerValue < 0) { largeClass = ClassLargeNegativeIntegerCompactIndex; magnitude = 0 - integerValue; @@ -72887,22 +72879,22 @@ || (0 != (integerValue << 1)))) { return signed32BitIntegerFor(integerValue); } - highWord = ((unsigned sqLong)magnitude) >> 32; - if (highWord == 0) { + if (((highWord = ((unsigned sqLong)magnitude) >> 32)) == 0) { sz = 4; } else { sz = 5; if (!(((highWord = ((usqInt) highWord) >> 8)) == 0)) { sz += 1; + if (!(((highWord = ((usqInt) highWord) >> 8)) == 0)) { + sz += 1; + if (!(((highWord = ((usqInt) highWord) >> 8)) == 0)) { + sz += 1; + } + } } - if (!(((highWord = ((usqInt) highWord) >> 8)) == 0)) { - sz += 1; - } - if (!(((highWord = ((usqInt) highWord) >> 8)) == 0)) { - sz += 1; - } } + /* begin eeInstantiateSmallClassIndex:format:numSlots: */ objFormat = 16 + ((8 - sz) & (BytesPerWord - 1)); numSlots = (sz + 3) / BytesPerOop; Modified: branches/Cog/nsspursrc/vm/cointerp.h =================================================================== --- branches/Cog/nsspursrc/vm/cointerp.h 2014-11-21 05:05:31 UTC (rev 3143) +++ branches/Cog/nsspursrc/vm/cointerp.h 2014-11-21 23:07:35 UTC (rev 3144) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.948 uuid: 9323b2ad-f5cf-4aca-8f31-67eb5616ccca + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.950 uuid: d4d2d679-fd90-48f5-a47a-ebae021776e7 */ Modified: branches/Cog/nsspursrc/vm/gcc3x-cointerp.c =================================================================== --- branches/Cog/nsspursrc/vm/gcc3x-cointerp.c 2014-11-21 05:05:31 UTC (rev 3143) +++ branches/Cog/nsspursrc/vm/gcc3x-cointerp.c 2014-11-21 23:07:35 UTC (rev 3144) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.948 uuid: 9323b2ad-f5cf-4aca-8f31-67eb5616ccca + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.950 uuid: d4d2d679-fd90-48f5-a47a-ebae021776e7 from - CoInterpreter VMMaker.oscog-eem.948 uuid: 9323b2ad-f5cf-4aca-8f31-67eb5616ccca + CoInterpreter VMMaker.oscog-eem.950 uuid: d4d2d679-fd90-48f5-a47a-ebae021776e7 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.948 uuid: 9323b2ad-f5cf-4aca-8f31-67eb5616ccca " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.950 uuid: d4d2d679-fd90-48f5-a47a-ebae021776e7 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2346,7 +2346,7 @@ /*540*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, /*560*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, 0, 0, 0,-1,-1 }; -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.948"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.950"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -9122,7 +9122,7 @@ if (!GIV(primFailCode)) { if (((integerArgument = (integerArgument >> 1))) >= 0) { - /* Left shift -- must fail if we lose bits beyond 32 */ + /* Left shift -- must fail bits would be lost */ if (!(integerArgument <= 0x1F)) { /* begin primitiveFail */ @@ -9133,7 +9133,7 @@ goto l96; } shifted = integerReceiver << integerArgument; - if (!((((usqInt) shifted) >> integerArgument) == integerReceiver)) { + if (!(integerReceiver == (((usqInt) shifted) >> integerArgument))) { /* begin primitiveFail */ if (!GIV(primFailCode)) { GIV(primFailCode) = 1; @@ -9156,9 +9156,7 @@ } shifted = ((usqInt) integerReceiver) >> (0 - integerArgument); } - shifted = ((shifted ^ (shifted << 1)) >= 0 - ? ((shifted << 1) | 1) - : positive32BitIntegerFor(shifted)); + shifted = positive32BitIntegerFor(shifted); /* begin pop:thenPush: */ longAtput((sp = GIV(stackPointer) + ((2 - 1) * BytesPerWord)), shifted); GIV(stackPointer) = sp; @@ -12112,7 +12110,7 @@ if (!GIV(primFailCode)) { if (((integerArgument = (integerArgument >> 1))) >= 0) { - /* Left shift -- must fail if we lose bits beyond 32 */ + /* Left shift -- must fail bits would be lost */ if (!(integerArgument <= 0x1F)) { /* begin primitiveFail */ @@ -12123,7 +12121,7 @@ goto l223; } shifted = integerReceiver << integerArgument; - if (!((((usqInt) shifted) >> integerArgument) == integerReceiver)) { + if (!(integerReceiver == (((usqInt) shifted) >> integerArgument))) { /* begin primitiveFail */ if (!GIV(primFailCode)) { GIV(primFailCode) = 1; @@ -12146,9 +12144,7 @@ } shifted = ((usqInt) integerReceiver) >> (0 - integerArgument); } - shifted = ((shifted ^ (shifted << 1)) >= 0 - ? ((shifted << 1) | 1) - : positive32BitIntegerFor(shifted)); + shifted = positive32BitIntegerFor(shifted); /* begin pop:thenPush: */ longAtput((sp = GIV(stackPointer) + ((2 - 1) * BytesPerWord)), shifted); GIV(stackPointer) = sp; @@ -23974,12 +23970,12 @@ sqInt classTablePage; size_t dataSize; sqInt edenBytes; - long firstSegSize; + sqInt firstSegSize; sqInt hdrCogCodeSize; sqInt hdrEdenBytes; sqInt hdrMaxExtSemTabSize; sqInt hdrNumStackPages; - long headerFlags; + sqInt headerFlags; sqInt headerSize; squeakFileOffsetType headerStart; usqInt heapSize; @@ -23998,7 +23994,7 @@ usqInt minimumMemory; usqInt numSlots; sqInt objOop; - long oldBaseAddr; + sqInt oldBaseAddr; sqInt oldStart; sqInt oop; sqInt p; @@ -24041,9 +24037,9 @@ /* begin getLongFromFile:swap: */ w1 = 0; sqImageFileRead((&w1), sizeof(long), 1, f); - dataSize = ((long) ((swapBytes - ? ((((((usqInt) w1 >> 24)) & Byte0Mask) + ((((usqInt) w1 >> 8)) & Byte1Mask)) + ((((usqInt) w1 << 8)) & Byte2Mask)) + ((((usqInt) w1 << 24)) & Byte3Mask) - : w1))); + dataSize = (swapBytes + ? ((((((usqInt) w1 >> 24)) & Byte0Mask) + ((((usqInt) w1 >> 8)) & Byte1Mask)) + ((((usqInt) w1 << 8)) & Byte2Mask)) + ((((usqInt) w1 << 24)) & Byte3Mask) + : w1); /* begin getLongFromFile:swap: */ w2 = 0; sqImageFileRead((&w2), sizeof(long), 1, f); @@ -24054,24 +24050,24 @@ /* begin getLongFromFile:swap: */ w3 = 0; sqImageFileRead((&w3), sizeof(long), 1, f); - anObject = ((long) ((swapBytes - ? ((((((usqInt) w3 >> 24)) & Byte0Mask) + ((((usqInt) w3 >> 8)) & Byte1Mask)) + ((((usqInt) w3 << 8)) & Byte2Mask)) + ((((usqInt) w3 << 24)) & Byte3Mask) - : w3))); + anObject = (swapBytes + ? ((((((usqInt) w3 >> 24)) & Byte0Mask) + ((((usqInt) w3 >> 8)) & Byte1Mask)) + ((((usqInt) w3 << 8)) & Byte2Mask)) + ((((usqInt) w3 << 24)) & Byte3Mask) + : w3); GIV(specialObjectsOop) = anObject; /* begin lastHash: */ /* begin getLongFromFile:swap: */ w4 = 0; sqImageFileRead((&w4), sizeof(long), 1, f); - seed = ((long) ((swapBytes - ? ((((((usqInt) w4 >> 24)) & Byte0Mask) + ((((usqInt) w4 >> 8)) & Byte1Mask)) + ((((usqInt) w4 << 8)) & Byte2Mask)) + ((((usqInt) w4 << 24)) & Byte3Mask) - : w4))); + seed = (swapBytes + ? ((((((usqInt) w4 >> 24)) & Byte0Mask) + ((((usqInt) w4 >> 8)) & Byte1Mask)) + ((((usqInt) w4 << 8)) & Byte2Mask)) + ((((usqInt) w4 << 24)) & Byte3Mask) + : w4); GIV(lastHash) = seed; /* begin getLongFromFile:swap: */ w5 = 0; sqImageFileRead((&w5), sizeof(long), 1, f); - GIV(savedWindowSize) = ((long) ((swapBytes - ? ((((((usqInt) w5 >> 24)) & Byte0Mask) + ((((usqInt) w5 >> 8)) & Byte1Mask)) + ((((usqInt) w5 << 8)) & Byte2Mask)) + ((((usqInt) w5 << 24)) & Byte3Mask) - : w5))); + GIV(savedWindowSize) = (swapBytes + ? ((((((usqInt) w5 >> 24)) & Byte0Mask) + ((((usqInt) w5 >> 8)) & Byte1Mask)) + ((((usqInt) w5 << 8)) & Byte2Mask)) + ((((usqInt) w5 << 24)) & Byte3Mask) + : w5); /* begin getLongFromFile:swap: */ w6 = 0; sqImageFileRead((&w6), sizeof(long), 1, f); @@ -28302,7 +28298,7 @@ sqInt sz; isSmall = (isNegative - ? magnitude <= ((MaxSmallInteger) + 1) + ? magnitude < (MaxSmallInteger) : magnitude < ((MaxSmallInteger) + 1)); if (isSmall) { smallVal = ((sqInt) magnitude); @@ -28318,22 +28314,22 @@ : (/* begin knownClassAtIndex: */ assert(((ClassLargePositiveIntegerCompactIndex >= 1) && (ClassLargePositiveIntegerCompactIndex <= (classTablePageSize())))), longAt((GIV(classTableFirstPage) + BaseHeaderSize) + (ClassLargePositiveIntegerCompactIndex << (shiftForWord()))))); - highWord = magnitude >> 32; - if (highWord == 0) { + if (((highWord = magnitude >> 32)) == 0) { sz = 4; } else { sz = 5; if (!(((highWord = ((usqInt) highWord) >> 8)) == 0)) { sz += 1; + if (!(((highWord = ((usqInt) highWord) >> 8)) == 0)) { + sz += 1; + if (!(((highWord = ((usqInt) highWord) >> 8)) == 0)) { + sz += 1; + } + } } - if (!(((highWord = ((usqInt) highWord) >> 8)) == 0)) { - sz += 1; - } - if (!(((highWord = ((usqInt) highWord) >> 8)) == 0)) { - sz += 1; - } } + newLargeInteger = instantiateClassindexableSize(largeClass, sz); for (i = 0; i < sz; i += 1) { intValue = (magnitude >> (i * 8)) & 0xFF; @@ -29907,7 +29903,7 @@ if (!GIV(primFailCode)) { if (((integerArgument = (integerArgument >> 1))) >= 0) { - /* Left shift -- must fail if we lose bits beyond 32 */ + /* Left shift -- must fail bits would be lost */ if (!(integerArgument <= 0x1F)) { /* begin primitiveFail */ @@ -29917,7 +29913,7 @@ return; } shifted = integerReceiver << integerArgument; - if (!((((usqInt) shifted) >> integerArgument) == integerReceiver)) { + if (!(integerReceiver == (((usqInt) shifted) >> integerArgument))) { /* begin primitiveFail */ if (!GIV(primFailCode)) { GIV(primFailCode) = 1; @@ -29938,9 +29934,7 @@ } shifted = ((usqInt) integerReceiver) >> (0 - integerArgument); } - shifted = ((shifted ^ (shifted << 1)) >= 0 - ? ((shifted << 1) | 1) - : positive32BitIntegerFor(shifted)); + shifted = positive32BitIntegerFor(shifted); /* begin pop:thenPush: */ longAtput((sp = GIV(stackPointer) + ((2 - 1) * BytesPerWord)), shifted); GIV(stackPointer) = sp; @@ -69055,23 +69049,20 @@ sqInt objFormat; sqInt sz; - - /* shift is coerced to usqInt otherwise */ - - highWord = integerValue >> 32; - if (highWord == 0) { + if (((highWord = ((sqInt) integerValue) >> 32)) == 0) { return positive32BitIntegerFor(integerValue); } sz = 5; if (!(((highWord = ((usqInt) highWord) >> 8)) == 0)) { sz += 1; + if (!(((highWord = ((usqInt) highWord) >> 8)) == 0)) { + sz += 1; + if (!(((highWord = ((usqInt) highWord) >> 8)) == 0)) { + sz += 1; + } + } } - if (!(((highWord = ((usqInt) highWord) >> 8)) == 0)) { - sz += 1; - } - if (!(((highWord = ((usqInt) highWord) >> 8)) == 0)) { - sz += 1; - } + /* begin eeInstantiateSmallClassIndex:format:numSlots: */ objFormat = 16 + ((8 - sz) & (BytesPerWord - 1)); assert(((8 / BytesPerOop) >= 0) @@ -72883,6 +72874,7 @@ sqInt objFormat; sqInt sz; + if (integerValue < 0) { largeClass = ClassLargeNegativeIntegerCompactIndex; magnitude = 0 - integerValue; @@ -72896,22 +72888,22 @@ || (0 != (integerValue << 1)))) { return signed32BitIntegerFor(integerValue); } - highWord = ((unsigned sqLong)magnitude) >> 32; - if (highWord == 0) { + if (((highWord = ((unsigned sqLong)magnitude) >> 32)) == 0) { sz = 4; } else { sz = 5; if (!(((highWord = ((usqInt) highWord) >> 8)) == 0)) { sz += 1; + if (!(((highWord = ((usqInt) highWord) >> 8)) == 0)) { + sz += 1; + if (!(((highWord = ((usqInt) highWord) >> 8)) == 0)) { + sz += 1; + } + } } - if (!(((highWord = ((usqInt) highWord) >> 8)) == 0)) { - sz += 1; - } - if (!(((highWord = ((usqInt) highWord) >> 8)) == 0)) { - sz += 1; - } } + /* begin eeInstantiateSmallClassIndex:format:numSlots: */ objFormat = 16 + ((8 - sz) & (BytesPerWord - 1)); numSlots = (sz + 3) / BytesPerOop; Modified: branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c =================================================================== --- branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c 2014-11-21 05:05:31 UTC (rev 3143) +++ branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c 2014-11-21 23:07:35 UTC (rev 3144) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.948 uuid: 9323b2ad-f5cf-4aca-8f31-67eb5616ccca + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.950 uuid: d4d2d679-fd90-48f5-a47a-ebae021776e7 from - StackInterpreter VMMaker.oscog-eem.948 uuid: 9323b2ad-f5cf-4aca-8f31-67eb5616ccca + StackInterpreter VMMaker.oscog-eem.950 uuid: d4d2d679-fd90-48f5-a47a-ebae021776e7 */ -static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.948 uuid: 9323b2ad-f5cf-4aca-8f31-67eb5616ccca " __DATE__ ; +static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.950 uuid: d4d2d679-fd90-48f5-a47a-ebae021776e7 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2093,7 +2093,7 @@ 0 }; char * breakSelector; sqInt breakSelectorLength = -1; -const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscog-eem.948"; +const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscog-eem.950"; volatile int sendTrace; sqInt suppressHeartbeatFlag; @@ -8489,7 +8489,7 @@ if (!GIV(primFailCode)) { if (((integerArgument = (integerArgument >> 1))) >= 0) { - /* Left shift -- must fail if we lose bits beyond 32 */ + /* Left shift -- must fail bits would be lost */ if (!(integerArgument <= 0x1F)) { /* begin primitiveFail */ @@ -8500,7 +8500,7 @@ goto l94; } shifted = integerReceiver << integerArgument; - if (!((((usqInt) shifted) >> integerArgument) == integerReceiver)) { + if (!(integerReceiver == (((usqInt) shifted) >> integerArgument))) { /* begin primitiveFail */ if (!GIV(primFailCode)) { GIV(primFailCode) = 1; @@ -8523,9 +8523,7 @@ } shifted = ((usqInt) integerReceiver) >> (0 - integerArgument); } - shifted = ((shifted ^ (shifted << 1)) >= 0 - ? ((shifted << 1) | 1) - : positive32BitIntegerFor(shifted)); + shifted = positive32BitIntegerFor(shifted); /* begin pop:thenPush: */ longAtput((sp = GIV(stackPointer) + ((2 - 1) * BytesPerWord)), shifted); GIV(stackPointer) = sp; @@ -11457,7 +11455,7 @@ if (!GIV(primFailCode)) { if (((integerArgument = (integerArgument >> 1))) >= 0) { - /* Left shift -- must fail if we lose bits beyond 32 */ + /* Left shift -- must fail bits would be lost */ if (!(integerArgument <= 0x1F)) { /* begin primitiveFail */ @@ -11468,7 +11466,7 @@ goto l221; } shifted = integerReceiver << integerArgument; - if (!((((usqInt) shifted) >> integerArgument) == integerReceiver)) { + if (!(integerReceiver == (((usqInt) shifted) >> integerArgument))) { /* begin primitiveFail */ if (!GIV(primFailCode)) { GIV(primFailCode) = 1; @@ -11491,9 +11489,7 @@ } shifted = ((usqInt) integerReceiver) >> (0 - integerArgument); } - shifted = ((shifted ^ (shifted << 1)) >= 0 - ? ((shifted << 1) | 1) - : positive32BitIntegerFor(shifted)); + shifted = positive32BitIntegerFor(shifted); /* begin pop:thenPush: */ longAtput((sp = GIV(stackPointer) + ((2 - 1) * BytesPerWord)), shifted); GIV(stackPointer) = sp; @@ -14111,7 +14107,7 @@ sqInt sz; isSmall = (isNegative - ? magnitude <= ((MaxSmallInteger) + 1) + ? magnitude < (MaxSmallInteger) : magnitude < ((MaxSmallInteger) + 1)); if (isSmall) { smallVal = ((sqInt) magnitude); @@ -14127,22 +14123,22 @@ : (/* begin knownClassAtIndex: */ assert(((ClassLargePositiveIntegerCompactIndex >= 1) && (ClassLargePositiveIntegerCompactIndex <= (classTablePageSize())))), longAt((GIV(classTableFirstPage) + BaseHeaderSize) + (ClassLargePositiveIntegerCompactIndex << (shiftForWord()))))); - highWord = magnitude >> 32; - if (highWord == 0) { + if (((highWord = magnitude >> 32)) == 0) { sz = 4; } else { sz = 5; if (!(((highWord = ((usqInt) highWord) >> 8)) == 0)) { sz += 1; + if (!(((highWord = ((usqInt) highWord) >> 8)) == 0)) { + sz += 1; + if (!(((highWord = ((usqInt) highWord) >> 8)) == 0)) { + sz += 1; + } + } } - if (!(((highWord = ((usqInt) highWord) >> 8)) == 0)) { - sz += 1; - } - if (!(((highWord = ((usqInt) highWord) >> 8)) == 0)) { - sz += 1; - } } + newLargeInteger = instantiateClassindexableSize(largeClass, sz); for (i = 0; i < sz; i += 1) { intValue = (magnitude >> (i * 8)) & 0xFF; @@ -15718,7 +15714,7 @@ if (!GIV(primFailCode)) { if (((integerArgument = (integerArgument >> 1))) >= 0) { - /* Left shift -- must fail if we lose bits beyond 32 */ + /* Left shift -- must fail bits would be lost */ if (!(integerArgument <= 0x1F)) { /* begin primitiveFail */ @@ -15728,7 +15724,7 @@ return; } shifted = integerReceiver << integerArgument; - if (!((((usqInt) shifted) >> integerArgument) == integerReceiver)) { + if (!(integerReceiver == (((usqInt) shifted) >> integerArgument))) { /* begin primitiveFail */ if (!GIV(primFailCode)) { GIV(primFailCode) = 1; @@ -15749,9 +15745,7 @@ } shifted = ((usqInt) integerReceiver) >> (0 - integerArgument); } - shifted = ((shifted ^ (shifted << 1)) >= 0 - ? ((shifted << 1) | 1) - : positive32BitIntegerFor(shifted)); + shifted = positive32BitIntegerFor(shifted); /* begin pop:thenPush: */ longAtput((sp = GIV(stackPointer) + ((2 - 1) * BytesPerWord)), shifted); GIV(stackPointer) = sp; @@ -57329,23 +57323,20 @@ sqInt objFormat; sqInt sz; - - /* shift is coerced to usqInt otherwise */ - - highWord = integerValue >> 32; - if (highWord == 0) { + if (((highWord = ((sqInt) integerValue) >> 32)) == 0) { return positive32BitIntegerFor(integerValue); } sz = 5; if (!(((highWord = ((usqInt) highWord) >> 8)) == 0)) { sz += 1; + if (!(((highWord = ((usqInt) highWord) >> 8)) == 0)) { + sz += 1; + if (!(((highWord = ((usqInt) highWord) >> 8)) == 0)) { + sz += 1; + } + } } - if (!(((highWord = ((usqInt) highWord) >> 8)) == 0)) { - sz += 1; - } - if (!(((highWord = ((usqInt) highWord) >> 8)) == 0)) { - sz += 1; - } + /* begin eeInstantiateSmallClassIndex:format:numSlots: */ objFormat = 16 + ((8 - sz) & (BytesPerWord - 1)); assert(((8 / BytesPerOop) >= 0) @@ -62361,6 +62352,7 @@ sqInt objFormat; sqInt sz; + if (integerValue < 0) { largeClass = ClassLargeNegativeIntegerCompactIndex; magnitude = 0 - integerValue; @@ -62374,22 +62366,22 @@ || (0 != (integerValue << 1)))) { return signed32BitIntegerFor(integerValue); } - highWord = ((unsigned sqLong)magnitude) >> 32; - if (highWord == 0) { + if (((highWord = ((unsigned sqLong)magnitude) >> 32)) == 0) { sz = 4; } else { sz = 5; if (!(((highWord = ((usqInt) highWord) >> 8)) == 0)) { sz += 1; + if (!(((highWord = ((usqInt) highWord) >> 8)) == 0)) { + sz += 1; + if (!(((highWord = ((usqInt) highWord) >> 8)) == 0)) { + sz += 1; + } + } } - if (!(((highWord = ((usqInt) highWord) >> 8)) == 0)) { - sz += 1; - } - if (!(((highWord = ((usqInt) highWord) >> 8)) == 0)) { - sz += 1; - } } + /* begin eeInstantiateSmallClassIndex:format:numSlots: */ objFormat = 16 + ((8 - sz) & (BytesPerWord - 1)); numSlots = (sz + 3) / BytesPerOop; Modified: branches/Cog/nsspurstacksrc/vm/interp.c =================================================================== --- branches/Cog/nsspurstacksrc/vm/interp.c 2014-11-21 05:05:31 UTC (rev 3143) +++ branches/Cog/nsspurstacksrc/vm/interp.c 2014-11-21 23:07:35 UTC (rev 3144) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.948 uuid: 9323b2ad-f5cf-4aca-8f31-67eb5616ccca + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.950 uuid: d4d2d679-fd90-48f5-a47a-ebae021776e7 from @@ Diff output truncated at 50000 characters. @@

1 0

VM Maker: VMMaker.oscog-eem.950.mcz
by commits＠source.squeak.org 22 Nov '14

22 Nov '14

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.950.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.950 Author: eem Time: 21 November 2014, 3:00:59.899 pm UUID: d4d2d679-fd90-48f5-a47a-ebae021776e7 Ancestors: VMMaker.oscog-tpr.949 Fix regression in new primitiveBitShift. Introduce >>> as an explicitly signed shift. 64-bit ize magnitude64BitIntegerFor:neg:, positive64BitIntegerFor: & signed64BitIntegerFor: =============== Diff against VMMaker.oscog-tpr.949 =============== Item was added: + ----- Method: CCodeGenerator>>generateSignedShiftRight:on:indent: (in category 'C translation') ----- + generateSignedShiftRight: msgNode on: aStream indent: level + "Generate the C code for >>> onto the given stream." + + aStream nextPutAll: '((sqInt) '. + self emitCExpression: msgNode receiver on: aStream. + aStream nextPutAll: ') >> '. + self emitCExpression: msgNode args first on: aStream! Item was changed: ----- Method: CCodeGenerator>>initializeCTranslationDictionary (in category 'C translation') ----- initializeCTranslationDictionary "Initialize the dictionary mapping message names to actions for C code generation." | pairs | translationDict := Dictionary new: 200. pairs := #( #& #generateAnd:on:indent: #| #generateOr:on:indent: #and: #generateSequentialAnd:on:indent: #or: #generateSequentialOr:on:indent: #not #generateNot:on:indent: #+ #generatePlus:on:indent: #- #generateMinus:on:indent: #negated #generateNegated:on:indent: #* #generateTimes:on:indent: #/ #generateDivide:on:indent: #// #generateDivide:on:indent: #\\ #generateModulo:on:indent: #<< #generateShiftLeft:on:indent: #>> #generateShiftRight:on:indent: + #>>> #generateSignedShiftRight:on:indent: #min: #generateMin:on:indent: #max: #generateMax:on:indent: #between:and: #generateBetweenAnd:on:indent: #bitAnd: #generateBitAnd:on:indent: #bitOr: #generateBitOr:on:indent: #bitXor: #generateBitXor:on:indent: #bitShift: #generateBitShift:on:indent: #signedBitShift: #generateSignedBitShift:on:indent: #bitInvert32 #generateBitInvert:on:indent: #bitInvert64 #generateBitInvert:on:indent: #bitClear: #generateBitClear:on:indent: #truncateTo: #generateTruncateTo:on:indent: #rounded #generateRounded:on:indent: #< #generateLessThan:on:indent: #<= #generateLessThanOrEqual:on:indent: #= #generateEqual:on:indent: #> #generateGreaterThan:on:indent: #>= #generateGreaterThanOrEqual:on:indent: #~= #generateNotEqual:on:indent: #== #generateEqual:on:indent: #~~ #generateNotEqual:on:indent: #isNil #generateIsNil:on:indent: #notNil #generateNotNil:on:indent: #whileTrue: #generateWhileTrue:on:indent: #whileFalse: #generateWhileFalse:on:indent: #whileTrue #generateDoWhileTrue:on:indent: #whileFalse #generateDoWhileFalse:on:indent: #to:do: #generateToDo:on:indent: #to:by:do: #generateToByDo:on:indent: #repeat #generateRepeat:on:indent: #ifTrue: #generateIfTrue:on:indent: #ifFalse: #generateIfFalse:on:indent: #ifTrue:ifFalse: #generateIfTrueIfFalse:on:indent: #ifFalse:ifTrue: #generateIfFalseIfTrue:on:indent: #ifNotNil: #generateIfNotNil:on:indent: #ifNil: #generateIfNil:on:indent: #ifNotNil:ifNil: #generateIfNotNilIfNil:on:indent: #ifNil:ifNotNil: #generateIfNilIfNotNil:on:indent: #at: #generateAt:on:indent: #at:put: #generateAtPut:on:indent: #basicAt: #generateAt:on:indent: #basicAt:put: #generateAtPut:on:indent: #integerValueOf: #generateIntegerValueOf:on:indent: #integerObjectOf: #generateIntegerObjectOf:on:indent: #isIntegerObject: #generateIsIntegerObject:on:indent: #cCode: #generateInlineCCode:on:indent: #cCode:inSmalltalk: #generateInlineCCode:on:indent: #cPreprocessorDirective: #generateInlineCPreprocessorDirective:on:indent: #cppIf:ifTrue:ifFalse: #generateInlineCppIfElse:on:indent: #cppIf:ifTrue: #generateInlineCppIfElse:on:indent: #cCoerce:to: #generateCCoercion:on:indent: #cCoerceSimple:to: #generateCCoercion:on:indent: #addressOf: #generateAddressOf:on:indent: #addressOf:put: #generateAddressOf:on:indent: #asAddress:put: #generateAsAddress:on:indent: #signedIntFromLong #generateSignedIntFromLong:on:indent: #signedIntToLong #generateSignedIntToLong:on:indent: #signedIntFromShort #generateSignedIntFromShort:on:indent: #signedIntToShort #generateSignedIntToShort:on:indent: #preIncrement #generatePreIncrement:on:indent: #preDecrement #generatePreDecrement:on:indent: #inline: #generateInlineDirective:on:indent: #asFloat #generateAsFloat:on:indent: #asInteger #generateAsInteger:on:indent: #asUnsignedInteger #generateAsUnsignedInteger:on:indent: #asLong #generateAsLong:on:indent: #asUnsignedLong #generateAsUnsignedLong:on:indent: #asVoidPointer #generateAsVoidPointer:on:indent: #asSymbol #generateAsSymbol:on:indent: #flag: #generateFlag:on:indent: #anyMask: #generateBitAnd:on:indent: #noMask: #generateNoMask:on:indent: #raisedTo: #generateRaisedTo:on:indent: #touch: #generateTouch:on:indent: #bytesPerOop #generateBytesPerOop:on:indent: #bytesPerWord #generateBytesPerWord:on:indent: #wordSize #generateBytesPerWord:on:indent: #baseHeaderSize #generateBaseHeaderSize:on:indent: #minSmallInteger #generateSmallIntegerConstant:on:indent: #maxSmallInteger #generateSmallIntegerConstant:on:indent: #sharedCodeNamed:inCase: #generateSharedCodeDirective:on:indent: #perform: #generatePerform:on:indent: #perform:with: #generatePerform:on:indent: #perform:with:with: #generatePerform:on:indent: #perform:with:with:with: #generatePerform:on:indent: #perform:with:with:with:with: #generatePerform:on:indent: #perform:with:with:with:with:with: #generatePerform:on:indent: #value #generateValue:on:indent: #value: #generateValue:on:indent: #value:value: #generateValue:on:indent: #value:value:value: #generateValue:on:indent: #deny: #generateDeny:on:indent: #shouldNotImplement #generateSmalltalkMetaError:on:indent: #shouldBeImplemented #generateSmalltalkMetaError:on:indent: #subclassResponsibility #generateSmalltalkMetaError:on:indent: ). 1 to: pairs size by: 2 do: [:i | translationDict at: (pairs at: i) put: (pairs at: i + 1)]. pairs := #( #ifTrue: #generateIfTrueAsArgument:on:indent: #ifFalse: #generateIfFalseAsArgument:on:indent: #ifTrue:ifFalse: #generateIfTrueIfFalseAsArgument:on:indent: #ifFalse:ifTrue: #generateIfFalseIfTrueAsArgument:on:indent: #ifNotNil: #generateIfNotNilAsArgument:on:indent: #ifNil: #generateIfNilAsArgument:on:indent: #ifNotNil:ifNil: #generateIfNotNilIfNilAsArgument:on:indent: #ifNil:ifNotNil: #generateIfNilIfNotNilAsArgument:on:indent: #cCode: #generateInlineCCodeAsArgument:on:indent: #cCode:inSmalltalk: #generateInlineCCodeAsArgument:on:indent: #cppIf:ifTrue:ifFalse: #generateInlineCppIfElseAsArgument:on:indent: #cppIf:ifTrue: #generateInlineCppIfElseAsArgument:on:indent: #value #generateValueAsArgument:on:indent: #value: #generateValueAsArgument:on:indent: #value:value: #generateValueAsArgument:on:indent: ). asArgumentTranslationDict := Dictionary new: 8. 1 to: pairs size by: 2 do: [:i | asArgumentTranslationDict at: (pairs at: i) put: (pairs at: i + 1)]. ! Item was added: + ----- Method: Integer>>>>> (in category '*VMMaker-bit manipulation') ----- + >>> shiftAmount "right shift, but causes CCodeGenerator to generate a signed shift" + shiftAmount < 0 ifTrue: [self error: 'negative arg']. + ^self bitShift: 0 - shiftAmount! Item was changed: ----- Method: InterpreterPrimitives>>magnitude64BitIntegerFor:neg: (in category 'primitive support') ----- magnitude64BitIntegerFor: magnitude neg: isNegative "Return a Large Integer object for the given integer magnitude and sign" | newLargeInteger largeClass intValue highWord sz isSmall smallVal | <var: 'magnitude' type: #usqLong> <var: 'highWord' type: #usqInt> isSmall := isNegative + ifTrue: [magnitude < objectMemory maxSmallInteger] - ifTrue: [magnitude <= (objectMemory maxSmallInteger + 1)] ifFalse: [magnitude < (objectMemory maxSmallInteger + 1)]. isSmall ifTrue: [smallVal := self cCoerceSimple: magnitude to: #sqInt. + isNegative ifTrue: [smallVal := 0 - smallVal]. + ^objectMemory integerObjectOf: smallVal]. + - isNegative ifTrue: [smallVal := 0 - smallVal]. - ^objectMemory integerObjectOf: smallVal]. largeClass := isNegative ifTrue: [objectMemory classLargeNegativeInteger] ifFalse: [objectMemory classLargePositiveInteger]. + objectMemory wordSize = 8 + ifTrue: [sz := 8] - highWord := magnitude >> 32. - highWord = 0 - ifTrue: [sz := 4] ifFalse: + [(highWord := magnitude >> 32) = 0 + ifTrue: [sz := 4] + ifFalse: + [sz := 5. + (highWord := highWord >> 8) = 0 ifFalse: + [sz := sz + 1. + (highWord := highWord >> 8) = 0 ifFalse: + [sz := sz + 1. + (highWord := highWord >> 8) = 0 ifFalse: [sz := sz + 1]]]]]. - [sz := 5. - (highWord := highWord >> 8) = 0 ifFalse: [sz := sz + 1]. - (highWord := highWord >> 8) = 0 ifFalse: [sz := sz + 1]. - (highWord := highWord >> 8) = 0 ifFalse: [sz := sz + 1]]. newLargeInteger := objectMemory instantiateClass: largeClass indexableSize: sz. 0 to: sz-1 do: [:i | intValue := (magnitude >> (i * 8)) bitAnd: 255. objectMemory storeByte: i ofObject: newLargeInteger withValue: intValue]. ^newLargeInteger! Item was changed: ----- Method: InterpreterPrimitives>>primitiveBitShift (in category 'arithmetic integer primitives') ----- primitiveBitShift | integerReceiver integerArgument shifted | integerArgument := self stackTop. (objectMemory isIntegerObject: integerArgument) ifFalse: [^self primitiveFail]. integerReceiver := self stackValue: 1. objectMemory wordSize = 4 ifTrue: [integerReceiver := self positive32BitValueOf: integerReceiver] ifFalse: [integerReceiver := self signed64BitValueOf: integerReceiver]. self successful ifTrue: [(integerArgument := objectMemory integerValueOf: integerArgument) >= 0 + ifTrue: "Left shift -- must fail bits would be lost" - ifTrue: "Left shift -- must fail if we lose bits beyond 32" [integerArgument <= objectMemory numSmallIntegerBits ifFalse: [^self primitiveFail]. shifted := integerReceiver << integerArgument. + integerReceiver = (objectMemory wordSize = 4 + ifTrue: [shifted >> integerArgument] + ifFalse: [shifted >>> integerArgument]) ifFalse: - (shifted >> integerArgument) = integerReceiver ifFalse: [^self primitiveFail]] ifFalse: "Right shift -- OK to lose bits" [integerArgument >= objectMemory numSmallIntegerBits negated ifFalse: [^self primitiveFail]. + shifted := integerReceiver >> (0 - integerArgument)]. + shifted := objectMemory wordSize = 4 + ifTrue: [self positive32BitIntegerFor: shifted] - shifted := integerReceiver >> (0 - integerArgument)]. - shifted := (objectMemory isIntegerValue: shifted) - ifTrue: [objectMemory integerObjectOf: shifted] ifFalse: + [(objectMemory isIntegerValue: shifted) + ifTrue: [objectMemory integerObjectOf: shifted] - [objectMemory wordSize = 4 - ifTrue: [self positive32BitIntegerFor: shifted] ifFalse: [self signed64BitIntegerFor: shifted]]. self pop: 2 thenPush: shifted]! Item was changed: ----- Method: StackInterpreter>>positive64BitIntegerFor: (in category 'primitive support') ----- positive64BitIntegerFor: integerValue <var: 'integerValue' type: #sqLong> "Answer a Large Positive Integer object for the given integer value. N.B. will *not* cause a GC." | newLargeInteger highWord sz | + objectMemory wordSize = 8 + ifTrue: + [(integerValue >= 0 and: [objectMemory isIntegerValue: integerValue]) ifTrue: + [^objectMemory integerObjectOf: integerValue]. + sz := 8] + ifFalse: + [(highWord := integerValue >>> 32) = 0 ifTrue: + [^self positive32BitIntegerFor: integerValue]. + sz := 5. + (highWord := highWord >> 8) = 0 ifFalse: + [sz := sz + 1. + (highWord := highWord >> 8) = 0 ifFalse: + [sz := sz + 1. + (highWord := highWord >> 8) = 0 ifFalse:[sz := sz + 1]]]]. - highWord := self cCode: 'integerValue >> 32' inSmalltalk: [integerValue >> 32]. "shift is coerced to usqInt otherwise" - highWord = 0 ifTrue:[^self positive32BitIntegerFor: integerValue]. - sz := 5. - (highWord := highWord >> 8) = 0 ifFalse:[sz := sz + 1]. - (highWord := highWord >> 8) = 0 ifFalse:[sz := sz + 1]. - (highWord := highWord >> 8) = 0 ifFalse:[sz := sz + 1]. newLargeInteger := objectMemory eeInstantiateSmallClassIndex: ClassLargePositiveIntegerCompactIndex format: (objectMemory byteFormatForNumBytes: sz) numSlots: 8 / objectMemory bytesPerOop. objectMemory storeByte: 7 ofObject: newLargeInteger withValue: (integerValue >> 56 bitAnd: 16rFF); storeByte: 6 ofObject: newLargeInteger withValue: (integerValue >> 48 bitAnd: 16rFF); storeByte: 5 ofObject: newLargeInteger withValue: (integerValue >> 40 bitAnd: 16rFF); storeByte: 4 ofObject: newLargeInteger withValue: (integerValue >> 32 bitAnd: 16rFF); storeByte: 3 ofObject: newLargeInteger withValue: (integerValue >> 24 bitAnd: 16rFF); storeByte: 2 ofObject: newLargeInteger withValue: (integerValue >> 16 bitAnd: 16rFF); storeByte: 1 ofObject: newLargeInteger withValue: (integerValue >> 8 bitAnd: 16rFF); storeByte: 0 ofObject: newLargeInteger withValue: (integerValue ">> 0" bitAnd: 16rFF). ^newLargeInteger ! Item was changed: ----- Method: StackInterpreter>>signed64BitIntegerFor: (in category 'primitive support') ----- signed64BitIntegerFor: integerValue <var: 'integerValue' type: #sqLong> "Answer a Large Integer object for the given integer value. N.B. will *not* cause a GC." | newLargeInteger magnitude largeClass highWord sz | <inline: false> <var: 'magnitude' type: #sqLong> <var: 'highWord' type: #usqInt> + objectMemory wordSize = 8 ifTrue: + [(objectMemory isIntegerValue: integerValue) ifTrue: + [^objectMemory integerObjectOf: integerValue]. + sz := 8]. + integerValue < 0 ifTrue:[ largeClass := ClassLargeNegativeIntegerCompactIndex. magnitude := 0 - integerValue] ifFalse:[ largeClass := ClassLargePositiveIntegerCompactIndex. magnitude := integerValue]. "Make sure to handle the most -ve value correctly. 0 - most -ve = most -ve and most -ve - 1 is +ve. Alas the simple (negative or: [integerValue - 1 < 0]) fails with contemporary gcc and icc versions with optimization and sometimes without. The shift works on all, touch wood." + + objectMemory wordSize = 4 ifTrue: + [(magnitude <= 16r7FFFFFFF + and: [integerValue >= 0 + or: [0 ~= (self cCode: [integerValue << 1] + inSmalltalk: [integerValue << 1 bitAnd: (1 << 64) - 1])]]) ifTrue: + [^self signed32BitIntegerFor: integerValue]. - (magnitude <= 16r7FFFFFFF - and: [integerValue >= 0 - or: [0 ~= (self cCode: [integerValue << 1] - inSmalltalk: [integerValue << 1 bitAnd: (1 << 64) - 1])]]) ifTrue: - [^self signed32BitIntegerFor: integerValue]. + (highWord := magnitude >> 32) = 0 + ifTrue: [sz := 4] + ifFalse: + [sz := 5. + (highWord := highWord >> 8) = 0 ifFalse: + [sz := sz + 1. + (highWord := highWord >> 8) = 0 ifFalse: + [sz := sz + 1. + (highWord := highWord >> 8) = 0 ifFalse: + [sz := sz + 1]]]]]. + - highWord := magnitude >> 32. - highWord = 0 - ifTrue:[sz := 4] - ifFalse: - [sz := 5. - (highWord := highWord >> 8) = 0 ifFalse:[sz := sz + 1]. - (highWord := highWord >> 8) = 0 ifFalse:[sz := sz + 1]. - (highWord := highWord >> 8) = 0 ifFalse:[sz := sz + 1]]. newLargeInteger := objectMemory eeInstantiateSmallClassIndex: largeClass format: (objectMemory byteFormatForNumBytes: sz) numSlots: sz + 3 // objectMemory bytesPerOop. sz > 4 ifTrue: [objectMemory storeByte: 7 ofObject: newLargeInteger withValue: (magnitude >> 56 bitAnd: 16rFF); storeByte: 6 ofObject: newLargeInteger withValue: (magnitude >> 48 bitAnd: 16rFF); storeByte: 5 ofObject: newLargeInteger withValue: (magnitude >> 40 bitAnd: 16rFF); storeByte: 4 ofObject: newLargeInteger withValue: (magnitude >> 32 bitAnd: 16rFF)]. objectMemory storeByte: 3 ofObject: newLargeInteger withValue: (magnitude >> 24 bitAnd: 16rFF); storeByte: 2 ofObject: newLargeInteger withValue: (magnitude >> 16 bitAnd: 16rFF); storeByte: 1 ofObject: newLargeInteger withValue: (magnitude >> 8 bitAnd: 16rFF); storeByte: 0 ofObject: newLargeInteger withValue: (magnitude ">> 0" bitAnd: 16rFF). ^newLargeInteger!

1 0

Re: [squeak-dev] Float hierarchy for 64-bit Spur
by Eliot Miranda 21 Nov '14

21 Nov '14

Hi Tobias, On Fri, Nov 21, 2014 at 4:51 AM, Tobias Pape <Das.Linux(a)gmx.de> wrote: > Hi, > > On 21.11.2014, at 13:44, Bert Freudenberg <bert(a)freudenbergs.de> wrote: > > > On 21.11.2014, at 13:29, J. Vuletich (mail lists) < > juanlists(a)jvuletich.org> wrote: > > > >> Quoting Bert Freudenberg <bert(a)freudenbergs.de>: > >>> > >>> I'd suggest BoxedDouble and ImmediateDouble as names for the concrete > subclasses (*). Names do mean something. (**) > >>> > >>> You're right about the FloatArray confusion. However, note that the > IEEE standard calls it single and double. It's only C using "float" to mean > "single precision". > >>> > >>> I'd name the abstract superclass Float, for readability, and the > isFloat test etc. Also: "Float pi" reads a lot nicer than anything else. I > don't see the need for having a deep LimitedPrecisionReal - Float - > BoxedDouble/ImmediateDouble deep hierarchy now. > >>> > >>> If we ever add single-precision floats, we should name them > BoxedSingle and ImmediateSingle. At that point we might want a Single > superclass and a LimitedPrecisionReal supersuperclass, but we can cross > that bridge when we get there. > >>> > >>> - Bert - > >>> > >>> (*) Since we're not going to see the class names often, we could even > spell it out as BoxedDoublePrecisionFloat and > ImmediateDoublePrecisionFloat. Only half joking. It would make the relation > to the abstract Float very clear. > >>> > >>> (**) We could also try to make the names googleable. I was surprised > to not get a good hit for "boxed immediate". Only "boxed unboxed" finds it. > Maybe there are two better words? > >> > >> I very much agree with Bert. But I'd suggest SmallDouble instead of > ImmediateDouble for consistency with SmallInteger. > > > > Then it would have to be LargeDouble for consistency with LargeInteger, > too. Which I don't find compelling. > > > > Also, with the 64 bit format we get many more immediate objects. There > already are immediate integers and characters, floats will be the third, > there could be more, like immediate points. For those, the small/large > distinction does not make sense. > > > > Maybe Eliot's idea of keeping "Float" in the name was best, but instead > of "small" use "immediate": > > > > Float - BoxedFloat - ImmediateFloat > > > > A Float is either a BoxedFloat or an ImmediateFloat, depending on > the magnitude of its exponent. > > I don't like the idea of putting a VM/Storage detail into the Class name. > The running system itself does not care about whether Floats or Integers > are > boxed or immediate. > I disagree. I think at least Smalltalk-80 has a philosophy of lifting as much out of the VM into the system, and hiding it from clients via encapsulation. So unlike many other VMs the compiler is in the system, the system explicitly separates SmallInteger, LargePositiveInteger and LargeNegativeInteger and implements large integer arithmetic with Smalltalk code that uses SmallIntegers. Note that the primitives are an optional extra optimization that the VM does not need to implement. So for me it is in keeping with the current system to use BoxedFloat and SmallFloat or BoxedDouble and SmallDouble. This lifting things up provides us with an extremely malleable system. Pushing things down into the VM does the opposite. For example in RSqueakVM (aka SPy) there is no immediate > Integer whatsoever. Yes, tagged ints are read during image startup but they > aren't subsequently represented as immediates or tagged ints after that. > Well because it's implemented above RPython I guess it is using Python's bignum code directly. That's fine but its a bit of a cheat. > > Just as input, in the Racket language and other Schemes, > the equivalent to our SmallInterger/LargeInteger is fixnum/bignum > and for floats they have flonums and "extflonums" (80bit). > > Best > -Tobias thanks -- best, Eliot

2 3

← Newer
1
2
3
4
5
6
7
8
...
17
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 2014