Vm-dev June 2022

vm-dev@lists.squeakfoundation.org

16 participants
87 discussions

[OpenSmalltalk/opensmalltalk-vm] f41925: Eliminate a warning, and potential run-time crash, ...
by Eliot Miranda 14 Jun '22

14 Jun '22

Branch: refs/heads/Cog Home: https://github.com/OpenSmalltalk/opensmalltalk-vm Commit: f4192577c954b8f8f010171396da6872345fb2b4 https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/f4192577c954b8f8f0… Author: Eliot Miranda <eliot.miranda(a)gmail.com> Date: 2022-06-13 (Mon, 13 Jun 2022) Changed paths: M platforms/iOS/plugins/CameraPlugin/AVFoundationVideoGrabber.m Log Message: ----------- Eliminate a warning, and potential run-time crash, when asking to enable camera access on macos.

1 0

[OpenSmalltalk/opensmalltalk-vm] ff5264: CogVM source as per VMMaker.oscog-eem.3188
by Eliot Miranda 14 Jun '22

14 Jun '22

Branch: refs/heads/Cog Home: https://github.com/OpenSmalltalk/opensmalltalk-vm Commit: ff5264234c2823207684d01cf78dddd7f39c24bb https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/ff5264234c28232076… Author: Eliot Miranda <eliot.miranda(a)gmail.com> Date: 2022-06-13 (Mon, 13 Jun 2022) Changed paths: M src/spur32.cog.lowcode/cogit.h M src/spur32.cog.lowcode/cogitARMv5.c M src/spur32.cog.lowcode/cogitIA32.c M src/spur32.cog.lowcode/cointerp.c M src/spur32.cog.lowcode/cointerp.h M src/spur32.cog.lowcode/gcc3x-cointerp.c M src/spur32.cog/cogit.h M src/spur32.cog/cogitARMv5.c M src/spur32.cog/cogitIA32.c M src/spur32.cog/cointerp.c M src/spur32.cog/cointerp.h M src/spur32.cog/cointerpmt.c M src/spur32.cog/cointerpmt.h M src/spur32.cog/gcc3x-cointerp.c M src/spur32.cog/gcc3x-cointerpmt.c M src/spur32.sista/cogit.h M src/spur32.sista/cogitARMv5.c M src/spur32.sista/cogitIA32.c M src/spur32.sista/cointerp.c M src/spur32.sista/cointerp.h M src/spur32.sista/gcc3x-cointerp.c M src/spur64.cog.lowcode/cogit.h M src/spur64.cog.lowcode/cogitARMv8.c M src/spur64.cog.lowcode/cogitX64SysV.c M src/spur64.cog.lowcode/cogitX64WIN64.c M src/spur64.cog.lowcode/cointerp.c M src/spur64.cog.lowcode/cointerp.h M src/spur64.cog.lowcode/gcc3x-cointerp.c M src/spur64.cog/cogit.h M src/spur64.cog/cogitARMv8.c M src/spur64.cog/cogitX64SysV.c M src/spur64.cog/cogitX64WIN64.c M src/spur64.cog/cointerp.c M src/spur64.cog/cointerp.h M src/spur64.cog/cointerpmt.c M src/spur64.cog/cointerpmt.h M src/spur64.cog/gcc3x-cointerp.c M src/spur64.cog/gcc3x-cointerpmt.c M src/spur64.sista/cogit.h M src/spur64.sista/cogitARMv8.c M src/spur64.sista/cogitX64SysV.c M src/spur64.sista/cogitX64WIN64.c M src/spur64.sista/cointerp.c M src/spur64.sista/cointerp.h M src/spur64.sista/gcc3x-cointerp.c Log Message: ----------- CogVM source as per VMMaker.oscog-eem.3188 Refactor CoInterpreter>>#followForwardedFieldsInCurrentMethod to avoid the (albeit rare) possibility of failing to reenable method zone executability after a send fault. Move the pruneYoungReferrers into followForwardedLiteralsIn: and use followForwardedLiteralsImplementationIn: within followMovableLiteralsAndUpdateYoungReferrers instead of the refactored followForwardedLiteralsIn:.

1 0

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

