Vm-dev January 2017

vm-dev@lists.squeakfoundation.org

30 participants
136 discussions

[OpenSmalltalk/opensmalltalk-vm] c66b23: CogVM source as per VMMaker.oscogSPC-eem.2113
by GitHub 26 Jan '17

26 Jan '17

Branch: refs/heads/SpurPlanningCompactor Home: https://github.com/OpenSmalltalk/opensmalltalk-vm Commit: c66b23377042503dbfd63ce92291f7cf8ee140cd https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/c66b23377042503dbf… Author: Eliot Miranda <eliot.miranda(a)gmail.com> Date: 2017-01-26 (Thu, 26 Jan 2017) Changed paths: M build.linux32ARMv6/editnewspeakinstall.sh M build.linux32ARMv6/editpharoinstall.sh M build.linux32ARMv7/editnewspeakinstall.sh M build.linux32x86/editnewspeakinstall.sh M build.linux32x86/editpharoinstall.sh M build.linux64x64/editnewspeakinstall.sh M build.linux64x64/editpharoinstall.sh M nsspur64src/vm/cogit.h M nsspur64src/vm/cogitX64.c M nsspur64src/vm/cointerp.c M nsspur64src/vm/cointerp.h M nsspur64src/vm/gcc3x-cointerp.c M nsspursrc/vm/cogit.h M nsspursrc/vm/cogitARMv5.c M nsspursrc/vm/cogitIA32.c M nsspursrc/vm/cogitMIPSEL.c M nsspursrc/vm/cointerp.c M nsspursrc/vm/cointerp.h M nsspursrc/vm/gcc3x-cointerp.c M nsspurstack64src/vm/gcc3x-interp.c M nsspurstack64src/vm/interp.c M nsspurstacksrc/vm/gcc3x-interp.c M nsspurstacksrc/vm/interp.c M spur64src/vm/cogit.h M spur64src/vm/cogitX64.c M spur64src/vm/cointerp.c M spur64src/vm/cointerp.h M spur64src/vm/gcc3x-cointerp.c M spursista64src/vm/cogit.h M spursista64src/vm/cogitX64.c M spursista64src/vm/cointerp.c M spursista64src/vm/cointerp.h M spursista64src/vm/gcc3x-cointerp.c M spursistasrc/vm/cogit.h M spursistasrc/vm/cogitARMv5.c M spursistasrc/vm/cogitIA32.c M spursistasrc/vm/cogitMIPSEL.c M spursistasrc/vm/cointerp.c M spursistasrc/vm/cointerp.h M spursistasrc/vm/gcc3x-cointerp.c M spursrc/vm/cogit.h M spursrc/vm/cogitARMv5.c M spursrc/vm/cogitIA32.c M spursrc/vm/cogitMIPSEL.c M spursrc/vm/cointerp.c M spursrc/vm/cointerp.h M spursrc/vm/gcc3x-cointerp.c M spurstack64src/vm/gcc3x-interp.c M spurstack64src/vm/interp.c M spurstacksrc/vm/gcc3x-interp.c M spurstacksrc/vm/interp.c M src/vm/cogit.h M src/vm/cogitARMv5.c M src/vm/cogitIA32.c M src/vm/cogitMIPSEL.c Log Message: ----------- CogVM source as per VMMaker.oscogSPC-eem.2113 Temporary branch for SpurPlanningCompactor as default compactor. copyAndUnmarkObject:to:bytes:firstField: musty use memmove sincer the source aed destination can overlap. Improve the simulator's implementations of mem:cp:y: to check for this. freeFrom:upTo:previousPin: may be given a toFinger beyond lastMobileObject, in which case toFinger must be wslid up to the next freeable object, if any. Add leak checking of CogMethod counters and implicit reveiver caches. Inline markIfIRC: Change the linux edit scripts for Pharo and Newspeak to fail to symbolic links if hard linking the sources fails. Parallels' disc server that allows access to one's home directory is such crap that it doesn't support hard links (and yes, I've talked to their tech support and they were, um, uncomprehending).

1 0

VM Maker: VMMaker.oscogSPC-eem.2113.mcz
by commits＠source.squeak.org 26 Jan '17

26 Jan '17

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscogSPC-eem.2113.mcz ==================== Summary ==================== Name: VMMaker.oscogSPC-eem.2113 Author: eem Time: 26 January 2017, 11:08:47.456381 am UUID: 759b608a-4e67-41d5-a8d7-2ba8b63010a7 Ancestors: VMMaker.oscogSPC-eem.2112 Temporary branch for SpurPlanningCompactor as default compactor. copyAndUnmarkObject:to:bytes:firstField: musty use memmove sincer the source aed destination can overlap. Improve the simulator's implementations of mem:cp:y: to check for this. freeFrom:upTo:previousPin: may be given a toFinger beyond lastMobileObject, in which case toFinger must be wslid up to the next freeable object, if any. Add leak checking of CogMethod counters and implicit reveiver caches. Inline markIfIRC: =============== Diff against VMMaker.oscogSPC-eem.2112 =============== Item was added: + ----- Method: CogObjectRepresentationForSpur>>checkValidDerivedObjectReference: (in category 'debug support') ----- + checkValidDerivedObjectReference: bodyAddress + ^(objectMemory heapMapAtWord: (self pointerForOop: bodyAddress - objectMemory baseHeaderSize)) ~= 0! Item was added: + ----- Method: CogObjectRepresentationForSpur>>couldBeDerivedObject: (in category 'garbage collection') ----- + couldBeDerivedObject: bodyAddress + ^self oop: bodyAddress - objectMemory baseHeaderSize isGreaterThanOrEqualTo: objectMemory startOfMemory! Item was changed: ----- Method: CogObjectRepresentationForSpur>>markIfIRC: (in category 'newspeak support') ----- markIfIRC: maybeIRCs "If maybeIRCs (from some cogMehtod's nextMethodOrIRCs) is in old space it is a pointer to the first field of a pinned object in old space holding the implicit receiver caches for a method. If so, map it back to an oop and mark it." <var: #maybeIRCs type: #usqInt> <option: #NewspeakVM> + <inline: true> (self oop: maybeIRCs isGreaterThan: objectMemory nilObject) ifTrue: [objectMemory markAndTrace: maybeIRCs - objectMemory baseHeaderSize]! Item was changed: ----- Method: Cogit>>allMachineCodeObjectReferencesValid (in category 'garbage collection') ----- allMachineCodeObjectReferencesValid "Check that all methods have valid selectors, and that all linked sends are to valid targets and have valid cache tags" | ok cogMethod | <var: #cogMethod type: #'CogMethod *'> ok := true. cogMethod := self cCoerceSimple: methodZoneBase to: #'CogMethod *'. [cogMethod < methodZone limitZony] whileTrue: [cogMethod cmType ~= CMFree ifTrue: [(self asserta: (objectRepresentation checkValidOopReference: cogMethod selector)) ifFalse: [ok := false]. (self asserta: (self cogMethodDoesntLookKosher: cogMethod) = 0) ifFalse: [ok := false]]. (cogMethod cmType = CMMethod or: [cogMethod cmType = CMOpenPIC]) ifTrue: [(self asserta: ((self mapFor: cogMethod performUntil: #checkIfValidOopRefAndTarget:pc:cogMethod: arg: cogMethod asInteger) = 0)) ifFalse: [ok := false]]. + (cogMethod cmType = CMMethod + and: [(NewspeakVM or: [SistaVM]) + and: [objectRepresentation canPinObjects]]) ifTrue: + [(SistaVM and: [cogMethod counters ~= 0]) ifTrue: + [(self asserta: (objectRepresentation checkValidDerivedObjectReference: cogMethod counters)) ifFalse: + [ok := false]]. + (NewspeakVM and: [cogMethod nextMethodOrIRCs ~= 0]) ifTrue: + [(self asserta: (objectRepresentation checkValidDerivedObjectReference: cogMethod nextMethodOrIRCs)) ifFalse: + [ok := false]]]. cogMethod cmType = CMClosedPIC ifTrue: [(self asserta: (self noTargetsFreeInClosedPIC: cogMethod)) ifFalse: [ok := false]]. cogMethod := methodZone methodAfter: cogMethod]. ^ok! Item was changed: ----- Method: Cogit>>cogMethodDoesntLookKosher: (in category 'debugging') ----- cogMethodDoesntLookKosher: cogMethod "Check that the header fields onf a non-free method are consistent with the type. Answer 0 if it is ok, otherwise answer a code for the error." <api> <inline: false> <var: #cogMethod type: #'CogMethod *'> ((cogMethod blockSize bitAnd: objectMemory wordSize - 1) ~= 0 or: [cogMethod blockSize < (self sizeof: CogMethod) or: [cogMethod blockSize >= 32768]]) ifTrue: [^1]. cogMethod cmType = CMFree ifTrue: [^2]. cogMethod cmType = CMMethod ifTrue: [(objectMemory isIntegerObject: cogMethod methodHeader) ifFalse: [^11]. (objectRepresentation couldBeObject: cogMethod methodObject) ifFalse: [^12]. (cogMethod stackCheckOffset > 0 + and: [cogMethod stackCheckOffset < cmNoCheckEntryOffset]) ifTrue: - and: [cogMethod stackCheckOffset < cmNoCheckEntryOffset]) ifTrue: [^13]. + (SistaVM + and: [objectRepresentation canPinObjects + and: [cogMethod counters ~= 0]]) ifTrue: + [(objectRepresentation couldBeDerivedObject: cogMethod counters) ifFalse: + [^14]]. + (NewspeakVM + and: [objectRepresentation canPinObjects + and: [cogMethod nextMethodOrIRCs ~= 0]]) ifTrue: + [(objectRepresentation couldBeDerivedObject: cogMethod nextMethodOrIRCs) ifFalse: + [^15]]. ^0]. cogMethod cmType = CMOpenPIC ifTrue: [cogMethod blockSize ~= openPICSize ifTrue: [^21]. cogMethod methodHeader ~= 0 ifTrue: [^22]. "Check the nextOpenPIC link unless we're compacting" cogMethod objectHeader >= 0 ifTrue: [(cogMethod methodObject ~= 0 and: [cogMethod methodObject < methodZoneBase or: [cogMethod methodObject > (methodZone freeStart - openPICSize) or: [(cogMethod methodObject bitAnd: objectMemory wordSize - 1) ~= 0 or: [(self cCoerceSimple: cogMethod methodObject to: #'CogMethod *') cmType ~= CMOpenPIC]]]]) ifTrue: [^23]]. cogMethod stackCheckOffset ~= 0 ifTrue: [^24]. ^0]. cogMethod cmType = CMClosedPIC ifTrue: [cogMethod blockSize ~= closedPICSize ifTrue: [^31]. (cogMethod cPICNumCases between: 1 and: MaxCPICCases) ifFalse: [^32]. cogMethod methodHeader ~= 0 ifTrue: [^33]. cogMethod methodObject ~= 0 ifTrue: [^34]. ^0]. ^9! Item was changed: ----- Method: SpurMemoryManager>>mem:cp:y: (in category 'simulation') ----- mem: destAddress cp: sourceAddress y: bytes + "For SpurGenerationScavenger>>copyToFutureSpace:bytes:. N.B. If ranges overlap, must use memmove." - "For SpurGenerationScavenger>>copyToFutureSpace:bytes:" <doNotGenerate> + self deny: ((destAddress <= sourceAddress and: [destAddress + bytes > sourceAddress]) + or: [sourceAddress <= destAddress and: [sourceAddress + bytes > destAddress]]). ^self mem: destAddress mo: sourceAddress ve: bytes! Item was changed: ----- Method: SpurPlanningCompactor>>copyAndUnmarkObject:to:bytes:firstField: (in category 'compaction') ----- copyAndUnmarkObject: o to: toFinger bytes: bytes firstField: firstField "Copy the object to toFinger, clearing its mark bit and restoring its firstField, which was overwritten with a forwarding pointer. Answer the number of bytes in the object, including overflow header." <inline: true> | numSlots destObj start | numSlots := manager rawNumSlotsOf: o. destObj := (manager objectWithRawSlotsHasOverflowHeader: numSlots) ifTrue: [toFinger + manager baseHeaderSize] ifFalse: [toFinger]. start := manager startOfObject: o given: numSlots. + "memmove must be used since the ranges may overlap." manager + mem: toFinger asVoidPointer mo: start asVoidPointer ve: bytes; - mem: toFinger asVoidPointer cp: start asVoidPointer y: bytes; setIsMarkedOf: destObj to: false; storePointerUnchecked: 0 ofObject: destObj withValue: firstField! Item was changed: ----- Method: SpurPlanningCompactor>>freeFrom:upTo:previousPin: (in category 'private') ----- freeFrom: toFinger upTo: limit previousPin: previousPinOrNil "Free from toFinger up to limit, dealing with a possible intervening run of pinned objects starting at previousPinOrNil." <inline: false> <var: 'limit' type: #usqInt> <var: 'toFinger' type: #usqInt> <var: 'previousPinOrNil' type: #usqInt> | effectiveToFinger pin nextUnpinned start seg | <var: 'nextUnpinned' type: #usqInt> <var: #seg type: #'SpurSegmentInfo *'> self cCode: [] inSmalltalk: [coInterpreter cr; cr; print: 'freeing at '; printHexnp: toFinger; print: ' up to '; printHexnp: limit; print: ' pin '; printHexnp: previousPinOrNil; cr]. effectiveToFinger := toFinger. pin := previousPinOrNil. + "If toFinger is past lastMobileObject then it was impossible to move an object past a pin + and toFinger is pointing at an object. The object may be a pin which must be preserved." + effectiveToFinger > lastMobileObject ifTrue: + [effectiveToFinger >= limit ifTrue: + [^self]. + nextUnpinned := manager objectStartingAt: effectiveToFinger. + [(manager isPinned: nextUnpinned) and: [manager isMarked: nextUnpinned]] whileTrue: + [nextUnpinned := manager objectAfter: nextUnpinned. + nextUnpinned >= limit ifTrue: + [^self]]. + effectiveToFinger := manager startOfObject: nextUnpinned. + (previousPinOrNil notNil and: [effectiveToFinger > previousPinOrNil]) ifTrue: + [pin := nil]]. "If the range toFinger to limit spans segments but there is no pin (as when freeing to the end of memory) segment boundaries must still be observed. So in this case use the nearest bridge above toFinger as the pin." pin ifNil: [seg := manager segmentManager segmentContainingObj: toFinger. seg segLimit < limit ifTrue: [pin := manager segmentManager bridgeFor: seg]]. [pin notNil] whileTrue: [(start := manager startOfObject: pin) > toFinger ifTrue: [manager addFreeChunkWithBytes: start - effectiveToFinger at: effectiveToFinger]. nextUnpinned := self unmarkPinnedObjectsAndFindFirstUnpinnedOrFreeEntityFollowing: pin. nextUnpinned >= limit ifTrue: [^self]. effectiveToFinger := manager startOfObject: nextUnpinned. pin := self findNextMarkedPinnedAfter: nextUnpinned]. manager addFreeChunkWithBytes: limit - effectiveToFinger at: effectiveToFinger! Item was changed: ----- Method: VMClass>>mem:cp:y: (in category 'C library simulation') ----- + mem: dString cp: sString y: bytes - mem: aString cp: bString y: n <doNotGenerate> + "implementation of memcpy(3). N.B. If ranges overlap, must use memmove." + (dString isString or: [sString isString]) ifFalse: + [| destAddress sourceAddress | + destAddress := dString asInteger. + sourceAddress := sString asInteger. + self deny: ((destAddress <= sourceAddress and: [destAddress + bytes > sourceAddress]) + or: [sourceAddress <= destAddress and: [sourceAddress + bytes > destAddress]])]. + dString isString - "implementation of memcpy(3)" - aString isString ifTrue: + [1 to: bytes do: - [1 to: n do: [:i| | v | + v := sString isString + ifTrue: [sString at: i] + ifFalse: [Character value: (self byteAt: sString + i - 1)]. + dString at: i put: v]] - v := bString isString - ifTrue: [bString at: i] - ifFalse: [Character value: (self byteAt: bString + i - 1)]. - aString at: i put: v]] ifFalse: + [1 to: bytes do: - [1 to: n do: [:i| | v | + v := sString isString + ifTrue: [(sString at: i) asInteger] + ifFalse: [self byteAt: sString + i - 1]. + self byteAt: dString + i - 1 put: v]]. + ^dString! - v := bString isString - ifTrue: [(bString at: i) asInteger] - ifFalse: [self byteAt: bString + i - 1]. - self byteAt: aString + i - 1 put: v]]. - ^aString!

