Vm-dev November 2014

vm-dev@lists.squeakfoundation.org

36 participants
165 discussions

Signed/unsigned shifting (was: VMMaker.oscog-eem.950.mcz)
by Bert Freudenberg 27 Nov '14

27 Nov '14

On 21.11.2014, at 23:01, Eliot Miranda uploaded VMMaker.oscog-eem.950.mcz > > Introduce >>> as an explicitly signed shift. Ugh, can we pick something else, please? It's really confusing. In various languages (notably Java and JavaScript), >> is signed and >>> unsigned. I don't know any language that has both operators and the meaning reversed. And >> still means signed or unsigned depending on context. Not nice at all. How about ... >> signed/unsigned depending on type (what we have now) >>+ force unsigned shift >>- force signed shift - Bert -

6 8

Identity hash for immediate objects in Spur
by Bert Freudenberg 27 Nov '14

27 Nov '14

Currently, the identityHash of a SmallInteger is that value itself. The hash primitive (75) fails for SmallIntegers. For new immediate objects I think the VM needs to answer a hash, because it would be inconvenient/expensive to do on the image side. The VM could simply re-interpret the bits of the oops as if it was a SmallInteger. But it could also pick 22 bits (as for non-immediate objects) depending on the immediate class that are likely to make a good hash (*). If we do the latter, would it be possible to make the identityHash of boxed floats be the same? The advantage of this would be that the VM could freely demote a boxed float into an immediate one at any time, even if it was held in an identity dictionary. That way the image might not have to worry as much about normalizing floats (as it has to do now with large integers). - Bert - (*) For an immediate double, picking the lower 22 bits of the upper 32 bit word seems reasonable, taking the 2 least significant bits of exponent and 20 most significant bits of the mantissa.

2 1

Re: [Pharo-dev] NativeBoost
by Eliot Miranda 26 Nov '14

26 Nov '14

On Tue, Nov 25, 2014 at 5:06 AM, Torsten Bergmann <astares(a)gmx.de> wrote: > Please enlighten me as well. I also do not yet understand the idea of this > unification layer. > "Unification layer" is just a name. IMO Ronie is doing something much more useful. He is architecting the marshalling layer of the FFI so that it can - be portable - work in both the Cog JIT and the Interpreter This is effectively an abstract instruction set for executing low-level machine intsructions. It can be used for FFI call-out marshalling, but it can also be used for low-level code generation, and we are using it in Sista. COnsequently Ronie's "Low code" as it is properly called can be an integral component to both a high-quality FFI and a fast VM. For me this is a useful substrate for an FFI that can be high quality. But note that it is only one component. The other components are - an image-level ABI compiler whose job it is to generate the correct marshalling code for different platforms. The FFI for processors such as IA64/x86-64 is complex, and a compiler is the only performant way to generate correct marshalling code - callback machinery. I have already designed and implemented this in the context of Alien. The architecture is portable; it can function correctly on x86-64 and ARM, not just x86. > So far we have > 1. FFI -> not maintained very well, no callbacks > This is simply false. The FFI was in active use at Qwaq where Cog was first implemented. I have continued to maintain and enhance it, reimplementing it so that it is a pure Smalltalk plugin with no assembler support code, so that it is reentrant. Recently Doug McPherson has implemented the ARM version alongside my original x86 version. > 2. Alien -> should provide the callbacks, hard to find a predefined > package/VM combination > Every Cog VM supports Alien callbacks. The Alien package Alien-eem.24 at http://www.squeaksource.com/Alien "jsut works", at least in Squeak. Try it. > 3. NativeBoost was supposed to be the better one, was based on AsmJit and > replace 1. and 2. > I disagree. NativeBoost has not been designed with portability in mind, nor has it been designed with interpretive VMs in mind. Further Igor made no attempt to work with me in providing the support he needs from Cog to integrate NativeBoost when I visited Rmod early this year. According to my knowledge it was the goal to continue with NB, integrate it > (which is done) > and move it forward as the single solution for external calls and > callbacks. > > So why do we need another layer (and mixed approach with still old FFI) > instead of working > on bringing NB to the other platforms as well and work on a good > NativeBoost. Wasn't there > already work for AsmJit for ARM? > We have a functional FFI at the moment, FFI + Alien for callbacks. This is in industrial use, both at Terf (nee Qwaq) and Cadence. We have NativeBoost that does not work on ARM. We have Ronie's work on low code that fits both with a well-architected FFI and with Sista. I am frustrated that there is no coherence in our work here. I have a clear understanding of what architecture can work, a clear vision, and yet other than Ronie, all I see is FUD ("Alien doesn't work", "FFI doesn't work", "Alien callbacks don't work"; all false). I wish this wasn't the case. I do not have time right now to work on all of Spur, Spur 64, Sista and find time to architect the FFI. But I know how this stuff works (I've implemented what works now) and as the leads VM architect isn't it right that the community try and work with me rather than without me? > Thx > T. > > > Gesendet: Dienstag, 25. November 2014 um 10:01 Uhr > > Von: "Markus Fritsche" <mfritsche(a)reauktion.de> > > An: "Pharo Development List" <pharo-dev(a)lists.pharo.org> > > Betreff: Re: [Pharo-dev] NativeBoost > > > > On 2014-11-24 23:34, Esteban Lorenzano wrote: > > > > > now, since the most common use of NB is for FFI, and NB is not present > > > in all platforms, we are working (Ronie, in this case) in a “unified > > > FFI”, which will provide a common abstraction layer for several FFI > > > frameworks (NB, OldFFI, Alien…). With that, we can choose which one > > > of the frameworks we use depending on the situation (but ideally, we > > > will maintain just one, the one that fits better in Pharo). > > > > I feel that providing a common abstraction layer on top of the various > > approaches to interface to C/ C++ libraries won't be useful and should > > be considered a waste of resources. From what I understood from the > > documentation, NativeBoost seems to be the most complete interface > > technology yet. I would rather (as in: If I was capable) try to get > > NativeBoost into Squeak and add the functionality missing that still > > justifies the existence of FFI and Alien than creating an abstraction > > layer that can't cope with the differences in the tools (which was the > > reason for their first creation despite the available ones). > > > > I tried to play around with FFI and creating plugins in Squeak and > > failed (I didn't try very hard though). NativeBoost was the first thing > > I was able to wrap a DLL myself and understand how to do it. The only > > thing that I wasn't able to wrap my mind around was finalization, but > > that is also due to the fact that I couldn't find understandable (read: > > understandable to me) documentation about the underlying concept in > > Pharo. > > > > (OT: Finalization and concurrency probably is more about the concept > > rather than the implementation in Pharo?) > > > > This is a piece of opinion. We all know, that unfortunately, one doesn't > > have to have knowledge to have an opinion, so if my opinion is wrong due > > to lack of knowledge, please ignore it. > > > > Best regards, > > Markus > > > > > > > > -- best, Eliot

3 3

[commit][3153] Format the morphed float timestamps correctly.
by commits＠squeakvm.org 26 Nov '14

26 Nov '14

Revision: 3153 Author: eliot Date: 2014-11-26 14:45:03 -0800 (Wed, 26 Nov 2014) Log Message: ----------- Format the morphed float timestamps correctly. Modified Paths: -------------- branches/Cog/image/MorphFloat.st Modified: branches/Cog/image/MorphFloat.st =================================================================== --- branches/Cog/image/MorphFloat.st 2014-11-26 19:57:25 UTC (rev 3152) +++ branches/Cog/image/MorphFloat.st 2014-11-26 22:45:03 UTC (rev 3153) @@ -12,10 +12,10 @@ classVariableNames: '' poolDictionaries: '' category: 'Kernel-Numbers'. - '!!SoonToBeFloat class methodsFor: ''instance creation'' stamp: ''eem 11/25/2014 7:54''!! + '!!SoonToBeFloat class methodsFor: ''instance creation'' stamp: ''eem 11/25/2014 07:54''!! basicNew ^Float basicNew: 2!! !! -!!SoonToBeFloat class methodsFor: ''instance creation'' stamp: ''eem 11/25/2014 7:54''!! +!!SoonToBeFloat class methodsFor: ''instance creation'' stamp: ''eem 11/25/2014 07:54''!! basicNew: anInteger ^Float basicNew: 2!! !!' readStream fileIn. @@ -57,14 +57,14 @@ on: AttemptToWriteReadOnlyGlobal do: [:ex| ex resume: true]. - '!!Float class methodsFor: ''instance creation'' stamp: ''eem 11/25/2014 7:54''!! + '!!Float class methodsFor: ''instance creation'' stamp: ''eem 11/25/2014 07:54''!! basicNew ^BoxedFloat64 basicNew: 2!! !! -!!Float class methodsFor: ''instance creation'' stamp: ''eem 11/25/2014 7:54''!! +!!Float class methodsFor: ''instance creation'' stamp: ''eem 11/25/2014 07:54''!! basicNew: anInteger ^BoxedFloat64 basicNew: 2!! !! -!!BoxedFloat64 class methodsFor: ''instance creation'' stamp: ''eem 11/25/2014 7:54''!! +!!BoxedFloat64 class methodsFor: ''instance creation'' stamp: ''eem 11/25/2014 07:54''!! basicNew: sizeRequested "Primitive. Answer an instance of this class with the number of indexable variables specified by the argument, sizeRequested. @@ -82,10 +82,10 @@ [self error: ''a Float shall always have two slots'']]. self primitiveFailed!! !! -!!SmallFloat64 class methodsFor: ''instance creation'' stamp: ''eem 11/25/2014 7:54''!! +!!SmallFloat64 class methodsFor: ''instance creation'' stamp: ''eem 11/25/2014 07:54''!! basicNew: anInteger ^self basicNew!! !! -!!SmallFloat64 class methodsFor: ''instance creation'' stamp: ''eem 11/25/2014 7:54''!! +!!SmallFloat64 class methodsFor: ''instance creation'' stamp: ''eem 11/25/2014 07:54''!! basicNew self error: ''SmallFloat64s can only be created by performing arithmetic''!! !!' readStream fileIn. @@ -119,13 +119,13 @@ smallFloat compile: code classified: (boxedFloat organization categoryOfElement: s) - withStamp: 'eem 11/25/2014 7:54' + withStamp: 'eem 11/25/2014 07:54' notifying: nil]. smallFloat organization sortCategories. boxedFloat comment: 'My instances hold 64-bit Floats in heap objects. This is the only representation on 32-bit systems. But on 64-bit systems SmallFloat64 holds a subset of the full 64-bit double-precision range in immediate objects.' - stamp: 'eem 11/25/2014 7:54'. + stamp: 'eem 11/25/2014 07:54'. smallFloat comment: 'My instances represent 64-bit Floats whose exponent fits in 8 bits as immediate objects. This representation is only available on 64-bit systems, not 32-bit systems.' - stamp: 'eem 11/25/2014 7:54'. + stamp: 'eem 11/25/2014 07:54'. Undeclared removeUnreferencedKeys]

1 0

VM Maker: Cog-eem.224.mcz
by commits＠source.squeak.org 26 Nov '14

26 Nov '14

