Vm-dev January 2014

vm-dev@lists.squeakfoundation.org

28 participants
97 discussions

Re: [Vm-dev] VM Maker: VMMaker-tpr.335.mcz
by Nicolas Cellier 07 Jan '14

07 Jan '14

? so the goal was not to limit dx2 and dy2 in interval [-2.0,2.0] ? 2014/1/5 <commits(a)source.squeak.org> > > tim Rowledge uploaded a new version of VMMaker to project VM Maker: > http://source.squeak.org/VMMaker/VMMaker-tpr.335.mcz > > ==================== Summary ==================== > > Name: VMMaker-tpr.335 > Author: tpr > Time: 4 January 2014, 5:11:00.292 pm > UUID: d8a65973-094c-419c-857d-ab70497a0c86 > Ancestors: VMMaker-dtl.334 > > fix typo bug in ScratchPlugin>primitiveWaterRipples1 > > =============== Diff against VMMaker-dtl.334 =============== > > Item was changed: > ----- Method: ScratchPlugin>>primitiveWaterRipples1 (in category 'other > filters') ----- > primitiveWaterRipples1 > > | in out aArray bArray ripply temp pix dx dy dist inOop outOop > width allPix aArOop bArOop height t1 blops x y power val val2 dx2 dy2 > newLoc | > <export: true> > <var: 'in' declareC: 'unsigned int *in'> > <var: 'out' declareC: 'unsigned int *out'> > <var: 'aArray' declareC: 'double *aArray'> > <var: 'bArray' declareC: 'double *bArray'> > <var: 'ripply' declareC: 'int ripply'> > <var: 'temp' declareC: 'double temp'> > <var: 'pix' declareC: 'unsigned int pix'> > <var: 'dist' declareC: 'double dist'> > <var: 'dx2' declareC: 'double dx2'> > <var: 'dy2' declareC: 'double dy2'> > > inOop := interpreterProxy stackValue: 5. > outOop := interpreterProxy stackValue: 4. > width := interpreterProxy stackIntegerValue: 3. > in := self checkedUnsignedIntPtrOf: inOop. > out := self checkedUnsignedIntPtrOf: outOop. > allPix := interpreterProxy stSizeOf: inOop. > ripply := interpreterProxy stackIntegerValue: 2. > aArOop := interpreterProxy stackValue: 1. > bArOop := interpreterProxy stackValue: 0. > aArray := self checkedFloatPtrOf: aArOop. > bArray := self checkedFloatPtrOf: bArOop. > interpreterProxy success: ((interpreterProxy stSizeOf: outOop) = > allPix). > interpreterProxy failed ifTrue: [^ nil]. > > height := allPix // width. > > t1 := self cCode: 'rand()'. > blops := t1 \\ ripply -1. > 0 to: blops /2-1 do: [:t | > t1 := self cCode: 'rand()'. > x := t1 \\ width. > t1 := self cCode: 'rand()'. > y := t1 \\ height. > t1 := self cCode: 'rand()'. > power := t1 \\ 8. > -4 to: 4 do: [:g | > -4 to: 4 do: [:h | > dist := ((g*g) + (h*h)) asFloat. > ((dist < 25) and: [dist > 0]) ifTrue: [ > dx := (x + g) asInteger. > dy := (y + h) asInteger. > ((dx >0) and: [(dy>0) and: > [(dy < height) and: [dx < width]]]) ifTrue: [ > aArray at: > ((dy)*width + dx) put: (power *(1.0 asFloat -(dist/(25.0 asFloat))) > asFloat). > ]. > ]. > ]. > ]. > ]. > > 1 to: width -2 do: [:f | > 1 to: height -2 do: [:d | > val := (d)*width + f. > aArray at: val put: ((( > (bArray at: (val+1)) + (bArray at: > (val-1)) + (bArray at: (val + width)) + (bArray at: (val - width)) + > ((bArray at: (val -1 -width))/2) + > ((bArray at: (val-1+width))/2) + ((bArray at: (val+1-width))/2) + ((bArray > at: (val+1+width))/2)) /4) - (aArray at: (val))). > aArray at: (val) put: ((aArray at: (val))*(0.9 > asFloat)). > ]. > ]. > > "temp := bArray. > bArray := aArray. > aArray := temp." > 0 to: width*height do: [:q | > temp := bArray at: q. > bArray at: q put: (aArray at: q). > aArray at: q put: temp. > ]. > > 0 to: height-1 do: [:j | > 0 to: width-1 do: [:i | > ((i > 1) and: [(i<(width-1)) and: [(j>1) > and: [(j<(height-1))]]]) ifTrue: [ > val2 := (j)*width + i. > dx2 := ((((aArray at: (val2)) - > (aArray at: (val2-1))) + ((aArray at: (val2+1)) - (aArray at: (val2)))) > *64) asFloat. > dy2 := ((((aArray at: (val2)) - > (aArray at: (val2-width))) + ((aArray at: (val2+width)) - (aArray at: > (val2)))) /64) asFloat. > + (dx2<2) ifTrue: [dx2 := -2]. > - (dx2<-2) ifTrue: [dx2 := -2]. > (dx2>2) ifTrue: [dx2 := 2]. > + (dy2<2) ifTrue: [dy2 := -2]. > - (dy2<-2) ifTrue: [dy2 := -2]. > (dy2>2) ifTrue: [dy2 := 2]. > newLoc := ((j+dy2)*width + > (i+dx2)) asInteger. > ((newLoc < (width*height)) and: > [newLoc >=0]) ifTrue: [ > pix := in at: newLoc] > ifFalse: [ > pix := in at: (i > +(j*width)) ]. > ] > ifFalse: [ > pix := in at: (i +(j*width)) ]. > out at: (i + (j*width)) put: pix. > ]]. > > interpreterProxy pop: 6. "pop args, leave rcvr on stack" > ^ 0 > ! > >

4 4

VM Maker: VMMaker.oscog-eem.579.mcz
by commits＠source.squeak.org 07 Jan '14

07 Jan '14

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.579.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.579 Author: eem Time: 6 January 2014, 6:40:53.647 pm UUID: 77657577-de3f-4064-ab8e-652f89a84d73 Ancestors: VMMaker.oscog-eem.577 Commit the correct fix for primitiveWaterRipples1, which is simply to add a space to <-2 to < -2, to avoid ambiguity. =============== Diff against VMMaker.oscog-eem.577 =============== Item was changed: ----- Method: ScratchPlugin>>primitiveWaterRipples1 (in category 'other filters') ----- primitiveWaterRipples1 | in out aArray bArray ripply temp pix dx dy dist inOop outOop width allPix aArOop bArOop height t1 blops x y power val val2 dx2 dy2 newLoc | <export: true> <var: 'in' declareC: 'unsigned int *in'> <var: 'out' declareC: 'unsigned int *out'> <var: 'aArray' declareC: 'double *aArray'> <var: 'bArray' declareC: 'double *bArray'> <var: 'ripply' declareC: 'int ripply'> <var: 'temp' declareC: 'double temp'> <var: 'pix' declareC: 'unsigned int pix'> <var: 'dist' declareC: 'double dist'> <var: 'dx2' declareC: 'double dx2'> <var: 'dy2' declareC: 'double dy2'> inOop := interpreterProxy stackValue: 5. outOop := interpreterProxy stackValue: 4. width := interpreterProxy stackIntegerValue: 3. in := self checkedUnsignedIntPtrOf: inOop. out := self checkedUnsignedIntPtrOf: outOop. allPix := interpreterProxy stSizeOf: inOop. ripply := interpreterProxy stackIntegerValue: 2. aArOop := interpreterProxy stackValue: 1. bArOop := interpreterProxy stackValue: 0. aArray := self checkedFloatPtrOf: aArOop. bArray := self checkedFloatPtrOf: bArOop. interpreterProxy success: ((interpreterProxy stSizeOf: outOop) = allPix). interpreterProxy failed ifTrue: [^ nil]. height := allPix // width. t1 := self cCode: 'rand()'. blops := t1 \\ ripply -1. 0 to: blops /2-1 do: [:t | t1 := self cCode: 'rand()'. x := t1 \\ width. t1 := self cCode: 'rand()'. y := t1 \\ height. t1 := self cCode: 'rand()'. power := t1 \\ 8. -4 to: 4 do: [:g | -4 to: 4 do: [:h | dist := ((g*g) + (h*h)) asFloat. ((dist < 25) and: [dist > 0]) ifTrue: [ dx := (x + g) asInteger. dy := (y + h) asInteger. ((dx >0) and: [(dy>0) and: [(dy < height) and: [dx < width]]]) ifTrue: [ aArray at: ((dy)*width + dx) put: (power *(1.0 asFloat -(dist/(25.0 asFloat))) asFloat). ]. ]. ]. ]. ]. 1 to: width -2 do: [:f | 1 to: height -2 do: [:d | val := (d)*width + f. aArray at: val put: ((( (bArray at: (val+1)) + (bArray at: (val-1)) + (bArray at: (val + width)) + (bArray at: (val - width)) + ((bArray at: (val -1 -width))/2) + ((bArray at: (val-1+width))/2) + ((bArray at: (val+1-width))/2) + ((bArray at: (val+1+width))/2)) /4) - (aArray at: (val))). aArray at: (val) put: ((aArray at: (val))*(0.9 asFloat)). ]. ]. "temp := bArray. bArray := aArray. aArray := temp." 0 to: width*height do: [:q | temp := bArray at: q. bArray at: q put: (aArray at: q). aArray at: q put: temp. ]. 0 to: height-1 do: [:j | 0 to: width-1 do: [:i | ((i > 1) and: [(i<(width-1)) and: [(j>1) and: [(j<(height-1))]]]) ifTrue: [ val2 := (j)*width + i. dx2 := ((((aArray at: (val2)) - (aArray at: (val2-1))) + ((aArray at: (val2+1)) - (aArray at: (val2)))) *64) asFloat. dy2 := ((((aArray at: (val2)) - (aArray at: (val2-width))) + ((aArray at: (val2+width)) - (aArray at: (val2)))) /64) asFloat. + (dx2 < -2) ifTrue: [dx2 := -2]. + (dx2 > 2) ifTrue: [dx2 := 2]. + (dy2 < -2) ifTrue: [dy2 := -2]. + (dy2 > 2) ifTrue: [dy2 := 2]. - (dx2<-2) ifTrue: [dx2 := -2]. - (dx2>2) ifTrue: [dx2 := 2]. - (dy2<-2) ifTrue: [dy2 := -2]. - (dy2>2) ifTrue: [dy2 := 2]. newLoc := ((j+dy2)*width + (i+dx2)) asInteger. ((newLoc < (width*height)) and: [newLoc >=0]) ifTrue: [ pix := in at: newLoc] ifFalse: [ pix := in at: (i +(j*width)) ]. ] ifFalse: [ pix := in at: (i +(j*width)) ]. out at: (i + (j*width)) put: pix. ]]. interpreterProxy pop: 6. "pop args, leave rcvr on stack" ^ 0 !

1 0

VM Maker: VMMaker.oscog-eem.578.mcz
by commits＠source.squeak.org 07 Jan '14