14 Jun '22

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.3188.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.3188 Author: eem Time: 13 June 2022, 5:58:51.981113 pm UUID: 010bab73-d814-4c05-b0f1-f2da78c1568f Ancestors: VMMaker.oscog-eem.3187 Refactor CoInterpreter>>#followForwardedFieldsInCurrentMethod to avoid the (albeit rare) possibility of failing to reenable method zone executability after a send fault. Move the pruneYoungReferrers into Cogit>>followForwardedLiteralsIn: and use followForwardedLiteralsImplementationIn: within followMovableLiteralsAndUpdateYoungReferrers instead of the refactored followForwardedLiteralsIn:. Fix a slip in freeUnmarkedMachineCode. =============== Diff against VMMaker.oscog-eem.3187 =============== Item was changed: ----- Method: CoInterpreter>>followForwardedFieldsInCurrentMethod (in category 'message sending') ----- followForwardedFieldsInCurrentMethod - | cogMethod wasInYoungReferrers | <var: #cogMethod type: #'CogMethod *'> <inline: false> (self isMachineCodeFrame: framePointer) ifTrue: + [| cogMethod | + cogMethod := self mframeHomeMethod: framePointer. - [cogMethod := self mframeHomeMethod: framePointer. objectMemory followForwardedObjectFields: cogMethod methodObject toDepth: 0. + cogit followForwardedLiteralsIn: cogMethod] - wasInYoungReferrers := cogMethod cmRefersToYoung. - cogit followForwardedLiteralsIn: cogMethod. - (wasInYoungReferrers and: [cogMethod cmRefersToYoung not]) ifTrue: - [cogit pruneYoungReferrers]] ifFalse: [objectMemory followForwardedObjectFields: method toDepth: 0]! Item was changed: ----- Method: Cogit>>followForwardedLiteralsIn: (in category 'garbage collection') ----- followForwardedLiteralsIn: cogMethod <api> <option: #SpurObjectMemory> <var: #cogMethod type: #'CogMethod *'> + | wasInYoungReferrers | self ensureWritableCodeZone. + wasInYoungReferrers := cogMethod cmRefersToYoung. self followForwardedLiteralsImplementationIn: cogMethod. + (wasInYoungReferrers and: [cogMethod cmRefersToYoung not]) ifTrue: + [self pruneYoungReferrers]. self ensureExecutableCodeZone! Item was changed: ----- Method: Cogit>>followMovableLiteralsAndUpdateYoungReferrers (in category 'garbage collection') ----- followMovableLiteralsAndUpdateYoungReferrers "To avoid runtime checks on literal variable and literal accesses in == and ~~, we follow literals in methods having movable literals in the postBecome action. To avoid scanning every method, we annotate cogMethods with the cmHasMovableLiteral flag." <option: #SpurObjectMemory> <api> <returnTypeC: #void> | cogMethod | <var: #cogMethod type: #'CogMethod *'> self assert: methodZone kosherYoungReferrers. "methodZone firstBogusYoungReferrer" "methodZone occurrencesInYoungReferrers: methodZone firstBogusYoungReferrer" codeModified := false. + self ensureWritableCodeZone. cogMethod := self cCoerceSimple: methodZoneBase to: #'CogMethod *'. [cogMethod < methodZone limitZony] whileTrue: [cogMethod cmType ~= CMFree ifTrue: [cogMethod cmHasMovableLiteral ifTrue: + [self followForwardedLiteralsImplementationIn: cogMethod]]. + cogMethod := methodZone methodAfter: cogMethod]. - [self followForwardedLiteralsIn: cogMethod]]. - cogMethod := methodZone methodAfter: cogMethod].. methodZone pruneYoungReferrers. codeModified ifTrue: "After updating oops in inline caches we need to flush the icache." [backEnd flushICacheFrom: codeBase asUnsignedInteger to: methodZone freeStart]. "And ensure code zone is executable. May have pruned young referrers..." self ensureExecutableCodeZone! Item was changed: ----- Method: Cogit>>freeUnmarkedMachineCode (in category 'jit - api') ----- freeUnmarkedMachineCode "Free machine-code methods whose compiled methods are unmarked and open PICs whose selectors are not marked, and closed PICs that refer to unmarked objects." <api> <option: #SpurObjectMemory> | cogMethod freedMethod | self moveProfileToMethods. "simulation only..." freedMethod := false. cogMethod := self cCoerceSimple: methodZoneBase to: #'CogMethod *'. [cogMethod < methodZone limitZony] whileTrue: [(cogMethod cmType = CMMethod and: [(objectMemory isMarked: cogMethod methodObject) not]) ifTrue: [freedMethod := true. methodZone freeMethod: cogMethod]. (cogMethod cmType = CMOpenPIC and: [(objectMemory isImmediate: cogMethod selector) not and: [(objectMemory isMarked: cogMethod selector) not]]) ifTrue: [freedMethod := true. methodZone freeMethod: cogMethod]. (cogMethod cmType = CMClosedPIC and: [self closedPICRefersToUnmarkedObject: cogMethod]) ifTrue: [freedMethod := true. methodZone freeMethod: cogMethod]. cogMethod := methodZone methodAfter: cogMethod]. freedMethod ifTrue: [self unlinkSendsToFree]. + self ensureExecutableCodeZone! - backEnd ensureExecutableCodeZone!

1 0

Small diff for the new Joystick updates on old enough Linux
by Bruce O'Neel 13 Jun '22

13 Jun '22

Hi, I am sending this just to save the next person who stumbles over the new Joystick stuff not building on old enough linuxes some time. In my case old enough is RedHat 7. We should not add complexity to make this automagic. But when someone says "does not build on Linux kernels 3.x or so", I know, ancient, we can say "here, this patch." cheers bruce git diff ../../../../platforms/unix/plugins/JoystickTabletPlugin/sqUnixJoystickTablet.c diff --git a/platforms/unix/plugins/JoystickTabletPlugin/sqUnixJoystickTablet.c b/platforms/unix/plugins/JoystickTabletPlugin/sqUnixJoys index b2e69c7..a3baf8d 100644 --- a/platforms/unix/plugins/JoystickTabletPlugin/sqUnixJoystickTablet.c +++ b/platforms/unix/plugins/JoystickTabletPlugin/sqUnixJoystickTablet.c @@ -26,7 +26,7 @@ */ /* Author: Ian.Piumarta(a)INRIA.Fr -/* Author: davidf(a)afeka.ac.il + Author: davidf(a)afeka.ac.il */ #include <assert.h> @@ -42,7 +42,7 @@ #include <dirent.h> #include <errno.h> #include <poll.h> -#include <linux/input-event-codes.h> +// #include <linux/input-event-codes.h> #include <linux/input.h> #include "JoystickTabletPlugin.h" @@ -161,10 +161,10 @@ detectButtons(joystick_state_t* pj) else { // it's a modern gamepad device - pj->button_index[0] = BTN_NORTH; +/* pj->button_index[0] = BTN_NORTH; pj->button_index[1] = BTN_EAST; pj->button_index[2] = BTN_SOUTH; - pj->button_index[3] = BTN_WEST; + pj->button_index[3] = BTN_WEST; */ } return 1;

1 0

[OpenSmalltalk/opensmalltalk-vm] e9ceb5: CogVM source as per VMMaker.oscog-eem.3187
by Eliot Miranda 09 Jun '22

