Vm-dev May 2018

vm-dev@lists.squeakfoundation.org

30 participants
115 discussions

Errored: OpenSmalltalk/opensmalltalk-vm#1326 (Cog - 2a64f48)
by Travis CI 03 May '18

03 May '18

Build Update for OpenSmalltalk/opensmalltalk-vm ------------------------------------- Build: #1326 Status: Errored Duration: 20 mins and 56 secs Commit: 2a64f48 (Cog) Author: Eliot Miranda Message: CogVM source as per VMMaker.oscog-eem.2381 General: ** new primitive to compare strings (slang + JIT) answers negative smi, 0 or positive smi (instead of 1, 2 or 3 in the MiscPlugin) Spur: Fix compiler bug with Apple LLVM version 7.0.0 (clang-700.1.76) for 64-bit Spur segment loading where compiler bug eliminated second version check in segment load when at -Os. Fix is to never inline the 32-bit word byte reversal. Fix sign extension in printOop: et al on 64-bit Spur. FFI Plugin: Correct a 32bit-hardcoded pointer size in FFI Correct two copy/paste typos in num32BitUnitsOf: Nicolas Cellier: Note: I don't like the FFI code that I just corrected. IMO, it does the wrong thing. if I have an argument spec is MyLib>>foo: aFoo <cdecl: void foo(Foo *)> where Foo is some ExternalStructure subclass (Foo class>>fields ^#((x 'ushort') (y 'ushort'))) and that I try to pass (MyLib new foo: Foo new), it seems to me that the Foo new getHandle will be (ByteArray new: 4). What I understand from the code that I just corrected is that we are trying to pass the contents of the ByteArray re-interpreted as a void pointer. Scary and wrong... If I instead pass (MyLib new foo: Foo externalNew), it seems that we don't even bother to check if the (argSpec anyMask: FFIFlagPointer) and just force passing the structure by value (thru a memcpy on stack). Scary and wrong... In general, every one use <cdecl: void foo(void *)> to work around this ill-behavior, and thus bypass type checks... Also note that we can't even pass an ExternalData (think an Array of Foo), because ffiArgument:Spec:Class:in: insists on having actualArg class inheritsFrom: argType referentClass. ExternalData does not inherit from Foo, event if its type matches (ExternalType structTypeNamed: #Foo). That's crazy... Another reason while people use <cdecl: void foo(void *)> It's high time to consider a rewrite IMO. Git: Add scripts to list modified and untracked files. View the changeset: https://github.com/OpenSmalltalk/opensmalltalk-vm/compare/42c2af2d4838...2a… View the full build log and details: https://travis-ci.org/OpenSmalltalk/opensmalltalk-vm/builds/374223023?utm_s… -- You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications This email was sent to vm-dev(a)lists.squeakfoundation.org (mailto:vm-dev@lists.squeakfoundation.org) unsubscribe from this list (http://clicks.travis-ci.com/track/unsub.php?u=14313403&id=82653a6a0fa34337b…)

2 1

[OpenSmalltalk/opensmalltalk-vm] 2a64f4: CogVM source as per VMMaker.oscog-eem.2381
by GitHub 03 May '18

03 May '18