07 Jan '14

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.578.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.578 Author: eem Time: 6 January 2014, 6:32:56.636 pm UUID: 11de99f6-118f-4f47-ab2b-b5c029f0045d Ancestors: VMMaker.oscog-eem.577 Merge VMMaker-tpr.335: fix typo bug in ScratchPlugin>primitiveWaterRipples1 =============== Diff against VMMaker.oscog-eem.577 =============== Item was changed: ----- Method: ScratchPlugin>>primitiveWaterRipples1 (in category 'other filters') ----- primitiveWaterRipples1 | in out aArray bArray ripply temp pix dx dy dist inOop outOop width allPix aArOop bArOop height t1 blops x y power val val2 dx2 dy2 newLoc | <export: true> <var: 'in' declareC: 'unsigned int *in'> <var: 'out' declareC: 'unsigned int *out'> <var: 'aArray' declareC: 'double *aArray'> <var: 'bArray' declareC: 'double *bArray'> <var: 'ripply' declareC: 'int ripply'> <var: 'temp' declareC: 'double temp'> <var: 'pix' declareC: 'unsigned int pix'> <var: 'dist' declareC: 'double dist'> <var: 'dx2' declareC: 'double dx2'> <var: 'dy2' declareC: 'double dy2'> inOop := interpreterProxy stackValue: 5. outOop := interpreterProxy stackValue: 4. width := interpreterProxy stackIntegerValue: 3. in := self checkedUnsignedIntPtrOf: inOop. out := self checkedUnsignedIntPtrOf: outOop. allPix := interpreterProxy stSizeOf: inOop. ripply := interpreterProxy stackIntegerValue: 2. aArOop := interpreterProxy stackValue: 1. bArOop := interpreterProxy stackValue: 0. aArray := self checkedFloatPtrOf: aArOop. bArray := self checkedFloatPtrOf: bArOop. interpreterProxy success: ((interpreterProxy stSizeOf: outOop) = allPix). interpreterProxy failed ifTrue: [^ nil]. height := allPix // width. t1 := self cCode: 'rand()'. blops := t1 \\ ripply -1. 0 to: blops /2-1 do: [:t | t1 := self cCode: 'rand()'. x := t1 \\ width. t1 := self cCode: 'rand()'. y := t1 \\ height. t1 := self cCode: 'rand()'. power := t1 \\ 8. -4 to: 4 do: [:g | -4 to: 4 do: [:h | dist := ((g*g) + (h*h)) asFloat. ((dist < 25) and: [dist > 0]) ifTrue: [ dx := (x + g) asInteger. dy := (y + h) asInteger. ((dx >0) and: [(dy>0) and: [(dy < height) and: [dx < width]]]) ifTrue: [ aArray at: ((dy)*width + dx) put: (power *(1.0 asFloat -(dist/(25.0 asFloat))) asFloat). ]. ]. ]. ]. ]. 1 to: width -2 do: [:f | 1 to: height -2 do: [:d | val := (d)*width + f. aArray at: val put: ((( (bArray at: (val+1)) + (bArray at: (val-1)) + (bArray at: (val + width)) + (bArray at: (val - width)) + ((bArray at: (val -1 -width))/2) + ((bArray at: (val-1+width))/2) + ((bArray at: (val+1-width))/2) + ((bArray at: (val+1+width))/2)) /4) - (aArray at: (val))). aArray at: (val) put: ((aArray at: (val))*(0.9 asFloat)). ]. ]. "temp := bArray. bArray := aArray. aArray := temp." 0 to: width*height do: [:q | temp := bArray at: q. bArray at: q put: (aArray at: q). aArray at: q put: temp. ]. 0 to: height-1 do: [:j | 0 to: width-1 do: [:i | ((i > 1) and: [(i<(width-1)) and: [(j>1) and: [(j<(height-1))]]]) ifTrue: [ val2 := (j)*width + i. dx2 := ((((aArray at: (val2)) - (aArray at: (val2-1))) + ((aArray at: (val2+1)) - (aArray at: (val2)))) *64) asFloat. dy2 := ((((aArray at: (val2)) - (aArray at: (val2-width))) + ((aArray at: (val2+width)) - (aArray at: (val2)))) /64) asFloat. + (dx2<2) ifTrue: [dx2 := -2]. - (dx2<-2) ifTrue: [dx2 := -2]. (dx2>2) ifTrue: [dx2 := 2]. + (dy2<2) ifTrue: [dy2 := -2]. - (dy2<-2) ifTrue: [dy2 := -2]. (dy2>2) ifTrue: [dy2 := 2]. newLoc := ((j+dy2)*width + (i+dx2)) asInteger. ((newLoc < (width*height)) and: [newLoc >=0]) ifTrue: [ pix := in at: newLoc] ifFalse: [ pix := in at: (i +(j*width)) ]. ] ifFalse: [ pix := in at: (i +(j*width)) ]. out at: (i + (j*width)) put: pix. ]]. interpreterProxy pop: 6. "pop args, leave rcvr on stack" ^ 0 !

1 0

Re: [Pharo-dev] Can we override == in Pharo ?
by Eliot Miranda 07 Jan '14

07 Jan '14

Hi Clement, On Mon, Jan 6, 2014 at 4:42 AM, Clément Bera <bera.clement(a)gmail.com> wrote: > So I tried and it worked. > > In Opal to remove the usage of #==, I removed it from the special selector > array in the method: > IRBytecodeGenerator class>>specialSelectorsArray > ^ #(#+ 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 nil 0 #blockCopy: 1 #value 0 #value: 1 #do: 1 > #new 0 #new: 1 #x 0 #y 0) > > Then I ran: > IRBytecodeGenerator initialize. > OpalCompiler recompileAll. > > Then in my example: > > A>>== > ^ true > > a := A new. > b := A new. > a == b answered true, so it worked. > > I don't like all these messages with no lookup. I don't even know if this > permits to earn performance now that we have inline caches. > Well, the arithmetic selectors *really* pay their way. Try your experiment with #+ through #~= and I bet you'll see slower loops. I think there's a compromise, which is to only inline the arithmetic selectors. That's what we did with the VisualWorks VM, HPS. There one can set a hidden flag in the image which directs the JIT (HPS only has a JIT) not to inline #== (VW does not inline #class), and change the flag with a primitive. We could (and I think should) do the same. Note that currently only #== and #class are inlined for all objects. The arithmetic selectors #+ et al and #< et al are only inlined by the JIT for SmallInteger, and executed without lookup in the interpreter for SmallInteger x Float. > @Frank Shearar > Just a detail, #timesRepeat: is not inlined any more by default in Pharo > 3.0 because there were conflicts with a stream library. Anyway it didn't > provide a lot of performance (just removed 1 indirection). > > > > > > > 2014/1/6 Frank Shearar <frank.shearar(a)gmail.com> > >> On 6 January 2014 11:11, Nicolai Hess <nicolaihess(a)web.de> wrote: >> > 2014/1/6 Clément Bera <bera.clement(a)gmail.com> >> >> >> >> Hello, >> >> >> >> here I have a class >> >> >> >> A>>== >> >> ^ true >> >> >> >> Now: >> >> a := A new. >> >> b := A new. >> >> a == b "Answers false" >> >> a perform: #== with: b "Answers true" >> >> >> >> Do I have to remove the usage of the byte code for #== in the compiler >> to >> >> be able to override == ? >> >> >> >> >> > >> > >> > No, a==b should be used for "are the same Objects" (pointing to the same >> > object) and not "are equal". >> > Look for example at the commentn for ProtoObject>>== >> >> Given the kinds of things Clément does, I suspect he knows full well >> the difference between #== and #=. >> >> My understanding is that the compiler inlines #== sends like it does >> with #timesRepeat: and ifTrue:ifFalse:. So yes, you'd need to fiddle >> with the compiler for any #== overrides to actually run. >> >> (I'm keen for Marcus to show us how exactly to do that in Opal!) >> >> frank >> >> > Nicolai >> >> > -- best, Eliot

1 0

VM Maker: VMMaker.oscog-eem.577.mcz
by commits＠source.squeak.org 06 Jan '14