1 0

[OpenSmalltalk/opensmalltalk-vm] 3c15cc: Merge commit '62e6114a900842c88b2b083a4ba293d7e37b...
by GitHub 26 Jan '17

26 Jan '17

Branch: refs/heads/Cog Home: https://github.com/OpenSmalltalk/opensmalltalk-vm Commit: 3c15ccb21a24d4e8dc3420d3b31826d19cb45434 https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/3c15ccb21a24d4e8dc… Author: Esteban Lorenzano <estebanlm(a)gmail.com> Date: 2017-01-23 (Mon, 23 Jan 2017) Changed paths: M build.linux32x86/HowToBuild M build.linux64x64/HowToBuild Log Message: ----------- Merge commit '62e6114a900842c88b2b083a4ba293d7e37b839f' Commit: 5c8305b946a9b436e3afc88691e24f527d5f7790 https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/5c8305b946a9b436e3… Author: Esteban Lorenzano <estebanlm(a)gmail.com> Date: 2017-01-23 (Mon, 23 Jan 2017) Changed paths: M build.linux32ARMv6/pharo.cog.spur/plugins.ext M build.linux32x86/pharo.cog.spur/plugins.ext M build.linux64x64/pharo.cog.spur/plugins.ext Log Message: ----------- add AioPlugin for linux distros as external plugin. as wigh SqueakSSL, I don’t know why this plugin is missing. Commit: 5de089bd44723a19c9fa832ca498a6c604051050 https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/5de089bd44723a19c9… Author: Esteban Lorenzano <estebanlm(a)gmail.com> Date: 2017-01-26 (Thu, 26 Jan 2017) Changed paths: M build.linux32ARMv6/pharo.cog.spur/plugins.ext M build.linux32x86/pharo.cog.spur/plugins.ext M build.linux64x64/pharo.cog.spur/plugins.ext Log Message: ----------- Merge pull request #114 from estebanlm/Cog adding AioPlugin (external) to Pharo linux distributions Compare: https://github.com/OpenSmalltalk/opensmalltalk-vm/compare/6df2f02e128e...5d…

1 0

Garbage collector issue
by Pavel Krivanek 26 Jan '17

26 Jan '17

Hi, in Pharo and in Squeak, if you try to print: Point allInstances size. several times, you will get fastly growing number of Point instances in most cases. But when you do: Smalltalk garbageCollect. Point allInstances size. The number of instances is quite stable. I realized that about every 5 milliseconds two new Point instances are created and not collected in reasonable time. I tried to find what points to them and I realized that nothing. That two instances contain display size so it was easy to find the place where these points are created. In Pharo it is in MorphicUIManager>>#checkForNewDisplaySize "Check whether the screen size has changed and if so take appropriate actions" Display extent = DisplayScreen actualScreenSize ifTrue: [^ Display]. DisplayScreen startUp. World restoreMorphicDisplay. As you can see in the code, the two point instances are only very temporary objects. And with some experiments I realized that that behavior is not Point specific (eg. some problem with the @ primitive). Because if you replace the code of the method with only Object basicNew, the growth of Object instances is similar. See the attached script. pharo-ui Pharo st script2.st Cheers, -- Pavel

3 5

SqueakJS named primitives in the interpreter module
by David T. Lewis 26 Jan '17

26 Jan '17

For named primitives, we can load and run a primitive function from a specific module, as in the case of <primitive: 'primitiveFileSize' module: 'FilePlugin'>. We can also load a primitive with module name unspecified, as in the case of <primitive: 'primitiveScreenDepth'>. In that case we load and run the function from the main interpreter module. I want to implement the anonymous named primitive #primitiveUtcWithOffset in SqueakJS, but I am a total JavaScript noob so I am looking for an example of some other anonymous named primitive to use as a pattern. At first glance, I do not see any anonymous named primitives implemented in vm.js, so I want to ask - does the basic functionality of looking up and executing e.g. #primitiveScreenDepth from the <primitive: 'primitiveScreenDepth'> pragma work? For reference, here are the named primitives in the anonymous module as referenced from methods in Squeak trunk. ( Pragma allSubInstances select: [:e | ( e keyword = #primitive: and: [ e numArgs = 1 ] ) and: [ e arguments first isInteger not ] ] ) collect: [ :e | e arguments first asSymbol ]. TIA, Dave

2 10

[OpenSmalltalk/opensmalltalk-vm] 67fa2a: CogVM source as per Name: VMMaker.oscogSPC-eem.211...
by GitHub 25 Jan '17

25 Jan '17