09 Jun '22

Branch: refs/heads/Cog Home: https://github.com/OpenSmalltalk/opensmalltalk-vm Commit: e9ceb5073084a8b3164235ac66882cf8e8e988ee https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/e9ceb5073084a8b316… Author: Eliot Miranda <eliot.miranda(a)gmail.com> Date: 2022-06-09 (Thu, 09 Jun 2022) Changed paths: M src/spur32.cog.lowcode/cointerp.c M src/spur32.cog.lowcode/cointerp.h M src/spur32.cog.lowcode/gcc3x-cointerp.c M src/spur32.cog/cointerp.c M src/spur32.cog/cointerp.h M src/spur32.cog/cointerpmt.c M src/spur32.cog/cointerpmt.h M src/spur32.cog/gcc3x-cointerp.c M src/spur32.cog/gcc3x-cointerpmt.c M src/spur32.sista/cointerp.c M src/spur32.sista/cointerp.h M src/spur32.sista/gcc3x-cointerp.c M src/spur32.stack.lowcode/gcc3x-interp.c M src/spur32.stack.lowcode/interp.c M src/spur32.stack/gcc3x-interp.c M src/spur32.stack/interp.c M src/spur32.stack/validImage.c M src/spur64.cog.lowcode/cointerp.c M src/spur64.cog.lowcode/cointerp.h M src/spur64.cog.lowcode/gcc3x-cointerp.c M src/spur64.cog/cointerp.c M src/spur64.cog/cointerp.h M src/spur64.cog/cointerpmt.c M src/spur64.cog/cointerpmt.h M src/spur64.cog/gcc3x-cointerp.c M src/spur64.cog/gcc3x-cointerpmt.c M src/spur64.sista/cointerp.c M src/spur64.sista/cointerp.h M src/spur64.sista/gcc3x-cointerp.c M src/spur64.stack.lowcode/gcc3x-interp.c M src/spur64.stack.lowcode/interp.c M src/spur64.stack/gcc3x-interp.c M src/spur64.stack/interp.c M src/spur64.stack/validImage.c M src/v3.cog/cointerp.c M src/v3.cog/cointerp.h M src/v3.cog/gcc3x-cointerp.c M src/v3.stack/gcc3x-interp.c M src/v3.stack/interp.c Log Message: ----------- CogVM source as per VMMaker.oscog-eem.3187 Fix failure of Spur image segment loading due to not having enough memory to allocate the Array of loaded objects result. This is unlikely, but can happen with large image segments if memory is scarce. Fix received from Max Leske with thanks. A little less inlining does you good. Don't inline allocateSlots:format:classIndex: in low-frequency primitives. Improve some comments in the changed methods.

1 0

VM Maker: VMMaker.oscog-eem.3187.mcz
by commits＠source.squeak.org 09 Jun '22