06 Jan '14

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.577.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.577 Author: eem Time: 6 January 2014, 1:53:51.172 pm UUID: 8788f091-6817-480e-9bda-13ae360eeeb7 Ancestors: VMMaker.oscog-eem.576 Clean-up accessorDepth code for SqueakV3 VMs. Don't include accessor depth in SqueakV3 vm's named primitives. Do a better job of dead code removal with and: and or: chains. Don't generate primitiveAccessorDepthTable in SqueakV3 VMs. Copy the hasSpurMemoryManagerAPI methods to the class-side. =============== Diff against VMMaker.oscog-eem.576 =============== Item was changed: ----- Method: CCodeGenerator>>emitExportsNamed:pluginName:on: (in category 'C code generator') ----- emitExportsNamed: exportsNamePrefix pluginName: pluginName on: aStream "Store all the exported primitives in the form used by the internal named prim system." + | nilVMClass excludeDepth | - | nilVMClass | (nilVMClass := vmClass isNil) ifTrue: [vmClass := StackInterpreter]. + "Don't include the depth in the vm's named primitives if the vm is non-Spur." + excludeDepth := exportsNamePrefix = 'vm' + and: [pluginName isEmpty + and: [vmClass objectMemoryClass hasSpurMemoryManagerAPI not]]. aStream cr; cr; nextPutAll: 'void* '; nextPutAll: exportsNamePrefix; nextPutAll: '_exports[][3] = {'. (self sortStrings: self exportedPrimitiveNames) do: [:primName| + aStream cr; tab; + nextPutAll: '{"'; - aStream cr; - nextPutAll:' {"'; nextPutAll: pluginName; nextPutAll: '", "'; nextPutAll: primName. + excludeDepth ifFalse: + [(self accessorDepthForSelector: primName asSymbol) ifNotNil: + [:depth| "store the accessor depth in a hidden byte immediately after the primName" + self assert: depth < 128. + aStream + nextPutAll: '\000\'; + nextPutAll: ((depth bitAnd: 255) printStringBase: 8 nDigits: 3)]]. - (self accessorDepthForSelector: primName asSymbol) ifNotNil: - [:depth| "store the accessor depth in a hidden byte immediately after the primName" - self assert: depth < 128. - aStream - nextPutAll: '\000\'; - nextPutAll: ((depth bitAnd: 255) printStringBase: 8 nDigits: 3)]. aStream + nextPutAll: '", (void*)'; - nextPutAll:'", (void*)'; nextPutAll: primName; + nextPutAll: '},']. + aStream cr; tab; nextPutAll: '{NULL, NULL, NULL}'; cr; nextPutAll: '};'; cr. - nextPutAll:'},']. - aStream cr; tab; nextPutAll:'{NULL, NULL, NULL}'; cr; nextPutAll: '};'; cr. nilVMClass ifTrue: [vmClass := nil]! Item was changed: ----- Method: CCodeGenerator>>nilOrBooleanConstantReceiverOf: (in category 'utilities') ----- nilOrBooleanConstantReceiverOf: aNode "Answer nil or the boolean constant that is the receiver of the given message send. Used to suppress conditional code when the condition is a translation-time constant." | val receiver argument | generateDeadCode ifTrue:[^nil]. ((self isConstantNode: aNode valueInto: [:v| val := v]) and: [#(true false) includes: val]) ifTrue: [^val]. aNode isSend ifTrue: [((#(or: and:) includes: aNode selector) and: [aNode args last isStmtList and: [aNode args last statements size = 1]]) ifTrue: [(self nilOrBooleanConstantReceiverOf: aNode receiver) ifNotNil: [:rcvr| + ((rcvr == false and: [aNode selector == #and:]) + or: [rcvr == true and: [aNode selector == #or:]]) ifTrue: + [^rcvr]. (self nilOrBooleanConstantReceiverOf: aNode args last statements first) ifNotNil: [:arg| ^rcvr perform: aNode selector with: [arg]]]]. ((#(= ~= < > <= >=) includes: aNode selector) and: [(self isConstantNode: aNode receiver valueInto: [:v| receiver := v]) and: [receiver isInteger and: [(self isConstantNode: aNode args first valueInto: [:v| argument := v]) and: [argument isInteger]]]]) ifTrue: [^receiver perform: aNode selector with: argument]]. ^nil! Item was added: + ----- Method: ObjectMemory class>>hasSpurMemoryManagerAPI (in category 'api chacterization') ----- + hasSpurMemoryManagerAPI + ^false! Item was added: + ----- Method: SpurMemoryManager class>>hasSpurMemoryManagerAPI (in category 'api characterization') ----- + hasSpurMemoryManagerAPI + ^true! Item was changed: ----- Method: StackInterpreter class>>declareCVarsIn: (in category 'translation') ----- declareCVarsIn: aCCodeGenerator self class == thisContext methodClass ifFalse: [^self]. "Don't duplicate decls in subclasses" aCCodeGenerator addHeaderFile:'<stddef.h> /* for e.g. alloca */'; addHeaderFile:'<setjmp.h>'; addHeaderFile:'"vmCallback.h"'; addHeaderFile:'"sqMemoryFence.h"'; addHeaderFile:'"dispdbg.h"'. self declareInterpreterVersionIn: aCCodeGenerator defaultName: 'Stack'. aCCodeGenerator var: #interpreterProxy type: #'struct VirtualMachine*'. aCCodeGenerator declareVar: #sendTrace type: 'volatile int'; declareVar: #byteCount type: 'unsigned long'. "These need to be pointers or unsigned." self declareC: #(instructionPointer method newMethod) as: #usqInt in: aCCodeGenerator. "These are all pointers; char * because Slang has no support for C pointer arithmetic." self declareC: #(localIP localSP localFP stackPointer framePointer stackLimit stackMemory) as: #'char *' in: aCCodeGenerator. self declareC: #(stackPage overflowedPage) as: #'StackPage *' in: aCCodeGenerator. aCCodeGenerator removeVariable: 'stackPages'. "this is an implicit receiver in the translated code." "This defines bytecodeSetSelector as 0 if MULTIPLEBYTECODESETS is not defined, for the benefit of the interpreter on slow machines." aCCodeGenerator addConstantForBinding: (self bindingOf: #MULTIPLEBYTECODESETS). MULTIPLEBYTECODESETS == false ifTrue: [aCCodeGenerator removeVariable: 'extA'; removeVariable: 'extB'; removeVariable: 'bytecodeSetSelector']. aCCodeGenerator var: #methodCache declareC: 'long methodCache[MethodCacheSize + 1 /* ', (MethodCacheSize + 1) printString, ' */]'. aCCodeGenerator var: #atCache declareC: 'sqInt atCache[AtCacheTotalSize + 1 /* ', (AtCacheTotalSize + 1) printString, ' */]'. aCCodeGenerator var: #primitiveTable declareC: 'void (*primitiveTable[MaxPrimitiveIndex + 2 /* ', (MaxPrimitiveIndex + 2) printString, ' */])(void) = ', self primitiveTableString. self primitiveTable do: [:symbolOrNot| (symbolOrNot isSymbol and: [symbolOrNot ~~ #primitiveFail]) ifTrue: [(aCCodeGenerator methodNamed: symbolOrNot) ifNotNil: [:tMethod| tMethod returnType: #void]]]. + self objectMemoryClass hasSpurMemoryManagerAPI + ifTrue: + [aCCodeGenerator + var: #primitiveAccessorDepthTable + type: 'signed char' + sizeString: 'MaxPrimitiveIndex + 2 /* ', (MaxPrimitiveIndex + 2) printString, ' */' + array: self primitiveAccessorDepthTable] + ifFalse: + [aCCodeGenerator removeVariable: #primitiveAccessorDepthTable]. - self objectMemoryClass basicNew hasSpurMemoryManagerAPI ifTrue: - [aCCodeGenerator - var: #primitiveAccessorDepthTable - type: 'signed char' - sizeString: 'MaxPrimitiveIndex + 2 /* ', (MaxPrimitiveIndex + 2) printString, ' */' - array: self primitiveAccessorDepthTable]. aCCodeGenerator var: #primitiveFunctionPointer declareC: 'void (*primitiveFunctionPointer)()'. aCCodeGenerator var: #externalPrimitiveTable declareC: 'void (*externalPrimitiveTable[MaxExternalPrimitiveTableSize + 1 /* ', (MaxExternalPrimitiveTableSize + 1) printString, ' */])(void)'. aCCodeGenerator var: #showSurfaceFn type: #'void *'. aCCodeGenerator var: #jmpBuf declareC: 'jmp_buf jmpBuf[MaxJumpBuf + 1 /* ', (MaxJumpBuf + 1) printString, ' */]'. aCCodeGenerator var: #suspendedCallbacks declareC: 'usqInt suspendedCallbacks[MaxJumpBuf + 1 /* ', (MaxJumpBuf + 1) printString, ' */]'. aCCodeGenerator var: #suspendedMethods declareC: 'usqInt suspendedMethods[MaxJumpBuf + 1 /* ', (MaxJumpBuf + 1) printString, ' */]'. aCCodeGenerator var: #interruptCheckChain declareC: 'void (*interruptCheckChain)(void) = 0'. aCCodeGenerator var: #breakSelector type: #'char *'; var: #breakSelectorLength declareC: 'sqInt breakSelectorLength = -1'. self declareCAsUSqLong: #(nextPollUsecs nextWakeupUsecs longRunningPrimitiveGCUsecs longRunningPrimitiveStartUsecs longRunningPrimitiveStopUsecs) in: aCCodeGenerator. aCCodeGenerator var: #nextProfileTick type: #sqLong! Item was changed: ----- Method: StackInterpreter>>checkForAndFollowForwardedPrimitiveState (in category 'primitive support') ----- checkForAndFollowForwardedPrimitiveState "In Spur a primitive may fail due to encountering a forwarder. On failure check the accessorDepth for the primitive and if non-negative scan the args to the depth, following any + forwarders. Answer if any are found so the prim can be retried." + <option: #SpurObjectMemory> - forwarders. Answer if any are found so the prim can be retried.." | primIndex accessorDepth found | self assert: self successful not. found := false. primIndex := self primitiveIndexOf: newMethod. self assert: (self cCode: [primitiveFunctionPointer = (self functionPointerFor: primIndex inClass: objectMemory nilObject)] inSmalltalk: [((primitiveFunctionPointer isInteger and: [primitiveFunctionPointer >= 1000]) ifTrue: [#primitiveExternalCall] ifFalse: [primitiveFunctionPointer]) = (self functionPointerFor: primIndex inClass: objectMemory nilObject)]). self assert: argumentCount = (self argumentCountOf: newMethod). accessorDepth := (primIndex = 117 and: [primitiveFunctionPointer ~~ #primitiveExternalCall]) ifTrue: [self primitiveAccessorDepthForExternalPrimitiveMethod: newMethod] ifFalse: [primitiveAccessorDepthTable at: primIndex]. accessorDepth < 0 ifTrue: [^false]. 0 to: argumentCount do: [:index| | oop | oop := self stackValue: index. (objectMemory isNonImmediate: oop) ifTrue: [(objectMemory isForwarded: oop) ifTrue: [self assert: index < argumentCount. "receiver should have been caught at send time." found := true. oop := objectMemory followForwarded: oop. self stackValue: index put: oop]. ((objectMemory hasPointerFields: oop) and: [objectMemory followForwardedObjectFields: oop toDepth: accessorDepth]) ifTrue: [found := true]]]. ^found!

1 0

VM Maker: VMMaker.oscog-eem.576.mcz
by commits＠source.squeak.org 06 Jan '14

06 Jan '14

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.576.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.576 Author: eem Time: 6 January 2014, 11:00:08.082 am UUID: f4b652dc-67bc-4cf3-8b62-74bcbcbf01cd Ancestors: VMMaker.oscog-eem.575 Make primitive accessor depth code translatable. Rename var:type:array: to arrayInitializerCalled:for:sizeString:type:. Add the missing simulation code for primitive accessor depth to CogVMSimulator. =============== Diff against VMMaker.oscog-eem.575 =============== Item was added: + ----- Method: CCodeGenerator>>arrayInitializerCalled:for:sizeString:type: (in category 'utilities') ----- + arrayInitializerCalled: varName for: array sizeString: sizeStringOrNil type: cType + "array is a literal array or a CArray on some array." + | sequence lastLine | + sequence := array isCollection ifTrue: [array] ifFalse: [array object]. + lastLine := 0. + ^String streamContents: + [:s| + s nextPutAll: cType; + space; + nextPutAll: varName; + nextPut: $[. + sizeStringOrNil ifNotNil: [s nextPutAll: sizeStringOrNil]. + s nextPutAll: '] = '. + sequence isString + ifTrue: [s nextPutAll: (self cLiteralFor: sequence)] + ifFalse: + [s nextPut: ${; crtab: 2. + sequence + do: [:element| s nextPutAll: (self cLiteralFor: element)] + separatedBy: + [s nextPut: $,. + (s position - lastLine) > 76 + ifTrue: [s crtab: 2. lastLine := s position] + ifFalse: [s space]]. + s crtab; nextPut: $}]]! Item was removed: - ----- Method: CCodeGenerator>>arrayInitializerCalled:for:type: (in category 'utilities') ----- - arrayInitializerCalled: varName for: array type: cType - "array is a literal array or a CArray on some array." - | sequence lastLine | - sequence := array isCollection ifTrue: [array] ifFalse: [array object]. - lastLine := 0. - ^String streamContents: - [:s| - s nextPutAll: cType; - space; - nextPutAll: varName; - nextPutAll: '[] = '. - sequence isString - ifTrue: [s nextPutAll: (self cLiteralFor: sequence)] - ifFalse: - [s nextPut: ${; crtab: 2. - sequence - do: [:element| s nextPutAll: (self cLiteralFor: element)] - separatedBy: - [s nextPut: $,. - (s position - lastLine) > 76 - ifTrue: [s crtab: 2. lastLine := s position] - ifFalse: [s space]]. - s crtab; nextPut: $}]. - s cr]! Item was changed: ----- Method: CCodeGenerator>>var:type:array: (in category 'public') ----- var: varName type: cType array: array "Use this in preference to #var:declareC: when possible. This produces a C statment of the form int * fooArray[]={1,2,3} See also #var:type: for simple var decls" self var: varName + declareC: (self arrayInitializerCalled: varName for: array sizeString: nil type: cType)! - declareC: (self arrayInitializerCalled: varName for: array type: cType)! Item was added: + ----- Method: CCodeGenerator>>var:type:sizeString:array: (in category 'public') ----- + var: varName type: cType sizeString: sizeString array: array + "Use this in preference to #var:declareC: when possible. This produces a C + statment of the form + int * fooArray[3 /* Foo */]={1,2,3} + See also #var:type: for simple var decls" + self + var: varName + declareC: (self arrayInitializerCalled: varName for: array sizeString: sizeString type: cType)! Item was added: + ----- Method: CogVMSimulator>>ioLoadFunction:From:AccessorDepthInto: (in category 'plugin support') ----- + ioLoadFunction: functionString From: pluginString AccessorDepthInto: accessorDepthPtr + "Load and return the requested function from a module. + Assign the accessor depth through accessorDepthPtr. + N.B. The actual code lives in platforms/Cross/vm/sqNamedPrims.h" + | firstTime plugin fnSymbol | + firstTime := false. + fnSymbol := functionString asSymbol. + transcript + cr; + show: '(', byteCount printString, ') Looking for ', functionString, ' in ', + (pluginString isEmpty ifTrue:['vm'] ifFalse:[pluginString]). + functionString = breakSelector ifTrue: [self halt: breakSelector]. + plugin := pluginList + detect: [:any| any key = pluginString asString] + ifNone: + [firstTime := true. + self loadNewPlugin: pluginString]. + plugin ifNil: + [firstTime ifTrue: [transcript cr; show: 'Failed ... primitive not in plugin']. + ^0]. + plugin := plugin value. + mappedPluginEntries doWithIndex: + [:pluginAndName :index| + ((pluginAndName at: 1) == plugin + and:[(pluginAndName at: 2) == fnSymbol]) ifTrue: + [firstTime ifTrue: [transcript cr; show: ' ... okay']. + accessorDepthPtr at: 0 put: (pluginAndName at: 4). + ^index]]. + firstTime ifTrue: [transcript cr; show: 'Failed ... primitive not in plugin']. + ^0! Item was changed: ----- Method: StackInterpreter class>>declareCVarsIn: (in category 'translation') ----- declareCVarsIn: aCCodeGenerator self class == thisContext methodClass ifFalse: [^self]. "Don't duplicate decls in subclasses" aCCodeGenerator addHeaderFile:'<stddef.h> /* for e.g. alloca */'; addHeaderFile:'<setjmp.h>'; addHeaderFile:'"vmCallback.h"'; addHeaderFile:'"sqMemoryFence.h"'; addHeaderFile:'"dispdbg.h"'. self declareInterpreterVersionIn: aCCodeGenerator defaultName: 'Stack'. aCCodeGenerator var: #interpreterProxy type: #'struct VirtualMachine*'. aCCodeGenerator declareVar: #sendTrace type: 'volatile int'; declareVar: #byteCount type: 'unsigned long'. "These need to be pointers or unsigned." self declareC: #(instructionPointer method newMethod) as: #usqInt in: aCCodeGenerator. "These are all pointers; char * because Slang has no support for C pointer arithmetic." self declareC: #(localIP localSP localFP stackPointer framePointer stackLimit stackMemory) as: #'char *' in: aCCodeGenerator. self declareC: #(stackPage overflowedPage) as: #'StackPage *' in: aCCodeGenerator. aCCodeGenerator removeVariable: 'stackPages'. "this is an implicit receiver in the translated code." "This defines bytecodeSetSelector as 0 if MULTIPLEBYTECODESETS is not defined, for the benefit of the interpreter on slow machines." aCCodeGenerator addConstantForBinding: (self bindingOf: #MULTIPLEBYTECODESETS). MULTIPLEBYTECODESETS == false ifTrue: [aCCodeGenerator removeVariable: 'extA'; removeVariable: 'extB'; removeVariable: 'bytecodeSetSelector']. aCCodeGenerator var: #methodCache declareC: 'long methodCache[MethodCacheSize + 1 /* ', (MethodCacheSize + 1) printString, ' */]'. aCCodeGenerator var: #atCache declareC: 'sqInt atCache[AtCacheTotalSize + 1 /* ', (AtCacheTotalSize + 1) printString, ' */]'. aCCodeGenerator var: #primitiveTable + declareC: 'void (*primitiveTable[MaxPrimitiveIndex + 2 /* ', (MaxPrimitiveIndex + 2) printString, ' */])(void) = ', self primitiveTableString. - declareC: 'void (*primitiveTable[MaxPrimitiveIndex + 2 /* ', (MaxPrimitiveIndex +2) printString, ' */])(void) = ', self primitiveTableString. self primitiveTable do: [:symbolOrNot| (symbolOrNot isSymbol and: [symbolOrNot ~~ #primitiveFail]) ifTrue: [(aCCodeGenerator methodNamed: symbolOrNot) ifNotNil: [:tMethod| tMethod returnType: #void]]]. + self objectMemoryClass basicNew hasSpurMemoryManagerAPI ifTrue: + [aCCodeGenerator + var: #primitiveAccessorDepthTable + type: 'signed char' + sizeString: 'MaxPrimitiveIndex + 2 /* ', (MaxPrimitiveIndex + 2) printString, ' */' + array: self primitiveAccessorDepthTable]. aCCodeGenerator var: #primitiveFunctionPointer declareC: 'void (*primitiveFunctionPointer)()'. aCCodeGenerator var: #externalPrimitiveTable declareC: 'void (*externalPrimitiveTable[MaxExternalPrimitiveTableSize + 1 /* ', (MaxExternalPrimitiveTableSize + 1) printString, ' */])(void)'. aCCodeGenerator var: #showSurfaceFn type: #'void *'. aCCodeGenerator var: #jmpBuf declareC: 'jmp_buf jmpBuf[MaxJumpBuf + 1 /* ', (MaxJumpBuf + 1) printString, ' */]'. aCCodeGenerator var: #suspendedCallbacks declareC: 'usqInt suspendedCallbacks[MaxJumpBuf + 1 /* ', (MaxJumpBuf + 1) printString, ' */]'. aCCodeGenerator var: #suspendedMethods declareC: 'usqInt suspendedMethods[MaxJumpBuf + 1 /* ', (MaxJumpBuf + 1) printString, ' */]'. aCCodeGenerator var: #interruptCheckChain declareC: 'void (*interruptCheckChain)(void) = 0'. aCCodeGenerator var: #breakSelector type: #'char *'; var: #breakSelectorLength declareC: 'sqInt breakSelectorLength = -1'. self declareCAsUSqLong: #(nextPollUsecs nextWakeupUsecs longRunningPrimitiveGCUsecs longRunningPrimitiveStartUsecs longRunningPrimitiveStopUsecs) in: aCCodeGenerator. aCCodeGenerator var: #nextProfileTick type: #sqLong! Item was changed: ----- Method: TAssignmentNode>>emitLiteralArrayDeclarationOn:level:generator: (in category 'C code generation') ----- emitLiteralArrayDeclarationOn: aStream level: level generator: aCCodeGen | type | type := expression args last value. self assert: type last = $*. aStream crtab: level; nextPutAll: '{ static '; + nextPutAll: (aCCodeGen + arrayInitializerCalled: 'aLiteralArray' + for: expression args first value + sizeString: nil + type: type allButLast) withBlanksTrimmed; - nextPutAll: (aCCodeGen arrayInitializerCalled: 'aLiteralArray' for: expression args first value type: type allButLast) withBlanksTrimmed; nextPut: $;; crtab: level + 1; nextPutAll: variable name; nextPutAll: ' = aLiteralArray;'; crtab: level; nextPut: $}; cr!

1 0

VM Maker: VMMaker.oscog-eem.575.mcz
by commits＠source.squeak.org 06 Jan '14

06 Jan '14

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.575.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.575 Author: eem Time: 6 January 2014, 10:00:10.701 am UUID: 3c41906f-dd7d-4298-9487-2a7089d19714 Ancestors: VMMaker.oscog-dtl.574, VMMaker.oscog-dtl.572 Implement following primitive args to primitive accessor depth on primitive failure in Spur. Implement simulator support for Spur primitive accessor depth. Fix assert in mapStackPages. Can't check for being married with SqueakV3 obj mem since when compacting it moves bodies after updating pointers. =============== Diff against VMMaker.oscog-dtl.574 =============== Item was changed: ----- Method: CoInterpreter>>slowPrimitiveResponse (in category 'primitive support') ----- slowPrimitiveResponse "Invoke a normal (non-quick) primitive. + Called under the assumption that primFunctionPointer has been preloaded. + Override to log primitive." - Called under the assumption that primFunctionPtr has been preloaded" - | nArgs savedFramePointer savedStackPointer | - <inline: true> - <asmLabel: false> - <var: #savedFramePointer type: #'char *'> - <var: #savedStackPointer type: #'char *'> cogit recordPrimTrace ifTrue: [self fastLogPrim: messageSelector]. + ^super slowPrimitiveResponse! - FailImbalancedPrimitives ifTrue: - [nArgs := argumentCount. - savedStackPointer := stackPointer. - savedFramePointer := framePointer]. - self initPrimCall. - self dispatchFunctionPointer: primitiveFunctionPointer. - (FailImbalancedPrimitives - and: [self successful - and: [framePointer = savedFramePointer - and: [(self isMachineCodeFrame: framePointer) not]]]) ifTrue:"Don't fail if primitive has done something radical, e.g. perform:" - [stackPointer ~= (savedStackPointer + (nArgs * BytesPerWord)) ifTrue: - [self flag: 'Would be nice to make this a message send of e.g. unbalancedPrimitive to the current process or context'. - "This is necessary but insufficient; the result may still have been written to the stack. - At least we'll know something is wrong." - stackPointer := savedStackPointer. - self failUnbalancedPrimitive]]. - "If we are profiling, take accurate primitive measures" - nextProfileTick > 0 ifTrue: - [self checkProfileTick: newMethod]. - ^self successful! Item was changed: ----- Method: CogVMSimulator>>initialize (in category 'initialization') ----- initialize "Initialize the CogVMSimulator when running the interpreter inside Smalltalk. The primary responsibility of this method is to allocate Smalltalk Arrays for variables that will be declared as statically-allocated global arrays in the translated code." objectMemory ifNil: [objectMemory := self class objectMemoryClass simulatorClass new]. cogit ifNil: [cogit := self class cogitClass new setInterpreter: self]. objectMemory coInterpreter: self cogit: cogit. cogit numRegArgs > 0 ifTrue: [debugStackDepthDictionary := Dictionary new]. cogThreadManager ifNotNil: [super initialize]. "Note: we must initialize ConstMinusOne & HasBeenReturnedFromMCPC differently for simulation, due to the fact that the simulator works only with +ve 32-bit values" ConstMinusOne := objectMemory integerObjectOf: -1. HasBeenReturnedFromMCPC := objectMemory integerObjectOf: -1. cogMethodZone := cogit methodZone. "Because Slang can't remove intermediate implicit receivers (cogit methodZone foo doesn't reduce to foo())" enableCog := true. methodCache := Array new: MethodCacheSize. atCache := Array new: AtCacheTotalSize. self flushMethodCache. self flushAtCache. cogCompiledCodeCompactionCalledFor := false. gcSemaphoreIndex := 0. externalSemaphoreSignalRequests := externalSemaphoreSignalResponses := #(). externalPrimitiveTable := CArrayAccessor on: (Array new: MaxExternalPrimitiveTableSize). externalPrimitiveTableFirstFreeIndex := 0. primitiveTable := self class primitiveTable copy. + primitiveAccessorDepthTable := objectMemory hasSpurMemoryManagerAPI ifTrue: + [self class primitiveAccessorDepthTable]. pluginList := {'' -> self }. mappedPluginEntries := OrderedCollection new. desiredNumStackPages := desiredEdenBytes := desiredCogCodeSize := 0. "This is initialized on loading the image, but convenient for testing stack page values..." numStackPages := self defaultNumStackPages. startMicroseconds := Time totalSeconds * 1000000. maxLiteralCountForCompile := MaxLiteralCountForCompile. minBackwardJumpCountForCompile := MinBackwardJumpCountForCompile. flagInterpretedMethods := false. "initialize InterpreterSimulator variables used for debugging" byteCount := lastPollCount := sendCount := 0. quitBlock := [^ self]. traceOn := true. printSends := printFrameAtEachStep := printBytecodeAtEachStep := false. myBitBlt := BitBltSimulator new setInterpreter: self. transcript := Transcript. displayForm := 'Display has not yet been installed' asDisplayText form. suppressHeartbeatFlag := deferSmash := deferredSmash := false. systemAttributes := Dictionary new. primTraceLog := CArrayAccessor on: (Array new: 256 withAll: 0). primTraceLogIndex := 0. traceLog := CArrayAccessor on: (Array new: TraceBufferSize withAll: 0). traceLogIndex := 0. traceSources := TraceSources. statCodeCompactionCount := 0. statCodeCompactionUsecs := 0. extSemTabSize := 256! Item was removed: - ----- Method: CogVMSimulator>>ioLoadExternalFunction:OfLength:FromModule:OfLength: (in category 'plugin support') ----- - ioLoadExternalFunction: functionName OfLength: functionLength FromModule: moduleName OfLength: moduleLength - "Load and return the requested function from a module" - | pluginString functionString | - pluginString := String new: moduleLength. - 1 to: moduleLength do:[:i| pluginString byteAt: i put: (objectMemory byteAt: moduleName+i-1)]. - functionString := String new: functionLength. - 1 to: functionLength do:[:i| functionString byteAt: i put: (objectMemory byteAt: functionName+i-1)]. - ^self ioLoadFunction: functionString From: pluginString! Item was changed: ----- Method: CogVMSimulator>>loadNewPlugin: (in category 'plugin support') ----- loadNewPlugin: pluginString + ^(self tryLoadNewPlugin: pluginString pluginEntries: mappedPluginEntries) ifNotNil: + [:entry| + pluginList := pluginList copyWith: entry. + entry]! - | plugin plugins simulatorClasses | - transcript cr; show: 'Looking for module ', pluginString. - "but *why*??" - (#('FloatArrayPlugin' 'Matrix2x3Plugin') includes: pluginString) ifTrue: - [transcript show: ' ... defeated'. ^nil]. - pluginString isEmpty - ifTrue: - [plugin := self] - ifFalse: - [plugins := InterpreterPlugin allSubclasses select: [:psc| psc moduleName asString = pluginString asString]. - simulatorClasses := (plugins - select: [:psc| psc simulatorClass notNil] - thenCollect: [:psc| psc simulatorClass]) asSet. - simulatorClasses isEmpty ifTrue: [transcript show: ' ... not found'. ^nil]. - simulatorClasses size > 1 ifTrue: [^self error: 'This won''t work...']. - plugins size > 1 ifTrue: - [transcript show: '...multiple plugin classes; choosing ', plugins last name]. - plugin := simulatorClasses anyOne newFor: plugins last. "hopefully lowest in the hierarchy..." - plugin setInterpreter: objectMemory. "Ignore return value from setInterpreter" - (plugin respondsTo: #initialiseModule) ifTrue: - [plugin initialiseModule ifFalse: - [transcript show: ' ... initialiser failed'. ^nil]]]. "module initialiser failed" - pluginList := pluginList copyWith: (pluginString asString -> plugin). - transcript show: ' ... loaded'. - ^pluginList last! Item was changed: ----- Method: SpurMemoryManager>>followForwardedObjectFields:toDepth: (in category 'forwarding') ----- followForwardedObjectFields: objOop toDepth: depth + "Follow pointers in the object to depth. + Answer if any forwarders were found. - "follow pointers in the object to depth. How to avoid cyclic structures?? A temproary mark bit?" + | oop found | + found := false. - | oop | self assert: ((self isPointers: objOop) or: [self isOopCompiledMethod: objOop]). 0 to: (self numPointerSlotsOf: objOop) - 1 do: [:i| + oop := self fetchPointer: i ofObject: objOop. + (self isNonImmediate: oop) ifTrue: + [(self isForwarded: oop) ifTrue: + [found := true. + oop := self followForwarded: oop. + self storePointer: i ofObject: objOop withValue: oop]. + (depth > 0 + and: [(self hasPointerFields: oop) + and: [self followForwardedObjectFields: oop toDepth: depth - 1]]) ifTrue: + [found := true]]]. + ^found! - oop := self fetchPointer: i ofObject: objOop. - ((self isNonImmediate: oop) - and: [self isForwarded: oop]) ifTrue: - [oop := self followForwarded: oop. - self storePointer: i ofObject: objOop withValue: oop]. - depth > 0 ifTrue: - [self followForwardedObjectFields: objOop toDepth: depth - 1]]! Item was added: + ----- Method: SpurMemoryManager>>hasPointerFields: (in category 'object testing') ----- + hasPointerFields: oop + <inline: true> + | format | + ^(self isNonImmediate: oop) + and: [(format := self formatOf: oop) <= self lastPointerFormat + or: [format >= self firstCompiledMethodFormat]]! Item was changed: InterpreterPrimitives subclass: #StackInterpreter + instanceVariableNames: 'currentBytecode bytecodeSetSelector localFP localIP localSP stackLimit stackPage stackPages method instructionPointer stackPointer framePointer localReturnValue extA extB primitiveFunctionPointer methodCache atCache lkupClassTag lkupClass methodDictLinearSearchLimit highestRunnableProcessPriority nextWakeupUsecs nextPollUsecs inIOProcessEvents interruptKeycode interruptPending savedWindowSize imageHeaderFlags fullScreenFlag deferDisplayUpdates pendingFinalizationSignals extraVMMemory interpreterProxy showSurfaceFn primitiveTable primitiveAccessorDepthTable externalPrimitiveTable externalPrimitiveTableFirstFreeIndex overflowedPage extraFramesToMoveOnOverflow globalSessionID jmpBuf jmpDepth suspendedCallbacks suspendedMethods numStackPages desiredNumStackPages desiredEdenBytes classNameIndex thisClassIndex metaclassNumSlots interruptCheckChain suppressHeartbeatFlag breakSelector breakSelectorLength longRunningPrimitiveCheckMethod longRunningPrimitiveCheckSemaphore longRunningPrimitiveStartUsecs longRunningPrimitiveStopUsecs longRunningPrimitiveGCUsecs longRunningPrimitiveCheckSequenceNumber longRunningPrimitiveSignalUndelivered tempOop statForceInterruptCheck statStackOverflow statStackPageDivorce statCheckForEvents statProcessSwitch statIOProcessEvents theUnknownShort the2ndUnknownShort imageFloatsBigEndian maxExtSemTabSizeSet lastMethodCacheProbeWrite statPendingFinalizationSignals gcSemaphoreIndex classByteArrayCompactIndex' - instanceVariableNames: 'currentBytecode bytecodeSetSelector localFP localIP localSP stackLimit stackPage stackPages method instructionPointer stackPointer framePointer localReturnValue extA extB primitiveFunctionPointer methodCache atCache lkupClassTag lkupClass methodDictLinearSearchLimit highestRunnableProcessPriority nextWakeupUsecs nextPollUsecs inIOProcessEvents interruptKeycode interruptPending savedWindowSize imageHeaderFlags fullScreenFlag deferDisplayUpdates pendingFinalizationSignals extraVMMemory interpreterProxy showSurfaceFn primitiveTable externalPrimitiveTable externalPrimitiveTableFirstFreeIndex overflowedPage extraFramesToMoveOnOverflow globalSessionID jmpBuf jmpDepth suspendedCallbacks suspendedMethods numStackPages desiredNumStackPages desiredEdenBytes classNameIndex thisClassIndex metaclassNumSlots interruptCheckChain suppressHeartbeatFlag breakSelector breakSelectorLength longRunningPrimitiveCheckMethod longRunningPrimitiveCheckSemaphore longRunningPrimitiveStartUsecs longRunningPrimitiveStopUsecs longRunningPrimitiveGCUsecs longRunningPrimitiveCheckSequenceNumber longRunningPrimitiveSignalUndelivered tempOop statForceInterruptCheck statStackOverflow statStackPageDivorce statCheckForEvents statProcessSwitch statIOProcessEvents theUnknownShort the2ndUnknownShort imageFloatsBigEndian maxExtSemTabSizeSet lastMethodCacheProbeWrite statPendingFinalizationSignals gcSemaphoreIndex classByteArrayCompactIndex' classVariableNames: 'AtCacheEntries AtCacheFixedFields AtCacheFmt AtCacheMask AtCacheOop AtCacheSize AtCacheTotalSize AtPutBase BytecodeTable CacheProbeMax DirBadPath DirEntryFound DirNoMoreEntries DumpStackOnLowSpace EnclosingMixinIndex EnclosingObjectIndex FailImbalancedPrimitives HeaderFlagBitPosition MaxExternalPrimitiveTableSize MaxJumpBuf MaxPrimitiveIndex MaxQuickPrimitiveIndex MixinIndex PrimitiveExternalCallIndex PrimitiveTable StackPageReachedButUntraced StackPageTraceInvalid StackPageTraced StackPageUnreached' poolDictionaries: 'VMBasicConstants VMMethodCacheConstants VMObjectIndices VMSpurObjectRepresentationConstants VMSqueakClassIndices VMSqueakV3BytecodeConstants VMSqueakV3ObjectRepresentationConstants VMStackFrameOffsets' category: 'VMMaker-Interpreter'! !StackInterpreter commentStamp: 'eem 9/11/2013 18:30' prior: 0! This class is a complete implementation of the Smalltalk-80 virtual machine, derived originally from the Blue Book specification but quite different in some areas. This VM supports Closures but *not* old-style BlockContexts. It has been modernized with 32-bit pointers, better management of Contexts (see next item), and attention to variable use that allows the CCodeGenerator (qv) to keep, eg, the instruction pointer and stack pointer in registers as well as keeping most simple variables in a global array that seems to improve performance for most platforms. The VM does not use Contexts directly. Instead Contexts serve as proxies for a more conventional stack format that is invisible to the image. There is considerable explanation at http://www.mirandabanda.org/cogblog/2009/01/14/under-cover-contexts-and-the…. The VM maintains a fixed-size stack zone divided into pages, each page being capable of holding several method/block activations. A send establishes a new frame in the current stack page, a return returns to the previous frame. This eliminates allocation/deallocation of contexts and the moving of receiver and arguments from caller to callee on each send/return. Contexts are created lazily when an activation needs a context (creating a block, explicit use of thisContext, access to sender when sender is a frame, or linking of stack pages together). Contexts are either conventional and heap-resident ("single") or "married" and serve as proxies for their corresponding frame or "widowed", meaning that their spouse frame has been returned from (died). A married context is specially marked (more details in the code) and refers to its frame. Likewise a married frame is specially marked and refers to its context. In addition to SmallInteger arithmetic and Floats, the VM supports logic on 32-bit PositiveLargeIntegers, thus allowing it to simulate itself much more effectively than would otherwise be the case. NOTE: Here follows a list of things to be borne in mind when working on this code, or when making changes for the future. 1. There are a number of things that should be done the next time we plan to release a completely incompatible image format. These include unifying the instanceSize field of the class format word -- see instantiateClass:indexableSize:, and unifying the bits of the method primitive index (if we decide we need more than 512, after all) -- see primitiveIndexOf:. Also, contexts should be given a special format code (see next item). 2. There are several fast checks for contexts (see isContextHeader: and isMethodContextHeader:) which will fail if the compact class indices of BlockContext or MethodContext change. This is necessary because the oops may change during a compaction when the oops are being adjusted. It's important to be aware of this when writing a new image using the SystemTracer. A better solution would be to reserve one of the format codes for Contexts only. An even better solution is to eliminate compact classes altogether (see 6.). 3. We have made normal files tolerant to size and positions up to 32 bits. This has not been done for async files, since they are still experimental. The code in size, at: and at:put: should work with sizes and indices up to 31 bits, although I have not tested it (di 12/98); it might or might not work with 32-bit sizes. [Late news, the support has been extended to 64-bit file sizes]. 4. Note that 0 is used in a couple of places as an impossible oop. This should be changed to a constant that really is impossible (or perhaps there is code somewhere that guarantees it --if so it should be put in this comment). The places include the method cache and the at cache. 5. Moving to a 2 bit immediate tag and having immediate Characters is a good choice for Unicode and the JIT. We can still have 31-bit SmallIntegers by allowing two tag patterns for SmallInteger. 6. If Eliot Miranda's 2 word header scheme is acceptable in terms of footprint (we estimate about a 10% increase in image size with about 35 reclaimed by better representation of CompiledMethod - loss of MethodProperties) then the in-line cache for the JIT is simplified, class access is faster and header access is the same in 32-bit and full 64-bit images. [Late breaking news, the 2-word header scheme is more compact, by over 2%]. See SpurMemorymanager's class comment.! Item was added: + ----- Method: StackInterpreter class>>primitiveAccessorDepthTable (in category 'constants') ----- + primitiveAccessorDepthTable + | cg | + cg := CCodeGenerator new. + cg vmClass: StackInterpreter. + ^PrimitiveTable collect: + [:thing| |class method | + (thing isInteger "quick prims, 0 for fast primitve fail" + or: [thing == #primitiveFail + or: [(class := self whichClassIncludesSelector: thing) isNil]]) + ifTrue: [-1] + ifFalse: + [method := (class >> thing) methodNode asTranslationMethodOfClass: TMethod. + cg accessorDepthForMethod: method]]! Item was added: + ----- Method: StackInterpreter>>checkForAndFollowForwardedPrimitiveState (in category 'primitive support') ----- + checkForAndFollowForwardedPrimitiveState + "In Spur a primitive may fail due to encountering a forwarder. + On failure check the accessorDepth for the primitive and + if non-negative scan the args to the depth, following any + forwarders. Answer if any are found so the prim can be retried.." + | primIndex accessorDepth found | + self assert: self successful not. + found := false. + primIndex := self primitiveIndexOf: newMethod. + self assert: (self + cCode: + [primitiveFunctionPointer = (self functionPointerFor: primIndex inClass: objectMemory nilObject)] + inSmalltalk: + [((primitiveFunctionPointer isInteger and: [primitiveFunctionPointer >= 1000]) + ifTrue: [#primitiveExternalCall] + ifFalse: [primitiveFunctionPointer]) = (self functionPointerFor: primIndex inClass: objectMemory nilObject)]). + self assert: argumentCount = (self argumentCountOf: newMethod). + accessorDepth := (primIndex = 117 and: [primitiveFunctionPointer ~~ #primitiveExternalCall]) + ifTrue: [self primitiveAccessorDepthForExternalPrimitiveMethod: newMethod] + ifFalse: [primitiveAccessorDepthTable at: primIndex]. + accessorDepth < 0 ifTrue: + [^false]. + 0 to: argumentCount do: + [:index| | oop | + oop := self stackValue: index. + (objectMemory isNonImmediate: oop) ifTrue: + [(objectMemory isForwarded: oop) ifTrue: + [self assert: index < argumentCount. "receiver should have been caught at send time." + found := true. + oop := objectMemory followForwarded: oop. + self stackValue: index put: oop]. + ((objectMemory hasPointerFields: oop) + and: [objectMemory followForwardedObjectFields: oop toDepth: accessorDepth]) ifTrue: + [found := true]]]. + ^found! Item was added: + ----- Method: StackInterpreter>>ioLoadExternalFunction:OfLength:FromModule:OfLength: (in category 'primitive support') ----- + ioLoadExternalFunction: functionName OfLength: functionLength FromModule: moduleName OfLength: moduleLength + "Load and return the requested function from a module. + N.B. The actual code lives in platforms/Cross/vm/sqNamedPrims.h" + <doNotGenerate> + | pluginString functionString | + pluginString := String new: moduleLength. + 1 to: moduleLength do:[:i| pluginString byteAt: i put: (objectMemory byteAt: moduleName+i-1)]. + functionString := String new: functionLength. + 1 to: functionLength do:[:i| functionString byteAt: i put: (objectMemory byteAt: functionName+i-1)]. + ^self ioLoadFunction: functionString From: pluginString! Item was added: + ----- Method: StackInterpreter>>ioLoadExternalFunction:OfLength:FromModule:OfLength:AccessorDepthInto: (in category 'primitive support') ----- + ioLoadExternalFunction: functionName OfLength: functionLength FromModule: moduleName OfLength: moduleLength AccessorDepthInto: accessorDepthPtr + "Load and return the requested function from a module. Assign the accessor depth through accessorDepthPtr. + N.B. The actual code lives in platforms/Cross/vm/sqNamedPrims.h" + <doNotGenerate> + | pluginString functionString | + pluginString := String new: moduleLength. + 1 to: moduleLength do:[:i| pluginString byteAt: i put: (objectMemory byteAt: moduleName+i-1)]. + functionString := String new: functionLength. + 1 to: functionLength do:[:i| functionString byteAt: i put: (objectMemory byteAt: functionName+i-1)]. + ^self ioLoadFunction: functionString From: pluginString AccessorDepthInto: accessorDepthPtr! Item was changed: ----- Method: StackInterpreter>>mapStackPages (in category 'object memory support') ----- mapStackPages <inline: false> <var: #thePage type: #'StackPage *'> <var: #theSP type: #'char *'> <var: #theFP type: #'char *'> <var: #callerFP type: #'char *'> <var: #theIPPtr type: #'char *'> 0 to: numStackPages - 1 do: [:i| | thePage theSP theFP callerFP theIPPtr theIP oop | thePage := stackPages stackPageAt: i. thePage isFree ifFalse: [theSP := thePage headSP. theFP := thePage headFP. "Skip the instruction pointer on top of stack of inactive pages." thePage = stackPage ifTrue: [theIPPtr := 0] ifFalse: [theIPPtr := theSP. theSP := theSP + BytesPerWord]. [self assert: (thePage addressIsInPage: theFP). self assert: (thePage addressIsInPage: theSP). self assert: (theIPPtr = 0 or: [thePage addressIsInPage: theIPPtr]). [theSP <= (theFP + FoxReceiver)] whileTrue: [oop := stackPages longAt: theSP. (objectMemory shouldRemapOop: oop) ifTrue: [stackPages longAt: theSP put: (objectMemory remapObj: oop)]. theSP := theSP + BytesPerWord]. (self frameHasContext: theFP) ifTrue: [(objectMemory shouldRemapObj: (self frameContext: theFP)) ifTrue: [stackPages longAt: theFP + FoxThisContext put: (objectMemory remapObj: (self frameContext: theFP))]. + "With SqueakV3 objectMemory can't assert since object body is yet to move." + objectMemory hasSpurMemoryManagerAPI ifTrue: + [self assert: ((self isMarriedOrWidowedContext: (self frameContext: theFP)) + and: [(self frameOfMarriedContext: (self frameContext: theFP)) = theFP])]]. - self assert: ((self isMarriedOrWidowedContext: (self frameContext: theFP)) - and: [(self frameOfMarriedContext: (self frameContext: theFP)) = theFP])]. (objectMemory shouldRemapObj: (self frameMethod: theFP)) ifTrue: [theIPPtr ~= 0 ifTrue: [self assert: (stackPages longAt: theIPPtr) > (self frameMethod: theFP). theIP := (stackPages longAt: theIPPtr) - (self frameMethod: theFP)]. stackPages longAt: theFP + FoxMethod put: (objectMemory remapObj: (self frameMethod: theFP)). theIPPtr ~= 0 ifTrue: [stackPages longAt: theIPPtr put: theIP + (self frameMethod: theFP)]]. (callerFP := self frameCallerFP: theFP) ~= 0] whileTrue: [theSP := (theIPPtr := theFP + FoxCallerSavedIP) + BytesPerWord. theFP := callerFP]. theSP := theFP + FoxCallerContext. "a.k.a. FoxCallerSavedIP" [theSP <= thePage baseAddress] whileTrue: [oop := stackPages longAt: theSP. (objectMemory shouldRemapOop: oop) ifTrue: [stackPages longAt: theSP put: (objectMemory remapObj: oop)]. theSP := theSP + BytesPerWord]]]! Item was added: + ----- Method: StackInterpreter>>primitiveAccessorDepthForExternalPrimitiveMethod: (in category 'primitive support') ----- + primitiveAccessorDepthForExternalPrimitiveMethod: methodObj + ^objectMemory integerValueOf: + (objectMemory + fetchPointer: 2 + ofObject: (self literal: 0 ofMethod: methodObj))! Item was changed: ----- Method: StackInterpreter>>slowPrimitiveResponse (in category 'primitive support') ----- slowPrimitiveResponse "Invoke a normal (non-quick) primitive. + Called under the assumption that primFunctionPointer has been preloaded." - Called under the assumption that primFunctionPtr has been preloaded" | nArgs savedFramePointer savedStackPointer | <inline: true> <asmLabel: false> <var: #savedFramePointer type: #'char *'> <var: #savedStackPointer type: #'char *'> FailImbalancedPrimitives ifTrue: [nArgs := argumentCount. savedStackPointer := stackPointer. savedFramePointer := framePointer]. self initPrimCall. self dispatchFunctionPointer: primitiveFunctionPointer. + "In Spur a primitive may fail due to encountering a forwarder. + On failure check the accessorDepth for the primitive and + if non-negative scan the args to the depth, following any + forwarders. Retry the primitive if any are found." + (objectMemory hasSpurMemoryManagerAPI + and: [self successful not + and: [(objectMemory isOopCompiledMethod: newMethod) + and: [self checkForAndFollowForwardedPrimitiveState]]]) ifTrue: + [self initPrimCall. + self dispatchFunctionPointer: primitiveFunctionPointer]. (FailImbalancedPrimitives and: [self successful + and: [framePointer = savedFramePointer + and: [(self isMachineCodeFrame: framePointer) not]]]) ifTrue:"Don't fail if primitive has done something radical, e.g. perform:" - and: [framePointer = savedFramePointer]]) ifTrue:"Don't fail if primitive has done something radical, e.g. perform:" [stackPointer ~= (savedStackPointer + (nArgs * BytesPerWord)) ifTrue: [self flag: 'Would be nice to make this a message send of e.g. unbalancedPrimitive to the current process or context'. "This is necessary but insufficient; the result may still have been written to the stack. At least we'll know something is wrong." stackPointer := savedStackPointer. self failUnbalancedPrimitive]]. "If we are profiling, take accurate primitive measures" nextProfileTick > 0 ifTrue: [self checkProfileTick: newMethod]. ^self successful! Item was added: + ----- Method: StackInterpreter>>tryLoadNewPlugin:pluginEntries: (in category 'primitive support') ----- + tryLoadNewPlugin: pluginString pluginEntries: pluginEntries + "Load the plugin and if on Spur, populate pluginEntries with the prmitives in the plugin." + <doNotGenerate> + | plugin plugins simulatorClasses | + self transcript cr; show: 'Looking for module ', pluginString. + "Defeat loading of the FloatArrayPlugin & Matrix2x3Plugin since complications with 32-bit + float support prevent simulation. If you feel up to tackling this start by implementing + cCoerce: value to: cType + ^cType = 'float' + ifTrue: [value asIEEE32BitWord] + ifFalse: [value] + in FloatArrayPlugin & Matrix2x3Plugin and then address the issues in the BalloonEnginePlugin. + See http://forum.world.st/Simulating-the-BalloonEnginePlugin-FloatArrayPlugin-a…" + (#('FloatArrayPlugin' 'Matrix2x3Plugin') includes: pluginString) ifTrue: + [self transcript show: ' ... defeated'. ^nil]. + pluginString isEmpty + ifTrue: + [plugin := self] + ifFalse: + [plugins := InterpreterPlugin allSubclasses select: [:psc| psc moduleName asString = pluginString asString]. + simulatorClasses := (plugins + select: [:psc| psc simulatorClass notNil] + thenCollect: [:psc| psc simulatorClass]) asSet. + simulatorClasses isEmpty ifTrue: [self transcript show: ' ... not found'. ^nil]. + simulatorClasses size > 1 ifTrue: [^self error: 'This won''t work...']. + plugins size > 1 ifTrue: + [self transcript show: '...multiple plugin classes; choosing ', plugins last name]. + plugin := simulatorClasses anyOne newFor: plugins last. "hopefully lowest in the hierarchy..." + plugin setInterpreter: objectMemory. "Ignore return value from setInterpreter" + (plugin respondsTo: #initialiseModule) ifTrue: + [plugin initialiseModule ifFalse: + [self transcript show: ' ... initialiser failed'. ^nil]]]. "module initialiser failed" + self transcript show: ' ... loaded'. + objectMemory hasSpurMemoryManagerAPI ifTrue: + [| realPlugin cg | + self transcript show: '...computing accessor depths'. + realPlugin := plugin class withAllSuperclasses detect: [:class| class shouldBeTranslated]. + cg := realPlugin buildCodeGeneratorUpTo: realPlugin. + cg exportedPrimitiveNames do: + [:primName| | fnSymbol | + fnSymbol := primName asSymbol. + pluginEntries addLast: {plugin. + fnSymbol. + [plugin perform: fnSymbol. self]. + cg accessorDepthForSelector: fnSymbol}]. + self transcript show: '...done']. + ^pluginString asString -> plugin! Item was changed: ----- Method: StackInterpreterSimulator>>flushExternalPrimitives (in category 'plugin support') ----- flushExternalPrimitives + mappedPluginEntries := OrderedCollection new. + super flushExternalPrimitives! - mappedPluginEntries := #(). - super flushExternalPrimitives.! Item was changed: ----- Method: StackInterpreterSimulator>>initialize (in category 'initialization') ----- initialize "Initialize the StackInterpreterSimulator when running the interpreter inside Smalltalk. The primary responsibility of this method is to allocate Smalltalk Arrays for variables that will be declared as statically-allocated global arrays in the translated code." bootstrapping := false. objectMemory ifNil: [objectMemory := self class objectMemoryClass simulatorClass new]. objectMemory coInterpreter: self. "Note: we must initialize ConstMinusOne differently for simulation, due to the fact that the simulator works only with +ve 32-bit values" ConstMinusOne := objectMemory integerObjectOf: -1. methodCache := Array new: MethodCacheSize. atCache := Array new: AtCacheTotalSize. self flushMethodCache. gcSemaphoreIndex := 0. externalSemaphoreSignalRequests := externalSemaphoreSignalResponses := #(). externalPrimitiveTable := CArrayAccessor on: (Array new: MaxExternalPrimitiveTableSize). externalPrimitiveTableFirstFreeIndex := 0. primitiveTable := self class primitiveTable copy. + primitiveAccessorDepthTable := objectMemory hasSpurMemoryManagerAPI ifTrue: + [self class primitiveAccessorDepthTable]. pluginList := {'' -> self }. + mappedPluginEntries := OrderedCollection new. - mappedPluginEntries := #(). desiredNumStackPages := desiredEdenBytes := 0. "This is initialized on loading the image, but convenient for testing stack page values..." numStackPages := self defaultNumStackPages. startMicroseconds := Time totalSeconds * 1000000. "initialize InterpreterSimulator variables used for debugging" byteCount := 0. sendCount := 0. quitBlock := [^ self]. traceOn := true. printSends := printReturns := printFrameAtEachStep := printBytecodeAtEachStep := false. myBitBlt := BitBltSimulator new setInterpreter: self. transcript := Transcript. displayForm := 'Display has not yet been installed' asDisplayText form. suppressHeartbeatFlag := false. extSemTabSize := 256. disableBooleanCheat := false! Item was removed: - ----- Method: StackInterpreterSimulator>>ioLoadExternalFunction:OfLength:FromModule:OfLength: (in category 'plugin support') ----- - ioLoadExternalFunction: functionName OfLength: functionLength FromModule: moduleName OfLength: moduleLength - "Load and return the requested function from a module" - | pluginString functionString | - pluginString := String new: moduleLength. - 1 to: moduleLength do:[:i| pluginString byteAt: i put: (objectMemory byteAt: moduleName+i-1)]. - functionString := String new: functionLength. - 1 to: functionLength do:[:i| functionString byteAt: i put: (objectMemory byteAt: functionName+i-1)]. - ^self ioLoadFunction: functionString From: pluginString! Item was added: + ----- Method: StackInterpreterSimulator>>ioLoadFunction:From:AccessorDepthInto: (in category 'plugin support') ----- + ioLoadFunction: functionString From: pluginString AccessorDepthInto: accessorDepthPtr + "Load and return the requested function from a module. + Assign the accessor depth through accessorDepthPtr. + N.B. The actual code lives in platforms/Cross/vm/sqNamedPrims.h" + | firstTime plugin fnSymbol | + firstTime := false. + fnSymbol := functionString asSymbol. + transcript + cr; + show: '(', byteCount printString, ') Looking for ', functionString, ' in ', + (pluginString isEmpty ifTrue:['vm'] ifFalse:[pluginString]). + functionString = breakSelector ifTrue: [self halt: breakSelector]. + plugin := pluginList + detect: [:any| any key = pluginString asString] + ifNone: + [firstTime := true. + self loadNewPlugin: pluginString]. + plugin ifNil: + [firstTime ifTrue: [transcript cr; show: 'Failed ... primitive not in plugin']. + ^0]. + plugin := plugin value. + mappedPluginEntries doWithIndex: + [:pluginAndName :index| + ((pluginAndName at: 1) == plugin + and:[(pluginAndName at: 2) == fnSymbol]) ifTrue: + [firstTime ifTrue: [transcript cr; show: ' ... okay']. + accessorDepthPtr at: 0 put: (pluginAndName at: 4). + ^index]]. + firstTime ifTrue: [transcript cr; show: 'Failed ... primitive not in plugin']. + ^0! Item was changed: ----- Method: StackInterpreterSimulator>>loadNewPlugin: (in category 'plugin support') ----- loadNewPlugin: pluginString + ^(self tryLoadNewPlugin: pluginString pluginEntries: mappedPluginEntries) ifNotNil: + [:entry| + pluginList := pluginList copyWith: entry. + entry]! - | plugin plugins simulatorClasses | - transcript cr; show: 'Looking for module ', pluginString. - "but *why*??" - (#('FloatArrayPlugin' 'Matrix2x3Plugin') includes: pluginString) ifTrue: - [transcript show: ' ... defeated'. ^nil]. - plugins := InterpreterPlugin allSubclasses select: [:psc| psc moduleName asString = pluginString asString]. - simulatorClasses := (plugins - select: [:psc| psc simulatorClass notNil] - thenCollect: [:psc| psc simulatorClass]) asSet. - simulatorClasses isEmpty ifTrue: [transcript show: ' ... not found'. ^nil]. - simulatorClasses size > 1 ifTrue: [^self error: 'This won''t work...']. - plugins size > 1 ifTrue: - [transcript show: '...multiple plugin classes; choosing ', plugins last name]. - plugin := simulatorClasses anyOne newFor: plugins last. "hopefully lowest in the hierarchy..." - plugin setInterpreter: objectMemory. "Ignore return value from setInterpreter" - (plugin respondsTo: #initialiseModule) ifTrue: - [plugin initialiseModule ifFalse: - [transcript show: ' ... initialiser failed'. ^nil]]. "module initialiser failed" - pluginList := pluginList copyWith: (pluginString asString -> plugin). - transcript show: ' ... loaded'. - ^pluginList last! Item was changed: ----- Method: StackInterpreterSimulator>>utilitiesMenu: (in category 'UI') ----- utilitiesMenu: aMenuMorph aMenuMorph add: 'toggle transcript' action: #toggleTranscript; add: 'clone VM' action: #cloneSimulation; addLine; add: 'print ext head frame' action: #printExternalHeadFrame; add: 'print int head frame' action: #printHeadFrame; add: 'short print ext frame & callers' action: [self shortPrintFrameAndCallers: framePointer]; add: 'short print int frame & callers' action: [self shortPrintFrameAndCallers: localFP]; add: 'long print ext frame & callers' action: [self printFrameAndCallers: framePointer SP: stackPointer]; add: 'long print int frame & callers' action: [self printFrameAndCallers: localFP SP: localSP]; add: 'print frame...' action: [(self promptHex: 'print frame') ifNotNil: [:fp| self printFrame: fp]]; add: 'print call stack' action: #printCallStack; add: 'print stack call stack' action: #printStackCallStack; add: 'print call stack of...' action: [(self promptHex: 'context or process oop') ifNotNil: [:obj| self printCallStackOf: obj]]; add: 'print call stack of frame...' action: [(self promptHex: 'frame') ifNotNil: [:fp| self printCallStackFP: fp]]; add: 'print all stacks' action: #printAllStacks; add: 'write back local ptrs' action: [stackPointer := localSP. framePointer := localFP. instructionPointer := localIP. self writeBackHeadFramePointers]; add: 'print prim trace log' action: #dumpPrimTraceLog; addLine; add: 'print oop...' action: [(self promptHex: 'print oop') ifNotNil: [:oop| self printOop: oop]]; add: 'long print oop...' action: [(self promptHex: 'print oop') ifNotNil: [:oop| self longPrintOop: oop]]; addLine; add: 'inspect object memory' target: objectMemory action: #inspect; + add: 'inspect interpreter' action: #inspect; - add: 'inspect cointerpreter' action: #inspect; addLine; add: 'set break count...' action: [|s| s := UIManager default request: 'break count (dec)'. s notEmpty ifTrue: [breakCount := Integer readFrom: s readStream]]; add: 'set break selector...' action: [|s| s := UIManager default request: 'break selector'. s notEmpty ifTrue: [self setBreakSelector: s]]; add: (printSends ifTrue: ['no print sends'] ifFalse: ['print sends']) action: [self ensureDebugAtEachStepBlock. printSends := printSends not]; "currently printReturns does nothing" "add: (printReturns ifTrue: ['no print returns'] ifFalse: ['print returns']) action: [self ensureDebugAtEachStepBlock. printReturns := printReturns not];" add: (printBytecodeAtEachStep ifTrue: ['no print bytecode each bytecode'] ifFalse: ['print bytecode each bytecode']) action: [self ensureDebugAtEachStepBlock. printBytecodeAtEachStep := printBytecodeAtEachStep not]; add: (printFrameAtEachStep ifTrue: ['no print frame each bytecode'] ifFalse: ['print frame each bytecode']) action: [self ensureDebugAtEachStepBlock. printFrameAtEachStep := printFrameAtEachStep not]. ^aMenuMorph!

1 0

Nice bit trick for component add
by Nicolas Cellier 06 Jan '14

06 Jan '14

I got an idea while reading this nice blending trick: http://stackoverflow.com/questions/20681590/how-does-this-color-blending-tr… We could do a similar thing when adding components in BitBlt partitionedAdd: word1 to: word2 nBits: nBits nPartitions: nParts For a simple example, say I have 2 parts of 4 bits I will start reasonning with extended precision (thus on 16 bits here) "The sum with carry is" sumWithCarry:=word1+word2. "But carry must not be propagated past each component." "So we must care of what happens at" carryOverflowMask := 2r100010000. "The sum without any carry is" sumWithoutCarry:=word1 bitXor: word2. "If the sum without carry differ from sum with carry then an overflow occured." "We can thus detect presence of a carry overflow:" carryOverflow := (sumWithCarry bitXor: sumWithoutCarry) bitAnd: carryOverflowMask. "If an undue carry occured, we just removet it:" sumWithoutUndueCarry := sumWithCarry - carryOverflow. "But in this case, previous component did overflow, we must saturate it at 2r1111, that is:" componentMask:=1<<nBits-1. "we just have to multiply each carryOverflow bit with this componentMask:" result := sumWithoutUndueCarry bitOr: carryOverflow >> nBit * componentMask. ----------- "Generalization: note that 2r00010001 * componentMask = 2r11111111" "Correlatively, for arbitrary nBits and nParts parameters:" carryOverflowMask := 1<<(nParts*nBits)-1//componentMask<<nBits. ----------- In BitBlt, we want to operate on 32bits words. We can use #usqLong (64 bits at least) all the way, and obtain branch free replacement for above method <var: #word1 type: 'unsigned int'> <var: #word2 type: 'unsigned int'> <var: #one type: #usqLong> <var: #componentMask type: #usqLong> <var: #carryOverflowMask type: #usqLong> <var: #carryOverflow type: #usqLong> <var: #sum type: #usqLong> one := 1. componentMask := one<<nBits-1. carryOverflowMask := one<<(nBits*nParts)-1//componentMask<<nBits. sum := word1. sum := sum + word2. carryOverflow := ((word1 bitXor: word2) bitXor: sum) bitAnd: carryOverflowMask. ^sum-carryOverflow bitOr: carryOverflow>>nBits * componentMask ----------- But maybe we can do better and express all with native unsigned int operations. We must then look if bits at 2r10001000 could produce a carry. We have a carry in next bit if at least 2 out of the 3 are true among word1 word2 carry... That is (word1 bitAnd: word2) bitOr: ((word1 bitOr: word2) bitAnd: carry). <var: #word1 type: 'unsigned int'> <var: #word2 type: 'unsigned int'> <var: #one type: #usqLong> "because we cannot shift <<32 a usqInt in C..." <var: #componentMask type: 'unsigned int'> <var: #carryOverflowMask type: 'unsigned int'> <var: #carryOverflow type: 'unsigned int'> <var: #carry type: 'unsigned int'> <var: #sum type: 'unsigned int'> one := 1. componentMask := one<<nBits-1. carryOverflowMask := one<<(nBits*nParts)-1. carryOverflowMask := carryOverflowMask//componentMask<<(nBits-1). sum := word1. sum := sum + word2. carry := (word1 bitXor: word2) bitXor: sum. carryOverflow := ((word1 bitAnd: word2) bitOr: ((word1 bitOr: word2) bitAnd: carry)) bitAnd: carryOverflowMask. ^sum-(carryOverflow<<1) bitOr: carryOverflow>>(nBits-1) * componentMask Maybe some good soul may help reducing # ops further, but we already have a branch free sum. I did no performance test. Does one have good BitBlt benchmark?

7 24

Re: [Vm-dev] VM Maker: VMMaker.oscog-dtl.574.mcz
by tim Rowledge 05 Jan '14

05 Jan '14

On 04-01-2014, at 7:17 PM, commits(a)source.squeak.org wrote: > Add Pragmatizer. Convert Scratch plugins to pragmas. Now we need a Stigmatizer, which would find bad code snippets and poke fun at the author. tim -- tim Rowledge; tim(a)rowledge.org; http://www.rowledge.org/tim Strange OpCodes: BNE: Buy Non-IBM Equipment

4 7

VM Maker: VMMaker-tpr.335.mcz
by commits＠source.squeak.org 05 Jan '14

05 Jan '14

tim Rowledge uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker-tpr.335.mcz ==================== Summary ==================== Name: VMMaker-tpr.335 Author: tpr Time: 4 January 2014, 5:11:00.292 pm UUID: d8a65973-094c-419c-857d-ab70497a0c86 Ancestors: VMMaker-dtl.334 fix typo bug in ScratchPlugin>primitiveWaterRipples1 =============== Diff against VMMaker-dtl.334 =============== Item was changed: ----- Method: ScratchPlugin>>primitiveWaterRipples1 (in category 'other filters') ----- primitiveWaterRipples1 | in out aArray bArray ripply temp pix dx dy dist inOop outOop width allPix aArOop bArOop height t1 blops x y power val val2 dx2 dy2 newLoc | <export: true> <var: 'in' declareC: 'unsigned int *in'> <var: 'out' declareC: 'unsigned int *out'> <var: 'aArray' declareC: 'double *aArray'> <var: 'bArray' declareC: 'double *bArray'> <var: 'ripply' declareC: 'int ripply'> <var: 'temp' declareC: 'double temp'> <var: 'pix' declareC: 'unsigned int pix'> <var: 'dist' declareC: 'double dist'> <var: 'dx2' declareC: 'double dx2'> <var: 'dy2' declareC: 'double dy2'> inOop := interpreterProxy stackValue: 5. outOop := interpreterProxy stackValue: 4. width := interpreterProxy stackIntegerValue: 3. in := self checkedUnsignedIntPtrOf: inOop. out := self checkedUnsignedIntPtrOf: outOop. allPix := interpreterProxy stSizeOf: inOop. ripply := interpreterProxy stackIntegerValue: 2. aArOop := interpreterProxy stackValue: 1. bArOop := interpreterProxy stackValue: 0. aArray := self checkedFloatPtrOf: aArOop. bArray := self checkedFloatPtrOf: bArOop. interpreterProxy success: ((interpreterProxy stSizeOf: outOop) = allPix). interpreterProxy failed ifTrue: [^ nil]. height := allPix // width. t1 := self cCode: 'rand()'. blops := t1 \\ ripply -1. 0 to: blops /2-1 do: [:t | t1 := self cCode: 'rand()'. x := t1 \\ width. t1 := self cCode: 'rand()'. y := t1 \\ height. t1 := self cCode: 'rand()'. power := t1 \\ 8. -4 to: 4 do: [:g | -4 to: 4 do: [:h | dist := ((g*g) + (h*h)) asFloat. ((dist < 25) and: [dist > 0]) ifTrue: [ dx := (x + g) asInteger. dy := (y + h) asInteger. ((dx >0) and: [(dy>0) and: [(dy < height) and: [dx < width]]]) ifTrue: [ aArray at: ((dy)*width + dx) put: (power *(1.0 asFloat -(dist/(25.0 asFloat))) asFloat). ]. ]. ]. ]. ]. 1 to: width -2 do: [:f | 1 to: height -2 do: [:d | val := (d)*width + f. aArray at: val put: ((( (bArray at: (val+1)) + (bArray at: (val-1)) + (bArray at: (val + width)) + (bArray at: (val - width)) + ((bArray at: (val -1 -width))/2) + ((bArray at: (val-1+width))/2) + ((bArray at: (val+1-width))/2) + ((bArray at: (val+1+width))/2)) /4) - (aArray at: (val))). aArray at: (val) put: ((aArray at: (val))*(0.9 asFloat)). ]. ]. "temp := bArray. bArray := aArray. aArray := temp." 0 to: width*height do: [:q | temp := bArray at: q. bArray at: q put: (aArray at: q). aArray at: q put: temp. ]. 0 to: height-1 do: [:j | 0 to: width-1 do: [:i | ((i > 1) and: [(i<(width-1)) and: [(j>1) and: [(j<(height-1))]]]) ifTrue: [ val2 := (j)*width + i. dx2 := ((((aArray at: (val2)) - (aArray at: (val2-1))) + ((aArray at: (val2+1)) - (aArray at: (val2)))) *64) asFloat. dy2 := ((((aArray at: (val2)) - (aArray at: (val2-width))) + ((aArray at: (val2+width)) - (aArray at: (val2)))) /64) asFloat. + (dx2<2) ifTrue: [dx2 := -2]. - (dx2<-2) ifTrue: [dx2 := -2]. (dx2>2) ifTrue: [dx2 := 2]. + (dy2<2) ifTrue: [dy2 := -2]. - (dy2<-2) ifTrue: [dy2 := -2]. (dy2>2) ifTrue: [dy2 := 2]. newLoc := ((j+dy2)*width + (i+dx2)) asInteger. ((newLoc < (width*height)) and: [newLoc >=0]) ifTrue: [ pix := in at: newLoc] ifFalse: [ pix := in at: (i +(j*width)) ]. ] ifFalse: [ pix := in at: (i +(j*width)) ]. out at: (i + (j*width)) put: pix. ]]. interpreterProxy pop: 6. "pop args, leave rcvr on stack" ^ 0 !

1 0

← Newer
1
2
3
4
5
6
7
8
9
10
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

Vm-dev January 2014