Eliot Miranda uploaded a new version of Cog to project VM Maker: http://source.squeak.org/VMMaker/Cog-eem.224.mcz ==================== Summary ==================== Name: Cog-eem.224 Author: eem Time: 26 November 2014, 10:48:13.13 am UUID: f6019ed0-a399-4ad7-9d02-db0e691b39f3 Ancestors: Cog-eem.223 Fix SpurBootstrap>>allMethodPrototypes given Esteban's reorganization. Make fillInPointerObjectWithPC:from: tolerate a nil method (for the MethodContext prototype). 64-bit-ize the bootstrap, which involves: Fix findRequiredGlobals for the potentially Undeclared BoxedFloat64. Fix installableMethodFor:selector:className:isMeta: for up-to 64-bit Integer literals. Map SmallFloat64 to an immediateSubclass:. Make the prototype for fromIEEE32Bit: multiply by 1.0 to reduce result to a SmallFloat64 if possible. Make recreateSpecialObjectsArray install BoxedFloat64 in place of Float. =============== Diff against Cog-eem.223 =============== Item was changed: ----- Method: SpurBootstrap>>allMethodPrototypes (in category 'method prototypes') ----- allMethodPrototypes "Answer all prototype selectors, including those marked <remove>" ^(imageTypes + inject: (IdentitySet withAll: SpurBootstrapPrototypes allMethodPrototypes) - inject: (IdentitySet withAll: SpurBootstrapPrototypes new allMethodPrototypes) into: [:allPrototypes :type | | prototypes | + prototypes := (SpurBootstrapPrototypes prototypeClassFor: type) allMethodPrototypes. - prototypes := (SpurBootstrapPrototypes prototypesFor: type) allMethodPrototypes. allPrototypes removeAllSuchThat: [:existing| prototypes anySatisfy: [:new| existing selector == new selector]]; addAll: prototypes; yourself]) asArray sort: [:ma :mb| ma selector <= mb selector]! Item was changed: ----- Method: SpurBootstrap>>fillInPointerObjectWithPC:from: (in category 'bootstrap image') ----- fillInPointerObjectWithPC: newObj from: oldObj "Fill-in a newObj with appropriately mapped contents from oldObj. If the object has a pc and its method has a primitive, increment the pc by the size of the callPrimitive: bytecode." | method | self fillInPointerObject: newObj from: oldObj. (newHeap classIndexOf: newObj) = classBlockClosureIndex ifTrue: [method := oldHeap fetchPointer: MethodIndex ofObject: (oldHeap fetchPointer: ClosureOuterContextIndex ofObject: oldObj). (oldInterpreter primitiveIndexOf: method) > 0 ifTrue: [self incrementPCField: ClosureStartPCIndex ofObject: newObj by: 3]]. (newHeap classIndexOf: newObj) = classMethodContextIndex ifTrue: [method := oldHeap fetchPointer: MethodIndex ofObject: oldObj. + (method ~= oldHeap nilObject + and: [(oldInterpreter primitiveIndexOf: method) > 0]) ifTrue: - (oldInterpreter primitiveIndexOf: method) > 0 ifTrue: [self incrementPCField: InstructionPointerIndex ofObject: newObj by: 3]].! Item was changed: ----- Method: SpurBootstrap>>findRequiredGlobals (in category 'bootstrap image') ----- findRequiredGlobals "Look for the necessary gobal bindings in the prototype methods in the old image. This has to be done early by sending bindingOf: to Smalltalk. Collect the class hierarchy of all prototypes that access inst vars (non-local prototypes) to check their shapes. Also find out Metaclass, needed for identifying classes." | globals ourMethodClasses classVars bindingOfSym | globals := Set new. ourMethodClasses := Set new. classVars := Dictionary new. self prototypeClassNameMetaSelectorMethodDo: [:c :m :s :method| | allNonMetaSupers | (Smalltalk classNamed: c) ifNotNil: [:nonMetaClass| allNonMetaSupers := nonMetaClass withAllSuperclasses. (method methodClass includesBehavior: SpurBootstrapPrototypes) ifFalse: [ourMethodClasses addAll: allNonMetaSupers. globals addAll: (allNonMetaSupers collect: [:sc| sc binding])]. method literals do: [:l| (l isVariableBinding and: [l key isSymbol and: [SpurBootstrapPrototypes withAllSubclasses noneSatisfy: [:sbpc| sbpc name == l key]]]) ifTrue: + [((Smalltalk bindingOf: l key) == l + or: [(Undeclared bindingOf: l key) == l]) - [(Smalltalk bindingOf: l key) == l ifTrue: [globals add: l] ifFalse: [self assert: (nonMetaClass bindingOf: l key) == l. classVars at: l put: nonMetaClass]]]]]. globals add: Compiler binding. "For potential reshaping in checkReshapeOf:" bindingOfSym := self findSymbol: #bindingOf:. self withExecutableInterpreter: oldInterpreter do: [| toBeAdded | globals do: [:global| | bindingOop | (self findSymbol: global key) ifNotNil: [:symbolOop| bindingOop := self interpreter: oldInterpreter object: (oldHeap splObj: 8) "Smalltalk" perform: bindingOfSym withArguments: {self findSymbol: global key}. bindingOop ~= oldHeap nilObject ifTrue: [literalMap at: global put: bindingOop]]]. toBeAdded := Dictionary new. classVars keysAndValuesDo: [:var :class| | val | (self findSymbol: var key) "New class inst vars may not yet be interned." ifNil: [toBeAdded at: var put: class] ifNotNil: [:varName| val := self interpreter: oldInterpreter object: (self oldClassOopFor: class) perform: bindingOfSym withArguments: {varName}. val ~= oldHeap nilObject ifTrue: [literalMap at: var put: val] ifFalse: [toBeAdded at: var put: class]]]. "May have to redefine to add missing inst vars and/or add any missing class vars." self checkReshapeOf: ourMethodClasses. self addMissingClassVars: toBeAdded]! Item was changed: ----- Method: SpurBootstrap>>installableMethodFor:selector:className:isMeta: (in category 'bootstrap methods') ----- installableMethodFor: aCompiledMethod selector: selector className: className isMeta: isMeta "Create a sourceless method to install in the bootstrapped image. It will allow the bootstrap to limp along until the relevant transformed Monticello package is loaded." | compiledMethodClass methodClassBinding methodClass sourcelessMethod bytes newMethod delta initialPC | compiledMethodClass := self findClassNamed: (self findSymbol: #CompiledMethod). methodClassBinding := self methodClassBindingForClassName: className isMeta: isMeta. methodClass := oldHeap fetchPointer: ValueIndex ofObject: methodClassBinding. "the prototypes have source pointers. the Character methods to be replaced don't." sourcelessMethod := aCompiledMethod trailer hasSourcePointer ifTrue: [aCompiledMethod copyWithTempsFromMethodNode: aCompiledMethod methodNode] ifFalse: [aCompiledMethod]. initialPC := sourcelessMethod initialPC. bytes := sourcelessMethod size - initialPC + 1. "Ugh, this is complicated. We could be running on Spur with the new method format or on non-Spur with the old format. Make both work." delta := (sourcelessMethod primitive > 0 and: [(sourcelessMethod at: initialPC) = sourcelessMethod encoderClass callPrimitiveCode]) ifTrue: [3] ifFalse: [0]. newMethod := self interpreter: oldInterpreter object: compiledMethodClass perform: (self findSymbol: #newMethod:header:) withArguments: { oldHeap integerObjectOf: bytes - delta. oldHeap integerObjectOf: (self oldFormatHeaderFor: sourcelessMethod) }. 1 to: sourcelessMethod numLiterals - 2 do: [:i| | literal oop | literal := sourcelessMethod literalAt: i. oop := (literal isLiteral or: [literal isVariableBinding]) ifTrue: [literal isInteger + ifTrue: [oldInterpreter signed64BitIntegerFor: literal] - ifTrue: [oldHeap integerObjectOf: literal] ifFalse: [literalMap at: literal ifAbsent: [self findLiteral: literal inClass: methodClass]]] ifFalse: "should be a VMObjectProxy" [literal oop]. oldHeap storePointer: i ofObject: newMethod withValue: oop]. oldHeap storePointer: sourcelessMethod numLiterals - 1 ofObject: newMethod withValue: (selector isSymbol ifTrue: [self findSymbol: selector] ifFalse: [selector oop]); storePointer: sourcelessMethod numLiterals ofObject: newMethod withValue: methodClassBinding. initialPC to: sourcelessMethod size - delta do: [:i| oldHeap storeByte: i - 1 ofObject: newMethod withValue: (sourcelessMethod byteAt: i + delta)]. installedMethodOops add: newMethod. ^newMethod! Item was changed: ----- Method: SpurBootstrap>>newClassFormatFor: (in category 'bootstrap image') ----- newClassFormatFor: oldClassObj "OLD: <2 bits=instSize//64><5 bits=cClass><4 bits=instSpec><6 bits=instSize\\64><1 bit=0> NEW: <5 bits inst spec><16 bits inst size>" | oldFormat instSize newInstSpec | ((oldInterpreter classNameOf: oldClassObj Is: 'SmallInteger') + or: [(oldInterpreter classNameOf: oldClassObj Is: 'Character') + or: [oldInterpreter classNameOf: oldClassObj Is: 'SmallFloat64']]) ifTrue: - or: [oldInterpreter classNameOf: oldClassObj Is: 'Character']) ifTrue: [^newHeap integerObjectOf: newHeap instSpecForImmediateClasses << 16]. oldFormat := oldHeap formatOfClass: oldClassObj. "N.B. SmallInteger with tag bit cleared" oldFormat := oldFormat >> 1. instSize := ((oldFormat bitShift: -10) bitAnd: 16rC0) + ((oldFormat bitShift: -1) bitAnd: 16r3F) - 1. newInstSpec := #(0 1 2 3 4 nil 10 9 16 16 16 16 24 24 24 24) at: ((oldFormat bitShift: -7) bitAnd: 16rF) + 1. ^newHeap integerObjectOf: newInstSpec << 16 + instSize! Item was added: + ----- Method: SpurBootstrapPrototypes class>>allMethodPrototypes (in category 'accessing method dictionary') ----- + allMethodPrototypes + ^(self canUnderstand: #allMethods) + ifTrue: "Pharo" + [self allMethods select: + [:each| each category = 'method prototypes']] + ifFalse: "Squeak" + [false + ifTrue: "%$#@*!! collect: on IdentitySet answers a *Set*, not an IdentitySet %$#@*!!" + [self allSelectors + collect: [:s| self lookupSelector: s] + thenSelect: [:m| m protocol = 'method prototypes']] + ifFalse: "...hence: " + [self allSelectors + inject: IdentitySet new + into: [:methods :sel| | method | + method := self lookupSelector: sel. + method protocol = 'method prototypes' ifTrue: + [methods add: method]. + methods]]]! Item was added: + ----- Method: SpurBootstrapPrototypes class>>prototypeClassFor: (in category 'instance creation') ----- + prototypeClassFor: type + | deepest | + deepest := nil. + self allSubclassesDo: + [:aClass | aClass imageType = type ifTrue: [deepest := aClass]]. + ^deepest! Item was removed: - ----- Method: SpurBootstrapPrototypes class>>prototypesFor: (in category 'instance creation') ----- - prototypesFor: type - ^ (self allSubclasses - detect: [ :aClass | aClass imageType = type ]) - new - ! Item was added: + ----- Method: SpurBootstrapPrototypes>>FloatclassPROTOTYPEfromIEEE32Bit: (in category 'method prototypes') ----- + FloatclassPROTOTYPEfromIEEE32Bit: word + "Convert the given 32 bit word (which is supposed to be a positive 32-bit value) from + a 32 bit IEEE floating point representation into an actual Squeak float object (being + 64 bits wide). Should only be used for conversion in FloatArrays or likewise objects." + + | sign mantissa exponent delta | + word <= 0 ifTrue: + [^word negative + ifTrue: [self error: 'Cannot deal with negative numbers'] + ifFalse: [self zero]]. + sign := word bitAnd: 16r80000000. + word = sign ifTrue: + [^self negativeZero]. + + exponent := ((word bitShift: -23) bitAnd: 16rFF) - 127. + mantissa := word bitAnd: 16r7FFFFF. + + exponent = 128 ifTrue: "Either NAN or INF" + [^mantissa = 0 + ifTrue: + [sign = 0 + ifTrue: [self infinity] + ifFalse: [self negativeInfinity]] + ifFalse: [self nan]]. + + exponent = -127 ifTrue: + "gradual underflow (denormalized number) + Remove first bit of mantissa and adjust exponent" + [delta := mantissa highBit. + mantissa := (mantissa bitShift: 1) bitAnd: (1 bitShift: delta) - 1. + exponent := exponent + delta - 23]. + + "Create new float" + ^(self basicNew: 2) + basicAt: 1 put: ((sign bitOr: (1023 + exponent bitShift: 20)) bitOr: (mantissa bitShift: -3)); + basicAt: 2 put: ((mantissa bitAnd: 7) bitShift: 29); + * 1.0 "reduce to SmallFloat64 if possible"! Item was removed: - ----- Method: SpurBootstrapPrototypes>>allMethodPrototypes (in category 'accessing') ----- - allMethodPrototypes - ^[self class allMethods "Pharo" - select: [ :each | each category = 'method prototypes' ]] - on: MessageNotUnderstood - do: [:ex| - ex message selector == #allMethods - ifTrue: - [self class selectors "Squeak" - collect: [:s| self class >> s] - thenSelect: [:m| m protocol = 'method prototypes']] - ifFalse: - [ex pass]]! Item was added: + ----- Method: SpurBootstrapSqueakFamilyPrototypes class>>imageType (in category 'accessing') ----- + imageType + ^'squeak'! Item was changed: ----- Method: SpurBootstrapSqueakPrototypes>>SmalltalkImagePROTOTYPErecreateSpecialObjectsArray (in category 'method prototypes') ----- SmalltalkImagePROTOTYPErecreateSpecialObjectsArray "Smalltalk recreateSpecialObjectsArray" "To external package developers: **** DO NOT OVERRIDE THIS METHOD. ***** If you are writing a plugin and need additional special object(s) for your own use, use addGCRoot() function and use own, separate special objects registry " "The Special Objects Array is an array of objects used by the Squeak virtual machine. Its contents are critical and accesses to it by the VM are unchecked, so don't even think of playing here unless you know what you are doing." | newArray | newArray := Array new: 60. "Nil false and true get used throughout the interpreter" newArray at: 1 put: nil. newArray at: 2 put: false. newArray at: 3 put: true. "This association holds the active process (a ProcessScheduler)" newArray at: 4 put: (self specialObjectsArray at: 4) "(self bindingOf: #Processor) but it answers an Alias". "Numerous classes below used for type checking and instantiation" newArray at: 5 put: Bitmap. newArray at: 6 put: SmallInteger. newArray at: 7 put: ByteString. newArray at: 8 put: Array. newArray at: 9 put: Smalltalk. + newArray at: 10 put: BoxedFloat64. - newArray at: 10 put: Float. newArray at: 11 put: (self globals at: #MethodContext ifAbsent: [self globals at: #Context]). newArray at: 12 put: nil. "was BlockContext." newArray at: 13 put: Point. newArray at: 14 put: LargePositiveInteger. newArray at: 15 put: Display. newArray at: 16 put: Message. newArray at: 17 put: CompiledMethod. newArray at: 18 put: ((self specialObjectsArray at: 18) ifNil: [Semaphore new]). "low space Semaphore" newArray at: 19 put: Semaphore. newArray at: 20 put: Character. newArray at: 21 put: #doesNotUnderstand:. newArray at: 22 put: #cannotReturn:. newArray at: 23 put: nil. "This is the process signalling low space." "An array of the 32 selectors that are compiled as special bytecodes, paired alternately with the number of arguments each takes." newArray at: 24 put: #( #+ 1 #- 1 #< 1 #> 1 #<= 1 #>= 1 #= 1 #~= 1 #* 1 #/ 1 #\\ 1 #@ 1 #bitShift: 1 #// 1 #bitAnd: 1 #bitOr: 1 #at: 1 #at:put: 2 #size 0 #next 0 #nextPut: 1 #atEnd 0 #== 1 #class 0 #blockCopy: 1 #value 0 #value: 1 #do: 1 #new 0 #new: 1 #x 0 #y 0 ). "An array of the 255 Characters in ascii order. Cog inlines table into machine code at: prim so do not regenerate it. This is nil in Spur, which has immediate Characters." newArray at: 25 put: (self specialObjectsArray at: 25). newArray at: 26 put: #mustBeBoolean. newArray at: 27 put: ByteArray. newArray at: 28 put: Process. "An array of up to 31 classes whose instances will have compact headers; an empty array in Spur" newArray at: 29 put: self compactClassesArray. newArray at: 30 put: ((self specialObjectsArray at: 30) ifNil: [Semaphore new]). "delay Semaphore" newArray at: 31 put: ((self specialObjectsArray at: 31) ifNil: [Semaphore new]). "user interrupt Semaphore" "Entries 32 - 34 unreferenced. Previously these contained prototype instances to be copied for fast initialization" newArray at: 32 put: nil. "was the prototype Float" newArray at: 33 put: nil. "was the prototype 4-byte LargePositiveInteger" newArray at: 34 put: nil. "was the prototype Point" newArray at: 35 put: #cannotInterpret:. newArray at: 36 put: nil. "was the prototype MethodContext" newArray at: 37 put: BlockClosure. newArray at: 38 put: nil. "was the prototype BlockContext" "array of objects referred to by external code" newArray at: 39 put: (self specialObjectsArray at: 39). "external semaphores" newArray at: 40 put: nil. "Reserved for Mutex in Cog VMs" newArray at: 41 put: ((self specialObjectsArray at: 41) ifNil: [LinkedList new]). "Reserved for a LinkedList instance for overlapped calls in CogMT" newArray at: 42 put: ((self specialObjectsArray at: 42) ifNil: [Semaphore new]). "finalization Semaphore" newArray at: 43 put: LargeNegativeInteger. "External objects for callout. Note: Written so that one can actually completely remove the FFI." newArray at: 44 put: (self at: #ExternalAddress ifAbsent: []). newArray at: 45 put: (self at: #ExternalStructure ifAbsent: []). newArray at: 46 put: (self at: #ExternalData ifAbsent: []). newArray at: 47 put: (self at: #ExternalFunction ifAbsent: []). newArray at: 48 put: (self at: #ExternalLibrary ifAbsent: []). newArray at: 49 put: #aboutToReturn:through:. newArray at: 50 put: #run:with:in:. "51 reserved for immutability message" newArray at: 51 put: #attemptToAssign:withIndex:. newArray at: 52 put: #(nil "nil => generic error" #'bad receiver' #'bad argument' #'bad index' #'bad number of arguments' #'inappropriate operation' #'unsupported operation' #'no modification' #'insufficient object memory' #'insufficient C memory' #'not found' #'bad method' #'internal error in named primitive machinery' #'object may move' #'resource limit exceeded' #'object is pinned' #'primitive write beyond end of object'). "53 to 55 are for Alien" newArray at: 53 put: (self at: #Alien ifAbsent: []). newArray at: 54 put: #invokeCallbackContext:. "use invokeCallback:stack:registers:jmpbuf: for old Alien callbacks." newArray at: 55 put: (self at: #UnsafeAlien ifAbsent: []). "Used to be WeakFinalizationList for WeakFinalizationList hasNewFinalization, obsoleted by ephemeron support." newArray at: 56 put: nil. "reserved for foreign callback process" newArray at: 57 put: (self specialObjectsArray at: 57 ifAbsent: []). newArray at: 58 put: #unusedBytecode. "59 reserved for Sista counter tripped message" newArray at: 59 put: #conditionalBranchCounterTrippedOn:. "60 reserved for Sista class trap message" newArray at: 60 put: #classTrapFor:. "Now replace the interpreter's reference in one atomic operation" self specialObjectsArray becomeForward: newArray!

