Vm-dev May 2016

vm-dev@lists.squeakfoundation.org

36 participants
150 discussions

[Vm-dev] AioPlugin: VMConstruction-Plugins-AioPlugin-EstebanLorenzano.19.mcz
by squeak-dev-noreply＠lists.squeakfoundation.org 26 May '16

26 May '16

Esteban Lorenzano uploaded a new version of VMConstruction-Plugins-AioPlugin to project AioPlugin: http://www.squeaksource.com/AioPlugin/VMConstruction-Plugins-AioPlugin-Este… ==================== Summary ==================== Name: VMConstruction-Plugins-AioPlugin-EstebanLorenzano.19 Author: EstebanLorenzano Time: 26 May 2016, 1:56:31.823249 pm UUID: 6608ce78-afce-4d1b-9061-f24c6492c36c Ancestors: VMConstruction-Plugins-AioPlugin-eem.18 replace cCode: '' with cCode:[]

1 0

VM Maker: VMMaker.oscog-EstebanLorenzano.1869.mcz
by commits＠source.squeak.org 26 May '16

26 May '16

Esteban Lorenzano uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-EstebanLorenzano.1869.mcz ==================== Summary ==================== Name: VMMaker.oscog-EstebanLorenzano.1869 Author: EstebanLorenzano Time: 26 May 2016, 1:49:23.32419 pm UUID: 6ccd2249-0a2c-4279-90b4-861c39f29859 Ancestors: VMMaker.oscog-eem.1868 last change breaks cCode: '' (strings). this commit fixes some, but not all... I don't know what to do with this (from UnixOSProcessPlugin): self cCode: 'sigchldHandlerAction.sa_sigaction = reapChildProcess' (that dot there...) =============== Diff against VMMaker.oscog-eem.1868 =============== Item was changed: ----- Method: FloatArrayPlugin>>primitiveLength (in category 'arithmetic primitives') ----- primitiveLength "Primitive. Compute the length of the argument (sqrt of sum of component squares)." | rcvr rcvrPtr length result | <export: true> <var: #rcvrPtr type:'float *'> <var: #result type:'double '> rcvr := interpreterProxy stackObjectValue: 0. interpreterProxy failed ifTrue:[^nil]. interpreterProxy success: (interpreterProxy isWords: rcvr). interpreterProxy failed ifTrue:[^nil]. length := interpreterProxy stSizeOf: rcvr. interpreterProxy success: true. rcvrPtr := self cCoerce: (interpreterProxy firstIndexableField: rcvr) to: 'float *'. result := 0.0. 0 to: length-1 do:[:i| result := result + ((self cCoerce: (rcvrPtr at: i) to: 'double') * (self cCoerce: (rcvrPtr at: i) to: 'double')). ]. + result := self cCode: [self sqrt:result] inSmalltalk: [result sqrt]. - result := self cCode: 'sqrt(result)' inSmalltalk: [result sqrt]. interpreterProxy pop: 1 thenPush: (interpreterProxy floatObjectOf: result)! Item was changed: ----- Method: FloatArrayPlugin>>primitiveNormalize (in category 'arithmetic primitives') ----- primitiveNormalize "Primitive. Normalize the argument (A FloatArray) in place." | rcvr rcvrPtr length len | <export: true> <var: #rcvrPtr type:'float *'> <var: #len type:'double '> rcvr := interpreterProxy stackObjectValue: 0. interpreterProxy failed ifTrue:[^nil]. interpreterProxy success: (interpreterProxy isWords: rcvr). interpreterProxy failed ifTrue:[^nil]. length := interpreterProxy stSizeOf: rcvr. interpreterProxy success: true. rcvrPtr := self cCoerce: (interpreterProxy firstIndexableField: rcvr) to: 'float *'. len := 0.0. 0 to: length-1 do:[:i| len := len + ((self cCoerce: (rcvrPtr at: i) to: 'double') * (self cCoerce: (rcvrPtr at: i) to: 'double')). ]. interpreterProxy success: (len > 0.0). interpreterProxy failed ifTrue:[^nil]. + len := self cCode: [self sqrt:len] inSmalltalk: [len sqrt]. - len := self cCode: 'sqrt(len)' inSmalltalk: [len sqrt]. 0 to: length-1 do:[:i| rcvrPtr at: i put: ((self cCoerce: (rcvrPtr at: i) to: 'double') / len). ]. "Leave receiver on the stack."! Item was changed: ----- Method: SoundPlugin>>primitiveSoundGetRecordingSampleRate (in category 'primitives') ----- primitiveSoundGetRecordingSampleRate "Return a float representing the actual sampling rate during recording. Fail if not currently recording." | rate | <var: #rate type: 'double '> self primitive: 'primitiveSoundGetRecordingSampleRate'. + rate := self snd_GetRecordingSampleRate. "fail if not recording" - rate := self cCode: 'snd_GetRecordingSampleRate()'. "fail if not recording" ^rate asFloatObj!

1 0

Re: [Vm-dev] VM Maker: VMMaker.oscog-eem.1868.mcz
by Esteban Lorenzano 26 May '16

26 May '16