09 Jun '22

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.3187.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.3187 Author: eem Time: 9 June 2022, 12:11:34.381091 pm UUID: 409db813-9691-40ab-8d5b-8960d3b50fbc Ancestors: VMMaker.oscog-eem.3186 A little less inlining does you good. Don't inline allocateSlots:format:classIndex: in low-frequency primitives. =============== Diff against VMMaker.oscog-eem.3186 =============== Item was changed: ----- Method: SpurMemoryManager>>allocateBytes:classIndex: (in category 'allocation') ----- allocateBytes: numBytes classIndex: classIndex "Allocate an object of numBytes. Answer nil if no available memory. classIndex must be that of a byte class (e.g. ByteString). The object is *NOT FILLED*." <var: #numBytes type: #usqInt> + <inline: #always> self assert: (coInterpreter addressCouldBeClassObj: (self classAtIndex: classIndex)). self assert: (self instSpecOfClass: (self classAtIndex: classIndex)) = self firstByteFormat. ^self + noInlineAllocateSlots: (numBytes + self bytesPerOop - 1 // self bytesPerOop) - allocateSlots: (numBytes + self bytesPerOop - 1 // self bytesPerOop) format: (self byteFormatForNumBytes: numBytes) classIndex: classIndex! Item was changed: ----- Method: SpurMemoryManager>>loadImageSegmentFrom:outPointers: (in category 'image segment in/out') ----- loadImageSegmentFrom: segmentWordArray outPointers: outPointerArray "This primitive is called from Smalltalk as... <imageSegment> loadSegmentFrom: aWordArray outPointers: anArray." "This primitive will load a binary image segment created by primitiveStoreImageSegment. It expects the outPointer array to be of the proper size, and the wordArray to be well formed. It will return as its value the original array of roots, and the segmentWordArray will become an array of the loaded objects. If this primitive should fail, the segmentWordArray will, sadly, have been reduced to an unrecognizable and unusable jumble. But what more could you have done with it anyway? The primitive, if it succeeds, also becomes the segmentWordArray into the array of loaded objects. This allows fixing up of loaded objects directly, without nextObject, which Spur doesn't support." <inline: #never> | segmentLimit segmentStart segVersion errorCode numLoadedObjects loadedObjectsArray | segmentLimit := self numSlotsOf: segmentWordArray. (self objectBytesForSlots: segmentLimit) < (self allocationUnit "version info" + self baseHeaderSize "one object header") ifTrue: [^PrimErrBadArgument halt]. "Verify format. If the format is wrong, word-swap (since ImageSegment data are 32-bit longs). If it is still wrong, undo the damage and fail." segVersion := self longAt: segmentWordArray + self baseHeaderSize. (coInterpreter readableFormat: (segVersion bitAnd: 16rFFFFFF "low 3 bytes")) ifFalse: [self reverseBytesIn32BitWordsIn: segmentWordArray. segVersion := self longAt: segmentWordArray + self baseHeaderSize. (coInterpreter readableFormat: (segVersion bitAnd: 16rFFFFFF "low 3 bytes")) ifFalse: [self reverseBytesIn32BitWordsIn: segmentWordArray. ^PrimErrBadArgument halt]]. segmentStart := segmentWordArray + self baseHeaderSize + self allocationUnit. segmentLimit := segmentLimit * self bytesPerOop + segmentWordArray + self baseHeaderSize. "Notionally reverse the Byte type objects if the data is from opposite endian machine. Test top byte. $d on the Mac or $s on the PC. Rest of word is equal. If Spur is ever ported to big-endian machines then the segment may have to be byte/word swapped, but so far it only runs on little-endian machines, so for now just fail if endianness is wrong." self flag: #endianness. (segVersion >> 24 bitAnd: 16rFF) ~= (self imageSegmentVersion >> 24 bitAnd: 16rFF) ifTrue: "Reverse the byte-type objects once" [true ifTrue: [^PrimErrBadArgument halt] ifFalse: [self byteSwapByteObjectsFrom: (self objectStartingAt: segmentStart) to: segmentLimit flipFloatsIf: false]]. "Avoid having to remember by arranging that there are no young outPointers if segment is in old space." (self isOldObject: segmentWordArray) ifTrue: [errorCode := self ensureNoNewObjectsIn: outPointerArray. errorCode ~= 0 ifTrue: [^errorCode]]. "scan through mapping oops and validating class references. Defer entering any class objects into the class table and/or pinning objects until a second pass." errorCode := self mapOopsAndValidateClassRefsFrom: segmentStart to: segmentLimit outPointers: outPointerArray. errorCode > 0 ifTrue: [^errorCode]. numLoadedObjects := errorCode negated. + loadedObjectsArray := self noInlineAllocateSlots: numLoadedObjects format: self arrayFormat classIndex: ClassArrayCompactIndex. - loadedObjectsArray := self allocateSlots: numLoadedObjects format: self arrayFormat classIndex: ClassArrayCompactIndex. loadedObjectsArray ifNil: [self growOldSpaceByAtLeast: (self largeObjectBytesForSlots: numLoadedObjects). + loadedObjectsArray := self noInlineAllocateSlots: numLoadedObjects format: self arrayFormat classIndex: ClassArrayCompactIndex. - loadedObjectsArray := self allocateSlots: numLoadedObjects format: self arrayFormat classIndex: ClassArrayCompactIndex. loadedObjectsArray ifNil: [^PrimErrNoMemory halt]]. "Scan for classes contained in the segment, entering them into the class table. Classes are at the front, after the root array and have the remembered bit set." errorCode := self enterClassesIntoClassTableFrom: segmentStart to: segmentLimit. errorCode ~= 0 ifTrue: [^errorCode]. "Make a final pass, assigning class indices and/or pinning pinned objects and collecting the loaded objects in loadedObjectsArray" self assignClassIndicesAndPinFrom: segmentStart to: segmentLimit outPointers: outPointerArray filling: loadedObjectsArray. "Evaporate the container, leaving the newly loaded objects in place." (self hasOverflowHeader: segmentWordArray) ifTrue: "N.B. setting the overflow slots to 1 creates a slimbridge in eden, so we also need to delete the overflow slot count in the segment itself" [(self oop: segmentWordArray isLessThan: oldSpaceStart) ifTrue: [self rawOverflowSlotsOf: segmentWordArray put: 0. self rawNumSlotsOf: segmentWordArray put: 0] ifFalse: [self rawOverflowSlotsOf: segmentWordArray put: self allocationUnit / self bytesPerOop]] ifFalse: [self rawNumSlotsOf: segmentWordArray put: self allocationUnit / self bytesPerOop]. "Finally forward the segmentWordArray to the loadedObjectsArray" self forward: segmentWordArray to: loadedObjectsArray. self runLeakCheckerFor: GCCheckImageSegment. "Answer the first object in the segment because this is what primitiveLoadImageSegment tests for, even though the real result is the segmentWordArray forwarded to the loadedObjectsArray." ^self objectStartingAt: segmentStart! Item was added: + ----- Method: SpurMemoryManager>>noInlineAllocateSlots:format:classIndex: (in category 'allocation') ----- + noInlineAllocateSlots: numSlots format: formatField classIndex: classIndex + "Allocate an object with numSlots space. If there is room beneath scavengeThreshold + allocate in newSpace, otherwise alocate in oldSpace. If there is not room in newSpace + and a scavenge is not already scheduled, schedule a scavenge." + <inline: #never> + ^self allocateSlots: numSlots format: formatField classIndex: classIndex! Item was changed: ----- Method: SpurMemoryManager>>storeImageSegmentInto:outPointers:roots: (in category 'image segment in/out') ----- storeImageSegmentInto: segmentWordArrayArg outPointers: outPointerArrayArg roots: arrayOfRootsArg "This primitive is called from Squeak as... <imageSegment> storeSegmentFor: arrayOfRoots into: aWordArray outPointers: anArray. This primitive will store a binary image segment (in the same format as objects in the heap) of the set of objects in arrayOfObjects. All pointers from within the set to objects outside the set will be copied into the array of outPointers. In their place in the image segment will be an oop equal to the offset in the outPointer array (the first would be 8), but with the high bit set. Since Spur has a class table the load primitive must insert classes that have instances into the class table. This primitive marks such classes using the isRemembered bit, which isn't meaningful as a remembered bit in the segment. The primitive expects the segmentWordArray and outPointerArray to be more than adequately long. In this case it returns normally, and truncates the two arrays to exactly the right size. The primitive can fail for the following reasons with the specified failure codes: PrimErrGenericError: the segmentWordArray is too small for the version stamp PrimErrWritePastObject: the segmentWordArray is too small to contain the reachable objects PrimErrBadIndex: the outPointerArray is too small PrimErrNoMemory: additional allocations failed PrimErrLimitExceeded: there is no room in the hash field to store out pointer indices or class references." <inline: false> | segmentWordArray outPointerArray arrayOfRoots arrayOfObjects savedFirstFields savedOutHashes segStart segAddr endSeg outIndex numClassesInSegment | <var: 'segAddr' type: #usqInt> ((self isObjImmutable: segmentWordArrayArg) or: [self isObjImmutable: outPointerArrayArg]) ifTrue: [^PrimErrNoModification]. "Since segmentWordArrayArg & outPointerArrayArg may get shortened, they can't be pinned." ((self isPinned: segmentWordArrayArg) or: [self isPinned: outPointerArrayArg]) ifTrue: [^PrimErrObjectIsPinned]. (self numSlotsOf: outPointerArrayArg) > self maxIdentityHash ifTrue: [^PrimErrLimitExceeded]. self runLeakCheckerFor: GCCheckImageSegment. "First scavenge to collect any new space garbage that refers to the graph." self scavengingGC. segmentWordArray := self updatePostScavenge: segmentWordArrayArg. outPointerArray := self updatePostScavenge: outPointerArrayArg. arrayOfRoots := self updatePostScavenge: arrayOfRootsArg. self deny: (self forwardersIn: outPointerArray). self deny: (self forwardersIn: arrayOfRoots). "Now compute the transitive closure, collecting the sequence of objects to be stored in the arrayOfObjects array. Included in arrayOfObjects are the arrayOfRoots and all its contents. All objects have been unmarked." arrayOfObjects := self objectsReachableFromRoots: arrayOfRoots. arrayOfObjects ifNil: [^PrimErrNoMemory]. "If objectsReachableFromRoots: answers an integer there is not enough continuous free space in which to allocate the reachable objects. If there is sufficient free space then answer an error code to prompt a compacting GC and a retry." (self isIntegerObject: arrayOfObjects) ifTrue: [totalFreeOldSpace - self allocationUnit >= (self integerValueOf: arrayOfObjects) ifTrue: [^PrimErrNeedCompaction]. ^PrimErrNoMemory]. self assert: self allObjectsUnmarked. "work to be done when the incremental GC is written" self deny: (self forwardersIn: arrayOfObjects). "Both to expand the max size of segment and to reduce the length of the load-time pass that adds classes to the class table, move classes to the front of arrayOfObjects, leaving the root array as the first element." numClassesInSegment := self moveClassesForwardsIn: arrayOfObjects. "The scheme is to copy the objects into segmentWordArray, and then map the oops in segmentWordArray. Therefore the primitive needs to both map efficiently originals to copies in segmentWordArray and be able to undo any side-effects if the primitive fails because either segmentWordArray or outPointerArray is too small. The mapping is done by having the objects to be stored in arrayOfObjects refer to their mapped locations through their first field, just like a forwarding pointer, but without becoming a forwarder, saving their first field in savedFirstFields, and the objects in outPointerArray pointing to their locations in the outPointerArray through their identityHashes, saved in savedOutHashes. Since arrayOfObjects and its savedFirstFields, and outPointerArray and its saved hashes, can be enumerated side-by-side, the hashes can be restored to the originals. So the first field of the heap object corresponding to an object in arrayOfObjects is set to its location in segmentWordArray, and the hash of an object in outPointerArray is set to its index in outPointerArray plus the top hash bit. Classes in arrayOfObjects have their marked bit set. Oops in objects in segmentWordArray are therefore mapped by accessing the original oop, and following its first field. Class indices in segmentWordArray are mapped by fetching the original class, and testing its marked bit. If marked, the first field is followed to access the class copy in the segment. Out pointers (objects and classes, which are unmarked), the object's identityHash is set (eek!!!!) to its index in the outPointerArray. So savedOutHashes parallels the outPointerArray. The saved hash array is initialized with an out-of-range hash value so that the first unused entry can be identified." + savedFirstFields := self noInlineAllocateSlots: (self numSlotsOf: arrayOfObjects) - savedFirstFields := self allocateSlots: (self numSlotsOf: arrayOfObjects) format: self wordIndexableFormat classIndex: self wordSizeClassIndexPun. + savedOutHashes := self noInlineAllocateSlots: (self numSlotsForBytes: (self numSlotsOf: outPointerArray) * 4) - savedOutHashes := self allocateSlots: (self numSlotsForBytes: (self numSlotsOf: outPointerArray) * 4) format: self firstLongFormat classIndex: self thirtyTwoBitLongsClassIndexPun. (savedFirstFields isNil or: [savedOutHashes isNil]) ifTrue: [self freeObject: arrayOfObjects. (savedFirstFields notNil and: [self isInOldSpace: savedFirstFields]) ifTrue: [self freeObject: savedFirstFields]. (savedOutHashes notNil and: [self isInOldSpace: savedOutHashes]) ifTrue: [self freeObject: savedOutHashes]. ^PrimErrNoMemory]. self fillObj: savedFirstFields numSlots: (self numSlotsOf: savedFirstFields) with: 0. self fillObj: savedOutHashes numSlots: (self numSlotsOf: savedOutHashes) with: self savedOutHashFillValue. segAddr := segmentWordArray + self baseHeaderSize. endSeg := self addressAfter: segmentWordArray. "Write a version number for byte order and version check." segAddr >= endSeg ifTrue: [^PrimErrGenericFailure]. self long32At: segAddr put: self imageSegmentVersion. self long32At: segAddr + 4 put: self imageSegmentVersion. segStart := segAddr := segAddr + self allocationUnit. self assert: arrayOfRoots = (self fetchPointer: 0 ofObject: arrayOfObjects). "Copy all reachable objects to the segment, setting the marked bit for all objects (clones) in the segment, and the remembered bit for all classes (clones) in the segment." 0 to: (self numSlotsOf: arrayOfObjects) - 1 do: [:i| | newSegAddrOrError objOop | "Check that classes in the segment are addressable. Since the top bit of the hash field is used to tag classes external to the segment, the segment offset must not inadvertently set this bit. This limit still allows for a million or more classes." (i = numClassesInSegment and: [segAddr - segStart / self allocationUnit + self lastClassIndexPun >= TopHashBit]) ifTrue: [^self return: PrimErrLimitExceeded restoringObjectsIn: arrayOfObjects upTo: i savedFirstFields: savedFirstFields]. objOop := self fetchPointer: i ofObject: arrayOfObjects. self deny: ((self isImmediate: objOop) or: [self isForwarded: objOop]). newSegAddrOrError := self copyObj: objOop toAddr: segAddr stopAt: endSeg savedFirstFields: savedFirstFields index: i. (self oop: newSegAddrOrError isLessThan: segStart) ifTrue: [^self return: newSegAddrOrError restoringObjectsIn: arrayOfObjects upTo: i savedFirstFields: savedFirstFields]. segAddr := newSegAddrOrError]. "Check that it can be safely shortened." (endSeg ~= segAddr and: [endSeg - segAddr < (self baseHeaderSize + self bytesPerOop)]) ifTrue: [^self return: PrimErrWritePastObject restoringObjectsIn: arrayOfObjects upTo: -1 savedFirstFields: savedFirstFields]. "Now scan, adding out pointers to the outPointersArray; all objects in arrayOfObjects have their first field pointing to the corresponding copy in segmentWordArray." (outIndex := self mapOopsFrom: segStart to: segAddr outPointers: outPointerArray outHashes: savedOutHashes) < 0 ifTrue: "no room in outPointers; fail" [^self return: PrimErrBadIndex restoringObjectsIn: arrayOfObjects savedFirstFields: savedFirstFields and: outPointerArray savedHashes: savedOutHashes]. "We're done. Shorten the results, restore hashes and return." self shorten: segmentWordArray toIndexableSize: segAddr - (segmentWordArray + self baseHeaderSize) / 4. self shorten: outPointerArray toIndexableSize: outIndex. ^self return: PrimNoErr restoringObjectsIn: arrayOfObjects savedFirstFields: savedFirstFields and: outPointerArray savedHashes: savedOutHashes!