Branch: refs/heads/SpurPlanningCompactor Home: https://github.com/OpenSmalltalk/opensmalltalk-vm Commit: 67fa2a2e23f844d3935dcdc5bafb669a3a240357 https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/67fa2a2e23f844d393… Author: Eliot Miranda <eliot.miranda(a)gmail.com> Date: 2017-01-25 (Wed, 25 Jan 2017) Changed paths: M build.linux32ARMv6/editnewspeakinstall.sh M build.linux32ARMv6/editpharoinstall.sh M build.linux32x86/HowToBuild M build.linux32x86/editnewspeakinstall.sh M build.linux32x86/editpharoinstall.sh M build.linux64x64/HowToBuild M build.linux64x64/editnewspeakinstall.sh M build.linux64x64/editpharoinstall.sh M nsspur64src/vm/cogit.h M nsspur64src/vm/cogitX64.c M nsspur64src/vm/cointerp.c M nsspur64src/vm/cointerp.h M nsspur64src/vm/gcc3x-cointerp.c M nsspursrc/vm/cogit.h M nsspursrc/vm/cogitARMv5.c M nsspursrc/vm/cogitIA32.c M nsspursrc/vm/cogitMIPSEL.c M nsspursrc/vm/cointerp.c M nsspursrc/vm/cointerp.h M nsspursrc/vm/gcc3x-cointerp.c M nsspurstack64src/vm/gcc3x-interp.c M nsspurstack64src/vm/interp.c M nsspurstacksrc/vm/gcc3x-interp.c M nsspurstacksrc/vm/interp.c M scripts/revertIfEssentiallyUnchanged M spur64src/vm/cogit.h M spur64src/vm/cogitX64.c M spur64src/vm/cointerp.c M spur64src/vm/cointerp.h M spur64src/vm/gcc3x-cointerp.c M spursista64src/vm/cogit.h M spursista64src/vm/cogitX64.c M spursista64src/vm/cointerp.c M spursista64src/vm/cointerp.h M spursista64src/vm/gcc3x-cointerp.c M spursistasrc/vm/cogit.h M spursistasrc/vm/cogitARMv5.c M spursistasrc/vm/cogitIA32.c M spursistasrc/vm/cogitMIPSEL.c M spursistasrc/vm/cointerp.c M spursistasrc/vm/cointerp.h M spursistasrc/vm/gcc3x-cointerp.c M spursrc/vm/cogit.h M spursrc/vm/cogitARMv5.c M spursrc/vm/cogitIA32.c M spursrc/vm/cogitMIPSEL.c M spursrc/vm/cointerp.c M spursrc/vm/cointerp.h M spursrc/vm/gcc3x-cointerp.c M spurstack64src/vm/gcc3x-interp.c M spurstack64src/vm/interp.c M spurstacksrc/vm/gcc3x-interp.c M spurstacksrc/vm/interp.c M src/plugins/SqueakFFIPrims/ARM32FFIPlugin.c M src/plugins/SqueakFFIPrims/IA32FFIPlugin.c M src/plugins/SqueakFFIPrims/X64SysVFFIPlugin.c M src/plugins/SqueakFFIPrims/X64Win64FFIPlugin.c M src/vm/cogit.h M src/vm/cogitARMv5.c M src/vm/cogitIA32.c M src/vm/cogitMIPSEL.c M src/vm/cointerp.c M src/vm/cointerp.h M src/vm/cointerpmt.c M src/vm/cointerpmt.h M src/vm/gcc3x-cointerp.c M src/vm/gcc3x-cointerpmt.c M stacksrc/vm/gcc3x-interp.c M stacksrc/vm/interp.c Log Message: ----------- CogVM source as per Name: VMMaker.oscogSPC-eem.2112 Temporary branch for SpurPlanningCompactor as default compactor. Eliminate several signed comparisons in SpurPlanningCompactor. Neewspeak/Slang: Fix printDecodeMethodHeaderOop: for the Newspeak VM. Add type inferrence for TBraceNode, including casting the default value to a pointer type in var := expr caseOf: { ... }. FFI Plugin: Fix FFI in 64bits. The moduleHandle (a pointer) was incorrectly truncated to an int (32bits). Spur: Have printEntity: print header flags for puns also. SistaCogit: Fix coging optimized methods with lots of literals. Decode a method header when doing longPrintOop:. Fix the ssFlushTo: call in genExtJumpIfNotInstanceOfBehaviorsBytecode Use Spur's single-bit tests for immediates in the CogObjectRepresetationFor??BitSpur's branchIf:has[Not]ImmediateTag:target: Fix conditional branches following inline primitive comparisons given the branch following logic. The unconditional branch following can only be elided if jumping to the bytecode following the conditional branch, which mnay no longer be the case with branch following. To this end refactor nextDescriptorAndExtensionsInto: into nextDescriptorExtensionsAndNextPCInto:. Simplify extJumpIfNotInstanceOfBehaviorsBytecode a bit. Set deadCode to true in trap bytecode to avoid generating merge machne code that is never reached. Fixed a bug in eventualTargetOf: where nExts was misscomputed, leading jumps targeting jumps with extensions to be incorrectly computed. Fixed a bug where branchIfNotInstanceOf: span function misscomputed the distance when ExtB is negated to inverse the branch. Fixed CharacterAsInteger inlined primitive. Linux install scripts: Make then able to cope with the oscogvmSPC name. Update the linux x86/x64 HowToBuils with more info on installing required packages and on how to debug a failing configure step.

1 0

VM Maker: VMMaker.oscogSPC-eem.2112.mcz
by commits＠source.squeak.org 25 Jan '17