Branch: refs/heads/Cog Home: https://github.com/OpenSmalltalk/opensmalltalk-vm Commit: 2a64f480334f24aca3f48769b61d9989330ecf17 https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/2a64f480334f24aca3… Author: Eliot Miranda <eliot.miranda(a)gmail.com> Date: 2018-05-02 (Wed, 02 May 2018) Changed paths: M nsspur64src/vm/cogit.h M nsspur64src/vm/cogitX64SysV.c M nsspur64src/vm/cogitX64WIN64.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 A scripts/modified A scripts/untracked M spur64src/vm/cogit.h M spur64src/vm/cogitX64SysV.c M spur64src/vm/cogitX64WIN64.c M spur64src/vm/cointerp.c M spur64src/vm/cointerp.h M spur64src/vm/cointerpmt.c M spur64src/vm/cointerpmt.h M spur64src/vm/gcc3x-cointerp.c M spur64src/vm/gcc3x-cointerpmt.c M spurlowcode64src/vm/cogit.h M spurlowcode64src/vm/cogitX64SysV.c M spurlowcode64src/vm/cogitX64WIN64.c M spurlowcode64src/vm/cointerp.c M spurlowcode64src/vm/cointerp.h M spurlowcode64src/vm/gcc3x-cointerp.c M spurlowcodesrc/vm/cogit.h M spurlowcodesrc/vm/cogitARMv5.c M spurlowcodesrc/vm/cogitIA32.c M spurlowcodesrc/vm/cogitMIPSEL.c M spurlowcodesrc/vm/cointerp.c M spurlowcodesrc/vm/cointerp.h M spurlowcodesrc/vm/gcc3x-cointerp.c M spurlowcodestack64src/vm/gcc3x-interp.c M spurlowcodestack64src/vm/interp.c M spurlowcodestacksrc/vm/gcc3x-interp.c M spurlowcodestacksrc/vm/interp.c M spursista64src/vm/cogit.h M spursista64src/vm/cogitX64SysV.c M spursista64src/vm/cogitX64WIN64.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/cointerpmt.c M spursrc/vm/cointerpmt.h M spursrc/vm/gcc3x-cointerp.c M spursrc/vm/gcc3x-cointerpmt.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/Squeak3D/Squeak3D.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 VMMaker.oscog-eem.2381 General: ** new primitive to compare strings (slang + JIT) answers negative smi, 0 or positive smi (instead of 1, 2 or 3 in the MiscPlugin) Spur: Fix compiler bug with Apple LLVM version 7.0.0 (clang-700.1.76) for 64-bit Spur segment loading where compiler bug eliminated second version check in segment load when at -Os. Fix is to never inline the 32-bit word byte reversal. Fix sign extension in printOop: et al on 64-bit Spur. FFI Plugin: Correct a 32bit-hardcoded pointer size in FFI Correct two copy/paste typos in num32BitUnitsOf: Nicolas Cellier: Note: I don't like the FFI code that I just corrected. IMO, it does the wrong thing. if I have an argument spec is MyLib>>foo: aFoo <cdecl: void foo(Foo *)> where Foo is some ExternalStructure subclass (Foo class>>fields ^#((x 'ushort') (y 'ushort'))) and that I try to pass (MyLib new foo: Foo new), it seems to me that the Foo new getHandle will be (ByteArray new: 4). What I understand from the code that I just corrected is that we are trying to pass the contents of the ByteArray re-interpreted as a void pointer. Scary and wrong... If I instead pass (MyLib new foo: Foo externalNew), it seems that we don't even bother to check if the (argSpec anyMask: FFIFlagPointer) and just force passing the structure by value (thru a memcpy on stack). Scary and wrong... In general, every one use <cdecl: void foo(void *)> to work around this ill-behavior, and thus bypass type checks... Also note that we can't even pass an ExternalData (think an Array of Foo), because ffiArgument:Spec:Class:in: insists on having actualArg class inheritsFrom: argType referentClass. ExternalData does not inherit from Foo, event if its type matches (ExternalType structTypeNamed: #Foo). That's crazy... Another reason while people use <cdecl: void foo(void *)> It's high time to consider a rewrite IMO. Git: Add scripts to list modified and untracked files. **NOTE:** This service been marked for deprecation: https://developer.github.com/changes/2018-04-25-github-services-deprecation/ Functionality will be removed from GitHub.com on January 31st, 2019.

1 0

VM Maker: VMMaker.oscog-eem.2381.mcz
by commits＠source.squeak.org 03 May '18

03 May '18

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.2381.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.2381 Author: eem Time: 2 May 2018, 6:38:40.242754 pm UUID: c8fa6961-f14a-4115-aa4c-f445c5f51e6f Ancestors: VMMaker.oscog-eem.2380 Fix a bug in the refactored conditional define code; a slip caused premature evaluation of the block argument. Fix a spleeing rorre. =============== Diff against VMMaker.oscog-eem.2380 =============== Item was changed: ----- Method: VMMaker class>>generateAllConfigurationsUnderVersionControl (in category 'configurations') ----- generateAllConfigurationsUnderVersionControl self executeDisplayingProgress: (OrderedDictionary with: 'Generate all newspeak configurations under VCS' -> [ self generateAllNewspeakConfigurationsUnderVersionControl ] with: 'Generate all squeak cofigurations under VCS' -> [ self generateAllSqueakConfigurationsUnderVersionControl ] + with: 'Generate all spur lowcode configurations' -> [ self generateAllSpurLowcodeConfigurations ] - with: 'Generate all spur lowercode configurations' -> [ self generateAllSpurLowcodeConfigurations ] with: 'Generate VM plugins' -> [ self generateVMPlugins ])! Item was changed: ----- Method: VMPluginCodeGenerator>>withGuardAgainstDefinitionOf:on:do: (in category 'C translation') ----- withGuardAgainstDefinitionOf: selector on: aStream do: aBlock "Evaluate aBlock, surrounded by a define if selector is defined as a macro (i.e. by preDeclareInterpreterProxyOn:" (self selectorsThatMayBeGeneratedAsMacros includes: selector) ifFalse: [^aBlock value]. self withConditionalDefineOf: (self cFunctionNameFor: selector) comment: nil on: aStream + do: aBlock! - do: aBlock value!