Hi Eliot, this fix breaks some plugins. Next commit will fix some, but there are things I still don’t know how to model with new way, for example: self cCode: 'sigchldHandlerAction.sa_sigaction = reapChildProcess' the part that accessed the structure… no idea how to translate that to smalltalk code inside a block… cheers, Esteban > On 26 May 2016, at 04:53, commits(a)source.squeak.org wrote: > > > Eliot Miranda uploaded a new version of VMMaker to project VM Maker: > http://source.squeak.org/VMMaker/VMMaker.oscog-eem.1868.mcz > > ==================== Summary ==================== > > Name: VMMaker.oscog-eem.1868 > Author: eem > Time: 25 May 2016, 9:53:03.519464 pm > UUID: 5bcb9563-5037-4e58-8aca-fb68a963e028 > Ancestors: VMMaker.oscog-eem.1867 > > ...and fix Slang to translate th erevised noCheckPush:onObjStack: (using '' is quicker than [], but Slang needs not to translate the brace node). > > =============== Diff against VMMaker.oscog-eem.1867 =============== > > Item was changed: > ----- Method: MessageNode>>asTranslatorNodeIn: (in category '*VMMaker-C translation') ----- > asTranslatorNodeIn: aTMethod > "make a CCodeGenerator equivalent of me" > "selector is sometimes a Symbol, sometimes a SelectorNode!! > On top of this, numArgs is needed due to the (truly grody) use of > arguments as a place to store the extra expressions needed to generate > code for in-line to:by:do:, etc. see below, where it is used." > | rcvrOrNil sel args ifNotNilBlock | > rcvrOrNil := receiver ifNotNil: [receiver asTranslatorNodeIn: aTMethod]. > (rcvrOrNil notNil > and: [rcvrOrNil isVariable > and: [rcvrOrNil name = 'super']]) ifTrue: > [^aTMethod superExpansionNodeFor: selector key args: arguments]. > sel := selector isSymbol ifTrue: [selector] ifFalse: [selector key]. > + (sel == #cCode:inSmalltalk: "extracting here rather than in translation allows inlining in the block." > + or: [sel == #cCode:]) ifTrue: > + [arguments first isBlockNode ifTrue: > + [| block | > + ^(block := arguments first asTranslatorNodeIn: aTMethod) statements size = 1 > + ifTrue: [block statements first] > + ifFalse: [block]]. > + (arguments first isLiteralNode > + and: [arguments first key isString]) ifTrue: > + [^arguments first asTranslatorNodeIn: aTMethod]]. > - ((sel == #cCode:inSmalltalk: "extracting here rather than in translation allows inlining in the block." > - or: [sel == #cCode:]) > - and: [arguments first isBlockNode]) ifTrue: > - [| block | > - ^(block := arguments first asTranslatorNodeIn: aTMethod) statements size = 1 > - ifTrue: [block statements first] > - ifFalse: [block]]. > args := arguments > select: [:arg| arg notNil] > thenCollect: [:arg| arg asTranslatorNodeIn: aTMethod]. > (sel = #to:by:do: and: [arguments size = 7 and: [(arguments at: 7) notNil]]) ifTrue: > ["Restore limit expr that got moved by transformToDo:" > args := {(arguments at: 7) value asTranslatorNodeIn: aTMethod. > args second. > args third. "add the limit var as a hidden extra argument; we may need it later" > TVariableNode new setName: arguments first key}]. > (sel == #ifTrue:ifFalse: and: [arguments first isJust: NodeNil]) ifTrue: > [sel := #ifFalse:. args := {args last}]. > (sel == #ifTrue:ifFalse: and: [arguments last isJust: NodeNil]) ifTrue: > [sel := #ifTrue:. args := {args first}]. > (sel == #ifFalse:ifTrue: and: [arguments first isJust: NodeNil]) ifTrue: > [sel := #ifTrue:. args := {args last}]. > (sel == #ifFalse:ifTrue: and: [arguments last isJust: NodeNil]) ifTrue: > [sel := #ifTrue:. args := {args first}]. > ((sel == #ifFalse: or: [sel == #or:]) > and: [arguments size = 2 and: [(arguments at: 2) notNil]]) ifTrue: > ["Restore argument block that got moved by transformOr: or transformIfFalse:" > args := {(arguments at: 2) asTranslatorNodeIn: aTMethod}]. > (args size > sel numArgs and: [sel ~~ #to:by:do:]) ifTrue: "to:by:do: has iLimiT hidden in last arg" > ["prune the extra blocks left by ifTrue:, ifFalse:, and: & or:" > self assert: args size - sel numArgs = 1. > self assert: (args last isStmtList > and: [args last statements size = 1 > and: [(args last statements first isVariable > or: [args last statements first isConstant]) > and: [#('nil' true false) includes: args last statements first nameOrValue]]]). > args := args first: sel numArgs]. > "For the benefit of later passes, e.g. value: inlining, > transform e ifNotNil: [:v| ...] into v := e. v ifNotNil: [...], > which in fact means transforming (v := e) ifTrue: [:v|...] into v := e. v ifTrue: [...]." > ((sel == #ifTrue: or: [sel == #ifFalse: or: [sel == #ifTrue:ifFalse: or: [sel == #ifFalse:ifTrue:]]]) > and: [receiver notNil > and: [receiver isAssignmentEqualsEqualsNil > and: [(ifNotNilBlock := args detect: [:arg| arg isStmtList and: [arg args size = 1]] ifNone: []) notNil]]]) ifTrue: > [ifNotNilBlock setArguments: #(). > ^TStmtListNode new > setArguments: #() > statements: > { receiver receiver asTranslatorNodeIn: aTMethod. > TSendNode new > setSelector: sel > receiver: (TSendNode new > setSelector: #== > receiver: (receiver receiver variable asTranslatorNodeIn: aTMethod) > arguments: {receiver arguments first asTranslatorNodeIn: aTMethod}) > arguments: args }]. > ^TSendNode new > setSelector: sel > receiver: rcvrOrNil > arguments: args! >

1 0

VM Maker: VMMaker.oscog-eem.1868.mcz
by commits＠source.squeak.org 26 May '16