25 Jan '17

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscogSPC-eem.2112.mcz ==================== Summary ==================== Name: VMMaker.oscogSPC-eem.2112 Author: eem Time: 25 January 2017, 1:00:46.35451 pm UUID: 2cb05138-53ee-44f4-9ef2-687f081b72d6 Ancestors: VMMaker.oscogSPC-eem.2109, VMMaker.oscog-eem.2111 Temporary branch for SpurPlanningCompactor as default compactor. Otherwise the same as VMMaker.oscog-eem.2111 Eliminate several signed comparisons in SpurPlanningCompactor. Add a class side analyser that spots them. =============== Diff against VMMaker.oscogSPC-eem.2109 =============== Item was changed: ----- Method: CCodeGenerator>>returnTypeForSend:in:ifNil: (in category 'type inference') ----- returnTypeForSend: sendNode in: aTMethod ifNil: typeIfNil "Answer the return type for a send. Unbound sends default to typeIfNil. Methods with types as yet unknown have a type determined either by the kernelReturnTypes or the table below, or, if they are in neither set, then nil. The inferred type should match as closely as possible the C type of generated expessions so that inlining would not change the expression. If there is a method for sel but its return type is as yet unknown it mustn't be defaulted, since on a subsequent pass its type may be computable." | sel methodOrNil | methodOrNil := self anyMethodNamed: (sel := sendNode selector). (methodOrNil notNil and: [methodOrNil returnType notNil]) ifTrue: [^self baseTypeForType: methodOrNil returnType]. ^kernelReturnTypes at: sel ifAbsent: [sel caseOf: { [#integerValueOf:] -> [#sqInt]. [#isIntegerObject:] -> [#int]. [#negated] -> [self promoteArithmeticTypes: (self typeFor: sendNode receiver in: aTMethod) and: #int]. [#+] -> [self typeForArithmetic: sendNode in: aTMethod]. [#-] -> [self typeForArithmetic: sendNode in: aTMethod]. [#*] -> [self typeForArithmetic: sendNode in: aTMethod]. [#/] -> [self typeForArithmetic: sendNode in: aTMethod]. [#//] -> [self typeForArithmetic: sendNode in: aTMethod]. [#\\] -> [self typeForArithmetic: sendNode in: aTMethod]. [#rem:] -> [self typeForArithmetic: sendNode in: aTMethod]. [#quo:] -> [self typeForArithmetic: sendNode in: aTMethod]. "C99 Sec Bitwise shift operators ... 3 Sematics ... The integer promotions are performed on each of the operands. The type of the result is that of the promoted left operand..." [#>>] -> [self typeFor: sendNode receiver in: aTMethod]. [#<<] -> [self typeFor: sendNode receiver in: aTMethod]. [#addressOf:] -> [(self typeFor: sendNode receiver in: aTMethod) ifNil: [#sqInt] ifNotNil: [:type| type, (type last isLetter ifTrue: [' *'] ifFalse: ['*'])]]. [#at:] -> [self typeForDereference: sendNode in: aTMethod]. [#bitAnd:] -> [self typeForArithmetic: sendNode in: aTMethod]. [#bitOr:] -> [self typeForArithmetic: sendNode in: aTMethod]. [#bitXor:] -> [self typeForArithmetic: sendNode in: aTMethod]. [#bitClear:] -> [self typeForArithmetic: sendNode in: aTMethod]. [#bitInvert32] -> [#'unsigned int']. [#bitInvert64] -> [self promoteArithmeticTypes: (self typeFor: sendNode receiver in: aTMethod) and: #int]. [#byteSwap32] -> [#'unsigned int']. [#byteSwap64] -> [#'unsigned long long']. [#byteSwapped32IfBigEndian:] -> [#'unsigned int']. [#byteSwapped64IfBigEndian:] -> [#'unsigned long long']. [#=] -> [#int]. [#~=] -> [#int]. [#==] -> [#int]. [#~~] -> [#int]. [#<] -> [#int]. [#<=] -> [#int]. [#>] -> [#int]. [#>=] -> [#int]. [#between:and:] -> [#int]. [#anyMask:] -> [#int]. [#allMask:] -> [#int]. [#noMask:] -> [#int]. [#isNil] -> [#int]. [#notNil] -> [#int]. [#&] -> [#int]. [#|] -> [#int]. [#not] -> [#int]. [#asFloat] -> [#double]. [#atan] -> [#double]. [#exp] -> [#double]. [#log] -> [#double]. [#sin] -> [#double]. [#sqrt] -> [#double]. [#asLong] -> [#long]. [#asInteger] -> [#sqInt]. [#asIntegerPtr] -> [#'sqIntptr_t']. [#asUnsignedInteger] -> [#usqInt]. [#asUnsignedIntegerPtr]-> [#'usqIntptr_t']. [#asUnsignedLong] -> [#'unsigned long']. [#asUnsignedLongLong] -> [#'unsigned long long']. [#asVoidPointer] -> [#'void *']. [#signedIntToLong] -> [#usqInt]. "c.f. generateSignedIntToLong:on:indent:" [#signedIntToShort] -> [#usqInt]. "c.f. generateSignedIntToShort:on:indent:" [#cCoerce:to:] -> [sendNode args last value]. [#cCoerceSimple:to:] -> [sendNode args last value]. [#sizeof:] -> [#'usqIntptr_t']. "Technically it's a size_t but it matches on target architectures so far..." [#ifTrue:ifFalse:] -> [self typeForConditional: sendNode in: aTMethod]. [#ifFalse:ifTrue:] -> [self typeForConditional: sendNode in: aTMethod]. [#ifTrue:] -> [self typeForConditional: sendNode in: aTMethod]. [#ifFalse:] -> [self typeForConditional: sendNode in: aTMethod]. [#and:] -> [#sqInt]. + [#or:] -> [#sqInt]. + [#caseOf:] -> [self typeFor: sendNode args first in: aTMethod] } - [#or:] -> [#sqInt] } otherwise: "If there /is/ a method for sel but its return type is as yet unknown it /mustn't/ be defaulted, since on a subsequent pass its type may be computable. Only default unbound selectors." [methodOrNil ifNotNil: [nil] ifNil: [typeIfNil]]]! Item was changed: ----- Method: SpurMemoryManager>>startOfObject: (in category 'object enumeration') ----- startOfObject: objOop "Answer the start of objOop, which is either the address of the overflow size word, or objOop itself, depending on the size of the object. This may be applied to any kind of object, normal, forwarders or free chunks." + <returnTypeC: #usqInt> ^(self hasOverflowHeader: objOop) ifTrue: [objOop - self baseHeaderSize] ifFalse: [objOop]! Item was changed: ----- Method: SpurMemoryManager>>startOfObject:given: (in category 'object enumeration') ----- startOfObject: objOop given: rawNumSlots "Answer the start of objOop, which is either the address of the overflow size word, or objOop itself, depending on the size of the object. This may be applied to any kind of object, normal, forwarders or free chunks." + <returnTypeC: #usqInt> ^(self objectWithRawSlotsHasOverflowHeader: rawNumSlots) ifTrue: [objOop - self baseHeaderSize] ifFalse: [objOop]! Item was changed: CogClass subclass: #SpurPlanningCompactor + instanceVariableNames: 'manager scavenger coInterpreter biasForGC firstFreeObject mobileStart firstMobileObject lastMobileObject savedFirstFieldsSpace savedFirstFieldsSpaceNotInOldSpace firstFieldOfRememberedSet interestingObj anomaly objectAfterLastMobileObject relocationMap' - instanceVariableNames: 'manager scavenger coInterpreter biasForGC firstFreeObject mobileStart firstMobileObject lastMobileObject savedFirstFieldsSpace savedFirstFieldsSpaceNotInOldSpace firstFieldOfRememberedSet interestingObj anomaly objectAfterLastMobileObject' classVariableNames: '' poolDictionaries: 'SpurMemoryManagementConstants VMBasicConstants VMBytecodeConstants VMSpurObjectRepresentationConstants' category: 'VMMaker-SpurMemoryManager'! !SpurPlanningCompactor commentStamp: 'eem 12/23/2016 17:50' prior: 0! SpurPlanningCompactor implements the classic planning compaction algorithm for Spur. It makes at least three passes through the heap. The first pass plans where live movable objects will go, copying their forwarding field to the next slot in savedFirstFieldsSpace, and setting their forwarding pointer to point to their eventual location. The second pass updates all pointers in live pointer objects to point to objects' final destinations. The third pass moves objects to their final positions, unmarking objects as it does so. If the forwarding fields of live objects in the to-be-moved portion of the entire heap won't fit in savedFirstFieldsSpace, then additional passes are made until the entire heap has been compacted. Instance Variables biasForGC <Boolean> coInterpreter: <StackInterpreter> firstFieldOfRememberedSet <Oop> firstFreeObject <Oop> firstMobileObject <Oop> lastMobileObject <Oop> manager: <SpurMemoryManager> savedFirstFieldsSpace <SpurContiguousObjStack> savedFirstFieldsSpaceWasAllocated <Boolean> scavenger: <SpurGenerationScavenger> biasForGC - true if compacting for GC, in which case do only one pass, or false if compacting for snapshot, in which case do as many passes as necessary to compact the entire heap. firstFieldOfRememberedSet - the saved first field of the rememberedSet. The rememberedSet must be relocated specially because it is not a pointer object. And hence the first field needs to be extracted for proper relocation. firstFreeObject - the first free object in a compaction pass. firstMobileObject - the first mobile object in a compaction. Unpinned objects from the firstMobileObject through to the lastMobileObject are implicitly forwarded. lastMobileObject - the last mobile object in a compaction. Unpinned objects from the firstMobileObject through to the lastMobileObject are implicitly forwarded. savedFirstFieldsSpace - the space holding the saved first fields, each overwritten by a forwarding pointer, for the objects from firstMobileObject through to lastMobileObject. savedFirstFieldsSpaceWasAllocated - if true, the memory for savedFirstFieldsSpace was obtained via a call of sqAllocateMemorySegmentOfSize:Above:AllocatedSizeInto:! Item was changed: ----- Method: SpurPlanningCompactor class>>declareCVarsIn: (in category 'translation') ----- declareCVarsIn: aCCodeGenerator + self declareCAsOop: (self instVarNames select: [:iv| iv endsWith: 'Object']) in: aCCodeGenerator. aCCodeGenerator var: 'savedFirstFieldsSpace' type: #SpurContiguousObjStack; + removeVariable: 'interestingObj'; + removeVariable: 'relocationMap'! - removeVariable: 'interestingObj'! Item was added: + ----- Method: SpurPlanningCompactor class>>identifySignedComparisons (in category 'analysis') ----- + identifySignedComparisons + "self identifySignedComparisons" + | vmm cg noise | + noise := #('(manager bytesInObject: largestFreeChunk) >= spaceEstimate' + '(self classIndexOf: o*) > self isForwardedObjectClassIndexPun' + 'GCModeFull > 0' + 'ReceiverIndex + (objectMemory integerValueOf: sp*) < (objectMemory lengthOf: o*)' + 'availableSpace > 0' + 'bytes + 2 * 8 > availableSpace' + 'fmt* < manager firstCompiledMethodFormat' + 'fmt* < self firstCompiledMethodFormat' + 'fmt* <= 5' + 'gcPhaseInProgress > 0' + 'i <= finishIndex' + 'i >= 0' + 'numPointerSlots > 0' + 'scavenger rememberedSetSize > 0'). + vmm := (VMMaker forPlatform: 'Cross') + interpreterClass: StackInterpreter; + options: #(ObjectMemory Spur32BitMemoryManager). + cg := [vmm buildCodeGeneratorForInterpreter] + on: Notification + do: [:ex| + ex tag == #getVMMaker + ifTrue: [ex resume: vmm] + ifFalse: [ex pass]]. + cg vmClass preGenerationHook: cg. + cg inferTypesForImplicitlyTypedVariablesAndMethods. + cg retainMethods: self selectors. + cg prepareMethods. + cg doInlining: true. + self selectors sort do: + [:sel| + (cg methodNamed: sel) ifNotNil: + [:m| + m parseTree nodesDo: + [:node| + (node isSend + and: [(#(< > <= >=) includes: node selector) + and: [({node receiver. node args first } anySatisfy: + [:o| (cg typeFor: o in: m) + ifNil: [true] + ifNotNil: [:t| (cg isIntegralCType: t) and: [t first ~= $u]]]) + and: [noise noneSatisfy: [:n| n match: node printString]]]]) ifTrue: + [Transcript ensureCr; nextPutAll: sel; space; print: node; flush]]]]! Item was changed: ----- Method: SpurPlanningCompactor>>copyAndUnmarkMobileObjects (in category 'compaction') ----- copyAndUnmarkMobileObjects "Sweep the mobile portion of the heap, moving objects to their eventual locations, and clearing their marked bits. Remember to update the savedFirstFields of pointer objects, as these have been forwarded. Answer if the end of the heap was reached (savedFirstFieldsSpace has not overflowed). The enumerations in planCompactSavingForwarders, updatePointersInMobileObjects and copyAndUnmarkMobileObjects match. We could implement them as a single enumeration method taking several block arguments, but arguably that would make understanding an already tricky algorithm more difficult. Instead we tolerate the duplication and encourage the reader to diff the three methods to see where they diverge (e.g. via Cmd-shift-C)." <inline: #never> | toFinger top previousPin | + <var: 'o' type: #usqInt> <var: 'top' type: #usqInt> <var: 'toFinger' type: #usqInt> + <var: 'previousPin' type: #usqInt> self deny: (manager isMarked: firstFreeObject). toFinger := manager startOfObject: firstFreeObject. top := savedFirstFieldsSpace start. manager allOldSpaceEntitiesForCompactingFrom: firstFreeObject do: [:o :n| self check: o. self assert: (previousPin ifNil: [toFinger <= (manager startOfObject: o)] ifNotNil: [(manager isMarked: previousPin) and: [toFinger <= (manager startOfObject: previousPin)]]). self assert: (savedFirstFieldsSpaceNotInOldSpace or: [toFinger < top]). o > lastMobileObject ifTrue: [self freeFrom: toFinger upTo: manager endOfMemory previousPin: previousPin. ^true]. (manager isMarked: o) ifTrue: [(manager isPinned: o) ifTrue: [previousPin ifNil: [previousPin := o]] ifFalse: [| availableSpace bytes | bytes := manager bytesInObject: o. [previousPin notNil and: [availableSpace := (manager startOfObject: previousPin) - toFinger. bytes ~= availableSpace and: [bytes + (2 * manager allocationUnit) > availableSpace]]] whileTrue: ["The object does not fit in the space between toFinger and previousPin. Move toFinger up to point at the first unmarked or mobile object after previousPin, or, if previousPin is contiguous with o, to the start of this object. Update previousPin to be the next pinned object above toFInger and below this object, or nil if no such pinned object exists. Any unfillable gaps between adjacent pinned objects will be freed." availableSpace > 0 ifTrue: [manager addFreeChunkWithBytes: availableSpace at: toFinger]. [self assert: ((manager isMarked: previousPin) and: [manager isPinned: previousPin]). self unmarkPinned: previousPin. toFinger := manager addressAfter: previousPin. previousPin := manager objectStartingAt: toFinger. (manager isMarked: previousPin) and: [(manager isPinned: previousPin) and: [previousPin < o]]] whileTrue. "Now previousPin is either equal to o or mobile. Move it to the next pinned object below o" [previousPin >= o or: [(manager isMarked: previousPin) and: [manager isPinned: previousPin]]] whileFalse: [previousPin := manager objectAfter: previousPin]. previousPin >= o ifTrue: [previousPin := nil]]. self copyAndUnmarkObject: o to: toFinger bytes: bytes firstField: (manager longAt: top). toFinger := toFinger + bytes. (top := top + manager bytesPerOop) >= savedFirstFieldsSpace limit ifTrue: [| done | self assert: savedFirstFieldsSpace top = (top - manager bytesPerOop). done := self noMobileObjectsAfter: n. done ifTrue: [self freeAllUnpinnedObjectsFromObject: (previousPin ifNil: [n]) toFinger: toFinger] ifFalse: [self freeFrom: toFinger upTo: (manager startOfObject: n) previousPin: previousPin]. ^done]]]]. self freeFrom: toFinger upTo: manager endOfMemory previousPin: previousPin. ^true! Item was changed: ----- Method: SpurPlanningCompactor>>findNextMarkedPinnedAfter: (in category 'private') ----- findNextMarkedPinnedAfter: unpinnedObj <inline: true> | nextObj | self deny: ((manager isPinned: unpinnedObj) and: [manager isMarked: unpinnedObj]). nextObj := unpinnedObj. [nextObj := manager objectAfter: nextObj limit: manager endOfMemory. + (self oop: nextObj isGreaterThanOrEqualTo: manager endOfMemory) ifTrue: - nextObj >= manager endOfMemory ifTrue: [^nil]. (manager isPinned: nextObj) and: [manager isMarked: nextObj]] whileFalse. ^nextObj! Item was changed: ----- Method: SpurPlanningCompactor>>forwardMobileObject:to:savedFirstFieldPtr: (in category 'private') ----- forwardMobileObject: o to: toFinger savedFirstFieldPtr: savedFirstFieldPtr "Forward a mobile object to some new location, saving its first field through savedFirstFieldPtr. Don't use forward:to:; we dont want to alter the object in any way other than by setting the forwarding pointer." <inline: true> lastMobileObject := o. manager longAt: savedFirstFieldPtr put: (manager fetchPointer: 0 ofObject: o); storePointerUnchecked: 0 ofObject: o withValue: ((manager hasOverflowHeader: o) ifTrue: [toFinger + manager baseHeaderSize] ifFalse: [toFinger]). + self cCode: '' inSmalltalk: [relocationMap at: o put: savedFirstFieldPtr]! - ^toFinger + (manager bytesInObject: o)! Item was changed: ----- Method: SpurPlanningCompactor>>freeFrom:upTo:previousPin: (in category 'private') ----- freeFrom: toFinger upTo: limit previousPin: previousPinOrNil "Free from toFinger up to limit, dealing with a possible intervening run of pinned objects starting at previousPinOrNil." <inline: false> + <var: 'limit' type: #usqInt> + <var: 'toFinger' type: #usqInt> + <var: 'previousPinOrNil' type: #usqInt> | effectiveToFinger pin nextUnpinned start seg | + <var: 'nextUnpinned' type: #usqInt> <var: #seg type: #'SpurSegmentInfo *'> self cCode: [] inSmalltalk: [coInterpreter cr; cr; print: 'freeing at '; printHexnp: toFinger; print: ' up to '; printHexnp: limit; print: ' pin '; printHexnp: previousPinOrNil; cr]. effectiveToFinger := toFinger. pin := previousPinOrNil. "If the range toFinger to limit spans segments but there is no pin (as when freeing to the end of memory) segment boundaries must still be observed. So in this case use the nearest bridge above toFinger as the pin." pin ifNil: [seg := manager segmentManager segmentContainingObj: toFinger. seg segLimit < limit ifTrue: [pin := manager segmentManager bridgeFor: seg]]. [pin notNil] whileTrue: [(start := manager startOfObject: pin) > toFinger ifTrue: [manager addFreeChunkWithBytes: start - effectiveToFinger at: effectiveToFinger]. nextUnpinned := self unmarkPinnedObjectsAndFindFirstUnpinnedOrFreeEntityFollowing: pin. nextUnpinned >= limit ifTrue: [^self]. effectiveToFinger := manager startOfObject: nextUnpinned. pin := self findNextMarkedPinnedAfter: nextUnpinned]. manager addFreeChunkWithBytes: limit - effectiveToFinger at: effectiveToFinger! Item was changed: ----- Method: SpurPlanningCompactor>>initializeCompaction (in category 'compaction') ----- initializeCompaction manager checkFreeSpace: GCModeFull. self selectSavedFirstFieldsSpace. self unpinRememberedSet. manager resetFreeListHeads; totalFreeOldSpace: 0; beginSlidingCompaction. + savedFirstFieldsSpace top: savedFirstFieldsSpace start - manager bytesPerOop. + self cCode: '' inSmalltalk: [relocationMap := Dictionary new]! - savedFirstFieldsSpace top: savedFirstFieldsSpace start - manager bytesPerOop! Item was changed: ----- Method: SpurPlanningCompactor>>logPhase: (in category 'private') ----- logPhase: phaseName <inline: true> + self break. + self cCode: '' inSmalltalk: [coInterpreter transcript nextPutAll: phaseName; flush]. ! - self cCode: '' inSmalltalk: [coInterpreter transcript nextPutAll: phaseName; flush].! Item was changed: ----- Method: SpurPlanningCompactor>>planCompactSavingForwarders (in category 'compaction') ----- planCompactSavingForwarders "Sweep the heap from firstFreeObject forwarding marked objects to where they can be moved to, saving their forwarding pointer in savedFirstFieldsSpace. Continue until either the end of the heap is reached or savedFirstFieldsSpace is full. Answer if the end of the heap was reached (savedFirstFieldsSpace has not overflowed). The enumerations in planCompactSavingForwarders, updatePointersInMobileObjects and copyAndUnmarkMobileObjects match. We could implement them as a single enumeration method taking several block arguments, but arguably that would make understanding an already tricky algorithm more difficult. Instead we tolerate the duplication and encourage the reader to diff the three methods to see where they diverge (e.g. via Cmd-shift-C)." <inline: #never> | toFinger top previousPin | + <var: 'o' type: #usqInt> <var: 'top' type: #usqInt> <var: 'toFinger' type: #usqInt> + <var: 'previousPin' type: #usqInt> savedFirstFieldsSpace top < savedFirstFieldsSpace start ifTrue: [self logPhase: 'planning...']. self deny: (manager isMarked: firstFreeObject). toFinger := manager startOfObject: firstFreeObject. top := savedFirstFieldsSpace start. manager allOldSpaceEntitiesFrom: firstFreeObject do: [:o| self check: o. self assert: (previousPin ifNil: [toFinger <= (manager startOfObject: o)] ifNotNil: [(manager isMarked: previousPin) and: [toFinger <= (manager startOfObject: previousPin)]]). self assert: (savedFirstFieldsSpaceNotInOldSpace or: [toFinger < top]). (manager isMarked: o) ifTrue: [(manager isPinned: o) ifTrue: [previousPin ifNil: [previousPin := o]] ifFalse: [| availableSpace bytes | bytes := manager bytesInObject: o. [previousPin notNil and: [availableSpace := (manager startOfObject: previousPin) - toFinger. bytes ~= availableSpace and: [bytes + (2 * manager allocationUnit) > availableSpace]]] whileTrue: ["The object does not fit in the space between toFinger and previousPin. Move toFinger up to point at the first unmarked or mobile object after previousPin, or, if previousPin is contiguous with o, to the start of this object. Update previousPin to be the next pinned object above toFInger and below this object, or nil if no such pinned object exists. Any unfillable gaps between adjacent pinned objects will be freed." [toFinger := manager addressAfter: previousPin. previousPin := manager objectStartingAt: toFinger. (manager isMarked: previousPin) and: [(manager isPinned: previousPin) and: [previousPin < o]]] whileTrue. "Now previousPin is either equal to o or mobile. Move it to the next pinned object below o" [previousPin >= o or: [(manager isMarked: previousPin) and: [manager isPinned: previousPin]]] whileFalse: [previousPin := manager objectAfter: previousPin]. previousPin >= o ifTrue: [previousPin := nil]]. self forwardMobileObject: o to: toFinger savedFirstFieldPtr: top. toFinger := toFinger + bytes. (top := top + manager bytesPerOop) >= savedFirstFieldsSpace limit ifTrue: [savedFirstFieldsSpace top: top - manager bytesPerOop. ^self noMobileObjectsAfter: o]]]]. savedFirstFieldsSpace top: top - manager bytesPerOop. ^true! Item was changed: ----- Method: SpurPlanningCompactor>>savedFirstFieldsSpaceInFreeChunk (in category 'space management') ----- savedFirstFieldsSpaceInFreeChunk <inline: true> + ^savedFirstFieldsSpaceNotInOldSpace not + and: [self oop: savedFirstFieldsSpace start isGreaterThan: manager nilObject]! - ^savedFirstFieldsSpaceNotInOldSpace not and: [savedFirstFieldsSpace start >= manager nilObject]! Item was changed: ----- Method: SpurPlanningCompactor>>savedFirstFieldsSpaceWasAllocated (in category 'space management') ----- savedFirstFieldsSpaceWasAllocated <inline: true> + ^savedFirstFieldsSpaceNotInOldSpace + and: [self oop: savedFirstFieldsSpace start isGreaterThan: manager nilObject]! - ^savedFirstFieldsSpaceNotInOldSpace and: [savedFirstFieldsSpace start >= manager nilObject]! Item was changed: ----- Method: SpurPlanningCompactor>>unmarkPinnedObjectsAndFindFirstUnpinnedOrFreeEntityFollowing: (in category 'private') ----- unmarkPinnedObjectsAndFindFirstUnpinnedOrFreeEntityFollowing: pinnedObj <inline: true> | nextObj | self assert: ((manager isPinned: pinnedObj) and: [manager isMarked: pinnedObj]). nextObj := pinnedObj. [self unmarkPinned: nextObj. nextObj := manager objectAfter: nextObj limit: manager endOfMemory. + (self oop: nextObj isGreaterThanOrEqualTo: manager endOfMemory) ifTrue: - nextObj >= manager endOfMemory ifTrue: [^manager endOfMemory]. (manager isPinned: nextObj) and: [manager isMarked: nextObj]] whileTrue. ^nextObj! Item was changed: ----- Method: SpurPlanningCompactor>>updatePointersInInitialImmobileObjects (in category 'compaction') ----- updatePointersInInitialImmobileObjects "Sweep the initial immobile heap, updating all references to mobile objects to their eventual locations." manager allOldSpaceObjectsFrom: manager firstObject do: [:o| self check: o. + (self oop: o isGreaterThanOrEqualTo: firstFreeObject) ifTrue: - o >= firstFreeObject ifTrue: [^self]. self assert: (manager isMarked: o). self updatePointersIn: o]! Item was changed: ----- Method: SpurPlanningCompactor>>updatePointersInMobileObjects (in category 'compaction') ----- updatePointersInMobileObjects "Sweep the mobile portion of the heap, updating all references to objects to their eventual locations. Remember to update the savedFirstFields of pointer objects, as these have been forwarded. Answer if the end of the heap was reached (savedFirstFieldsSpace has not overflowed). The enumerations in planCompactSavingForwarders, updatePointersInMobileObjects and copyAndUnmarkMobileObjects match. We could implement them as a single enumeration method taking several block arguments, but arguably that would make understanding an already tricky algorithm more difficult. Instead we tolerate the duplication and encourage the reader to diff the three methods to see where they diverge (e.g. via Cmd-shift-C)." | toFinger top previousPin | + <var: 'o' type: #usqInt> <var: 'top' type: #usqInt> <var: 'toFinger' type: #usqInt> + <var: 'previousPin' type: #usqInt> self deny: (manager isMarked: firstFreeObject). toFinger := manager startOfObject: firstFreeObject. top := savedFirstFieldsSpace start. manager allOldSpaceEntitiesFrom: firstFreeObject do: [:o| self check: o. self assert: (previousPin ifNil: [toFinger <= (manager startOfObject: o)] ifNotNil: [(manager isMarked: previousPin) and: [toFinger <= (manager startOfObject: previousPin)]]). (manager isMarked: o) ifTrue: [(manager isPinned: o) ifTrue: [previousPin ifNil: [previousPin := o]. self updatePointersIn: o] ifFalse: [| availableSpace bytes | bytes := manager bytesInObject: o. [previousPin notNil and: [availableSpace := (manager startOfObject: previousPin) - toFinger. bytes ~= availableSpace and: [bytes + (2 * manager allocationUnit) > availableSpace]]] whileTrue: ["The object does not fit in the space between toFinger and previousPin. Move toFinger up to point at the first unmarked or mobile object after previousPin, or, if previousPin is contiguous with o, to the start of this object. Update previousPin to be the next pinned object above toFInger and below this object, or nil if no such pinned object exists. Any unfillable gaps between adjacent pinned objects will be freed." [toFinger := manager addressAfter: previousPin. previousPin := manager objectStartingAt: toFinger. (manager isMarked: previousPin) and: [(manager isPinned: previousPin) and: [previousPin < o]]] whileTrue. "Now previousPin is either equal to o or mobile. Move it to the next pinned object below o" [previousPin >= o or: [(manager isMarked: previousPin) and: [manager isPinned: previousPin]]] whileFalse: [previousPin := manager objectAfter: previousPin]. previousPin >= o ifTrue: [previousPin := nil]]. self updatePointersIn: o savedFirstFieldPointer: top. toFinger := toFinger + bytes. (top := top + manager bytesPerOop) >= savedFirstFieldsSpace limit ifTrue: [self assert: savedFirstFieldsSpace top = (top - manager bytesPerOop). ^self noMobileObjectsAfter: o]]]]. self assert: savedFirstFieldsSpace top = (top - manager bytesPerOop). ^true! Item was changed: ----- Method: SpurPlanningCompactor>>useSegmentForSavedFirstFieldsSpace: (in category 'space management') ----- useSegmentForSavedFirstFieldsSpace: spaceEstimate "Attempt to allocate a memory segment large enough to hold the savedFirstFieldsSpace. Invoked when neither eden nor a large free chunk are found to be big enough for the job." | allocatedSize | + <var: #segAddress type: #'void *'> (manager "sent to the manager so that the simulator can increase memory to simulate a new segment" sqAllocateMemorySegmentOfSize: spaceEstimate Above: (self firstGapOfSizeAtLeast: spaceEstimate) AllocatedSizeInto: (self cCode: [self addressOf: allocatedSize] inSmalltalk: [[:sz| allocatedSize := sz]])) ifNotNil: [:segAddress| savedFirstFieldsSpace + start: segAddress asUnsignedIntegerPtr; + limit: segAddress asUnsignedIntegerPtr + allocatedSize. - start: segAddress; - limit: segAddress + allocatedSize. savedFirstFieldsSpaceNotInOldSpace := true. self assert: self savedFirstFieldsSpaceWasAllocated. ^true]. ^false! Item was changed: ----- Method: SpurSegmentInfo>>segLimit (in category 'accessing') ----- segLimit + <returnTypeC: #usqInt> ^segSize + segStart! Item was changed: ----- Method: SpurSegmentManager>>notePinned: (in category 'pinning') ----- notePinned: objOop "Let the segmentManager mark which segments contain pinned objects" self assert: (manager isPinned: objOop). (manager isSegmentBridge: objOop) ifTrue: [manager setIsMarkedOf: objOop to: true] ifFalse: + [[self oop: (segments at: sweepIndex) segLimit isLessThan: objOop] whileTrue: - [[(segments at: sweepIndex) segLimit < objOop] whileTrue: [sweepIndex := sweepIndex + 1]. (segments at: sweepIndex) containsPinned: true]! Item was changed: ----- Method: StackInterpreter>>commonVariable:at:put:cacheIndex: (in category 'indexing primitive support') ----- commonVariable: rcvr at: index put: value cacheIndex: atIx "This code assumes the receiver has been identified at location atIx in the atCache." + <returnTypeC: #void> | stSize fmt fixedFields valToPut isCharacter | <inline: true> stSize := atCache at: atIx+AtCacheSize. ((self oop: index isGreaterThanOrEqualTo: 1) and: [self oop: index isLessThanOrEqualTo: stSize]) ifTrue: [fmt := atCache at: atIx+AtCacheFmt. fmt <= objectMemory weakArrayFormat ifTrue: [self assert: (objectMemory isContextNonImm: rcvr) not. fixedFields := atCache at: atIx+AtCacheFixedFields. ^objectMemory storePointer: index + fixedFields - 1 ofObject: rcvr withValue: value]. fmt < objectMemory firstByteFormat ifTrue: "64, 32, & 16 bits" [objectMemory hasSpurMemoryManagerAPI ifTrue: [fmt >= objectMemory firstShortFormat ifTrue: [valToPut := (objectMemory isIntegerObject: value) ifTrue: [objectMemory integerValueOf: value] ifFalse: [-1]. (valToPut >= 0 and: [valToPut <= 65535]) ifFalse: [^self primitiveFailFor: PrimErrBadArgument]. ^objectMemory storeShort16: index - 1 ofObject: rcvr withValue: valToPut]. fmt = objectMemory sixtyFourBitIndexableFormat ifTrue: [| val64ToPut | val64ToPut := self positive64BitValueOf: value. self successful ifTrue: [^objectMemory storeLong64: index - 1 ofObject: rcvr withValue: val64ToPut]. ^self primitiveFailFor: PrimErrBadArgument]]. valToPut := self positive32BitValueOf: value. self successful ifTrue: [^objectMemory storeLong32: index - 1 ofObject: rcvr withValue: valToPut]. ^self primitiveFailFor: PrimErrBadArgument]. fmt >= objectMemory firstStringyFakeFormat "Note fmt >= firstStringyFormat is an artificial flag for strings" ifTrue: [isCharacter := objectMemory isCharacterObject: value. isCharacter ifFalse: [^self primitiveFailFor: PrimErrBadArgument]. objectMemory hasSpurMemoryManagerAPI ifTrue: [valToPut := objectMemory characterValueOf: value] ifFalse: [valToPut := objectMemory fetchPointer: CharacterValueIndex ofObject: value. valToPut := (objectMemory isIntegerObject: valToPut) ifTrue: [objectMemory integerValueOf: valToPut] ifFalse: [-1]]. objectMemory hasSpurMemoryManagerAPI ifTrue: [fmt < (objectMemory firstByteFormat + objectMemory firstStringyFakeFormat) ifTrue: [fmt < (objectMemory firstShortFormat + objectMemory firstStringyFakeFormat) ifTrue: [self assert: fmt ~= (objectMemory sixtyFourBitIndexableFormat + objectMemory firstStringyFakeFormat). ^objectMemory storeLong32: index - 1 ofObject: rcvr withValue: valToPut] ifFalse: [(valToPut >= 0 and: [valToPut <= 65535]) ifFalse: [^self primitiveFailFor: PrimErrBadArgument]. ^objectMemory storeShort16: index - 1 ofObject: rcvr withValue: valToPut]]]] ifFalse: [(fmt >= objectMemory firstCompiledMethodFormat and: [index < (self firstByteIndexOfMethod: rcvr)]) ifTrue: [^self primitiveFailFor: PrimErrBadIndex]. valToPut := (objectMemory isIntegerObject: value) ifTrue: [objectMemory integerValueOf: value] ifFalse: [-1]]. (valToPut >= 0 and: [valToPut <= 255]) ifFalse: [^self primitiveFailFor: PrimErrBadArgument]. ^objectMemory storeByte: index - 1 ofObject: rcvr withValue: valToPut]. ^self primitiveFailFor: ((objectMemory isIndexable: rcvr) ifFalse: [PrimErrBadReceiver] ifTrue: [PrimErrBadIndex])! Item was changed: ----- Method: StackInterpreter>>printDecodeMethodHeaderOop: (in category 'printing') ----- printDecodeMethodHeaderOop: methodHeaderOop self printOopShort: methodHeaderOop. (self methodHeaderHasPrimitive: methodHeaderOop) ifTrue: [self print: ' hasPrim']. (self methodHeaderIndicatesLargeFrame: methodHeaderOop) ifTrue: [self print: ' largeFrame']. (SistaVM and: [self isOptimizedMethodHeader: methodHeaderOop]) ifTrue: [self print: ' optimized']. (MULTIPLEBYTECODESETS and: [objectMemory integerValueOf: methodHeaderOop]) < 0 ifTrue: [self print: ' altSet']. NewspeakVM ifTrue: + [| s | + s := (self accessModifierOfMethodHeader: methodHeaderOop) caseOf: { - [self print: ((self accessModifierOfMethodHeader: methodHeaderOop) caseOf: { [0] -> [' public']. [1] -> [' private']. [2] -> [' protected']. + [3] -> [' access undefined'] }. + self print: s]. - [3] -> [' access undefined'] })]. self print: ' nLits '; printNum: (objectMemory literalCountOfMethodHeader: methodHeaderOop); print: ' nArgs '; printNum: (self argumentCountOfMethodHeader: methodHeaderOop); print: ' nTemps '; printNum: (self temporaryCountOfMethodHeader: methodHeaderOop)! Item was added: + ----- Method: TBraceCaseNode>>typeOrNilFrom:in: (in category 'type inference') ----- + typeOrNilFrom: aCodeGenerator in: aTMethod + | types | + types := Set withAll: (cases collect: [:case| case typeOrNilFrom: aCodeGenerator in: aTMethod]). + ^types size = 1 ifTrue: [types anyOne]! Item was changed: ----- Method: TConstantNode>>typeOrNilFrom:in: (in category 'type inference') ----- typeOrNilFrom: aCodeGenerator in: aTMethod "For integers, answer int unless the value does not fit into a 32bits signed int. In that case, answer the shortest architecture independant integer type that could hold the constant. This method must be consistent with CCodeGenerator>>cLiteralFor:" | hb | value isInteger ifTrue: [value positive ifTrue: [hb := value highBit. hb < 32 ifTrue: [^#int]. hb = 32 ifTrue: [^#'unsigned int']. hb = 64 ifTrue: [^#'unsigned long long']. ^#'long long'] ifFalse: [hb := value bitInvert highBit. hb < 32 ifTrue: [^#int]. ^#'long long']]. value isFloat ifTrue: [^#double]. (#(nil true false) includes: value) ifTrue: [^#int]. + (value isString and: [value isSymbol not]) ifTrue: [^#'char *']. ^nil! Item was changed: ----- Method: TSendNode>>emitCCodeAsFunctionCallOn:level:generator: (in category 'C code generation') ----- emitCCodeAsFunctionCallOn: aStream level: level generator: aCodeGen - "Translate this message send into a C function call" + + selector == #break ifTrue: + [aStream nextPutAll: '/* send of break elided */'. + ^self]. + "Special case for pluggable modules. Replace messages to interpreterProxy by interpreterProxy->message(..) if the message is not builtin" (aCodeGen shouldGenerateAsInterpreterProxySend: self) ifTrue: [(aCodeGen noteUsedPluginFunction: selector) ifTrue: [aStream nextPutAll: 'interpreterProxy->']]. - "Translate this message send into a C function call." aStream nextPutAll: (aCodeGen cFunctionNameFor: selector); nextPut: $(. + "Only include the receiver as the first argument in certain cases. The receiver is always included if it is an expression. If it is a variable: If the vmClass says it is an implicit variable, don't include it. If the variable is 'self' and the method being called is not in the method set (i.e. it is some external code), don't include it." (self shouldExcludeReceiverAsFirstArgument: aCodeGen) ifFalse: [(receiver structTargetKindIn: aCodeGen) == #struct ifTrue: [aStream nextPut: $&]. receiver emitCCodeOn: aStream level: level generator: aCodeGen. arguments isEmpty ifFalse: [aStream nextPutAll: ', ']]. arguments do: [ :arg| arg emitCCodeAsArgumentOn: aStream level: level generator: aCodeGen] separatedBy: [aStream nextPut: $,; space]. aStream nextPut: $)! Item was changed: ----- Method: TSwitchStmtNode>>emitCCodeOn:addToEndOfCases:level:generator: (in category 'C code generation') ----- emitCCodeOn: aStream addToEndOfCases: aNodeOrNil level: level generator: aCodeGen aStream crtab: level. aStream nextPutAll: 'switch ('. expression emitCCodeAsArgumentOn: aStream level: level generator: aCodeGen. aStream nextPutAll: ') {'. cases do: [:tuple| [:labels :case| labels do: [:label| aStream crtab: level; nextPutAll: 'case '. label emitCCodeAsArgumentOn: aStream level: level + 1 generator: aCodeGen. aStream nextPut: $:]. aStream crtab: level + 1. case emitCCodeOn: aStream prependToEnd: aNodeOrNil level: level + 1 generator: aCodeGen] valueWithArguments: tuple. (aNodeOrNil notNil and: [aNodeOrNil isReturn]) ifFalse: [aStream crtab: level + 1; nextPutAll: 'break;']]. aStream crtab: level; nextPutAll: 'default:'; crtab: level + 1. otherwiseOrNil ifNotNil: [otherwiseOrNil emitCCodeOn: aStream prependToEnd: aNodeOrNil level: level + 1 generator: aCodeGen] ifNil: [aStream nextPutAll: 'error("Case not found and no otherwise clause");'. aNodeOrNil ifNotNil: + [| defaultExpr type | + aStream crtab: level + 1. + defaultExpr := TConstantNode new setValue: -1. + (aNodeOrNil isAssignment + and: [(type := aCodeGen typeFor: aNodeOrNil variable in: aCodeGen currentMethod) notNil + and: [aCodeGen isPointerCType: type]]) ifTrue: + [defaultExpr := TSendNode new + setSelector: #cCoerceSimple:to: + receiver: (TVariableNode new setName: 'self') + arguments: {defaultExpr. TConstantNode new setValue: type}]. + (aNodeOrNil copy setExpression: defaultExpr) - [aStream crtab: level + 1. - (aNodeOrNil copy setExpression: (TConstantNode new setValue: -1)) emitCCodeOn: aStream level: level generator: aCodeGen. aStream nextPut: $;]]. aStream crtab: level; nextPut: $}!

1 0

VM Maker: VMMaker.oscog-eem.2111.mcz
by commits＠source.squeak.org 25 Jan '17

25 Jan '17

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.2111.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.2111 Author: eem Time: 24 January 2017, 7:33:34.632944 pm UUID: 7c02b557-bdcc-4a91-92b1-7fc15f1e8605 Ancestors: VMMaker.oscog-eem.2110 Ndewspeak/Slang: Fix printDecodeMethodHeaderOop: for the Newspeak VM. Add type inferrence for TBraceNode, including casting the default value to a pointer type in var := expr caseOf: { ... }. Elide break sends automatically when outputting sources. =============== Diff against VMMaker.oscog-eem.2110 =============== Item was changed: ----- Method: CCodeGenerator>>returnTypeForSend:in:ifNil: (in category 'type inference') ----- returnTypeForSend: sendNode in: aTMethod ifNil: typeIfNil "Answer the return type for a send. Unbound sends default to typeIfNil. Methods with types as yet unknown have a type determined either by the kernelReturnTypes or the table below, or, if they are in neither set, then nil. The inferred type should match as closely as possible the C type of generated expessions so that inlining would not change the expression. If there is a method for sel but its return type is as yet unknown it mustn't be defaulted, since on a subsequent pass its type may be computable." | sel methodOrNil | methodOrNil := self anyMethodNamed: (sel := sendNode selector). (methodOrNil notNil and: [methodOrNil returnType notNil]) ifTrue: [^self baseTypeForType: methodOrNil returnType]. ^kernelReturnTypes at: sel ifAbsent: [sel caseOf: { [#integerValueOf:] -> [#sqInt]. [#isIntegerObject:] -> [#int]. [#negated] -> [self promoteArithmeticTypes: (self typeFor: sendNode receiver in: aTMethod) and: #int]. [#+] -> [self typeForArithmetic: sendNode in: aTMethod]. [#-] -> [self typeForArithmetic: sendNode in: aTMethod]. [#*] -> [self typeForArithmetic: sendNode in: aTMethod]. [#/] -> [self typeForArithmetic: sendNode in: aTMethod]. [#//] -> [self typeForArithmetic: sendNode in: aTMethod]. [#\\] -> [self typeForArithmetic: sendNode in: aTMethod]. [#rem:] -> [self typeForArithmetic: sendNode in: aTMethod]. [#quo:] -> [self typeForArithmetic: sendNode in: aTMethod]. "C99 Sec Bitwise shift operators ... 3 Sematics ... The integer promotions are performed on each of the operands. The type of the result is that of the promoted left operand..." [#>>] -> [self typeFor: sendNode receiver in: aTMethod]. [#<<] -> [self typeFor: sendNode receiver in: aTMethod]. [#addressOf:] -> [(self typeFor: sendNode receiver in: aTMethod) ifNil: [#sqInt] ifNotNil: [:type| type, (type last isLetter ifTrue: [' *'] ifFalse: ['*'])]]. [#at:] -> [self typeForDereference: sendNode in: aTMethod]. [#bitAnd:] -> [self typeForArithmetic: sendNode in: aTMethod]. [#bitOr:] -> [self typeForArithmetic: sendNode in: aTMethod]. [#bitXor:] -> [self typeForArithmetic: sendNode in: aTMethod]. [#bitClear:] -> [self typeForArithmetic: sendNode in: aTMethod]. [#bitInvert32] -> [#'unsigned int']. [#bitInvert64] -> [self promoteArithmeticTypes: (self typeFor: sendNode receiver in: aTMethod) and: #int]. [#byteSwap32] -> [#'unsigned int']. [#byteSwap64] -> [#'unsigned long long']. [#byteSwapped32IfBigEndian:] -> [#'unsigned int']. [#byteSwapped64IfBigEndian:] -> [#'unsigned long long']. [#=] -> [#int]. [#~=] -> [#int]. [#==] -> [#int]. [#~~] -> [#int]. [#<] -> [#int]. [#<=] -> [#int]. [#>] -> [#int]. [#>=] -> [#int]. [#between:and:] -> [#int]. [#anyMask:] -> [#int]. [#allMask:] -> [#int]. [#noMask:] -> [#int]. [#isNil] -> [#int]. [#notNil] -> [#int]. [#&] -> [#int]. [#|] -> [#int]. [#not] -> [#int]. [#asFloat] -> [#double]. [#atan] -> [#double]. [#exp] -> [#double]. [#log] -> [#double]. [#sin] -> [#double]. [#sqrt] -> [#double]. [#asLong] -> [#long]. [#asInteger] -> [#sqInt]. [#asIntegerPtr] -> [#'sqIntptr_t']. [#asUnsignedInteger] -> [#usqInt]. [#asUnsignedIntegerPtr]-> [#'usqIntptr_t']. [#asUnsignedLong] -> [#'unsigned long']. [#asUnsignedLongLong] -> [#'unsigned long long']. [#asVoidPointer] -> [#'void *']. [#signedIntToLong] -> [#usqInt]. "c.f. generateSignedIntToLong:on:indent:" [#signedIntToShort] -> [#usqInt]. "c.f. generateSignedIntToShort:on:indent:" [#cCoerce:to:] -> [sendNode args last value]. [#cCoerceSimple:to:] -> [sendNode args last value]. [#sizeof:] -> [#'usqIntptr_t']. "Technically it's a size_t but it matches on target architectures so far..." [#ifTrue:ifFalse:] -> [self typeForConditional: sendNode in: aTMethod]. [#ifFalse:ifTrue:] -> [self typeForConditional: sendNode in: aTMethod]. [#ifTrue:] -> [self typeForConditional: sendNode in: aTMethod]. [#ifFalse:] -> [self typeForConditional: sendNode in: aTMethod]. [#and:] -> [#sqInt]. + [#or:] -> [#sqInt]. + [#caseOf:] -> [self typeFor: sendNode args first in: aTMethod] } - [#or:] -> [#sqInt] } otherwise: "If there /is/ a method for sel but its return type is as yet unknown it /mustn't/ be defaulted, since on a subsequent pass its type may be computable. Only default unbound selectors." [methodOrNil ifNotNil: [nil] ifNil: [typeIfNil]]]! Item was changed: ----- Method: StackInterpreter>>printDecodeMethodHeaderOop: (in category 'printing') ----- printDecodeMethodHeaderOop: methodHeaderOop self printOopShort: methodHeaderOop. (self methodHeaderHasPrimitive: methodHeaderOop) ifTrue: [self print: ' hasPrim']. (self methodHeaderIndicatesLargeFrame: methodHeaderOop) ifTrue: [self print: ' largeFrame']. (SistaVM and: [self isOptimizedMethodHeader: methodHeaderOop]) ifTrue: [self print: ' optimized']. (MULTIPLEBYTECODESETS and: [objectMemory integerValueOf: methodHeaderOop]) < 0 ifTrue: [self print: ' altSet']. NewspeakVM ifTrue: + [| s | + s := (self accessModifierOfMethodHeader: methodHeaderOop) caseOf: { - [self print: ((self accessModifierOfMethodHeader: methodHeaderOop) caseOf: { [0] -> [' public']. [1] -> [' private']. [2] -> [' protected']. + [3] -> [' access undefined'] }. + self print: s]. - [3] -> [' access undefined'] })]. self print: ' nLits '; printNum: (objectMemory literalCountOfMethodHeader: methodHeaderOop); print: ' nArgs '; printNum: (self argumentCountOfMethodHeader: methodHeaderOop); print: ' nTemps '; printNum: (self temporaryCountOfMethodHeader: methodHeaderOop)! Item was added: + ----- Method: TBraceCaseNode>>typeOrNilFrom:in: (in category 'type inference') ----- + typeOrNilFrom: aCodeGenerator in: aTMethod + | types | + types := Set withAll: (cases collect: [:case| case typeOrNilFrom: aCodeGenerator in: aTMethod]). + ^types size = 1 ifTrue: [types anyOne]! Item was changed: ----- Method: TConstantNode>>typeOrNilFrom:in: (in category 'type inference') ----- typeOrNilFrom: aCodeGenerator in: aTMethod "For integers, answer int unless the value does not fit into a 32bits signed int. In that case, answer the shortest architecture independant integer type that could hold the constant. This method must be consistent with CCodeGenerator>>cLiteralFor:" | hb | value isInteger ifTrue: [value positive ifTrue: [hb := value highBit. hb < 32 ifTrue: [^#int]. hb = 32 ifTrue: [^#'unsigned int']. hb = 64 ifTrue: [^#'unsigned long long']. ^#'long long'] ifFalse: [hb := value bitInvert highBit. hb < 32 ifTrue: [^#int]. ^#'long long']]. value isFloat ifTrue: [^#double]. (#(nil true false) includes: value) ifTrue: [^#int]. + (value isString and: [value isSymbol not]) ifTrue: [^#'char *']. ^nil! Item was changed: ----- Method: TSendNode>>emitCCodeAsFunctionCallOn:level:generator: (in category 'C code generation') ----- emitCCodeAsFunctionCallOn: aStream level: level generator: aCodeGen - "Translate this message send into a C function call" + + selector == #break ifTrue: + [aStream nextPutAll: '/* send of break elided */'. + ^self]. + "Special case for pluggable modules. Replace messages to interpreterProxy by interpreterProxy->message(..) if the message is not builtin" (aCodeGen shouldGenerateAsInterpreterProxySend: self) ifTrue: [(aCodeGen noteUsedPluginFunction: selector) ifTrue: [aStream nextPutAll: 'interpreterProxy->']]. - "Translate this message send into a C function call." aStream nextPutAll: (aCodeGen cFunctionNameFor: selector); nextPut: $(. + "Only include the receiver as the first argument in certain cases. The receiver is always included if it is an expression. If it is a variable: If the vmClass says it is an implicit variable, don't include it. If the variable is 'self' and the method being called is not in the method set (i.e. it is some external code), don't include it." (self shouldExcludeReceiverAsFirstArgument: aCodeGen) ifFalse: [(receiver structTargetKindIn: aCodeGen) == #struct ifTrue: [aStream nextPut: $&]. receiver emitCCodeOn: aStream level: level generator: aCodeGen. arguments isEmpty ifFalse: [aStream nextPutAll: ', ']]. arguments do: [ :arg| arg emitCCodeAsArgumentOn: aStream level: level generator: aCodeGen] separatedBy: [aStream nextPut: $,; space]. aStream nextPut: $)! Item was changed: ----- Method: TSwitchStmtNode>>emitCCodeOn:addToEndOfCases:level:generator: (in category 'C code generation') ----- emitCCodeOn: aStream addToEndOfCases: aNodeOrNil level: level generator: aCodeGen aStream crtab: level. aStream nextPutAll: 'switch ('. expression emitCCodeAsArgumentOn: aStream level: level generator: aCodeGen. aStream nextPutAll: ') {'. cases do: [:tuple| [:labels :case| labels do: [:label| aStream crtab: level; nextPutAll: 'case '. label emitCCodeAsArgumentOn: aStream level: level + 1 generator: aCodeGen. aStream nextPut: $:]. aStream crtab: level + 1. case emitCCodeOn: aStream prependToEnd: aNodeOrNil level: level + 1 generator: aCodeGen] valueWithArguments: tuple. (aNodeOrNil notNil and: [aNodeOrNil isReturn]) ifFalse: [aStream crtab: level + 1; nextPutAll: 'break;']]. aStream crtab: level; nextPutAll: 'default:'; crtab: level + 1. otherwiseOrNil ifNotNil: [otherwiseOrNil emitCCodeOn: aStream prependToEnd: aNodeOrNil level: level + 1 generator: aCodeGen] ifNil: [aStream nextPutAll: 'error("Case not found and no otherwise clause");'. aNodeOrNil ifNotNil: + [| defaultExpr type | + aStream crtab: level + 1. + defaultExpr := TConstantNode new setValue: -1. + (aNodeOrNil isAssignment + and: [(type := aCodeGen typeFor: aNodeOrNil variable in: aCodeGen currentMethod) notNil + and: [aCodeGen isPointerCType: type]]) ifTrue: + [defaultExpr := TSendNode new + setSelector: #cCoerceSimple:to: + receiver: (TVariableNode new setName: 'self') + arguments: {defaultExpr. TConstantNode new setValue: type}]. + (aNodeOrNil copy setExpression: defaultExpr) - [aStream crtab: level + 1. - (aNodeOrNil copy setExpression: (TConstantNode new setValue: -1)) emitCCodeOn: aStream level: level generator: aCodeGen. aStream nextPut: $;]]. aStream crtab: level; nextPut: $}!

1 0

VM Maker: VMMaker.oscog-eem.2110.mcz
by commits＠source.squeak.org 24 Jan '17

24 Jan '17

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.2110.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.2110 Author: eem Time: 24 January 2017, 2:25:56.230129 pm UUID: efa09ad2-54d9-4746-a2cb-39acc333d22b Ancestors: VMMaker.oscog-eem.2109, VMMaker.oscog-nice.2109 Merge VMMaker.oscog-nice.2109 & VMMaker.oscog-eem.2109 =============== Diff against VMMaker.oscog-eem.2109 =============== Item was changed: ----- Method: ThreadedFFIPlugin>>ffiLoadCalloutModule: (in category 'symbol loading') ----- ffiLoadCalloutModule: module "Load the given module and return its handle" | moduleHandlePtr moduleHandle ffiModuleName moduleLength rcvr ptr | + <var: #ptr type:'sqInt *'> - <var: #ptr type:'int *'> (interpreterProxy isBytes: module) ifTrue:[ "plain module name" ffiModuleName := module. moduleLength := interpreterProxy byteSizeOf: ffiModuleName. moduleHandle := (interpreterProxy ioLoadModule: (interpreterProxy firstIndexableField: ffiModuleName) asInteger OfLength: moduleLength) asInteger. (interpreterProxy failed or: [moduleHandle = 0]) ifTrue: [^self ffiFail: FFIErrorModuleNotFound]. "failed" ^moduleHandle]. "Check if the external method is defined in an external library" rcvr := interpreterProxy stackValue: interpreterProxy methodArgumentCount. (interpreterProxy is: rcvr KindOfClass: interpreterProxy classExternalLibrary) ifFalse: [^self ffiFail: FFIErrorNoModule]. "external library" moduleHandlePtr := interpreterProxy fetchPointer: 0 ofObject: rcvr. moduleHandle := self ffiContentsOfHandle: moduleHandlePtr errCode: FFIErrorBadExternalLibrary. interpreterProxy failed ifTrue:[^0]. moduleHandle = 0 ifTrue:["need to reload module" ffiModuleName := interpreterProxy fetchPointer: 1 ofObject: rcvr. (interpreterProxy isBytes: ffiModuleName) ifFalse:[^self ffiFail: FFIErrorBadExternalLibrary]. moduleLength := interpreterProxy byteSizeOf: ffiModuleName. moduleHandle := (interpreterProxy ioLoadModule: (interpreterProxy firstIndexableField: ffiModuleName) asInteger OfLength: moduleLength) asInteger. (interpreterProxy failed or: [moduleHandle = 0]) ifTrue: [^self ffiFail: FFIErrorModuleNotFound]. "failed" "and store back" ptr := interpreterProxy firstIndexableField: moduleHandlePtr. ptr at: 0 put: moduleHandle]. ^moduleHandle!

1 0

[OpenSmalltalk/opensmalltalk-vm] 6df2f0: Generate ThreadedFFIPlugins as per VMMaker.oscog-n...
by GitHub 24 Jan '17

24 Jan '17

Branch: refs/heads/Cog Home: https://github.com/OpenSmalltalk/opensmalltalk-vm Commit: 6df2f02e128e83a3f4615e2acfd8b125f496ca1a https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/6df2f02e128e83a3f4… Author: Nicolas Cellier <nicolas.cellier.aka.nice(a)gmail.com> Date: 2017-01-24 (Tue, 24 Jan 2017) Changed paths: M src/plugins/SqueakFFIPrims/ARM32FFIPlugin.c M src/plugins/SqueakFFIPrims/IA32FFIPlugin.c M src/plugins/SqueakFFIPrims/SqueakFFIPrims.c M src/plugins/SqueakFFIPrims/X64SysVFFIPlugin.c M src/plugins/SqueakFFIPrims/X64Win64FFIPlugin.c Log Message: ----------- Generate ThreadedFFIPlugins as per VMMaker.oscog-nice.2109 to fix 64bits FFI. The moduleHandle (a pointer) was incorrectly truncated to an int (32bits).

1 0

← Newer
1
2
3
4
5
6
7
...
14
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 January 2017