1 0

VM Maker: VMMaker.oscog-eem.2380.mcz
by commits＠source.squeak.org 03 May '18

03 May '18

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.2380.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.2380 Author: eem Time: 2 May 2018, 6:09:06.540045 pm UUID: c76d37e1-445c-4e34-9796-fc836dfd50c9 Ancestors: VMMaker.oscog-cb.2379 Fix compiler bug with Apple LLVM version 7.0.0 (clang-700.1.76) for 64-bit Spur segment loading where compiler bug eliminated second version check in segment load when at -Os. Fix is to never inline the 32-bit word byte reversal. Fix sign extension in printOop: et al on 64-bit Spur. Revert an unchanged method that gained a later version. =============== Diff against VMMaker.oscog-cb.2379 =============== Item was changed: ----- Method: SpurCompactor>>printTheBogons: (in category 'debugging') ----- printTheBogons: aBogon <inline: true> coInterpreter print: 'bogon '; printHexnp: aBogon; cr! 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> - <inline: false> | 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. - [self reverseBytesIn32BitWordsFrom: segmentWordArray + self baseHeaderSize - to: (self addressAfter: segmentWordArray). segVersion := self longAt: segmentWordArray + self baseHeaderSize. (coInterpreter readableFormat: (segVersion bitAnd: 16rFFFFFF "low 3 bytes")) ifFalse: + [self reverseBytesIn32BitWordsIn: segmentWordArray. - [self reverseBytesIn32BitWordsFrom: segmentWordArray + self baseHeaderSize - to: (self addressAfter: 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." - but so far it only runs on little-endian machines, so for now just fail if endinanness 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: [^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: [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: GCModeImageSegment. ^self objectStartingAt: segmentStart! Item was added: + ----- Method: SpurMemoryManager>>reverseBytesIn32BitWordsIn: (in category 'image segment in/out') ----- + reverseBytesIn32BitWordsIn: segmentWordArray + "This exists to get around a compiler bug in Apple LLVM version 7.0.0 (clang-700.1.76) + that was avoiding the second comparison of segVersion after the first byte swap." + <inline: #never> + self reverseBytesIn32BitWordsFrom: segmentWordArray + self baseHeaderSize + to: (self addressAfter: segmentWordArray)! Item was changed: ----- Method: StackInterpreter>>longPrintOop: (in category 'debug printing') ----- longPrintOop: oop <api> | fmt lastIndex startIP bytecodesPerLine column | + <var: 'field16' type: #'unsigned short'> + <var: 'field32' type: #'unsigned int'> + <var: 'field64' type: #usqLong> ((objectMemory isImmediate: oop) or: [(objectMemory addressCouldBeObj: oop) not or: [(oop bitAnd: objectMemory allocationUnit - 1) ~= 0 or: [(objectMemory isFreeObject: oop) or: [objectMemory isForwarded: oop]]]]) ifTrue: [self printOop: oop. ^self]. self printHex: oop. (objectMemory fetchClassOfNonImm: oop) ifNil: [self print: ' has a nil class!!!!'] ifNotNil: [:class| self print: ': a(n) '; printNameOfClass: class count: 5; print: ' ('. objectMemory hasSpurMemoryManagerAPI ifTrue: [self printHexnp: (objectMemory compactClassIndexOf: oop); print: '=>']. self printHexnp: class; print: ')']. fmt := objectMemory formatOf: oop. self print: ' format '; printHexnp: fmt. fmt > objectMemory lastPointerFormat ifTrue: [self print: ' nbytes '; printNum: (objectMemory numBytesOf: oop)] ifFalse: [(objectMemory isIndexableFormat: fmt) ifTrue: [| len | len := objectMemory lengthOf: oop. self print: ' size '; printNum: len - (objectMemory fixedFieldsOf: oop format: fmt length: len)]]. objectMemory printHeaderTypeOf: oop. self print: ' hash '; printHexnp: (objectMemory rawHashBitsOf: oop). self cr. (fmt between: objectMemory firstByteFormat and: objectMemory firstCompiledMethodFormat - 1) ifTrue: [^self printStringOf: oop; cr]. (fmt between: objectMemory firstLongFormat and: objectMemory firstByteFormat - 1) ifTrue: [0 to: ((objectMemory num32BitUnitsOf: oop) min: 256) - 1 do: [:i| | field32 | field32 := objectMemory fetchLong32: i ofObject: oop. self space; printNum: i; space; printHex: field32; space; cr]. ^self]. objectMemory hasSpurMemoryManagerAPI ifTrue: [fmt = objectMemory sixtyFourBitIndexableFormat ifTrue: [0 to: ((objectMemory num64BitUnitsOf: oop) min: 256) - 1 do: [:i| | field64 | field64 := objectMemory fetchLong64: i ofObject: oop. self space; printNum: i; space; printHex: field64; space; cr]. ^self]. (fmt between: objectMemory firstShortFormat and: objectMemory firstShortFormat + 1) ifTrue: [0 to: ((objectMemory num16BitUnitsOf: oop) min: 256) - 1 do: [:i| | field16 | field16 := objectMemory fetchShort16: i ofObject: oop. self space; printNum: i; space; printHex: field16; space; cr]. ^self]]. "this is nonsense. apologies." startIP := (objectMemory lastPointerOf: oop) + objectMemory bytesPerOop - objectMemory baseHeaderSize / objectMemory bytesPerOop. lastIndex := 256 min: startIP. lastIndex > 0 ifTrue: [1 to: lastIndex do: [:i| | fieldOop | fieldOop := objectMemory fetchPointer: i - 1 ofObject: oop. self space; printNum: i - 1; space; printHex: fieldOop; space. (i = 1 and: [objectMemory isCompiledMethod: oop]) ifTrue: [self printMethodHeaderOop: fieldOop] ifFalse: [self cCode: [self printOopShort: fieldOop] inSmalltalk: [self print: (self shortPrint: fieldOop)]]. self cr]]. (objectMemory isCompiledMethod: oop) ifFalse: [startIP > lastIndex ifTrue: [self print: '...'; cr]] ifTrue: [startIP := startIP * objectMemory wordSize + 1. lastIndex := objectMemory lengthOf: oop. lastIndex - startIP > 100 ifTrue: [lastIndex := startIP + 100]. bytecodesPerLine := 8. column := 1. startIP to: lastIndex do: [:index| | byte | column = 1 ifTrue: [self cCode: 'printf("0x%08" PRIxSQPTR ": ", (usqIntptr_t)(oop+BaseHeaderSize+index-1))' inSmalltalk: [self print: (oop+objectMemory baseHeaderSize+index-1) hex; print: ': ']]. byte := objectMemory fetchByte: index - 1 ofObject: oop. self cCode: 'printf(" %02x/%-3d", (int)byte,(int)byte)' inSmalltalk: [self space; print: (byte radix: 16); printChar: $/; printNum: byte]. column := column + 1. column > bytecodesPerLine ifTrue: [column := 1. self cr]]. column = 1 ifFalse: [self cr]]! Item was changed: ----- Method: StackInterpreter>>printHex: (in category 'debug printing') ----- printHex: n "Print n in hex, in the form ' 0x1234', padded to a width of 10 characters in 32-bits ('0x' + 8 nibbles) or 18 characters in 64-bits ('0x' + 16 nibbles)" <api> + <var: #n type: #usqInt> | len buf | <var: #buf declareC: 'char buf[37]'> "large enough for a 64-bit value in hex plus the null plus 16 spaces" self cCode: 'memset(buf,'' '',36)' inSmalltalk: [buf := 'doh!!']. len := self cCode: 'sprintf(buf + 2 + 2 * BytesPerWord, "0x%" PRIxSQPTR, (usqIntptr_t)(n))'. self cCode: 'printf("%s", buf + len)'. len touch: buf! Item was changed: ----- Method: StackInterpreter>>printHexnp: (in category 'debug printing') ----- printHexnp: n <api> + <var: #n type: #usqInt> "Print n in hex, in the form '0x1234', unpadded" + self print: '0x%lx' f: n! - self print: '0x%lx' f: (self cCoerceSimple: n to: #'unsigned long')! Item was changed: ----- Method: StackInterpreter>>printHexnpnp: (in category 'debug printing') ----- printHexnpnp: n + <var: #n type: #usqInt> "Print n in hex, in the form '1234', unpadded" + self print: '%lx' f: n! - self print: '%lx' f: (self cCoerceSimple: n to: #'unsigned long')! Item was changed: ----- Method: StackInterpreter>>printOop: (in category 'debug printing') ----- printOop: oop | cls fmt lastIndex startIP bytecodesPerLine column | <inline: false> (objectMemory isImmediate: oop) ifTrue: [^self shortPrintOop: oop]. self printHex: oop. (objectMemory addressCouldBeObj: oop) ifFalse: [^self print: ((oop bitAnd: objectMemory allocationUnit - 1) ~= 0 ifTrue: [' is misaligned'] ifFalse: [self whereIs: oop]); cr]. (objectMemory isFreeObject: oop) ifTrue: [self print: ' is a free chunk of size '; printNum: (objectMemory sizeOfFree: oop). objectMemory hasSpurMemoryManagerAPI ifTrue: [self print: ' 0th: '; printHex: (objectMemory fetchPointer: 0 ofFreeChunk: oop). objectMemory printHeaderTypeOf: oop]. ^self cr]. (objectMemory isForwarded: oop) ifTrue: [self print: ' is a forwarded object to '; printHex: (objectMemory followForwarded: oop); print: ' of slot size '; printNum: (objectMemory numSlotsOfAny: oop). objectMemory printHeaderTypeOf: oop. ^self cr]. self print: ': a(n) '. self printNameOfClass: (cls := objectMemory fetchClassOfNonImm: oop) count: 5. cls = (objectMemory splObj: ClassFloat) ifTrue: [^self cr; printFloat: (objectMemory dbgFloatValueOf: oop); cr]. fmt := objectMemory formatOf: oop. fmt > objectMemory lastPointerFormat ifTrue: [self print: ' nbytes '; printNum: (objectMemory numBytesOf: oop)]. self cr. (fmt between: objectMemory firstLongFormat and: objectMemory firstCompiledMethodFormat - 1) ifTrue: ["This will answer false if splObj: ClassAlien is nilObject" (self is: oop KindOfClass: (objectMemory splObj: ClassAlien)) ifTrue: [self print: ' datasize '; printNum: (self sizeOfAlienData: oop). self print: ((self isIndirectAlien: oop) ifTrue: [' indirect @ '] ifFalse: [(self isPointerAlien: oop) ifTrue: [' pointer @ '] ifFalse: [' direct @ ']]). ^self printHex: (self startOfAlienData: oop) asUnsignedInteger; cr]. (objectMemory isWordsNonImm: oop) ifTrue: [lastIndex := 64 min: ((objectMemory numBytesOf: oop) / objectMemory wordSize). lastIndex > 0 ifTrue: [1 to: lastIndex do: [:index| + self space; printHex: (self cCoerceSimple: (objectMemory fetchLong32: index - 1 ofObject: oop) + to: #'unsigned int'). - self space; printHex: (objectMemory fetchLong32: index - 1 ofObject: oop). (index \\ self elementsPerPrintOopLine) = 0 ifTrue: [self cr]]. (lastIndex \\ self elementsPerPrintOopLine) = 0 ifFalse: [self cr]]. ^self]. ^self printStringOf: oop; cr]. "this is nonsense. apologies." startIP := (objectMemory lastPointerOf: oop) + objectMemory bytesPerOop - objectMemory baseHeaderSize / objectMemory bytesPerOop. lastIndex := 256 min: startIP. lastIndex > 0 ifTrue: [1 to: lastIndex do: [:index| self cCode: [self printHex: (objectMemory fetchPointer: index - 1 ofObject: oop); space] inSmalltalk: [self space; printHex: (objectMemory fetchPointer: index - 1 ofObject: oop); space. self print: (self shortPrint: (objectMemory fetchPointer: index - 1 ofObject: oop))]. (index \\ self elementsPerPrintOopLine) = 0 ifTrue: [self cr]]. (lastIndex \\ self elementsPerPrintOopLine) = 0 ifFalse: [self cr]]. (objectMemory isCompiledMethod: oop) ifFalse: [startIP > 64 ifTrue: [self print: '...'; cr]] ifTrue: [startIP := startIP * objectMemory wordSize + 1. lastIndex := objectMemory lengthOf: oop. lastIndex - startIP > 100 ifTrue: [lastIndex := startIP + 100]. bytecodesPerLine := 8. column := 1. startIP to: lastIndex do: [:index| | byte | column = 1 ifTrue: [self cCode: 'printf("0x%08" PRIxSQPTR ": ", (usqIntptr_t)(oop+BaseHeaderSize+index-1))' inSmalltalk: [self print: (oop+objectMemory baseHeaderSize+index-1) hex; print: ': ']]. byte := objectMemory fetchByte: index - 1 ofObject: oop. self cCode: 'printf(" %02x/%-3d", (int)byte,(int)byte)' inSmalltalk: [self space; print: (byte radix: 16); printChar: $/; printNum: byte]. column := column + 1. column > bytecodesPerLine ifTrue: [column := 1. self cr]]. column = 1 ifFalse: [self cr]]!

1 0

Re: [Vm-dev] [squeak-dev] The Trunk: System-eem.1021.mcz
by Eliot Miranda 02 May '18

02 May '18

Hi All, FYI... On Wed, May 2, 2018 at 1:40 PM, <commits(a)source.squeak.org> wrote: > Eliot Miranda uploaded a new version of System to project The Trunk: > http://source.squeak.org/trunk/System-eem.1021.mcz > > ==================== Summary ==================== > > Name: System-eem.1021 > Author: eem > Time: 2 May 2018, 1:39:55.407326 pm > UUID: 727d275e-a337-4208-9616-f887d8fd4576 > Ancestors: System-eem.1020 > > Move more NativeImageSegment methods up to ImageSegment. Provide a hack > accessor for testing that a segment can be loaded (forFile:outPointers:, > which may get deleted once 64-bit native image segments work). > It turns out that, at least on Mac OS X, 64-bit image segments do work in both the debug (-O0) and the assert (-O1) VMs, both Cog and Stack VMs, but not in the production VM (-Os). Sigh... =============== Diff against System-eem.1020 =============== > > Item was added: > + ----- Method: ImageSegment class>>folder (in category 'fileIn/Out') ----- > + folder > + | im | > + "Full path name of segments folder. Be sure to duplicate and > rename the folder when you duplicate and rename an image. Is $_ legal in > all file systems?" > + > + im := Smalltalk imageName. > + ^ (im copyFrom: 1 to: im size - 6 "'.image' size"), '_segs'! > > Item was added: > + ----- Method: ImageSegment>>errorWrongState (in category 'testing') ----- > + errorWrongState > + > + ^ self error: 'wrong state'! > > Item was added: > + ----- Method: ImageSegment>>forFile:outPointers: (in category > 'testing') ----- > + forFile: aFileName outPointers: outPointerArray > + "An accessor for testing to set up a new image segment to be in a > state to load from aFileName. After this send install to load." > + fileName := aFileName. > + state := #onFile. > + outPointers := outPointerArray! > > Item was added: > + ----- Method: ImageSegment>>install (in category 'read/write segment') > ----- > + install > + "This operation retrieves the segment if necessary from file > storage, installs it in memory, and replaces (using become:) all the root > stubs with the reconstructed roots of the segment." > + > + | allObjectsInSegment newRoots | > + state = #onFile ifTrue: [self readFromFile]. > + state = #onFileWithSymbols ifTrue: > + [self readFromFileWithSymbols]. > + (state = #active) | (state = #imported) ifFalse: [self > errorWrongState]. > + allObjectsInSegment := self loadSegmentFrom: segment outPointers: > outPointers. > + newRoots := allObjectsInSegment first. > + self checkAndReportLoadError. > + (state = #imported "just came in from exported file" or: > [arrayOfRoots isNil "testing..."]) > + ifTrue: [arrayOfRoots := newRoots] > + ifFalse: [arrayOfRoots elementsForwardIdentityTo: > newRoots]. > + state := #inactive. > + Beeper beepPrimitive! > > Item was changed: > ----- Method: ImageSegment>>loadSegmentFrom:outPointers: (in category > 'read/write segment') ----- > loadSegmentFrom: segment outPointers: outPointers > "Attempt to load the segment into memory (reify the objects in > segment > as real objects), using outPointers to bind references to objects > not in the > segment. Answer a collection of all the objects in the segment." > | segmentFormat | > + (state == #imported or: [state == #active]) ifTrue: > + [segmentFormat := self segmentFormatFrom: segment first. > - state == #imported ifTrue: > - [segmentFormat := segment first bitAnd: 16rFFFFFF. > segmentFormat = 6502 ifTrue: > [LegacyImageSegment adoptInstance: self. > ^self loadSegmentFrom: segment outPointers: > outPointers]. > segmentFormat = Smalltalk imageFormatVersion ifTrue: > [NativeImageSegment adoptInstance: self. > ^self loadSegmentFrom: segment outPointers: > outPointers]. > self error: 'no handling for format ', segmentFormat > asString. ' in a ', Smalltalk imageFormatVersion asString, ' image.']. > self subclassResponsibility! > > Item was added: > + ----- Method: ImageSegment>>localName (in category 'read/write segment') > ----- > + localName > + | segs ind sep | > + "Return the current file name for this segment, a local name in > the segments directory." > + > + fileName ifNil: [^ nil]. > + "^ fileName" > + > + "The following is for backward compatibility. Remove this part > after June 2000. > + Check if the fileName is a full path, and make it local. > Regardless of current or previous file system delimiter." > + > + segs := self class folder copyLast: 4. ":=segs" > + ind := 1. > + [ind := fileName findString: segs startingAt: ind+1 caseSensitive: > false. > + ind = 0 ifTrue: [^ fileName]. > + sep := fileName at: ind + (segs size). > + sep isAlphaNumeric ] whileTrue. "sep is letter or > digit, not a separator" > + > + ^ fileName := fileName copyFrom: ind+(segs size)+1 "delimiter" to: > fileName size! > > Item was added: > + ----- Method: ImageSegment>>readFromFile (in category 'read/write > segment') ----- > + readFromFile > + "Read in a simple segment. Use folder of this image, even if > remembered as previous location of this image" > + > + | ff realName | > + realName := self class folder, FileDirectory slash, self localName. > + ff := FileStream readOnlyFileNamed: realName. > + segment := ff nextWordsInto: (WordArrayForSegment new: ff size//4). > + ff close. > + state := #active! > > Item was added: > + ----- Method: ImageSegment>>segmentFormatFrom: (in category 'private') > ----- > + segmentFormatFrom: a32BitWord > + "The first two words of a segment array contain the image format > version of the system upon which the segment was generated, along with a > top byte that is either $d or $s (from the 'does' in #doesNotUnderstand:). > But this may be encoded either in big-endian or little-endian format. > Since endianness may or may not have been changed, determining what the > segment format is takes care." > + | msc lsc | > + msc := Character value: ((a32BitWord bitShift: -24) bitAnd: 255). > + lsc := Character value: (a32BitWord bitAnd: 255). > + (('ds' includes: msc) > + and: ['ds' includes: lsc]) ifTrue: > + [self error: 'ambiguous segment format']. > + ('ds' includes: msc) ifTrue: > + [^a32BitWord bitAnd: 16rFFFFFF]. > + ^((a32BitWord bitShift: -24) bitAnd: 16rFF) > + + ((a32BitWord bitShift: -8) bitAnd: 16rFF00) > + + ((a32BitWord bitShift: 8) bitAnd: 16rFF0000)! > > Item was added: > + ----- Method: LegacyImageSegment>>aComment (in category 'compact > classes') ----- > + aComment > + "Compact classes are a potential problem because a pointer to the > class would not ordinarily show up in the outPointers. We add the classes > of all compact classes to outPointers, both for local and export segments. > + Compact classes are never allowed as roots. No compact class may > be in an Environment that is written out to disk. (In local segments, the > compact classes array should never have an ImageSegmentRootStub in it. For > export, fileIn the class first, then load a segment with instances of it. > The fileIn code can be pasted onto the front of the .extSeg file) > + For local segments, a class may become compact while its instances > are out on the disk. Or it may become un-compact. A compact class may > change shape while some of its instances are on disk. All three cases go > through (ClassDescription updateInstancesFrom:). If it can't rule out an > instance being in the segment, it reads it in to fix the instances. > + See Behavior.becomeCompact for the rules on Compact classes. > Indexes may not be reused. This is so that an incoming export segment has > its index available. (Changes may be needed in the way indexes are > assigned.) > + For export segments, a compact class may have a different shape. > The normal class reshape mechanism will catch this. During the > installation of the segment, objects will have the wrong version of their > class momentarily. We will change them back before we get caught. > + For export segments, the last two items in outPointers are the > number 1717 and an array of the compact classes used in this segment. (The > classes in the array are converted from DiskProxies by SmartRefStream.) If > that class is not compact in the new image, the instances are recopied. > + "! > > Item was removed: > - ----- Method: NativeImageSegment class>>folder (in category > 'fileIn/Out') ----- > - folder > - | im | > - "Full path name of segments folder. Be sure to duplicate and > rename the folder when you duplicate and rename an image. Is $_ legal in > all file systems?" > - > - im := Smalltalk imageName. > - ^ (im copyFrom: 1 to: im size - 6 "'.image' size"), '_segs'! > > Item was changed: > ----- Method: NativeImageSegment>>aComment (in category 'compact > classes') ----- > aComment > + "Spur does not use compact classes, so an effort has been made to > excise their use from the code. The previous comment was: > - "Spur does not use compact classes, so an effort has been made to > excise their use from the code. Thew previous comment was: > > Compact classes are a potential problem because a pointer to the > class would not ordinarily show up in the outPointers. We add the classes > of all compact classes to outPointers, both for local and export segments. > Compact classes are never allowed as roots. No compact class may > be in an Environment that is written out to disk. (In local segments, the > compact classes array should never have an ImageSegmentRootStub in it. For > export, fileIn the class first, then load a segment with instances of it. > The fileIn code can be pasted onto the front of the .extSeg file) > For local segments, a class may become compact while its instances > are out on the disk. Or it may become un-compact. A compact class may > change shape while some of its instances are on disk. All three cases go > through (ClassDescription updateInstancesFrom:). If it can't rule out an > instance being in the segment, it reads it in to fix the instances. > See Behavior.becomeCompact for the rules on Compact classes. > Indexes may not be reused. This is so that an incoming export segment has > its index available. (Changes may be needed in the way indexes are > assigned.) > For export segments, a compact class may have a different shape. > The normal class reshape mechanism will catch this. During the > installation of the segment, objects will have the wrong version of their > class momentarily. We will change them back before we get caught. > + For export segments, the last two items in outPointers are the > number 1717 and an array of the compact classes used in this segment. (The > classes in the array are converted from DiskProxies by SmartRefStream.) If > that class is not compact in the new image, the instances are recopied."! > - For export segments, the last two items in outPointers are the > number 1717 and an array of the compact classes used in this segment. (The > classes in the array are converted from DiskProxies by SmartRefStream.) If > that class is not compact in the new image, the instances are recopied. > - "! > > Item was removed: > - ----- Method: NativeImageSegment>>errorWrongState (in category > 'testing') ----- > - errorWrongState > - > - ^ self error: 'wrong state'! > > Item was removed: > - ----- Method: NativeImageSegment>>install (in category 'read/write > segment') ----- > - install > - "This operation retrieves the segment if necessary from file > storage, installs it in memory, and replaces (using become:) all the root > stubs with the reconstructed roots of the segment." > - > - | allObjectsInSegment newRoots | > - state = #onFile ifTrue: [self readFromFile]. > - state = #onFileWithSymbols ifTrue: > - [self readFromFileWithSymbols]. > - (state = #active) | (state = #imported) ifFalse: [self > errorWrongState]. > - allObjectsInSegment := self loadSegmentFrom: segment outPointers: > outPointers. > - newRoots := allObjectsInSegment first. > - self checkAndReportLoadError. > - state = #imported "just came in from exported file" > - ifTrue: [arrayOfRoots := newRoots] > - ifFalse: [arrayOfRoots elementsForwardIdentityTo: > newRoots]. > - state := #inactive. > - Beeper beepPrimitive! > > Item was removed: > - ----- Method: NativeImageSegment>>localName (in category 'read/write > segment') ----- > - localName > - | segs ind sep | > - "Return the current file name for this segment, a local name in > the segments directory." > - > - fileName ifNil: [^ nil]. > - "^ fileName" > - > - "The following is for backward compatibility. Remove this part > after June 2000. > - Check if the fileName is a full path, and make it local. > Regardless of current or previous file system delimiter." > - > - segs := self class folder copyLast: 4. ":=segs" > - ind := 1. > - [ind := fileName findString: segs startingAt: ind+1 caseSensitive: > false. > - ind = 0 ifTrue: [^ fileName]. > - sep := fileName at: ind + (segs size). > - sep isAlphaNumeric ] whileTrue. "sep is letter or > digit, not a separator" > - > - ^ fileName := fileName copyFrom: ind+(segs size)+1 "delimiter" to: > fileName size! > > Item was removed: > - ----- Method: NativeImageSegment>>readFromFile (in category 'read/write > segment') ----- > - readFromFile > - "Read in a simple segment. Use folder of this image, even if > remembered as previous location of this image" > - > - | ff realName | > - realName := self class folder, FileDirectory slash, self localName. > - ff := FileStream readOnlyFileNamed: realName. > - segment := ff nextWordsInto: (WordArrayForSegment new: ff size//4). > - ff close. > - state := #active! > > Item was removed: > - ----- Method: NativeImageSegment>>segmentFormatFrom: (in category > 'private') ----- > - segmentFormatFrom: a32BitWord > - "The first two words of a segment array contain the image format > version of the system upon which the segment was generated, along with a > top byte that is either $d or $s (from the 'does' in #doesNotUnderstand:). > But this may be encoded either in big-endian or little-endian format. > Since endianness may or may not have been changed, determining what the > segment format is takes care." > - | msc lsc | > - msc := Character value: ((a32BitWord bitShift: -24) bitAnd: 255). > - lsc := Character value: (a32BitWord bitAnd: 255). > - (('ds' includes: msc) > - and: ['ds' includes: lsc]) ifTrue: > - [self error: 'ambiguous segment format']. > - ('ds' includes: msc) ifTrue: > - [^a32BitWord bitAnd: 16rFFFFFF]. > - ^((a32BitWord bitShift: -24) bitAnd: 16rFF) > - + ((a32BitWord bitShift: -8) bitAnd: 16rFF00) > - + ((a32BitWord bitShift: 8) bitAnd: 16rFF0000)! > > > -- _,,,^..^,,,_ best, Eliot

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

Vm-dev May 2018