1 0

VM Maker: VMMaker.oscog-eem.3186.mcz
by commits＠source.squeak.org 09 Jun '22

09 Jun '22

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.3186.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.3186 Author: eem Time: 9 June 2022, 11:13:32.630854 am UUID: 0d525cc7-e989-4c4b-af03-cb12d271b302 Ancestors: VMMaker.oscog-eem.3184, VMMaker.oscog-dtl.3185 Fix failure of Spur image segment loading due to not having enough memory to allocate the Array of loaded objects result. This is unlikely, but can happen with large image segments if memory is scarce. Fix received from Max Leske with thanks. Improve some comments in the changed methods. =============== Diff against VMMaker.oscog-dtl.3185 =============== Item was changed: ----- Method: SpurMemoryManager>>loadImageSegmentFrom:outPointers: (in category 'image segment in/out') ----- loadImageSegmentFrom: segmentWordArray outPointers: outPointerArray "This primitive is called from Smalltalk as... <imageSegment> loadSegmentFrom: aWordArray outPointers: anArray." "This primitive will load a binary image segment created by primitiveStoreImageSegment. It expects the outPointer array to be of the proper size, and the wordArray to be well formed. It will return as its value the original array of roots, and the segmentWordArray will become an array of the loaded objects. If this primitive should fail, the segmentWordArray will, sadly, have been reduced to an unrecognizable and unusable jumble. But what more could you have done with it anyway? The primitive, if it succeeds, also becomes the segmentWordArray into the array of loaded objects. This allows fixing up of loaded objects directly, without nextObject, which Spur doesn't support." <inline: #never> | segmentLimit segmentStart segVersion errorCode numLoadedObjects loadedObjectsArray | segmentLimit := self numSlotsOf: segmentWordArray. (self objectBytesForSlots: segmentLimit) < (self allocationUnit "version info" + self baseHeaderSize "one object header") ifTrue: [^PrimErrBadArgument halt]. "Verify format. If the format is wrong, word-swap (since ImageSegment data are 32-bit longs). If it is still wrong, undo the damage and fail." segVersion := self longAt: segmentWordArray + self baseHeaderSize. (coInterpreter readableFormat: (segVersion bitAnd: 16rFFFFFF "low 3 bytes")) ifFalse: [self reverseBytesIn32BitWordsIn: segmentWordArray. segVersion := self longAt: segmentWordArray + self baseHeaderSize. (coInterpreter readableFormat: (segVersion bitAnd: 16rFFFFFF "low 3 bytes")) ifFalse: [self reverseBytesIn32BitWordsIn: segmentWordArray. ^PrimErrBadArgument halt]]. segmentStart := segmentWordArray + self baseHeaderSize + self allocationUnit. segmentLimit := segmentLimit * self bytesPerOop + segmentWordArray + self baseHeaderSize. "Notionally reverse the Byte type objects if the data is from opposite endian machine. Test top byte. $d on the Mac or $s on the PC. Rest of word is equal. If Spur is ever ported to big-endian machines then the segment may have to be byte/word swapped, but so far it only runs on little-endian machines, so for now just fail if endianness is wrong." self flag: #endianness. (segVersion >> 24 bitAnd: 16rFF) ~= (self imageSegmentVersion >> 24 bitAnd: 16rFF) ifTrue: "Reverse the byte-type objects once" [true ifTrue: [^PrimErrBadArgument halt] ifFalse: [self byteSwapByteObjectsFrom: (self objectStartingAt: segmentStart) to: segmentLimit flipFloatsIf: false]]. "Avoid having to remember by arranging that there are no young outPointers if segment is in old space." (self isOldObject: segmentWordArray) ifTrue: [errorCode := self ensureNoNewObjectsIn: outPointerArray. errorCode ~= 0 ifTrue: [^errorCode]]. "scan through mapping oops and validating class references. Defer entering any class objects into the class table and/or pinning objects until a second pass." errorCode := self mapOopsAndValidateClassRefsFrom: segmentStart to: segmentLimit outPointers: outPointerArray. errorCode > 0 ifTrue: [^errorCode]. numLoadedObjects := errorCode negated. loadedObjectsArray := self allocateSlots: numLoadedObjects format: self arrayFormat classIndex: ClassArrayCompactIndex. loadedObjectsArray ifNil: + [self growOldSpaceByAtLeast: (self largeObjectBytesForSlots: numLoadedObjects). + loadedObjectsArray := self allocateSlots: numLoadedObjects format: self arrayFormat classIndex: ClassArrayCompactIndex. + loadedObjectsArray ifNil: + [^PrimErrNoMemory halt]]. - [^PrimErrNoMemory halt]. "Scan for classes contained in the segment, entering them into the class table. Classes are at the front, after the root array and have the remembered bit set." errorCode := self enterClassesIntoClassTableFrom: segmentStart to: segmentLimit. errorCode ~= 0 ifTrue: [^errorCode]. "Make a final pass, assigning class indices and/or pinning pinned objects and collecting the loaded objects in loadedObjectsArray" self assignClassIndicesAndPinFrom: segmentStart to: segmentLimit outPointers: outPointerArray filling: loadedObjectsArray. "Evaporate the container, leaving the newly loaded objects in place." (self hasOverflowHeader: segmentWordArray) ifTrue: "N.B. setting the overflow slots to 1 creates a slimbridge in eden, so we also need to delete the overflow slot count in the segment itself" [(self oop: segmentWordArray isLessThan: oldSpaceStart) ifTrue: [self rawOverflowSlotsOf: segmentWordArray put: 0. self rawNumSlotsOf: segmentWordArray put: 0] ifFalse: [self rawOverflowSlotsOf: segmentWordArray put: self allocationUnit / self bytesPerOop]] ifFalse: [self rawNumSlotsOf: segmentWordArray put: self allocationUnit / self bytesPerOop]. "Finally forward the segmentWordArray to the loadedObjectsArray" self forward: segmentWordArray to: loadedObjectsArray. self runLeakCheckerFor: GCCheckImageSegment. + "Answer the first object in the segment because this is what primitiveLoadImageSegment tests for, + even though the real result is the segmentWordArray forwarded to the loadedObjectsArray." ^self objectStartingAt: segmentStart! Item was changed: ----- Method: SpurMemoryManager>>mapOopsAndValidateClassRefsFrom:to:outPointers: (in category 'image segment in/out') ----- mapOopsAndValidateClassRefsFrom: segmentStart to: segmentLimit outPointers: outPointerArray "This is part of loadImageSegmentFrom:outPointers:. Scan through mapping oops and validating class references. Defer entering any class objects into the class table and/or pinning objects + until the second pass in assignClassIndicesAndPinFrom:to:outPointers:. + If anything is wrong, answer a primitive error code, otherwise answer + the number of objects in the segment as a negative value." - until the second pass in assignClassIndicesAndPinFrom:to:outPointers:." <var: 'segmentLimit' type: #usqInt> | numOutPointers numSegObjs objOop | <var: #oop type: #usqInt> numOutPointers := self numSlotsOf: outPointerArray. numSegObjs := 0. objOop := self objectStartingAt: segmentStart. [self oop: objOop isLessThan: segmentLimit] whileTrue: [| classIndex hash oop mappedOop | numSegObjs := numSegObjs + 1. "No object in the segment should be marked. If is is something is wrong." (self isMarked: objOop) ifTrue: [^PrimErrInappropriate halt]. classIndex := self classIndexOf: objOop. "validate the class ref, but don't update it until any internal classes have been added to the class table." (classIndex anyMask: TopHashBit) ifTrue: [classIndex := classIndex - TopHashBit. classIndex >= numOutPointers ifTrue: [^PrimErrBadIndex halt]. mappedOop := self fetchPointer: classIndex ofObject: outPointerArray. hash := self rawHashBitsOf: mappedOop. (hash = 0 "class has yet to be instantiated" or: [hash > self lastClassIndexPun and: [(self classOrNilAtIndex: hash) = mappedOop]]) ifFalse: [^PrimErrInappropriate halt]] ifFalse: "The class is contained within the segment." [(oop := classIndex - self firstClassIndexPun * self allocationUnit + segmentStart) >= segmentLimit ifTrue: [^PrimErrBadIndex halt]. (self rawHashBitsOf: oop) ~= 0 ifTrue: [^PrimErrInappropriate halt]]. 0 to: (self numPointerSlotsOf: objOop) - 1 do: [:i| oop := self fetchPointer: i ofObject: objOop. (self isNonImmediate: oop) ifTrue: [(oop anyMask: TopOopBit) ifTrue: [(oop := oop - TopOopBit / self bytesPerOop) >= numOutPointers ifTrue: [^PrimErrBadIndex halt]. mappedOop := self fetchPointer: oop ofObject: outPointerArray] ifFalse: [(oop bitAnd: self allocationUnit - 1) ~= 0 ifTrue: [^PrimErrInappropriate halt]. (mappedOop := oop + segmentStart) >= segmentLimit ifTrue: [^PrimErrBadIndex halt]]. self storePointerUnchecked: i ofObject: objOop withValue: mappedOop]]. objOop := self objectAfter: objOop limit: segmentLimit]. ^numSegObjs negated!