26 May '16

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.1868.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.1868 Author: eem Time: 25 May 2016, 9:53:03.519464 pm UUID: 5bcb9563-5037-4e58-8aca-fb68a963e028 Ancestors: VMMaker.oscog-eem.1867 ...and fix Slang to translate th erevised noCheckPush:onObjStack: (using '' is quicker than [], but Slang needs not to translate the brace node). =============== Diff against VMMaker.oscog-eem.1867 =============== Item was changed: ----- Method: MessageNode>>asTranslatorNodeIn: (in category '*VMMaker-C translation') ----- asTranslatorNodeIn: aTMethod "make a CCodeGenerator equivalent of me" "selector is sometimes a Symbol, sometimes a SelectorNode!! On top of this, numArgs is needed due to the (truly grody) use of arguments as a place to store the extra expressions needed to generate code for in-line to:by:do:, etc. see below, where it is used." | rcvrOrNil sel args ifNotNilBlock | rcvrOrNil := receiver ifNotNil: [receiver asTranslatorNodeIn: aTMethod]. (rcvrOrNil notNil and: [rcvrOrNil isVariable and: [rcvrOrNil name = 'super']]) ifTrue: [^aTMethod superExpansionNodeFor: selector key args: arguments]. sel := selector isSymbol ifTrue: [selector] ifFalse: [selector key]. + (sel == #cCode:inSmalltalk: "extracting here rather than in translation allows inlining in the block." + or: [sel == #cCode:]) ifTrue: + [arguments first isBlockNode ifTrue: + [| block | + ^(block := arguments first asTranslatorNodeIn: aTMethod) statements size = 1 + ifTrue: [block statements first] + ifFalse: [block]]. + (arguments first isLiteralNode + and: [arguments first key isString]) ifTrue: + [^arguments first asTranslatorNodeIn: aTMethod]]. - ((sel == #cCode:inSmalltalk: "extracting here rather than in translation allows inlining in the block." - or: [sel == #cCode:]) - and: [arguments first isBlockNode]) ifTrue: - [| block | - ^(block := arguments first asTranslatorNodeIn: aTMethod) statements size = 1 - ifTrue: [block statements first] - ifFalse: [block]]. args := arguments select: [:arg| arg notNil] thenCollect: [:arg| arg asTranslatorNodeIn: aTMethod]. (sel = #to:by:do: and: [arguments size = 7 and: [(arguments at: 7) notNil]]) ifTrue: ["Restore limit expr that got moved by transformToDo:" args := {(arguments at: 7) value asTranslatorNodeIn: aTMethod. args second. args third. "add the limit var as a hidden extra argument; we may need it later" TVariableNode new setName: arguments first key}]. (sel == #ifTrue:ifFalse: and: [arguments first isJust: NodeNil]) ifTrue: [sel := #ifFalse:. args := {args last}]. (sel == #ifTrue:ifFalse: and: [arguments last isJust: NodeNil]) ifTrue: [sel := #ifTrue:. args := {args first}]. (sel == #ifFalse:ifTrue: and: [arguments first isJust: NodeNil]) ifTrue: [sel := #ifTrue:. args := {args last}]. (sel == #ifFalse:ifTrue: and: [arguments last isJust: NodeNil]) ifTrue: [sel := #ifTrue:. args := {args first}]. ((sel == #ifFalse: or: [sel == #or:]) and: [arguments size = 2 and: [(arguments at: 2) notNil]]) ifTrue: ["Restore argument block that got moved by transformOr: or transformIfFalse:" args := {(arguments at: 2) asTranslatorNodeIn: aTMethod}]. (args size > sel numArgs and: [sel ~~ #to:by:do:]) ifTrue: "to:by:do: has iLimiT hidden in last arg" ["prune the extra blocks left by ifTrue:, ifFalse:, and: & or:" self assert: args size - sel numArgs = 1. self assert: (args last isStmtList and: [args last statements size = 1 and: [(args last statements first isVariable or: [args last statements first isConstant]) and: [#('nil' true false) includes: args last statements first nameOrValue]]]). args := args first: sel numArgs]. "For the benefit of later passes, e.g. value: inlining, transform e ifNotNil: [:v| ...] into v := e. v ifNotNil: [...], which in fact means transforming (v := e) ifTrue: [:v|...] into v := e. v ifTrue: [...]." ((sel == #ifTrue: or: [sel == #ifFalse: or: [sel == #ifTrue:ifFalse: or: [sel == #ifFalse:ifTrue:]]]) and: [receiver notNil and: [receiver isAssignmentEqualsEqualsNil and: [(ifNotNilBlock := args detect: [:arg| arg isStmtList and: [arg args size = 1]] ifNone: []) notNil]]]) ifTrue: [ifNotNilBlock setArguments: #(). ^TStmtListNode new setArguments: #() statements: { receiver receiver asTranslatorNodeIn: aTMethod. TSendNode new setSelector: sel receiver: (TSendNode new setSelector: #== receiver: (receiver receiver variable asTranslatorNodeIn: aTMethod) arguments: {receiver arguments first asTranslatorNodeIn: aTMethod}) arguments: args }]. ^TSendNode new setSelector: sel receiver: rcvrOrNil arguments: args!

1 0

VM Maker: VMMaker.oscog-eem.1867.mcz
by commits＠source.squeak.org 26 May '16

26 May '16

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.1867.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.1867 Author: eem Time: 25 May 2016, 9:38:19.765577 pm UUID: 17d41c8f-18a0-4dd0-8b35-1eba4ffa1d53 Ancestors: VMMaker.oscog-eem.1866 Fixes for ephemerons. Fix bug in markAllUnscannedEphemerons. Now Gille's test case works for 50k elements, but not yet for 200k. Fix asserts in various functions. =============== Diff against VMMaker.oscog-eem.1866 =============== Item was changed: ----- Method: SpurGenerationScavenger>>fireEphemeronsOnEphemeronList (in category 'weakness and ephemerality') ----- fireEphemeronsOnEphemeronList "There are ephemerons to be fired in the remembered set. Fire them and scavenge their keys. Be careful since copyAndForward: can remember ephemerons (ephemerons pointing to ephemerons)." | ephemeron ephemeronCorpse key oldList oldCorpse | "old ones for debugging" ephemeronList ifNil: [^self]. oldCorpse := nil. ephemeronCorpse := self firstCorpse: ephemeronList. "Reset the list head so that new ephemerons will get added to a new list, not concatenated on the one we are scanning." oldList := ephemeronList. ephemeronList := nil. + [ephemeronCorpse notNil] whileTrue: + [self assert: ((manager isYoung: ephemeronCorpse) and: [manager isForwarded: ephemeronCorpse]). - [self assert: (manager isYoung: ephemeronCorpse). - ephemeronCorpse notNil] whileTrue: - [self assert: (manager isForwarded: ephemeronCorpse). ephemeron := manager followForwarded: ephemeronCorpse. key := manager keyOfMaybeFiredEphemeron: ephemeron. (self isScavengeSurvivor: key) ifFalse: [coInterpreter fireEphemeron: ephemeron. manager storePointerUnchecked: 0 ofObject: ephemeron withValue: (self copyAndForward: key)]. "Fired ephemerons should have had their format changed." self deny: ((self isScavengeSurvivor: key) and: [manager isEphemeron: ephemeron]). self cCoerceSimple: (self scavengeReferentsOf: ephemeron) to: #void. oldCorpse := ephemeronCorpse. ephemeronCorpse := self nextCorpseOrNil: ephemeronCorpse]! Item was changed: ----- Method: SpurMemoryManager>>allUnscannedEphemeronsAreActive (in category 'weakness and ephemerality') ----- allUnscannedEphemeronsAreActive unscannedEphemerons start to: unscannedEphemerons top - self bytesPerOop by: self bytesPerOop do: [:p| | key | + key := self keyOfMaybeFiredEphemeron: (self longAt: p). - key := self keyOfEphemeron: (self longAt: p). ((self isImmediate: key) or: [self isMarked: key]) ifTrue: [^false]]. ^true! Item was added: + ----- Method: SpurMemoryManager>>followedKeyOfMaybeFiredEphemeron: (in category 'object access') ----- + followedKeyOfMaybeFiredEphemeron: objOop + "Answer the object the ephemeron guards. This is its first element." + self assert: ((self isNonImmediate: objOop) and: [self isMaybeFiredEphemeron: objOop]). + ^self followOopField: 0 ofObject: objOop! Item was changed: ----- Method: SpurMemoryManager>>is:onObjStack: (in category 'obj stacks') ----- is: oop onObjStack: objStack <inline: false> | index nextPage | + objStack = nilObj ifTrue: + [^false]. self assert: (self numSlotsOfAny: objStack) = ObjStackPageSlots. "There are four fixed slots in an obj stack, and a Topx of 0 indicates empty, so if there were 6 slots in an oop stack, full would be 2, and the last 0-rel index is 5." index := (self fetchPointer: ObjStackTopx ofObject: objStack) + ObjStackNextx. [index >= ObjStackFixedSlots] whileTrue: [oop = (self fetchPointer: index ofObject: objStack) ifTrue: [^true]. index := index - 1]. nextPage := self fetchPointer: ObjStackNextx ofObject: objStack. nextPage ~= 0 ifTrue: [(self is: oop onObjStack: nextPage) ifTrue: [^true]]. ^false! Item was changed: ----- Method: SpurMemoryManager>>markAllUnscannedEphemerons (in category 'weakness and ephemerality') ----- markAllUnscannedEphemerons "After firing the unscanned ephemerons we must scan-mark them. + The wrinkle is that doing so may add more ephemerons to the set. + So we remove the first element, by overwriting it with the last element, + and decrementing the top, and then markAndTrace its contents." - The wrinkle is that doing so may add more ephemerons to the set." - | ptr | self assert: (self noUnscannedEphemerons) not. self assert: self allUnscannedEphemeronsAreActive. + [unscannedEphemerons top > unscannedEphemerons start] whileTrue: + [| ephemeron key lastptr | + ephemeron := self longAt: unscannedEphemerons start. + lastptr := unscannedEphemerons top - self bytesPerOop. + lastptr > unscannedEphemerons start ifTrue: + [self longAt: unscannedEphemerons start put: (self longAt: lastptr)]. + unscannedEphemerons top: lastptr. + key := self followedKeyOfMaybeFiredEphemeron: ephemeron. + self setIsMarkedOf: ephemeron to: false. "to get it to be fully scanned in markAndTrace:" - ptr := unscannedEphemerons top - self wordSize. - [ptr >= unscannedEphemerons start] whileTrue: - [| ephemeron key | - key := self followedKeyOfEphemeron: (ephemeron := self longAt: ptr). self markAndTrace: key; + markAndTrace: ephemeron]! - markAndTrace: ephemeron. - unscannedEphemerons top: unscannedEphemerons top - self bytesPerOop. - ptr < unscannedEphemerons top ifTrue: - ["not the last entry; remove it by overwriting it with the last - ephemeron (which must have been newly added by markAndTrace:)." - self longAt: ptr put: (self longAt: unscannedEphemerons top)]. - ptr := ptr - self bytesPerOop]! Item was changed: ----- Method: SpurMemoryManager>>noCheckPush:onObjStack: (in category 'obj stacks') ----- noCheckPush: objOop onObjStack: objStack "Push an element on an objStack. Split from push:onObjStack: for testing." | topx | self eassert: [self isValidObjStack: objStack]. + self cCode: '' "for debugging markAndTrace: set (MarkStackRecord := OrderedCollection new)" - self cCode: [] "for debugging markAndTrace: set (MarkStackRecord := OrderedCollection new)" inSmalltalk: + [MarkStackRecord ifNotNil: + [(self fetchPointer: ObjStackMyx ofObject: objStack) = MarkStackRootIndex ifTrue: + [MarkStackRecord addLast: {#push. objOop}]]]. - [(self fetchPointer: ObjStackMyx ofObject: objStack) = MarkStackRootIndex ifTrue: - [MarkStackRecord ifNotNil: [MarkStackRecord addLast: {#push. objOop}]]]. topx := self fetchPointer: ObjStackTopx ofObject: objStack. topx >= ObjStackLimit ifTrue: [self noCheckPush: objOop onObjStack: (self ensureRoomOnObjStackAt: (self fetchPointer: ObjStackMyx ofObject: objStack))] ifFalse: [self storePointer: ObjStackFixedSlots + topx ofObjStack: objStack withValue: objOop. self storePointer: ObjStackTopx ofObjStack: objStack withValue: topx + 1]. ^objOop! Item was changed: ----- Method: SpurMemoryManager>>queueMourner: (in category 'weakness and ephemerality') ----- queueMourner: anEphemeronOrWeakArray "Add the ephemeron to the queue and make it non-ephemeral, to avoid subsequent firing. Alas this means that other ephemerons on the same object not identified in this sccavenge or GC will not fire until later. But that's life." self assert: ((self isNonImmediate: anEphemeronOrWeakArray) and: [(self formatOf: anEphemeronOrWeakArray) = self ephemeronFormat or: [(self formatOf: anEphemeronOrWeakArray) = self weakArrayFormat]]). + self deny: (self is: anEphemeronOrWeakArray onObjStack: mournQueue). - self deny: (mournQueue ~= nilObj - and: [self is: anEphemeronOrWeakArray onObjStack: mournQueue]). self ensureRoomOnObjStackAt: MournQueueRootIndex. + self push: anEphemeronOrWeakArray onObjStack: mournQueue! - self push: anEphemeronOrWeakArray onObjStack: mournQueue. - (self formatOf: anEphemeronOrWeakArray) = self ephemeronFormat ifTrue: - [self setFormatOf: anEphemeronOrWeakArray to: self nonIndexablePointerFormat]! Item was changed: ----- Method: StackInterpreter>>fireEphemeron: (in category 'finalization') ----- fireEphemeron: ephemeron <option: #SpurObjectMemory> + objectMemory queueMourner: ephemeron.. + self setFormatOf: ephemeron to: self nonIndexablePointerFormat. - objectMemory queueMourner: ephemeron. self signalFinalization: ephemeron!

1 0

VM Maker: VMMaker.oscog-eem.1866.mcz
by commits＠source.squeak.org 26 May '16

26 May '16

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.1866.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.1866 Author: eem Time: 25 May 2016, 5:58:11.196163 pm UUID: 7755faa2-afdc-4d3d-9530-47599e2eaf14 Ancestors: VMMaker.oscog-eem.1865 Fixes to ephemeron scavenging. Both fireEphemeronsInRememberedSet and fireEphemeronsOnEphemeronList must check for an ephemeron being fireable. An as-yet-firable ephemeron misgt get added to the ephemeron list and later its key may get tenured, rendering the ephemeron unfirable in that cycle. Fix marking of obj stack contents (markAndTraceObjStack:andContents:). Again tenuring could cause contents to be forwarded and hewnce a read barrier is needed. Fix asserts that check for ephemerons so that the change in an ephemeron's format once it gets added to the mournQueue doesn't break the asserts; isMaybeFiredEphemeron[Format]: answer true for ephemerons and ephemerons in the mournQueue. Make pushLiteralVariable: store unfollowed literals back into the literal frame. Do so in a function off to the side, not inlined into the interpreter loop. Slang: Fix computation of StackInterpreter's requiredMethodNames:; it must use objectMemoryClass, not assume NewObjectMemory. And SpurMemoryManager's api includes api methods in the scavenger. Henc3e printRememberedTable is now generated. With these changes Guille's test case still crashes but gets much further : | e | Smalltalk supportsQueueingFinalization: true. e := (1 to: 200000) collect: [ :i | Ephemeron key: (ObjectFinalizer receiver: 'test', 'asd' selector: #logCr) value: Object new ]. Smalltalk garbageCollect! =============== Diff against VMMaker.oscog-eem.1865 =============== Item was changed: ----- Method: SpurGenerationScavenger>>fireEphemeronsInRememberedSet (in category 'weakness and ephemerality') ----- fireEphemeronsInRememberedSet "There are ephemerons to be fired in the remembered set. Fire them and scavenge their keys. Leave it to scavengeLoop to remove any scavenged ephemerons that no longer have new referents." | i | self assert: self noUnfiredEphemeronsAtEndOfRememberedSet. i := 0. [i < numRememberedEphemerons] whileTrue: + [ | ephemeron key | - [ | ephemeron | ephemeron := rememberedSet at: i. self assert: (manager isEphemeron: ephemeron). + key := manager keyOfEphemeron: ephemeron. + (self isScavengeSurvivor: key) ifFalse: + [coInterpreter fireEphemeron: ephemeron. + manager + storePointerUnchecked: 0 + ofObject: ephemeron + withValue: (self copyAndForward: key)]. + "Fired ephemerons should have had their format changed." + self deny: ((self isScavengeSurvivor: key) and: [manager isEphemeron: ephemeron]). - self assert: (self isScavengeSurvivor: (manager keyOfEphemeron: ephemeron)) not. - coInterpreter fireEphemeron: ephemeron. - manager - storePointerUnchecked: 0 - ofObject: ephemeron - withValue: (self copyAndForward: (manager keyOfEphemeron: ephemeron)). (self scavengeReferentsOf: ephemeron) ifTrue: "keep in set" [i := i + 1] ifFalse: [manager setIsRememberedOf: ephemeron to: false. "remove from set by overwriting with next-to-be scanned" numRememberedEphemerons := numRememberedEphemerons - 1. previousRememberedSetSize := previousRememberedSetSize - 1. rememberedSetSize := rememberedSetSize - 1. "First overwrite with last firable ephemeron (could be a noop if this is the last one). Then overwrite last firable entry with next unscanned rememberedSet entry (could also be a noop). Then overwrite next unscanned entry with last unscanned rememberedSet entry (could also be a noop)." rememberedSet at: i put: (rememberedSet at: numRememberedEphemerons); at: numRememberedEphemerons put: (rememberedSet at: previousRememberedSetSize); at: previousRememberedSetSize put: (rememberedSet at: rememberedSetSize)]]. "no more firable ephemerons in this cycle. scavengeRememberedSetStartingAt: may find new ones." numRememberedEphemerons := 0! Item was changed: ----- Method: SpurGenerationScavenger>>fireEphemeronsOnEphemeronList (in category 'weakness and ephemerality') ----- fireEphemeronsOnEphemeronList "There are ephemerons to be fired in the remembered set. Fire them and scavenge their keys. Be careful since copyAndForward: can remember ephemerons (ephemerons pointing to ephemerons)." + | ephemeron ephemeronCorpse key oldList oldCorpse | "old ones for debugging" - | ephemeron ephemeronCorpse | ephemeronList ifNil: [^self]. + oldCorpse := nil. ephemeronCorpse := self firstCorpse: ephemeronList. "Reset the list head so that new ephemerons will get added to a new list, not concatenated on the one we are scanning." + oldList := ephemeronList. ephemeronList := nil. + [self assert: (manager isYoung: ephemeronCorpse). + ephemeronCorpse notNil] whileTrue: - [ephemeronCorpse notNil] whileTrue: [self assert: (manager isForwarded: ephemeronCorpse). ephemeron := manager followForwarded: ephemeronCorpse. + key := manager keyOfMaybeFiredEphemeron: ephemeron. + (self isScavengeSurvivor: key) ifFalse: + [coInterpreter fireEphemeron: ephemeron. + manager + storePointerUnchecked: 0 + ofObject: ephemeron + withValue: (self copyAndForward: key)]. + "Fired ephemerons should have had their format changed." + self deny: ((self isScavengeSurvivor: key) and: [manager isEphemeron: ephemeron]). - self assert: (self isScavengeSurvivor: (manager keyOfEphemeron: ephemeron)) not. - coInterpreter fireEphemeron: ephemeron. - manager - storePointerUnchecked: 0 - ofObject: ephemeron - withValue: (self copyAndForward: (manager keyOfEphemeron: ephemeron)). self cCoerceSimple: (self scavengeReferentsOf: ephemeron) to: #void. + oldCorpse := ephemeronCorpse. ephemeronCorpse := self nextCorpseOrNil: ephemeronCorpse]! Item was added: + ----- Method: SpurMemoryManager class>>requiredMethodNames: (in category 'translation') ----- + requiredMethodNames: options + "return the list of method names that should be retained for export or other support reasons" + ^(self exportAPISelectors: options), + (SpurGenerationScavenger exportAPISelectors: options)! Item was added: + ----- Method: SpurMemoryManager>>isMaybeFiredEphemeron: (in category 'object testing') ----- + isMaybeFiredEphemeron: objOop + ^self isMaybeFiredEphemeronFormat: (self formatOf: objOop)! Item was added: + ----- Method: SpurMemoryManager>>isMaybeFiredEphemeronFormat: (in category 'header formats') ----- + isMaybeFiredEphemeronFormat: format + "Answer if an object's format could be that of an ephemeron. When ephemerons are born + their format is ephemeronFormat, but when they fire their format is changed to 3 (inst vars + plus indexable fields) or 1 (objects with inst vars), we haven't decided which yet." + ^format <= self lastPointerFormat and: [format odd]! Item was added: + ----- Method: SpurMemoryManager>>isObjEphemeron: (in category 'object testing') ----- + isObjEphemeron: objOop + ^self isEphemeronFormat: (self formatOf: objOop)! Item was changed: ----- Method: SpurMemoryManager>>keyOfEphemeron: (in category 'object access') ----- keyOfEphemeron: objOop "Answer the object the ephemeron guards. This is its first element." + self assert: ((self isNonImmediate: objOop) and: [self isObjEphemeron: objOop]). - self assert: ((self isNonImmediate: objOop) and: [self isEphemeron: objOop]). ^self fetchPointer: 0 ofObject: objOop! Item was added: + ----- Method: SpurMemoryManager>>keyOfMaybeFiredEphemeron: (in category 'object access') ----- + keyOfMaybeFiredEphemeron: objOop + "Answer the object the ephemeron guards. This is its first element." + self assert: ((self isNonImmediate: objOop) and: [self isMaybeFiredEphemeron: objOop]). + ^self fetchPointer: 0 ofObject: objOop! Item was changed: ----- Method: SpurMemoryManager>>markAndTraceObjStack:andContents: (in category 'obj stacks') ----- markAndTraceObjStack: stackOrNil andContents: markAndTraceContents "An obj stack is a stack of objects stored in a hidden root slot, such as the markStack or the ephemeronQueue. It is a linked list of segments, with the hot end at the head of the list. It is a word object. The stack pointer is in ObjStackTopx and 0 means empty." <inline: false> | index field | stackOrNil = nilObj ifTrue: [^self]. self setIsMarkedOf: stackOrNil to: true. self assert: (self numSlotsOfAny: stackOrNil) = ObjStackPageSlots. field := self fetchPointer: ObjStackNextx ofObject: stackOrNil. field ~= 0 ifTrue: [self markAndTraceObjStack: field andContents: markAndTraceContents]. field := stackOrNil. [field := self fetchPointer: ObjStackFreex ofObject: field. field ~= 0] whileTrue: [self setIsMarkedOf: field to: true]. markAndTraceContents ifFalse: [^self]. "There are four fixed slots in an obj stack, and a Topx of 0 indicates empty, so if there were 6 slots in an oop stack, full would be 2, and the last 0-rel index is 5." index := (self fetchPointer: ObjStackTopx ofObject: stackOrNil) + ObjStackNextx. [index >= ObjStackFixedSlots] whileTrue: + [field := self followObjField: index ofObject: stackOrNil. - [field := self fetchPointer: index ofObject: stackOrNil. (self isImmediate: field) ifFalse: [self markAndTrace: field]. index := index - 1]! Item was changed: ----- Method: StackInterpreter class>>preambleCCode (in category 'translation') ----- preambleCCode ^ '/* Disable Intel compiler inlining of warning which is used for breakpoints */ #pragma auto_inline off sqInt warnpid, erroronwarn; void warning(char *s) { /* Print an error message but don''t necessarily exit. */ if (erroronwarn) error(s); if (warnpid) printf("\n%s pid %ld\n", s, (long)warnpid); else printf("\n%s\n", s); } void warningat(char *s, int l) { /* ditto with line number. */ /* use alloca to call warning so one does not have to remember to set two breakpoints... */ char *sl = alloca(strlen(s) + 16); sprintf(sl, "%s %d", s, l); warning(sl); } #pragma auto_inline on void invalidCompactClassError(char *s) { /* Print a (compact) class index error message and exit. */ #if SPURVM printf("\nClass %s does not have the required class index\n", s); #else printf("\nClass %s does not have the required compact class index\n", s); #endif exit(-1); } /* * Define sigsetjmp and siglongjmp to be the most minimal setjmp/longjmp available on the platform. */ #if WIN32 # define sigsetjmp(jb,ssmf) setjmp(jb) # define siglongjmp(jb,v) longjmp(jb,v) #else # define sigsetjmp(jb,ssmf) _setjmp(jb) # define siglongjmp(jb,v) _longjmp(jb,v) #endif + + #define odd(v) ((int)(v)&1) + #define even(v) (!!odd(v)) '! Item was changed: ----- Method: StackInterpreter class>>requiredMethodNames: (in category 'translation') ----- requiredMethodNames: options "return the list of method names that should be retained for export or other support reasons" | requiredList | requiredList := self exportAPISelectors: options. + requiredList addAll: (self objectMemoryClass requiredMethodNames: options). - requiredList addAll: (NewObjectMemory requiredMethodNames: options). "A number of methods required by VM support code, jitter, specific platforms etc" requiredList addAll: #( assertValidExecutionPointe:r:s: characterForAscii: findClassOfMethod:forReceiver: findSelectorOfMethod: forceInterruptCheck forceInterruptCheckFromHeartbeat fullDisplayUpdate getCurrentBytecode getFullScreenFlag getInterruptKeycode getInterruptPending getSavedWindowSize getThisSessionID interpret loadInitialContext primitiveFail primitiveFailFor: primitiveFlushExternalPrimitives printAllStacks printCallStack printContext: printExternalHeadFrame printFramesInPage: printFrame: printHeadFrame printMemory printOop: printStackPages printStackPageList printStackPagesInUse printStackPageListInUse readableFormat: readImageFromFile:HeapSize:StartingAt: setFullScreenFlag: setInterruptKeycode: setInterruptPending: setInterruptCheckChain: setSavedWindowSize: success: validInstructionPointer:inMethod:framePointer:). "Nice to actually have all the primitives available" requiredList addAll: (self primitiveTable select: [:each| each isSymbol]). "InterpreterProxy is the internal analogue of sqVirtualMachine.c, so make sure to keep all those" InterpreterProxy organization categories do: [:cat | ((cat ~= 'initialize') and: [cat ~= 'private']) ifTrue: [requiredList addAll: (InterpreterProxy organization listAtCategoryNamed: cat)]]. ^requiredList! Item was added: + ----- Method: StackInterpreter>>literal:ofMethod:put: (in category 'compiled methods') ----- + literal: offset ofMethod: methodPointer put: oop + <option: #SpurMemoryManager> + <inline: true> + objectMemory storePointer: offset + LiteralStart ofObject: methodPointer withValue: oop + ! Item was changed: ----- Method: StackInterpreter>>pushLiteralVariable: (in category 'stack bytecodes') ----- pushLiteralVariable: literalIndex objectMemory hasSpurMemoryManagerAPI ifTrue: [| litVar | "push/store/popLiteralVariable all fetch a literal, and either read or write the literal's value field. The fetch of the literal needs an explicit check (otherwise we would have to scan all literals in all methods in the stack zone, and the entire method on return, and global variables are relatively rare; in my work image 8.7% of literals are globals)." litVar := self literal: literalIndex. (objectMemory isForwarded: litVar) ifTrue: + [litVar := self unfollow: litVar atIndex: literalIndex]. - [litVar := objectMemory followForwarded: litVar]. self internalPush: (objectMemory fetchPointer: ValueIndex ofObject: litVar)] ifFalse: [self internalPush: (objectMemory fetchPointer: ValueIndex ofObject: (self literal: literalIndex))]! Item was added: + ----- Method: StackInterpreter>>unfollow:atIndex: (in category 'compiled methods') ----- + unfollow: litVar atIndex: literalIndex + <option: #SpurMemoryManager> + <inline: #never> "So rare it mustn't bulk up the common path" + | followed | + followed := objectMemory followForwarded: litVar. + self literal: literalIndex ofMethod: method put: followed. + ^followed!

1 0

[commit][3731] Apply the changes of Mr Hachisuka for multibyte character composition.
by commits＠squeakvm.org 26 May '16

26 May '16

Revision: 3731 Author: lewis Date: 2016-05-25 16:56:00 -0700 (Wed, 25 May 2016) Log Message: ----------- Apply the changes of Mr Hachisuka for multibyte character composition. The diff is in the earlier email from Yoshiki: http://lists.squeakfoundation.org/pipermail/squeak-dev/2016-May/189599.html http://www2.asu.ac.jp/hachi/v3/scratch14ime.html Changes are licenced MIT: http://lists.squeakfoundation.org/pipermail/squeak-dev/2016-May/189646.html Adapt the patch to use the -compositioninput option of the X11 display module. Also fix invocation of that option, which was missing the necessary declaration in sqUnixMain.c (hence did not work). With this change, if the -compositioninput options is on the command line, or if the equivalent SQUEAK_COMPOSITIONINPUT environment variable is set, then the recordPendingKeys() function in the X11 desplay module will use the enhancement of Mr. Hachisuka. Otherwise the original recordPendingKeys() logic is used. Modified Paths: -------------- branches/Cog/platforms/unix/vm-display-X11/sqUnixX11.c Modified: branches/Cog/platforms/unix/vm-display-X11/sqUnixX11.c =================================================================== --- branches/Cog/platforms/unix/vm-display-X11/sqUnixX11.c 2016-05-25 00:32:44 UTC (rev 3730) +++ branches/Cog/platforms/unix/vm-display-X11/sqUnixX11.c 2016-05-25 23:56:00 UTC (rev 3731) @@ -1713,29 +1713,100 @@ static int recordPendingKeys(void) { - if (inputCount > 0) + if (compositionInput) { - int i= iebOut - iebIn; - for (i= (i > 0 ? i : IEB_SIZE + i) / 4; i > 0; -- i) + if (inputCount <= 0) { + if (inputBuf != inputString) { + free(inputBuf); + inputBuf= inputString; + } + return 0; + } + + int utf32= 0; + while (inputCount > 0) { +# if defined(DEBUG_XIM) + fprintf(stderr, "%3d pending key 0x%02x\n", inputCount, *pendingKey); +# endif + /* 110x xxxx 10xx xxxx */ + if (inputCount >= 2 && + pendingKey[0] >= 0xc0 && pendingKey[0] <= 0xdf && + pendingKey[1] >= 0x80 && pendingKey[1] <= 0xbf) + { + utf32= ((pendingKey[0] & 0x1f) << 6) | + (pendingKey[1] & 0x3f); + recordKeyboardEvent(0, EventKeyDown, modifierState, utf32); + recordKeyboardEvent(0, EventKeyChar, modifierState, utf32); + pendingKey += 2; + inputCount -= 2; + } + /* 1110 xxxx 10xx xxxx 10xx xxxx */ + else if (inputCount >= 3 && + pendingKey[0] >= 0xe0 && pendingKey[0] <= 0xef && + pendingKey[1] >= 0x80 && pendingKey[1] <= 0xbf && + pendingKey[2] >= 0x80 && pendingKey[2] <= 0xbf) + { + utf32= ((pendingKey[0] & 0x0f) << 12) | + ((pendingKey[1] & 0x3f) << 6) | + (pendingKey[2] & 0x3f); + recordKeyboardEvent(0, EventKeyDown, modifierState, utf32); + recordKeyboardEvent(0, EventKeyChar, modifierState, utf32); + pendingKey += 3; + inputCount -= 3; + } + /* 1111 0xxx 10xx xxxx 10xx xxxx 10xx xxxx */ + else if (inputCount >= 4 && + pendingKey[0] >= 0xf0 && pendingKey[0] <= 0xf7 && + pendingKey[1] >= 0x80 && pendingKey[1] <= 0xbf && + pendingKey[2] >= 0x80 && pendingKey[2] <= 0xbf && + pendingKey[3] >= 0x80 && pendingKey[3] <= 0xbf) + { + utf32= ((pendingKey[0] & 0x07) << 18) | + ((pendingKey[1] & 0x3f) << 12) | + ((pendingKey[2] & 0x3f) << 6) | + (pendingKey[3] & 0x3f); + recordKeyboardEvent(0, EventKeyDown, modifierState, utf32); + recordKeyboardEvent(0, EventKeyChar, modifierState, utf32); + pendingKey += 4; + inputCount -= 4; + } + else + { + recordKeyboardEvent(*pendingKey, EventKeyDown, modifierState, 0); + recordKeyboardEvent(*pendingKey, EventKeyChar, modifierState, 0); + recordKeystroke(*pendingKey); /* DEPRECATED */ + pendingKey++; + inputCount--; + } + } + return 0; + } + else + { + if (inputCount > 0) { + int i= iebOut - iebIn; + for (i= (i > 0 ? i : IEB_SIZE + i) / 4; i > 0; -- i) + { # if defined(DEBUG_XIM) - fprintf(stderr, "%3d pending key %2d=0x%02x\n", inputCount, i, *pendingKey); + fprintf(stderr, "%3d pending key %2d=0x%02x\n", inputCount, i, *pendingKey); # endif - recordKeyboardEvent(*pendingKey, EventKeyDown, modifierState, 0); - recordKeyboardEvent(*pendingKey, EventKeyChar, modifierState, 0); - recordKeystroke(*pendingKey); /* DEPRECATED */ - ++pendingKey; - if (--inputCount == 0) break; + recordKeyboardEvent(*pendingKey, EventKeyDown, modifierState, 0); + recordKeyboardEvent(*pendingKey, EventKeyChar, modifierState, 0); + recordKeystroke(*pendingKey); /* DEPRECATED */ + ++pendingKey; + if (--inputCount == 0) break; + } + return 1; } - return 1; + /* inputBuf is allocated by lookupKeys */ + if (inputBuf != inputString) + { + free(inputBuf); + inputBuf= inputString; + } + return 0; } - /* inputBuf is allocated by lookupKeys */ - if (inputBuf != inputString) - { - free(inputBuf); - inputBuf= inputString; - } - return 0; } static int xkeysym2ucs4(KeySym keysym);

1 0

OS-X Squeak branch VM
by John McIntosh 25 May '16

25 May '16

I've a boatload of OS-X fixes to commit to the Squeak branch, but (0) I need someone to regenerate the iOS/vm/src/vm tree using whatever the current blessed pre-cog VMMaker version/setup/etc is. (a) Do I want to even bother? Should all app builds just be Cog based going forward? (b) I'm not sure what the current Squeak branch app update process is? (c) I don't do website, so need someone to flesh out http://squeakvm.org/mac/ a bit. IE Cocoa Stack VM & Cog VM links don't work (d) I need some help with the iOS builds/testing as there are pending changes there based on fixes to the OS-X code (mostly in the UI abstraction). -- =========================================================================== John M. McIntosh. Corporate Smalltalk Consulting Ltd https://www.linkedin.com/in/smalltalk ===========================================================================

2 2

[commit][3730] Fix VFP execution and VFP register reset.
by commits＠squeakvm.org 25 May '16

25 May '16

Revision: 3730 Author: eliot Date: 2016-05-24 17:32:44 -0700 (Tue, 24 May 2016) Log Message: ----------- Fix VFP execution and VFP register reset. XScale must not be included for VFP execution. Make sure processor's prog32Sig is set to HIGH. Assert this in runOnCPU. Make runOnCPU inline for performance. Requires r3729 of the Cog tree to link on Mac OS X. Modified Paths: -------------- trunk/platforms/Cross/plugins/GdbARMPlugin/sqGdbARMPlugin.c Property Changed: ---------------- trunk/platforms/Cross/plugins/sqPluginsSCCSVersion.h Modified: trunk/platforms/Cross/plugins/GdbARMPlugin/sqGdbARMPlugin.c =================================================================== --- trunk/platforms/Cross/plugins/GdbARMPlugin/sqGdbARMPlugin.c 2016-05-25 00:19:57 UTC (rev 3729) +++ trunk/platforms/Cross/plugins/GdbARMPlugin/sqGdbARMPlugin.c 2016-05-25 00:32:44 UTC (rev 3730) @@ -1,6 +1,7 @@ #define COG 1 #define FOR_COG_PLUGIN 1 +#include "sqAssert.h" #include "GdbARMPlugin.h" //disassembler #if __APPLE__ && __MACH__ @@ -35,11 +36,12 @@ void print_state(ARMul_State* state) { - printf("NextInstr: %i\ttheMemory: 0x%p\tNumInstrs: 0x%p\tPC: 0x%p\tmode: %i\tEndCondition: %i\tEmulate: %i\n", + printf("NextInstr: %i\ttheMemory: 0x%p\tNumInstrs: 0x%p\tPC: 0x%p\tmode: %i\tEndCondition: %i\tprog32Sig: %s\tEmulate: %i\n", state->NextInstr, state->MemDataPtr, state->NumInstrs, state->Reg[15], state->Mode, state->EndCondition, - state->Emulate); + state->prog32Sig == LOW ? "LOW" : (state->prog32Sig == HIGH ? "HIGH" : + (state->prog32Sig == HIGHLOW ? "HIGHLOW" : "???")), state->Emulate); } void* @@ -47,7 +49,11 @@ { if(lastCPU == NULL) ARMul_EmulateInit(); lastCPU = ARMul_NewState(); +#if 0 /* XScale seems to disable floating point */ ARMul_SelectProcessor (lastCPU, ARM_v5_Prop | ARM_v5e_Prop | ARM_XScale_Prop | ARM_v6_Prop); +#else /* see sim_create_inferior in sim/arm/wrapper.c */ + ARMul_SelectProcessor (lastCPU, ARM_v5_Prop | ARM_v5e_Prop | ARM_v6_Prop); +#endif return lastCPU; } @@ -57,50 +63,54 @@ unsigned int i, j; ARMul_State* state = (ARMul_State*) cpu; // test whether the supplied instance is an ARMul type? - + gdblog_index = 0; - + // reset registers in all modes - for (i = 0; i < 16; i++) - { + for (i = 0; i < 16; i++) { state->Reg[i] = 0; for (j = 0; j < 7; j++) state->RegBank[j][i] = 0; } for (i = 0; i < 7; i++) state->Spsr[i] = 0; - + for (i = 0; i < 32; i++) + state->VFP_Reg[i].dword = 0ULL; + // make sure the processor is at least in 32-bit mode + if (!state->prog32Sig) + state->prog32Sig = HIGH; ARMul_Reset(state); return 0; } -long +static inline long runOnCPU(void *cpu, void *memory, ulong byteSize, ulong minAddr, ulong minWriteMaxExecAddr, ARMword (*run)(ARMul_State*)) { ARMul_State* state = (ARMul_State*) cpu; lastCPU = state; - + + assert(state->prog32Sig == HIGH || state->prog32Sig == HIGHLOW); // test whether the supplied instance is an ARMul type? state->MemDataPtr = (unsigned char*) memory; state->MemSize = byteSize; minReadAddress = minAddr; minWriteAddress = minWriteMaxExecAddr; - + gdblog_index = 0; - + state->EndCondition = NoError; state->NextInstr = RESUME; - + state->Reg[15] = run(state); - + // collect the PSR from their dedicated flags to have easy access from the image. ARMul_SetCPSR(state, ARMul_GetCPSR(state)); - + if(state->EndCondition != NoError){ return state->EndCondition; } - + return gdblog_index == 0 ? 0 : SomethingLoggedError; } @@ -135,7 +145,7 @@ va_list arg; int n; va_start(arg,format); - + if(stream == NULL){ n = vsnprintf((char*) (&gdb_log) + gdblog_index, LOGSIZE-gdblog_index, format, arg); gdblog_index = gdblog_index + n; @@ -153,29 +163,29 @@ // ignore the cpu // start disassembling at laddr relative to memory // stop disassembling at memory+byteSize - + disassemble_info* dis = (disassemble_info*) calloc(1, sizeof(disassemble_info)); // void init_disassemble_info (struct disassemble_info *dinfo, void *stream, fprintf_ftype fprintf_func) init_disassemble_info ( dis, NULL, gdb_log_printf); - + dis->arch = bfd_arch_arm; dis->mach = bfd_mach_arm_unknown; - + // sets some fields in the structure dis to architecture specific values disassemble_init_for_target( dis ); - + dis->buffer_vma = 0; dis->buffer = memory; dis->buffer_length = byteSize; - + // first print the address gdb_log_printf( NULL, "%08lx: ", laddr); //other possible functions are listed in opcodes/dissassemble.c unsigned int size = print_insn_little_arm((bfd_vma) laddr, dis); - + free(dis); gdb_log[gdblog_index+1] = 0; - + return size; } Property changes on: trunk/platforms/Cross/plugins/sqPluginsSCCSVersion.h ___________________________________________________________________ Modified: checkindate - Thu Apr 28 22:05:49 PDT 2016 + Tue May 24 17:24:39 PDT 2016

1 0

[commit][3729] Fix the configuration of the gdb-7. x support for for the GdbARMPlugin (COG=1).
by commits＠squeakvm.org 25 May '16

25 May '16

Revision: 3729 Author: eliot Date: 2016-05-24 17:19:57 -0700 (Tue, 24 May 2016) Log Message: ----------- Fix the configuration of the gdb-7.x support for for the GdbARMPlugin (COG=1). Put #if COG around a couple of changes to the gdb-7.10 code. Allow assert to be used in the plugin on MacOS X (-undefined dynamic_lookup) Modified Paths: -------------- branches/Cog/build.linux32x86/gdbarm32/conf.COG branches/Cog/build.macos32x86/gdbarm32/conf.COG branches/Cog/build.macos64x64/gdbarm32/conf.COG branches/Cog/platforms/iOS/plugins/GdbARMPlugin/Makefile branches/Cog/processors/ARM/gdb-7.10/include/bfdlink.h branches/Cog/processors/ARM/gdb-7.10/sim/arm/armemu.c Property Changed: ---------------- branches/Cog/platforms/Cross/vm/sqSCCSVersion.h Modified: branches/Cog/build.linux32x86/gdbarm32/conf.COG =================================================================== --- branches/Cog/build.linux32x86/gdbarm32/conf.COG 2016-05-24 01:07:07 UTC (rev 3728) +++ branches/Cog/build.linux32x86/gdbarm32/conf.COG 2016-05-25 00:19:57 UTC (rev 3729) @@ -2,18 +2,18 @@ CFLAGS="-g -O2 -m32" mkdir -p zlib bfd libiberty opcodes sim/common sim/arm for d in zlib; do - (cd $d; ../../../processors/ARM/gdb-7.10/$d/configure CFLAGS="$CFLAGS") + (cd $d; ../../../processors/ARM/gdb-7.10/$d/configure COG=1 CFLAGS="$CFLAGS") done for d in bfd; do - (cd $d; ../../../processors/ARM/gdb-7.10/$d/configure CFLAGS="$CFLAGS"\ + (cd $d; ../../../processors/ARM/gdb-7.10/$d/configure COG=1 CFLAGS="$CFLAGS"\ --target=arm-linux --with-system-zlib=no) done for d in libiberty opcodes; do - (cd $d; ../../../processors/ARM/gdb-7.10/$d/configure CFLAGS="$CFLAGS"\ + (cd $d; ../../../processors/ARM/gdb-7.10/$d/configure COG=1 CFLAGS="$CFLAGS"\ --target=arm-linux) done for d in sim/common sim/arm; do (cd $d; - ../../../../processors/ARM/gdb-7.10/$d/configure CFLAGS="$CFLAGS"\ + ../../../../processors/ARM/gdb-7.10/$d/configure COG=1 CFLAGS="$CFLAGS"\ --target=arm-linux) done Modified: branches/Cog/build.macos32x86/gdbarm32/conf.COG =================================================================== --- branches/Cog/build.macos32x86/gdbarm32/conf.COG 2016-05-24 01:07:07 UTC (rev 3728) +++ branches/Cog/build.macos32x86/gdbarm32/conf.COG 2016-05-25 00:19:57 UTC (rev 3729) @@ -2,18 +2,18 @@ CFLAGS="-g -O2 -m32" mkdir -p zlib bfd libiberty opcodes sim/common sim/arm for d in zlib; do - (cd $d; ../../../processors/ARM/gdb-7.10/$d/configure CFLAGS="$CFLAGS") + (cd $d; ../../../processors/ARM/gdb-7.10/$d/configure COG=1 CFLAGS="$CFLAGS") done for d in bfd; do - (cd $d; ../../../processors/ARM/gdb-7.10/$d/configure CFLAGS="$CFLAGS"\ + (cd $d; ../../../processors/ARM/gdb-7.10/$d/configure COG=1 CFLAGS="$CFLAGS"\ --target=arm-linux --with-system-zlib=no) done for d in libiberty opcodes; do - (cd $d; ../../../processors/ARM/gdb-7.10/$d/configure CFLAGS="$CFLAGS"\ + (cd $d; ../../../processors/ARM/gdb-7.10/$d/configure COG=1 CFLAGS="$CFLAGS"\ --target=arm-linux) done for d in sim/common sim/arm; do (cd $d; - ../../../../processors/ARM/gdb-7.10/$d/configure CFLAGS="$CFLAGS"\ + ../../../../processors/ARM/gdb-7.10/$d/configure COG=1 CFLAGS="$CFLAGS"\ --target=arm-linux) done Modified: branches/Cog/build.macos64x64/gdbarm32/conf.COG =================================================================== --- branches/Cog/build.macos64x64/gdbarm32/conf.COG 2016-05-24 01:07:07 UTC (rev 3728) +++ branches/Cog/build.macos64x64/gdbarm32/conf.COG 2016-05-25 00:19:57 UTC (rev 3729) @@ -1,19 +1,19 @@ #!/bin/sh -CFLAGS="-g -O2" +CFLAGS="-g -O2 -m64" mkdir -p zlib bfd libiberty opcodes sim/common sim/arm for d in zlib; do - (cd $d; ../../../processors/ARM/gdb-7.10/$d/configure CFLAGS="$CFLAGS") + (cd $d; ../../../processors/ARM/gdb-7.10/$d/configure COG=1 CFLAGS="$CFLAGS") done for d in bfd; do - (cd $d; ../../../processors/ARM/gdb-7.10/$d/configure CFLAGS="$CFLAGS"\ + (cd $d; ../../../processors/ARM/gdb-7.10/$d/configure COG=1 CFLAGS="$CFLAGS"\ --target=arm-linux --with-system-zlib=no) done for d in libiberty opcodes; do - (cd $d; ../../../processors/ARM/gdb-7.10/$d/configure CFLAGS="$CFLAGS"\ + (cd $d; ../../../processors/ARM/gdb-7.10/$d/configure COG=1 CFLAGS="$CFLAGS"\ --target=arm-linux) done for d in sim/common sim/arm; do (cd $d; - ../../../../processors/ARM/gdb-7.10/$d/configure CFLAGS="$CFLAGS"\ + ../../../../processors/ARM/gdb-7.10/$d/configure COG=1 CFLAGS="$CFLAGS"\ --target=arm-linux) done Property changes on: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h ___________________________________________________________________ Modified: checkindate - Mon May 23 18:03:45 PDT 2016 + Tue May 24 17:17:47 PDT 2016 Modified: branches/Cog/platforms/iOS/plugins/GdbARMPlugin/Makefile =================================================================== --- branches/Cog/platforms/iOS/plugins/GdbARMPlugin/Makefile 2016-05-24 01:07:07 UTC (rev 3728) +++ branches/Cog/platforms/iOS/plugins/GdbARMPlugin/Makefile 2016-05-25 00:19:57 UTC (rev 3729) @@ -12,9 +12,20 @@ ../../processors/ARM/gdb-7.10/sim/arm \ ../../processors/ARM/gdb-7.10/bfd \ ../gdbarm32/bfd + +# assert uses warning, which is in the VM, so -undefined dynamic_lookup needed +ifeq ($(CONFIGURATION),assert) + EXTRA_FOR_ASSERT:=-undefined dynamic_lookup +else ifeq ($(CONFIGURATION),debug) + EXTRA_FOR_ASSERT:=-undefined dynamic_lookup + BUILD:=builddbg +else # default CONFIGURATION=product + EXTRA_FOR_ASSERT:= +endif EXTRALIBS:=-L../gdbarm32/bfd -L../gdbarm32/libiberty -L../gdbarm32/opcodes \ -L../gdbarm32/sim/arm -L../gdbarm32/zlib \ - -lbfd -liberty -lopcodes -lopcodes -lsim -lz + -lbfd -liberty -lopcodes -lopcodes -lsim -lz \ + $(EXTRA_FOR_ASSERT) include ../common/Makefile.plugin Modified: branches/Cog/processors/ARM/gdb-7.10/include/bfdlink.h =================================================================== --- branches/Cog/processors/ARM/gdb-7.10/include/bfdlink.h 2016-05-24 01:07:07 UTC (rev 3728) +++ branches/Cog/processors/ARM/gdb-7.10/include/bfdlink.h 2016-05-25 00:19:57 UTC (rev 3729) @@ -432,8 +432,7 @@ char path_separator; /* TAO -- removed for Cog */ -#if 0 -#else +#if !COG /* Compress DWARF debug sections. */ enum compressed_debug_section_type compress_debug; #endif Modified: branches/Cog/processors/ARM/gdb-7.10/sim/arm/armemu.c =================================================================== --- branches/Cog/processors/ARM/gdb-7.10/sim/arm/armemu.c 2016-05-24 01:07:07 UTC (rev 3728) +++ branches/Cog/processors/ARM/gdb-7.10/sim/arm/armemu.c 2016-05-25 00:19:57 UTC (rev 3729) @@ -6008,7 +6008,11 @@ state->Reg[nRdHi] = RdHi; } else +#if COG fprintf (stderr, "sim: MULTIPLY64 - INVALID ARGUMENTS instr=%08x\n", instr); +#else + fprintf (stderr, "sim: MULTIPLY64 - INVALID ARGUMENTS\n"); +#endif if (scc) /* Ensure that both RdHi and RdLo are used to compute Z,

1 0

← Newer
1
2
3
4
5
6
7
8
...
15
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

Vm-dev May 2016