1 0

FFI callbacks
by Bert Freudenberg 26 Nov '14

26 Nov '14

How do they actually work? I want to know what information the thunk needs, and what happens when it is activated. I think SqueakJS would benefit from callback support. I imagine that somehow the VM's state needs to be saved, then the context that defined the block is activated, and then the VM would run the block until it returns (or until the return prim is called?), then the VM's state would need to be restored to what it was, and the result is passed back by the thunk returning. Am I close? Since the callback can happen at any time, and it could do anything, saving the whole VM state seems daunting. - Bert -

4 4

[commit][3150] Add MorphFloat. st which morphs the Float hierarchy to admit immediate floats.
by commits＠squeakvm.org 26 Nov '14

26 Nov '14

Revision: 3150 Author: eliot Date: 2014-11-25 15:33:58 -0800 (Tue, 25 Nov 2014) Log Message: ----------- Add MorphFloat.st which morphs the Float hierarchy to admit immediate floats. Add buildsqueaktrunkimage.sh to create image with morphed float hierarchy. Use UpdateSqueakTrunkImage.st in place of equivalent BuildSqueakTrunkImage.st. Modified Paths: -------------- branches/Cog/image/UpdateSqueakTrunkImage.st branches/Cog/image/buildspurtrunkimage.sh Added Paths: ----------- branches/Cog/image/MorphFloat.st branches/Cog/image/buildsqueaktrunkimage.sh Removed Paths: ------------- branches/Cog/image/BuildSqueakTrunkImage.st Deleted: branches/Cog/image/BuildSqueakTrunkImage.st =================================================================== --- branches/Cog/image/BuildSqueakTrunkImage.st 2014-11-24 22:09:18 UTC (rev 3149) +++ branches/Cog/image/BuildSqueakTrunkImage.st 2014-11-25 23:33:58 UTC (rev 3150) @@ -1,6 +0,0 @@ -"Change the update stream to trunk and update" -[MCMcmUpdater - defaultUpdateURL: 'http://source.squeak.org/trunk'; - updateFromServer] valueSupplyingAnswer: true. - -Smalltalk snapshot: true andQuit: true Added: branches/Cog/image/MorphFloat.st =================================================================== --- branches/Cog/image/MorphFloat.st (rev 0) +++ branches/Cog/image/MorphFloat.st 2014-11-25 23:33:58 UTC (rev 3150) @@ -0,0 +1,111 @@ +SystemChangeNotifier uniqueInstance doSilently: + [| boxedFloat floatClassVars soonToBeFloat smallFloat | + boxedFloat := Float. + floatClassVars := Float classVariablesString. + soonToBeFloat := Number subclass: #SoonToBeFloat + instanceVariableNames: '' + classVariableNames: '' + poolDictionaries: '' + category: 'Kernel-Numbers'. + smallFloat := soonToBeFloat subclass: #SmallFloat64 + instanceVariableNames: '' + classVariableNames: '' + poolDictionaries: '' + category: 'Kernel-Numbers'. + '!!SoonToBeFloat class methodsFor: ''instance creation'' stamp: ''eem 11/25/2014 7:54''!! +basicNew + ^Float basicNew: 2!! !! +!!SoonToBeFloat class methodsFor: ''instance creation'' stamp: ''eem 11/25/2014 7:54''!! +basicNew: anInteger + ^Float basicNew: 2!! !!' readStream fileIn. + + [soonToBeFloat variableWordSubclass: #Float + instanceVariableNames: '' + classVariableNames: floatClassVars + poolDictionaries: '' + category: 'Kernel-Numbers'] + on: Error, Warning + do: [:ex| + Transcript cr; nextPutAll: ex messageText; flush. + ex isResumable ifFalse: + [Notification adoptInstance: ex]. + ex resume: true]. + soonToBeFloat classPool: Float classPool. + Float classPool: nil. + soonToBeFloat + comment: Float comment asString + stamp: Float organization commentStamp. + Float class selectors do: + [:s| + (soonToBeFloat class includesSelector: s) ifFalse: + [soonToBeFloat class recompile: s from: Float class. + soonToBeFloat class organization + classify: s + under: (Float class organization categoryOfElement: s)]]. + + (Float selectors reject: [:s| (Float >> s) primitive between: 40 and: 59]) do: + [:s| + soonToBeFloat recompile: s from: Float. + soonToBeFloat organization + classify: s + under: (Float organization categoryOfElement: s). + Float removeSelector: s]. + [boxedFloat setName: #BoxedFloat64. + boxedFloat environment renameClass: Float from: #Float. + soonToBeFloat setName: #Float. + soonToBeFloat environment renameClass: soonToBeFloat from: #SoonToBeFloat] + on: AttemptToWriteReadOnlyGlobal + do: [:ex| ex resume: true]. + + '!!Float class methodsFor: ''instance creation'' stamp: ''eem 11/25/2014 7:54''!! +basicNew + ^BoxedFloat64 basicNew: 2!! !! + +!!Float class methodsFor: ''instance creation'' stamp: ''eem 11/25/2014 7:54''!! +basicNew: anInteger + ^BoxedFloat64 basicNew: 2!! !! +!!BoxedFloat64 class methodsFor: ''instance creation'' stamp: ''eem 11/25/2014 7:54''!! +basicNew: sizeRequested + "Primitive. Answer an instance of this class with the number + of indexable variables specified by the argument, sizeRequested. + Fail if this class is not indexable or if the argument is not a + positive Integer, or if there is not enough memory available. + Essential. See Object documentation whatIsAPrimitive." + + <primitive: 71> + sizeRequested isInteger ifTrue: + [^sizeRequested = 2 + ifTrue: "arg okay; space must be low." + [OutOfMemory signal. + self basicNew: sizeRequested] "retry if user proceeds" + ifFalse: + [self error: ''a Float shall always have two slots'']]. + self primitiveFailed!! !! + +!!SmallFloat64 class methodsFor: ''instance creation'' stamp: ''eem 11/25/2014 7:54''!! +basicNew: anInteger + ^self basicNew!! !! +!!SmallFloat64 class methodsFor: ''instance creation'' stamp: ''eem 11/25/2014 7:54''!! +basicNew + self error: ''SmallFloat64s can only be created by performing arithmetic''!! !!' readStream fileIn. + + boxedFloat class selectors do: + [:s| + ((#(basicNew basicNew:) includes: s) not + and: [soonToBeFloat class includesSelector: s]) ifTrue: + [boxedFloat class removeSelector: s]]. + + {boxedFloat. boxedFloat class. Float. Float class} do: + [:bfc| | binding | + binding := bfc binding. + bfc selectorsAndMethodsDo: + [:s :m| + m methodClassAssociation: binding]. + bfc organization removeEmptyCategories; sortCategories]. + + boxedFloat comment: 'My instances hold 64-bit Floats in heap objects. This is the only representation on 32-bit systems. But on 64-bit systems SmallFloat64 holds a subset of the full 64-bit double-precision range in immediate objects.' + stamp: 'eem 11/25/2014 7:54'. + smallFloat comment: 'My instances represent 64-bit Floats whose exponent fits in 8 bits as immediate objects. This representation is only available on 64-bit systems, not 32-bit systems.' + stamp: 'eem 11/25/2014 7:54'. + + Undeclared removeUnreferencedKeys] Modified: branches/Cog/image/UpdateSqueakTrunkImage.st =================================================================== --- branches/Cog/image/UpdateSqueakTrunkImage.st 2014-11-24 22:09:18 UTC (rev 3149) +++ branches/Cog/image/UpdateSqueakTrunkImage.st 2014-11-25 23:33:58 UTC (rev 3150) @@ -3,4 +3,6 @@ defaultUpdateURL: 'http://source.squeak.org/trunk'; updateFromServer] valueSupplyingAnswer: true. +(FileStream oldFileNamed: 'MorphFloat.st') fileIn. + Smalltalk snapshot: true andQuit: true Modified: branches/Cog/image/buildspurtrunkimage.sh =================================================================== --- branches/Cog/image/buildspurtrunkimage.sh 2014-11-24 22:09:18 UTC (rev 3149) +++ branches/Cog/image/buildspurtrunkimage.sh 2014-11-25 23:33:58 UTC (rev 3150) @@ -7,8 +7,8 @@ cp -p $SQUEAK45.image trunk46forspur.image cp -p $SQUEAK45.changes trunk46forspur.changes - echo $VM trunk46forspur.image BuildSqueakTrunkImage.st - $VM trunk46forspur.image BuildSqueakTrunkImage.st + echo $VM trunk46forspur.image UpdateSqueakTrunkImage.st + $VM trunk46forspur.image UpdateSqueakTrunkImage.st fi #Old code pre patchAndUploadUnpatchedInTrunk Added: branches/Cog/image/buildsqueaktrunkimage.sh =================================================================== --- branches/Cog/image/buildsqueaktrunkimage.sh (rev 0) +++ branches/Cog/image/buildsqueaktrunkimage.sh 2014-11-25 23:33:58 UTC (rev 3150) @@ -0,0 +1,12 @@ +#!/bin/sh +. ./envvars.sh +./getsqueak45.sh +. ./getGoodCogVM.sh + +cp -p $SQUEAK45.image trunk46forspur.image +cp -p $SQUEAK45.changes trunk46forspur.changes + +echo $VM trunk46forspur.image UpdateSqueakTrunkImage.st +$VM trunk46forspur.image UpdateSqueakTrunkImage.st + +./resizesqueakwindow.sh trunk46forspur.image 800 600 Property changes on: branches/Cog/image/buildsqueaktrunkimage.sh ___________________________________________________________________ Added: svn:executable + *

2 1

AioPlugin: VMConstruction-Plugins-AioPlugin-eem.16.mcz
by squeak-dev-noreply＠lists.squeakfoundation.org 26 Nov '14

26 Nov '14

Dave Lewis uploaded a new version of VMConstruction-Plugins-AioPlugin to project AioPlugin: http://www.squeaksource.com/AioPlugin/VMConstruction-Plugins-AioPlugin-eem.… ==================== Summary ==================== Name: VMConstruction-Plugins-AioPlugin-eem.16 Author: eem Time: 19 November 2014, 10:43:25.999 pm UUID: 88d89f3d-80f8-4dbc-977a-78df02bbe8be Ancestors: VMConstruction-Plugins-AioPlugin-eem.15 Use sizeof: instead of cCode:

1 0

[commit][3151] VMMaker 4.13.8
by commits＠squeakvm.org 26 Nov '14

26 Nov '14

Revision: 3151 Author: lewis Date: 2014-11-25 17:09:16 -0800 (Tue, 25 Nov 2014) Log Message: ----------- VMMaker 4.13.8 Complete the adoption of oscog improvements that eliminate use of #asSymbol hacks, and to produce correct code generation for #sizeOf: and #flag: methods. Also includes generation of constants in hex format, which improves readability of generated code. Modified Paths: -------------- trunk/src/ckformat.c trunk/src/plugins/ADPCMCodecPlugin/ADPCMCodecPlugin.c trunk/src/plugins/AioPlugin/AioPlugin.c trunk/src/plugins/AsynchFilePlugin/AsynchFilePlugin.c trunk/src/plugins/B2DPlugin/B2DPlugin.c trunk/src/plugins/B3DAcceleratorPlugin/B3DAcceleratorPlugin.c trunk/src/plugins/BMPReadWriterPlugin/BMPReadWriterPlugin.c trunk/src/plugins/BitBltPlugin/BitBltPlugin.c trunk/src/plugins/CameraPlugin/CameraPlugin.c trunk/src/plugins/ClipboardExtendedPlugin/ClipboardExtendedPlugin.c trunk/src/plugins/CroquetPlugin/CroquetPlugin.c trunk/src/plugins/DBusPlugin/DBusPlugin.c trunk/src/plugins/DSAPrims/DSAPrims.c trunk/src/plugins/DropPlugin/DropPlugin.c trunk/src/plugins/FFTPlugin/FFTPlugin.c trunk/src/plugins/FT2Plugin/FT2Plugin.c trunk/src/plugins/FileCopyPlugin/FileCopyPlugin.c trunk/src/plugins/FilePlugin/FilePlugin.c trunk/src/plugins/FloatArrayPlugin/FloatArrayPlugin.c trunk/src/plugins/FloatMathPlugin/FloatMathPlugin.c trunk/src/plugins/GeniePlugin/GeniePlugin.c trunk/src/plugins/HostWindowPlugin/HostWindowPlugin.c trunk/src/plugins/JPEGReadWriter2Plugin/JPEGReadWriter2Plugin.c trunk/src/plugins/JPEGReaderPlugin/JPEGReaderPlugin.c trunk/src/plugins/JoystickTabletPlugin/JoystickTabletPlugin.c trunk/src/plugins/KedamaPlugin2/KedamaPlugin2.c trunk/src/plugins/Klatt/Klatt.c trunk/src/plugins/LargeIntegers/LargeIntegers.c trunk/src/plugins/LocalePlugin/LocalePlugin.c trunk/src/plugins/MIDIPlugin/MIDIPlugin.c trunk/src/plugins/Matrix2x3Plugin/Matrix2x3Plugin.c trunk/src/plugins/MiscPrimitivePlugin/MiscPrimitivePlugin.c trunk/src/plugins/Mpeg3Plugin/Mpeg3Plugin.c trunk/src/plugins/RePlugin/RePlugin.c trunk/src/plugins/RomePlugin/RomePlugin.c trunk/src/plugins/ScratchPlugin/ScratchPlugin.c trunk/src/plugins/SecurityPlugin/SecurityPlugin.c trunk/src/plugins/SerialPlugin/SerialPlugin.c trunk/src/plugins/SocketPlugin/SocketPlugin.c trunk/src/plugins/SoundCodecPrims/SoundCodecPrims.c trunk/src/plugins/SoundGenerationPlugin/SoundGenerationPlugin.c trunk/src/plugins/SoundPlugin/SoundPlugin.c trunk/src/plugins/Squeak3D/Squeak3D.c trunk/src/plugins/SqueakFFIPrims/SqueakFFIPrims.c trunk/src/plugins/SqueakSSL/SqueakSSL.c trunk/src/plugins/StarSqueakPlugin/StarSqueakPlugin.c trunk/src/plugins/UUIDPlugin/UUIDPlugin.c trunk/src/plugins/UnicodePlugin/UnicodePlugin.c trunk/src/plugins/UnixOSProcessPlugin/UnixOSProcessPlugin.c trunk/src/plugins/WeDoPlugin/WeDoPlugin.c trunk/src/plugins/XDisplayControlPlugin/XDisplayControlPlugin.c trunk/src/vm/interp.c trunk/src/vm/interp.h trunk/src/vm/sqNamedPrims.h Modified: trunk/src/ckformat.c =================================================================== --- trunk/src/ckformat.c 2014-11-25 23:33:58 UTC (rev 3150) +++ trunk/src/ckformat.c 2014-11-26 01:09:16 UTC (rev 3151) @@ -5,7 +5,7 @@ /* Usage: ckformat imageFileName */ /* --- DO NOT EDIT THIS FILE --- */ -/* --- Automatically generated from class ImageFormat 2014-10-24T08:36:03.45+01:00--- */ +/* --- Automatically generated from class ImageFormat 2014-11-25T20:00:13.974+01:00--- */ /* --- Source code is in package ImageFormat in the VMMaker repository --- */ /* --- DO NOT EDIT THIS FILE --- */ Modified: trunk/src/plugins/ADPCMCodecPlugin/ADPCMCodecPlugin.c =================================================================== --- trunk/src/plugins/ADPCMCodecPlugin/ADPCMCodecPlugin.c 2014-11-25 23:33:58 UTC (rev 3150) +++ trunk/src/plugins/ADPCMCodecPlugin/ADPCMCodecPlugin.c 2014-11-26 01:09:16 UTC (rev 3151) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.5 with VMMaker 4.13.7 translated as C source on 24 October 2014 8:35:59 am */ +/* Smalltalk from Squeak4.5 with VMMaker 4.13.8 translated as C source on 25 November 2014 8:00:03 pm */ /* Automatically generated by - VMPluginCodeGenerator VMMaker-dtl.354 uuid: a38a877b-1f44-40b9-9ee8-c812a471808c + VMPluginCodeGenerator VMMaker-dtl.355 uuid: 9e6e08b4-e8f0-44b0-803c-de1559fbcb27 from - ADPCMCodecPlugin VMMaker-dtl.354 uuid: a38a877b-1f44-40b9-9ee8-c812a471808c + ADPCMCodecPlugin VMMaker-dtl.355 uuid: 9e6e08b4-e8f0-44b0-803c-de1559fbcb27 */ -static char __buildInfo[] = "ADPCMCodecPlugin VMMaker-dtl.354 uuid: a38a877b-1f44-40b9-9ee8-c812a471808c " __DATE__ ; +static char __buildInfo[] = "ADPCMCodecPlugin VMMaker-dtl.355 uuid: 9e6e08b4-e8f0-44b0-803c-de1559fbcb27 " __DATE__ ; @@ -70,9 +70,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "ADPCMCodecPlugin 24 October 2014 (i)" + "ADPCMCodecPlugin 25 November 2014 (i)" #else - "ADPCMCodecPlugin 24 October 2014 (e)" + "ADPCMCodecPlugin 25 November 2014 (e)" #endif ; @@ -178,13 +178,13 @@ } else { result += ((usqInt) currentByte) >> (0 - shift); bitPosition -= remaining; - currentByte = currentByte & (((usqInt) 255) >> (8 - bitPosition)); + currentByte = currentByte & (((usqInt) 0xFF) >> (8 - bitPosition)); predicted = result; goto l1; } } l1: /* end nextBits: */; - if (predicted > 32767) { + if (predicted > 0x7FFF) { predicted -= 65536; } /* begin nextBits: */ @@ -200,7 +200,7 @@ } else { result1 += ((usqInt) currentByte) >> (0 - shift1); bitPosition -= remaining1; - currentByte = currentByte & (((usqInt) 255) >> (8 - bitPosition)); + currentByte = currentByte & (((usqInt) 0xFF) >> (8 - bitPosition)); index = result1; goto l2; } @@ -221,7 +221,7 @@ } else { result2 += ((usqInt) currentByte) >> (0 - shift2); bitPosition -= remaining2; - currentByte = currentByte & (((usqInt) 255) >> (8 - bitPosition)); + currentByte = currentByte & (((usqInt) 0xFF) >> (8 - bitPosition)); delta = result2; goto l3; } @@ -243,8 +243,8 @@ } else { predicted += predictedDelta; } - if (predicted > 32767) { - predicted = 32767; + if (predicted > 0x7FFF) { + predicted = 0x7FFF; } else { if (predicted < -32768) { predicted = -32768; @@ -376,7 +376,7 @@ } else { result += ((usqInt) currentByte) >> (0 - shift); bitPosition -= remaining; - currentByte = currentByte & (((usqInt) 255) >> (8 - bitPosition)); + currentByte = currentByte & (((usqInt) 0xFF) >> (8 - bitPosition)); predictedLeft = result; goto l1; } @@ -395,7 +395,7 @@ } else { result1 += ((usqInt) currentByte) >> (0 - shift1); bitPosition -= remaining1; - currentByte = currentByte & (((usqInt) 255) >> (8 - bitPosition)); + currentByte = currentByte & (((usqInt) 0xFF) >> (8 - bitPosition)); indexLeft = result1; goto l2; } @@ -414,7 +414,7 @@ } else { result2 += ((usqInt) currentByte) >> (0 - shift2); bitPosition -= remaining2; - currentByte = currentByte & (((usqInt) 255) >> (8 - bitPosition)); + currentByte = currentByte & (((usqInt) 0xFF) >> (8 - bitPosition)); predictedRight = result2; goto l3; } @@ -433,16 +433,16 @@ } else { result3 += ((usqInt) currentByte) >> (0 - shift3); bitPosition -= remaining3; - currentByte = currentByte & (((usqInt) 255) >> (8 - bitPosition)); + currentByte = currentByte & (((usqInt) 0xFF) >> (8 - bitPosition)); indexRight = result3; goto l4; } } l4: /* end nextBits: */; - if (predictedLeft > 32767) { + if (predictedLeft > 0x7FFF) { predictedLeft -= 65536; } - if (predictedRight > 32767) { + if (predictedRight > 0x7FFF) { predictedRight -= 65536; } samples[(sampleIndex += 1)] = predictedLeft; @@ -461,7 +461,7 @@ } else { result4 += ((usqInt) currentByte) >> (0 - shift4); bitPosition -= remaining4; - currentByte = currentByte & (((usqInt) 255) >> (8 - bitPosition)); + currentByte = currentByte & (((usqInt) 0xFF) >> (8 - bitPosition)); deltaLeft = result4; goto l5; } @@ -480,7 +480,7 @@ } else { result5 += ((usqInt) currentByte) >> (0 - shift5); bitPosition -= remaining5; - currentByte = currentByte & (((usqInt) 255) >> (8 - bitPosition)); + currentByte = currentByte & (((usqInt) 0xFF) >> (8 - bitPosition)); deltaRight = result5; goto l6; } @@ -513,15 +513,15 @@ } else { predictedRight += predictedDeltaRight; } - if (predictedLeft > 32767) { - predictedLeft = 32767; + if (predictedLeft > 0x7FFF) { + predictedLeft = 0x7FFF; } else { if (predictedLeft < -32768) { predictedLeft = -32768; } } - if (predictedRight > 32767) { - predictedRight = 32767; + if (predictedRight > 0x7FFF) { + predictedRight = 0x7FFF; } else { if (predictedRight < -32768) { predictedRight = -32768; @@ -658,9 +658,9 @@ if (diff1 < 0) { diff1 = 0 - diff1; } - bestIndex = 63; - for (j = 1; j <= 62; j += 1) { - if (bestIndex == 63) { + bestIndex = 0x3F; + for (j = 1; j <= 0x3E; j += 1) { + if (bestIndex == 0x3F) { if ((stepSizeTable[j]) >= diff1) { bestIndex = j; } @@ -719,8 +719,8 @@ } else { predicted += predictedDelta; } - if (predicted > 32767) { - predicted = 32767; + if (predicted > 0x7FFF) { + predicted = 0x7FFF; } else { if (predicted < -32768) { predicted = -32768; Modified: trunk/src/plugins/AioPlugin/AioPlugin.c =================================================================== --- trunk/src/plugins/AioPlugin/AioPlugin.c 2014-11-25 23:33:58 UTC (rev 3150) +++ trunk/src/plugins/AioPlugin/AioPlugin.c 2014-11-26 01:09:16 UTC (rev 3151) @@ -1,6 +1,6 @@ -/* Smalltalk from Squeak4.5 with VMMaker 4.13.7 translated as C source on 24 October 2014 8:36:03 am */ +/* Smalltalk from Squeak4.5 with VMMaker 4.13.8 translated as C source on 25 November 2014 8:00:13 pm */ /* Automatically generated by - VMPluginCodeGenerator VMMaker-dtl.354 uuid: a38a877b-1f44-40b9-9ee8-c812a471808c + VMPluginCodeGenerator VMMaker-dtl.355 uuid: 9e6e08b4-e8f0-44b0-803c-de1559fbcb27 from UnixAioPlugin VMConstruction-Plugins-AioPlugin-eem.15 uuid: 0029df1c-3720-4b61-8579-4851417d24a7 */ @@ -88,9 +88,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "AioPlugin 24 October 2014 (i)" + "AioPlugin 25 November 2014 (i)" #else - "AioPlugin 24 October 2014 (e)" + "AioPlugin 25 November 2014 (e)" #endif ; Modified: trunk/src/plugins/AsynchFilePlugin/AsynchFilePlugin.c =================================================================== --- trunk/src/plugins/AsynchFilePlugin/AsynchFilePlugin.c 2014-11-25 23:33:58 UTC (rev 3150) +++ trunk/src/plugins/AsynchFilePlugin/AsynchFilePlugin.c 2014-11-26 01:09:16 UTC (rev 3151) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.5 with VMMaker 4.13.7 translated as C source on 24 October 2014 8:35:59 am */ +/* Smalltalk from Squeak4.5 with VMMaker 4.13.8 translated as C source on 25 November 2014 8:00:03 pm */ /* Automatically generated by - SmartSyntaxPluginCodeGenerator VMMaker-dtl.354 uuid: a38a877b-1f44-40b9-9ee8-c812a471808c + SmartSyntaxPluginCodeGenerator VMMaker-dtl.355 uuid: 9e6e08b4-e8f0-44b0-803c-de1559fbcb27 from - AsynchFilePlugin VMMaker-dtl.354 uuid: a38a877b-1f44-40b9-9ee8-c812a471808c + AsynchFilePlugin VMMaker-dtl.355 uuid: 9e6e08b4-e8f0-44b0-803c-de1559fbcb27 */ -static char __buildInfo[] = "AsynchFilePlugin VMMaker-dtl.354 uuid: a38a877b-1f44-40b9-9ee8-c812a471808c " __DATE__ ; +static char __buildInfo[] = "AsynchFilePlugin VMMaker-dtl.355 uuid: 9e6e08b4-e8f0-44b0-803c-de1559fbcb27 " __DATE__ ; @@ -67,9 +67,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "AsynchFilePlugin 24 October 2014 (i)" + "AsynchFilePlugin 25 November 2014 (i)" #else - "AsynchFilePlugin 24 October 2014 (e)" + "AsynchFilePlugin 25 November 2014 (e)" #endif ; static void * sCOAFfn; Modified: trunk/src/plugins/B2DPlugin/B2DPlugin.c =================================================================== --- trunk/src/plugins/B2DPlugin/B2DPlugin.c 2014-11-25 23:33:58 UTC (rev 3150) +++ trunk/src/plugins/B2DPlugin/B2DPlugin.c 2014-11-26 01:09:16 UTC (rev 3151) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.5 with VMMaker 4.13.7 translated as C source on 24 October 2014 8:35:59 am */ +/* Smalltalk from Squeak4.5 with VMMaker 4.13.8 translated as C source on 25 November 2014 8:00:05 pm */ /* Automatically generated by - VMPluginCodeGenerator VMMaker-dtl.354 uuid: a38a877b-1f44-40b9-9ee8-c812a471808c + VMPluginCodeGenerator VMMaker-dtl.355 uuid: 9e6e08b4-e8f0-44b0-803c-de1559fbcb27 from - BalloonEnginePlugin VMMaker-dtl.354 uuid: a38a877b-1f44-40b9-9ee8-c812a471808c + BalloonEnginePlugin VMMaker-dtl.355 uuid: 9e6e08b4-e8f0-44b0-803c-de1559fbcb27 */ -static char __buildInfo[] = "BalloonEnginePlugin VMMaker-dtl.354 uuid: a38a877b-1f44-40b9-9ee8-c812a471808c " __DATE__ ; +static char __buildInfo[] = "BalloonEnginePlugin VMMaker-dtl.355 uuid: 9e6e08b4-e8f0-44b0-803c-de1559fbcb27 " __DATE__ ; @@ -120,17 +120,17 @@ #define GEPrimitiveBezier 6 #define GEPrimitiveClippedBitmapFill 1024 #define GEPrimitiveEdge 2 -#define GEPrimitiveEdgeMask 255 +#define GEPrimitiveEdgeMask 0xFF #define GEPrimitiveFill 256 -#define GEPrimitiveFillMask 65280 +#define GEPrimitiveFillMask 0xFF00 #define GEPrimitiveLine 4 #define GEPrimitiveLinearGradientFill 512 #define GEPrimitiveRadialGradientFill 768 -#define GEPrimitiveTypeMask 65535 +#define GEPrimitiveTypeMask 0xFFFF #define GEPrimitiveWide 1 #define GEPrimitiveWideBezier 7 #define GEPrimitiveWideLine 5 -#define GEPrimitiveWideMask 254 +#define GEPrimitiveWideMask 0xFE #define GEStateAddingFromGET 1 #define GEStateBlitBuffer 5 #define GEStateCompleted 8 @@ -222,7 +222,7 @@ #define GWMagicIndex 0 #define GWMagicNumber 1097753705 #define GWMinimalSize 256 -#define GWNeedsFlush 63 +#define GWNeedsFlush 0x3F #define GWObjStart 8 #define GWObjUsed 9 #define GWPoint1 80 @@ -447,9 +447,9 @@ static void * loadBBFn; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "B2DPlugin 24 October 2014 (i)" + "B2DPlugin 25 November 2014 (i)" #else - "B2DPlugin 24 October 2014 (e)" + "B2DPlugin 25 November 2014 (e)" #endif ; static int* objBuffer; @@ -729,7 +729,7 @@ nFills = 0; for (i = 0; i <= (length - 1); i += 1) { runLength = ((usqInt) ((((int *) fillPtr))[i]) >> 16); - runValue = ((((int *) fillPtr))[i]) & 65535; + runValue = ((((int *) fillPtr))[i]) & 0xFFFF; if (!((runValue >= 0) && (runValue <= maxIndex))) { return 0; } @@ -1353,8 +1353,8 @@ bmRaster = objBuffer[bmFill + GBBitmapRaster]; if (bmDepth == 32) { value = (((int*) bits))[(bmRaster * yp) + xp]; - if ((value != 0) && ((value & 4278190080U) == 0)) { - value = value | 4278190080U; + if ((value != 0) && ((value & 0xFF000000U) == 0)) { + value = value | 0xFF000000U; } fillValue = uncheckedTransformColor(value); goto l3; @@ -1366,13 +1366,13 @@ value = (((usqInt) value) >> rShift) & cMask; if (bmDepth == 16) { if (!(value == 0)) { - b = (value & 31) << 3; + b = (value & 0x1F) << 3; b += ((usqInt) b) >> 5; - g = ((((usqInt) value) >> 5) & 31) << 3; + g = ((((usqInt) value) >> 5) & 0x1F) << 3; g += ((usqInt) g) >> 5; - r = ((((usqInt) value) >> 10) & 31) << 3; + r = ((((usqInt) value) >> 10) & 0x1F) << 3; r += ((usqInt) r) >> 5; - a = 255; + a = 0xFF; value = ((b + (g << 8)) + (r << 16)) + (a << 24); } } else { @@ -1537,8 +1537,8 @@ bmRaster = objBuffer[bmFill + GBBitmapRaster]; if (bmDepth == 32) { value = (((int*) bits))[(bmRaster * yp) + xp]; - if ((value != 0) && ((value & 4278190080U) == 0)) { - value = value | 4278190080U; + if ((value != 0) && ((value & 0xFF000000U) == 0)) { + value = value | 0xFF000000U; } fillValue = uncheckedTransformColor(value); goto l3; @@ -1550,13 +1550,13 @@ value = (((usqInt) value) >> rShift) & cMask1; if (bmDepth == 16) { if (!(value == 0)) { - b = (value & 31) << 3; + b = (value & 0x1F) << 3; b += ((usqInt) b) >> 5; - g = ((((usqInt) value) >> 5) & 31) << 3; + g = ((((usqInt) value) >> 5) & 0x1F) << 3; g += ((usqInt) g) >> 5; - r = ((((usqInt) value) >> 10) & 31) << 3; + r = ((((usqInt) value) >> 10) & 0x1F) << 3; r += ((usqInt) r) >> 5; - a = 255; + a = 0xFF; value = ((b + (g << 8)) + (r << 16)) + (a << 24); } } else { @@ -1637,8 +1637,8 @@ bmRaster1 = objBuffer[bmFill + GBBitmapRaster]; if (bmDepth1 == 32) { value1 = (((int*) bits))[(bmRaster1 * yp) + xp]; - if ((value1 != 0) && ((value1 & 4278190080U) == 0)) { - value1 = value1 | 4278190080U; + if ((value1 != 0) && ((value1 & 0xFF000000U) == 0)) { + value1 = value1 | 0xFF000000U; } fillValue = uncheckedTransformColor(value1); goto l6; @@ -1650,13 +1650,13 @@ value1 = (((usqInt) value1) >> rShift1) & cMask2; if (bmDepth1 == 16) { if (!(value1 == 0)) { - b1 = (value1 & 31) << 3; + b1 = (value1 & 0x1F) << 3; b1 += ((usqInt) b1) >> 5; - g1 = ((((usqInt) value1) >> 5) & 31) << 3; + g1 = ((((usqInt) value1) >> 5) & 0x1F) << 3; g1 += ((usqInt) g1) >> 5; - r1 = ((((usqInt) value1) >> 10) & 31) << 3; + r1 = ((((usqInt) value1) >> 10) & 0x1F) << 3; r1 += ((usqInt) r1) >> 5; - a1 = 255; + a1 = 0xFF; value1 = ((b1 + (g1 << 8)) + (r1 << 16)) + (a1 << 24); } } else { @@ -1737,8 +1737,8 @@ bmRaster2 = objBuffer[bmFill + GBBitmapRaster]; if (bmDepth2 == 32) { value2 = (((int*) bits))[(bmRaster2 * yp) + xp]; - if ((value2 != 0) && ((value2 & 4278190080U) == 0)) { - value2 = value2 | 4278190080U; + if ((value2 != 0) && ((value2 & 0xFF000000U) == 0)) { + value2 = value2 | 0xFF000000U; } fillValue = uncheckedTransformColor(value2); goto l9; @@ -1750,13 +1750,13 @@ value2 = (((usqInt) value2) >> rShift2) & cMask3; if (bmDepth2 == 16) { if (!(value2 == 0)) { - b2 = (value2 & 31) << 3; + b2 = (value2 & 0x1F) << 3; b2 += ((usqInt) b2) >> 5; - g2 = ((((usqInt) value2) >> 5) & 31) << 3; + g2 = ((((usqInt) value2) >> 5) & 0x1F) << 3; g2 += ((usqInt) g2) >> 5; - r2 = ((((usqInt) value2) >> 10) & 31) << 3; + r2 = ((((usqInt) value2) >> 10) & 0x1F) << 3; r2 += ((usqInt) r2) >> 5; - a2 = 255; + a2 = 0xFF; value2 = ((b2 + (g2 << 8)) + (r2 << 16)) + (a2 << 24); } } else { @@ -2529,7 +2529,7 @@ if (x0 >= x1) { return 0; } - if ((fill & 4278190080U) != 0) { + if ((fill & 0xFF000000U) != 0) { /* begin fillColorSpan:from:to: */ if (!((workBuffer[GWAALevel]) == 1)) { fillColorSpanAAx0x1(fill, x0, x1); @@ -3153,7 +3153,7 @@ } static sqInt isFillOkay(sqInt fill) { - return (fill == 0) || (((fill & 4278190080U) != 0) || (((fill >= 0) && (fill < objUsed)) && (((fill & 4278190080U) != 0) || ((((objBuffer[fill + GEObjectType]) & GEPrimitiveTypeMask) & GEPrimitiveFillMask) != 0)))); + return (fill == 0) || (((fill & 0xFF000000U) != 0) || (((fill >= 0) && (fill < objUsed)) && (((fill & 0xFF000000U) != 0) || ((((objBuffer[fill + GEObjectType]) & GEPrimitiveTypeMask) & GEPrimitiveFillMask) != 0)))); } @@ -3476,7 +3476,7 @@ if (((leftLength -= 1)) <= 0) { leftRun += 1; leftLength = ((usqInt) ((((int *) leftFills))[leftRun]) >> 16); - leftValue = ((((int *) leftFills))[leftRun]) & 65535; + leftValue = ((((int *) leftFills))[leftRun]) & 0xFFFF; if (!(leftValue == 0)) { leftValue = fillIndexList[leftValue - 1]; leftValue = transformColor(leftValue); @@ -3488,7 +3488,7 @@ if (((rightLength -= 1)) <= 0) { rightRun += 1; rightLength = ((usqInt) ((((int *) rightFills))[rightRun]) >> 16); - rightValue = ((((int *) rightFills))[rightRun]) & 65535; + rightValue = ((((int *) rightFills))[rightRun]) & 0xFFFF; if (!(rightValue == 0)) { rightValue = fillIndexList[rightValue - 1]; rightValue = transformColor(rightValue); @@ -3497,7 +3497,7 @@ if (((widthLength -= 1)) <= 0) { widthRun += 1; widthLength = ((usqInt) ((((int *) lineWidths))[widthRun]) >> 16); - widthValue = ((((int *) lineWidths))[widthRun]) & 65535; + widthValue = ((((int *) lineWidths))[widthRun]) & 0xFFFF; if (!(widthValue == 0)) { widthValue = transformWidth(widthValue); } @@ -3505,7 +3505,7 @@ if (((lineFillLength -= 1)) <= 0) { lineFillRun += 1; lineFillLength = ((usqInt) ((((int *) lineFills))[lineFillRun]) >> 16); - lineFillValue = ((((int *) lineFills))[lineFillRun]) & 65535; + lineFillValue = ((((int *) lineFills))[lineFillRun]) & 0xFFFF; if (!(lineFillValue == 0)) { lineFillValue = fillIndexList[lineFillValue - 1]; } @@ -6551,7 +6551,7 @@ workBuffer[GWAALevel] = aaLevel; if (aaLevel == 1) { workBuffer[GWAAShift] = 0; - workBuffer[GWAAColorMask] = 4294967295U; + workBuffer[GWAAColorMask] = 0xFFFFFFFFU; workBuffer[GWAAScanMask] = 0; } if (aaLevel == 2) { @@ -6674,10 +6674,10 @@ if (maxSteps < 2) { maxSteps = 2; } - scaledStepSize = 16777216 / maxSteps; + scaledStepSize = 0x1000000 / maxSteps; /* begin absoluteSquared8Dot24: */ - word1 = scaledStepSize & 65535; - word2 = (((usqInt) scaledStepSize >> 16)) & 255; + word1 = scaledStepSize & 0xFFFF; + word2 = (((usqInt) scaledStepSize >> 16)) & 0xFF; squaredStepSize = ((usqInt) (((((usqInt) (((unsigned) (word1 * word1))) >> 16)) + ((word1 * word2) * 2)) + (((usqInt) (word2 * word2) << 16))) >> 8); fwDx = fwX1 * scaledStepSize; fwDDx = (fwX2 * squaredStepSize) * 2; @@ -7246,7 +7246,7 @@ if (deltaY < 0) { deltaY = 0 - deltaY; } - if (deltaY > 255) { + if (deltaY > 0xFF) { workBuffer[GWBezierHeightSubdivisions] = ((workBuffer[GWBezierHeightSubdivisions]) + 1); return computeBezierSplitAtHalf(index); } @@ -7528,13 +7528,13 @@ sqInt r; float *transform; - if (!((fillIndex == 0) || ((fillIndex & 4278190080U) != 0))) { + if (!((fillIndex == 0) || ((fillIndex & 0xFF000000U) != 0))) { return fillIndex; } - b = fillIndex & 255; - g = (((usqInt) fillIndex) >> 8) & 255; - r = (((usqInt) fillIndex) >> 16) & 255; - a = (((usqInt) fillIndex) >> 24) & 255; + b = fillIndex & 0xFF; + g = (((usqInt) fillIndex) >> 8) & 0xFF; + r = (((usqInt) fillIndex) >> 16) & 0xFF; + a = (((usqInt) fillIndex) >> 24) & 0xFF; if ((workBuffer[GWHasColorTransform]) != 0) { transform = ((float *) (workBuffer + GWColorTransform)); alphaScale = ((a * (transform[6])) + (transform[7])) / a; @@ -7543,18 +7543,18 @@ b = ((sqInt)(((b * (transform[4])) + (transform[5])) * alphaScale)); a = a * alphaScale; r = ((r < 0) ? 0 : r); - r = ((r < 255) ? r : 255); + r = ((r < 0xFF) ? r : 0xFF); g = ((g < 0) ? 0 : g); - g = ((g < 255) ? g : 255); + g = ((g < 0xFF) ? g : 0xFF); b = ((b < 0) ? 0 : b); - b = ((b < 255) ? b : 255); + b = ((b < 0xFF) ? b : 0xFF); a = ((a < 0) ? 0 : a); - a = ((a < 255) ? a : 255); + a = ((a < 0xFF) ? a : 0xFF); } if (a < 1) { return 0; } - if ((a < 255) && ((workBuffer[GWNeedsFlush]) != 0)) { + if ((a < 0xFF) && ((workBuffer[GWNeedsFlush]) != 0)) { /* begin stopBecauseOf: */ workBuffer[GWStopReason] = GErrorNeedFlush; engineStopped = 1; @@ -7647,23 +7647,23 @@ if (!((workBuffer[GWHasColorTransform]) != 0)) { return fillIndex; } - b = fillIndex & 255; - g = (((usqInt) fillIndex) >> 8) & 255; - r = (((usqInt) fillIndex) >> 16) & 255; - a = (((usqInt) fillIndex) >> 24) & 255; + b = fillIndex & 0xFF; + g = (((usqInt) fillIndex) >> 8) & 0xFF; + r = (((usqInt) fillIndex) >> 16) & 0xFF; + a = (((usqInt) fillIndex) >> 24) & 0xFF; transform = ((float *) (workBuffer + GWColorTransform)); r = ((sqInt)((r * (transform[0])) + (transform[1]))); g = ((sqInt)((g * (transform[2])) + (transform[3]))); b = ((sqInt)((b * (transform[4])) + (transform[5]))); a = ((sqInt)((a * (transform[6])) + (transform[7]))); r = ((r < 0) ? 0 : r); - r = ((r < 255) ? r : 255); + r = ((r < 0xFF) ? r : 0xFF); g = ((g < 0) ? 0 : g); - g = ((g < 255) ? g : 255); + g = ((g < 0xFF) ? g : 0xFF); b = ((b < 0) ? 0 : b); - b = ((b < 255) ? b : 255); + b = ((b < 0xFF) ? b : 0xFF); a = ((a < 0) ? 0 : a); - a = ((a < 255) ? a : 255); + a = ((a < 0xFF) ? a : 0xFF); if (a < 16) { return 0; } Modified: trunk/src/plugins/B3DAcceleratorPlugin/B3DAcceleratorPlugin.c =================================================================== --- trunk/src/plugins/B3DAcceleratorPlugin/B3DAcceleratorPlugin.c 2014-11-25 23:33:58 UTC (rev 3150) +++ trunk/src/plugins/B3DAcceleratorPlugin/B3DAcceleratorPlugin.c 2014-11-26 01:09:16 UTC (rev 3151) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.5 with VMMaker 4.13.7 translated as C source on 24 October 2014 8:36:01 am */ +/* Smalltalk from Squeak4.5 with VMMaker 4.13.8 translated as C source on 25 November 2014 8:00:09 pm */ /* Automatically generated by - VMPluginCodeGenerator VMMaker-dtl.354 uuid: a38a877b-1f44-40b9-9ee8-c812a471808c + VMPluginCodeGenerator VMMaker-dtl.355 uuid: 9e6e08b4-e8f0-44b0-803c-de1559fbcb27 from - B3DAcceleratorPlugin VMMaker-dtl.354 uuid: a38a877b-1f44-40b9-9ee8-c812a471808c + B3DAcceleratorPlugin VMMaker-dtl.355 uuid: 9e6e08b4-e8f0-44b0-803c-de1559fbcb27 */ -static char __buildInfo[] = "B3DAcceleratorPlugin VMMaker-dtl.354 uuid: a38a877b-1f44-40b9-9ee8-c812a471808c " __DATE__ ; +static char __buildInfo[] = "B3DAcceleratorPlugin VMMaker-dtl.355 uuid: 9e6e08b4-e8f0-44b0-803c-de1559fbcb27 " __DATE__ ; @@ -107,9 +107,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "B3DAcceleratorPlugin 24 October 2014 (i)" + "B3DAcceleratorPlugin 25 November 2014 (i)" #else - "B3DAcceleratorPlugin 24 October 2014 (e)" + "B3DAcceleratorPlugin 25 November 2014 (e)" #endif ; Modified: trunk/src/plugins/BMPReadWriterPlugin/BMPReadWriterPlugin.c =================================================================== --- trunk/src/plugins/BMPReadWriterPlugin/BMPReadWriterPlugin.c 2014-11-25 23:33:58 UTC (rev 3150) +++ trunk/src/plugins/BMPReadWriterPlugin/BMPReadWriterPlugin.c 2014-11-26 01:09:16 UTC (rev 3151) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.5 with VMMaker 4.13.7 translated as C source on 24 October 2014 8:35:59 am */ +/* Smalltalk from Squeak4.5 with VMMaker 4.13.8 translated as C source on 25 November 2014 8:00:03 pm */ /* Automatically generated by - VMPluginCodeGenerator VMMaker-dtl.354 uuid: a38a877b-1f44-40b9-9ee8-c812a471808c + VMPluginCodeGenerator VMMaker-dtl.355 uuid: 9e6e08b4-e8f0-44b0-803c-de1559fbcb27 from - BMPReadWriterPlugin VMMaker-dtl.354 uuid: a38a877b-1f44-40b9-9ee8-c812a471808c + BMPReadWriterPlugin VMMaker-dtl.355 uuid: 9e6e08b4-e8f0-44b0-803c-de1559fbcb27 */ -static char __buildInfo[] = "BMPReadWriterPlugin VMMaker-dtl.354 uuid: a38a877b-1f44-40b9-9ee8-c812a471808c " __DATE__ ; +static char __buildInfo[] = "BMPReadWriterPlugin VMMaker-dtl.355 uuid: 9e6e08b4-e8f0-44b0-803c-de1559fbcb27 " __DATE__ ; @@ -58,9 +58,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "BMPReadWriterPlugin 24 October 2014 (i)" + "BMPReadWriterPlugin 25 November 2014 (i)" #else - "BMPReadWriterPlugin 24 October 2014 (e)" + "BMPReadWriterPlugin 25 November 2014 (e)" #endif ; Modified: trunk/src/plugins/BitBltPlugin/BitBltPlugin.c =================================================================== --- trunk/src/plugins/BitBltPlugin/BitBltPlugin.c 2014-11-25 23:33:58 UTC (rev 3150) +++ trunk/src/plugins/BitBltPlugin/BitBltPlugin.c 2014-11-26 01:09:16 UTC (rev 3151) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.5 with VMMaker 4.13.7 translated as C source on 24 October 2014 8:36 am */ +/* Smalltalk from Squeak4.5 with VMMaker 4.13.8 translated as C source on 25 November 2014 8:00:05 pm */ /* Automatically generated by - SmartSyntaxPluginCodeGenerator VMMaker-dtl.354 uuid: a38a877b-1f44-40b9-9ee8-c812a471808c + SmartSyntaxPluginCodeGenerator VMMaker-dtl.355 uuid: 9e6e08b4-e8f0-44b0-803c-de1559fbcb27 from - BitBltSimulation VMMaker-dtl.354 uuid: a38a877b-1f44-40b9-9ee8-c812a471808c + BitBltSimulation VMMaker-dtl.355 uuid: 9e6e08b4-e8f0-44b0-803c-de1559fbcb27 */ -static char __buildInfo[] = "BitBltSimulation VMMaker-dtl.354 uuid: a38a877b-1f44-40b9-9ee8-c812a471808c " __DATE__ ; +static char __buildInfo[] = "BitBltSimulation VMMaker-dtl.355 uuid: 9e6e08b4-e8f0-44b0-803c-de1559fbcb27 " __DATE__ ; @@ -45,7 +45,7 @@ /*** Constants ***/ -#define AllOnes 4294967295U +#define AllOnes 0xFFFFFFFFU #define AlphaIndex 3 #define BBClipHeightIndex 13 #define BBClipWidthIndex 12 @@ -256,9 +256,9 @@ }; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "BitBltPlugin 24 October 2014 (i)" + "BitBltPlugin 25 November 2014 (i)" #else - "BitBltPlugin 24 October 2014 (e)" + "BitBltPlugin 25 November 2014 (e)" #endif ; static sqInt nWords; @@ -324,12 +324,12 @@ } if (destDepth == 16) { diff = partitionedSubfromnBitsnPartitions(sourceWord, destinationWord, 5, 3); - bitCount = ((bitCount + (diff & 31)) + ((((usqInt) diff) >> 5) & 31)) + ((((usqInt) diff) >> 10) & 31); + bitCount = ((bitCount + (diff & 0x1F)) + ((((usqInt) diff) >> 5) & 0x1F)) + ((((usqInt) diff) >> 10) & 0x1F); diff = partitionedSubfromnBitsnPartitions(((usqInt) sourceWord) >> 16, ((usqInt) destinationWord) >> 16, 5, 3); - bitCount = ((bitCount + (diff & 31)) + ((((usqInt) diff) >> 5) & 31)) + ((((usqInt) diff) >> 10) & 31); + bitCount = ((bitCount + (diff & 0x1F)) + ((((usqInt) diff) >> 5) & 0x1F)) + ((((usqInt) diff) >> 10) & 0x1F); } else { diff = partitionedSubfromnBitsnPartitions(sourceWord, destinationWord, 8, 3); - bitCount = ((bitCount + (diff & 255)) + ((((usqInt) diff) >> 8) & 255)) + ((((usqInt) diff) >> 16) & 255); + bitCount = ((bitCount + (diff & 0xFF)) + ((((usqInt) diff) >> 8) & 0xFF)) + ((((usqInt) diff) >> 16) & 0xFF); } return destinationWord; } @@ -384,7 +384,7 @@ /* begin rgbMap:from:to: */ if (((d = cmBitsPerColor - 5)) > 0) { mask = (1 << 5) - 1; - srcPix = (destinationWord & 65535) << d; + srcPix = (destinationWord & 0xFFFF) << d; mask = mask << d; destPix = srcPix & mask; mask = mask << cmBitsPerColor; @@ -394,23 +394,23 @@ } else { if (d == 0) { if (5 == 5) { - mapIndex = (destinationWord & 65535) & 32767; + mapIndex = (destinationWord & 0xFFFF) & 0x7FFF; goto l1; } if (5 == 8) { - mapIndex = (destinationWord & 65535) & 16777215; + mapIndex = (destinationWord & 0xFFFF) & 0xFFFFFF; goto l1; } - mapIndex = destinationWord & 65535; + mapIndex = destinationWord & 0xFFFF; goto l1; } - if ((destinationWord & 65535) == 0) { - mapIndex = destinationWord & 65535; + if ((destinationWord & 0xFFFF) == 0) { + mapIndex = destinationWord & 0xFFFF; goto l1; } d = 5 - cmBitsPerColor; mask = (1 << cmBitsPerColor) - 1; - srcPix = ((usqInt) (destinationWord & 65535)) >> d; + srcPix = ((usqInt) (destinationWord & 0xFFFF)) >> d; destPix = srcPix & mask; mask = mask << cmBitsPerColor; srcPix = ((usqInt) srcPix) >> d; @@ -437,11 +437,11 @@ } else { if (d1 == 0) { if (5 == 5) { - mapIndex = (((usqInt) destinationWord) >> 16) & 32767; + mapIndex = (((usqInt) destinationWord) >> 16) & 0x7FFF; goto l2; } if (5 == 8) { - mapIndex = (((usqInt) destinationWord) >> 16) & 16777215; + mapIndex = (((usqInt) destinationWord) >> 16) & 0xFFFFFF; goto l2; } mapIndex = ((usqInt) destinationWord) >> 16; @@ -484,11 +484,11 @@ } else { if (d2 == 0) { if (8 == 5) { - mapIndex = destinationWord & 32767; + mapIndex = destinationWord & 0x7FFF; goto l3; } if (8 == 8) { - mapIndex = destinationWord & 16777215; + mapIndex = destinationWord & 0xFFFFFF; goto l3; } mapIndex = destinationWord; @@ -544,10 +544,10 @@ if (alpha == 0) { return destinationWord; } - if (alpha == 255) { + if (alpha == 0xFF) { return sourceWord; } - unAlpha = 255 - alpha; + unAlpha = 0xFF - alpha; /* blend red and blue */ @@ -555,7 +555,7 @@ /* blend alpha and green */ - blendAG = (((((((usqInt) sourceWord) >> 8) | 16711680) & 16711935) * alpha) + (((((usqInt) destinationWord) >> 8) & 16711935) * unAlpha)) + 16711935; + blendAG = (((((((usqInt) sourceWord) >> 8) | 0xFF0000) & 16711935) * alpha) + (((((usqInt) destinationWord) >> 8) & 16711935) * unAlpha)) + 16711935; /* divide by 255 */ @@ -605,7 +605,7 @@ if (destDepth < 16) { return destinationWord; } - unAlpha = 255 - sourceAlpha; + unAlpha = 0xFF - sourceAlpha; result = destinationWord; if (destPPW == 1) { @@ -633,7 +633,7 @@ } else { pixMask = maskTable[destDepth]; bitsPerColor = 5; - rgbMask = 31; + rgbMask = 0x1F; maskShifted = destMask; destShifted = destinationWord; sourceShifted = sourceWord; @@ -644,7 +644,7 @@ pixBlend = 0; for (i = 1; i <= 3; i += 1) { shift = (i - 1) * bitsPerColor; - blend = ((((((((usqInt) sourcePixVal) >> shift) & rgbMask) * sourceAlpha) + (((((usqInt) destPixVal) >> shift) & rgbMask) * unAlpha)) + 254) / 255) & rgbMask; + blend = ((((((((usqInt) sourcePixVal) >> shift) & rgbMask) * sourceAlpha) + (((((usqInt) destPixVal) >> shift) & rgbMask) * unAlpha)) + 0xFE) / 0xFF) & rgbMask; pixBlend = pixBlend | (blend << shift); } result = (result & (~(pixMask << ((j - 1) * 16)))) | (pixBlend << ((j - 1) * 16)); @@ -677,7 +677,7 @@ /* High 8 bits of source pixel is source opacity (ARGB format) */ - unAlpha = 255 - (((usqInt) sourceWord) >> 24); + unAlpha = 0xFF - (((usqInt) sourceWord) >> 24); /* blend red and blue components */ @@ -689,11 +689,11 @@ /* saturate red and blue components if there is a carry */ - rb = (rb & 16711935) | (((usqInt) ((rb & 16777472) * 255)) >> 8); + rb = (rb & 16711935) | (((usqInt) ((rb & 16777472) * 0xFF)) >> 8); /* saturate alpha and green components if there is a carry */ - ag = ((ag & 16711935) << 8) | ((ag & 16777472) * 255); + ag = ((ag & 16711935) << 8) | ((ag & 16777472) * 0xFF); return ag | rb; } @@ -748,7 +748,7 @@ /* This is the outer loop */ - mask1 = 65535 << (16 - srcShift); + mask1 = 0xFFFF << (16 - srcShift); while (((deltaY -= 1)) != 0) { srcIndex = (sourceBits + (srcY * sourcePitch)) + (sx * 4); dstIndex = (destBits + (dstY * destPitch)) + ((((sqInt) dx >> 1)) * 4); @@ -762,7 +762,7 @@ deltaX = bbW + 1; dstMask = mask1; - if (dstMask == 65535) { + if (dstMask == 0xFFFF) { srcShift = 16; } else { srcShift = 0; @@ -771,13 +771,13 @@ ditherThreshold = ditherMatrix4x4[ditherBase + ((ditherIndex = (ditherIndex + 1) & 3))]; sourceWord = long32At(srcIndex); srcAlpha = ((usqInt) sourceWord) >> 24; - if (srcAlpha == 255) { + if (srcAlpha == 0xFF) { /* Dither from 32 to 16 bit */ /* begin dither32To16:threshold: */ addThreshold = ((usqInt) ditherThreshold << 8); - sourceWord = ((((usqInt) (dither8Lookup[addThreshold + ((((usqInt) sourceWord >> 16)) & 255)]) << 10)) + (((usqInt) (dither8Lookup[addThreshold + ((((usqInt) sourceWord >> 8)) & 255)]) << 5))) + (dither8Lookup[addThreshold + (sourceWord & 255)]); + sourceWord = ((((usqInt) (dither8Lookup[addThreshold + ((((usqInt) sourceWord >> 16)) & 0xFF)]) << 10)) + (((usqInt) (dither8Lookup[addThreshold + ((((usqInt) sourceWord >> 8)) & 0xFF)]) << 5))) + (dither8Lookup[addThreshold + (sourceWord & 0xFF)]); if (sourceWord == 0) { sourceWord = 1 << srcShift; } else { @@ -806,14 +806,14 @@ /* Mix colors */ - destWord = ((((usqInt) (destWord & 31744) << 9)) | (((usqInt) (destWord & 992) << 6))) | ((((usqInt) (destWord & 31) << 3)) | 4278190080U); + destWord = ((((usqInt) (destWord & 0x7C00) << 9)) | (((usqInt) (destWord & 0x3E0) << 6))) | ((((usqInt) (destWord & 0x1F) << 3)) | 0xFF000000U); /* And dither */ sourceWord = alphaBlendScaledwith(sourceWord, destWord); /* begin dither32To16:threshold: */ addThreshold1 = ((usqInt) ditherThreshold << 8); - sourceWord = ((((usqInt) (dither8Lookup[addThreshold1 + ((((usqInt) sourceWord >> 16)) & 255)]) << 10)) + (((usqInt) (dither8Lookup[addThreshold1 + ((((usqInt) sourceWord >> 8)) & 255)]) << 5))) + (dither8Lookup[addThreshold1 + (sourceWord & 255)]); + sourceWord = ((((usqInt) (dither8Lookup[addThreshold1 + ((((usqInt) sourceWord >> 16)) & 0xFF)]) << 10)) + (((usqInt) (dither8Lookup[addThreshold1 + ((((usqInt) sourceWord >> 8)) & 0xFF)]) << 5))) + (dither8Lookup[addThreshold1 + (sourceWord & 0xFF)]); if (sourceWord == 0) { sourceWord = 1 << srcShift; } else { @@ -896,14 +896,14 @@ while (((deltaX -= 1)) != 0) { sourceWord = long32At(srcIndex); srcAlpha = ((usqInt) sourceWord) >> 24; - if (srcAlpha == 255) { + if (srcAlpha == 0xFF) { long32Atput(dstIndex, sourceWord); srcIndex += 4; /* Now copy as many words as possible with alpha = 255 */ dstIndex += 4; - while ((((deltaX -= 1)) != 0) && ((((usqInt) ((sourceWord = long32At(srcIndex)))) >> 24) == 255)) { + while ((((deltaX -= 1)) != 0) && ((((usqInt) ((sourceWord = long32At(srcIndex)))) >> 24) == 0xFF)) { long32Atput(dstIndex, sourceWord); srcIndex += 4; dstIndex += 4; @@ -982,7 +982,7 @@ if (destMSB) { mask1 = 24 - mask1; } - mask2 = AllOnes ^ (255 << mask1); + mask2 = AllOnes ^ (0xFF << mask1); if ((dx & 1) == 0) { adjust = 0; } else { @@ -1007,7 +1007,7 @@ while (((deltaX -= 1)) != 0) { sourceWord = ((long32At(srcIndex)) & (~adjust)) + adjust; srcAlpha = ((usqInt) sourceWord) >> 24; - if (srcAlpha > 31) { + if (srcAlpha > 0x1F) { /* Everything below 31 is transparent */ @@ -1054,19 +1054,19 @@ if (srcShift == 0) { dstIndex += 4; srcShift = 24; - dstMask = 16777215; + dstMask = 0xFFFFFF; } else { srcShift -= 8; - dstMask = (((usqInt) dstMask) >> 8) | 4278190080U; + dstMask = (((usqInt) dstMask) >> 8) | 0xFF000000U; } } else { if (srcShift == 24) { dstIndex += 4; srcShift = 0; - dstMask = 4294967040U; + dstMask = 0xFFFFFF00U; } else { srcShift += 8; - dstMask = (dstMask << 8) | 255; + dstMask = (dstMask << 8) | 0xFF; } } adjust = adjust ^ 522133279; @@ -1258,13 +1258,13 @@ } destPPW = 32 / destDepth; cmBitsPerColor = 0; - if (cmMask == 511) { + if (cmMask == 0x1FF) { cmBitsPerColor = 3; } - if (cmMask == 4095) { + if (cmMask == 0xFFF) { cmBitsPerColor = 4; } - if (cmMask == 32767) { + if (cmMask == 0x7FFF) { cmBitsPerColor = 5; } /* begin tryCopyingBitsQuickly */ @@ -1447,13 +1447,13 @@ if (!(!(interpreterProxy->failed()))) { return interpreterProxy->primitiveFail(); } - if ((combinationRule == 30) || (combinationRule == 31)) { + if ((combinationRule == 30) || (combinationRule == 0x1F)) { /* Check and fetch source alpha parameter for alpha blend */ if ((interpreterProxy->methodArgumentCount()) == 1) { sourceAlpha = interpreterProxy->stackIntegerValue(0); - if (!((!(interpreterProxy->failed())) && ((sourceAlpha >= 0) && (sourceAlpha <= 255)))) { + if (!((!(interpreterProxy->failed())) && ((sourceAlpha >= 0) && (sourceAlpha <= 0xFF)))) { return interpreterProxy->primitiveFail(); } } else { @@ -1617,13 +1617,13 @@ if (done) { return null; } - if ((combinationRule == 30) || (combinationRule == 31)) { + if ((combinationRule == 30) || (combinationRule == 0x1F)) { /* Check and fetch source alpha parameter for alpha blend */ if ((interpreterProxy->methodArgumentCount()) == 1) { sourceAlpha = interpreterProxy->stackIntegerValue(0); - if (!((!(interpreterProxy->failed())) && ((sourceAlpha >= 0) && (sourceAlpha <= 255)))) { + if (!((!(interpreterProxy->failed())) && ((sourceAlpha >= 0) && (sourceAlpha <= 0xFF)))) { return interpreterProxy->primitiveFail(); } } else { @@ -1750,8 +1750,8 @@ /* fetch the forecolor into componentAlphaModeColor. */ - componentAlphaModeAlpha = 255; - componentAlphaModeColor = 16777215; + componentAlphaModeAlpha = 0xFF; + componentAlphaModeColor = 0xFFFFFF; gammaLookupTable = null; ungammaLookupTable = null; if ((interpreterProxy->methodArgumentCount()) >= 2) { @@ -2144,7 +2144,7 @@ destPix = cmLookupTable[sourcePix & cmMask]; destWord1 = destWord1 | ((destPix & destPixMask) << dstShift1); dstShift1 += dstShiftInc; - if (!((((srcShift1 += srcShiftInc)) & 4294967264U) == 0)) { + if (!((((srcShift1 += srcShiftInc)) & 0xFFFFFFE0U) == 0)) { if (sourceMSB) { srcShift1 += 32; } else { @@ -2178,7 +2178,7 @@ destPix = pv; destWord1 = destWord1 | ((destPix & destPixMask) << dstShift1); dstShift1 += dstShiftInc; - if (!((((srcShift1 += srcShiftInc)) & 4294967264U) == 0)) { + if (!((((srcShift1 += srcShiftInc)) & 0xFFFFFFE0U) == 0)) { if (sourceMSB) { srcShift1 += 32; } else { @@ -2339,10 +2339,10 @@ if (destinationWord == 0) { return 0; } - if (!((destinationWord & 4278190080U) == 0)) { + if (!((destinationWord & 0xFF000000U) == 0)) { return destinationWord; } - return destinationWord | (sourceWord & 4278190080U); + return destinationWord | (sourceWord & 0xFF000000U); } @@ -2413,10 +2413,10 @@ sqInt value1; sqInt out; - for (b = 0; b <= 255; b += 1) { + for (b = 0; b <= 0xFF; b += 1) { for (t = 0; t <= 15; t += 1) { /* begin expensiveDither32To16:threshold: */ - pv = b & 255; + pv = b & 0xFF; threshold = ditherThresholds16[pv & 7]; value1 = ditherValues16[((usqInt) pv >> 3)]; if (t < threshold) { @@ -2424,7 +2424,7 @@ } else { out = value1; } - pv = (((usqInt) b >> 8)) & 255; + pv = (((usqInt) b >> 8)) & 0xFF; threshold = ditherThresholds16[pv & 7]; value1 = ditherValues16[((usqInt) pv >> 3)]; if (t < threshold) { @@ -2432,7 +2432,7 @@ } else { out = out | (((usqInt) value1 << 5)); } - pv = (((usqInt) b >> 16)) & 255; + pv = (((usqInt) b >> 16)) & 0xFF; threshold = ditherThresholds16[pv & 7]; value1 = ditherValues16[((usqInt) pv >> 3)]; if (t < threshold) { @@ -2464,7 +2464,7 @@ if ((shifts == null) || (masks == null)) { return 1; } - if (((shifts[RedIndex]) == 0) && (((shifts[GreenIndex]) == 0) && (((shifts[BlueIndex]) == 0) && (((shifts[AlphaIndex]) == 0) && (((masks[RedIndex]) == 16711680) && (((masks[GreenIndex]) == 65280) && (((masks[BlueIndex]) == 255) && ((masks[AlphaIndex]) == 4278190080U)))))))) { + if (((shifts[RedIndex]) == 0) && (((shifts[GreenIndex]) == 0) && (((shifts[BlueIndex]) == 0) && (((shifts[AlphaIndex]) == 0) && (((masks[RedIndex]) == 0xFF0000) && (((masks[GreenIndex]) == 0xFF00) && (((masks[BlueIndex]) == 0xFF) && ((masks[AlphaIndex]) == 0xFF000000U)))))))) { return 1; } return 0; @@ -3293,7 +3293,7 @@ if (!(loadBitBltFromwarping(bbObj, 0))) { return interpreterProxy->primitiveFail(); } - if ((combinationRule == 30) || (combinationRule == 31)) { + if ((combinationRule == 30) || (combinationRule == 0x1F)) { /* needs extra source alpha */ @@ -3577,7 +3577,7 @@ /* make a mask to isolate the pixel within that word */ - mask = ((usqInt) 4294967295U) >> (32 - depth); + mask = ((usqInt) 0xFFFFFFFFU) >> (32 - depth); /* this is the tricky MSB part - we mask the xVal to find how far into the word we need, then add 1 for the pixel we're looking for, then * depth to get the bit shift */ @@ -3718,21 +3718,21 @@ /* Add each pixel separately */ componentMask = (1 << destDepth) - 1; - carryOverflowMask = (4294967295U / componentMask) << (destDepth - 1); + carryOverflowMask = (0xFFFFFFFFU / componentMask) << (destDepth - 1); return partitionedAddtonBitscomponentMaskcarryOverflowMask(sourceWord, destinationWord, destDepth, componentMask, carryOverflowMask); } if (destDepth == 16) { /* Add RGB components of each pixel separately */ - componentMask = 31; + componentMask = 0x1F; carryOverflowMask = 1108361744; return partitionedAddtonBitscomponentMaskcarryOverflowMask(sourceWord & 2147450879, destinationWord & 2147450879, 5, componentMask, carryOverflowMask); } else { /* Add RGBA components of the pixel separately */ - componentMask = 255; + componentMask = 0xFF; carryOverflowMask = 2155905152U; return partitionedAddtonBitscomponentMaskcarryOverflowMask(sourceWord, destinationWord, 8, componentMask, carryOverflowMask); } @@ -3778,7 +3778,7 @@ /* This is the outer loop */ - mask1 = 65535 << (16 - srcShift); + mask1 = 0xFFFF << (16 - srcShift); while (((deltaY -= 1)) != 0) { srcIndex = (sourceBits + (srcY * sourcePitch)) + (sx * 4); dstIndex = (destBits + (dstY * destPitch)) + ((((sqInt) dx >> 1)) * 4); @@ -3792,7 +3792,7 @@ deltaX = bbW + 1; dstMask = mask1; - if (dstMask == 65535) { + if (dstMask == 0xFFFF) { srcShift = 16; } else { srcShift = 0; @@ -3800,7 +3800,7 @@ while (((deltaX -= 1)) != 0) { ditherThreshold = ditherMatrix4x4[ditherBase + ((ditherIndex = (ditherIndex + 1) & 3))]; sourceWord = long32At(srcIndex); - srcAlpha = sourceWord & 16777215; + srcAlpha = sourceWord & 0xFFFFFF; if (!(srcAlpha == 0)) { /* 0 < srcAlpha */ @@ -3815,14 +3815,14 @@ /* Mix colors */ - destWord = ((((usqInt) (destWord & 31744) << 9)) | (((usqInt) (destWord & 992) << 6))) | ((((usqInt) (destWord & 31) << 3)) | 4278190080U); + destWord = ((((usqInt) (destWord & 0x7C00) << 9)) | (((usqInt) (destWord & 0x3E0) << 6))) | ((((usqInt) (destWord & 0x1F) << 3)) | 0xFF000000U); /* And dither */ sourceWord = rgbComponentAlpha32with(sourceWord, destWord); /* begin dither32To16:threshold: */ addThreshold = ((usqInt) ditherThreshold << 8); - sourceWord = ((((usqInt) (dither8Lookup[addThreshold + ((((usqInt) sourceWord >> 16)) & 255)]) << 10)) + (((usqInt) (dither8Lookup[addThreshold + ((((usqInt) sourceWord >> 8)) & 255)]) << 5))) + (dither8Lookup[addThreshold + (sourceWord & 255)]); + sourceWord = ((((usqInt) (dither8Lookup[addThreshold + ((((usqInt) sourceWord >> 16)) & 0xFF)]) << 10)) + (((usqInt) (dither8Lookup[addThreshold + ((((usqInt) sourceWord >> 8)) & 0xFF)]) << 5))) + (dither8Lookup[addThreshold + (sourceWord & 0xFF)]); if (sourceWord == 0) { sourceWord = 1 << srcShift; } else { @@ -3903,14 +3903,14 @@ deltaX = bbW + 1; while (((deltaX -= 1)) != 0) { sourceWord = long32At(srcIndex); - srcAlpha = sourceWord & 16777215; + srcAlpha = sourceWord & 0xFFFFFF; if (srcAlpha == 0) { srcIndex += 4; /* Now skip as many words as possible, */ dstIndex += 4; - while ((((deltaX -= 1)) != 0) && ((((sourceWord = long32At(srcIndex))) & 16777215) == 0)) { + while ((((deltaX -= 1)) != 0) && ((((sourceWord = long32At(srcIndex))) & 0xFFFFFF) == 0)) { srcIndex += 4; dstIndex += 4; } @@ -3971,60 +3971,60 @@ return destinationWord; } srcColor = componentAlphaModeColor; - srcAlpha = componentAlphaModeAlpha & 255; - aB = alpha & 255; + srcAlpha = componentAlphaModeAlpha & 0xFF; + aB = alpha & 0xFF; alpha = ((usqInt) alpha) >> 8; - aG = alpha & 255; + aG = alpha & 0xFF; alpha = ((usqInt) alpha) >> 8; - aR = alpha & 255; + aR = alpha & 0xFF; alpha = ((usqInt) alpha) >> 8; - aA = alpha & 255; - if (!(srcAlpha == 255)) { + aA = alpha & 0xFF; + if (!(srcAlpha == 0xFF)) { aA = ((usqInt) (aA * srcAlpha)) >> 8; aR = ((usqInt) (aR * srcAlpha)) >> 8; aG = ((usqInt) (aG * srcAlpha)) >> 8; aB = ((usqInt) (aB * srcAlpha)) >> 8; } dstMask = destinationWord; - d = dstMask & 255; - s = srcColor & 255; + d = dstMask & 0xFF; + s = srcColor & 0xFF; if (!(ungammaLookupTable == null)) { d = ungammaLookupTable[d]; s = ungammaLookupTable[s]; } - b = (((usqInt) (d * (255 - aB))) >> 8) + (((usqInt) (s * aB)) >> 8); - if (b > 255) { - b = 255; + b = (((usqInt) (d * (0xFF - aB))) >> 8) + (((usqInt) (s * aB)) >> 8); + if (b > 0xFF) { + b = 0xFF; } if (!(gammaLookupTable == null)) { b = gammaLookupTable[b]; } dstMask = ((usqInt) dstMask) >> 8; srcColor = ((usqInt) srcColor) >> 8; - d = dstMask & 255; - s = srcColor & 255; + d = dstMask & 0xFF; + s = srcColor & 0xFF; if (!(ungammaLookupTable == null)) { d = ungammaLookupTable[d]; s = ungammaLookupTable[s]; } - g = (((usqInt) (d * (255 - aG))) >> 8) + (((usqInt) (s * aG)) >> 8); - if (g > 255) { - g = 255; + g = (((usqInt) (d * (0xFF - aG))) >> 8) + (((usqInt) (s * aG)) >> 8); + if (g > 0xFF) { + g = 0xFF; } if (!(gammaLookupTable == null)) { g = gammaLookupTable[g]; } dstMask = ((usqInt) dstMask) >> 8; srcColor = ((usqInt) srcColor) >> 8; - d = dstMask & 255; - s = srcColor & 255; + d = dstMask & 0xFF; + s = srcColor & 0xFF; if (!(ungammaLookupTable == null)) { d = ungammaLookupTable[d]; s = ungammaLookupTable[s]; } - r = (((usqInt) (d * (255 - aR))) >> 8) + (((usqInt) (s * aR)) >> 8); - if (r > 255) { - r = 255; + r = (((usqInt) (d * (0xFF - aR))) >> 8) + (((usqInt) (s * aR)) >> 8); + if (r > 0xFF) { + r = 0xFF; } if (!(gammaLookupTable == null)) { r = gammaLookupTable[r]; @@ -4034,9 +4034,9 @@ /* no need to gamma correct alpha value ? */ - a = (((usqInt) ((dstMask & 255) * (255 - aA))) >> 8) + aA; - if (a > 255) { - a = 255; + a = (((usqInt) ((dstMask & 0xFF) * (0xFF - aA))) >> 8) + aA; + if (a > 0xFF) { + a = 0xFF; } answer = (((((a << 8) + r) << 8) + g) << 8) + b; return answer; @@ -4085,7 +4085,7 @@ if (destMSB) { mask1 = 24 - mask1; } - mask2 = AllOnes ^ (255 << mask1); + mask2 = AllOnes ^ (0xFF << mask1); if ((dx & 1) == 0) { adjust = 0; } else { @@ -4112,9 +4112,9 @@ /* set srcAlpha to the average of the 3 separate aR,Ag,AB values */ - srcAlpha = sourceWord & 16777215; - srcAlpha = (((((usqInt) srcAlpha) >> 16) + ((((usqInt) srcAlpha) >> 8) & 255)) + (srcAlpha & 255)) / 3; - if (srcAlpha > 31) { + srcAlpha = sourceWord & 0xFFFFFF; + srcAlpha = (((((usqInt) srcAlpha) >> 16) + ((((usqInt) srcAlpha) >> 8) & 0xFF)) + (srcAlpha & 0xFF)) / 3; + if (srcAlpha > 0x1F) { /* Everything below 31 is transparent */ @@ -4122,7 +4122,7 @@ /* treat everything above 224 as opaque */ - sourceWord = 4294967295U; + sourceWord = 0xFFFFFFFFU; } destWord = long32At(dstIndex); destWord = destWord & (~dstMask); @@ -4162,19 +4162,19 @@ if (srcShift == 0) { dstIndex += 4; srcShift = 24; - dstMask = 16777215; + dstMask = 0xFFFFFF; } else { srcShift -= 8; - dstMask = (((usqInt) dstMask) >> 8) | 4278190080U; + dstMask = (((usqInt) dstMask) >> 8) | 0xFF000000U; } } else { if (srcShift == 32) { dstIndex += 4; srcShift = 0; - dstMask = 4294967040U; + dstMask = 0xFFFFFF00U; } else { srcShift += 8; - dstMask = (dstMask << 8) | 255; + dstMask = (dstMask << 8) | 0xFF; } } adjust = adjust ^ 522133279; @@ -4226,11 +4226,11 @@ p2 = ((usqInt) (destinationWord & mask)) >> ((i - 1) * destDepth); if (!(destDepth == 32)) { if (destDepth == 16) { - p1 = ((((p1 & 31) << 3) | ((p1 & 992) << 6)) | ((p1 & 31744) << 9)) | 4278190080U; - p2 = ((((p2 & 31) << 3) | ((p2 & 992) << 6)) | ((p2 & 31744) << 9)) | 4278190080U; + p1 = ((((p1 & 0x1F) << 3) | ((p1 & 0x3E0) << 6)) | ((p1 & 0x7C00) << 9)) | 0xFF000000U; + p2 = ((((p2 & 0x1F) << 3) | ((p2 & 0x3E0) << 6)) | ((p2 & 0x7C00) << 9)) | 0xFF000000U; } else { - p1 = (rgbMapfromto(p1, destDepth, 32)) | 4278190080U; - p2 = (rgbMapfromto(p2, destDepth, 32)) | 4278190080U; + p1 = (rgbMapfromto(p1, destDepth, 32)) | 0xFF000000U; + p2 = (rgbMapfromto(p2, destDepth, 32)) | 0xFF000000U; } } v = rgbComponentAlpha32with(p1, p2); @@ -4248,11 +4248,11 @@ } else { if (d == 0) { if (32 == 5) { - v = v & 32767; + v = v & 0x7FFF; goto l1; } if (32 == 8) { - v = v & 16777215; + v = v & 0xFFFFFF; goto l1; } v = v; @@ -4304,10 +4304,10 @@ pixMask = maskTable[destDepth]; if (destDepth == 16) { bitsPerColor = 5; - rgbMask = 31; + rgbMask = 0x1F; } else { bitsPerColor = 8; - rgbMask = 255; + rgbMask = 0xFF; } maskShifted = destMask; destShifted = destinationWord; @@ -4371,14 +4371,14 @@ /* Sometimes called with 16 bits, though pixel is 15, but we must never return more than 15. */ - return sourcePixel & 32767; + return sourcePixel & 0x7FFF; } if (nBitsIn == 8) { /* Sometimes called with 32 bits, though pixel is 24, but we must never return more than 24. */ - return sourcePixel & 16777215; + return sourcePixel & 0xFFFFFF; } return sourcePixel; } @@ -4656,11 +4656,11 @@ } else { if (d == 0) { if (5 == 5) { - mapIndex = pixVal & 32767; + mapIndex = pixVal & 0x7FFF; goto l1; } if (5 == 8) { - mapIndex = pixVal & 16777215; + mapIndex = pixVal & 0xFFFFFF; goto l1; } mapIndex = pixVal; @@ -4699,11 +4699,11 @@ } else { if (d1 == 0) { if (8 == 5) { - mapIndex = pixVal & 32767; + mapIndex = pixVal & 0x7FFF; goto l2; } if (8 == 8) { - mapIndex = pixVal & 16777215; + mapIndex = pixVal & 0xFFFFFF; goto l2; } mapIndex = pixVal; @@ -5270,14 +5270,14 @@ /* Already in RGB format */ if (sourceDepth == 16) { - rgb = (((rgb & 31) << 3) | ((rgb & 992) << 6)) | ((rgb & 31744) << 9); @@ Diff output truncated at 50000 characters. @@

1 0

VM Maker: VMMaker-dtl.355.mcz
by commits＠source.squeak.org 26 Nov '14

26 Nov '14

David T. Lewis uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker-dtl.355.mcz ==================== Summary ==================== Name: VMMaker-dtl.355 Author: dtl Time: 25 November 2014, 7:59:15.571 pm UUID: 9e6e08b4-e8f0-44b0-803c-de1559fbcb27 Ancestors: VMMaker-dtl.354 VMMaker 4.13.8 Complete the adoption of oscog improvements that eliminate use of #asSymbol hacks, and that produce correct code generation for #sizeOf: and #flag: methods. Also includes generation of constants in hex format, which improves readability of generated code. Add SlangTest>>testLiteralName to verify translation of sizeOf: #Foo as sizeOf(Foo) rather than sizeOf("Foo"). =============== Diff against VMMaker-dtl.354 =============== Item was changed: Object subclass: #CCodeGenerator + instanceVariableNames: 'translationDict inlineList constants variables variableDeclarations scopeStack methods macros preparedMethodList variablesSetCache headerFiles globalVariableUsage useSymbolicConstants generateDeadCode doNotRemoveMethodList asArgumentTranslationDict receiverDict vmClass currentMethod logger declareMethodsStatic permitMethodPruning pools abstractDeclarations uncheckedAbstractMethods selectorTranslations breakSrcInlineSelector breakDestInlineSelector' - instanceVariableNames: 'translationDict inlineList constants variables variableDeclarations scopeStack methods macros preparedMethodList variablesSetCache headerFiles globalVariableUsage useSymbolicConstants generateDeadCode doNotRemoveMethodList asArgumentTranslationDict receiverDict vmClass currentMethod logger declareMethodsStatic permitMethodPruning pools abstractDeclarations uncheckedAbstractMethods breakSrcInlineSelector breakDestInlineSelector' classVariableNames: 'UseRightShiftForDivide' poolDictionaries: '' category: 'VMMaker-Translation to C'! !CCodeGenerator commentStamp: 'tpr 5/2/2003 14:30' prior: 0! This class oversees the translation of a subset of Smalltalk to C, allowing the comforts of Smalltalk during development and the efficiency and portability of C for the resulting interpreter. See VMMaker for more useful info! Item was added: + ----- Method: CCodeGenerator>>addSelectorTranslation:to: (in category 'public') ----- + addSelectorTranslation: aSelector to: aString + selectorTranslations at: aSelector asSymbol put: aString! Item was changed: ----- Method: CCodeGenerator>>cFunctionNameFor: (in category 'C code generator') ----- cFunctionNameFor: aSelector + "Create a C function name from the given selector by finding + a specific translation, or if none, simply omitting colons." + ^selectorTranslations at: aSelector ifAbsent: [aSelector copyWithout: $:]! - "Create a C function name from the given selector by omitting colons - and prefixing with the plugin name if the method is exported." - ^aSelector copyWithout: $:! Item was changed: ----- Method: CCodeGenerator>>cLiteralFor: (in category 'C code generator') ----- cLiteralFor: anObject "Return a string representing the C literal value for the given object." + anObject isNumber + ifTrue: + [anObject isInteger ifTrue: + [| printString | + printString := (anObject > 0 + and: [(anObject >> anObject lowBit + 1) isPowerOfTwo + and: [(anObject highBit = anObject lowBit and: [anObject > 65536]) + or: [anObject highBit - anObject lowBit >= 4]]]) + ifTrue: ['0x', (anObject printStringBase: 16)] + ifFalse: [anObject printString]. + ^anObject > 16rFFFFFFFF + ifTrue: [printString, ObjectMemory unsignedLongLongSuffix] + ifFalse: [anObject < 16r7FFFFFFF + ifTrue: [printString] + ifFalse: [printString, ObjectMemory unsignedIntegerSuffix]]]. + anObject isFloat ifTrue: + [^anObject printString]] + ifFalse: + [anObject isSymbol ifTrue: + [^self cFunctionNameFor: anObject]. + anObject isString ifTrue: + [^'"', (anObject copyReplaceAll: (String with: Character cr) with: '\n') , '"']. + anObject == nil ifTrue: [^ 'null' ]. + anObject == true ifTrue: [^ '1' ]. + anObject == false ifTrue: [^ '0' ]. + anObject isCharacter ifTrue: + [^anObject == $' + ifTrue: ['''\'''''] "i.e. '\''" + ifFalse: [anObject asString printString]]]. + self error: 'Warning: A Smalltalk literal could not be translated into a C constant: ', anObject printString. - (anObject isKindOf: Integer) ifTrue: [ - (anObject < 16r7FFFFFFF) - ifTrue: [^ anObject printString] - ifFalse: [^ anObject printString , ObjectMemory unsignedIntegerSuffix "ikp"]]. - (anObject isKindOf: String) ifTrue: [^ '"', anObject, '"' ]. - (anObject isKindOf: Float) ifTrue: [^ anObject printString ]. - anObject == nil ifTrue: [^ 'null' ]. - anObject == true ifTrue: [^ '1' ]. "ikp" - anObject == false ifTrue: [^ '0' ]. "ikp" - (anObject isKindOf: Character) ifTrue:[^anObject asString printString]. "ar" - self error: "ikp" - 'Warning: A Smalltalk literal could not be translated into a C constant: ', anObject printString. ^'"XXX UNTRANSLATABLE CONSTANT XXX"'! Item was added: + ----- Method: CCodeGenerator>>cLiteralFor:name: (in category 'C code generator') ----- + cLiteralFor: anObject name: smalltalkName + "Return a string representing the C literal value for the given object. + This version may use hex for integers that are bit masks." + anObject isInteger ifTrue: + [| hex dec rep | + hex := anObject printStringBase: 16. + dec := anObject printStringBase: 10. + rep := ((smalltalkName endsWith: 'Mask') + or: [anObject digitLength > 1 + and: [(hex asSet size * 3) <= (dec asSet size * 2) + and: [(smalltalkName endsWith: 'Size') not]]]) + ifTrue: [hex first = $- ifTrue: ['-0x', hex allButFirst] ifFalse: ['0x', hex]] + ifFalse: [dec]. + ^anObject > 16rFFFFFFFF + ifTrue: [rep, ObjectMemory unsignedLongLongSuffix] + ifFalse: [anObject < 16r7FFFFFFF + ifTrue: [rep] + ifFalse: [rep, ObjectMemory unsignedIntegerSuffix]]]. + ^self cLiteralFor: anObject! Item was added: + ----- Method: CCodeGenerator>>generateFlag:on:indent: (in category 'C translation') ----- + generateFlag: msgNode on: aStream indent: level + "Compoensate for the use of self flag: #aSymbol. We used to translate symbols + as strings unless they were quoted via #aSymbol asSymbol. But this is too tedious, + so we now translate symbols directly. The only use that this affected was in + self flag: #aSymbol, + so hard-code it to produce a string value. Note that this isn't strictly necessary + because there's a + #define flag(foo) 0 + in C land, but it makes the generated C less dissonant." + + aStream + nextPutAll: 'flag('; + nextPutAll: (self cLiteralFor: msgNode args last value asString); + nextPut: $)! Item was changed: ----- Method: CCodeGenerator>>initialize (in category 'public') ----- initialize translationDict := Dictionary new. inlineList := Array new. constants := Dictionary new: 100. variables := OrderedCollection new: 100. variableDeclarations := Dictionary new: 100. methods := Dictionary new: 500. macros := Dictionary new. self initializeCTranslationDictionary. receiverDict := Dictionary new. headerFiles := OrderedCollection new. globalVariableUsage := Dictionary new. useSymbolicConstants := true. generateDeadCode := true. scopeStack := OrderedCollection new. logger := (ProvideAnswerNotification new tag: #logger; signal) ifNil: [Transcript]. pools := IdentitySet new. abstractDeclarations := IdentitySet new. uncheckedAbstractMethods := OrderedCollection new. + selectorTranslations := IdentityDictionary new.! - ! 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: #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 #generateBitInvert32:on:indent: #bitClear: #generateBitClear: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: #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: #preprocessorExpression: #generateInlineCppDirective:on:indent: #isDefined:inSmalltalk:comment:ifTrue: #generateInlineCppIfDef:on:indent: #isDefined:inSmalltalk:comment:ifTrue:ifFalse: #generateInlineCppIfDefElse:on:indent: #isDefinedTrueExpression:inSmalltalk:comment:ifTrue:ifFalse: #generateInlineCppIfElse:on:indent: #cCoerce:to: #generateCCoercion:on:indent: #cCoerceSimple:to: #generateCCoercion:on:indent: #addressOf: #generateAddressOf: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: #asSymbol #generateAsSymbol:on:indent: + #flag: #generateFlag:on:indent: #anyMask: #generateBitAnd:on:indent: #raisedTo: #generateRaisedTo:on:indent: #touch: #generateTouch:on:indent: #bytesPerWord #generateBytesPerWord:on:indent: #baseHeaderSize #generateBaseHeaderSize: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: #shouldNotImplement #generateSmalltalkMetaError:on:indent: #shouldBeImplemented #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: #cCode: #generateInlineCCodeAsArgument:on:indent: #cCode:inSmalltalk: #generateInlineCCodeAsArgument: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: ObjectMemory class>>unsignedLongLongSuffix (in category 'translation') ----- + unsignedLongLongSuffix + "Answer the suffix that should be appended to unsigned integer literals in generated code." + + ^'ULL'! Item was added: + ----- Method: SlangTest>>testLiteralName (in category 'testing variable declaration') ----- + testLiteralName + "sizeOf: #Foo should translated to C function call sizeof(Foo), where Foo is a literal, not a string" + + | stssi s | + stssi := SlangTestSupportInterpreter inline: false. + s := stssi asCString: #sizeOfFoo . + self assert: (s includesSubString: 'sizeOf(Foo)'). + self deny: (s includesSubString: 'sizeOf("Foo")'). + + ! Item was added: + ----- Method: SlangTestSupportInterpreter>>sizeOfFoo (in category 'local and instance vars') ----- + sizeOfFoo + ^ self sizeOf: #Foo! Item was changed: ----- Method: TConstantNode>>printOn:level: (in category 'printing') ----- printOn: aStream level: level + value isSymbol + ifTrue: [aStream nextPutAll: (value copyWithout: $:)] + ifFalse: [value storeOn: aStream]! - - value storeOn: aStream.! Item was changed: + ----- Method: TParseNode>>allCalls (in category 'utilities') ----- - ----- Method: TParseNode>>allCalls (in category 'as yet unclassified') ----- allCalls "Answer a collection of selectors for the messages sent in this parse tree." | calls | + calls := Set new: 32. + self nodesDo: + [:node| + node isSend ifTrue: + [calls add: node selector]. + (node isConstant and: [node value isSymbol]) ifTrue: + [calls add: node value]]. - calls := Set new: 100. - self nodesDo: [ :node | - node isSend ifTrue: [ calls add: node selector ]. - ]. ^calls! Item was changed: ----- Method: VMMaker class>>versionString (in category 'version testing') ----- versionString "VMMaker versionString" + ^'4.13.8'! - ^'4.13.7'!

1 0

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