1 0

VM Maker Inbox: VMMaker.oscog-eem.3184.mcz
by commits＠source.squeak.org 09 Jun '22

09 Jun '22

Eliot Miranda uploaded a new version of VMMaker to project VM Maker Inbox: http://source.squeak.org/VMMakerInbox/VMMaker.oscog-eem.3184.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.3184 Author: eem Time: 8 June 2022, 7:36:42.433631 pm UUID: 656c5ccf-2a35-4c16-a16f-e3821211da38 Ancestors: VMMaker.oscog-eem.3183 Improve the comment of a Spur image segment loading helper method. =============== Diff against VMMaker.oscog-eem.3183 =============== Item was changed: ----- Method: SpurMemoryManager>>mapOopsAndValidateClassRefsFrom:to:outPointers: (in category 'image segment in/out') ----- mapOopsAndValidateClassRefsFrom: segmentStart to: segmentLimit outPointers: outPointerArray "This is part of loadImageSegmentFrom:outPointers:. Scan through mapping oops and validating class references. Defer entering any class objects into the class table and/or pinning objects + until the second pass in assignClassIndicesAndPinFrom:to:outPointers:. + If anything is wrong, answer a primitive error code, otherwise answer + the number of objects in the segment as a negative value." - until the second pass in assignClassIndicesAndPinFrom:to:outPointers:." <var: 'segmentLimit' type: #usqInt> | numOutPointers numSegObjs objOop | <var: #oop type: #usqInt> numOutPointers := self numSlotsOf: outPointerArray. numSegObjs := 0. objOop := self objectStartingAt: segmentStart. [self oop: objOop isLessThan: segmentLimit] whileTrue: [| classIndex hash oop mappedOop | numSegObjs := numSegObjs + 1. "No object in the segment should be marked. If is is something is wrong." (self isMarked: objOop) ifTrue: [^PrimErrInappropriate halt]. classIndex := self classIndexOf: objOop. "validate the class ref, but don't update it until any internal classes have been added to the class table." (classIndex anyMask: TopHashBit) ifTrue: [classIndex := classIndex - TopHashBit. classIndex >= numOutPointers ifTrue: [^PrimErrBadIndex halt]. mappedOop := self fetchPointer: classIndex ofObject: outPointerArray. hash := self rawHashBitsOf: mappedOop. (hash = 0 "class has yet to be instantiated" or: [hash > self lastClassIndexPun and: [(self classOrNilAtIndex: hash) = mappedOop]]) ifFalse: [^PrimErrInappropriate halt]] ifFalse: "The class is contained within the segment." [(oop := classIndex - self firstClassIndexPun * self allocationUnit + segmentStart) >= segmentLimit ifTrue: [^PrimErrBadIndex halt]. (self rawHashBitsOf: oop) ~= 0 ifTrue: [^PrimErrInappropriate halt]]. 0 to: (self numPointerSlotsOf: objOop) - 1 do: [:i| oop := self fetchPointer: i ofObject: objOop. (self isNonImmediate: oop) ifTrue: [(oop anyMask: TopOopBit) ifTrue: [(oop := oop - TopOopBit / self bytesPerOop) >= numOutPointers ifTrue: [^PrimErrBadIndex halt]. mappedOop := self fetchPointer: oop ofObject: outPointerArray] ifFalse: [(oop bitAnd: self allocationUnit - 1) ~= 0 ifTrue: [^PrimErrInappropriate halt]. (mappedOop := oop + segmentStart) >= segmentLimit ifTrue: [^PrimErrBadIndex halt]]. self storePointerUnchecked: i ofObject: objOop withValue: mappedOop]]. objOop := self objectAfter: objOop limit: segmentLimit]. ^numSegObjs negated!

1 0

[OpenSmalltalk/opensmalltalk-vm] primitiveImageFormatVersion may be not correct (Issue #638)
by Marcel Taeumel 08 Jun '22

08 Jun '22

The return value of `primitiveImageFormatVersion` is hard-coded and does not consider the value of `multipleBytecodeSetsActive`, which is indeed important when trying to open a particular image with a particular VM. See: - Interpreter >> #imageFormatVersion - StackInterpreter >> #imageFormatVersion - ObjectMemory >> #imageFormatVersion - Spur32BitMemoryManager >> #imageFormatVersion - Spur64BitMemoryManager >> #imageFormatVersion Note that this can be fixed on the image-side by checking primitiveMultipleBytecodeSetsActive. -- Reply to this email directly or view it on GitHub: https://github.com/OpenSmalltalk/opensmalltalk-vm/issues/638 You are receiving this because you are subscribed to this thread. Message ID: <OpenSmalltalk/opensmalltalk-vm/issues/638(a)github.com>

4 14

[ANN] OpenSmalltalk VM 2022.06 released (tag 202206021410)
by Marcel Taeumel 03 Jun '22

03 Jun '22

Hi all! We just made a patch release: https://github.com/OpenSmalltalk/opensmalltalk-vm/releases/tag/202206021410 [https://github.com/OpenSmalltalk/opensmalltalk-vm/releases/tag/202206021410] - Adds joystick/gamepad support on Linux - Fixes support for OpenSSL3 on Linux - Fixes resolution of fully-qualified domain names (FQDNs) longer than 64 characters on Linux (Squeak's bundles will be updated ASAP. Check the name of the file/archive download.) Best, Marcel (on behalf of the OSVM core dev team)

1 0

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

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

Vm-dev June 2022