Vm-dev September 2016

vm-dev@lists.squeakfoundation.org

30 participants
102 discussions

VM Maker: VMMaker.oscog-cb.1944.mcz
by commits＠source.squeak.org 06 Sep '16

06 Sep '16

ClementBera uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-cb.1944.mcz ==================== Summary ==================== Name: VMMaker.oscog-cb.1944 Author: cb Time: 6 September 2016, 5:25:54.75903 pm UUID: 8a25f110-e70d-4ba3-b7b5-c36af4934c16 Ancestors: VMMaker.oscog-cb.1943 Added assertion ensuring that when a method is jitted, the compiled code jitted is a compiled method and when a block is jitted, the compiled code jitted is a compiled block. =============== Diff against VMMaker.oscog-cb.1943 =============== Item was changed: ----- Method: Cogit>>cog:selector: (in category 'jit - api') ----- cog: aMethodObj selector: aSelectorOop "Attempt to produce a machine code method for the bytecode method object aMethodObj. N.B. If there is no code memory available do *NOT* attempt to reclaim the method zone. Certain clients (e.g. ceSICMiss:) depend on the zone remaining constant across method generation." <api> <returnTypeC: #'CogMethod *'> | cogMethod | <var: #cogMethod type: #'CogMethod *'> (self exclude: aMethodObj selector: aSelectorOop) ifTrue: [^nil]. "In Newspeak we support anonymous accessors and hence tolerate the same method being cogged multiple times. But only if the method class association is nil." NewspeakVM ifTrue: [(coInterpreter methodHasCogMethod: aMethodObj) ifTrue: [cogMethod := coInterpreter cogMethodOf: aMethodObj. self deny: cogMethod selector = aSelectorOop. cogMethod selector = aSelectorOop ifTrue: [^cogMethod]. (coInterpreter methodClassAssociationOf: aMethodObj) ~= objectMemory nilObject ifTrue: [self cCode: 'extern void *firstIndexableField(sqInt)'. "Slang, au natural" self warnMultiple: cogMethod selectors: aSelectorOop. ^nil]]] ifFalse: [self deny: (coInterpreter methodHasCogMethod: aMethodObj)]. + self deny: (objectMemory isCompiledMethod: (coInterpreter ultimateLiteralOf: aMethodObj)). "coInterpreter stringOf: aSelectorOop" coInterpreter compilationBreak: aSelectorOop point: (objectMemory lengthOf: aSelectorOop) isMNUCase: false. aMethodObj = breakMethod ifTrue: [self halt: 'Compilation of breakMethod']. NewspeakVM ifTrue: [cogMethod := methodZone findPreviouslyCompiledVersionOf: aMethodObj with: aSelectorOop. cogMethod ifNotNil: [(coInterpreter methodHasCogMethod: aMethodObj) not ifTrue: [self assert: (coInterpreter rawHeaderOf: aMethodObj) = cogMethod methodHeader. cogMethod methodObject: aMethodObj. coInterpreter rawHeaderOf: aMethodObj put: cogMethod asInteger]. ^cogMethod]]. "If the generators for the alternate bytecode set are missing then interpret." (coInterpreter methodUsesAlternateBytecodeSet: aMethodObj) ifTrue: [(self numElementsIn: generatorTable) <= 256 ifTrue: [^nil]. bytecodeSetOffset := 256] ifFalse: [bytecodeSetOffset := 0]. objectRepresentation ensureNoForwardedLiteralsIn: aMethodObj. methodObj := aMethodObj. methodHeader := objectMemory methodHeaderOf: aMethodObj. cogMethod := self compileCogMethod: aSelectorOop. (cogMethod asInteger between: MaxNegativeErrorCode and: -1) ifTrue: [cogMethod asInteger = InsufficientCodeSpace ifTrue: [coInterpreter callForCogCompiledCodeCompaction]. self maybeFreeCounters. "Right now no errors should be reported, so nothing more to do." "self reportError: (self cCoerceSimple: cogMethod to: #sqInt)." ^nil]. "self cCode: '' inSmalltalk: [coInterpreter printCogMethod: cogMethod. ""coInterpreter symbolicMethod: aMethodObj."" self assertValidMethodMap: cogMethod." "self disassembleMethod: cogMethod." "printInstructions := clickConfirm := true""]." ^cogMethod! Item was changed: ----- Method: Cogit>>cogFullBlockMethod:numCopied: (in category 'jit - api') ----- cogFullBlockMethod: aMethodObj numCopied: numCopied "Attempt to produce a machine code method for the bytecode method object aMethodObj. N.B. If there is no code memory available do *NOT* attempt to reclaim the method zone. Certain clients (e.g. ceSICMiss:) depend on the zone remaining constant across method generation." <api> <option: #SistaV1BytecodeSet> <returnTypeC: #'CogMethod *'> | cogMethod | <var: #cogMethod type: #'CogMethod *'> self cCode: [] inSmalltalk: "for debugging, allow excluding methods based on selector or methodClass" [self class initializationOptions at: #DoNotJIT ifPresent: [:excluded| (excluded anySatisfy: [:exclude| aMethodObj = exclude]) ifTrue: [coInterpreter transcript nextPutAll: 'EXCLUDING '; nextPutAll: aMethodObj; nextPutAll: ' (compiled block)'; cr; flush. ^nil]]]. self deny: (coInterpreter methodHasCogMethod: aMethodObj). + self assert: (objectMemory isCompiledMethod: (coInterpreter ultimateLiteralOf: aMethodObj)). aMethodObj = breakMethod ifTrue: [self halt: 'Compilation of breakMethod']. "If the generators for the alternate bytecode set are missing then interpret." (coInterpreter methodUsesAlternateBytecodeSet: aMethodObj) ifTrue: [(self numElementsIn: generatorTable) <= 256 ifTrue: [^nil]. bytecodeSetOffset := 256] ifFalse: [bytecodeSetOffset := 0]. objectRepresentation ensureNoForwardedLiteralsIn: aMethodObj. methodObj := aMethodObj. methodHeader := objectMemory methodHeaderOf: aMethodObj. cogMethod := self compileCogFullBlockMethod: numCopied. (cogMethod asInteger between: MaxNegativeErrorCode and: -1) ifTrue: [cogMethod asInteger = InsufficientCodeSpace ifTrue: [coInterpreter callForCogCompiledCodeCompaction]. self maybeFreeCounters. "Right now no errors should be reported, so nothing more to do." "self reportError: (self cCoerceSimple: cogMethod to: #sqInt)." ^nil]. "self cCode: '' inSmalltalk: [coInterpreter printCogMethod: cogMethod. ""coInterpreter symbolicMethod: aMethodObj."" self assertValidMethodMap: cogMethod." "self disassembleMethod: cogMethod." "printInstructions := clickConfirm := true""]." ^cogMethod!

1 0

VM Maker: VMMaker.oscog-cb.1943.mcz
by commits＠source.squeak.org 06 Sep '16

06 Sep '16

ClementBera uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-cb.1943.mcz ==================== Summary ==================== Name: VMMaker.oscog-cb.1943 Author: cb Time: 6 September 2016, 5:10:02.198185 pm UUID: 3b8e2d0c-b41c-4f15-833d-a56b8d6256bf Ancestors: VMMaker.oscog-eem.1942 testBcToBc is improved to to test instructions only mapped in blocks. StackDepthFinder is improved to support nlr in well aligned compiledBlock compiled to machine code (in this case the mcpc to bcpc mapping maps the las bcpc+1 and last mcpc + 1) Remvoe two type annotations that were not used any more. =============== Diff against VMMaker.oscog-eem.1942 =============== Item was changed: ----- Method: Cogit>>testBcToMcPcMappingForCogMethod: (in category 'testing') ----- testBcToMcPcMappingForCogMethod: cogMethod <doNotGenerate> "self disassembleMethod: cogMethod" "self printPCMapPairsFor: cogMethod on: Transcript" | aMethodObj subMethods bsOffset | aMethodObj := cogMethod methodObject. subMethods := self subMethodsAsRangesFor: cogMethod. subMethods first endPC: (self endPCOf: aMethodObj). bsOffset := self bytecodeSetOffsetFor: aMethodObj. self bcpcsAndDescriptorsFor: aMethodObj bsOffset: bsOffset do: [:bcpc :byte :desc :nExts| | subMethod | (desc notNil and: [desc isBlockCreation]) ifTrue: [subMethod := subMethods detect: [:sm| sm startpc = (bcpc + desc numBytes)]. subMethod endPC: bcpc + desc numBytes + (self spanFor: desc at: bcpc exts: -1 in: aMethodObj) - 1]]. subMethods allButFirst do: [:blockSubMethod| | cogBlockMethod | cogBlockMethod := self findMethodForStartBcpc: blockSubMethod startpc inHomeMethod: cogMethod. self assert: cogBlockMethod address = (blockSubMethod first - (self sizeof: CogBlockMethod))]. self bcpcsAndDescriptorsFor: aMethodObj bsOffset: bsOffset do: [:bcpc :byte :desc :nExts| | startBcpc currentSubMethod subCogMethod absMcpc mappedBcpc | currentSubMethod := self innermostSubMethodFor: bcpc in: subMethods startingAt: 1. subCogMethod := currentSubMethod cogMethod. (subCogMethod stackCheckOffset > 0 + and: [desc isNil or: [desc isMapped + or: [ inBlock = InFullBlock and: [desc isMappedInBlock]]]]) ifTrue: - and: [desc isNil or: [desc isMapped]]) ifTrue: [startBcpc := subCogMethod = cogMethod ifTrue: [coInterpreter startPCOfMethod: aMethodObj] ifFalse: [currentSubMethod startpc]. "The first bytecode and backward branch bytecodes are mapped to their pc. Other bytecodes map to their following pc." absMcpc := (desc notNil and: [desc isBranch and: [self isBackwardBranch: desc at: bcpc exts: nExts in: aMethodObj]]) ifTrue: "Backward branches have a special mapper" [mappedBcpc := bcpc. self mcPCForBackwardBranch: mappedBcpc startBcpc: startBcpc in: subCogMethod] ifFalse: "All others use the generic mapper" [mappedBcpc := desc ifNil: [bcpc] ifNotNil: [bcpc + desc numBytes]. self mcPCFor: mappedBcpc startBcpc: startBcpc in: subCogMethod]. self assert: absMcpc >= (subCogMethod asInteger + subCogMethod stackCheckOffset). self assert: (self bytecodePCFor: absMcpc startBcpc: startBcpc in: subCogMethod) = mappedBcpc]]! Item was changed: ----- Method: StackDepthFinder>>method:pc: (in category 'private') ----- method: method pc: startpc super method: method pc: startpc. + "The + 1 is there for full blocks ending with non local return, + as the following pc is mapped and beyong endPC" + joins := Array new: method endPC + 1. - joins := Array new: method endPC. stackp := method numTemps! Item was changed: ----- Method: StackDepthFinder>>stackPointers (in category 'accessing') ----- stackPointers "Collect the stack depth for each bytecode in the method. For the convenience of clients, write the stack depth for extended bytecodes to the bytecode pc, as well as the bytecocdes' extensions' pcs." | method stackPointers end | + "endPC +1 because of full blocks that can end with NLR effectively mapping the pc right after the end PC" + stackPointers := Array new: (end := (method := self method) endPC) + 1. - stackPointers := Array new: (end := (method := self method) endPC). encoderClass ifNil: [encoderClass := method encoderClass]. [pc <= end] whileTrue: [stackPointers at: pc put: stackp. encoderClass extensionsAt: pc in: method into: [:extA :extB :delta| delta > 0 ifTrue: [stackPointers at: pc + delta put: stackp]]. self interpretNextInstructionFor: self]. + stackPointers at: end + 1 put: (stackPointers at: end). ^stackPointers! Item was changed: ----- Method: StackToRegisterMappingCogit>>genGenericStorePop:MaybeContextSlotIndex:needsStoreCheck:needsRestoreRcvr:needsImmutabilityCheck: (in category 'bytecode generator stores') ----- genGenericStorePop: popBoolean MaybeContextSlotIndex: slotIndex needsStoreCheck: needsStoreCheck needsRestoreRcvr: needsRestoreReceiver needsImmutabilityCheck: needsImmCheck "Generates a store into an object that *may* be a context. Multiple settings: - needsStoreCheck (young into old object check) - needRestoreRcvr (ensures the recevier is live across the store) - needsImmCheck (do the call-back if the receiver is immutable)" <inline: true> - <var: #jmpSingle type: #'AbstractInstruction *'> - <var: #jmpDone type: #'AbstractInstruction *'> <var: #mutableJump type: #'AbstractInstruction *'> <var: #immutabilityFailure type: #'AbstractInstruction *'> | immutabilityFailure mutableJump | "The reason we need a frame here is that assigning to an inst var of a context may involve wholesale reorganization of stack pages, and the only way to preserve the execution state of an activation in that case is if it has a frame." self assert: needsFrame. self cppIf: IMMUTABILITY ifTrue: [needsImmCheck ifTrue: [mutableJump := objectRepresentation genJumpMutable: ReceiverResultReg scratchReg: TempReg. objectRepresentation genStoreTrampolineCall: slotIndex. needsRestoreReceiver ifTrue: [ self putSelfInReceiverResultReg ]. immutabilityFailure := self Jump: 0. mutableJump jmpTarget: self Label.]]. self ssPop: 1. self ssAllocateCallReg: ClassReg and: SendNumArgsReg. "for ceStoreContextInstVarTrampoline" self ssPush: 1. objectRepresentation genLoadSlot: SenderIndex sourceReg: ReceiverResultReg destReg: TempReg. self ssStoreAndReplacePop: popBoolean toReg: ClassReg. self ssFlushTo: simStackPtr. self MoveCq: slotIndex R: SendNumArgsReg. self CallRT: ceStoreContextInstVarTrampoline. self cppIf: IMMUTABILITY ifTrue: [needsImmCheck ifTrue:[immutabilityFailure jmpTarget: self Label]]. ^0!

1 0

[OpenSmalltalk/opensmalltalk-vm] 382e84: Whitespace cleanup
by GitHub 06 Sep '16

06 Sep '16

Branch: refs/heads/libtls Home: https://github.com/OpenSmalltalk/opensmalltalk-vm Commit: 382e848eb48cb110ef4e0aa6348b8cdf91053738 https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/382e848eb48cb110ef… Author: Tobias Pape <tobias(a)netshed.de> Date: 2016-09-06 (Tue, 06 Sep 2016) Changed paths: M platforms/unix/plugins/SqueakSSL/sqUnixOpenSSL.c Log Message: ----------- Whitespace cleanup Commit: 0476bba7e818072c11b41142c3ef673bb3ed3b2d https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/0476bba7e818072c11… Author: Tobias Pape <tobias(a)netshed.de> Date: 2016-09-06 (Tue, 06 Sep 2016) Changed paths: M platforms/unix/plugins/SqueakSSL/Makefile.inc M platforms/unix/plugins/SqueakSSL/config.cmake A platforms/unix/plugins/SqueakSSL/sqUnixLibreSSL.c R platforms/unix/plugins/SqueakSSL/sqUnixOpenSSL.c Log Message: ----------- [WIP] use LibreSSL LibTLS Compare: https://github.com/OpenSmalltalk/opensmalltalk-vm/compare/382e848eb48c^...0…

1 0

[OpenSmalltalk/opensmalltalk-vm] 98f8a0: Ensure linux32x86 exposes the right machine in mvm
by GitHub 06 Sep '16

06 Sep '16

Branch: refs/heads/Cog Home: https://github.com/OpenSmalltalk/opensmalltalk-vm Commit: 98f8a01ae28f8f759a66bb263e920f423f6e67c3 https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/98f8a01ae28f8f759a… Author: Tobias Pape <tobias(a)netshed.de> Date: 2016-09-06 (Tue, 06 Sep 2016) Changed paths: M build.linux32x86/newspeak.cog.spur/build.assert.itimerheartbeat/mvm M build.linux32x86/newspeak.cog.spur/build.assert/mvm M build.linux32x86/newspeak.cog.spur/build.debug.itimerheartbeat/mvm M build.linux32x86/newspeak.cog.spur/build.debug/mvm M build.linux32x86/newspeak.cog.spur/build.itimerheartbeat/mvm M build.linux32x86/newspeak.cog.spur/build/mvm M build.linux32x86/newspeak.stack.spur/build.assert/mvm M build.linux32x86/newspeak.stack.spur/build.debug/mvm M build.linux32x86/newspeak.stack.spur/build/mvm M build.linux32x86/nsnac.cog.spur/build.assert.itimerheartbeat/mvm M build.linux32x86/nsnac.cog.spur/build.assert/mvm M build.linux32x86/nsnac.cog.spur/build.debug.itimerheartbeat/mvm M build.linux32x86/nsnac.cog.spur/build.debug/mvm M build.linux32x86/nsnac.cog.spur/build.itimerheartbeat/mvm M build.linux32x86/nsnac.cog.spur/build/mvm M build.linux32x86/squeak.cog.spur.immutability/build.assert/mvm M build.linux32x86/squeak.cog.spur.immutability/build.debug/mvm M build.linux32x86/squeak.cog.spur.immutability/build/mvm M build.linux32x86/squeak.cog.spur/build.assert.itimerheartbeat/mvm M build.linux32x86/squeak.cog.spur/build.assert/mvm M build.linux32x86/squeak.cog.spur/build.debug.itimerheartbeat/mvm M build.linux32x86/squeak.cog.spur/build.debug/mvm M build.linux32x86/squeak.cog.spur/build.itimerheartbeat/mvm M build.linux32x86/squeak.cog.spur/build/mvm M build.linux32x86/squeak.cog.v3/build.assert.itimerheartbeat/mvm M build.linux32x86/squeak.cog.v3/build.assert/mvm M build.linux32x86/squeak.cog.v3/build.debug.itimerheartbeat/mvm M build.linux32x86/squeak.cog.v3/build.debug/mvm M build.linux32x86/squeak.cog.v3/build.itimerheartbeat/mvm M build.linux32x86/squeak.cog.v3/build.multithreaded.assert/mvm M build.linux32x86/squeak.cog.v3/build.multithreaded.debug/mvm M build.linux32x86/squeak.cog.v3/build.multithreaded/mvm M build.linux32x86/squeak.cog.v3/build/mvm M build.linux32x86/squeak.sista.spur/build.assert.itimerheartbeat/mvm M build.linux32x86/squeak.sista.spur/build.assert/mvm M build.linux32x86/squeak.sista.spur/build.debug.itimerheartbeat/mvm M build.linux32x86/squeak.sista.spur/build.debug/mvm M build.linux32x86/squeak.sista.spur/build.itimerheartbeat/mvm M build.linux32x86/squeak.sista.spur/build/mvm M build.linux32x86/squeak.stack.spur/build.assert/mvm M build.linux32x86/squeak.stack.spur/build.debug/mvm M build.linux32x86/squeak.stack.spur/build/mvm M build.linux32x86/squeak.stack.v3/build.assert/mvm M build.linux32x86/squeak.stack.v3/build.debug/mvm M build.linux32x86/squeak.stack.v3/build/mvm Log Message: ----------- Ensure linux32x86 exposes the right machine in mvm

1 0

VM Maker: VMMaker.oscog-eem.1942.mcz
by commits＠source.squeak.org 06 Sep '16

06 Sep '16

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.1942.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.1942 Author: eem Time: 6 September 2016, 12:17:18.340784 pm UUID: 85b22cc1-24ba-43e0-9f93-2ba18fe8554e Ancestors: VMMaker.oscog-eem.1941 Fix disassembly of non-local returns, including the map entries. These are associated with the address following a non-local return call and so may actually be associated with the address of the following block method (rare cuz embedded block method headers are aligned on an 8 byte boundary). =============== Diff against VMMaker.oscog-eem.1941 =============== Item was changed: ----- Method: Cogit class>>initializeAnnotationConstants (in category 'class initialization') ----- initializeAnnotationConstants "These form the method map for a cog method. The map defines which addresses in a machine code method are ones with important functions, such as being a send site or being a reference to a heap object. Each annotated instruction has a byte in the map, and each byte in the map has two parts. In the least signficant bits are a distance in codeGranularity units from the start of the method or the previous map entry, except for the IsAnnotationExtension type. In the most signficant bits are the type of annotation at the point reached. A null byte ends the map. The first mapped location is a distance from the cmNoCheckEntryOffset. The map occurs at the end of a method (*), in reverse, so that its start is found by adding the method's block size. If the distance between two mapped instructions will not fit in the displacement field then one or more displacement entries are placed in the map to bridge the gap. There is a * 32 displacement units type for spanning large gaps. The displacements are in codeGranularity units so that processors like e.g. ARM, with 4-byte instructions, do not have overly large maps. In [practice maps are very compact, but they should be as quick to navigate as possible, and hence be as compact as possible. There is only one kind of call annotation that serves for all calls from machine code. There are several kinds of call, sends, super sends, calls of the generated run-time, and direct calls of primitive functions in the interpreter. These need different treatment at different times. For example, when the send cache is flushed or the method zone is shrunk some sends must be unlinked and some sends must be relocated. But to be able to parse bytecoded methods and match their pcs with corresponding machine code pcs the map needs to differentiate between sends and run-time calls. Sends can be distinguished from run-time or direct primitive calls based on address; only sends have their target between methodZoneBase and methodZone freeStart. We used to distinguish normal sends from super sends based on alignment of entry-point, because normal sends link to the checked entry-point, whereas super sends link to the unchecked entry-point, and both entry points have different alignments. But now we use the IsAnnotationExtension to label sends other than normal sends. For these ``exotic'' sends there is both an IsAnnotationExtension annotation and an IsSendCall annotation. While run-time calls can be distinguished from direct primitive calls on the basis of address there is no need to do so. They are merely calls to locations that don't move during method zone compaction. Absolute PC references are used for method references and counter references. These are references from within a particular method to absolute pcs in that same method that must be relocated when the method moves." "self initializeAnnotationConstants" AnnotationShift := 5. IsDisplacementX2N := 0. "N.B. A 0 byte ends the map" IsAnnotationExtension := 1. "Used to extend IsSendCall with different codes for exotic send types." IsObjectReference := 2. IsAbsPCReference := 3. IsRelativeCall := 4. HasBytecodePC := 5. IsNSSendCall := NewspeakVM ifTrue: [6]. IsSendCall := 7. "These are formed by combining IsSendCall and IsAnnotationExtension annotations." IsSuperSend := 8. IsDirectedSuperSend := 9. IsNSSelfSend := NewspeakVM ifTrue: [10]. IsNSDynamicSuperSend := NewspeakVM ifTrue: [11]. IsNSImplicitReceiverSend := NewspeakVM ifTrue: [12]. DisplacementMask := (1 << AnnotationShift) - 1. DisplacementX2N := IsDisplacementX2N << AnnotationShift. FirstAnnotation := IsObjectReference << AnnotationShift. MaxX2NDisplacement := DisplacementMask << AnnotationShift. MapEnd := 0. AnnotationConstantNames := #( IsDisplacementX2N IsAnnotationExtension IsObjectReference IsAbsPCReference IsRelativeCall HasBytecodePC IsNSSendCall IsSendCall IsSuperSend IsDirectedSuperSend IsNSSelfSend IsNSDynamicSuperSend IsNSImplicitReceiverSend). AnnotationsWithBytecodePCs := #(HasBytecodePC IsNSSendCall IsSendCall IsSuperSend IsDirectedSuperSend IsNSSelfSend IsNSDynamicSuperSend + IsNSImplicitReceiverSend), + {'IsRelativeCall:\HasBytecodePC' withCRs}! - IsNSImplicitReceiverSend)! Item was changed: ----- Method: Cogit>>disassembleMethod:on: (in category 'disassembly') ----- disassembleMethod: surrogateOrAddress on: aStream <doNotGenerate> | cogMethod mapEntries codeRanges | cogMethod := surrogateOrAddress isInteger ifTrue: [self cogMethodSurrogateAt: surrogateOrAddress] ifFalse: [surrogateOrAddress]. cogMethod cmType = CMBlock ifTrue: [^self disassembleMethod: cogMethod cmHomeMethod on: aStream]. (disassemblingMethod isNil and: [self class initializationOptions at: #relativeAddressDisassembly ifAbsent: [false]]) ifTrue: [^[disassemblingMethod := cogMethod. self disassembleMethod: surrogateOrAddress on: aStream] ensure: [disassemblingMethod := nil]]. self printMethodHeader: cogMethod on: aStream. mapEntries := Dictionary new. (cogMethod cmType = CMMethod and: [cogMethod cmIsFullBlock]) ifFalse: [mapEntries at: cogMethod asInteger + cmEntryOffset put: 'entry']. cogMethod cmType = CMMethod ifTrue: [cogMethod cmIsFullBlock ifTrue: [mapEntries at: cogMethod asInteger + cbNoSwitchEntryOffset put: 'noSwitchEntry'] ifFalse: [mapEntries at: cogMethod asInteger + cmNoCheckEntryOffset put: 'noCheckEntry']]. cogMethod cmType = CMClosedPIC ifTrue: [mapEntries at: cogMethod asInteger + firstCPICCaseOffset put: 'ClosedPICCase0'. 1 to: MaxCPICCases - 1 do: [:i| mapEntries at: cogMethod asInteger + firstCPICCaseOffset + (i * cPICCaseSize) put: 'ClosedPICCase', i printString]] ifFalse: [self mapFor: cogMethod performUntil: #collectMapEntry:address:into: arg: mapEntries]. NewspeakVM ifTrue: [objectRepresentation canPinObjects ifFalse: [mapEntries keys do: [:a| (mapEntries at: a) = #IsNSSendCall ifTrue: [mapEntries at: a + backEnd jumpShortByteSize put: {'Class'. #disassembleCachedOop:. (objectMemory wordSize)}; at: a + backEnd jumpShortByteSize + objectMemory bytesPerOop put: {'ImplicitReceiver'. #disassembleCachedOop:. (objectMemory wordSize)}]]]]. "This would all be far more elegant and simple if we used blocks. But there are no blocks in C and the basic enumerators here need to be used in the real VM. Apologies." (codeRanges := self codeRangesFor: cogMethod) do: [:range| (cogMethod cmType = CMMethod) ifTrue: [mapEntries keysAndValuesDo: [:mcpc :label| | bcpc selectorOrNone | + (((range includes: mcpc) or: [range last + 1 = mcpc]) - ((range includes: mcpc) and: [(AnnotationsWithBytecodePCs includes: label) and: [range cogMethod stackCheckOffset > 0]]) ifTrue: [bcpc := self bytecodePCFor: mcpc startBcpc: range startpc in: range cogMethod. bcpc ~= 0 ifTrue: [label = #IsSendCall ifTrue: [selectorOrNone := (self selectorForSendAt: mcpc annotation: IsSendCall in: cogMethod methodObject). (selectorOrNone isInteger and: [objectMemory addressCouldBeOop: selectorOrNone]) ifTrue: [selectorOrNone := objectMemory stringOf: selectorOrNone]. selectorOrNone := ' ', selectorOrNone] ifFalse: [selectorOrNone := '']. mapEntries at: mcpc put: label, selectorOrNone, ' bc ', bcpc printString, '/', (bcpc + 1) printString]]]]. (cogMethod blockEntryOffset ~= 0 and: [range first = (cogMethod blockEntryOffset + cogMethod asInteger)]) ifTrue: [aStream nextPutAll: 'blockEntry:'; cr. self blockDispatchFor: cogMethod perform: #disassemble:from:to:arg: arg: aStream] ifFalse: [range first > (cogMethod address + cmNoCheckEntryOffset) ifTrue: [self printMethodHeader: range cogMethod on: aStream]. self disassembleFrom: range first to: range last labels: mapEntries on: aStream]]. aStream nextPutAll: 'startpc: '; print: codeRanges first startpc; cr. (cogMethod cmType = CMMethod or: [cogMethod cmType = CMOpenPIC]) ifTrue: [[self mapFor: cogMethod performUntil: #printMapEntry:mcpc:args: arg: { aStream. codeRanges. cogMethod }] on: AssertionFailure do: [:ex| ex primitiveChangeClassTo: ResumableVMError basicNew. ":) :) :)" ex resume: nil]]. ^cogMethod! Item was changed: ----- Method: Cogit>>printMapEntry:mcpc:args: (in category 'disassembly') ----- printMapEntry: annotation mcpc: mcpc args: tupleOfStreamCodeRangesAndMethod "Print the Map entry's mcpc, its annotation and the corresponding bytecode pc, if any." <doNotGenerate> | printHex | printHex := disassemblingMethod ifNil: [[:pc| pc hex]] ifNotNil: [[:pc| '.+', (pc - disassemblingMethod asInteger printStringBase: 16 length: 4 padded: true)]]. [:aStream :codeRanges :cogMethod| self startMcpcAndCogMethodForMcpc: mcpc in: cogMethod do: [:startmcpc :subMethod| | name codeRange | "Find the start of the block by searching the code ranges." + codeRange := codeRanges detect: [:range| range includes: mcpc] ifNone: [codeRanges detect: [:range| range last + 1 = mcpc]]. - codeRange := codeRanges detect: [:range| range includes: mcpc]. codeRange first = mcpc ifTrue: [aStream nextPutAll: 'startpc: '; print: codeRange startpc; cr]. aStream next: 2 put: Character space; nextPutAll: (printHex value: mcpc); space; nextPutAll: (name := self class annotationConstantNames at: annotation + 1); next: 20 - name size put: Character space; nextPut: $(; nextPutAll: (printHex value: (self findMapLocationForMcpc: mcpc inMethod: cogMethod)). (self isPCMappedAnnotation: annotation) ifTrue: [aStream nextPutAll: ', bc: '; print: (self bytecodePCFor: mcpc startBcpc: codeRange startpc in: subMethod)]. (self isSendAnnotation: annotation) ifTrue: [| sel | sel := self selectorForSendAt: mcpc annotation: annotation in: cogMethod methodObject. sel isInteger ifTrue: [sel := self lookupAddress: sel]. sel isString ifTrue: [aStream space; nextPutAll: sel]]. aStream nextPut: $); cr; flush]] valueWithArguments: tupleOfStreamCodeRangesAndMethod. ^0! Item was changed: ----- Method: Cogit>>startMcpcAndCogMethodForMcpc:in:do: (in category 'disassembly') ----- startMcpcAndCogMethodForMcpc: mcpc in: cogMethod do: aBinaryBlock "Evaluate aBinaryBlock with the startmcpc and method containing mcpc in cogMethod." <doNotGenerate> | startMcpc | startMcpc := ((self codeRangesFor: cogMethod) detect: [:range| range includes: mcpc] + ifNone: + [(self codeRangesFor: cogMethod) + detect: [:range| range last + 1 = mcpc] + ifNone: [^nil]]) first. - ifNone: [^nil]) first. ^aBinaryBlock value: startMcpc value: (startMcpc = (cogMethod asInteger + (self sizeof: CogMethod)) ifTrue: [cogMethod] ifFalse: [self cCoerceSimple: startMcpc - (self sizeof: CogBlockMethod) to: #'CogBlockMethod *'])!

1 0

VM Maker: Cog-eem.329.mcz
by commits＠source.squeak.org 06 Sep '16

06 Sep '16

Eliot Miranda uploaded a new version of Cog to project VM Maker: http://source.squeak.org/VMMaker/Cog-eem.329.mcz ==================== Summary ==================== Name: Cog-eem.329 Author: eem Time: 6 September 2016, 12:08:13.352767 pm UUID: d6e9861d-2c8f-4f97-b544-80637888b569 Ancestors: Cog-eem.328 Refactor disassembly to append labels associated wiuth the address immediately following the last instruction in a range (e.g. those following a ceNonLocalReturn call). =============== Diff against Cog-eem.328 =============== Item was changed: ----- Method: CogProcessorAlien>>disassembleFrom:to:in:for:labels:on: (in category 'disassembly') ----- disassembleFrom: startAddress to: endAddress in: memory for: aSymbolManager "<Cogit>" labels: labelDictionary on: aStream | address | address := startAddress. [address <= endAddress] whileTrue: [[:sizeArg :stringArg| | size string | size := sizeArg. string := stringArg. (aSymbolManager labelForPC: address) ifNotNil: [:label| aStream nextPutAll: label; nextPut: $:; cr]. (labelDictionary at: address ifAbsent: []) ifNotNil: [:label| + self printLabel: label on: aStream at: address for: aSymbolManager. + label isArray ifTrue: + [string := nil. + size := label third]]. - label isArray - ifTrue: [label first == #literal - ifTrue: - [aStream - nextPutAll: (address printStringBase: 16 length: 8 padded: true) asLowercase; - nextPut: $:; space; - nextPutAll: (aSymbolManager lookupAddress: (aSymbolManager objectMemory longAt: address))] - ifFalse: - [aStream - nextPutAll: label first; - nextPut: $:; cr; - nextPutAll: (address printStringBase: 16 length: 8 padded: true) asLowercase; - nextPut: $:; space; - nextPutAll: (aSymbolManager perform: label second with: address) asString]. - string := nil. - size := label third] - ifFalse: [aStream nextPutAll: label; nextPut: $:; cr]]. string ifNotNil: [aStream nextPutAll: (self decorateDisassembly: string for: aSymbolManager fromAddress: address)]. aStream cr; flush. address := address + size] valueWithArguments: (self primitiveDisassembleAt: address + inMemory: memory)]. + (labelDictionary at: address ifAbsent: []) ifNotNil: + [:label| self printLabel: label on: aStream at: address for: aSymbolManager]! - inMemory: memory)]! Item was added: + ----- Method: CogProcessorAlien>>printLabel:on:at:for: (in category 'printing') ----- + printLabel: label on: aStream at: address for: aSymbolManager + "Print label on aStream. The label is either a triple of {type, printer, size} or a simple string." + label isArray + ifTrue: [label first == #literal + ifTrue: + [aStream + nextPutAll: (address printStringBase: 16 length: 8 padded: true) asLowercase; + nextPut: $:; space; + nextPutAll: (aSymbolManager lookupAddress: (aSymbolManager objectMemory longAt: address))] + ifFalse: + [aStream + nextPutAll: label first; + nextPut: $:; cr; + nextPutAll: (address printStringBase: 16 length: 8 padded: true) asLowercase; + nextPut: $:; space; + nextPutAll: (aSymbolManager perform: label second with: address) asString]] + ifFalse: [aStream nextPutAll: label; nextPut: $:; cr]! Item was changed: ----- Method: GdbARMAlien>>disassembleFrom:to:in:for:labels:on: (in category 'disassembly') ----- disassembleFrom: startAddress to: endAddress in: memory for: aSymbolManager "<Cogit>" labels: labelDictionary on: aStream | address | address := startAddress. [address <= endAddress] whileTrue: [[:sizeArg :stringArg| | size string index offset | size := sizeArg. string := stringArg. (aSymbolManager labelForPC: address) ifNotNil: [:label| aStream nextPutAll: label; nextPut: $:; cr]. (labelDictionary at: address ifAbsent: []) ifNotNil: [:label| + self printLabel: label on: aStream at: address for: aSymbolManager. + label isArray ifTrue: + [string := nil. + size := label third]]. - label isArray - ifTrue: [label first == #literal - ifTrue: - [label size = 4 ifTrue: - [aStream nextPutAll: label last; nextPut: $:; cr]. - aStream - nextPutAll: (address printStringBase: 16 length: 8 padded: true) asLowercase; - nextPut: $:; space; - nextPutAll: ((aSymbolManager objectMemory longAt: address) printStringBase: 16 length: 8 padded: true) asLowercase. - (aSymbolManager lookupAddress: (aSymbolManager objectMemory longAt: address)) ifNotNil: - [:name| aStream space; nextPutAll: name]] - ifFalse: - [aStream - nextPutAll: label first; - nextPut: $:; cr; - nextPutAll: (address printStringBase: 16 length: 8 padded: true) asLowercase; - nextPut: $:; space; - nextPutAll: (aSymbolManager perform: label second with: address) asString]. - string := nil. - size := label third] - ifFalse: [aStream nextPutAll: label; nextPut: $:; cr]]. string ifNotNil: [aStream nextPutAll: (self decorateDisassembly: string for: aSymbolManager fromAddress: address). (string includesSubString: ': ldr ') ifTrue:"i.e. colon space 'ldr' tab" [(index := string indexOfSubCollection: ' [pc, #' startingAt: 1) > 0 ifTrue: [offset := Integer readFrom: (ReadStream on: string from: index + 7 to: (string indexOf: $] startingAt: index + 7) - 1)] ifFalse: [(string indexOfSubCollection: ' [pc]' startingAt: 1) > 0 ifTrue: [offset := 0]]. offset ifNotNil: [offset := address + 8 + offset. labelDictionary at: offset ifPresent: [:entry| entry isString ifTrue: [labelDictionary at: offset put: {#literal. offset. 4. entry}] ifFalse: [self assert: (entry isArray and: [entry first == #literal])]] ifAbsentPut: [{#literal. offset. 4}]]]]. aStream cr; flush. address := address + size] valueWithArguments: (self primitiveDisassembleAt: address + inMemory: memory)]. + (labelDictionary at: address ifAbsent: []) ifNotNil: + [:label| self printLabel: label on: aStream at: address for: aSymbolManager]! - inMemory: memory)]! Item was added: + ----- Method: GdbARMAlien>>printLabel:on:at:for: (in category 'printing') ----- + printLabel: label on: aStream at: address for: aSymbolManager + "Print label on aStream. The label is either a triple of {type, printer, size} or a simple string." + label isArray + ifTrue: [label first == #literal + ifTrue: + [label size = 4 ifTrue: + [aStream nextPutAll: label last; nextPut: $:; cr]. + aStream + nextPutAll: (address printStringBase: 16 length: 8 padded: true) asLowercase; + nextPut: $:; space; + nextPutAll: ((aSymbolManager objectMemory longAt: address) printStringBase: 16 length: 8 padded: true) asLowercase. + (aSymbolManager lookupAddress: (aSymbolManager objectMemory longAt: address)) ifNotNil: + [:name| aStream space; nextPutAll: name]] + ifFalse: + [aStream + nextPutAll: label first; + nextPut: $:; cr; + nextPutAll: (address printStringBase: 16 length: 8 padded: true) asLowercase; + nextPut: $:; space; + nextPutAll: (aSymbolManager perform: label second with: address) asString]] + ifFalse: [aStream nextPutAll: label; nextPut: $:; cr]!

1 0

git incoming diffs?
by Eliot Miranda 06 Sep '16

06 Sep '16

Hi All, thanks for the git incoming script that lists the commits that are pending to be pulled. IUt reads: incoming = "!git remote update -p; git log ..@{u}" How do I list the files that would be changed? How do I diff the files that would be changed? AdvThanksance _,,,^..^,,,_ best, Eliot

2 1

VM Maker: VMMaker.oscog-eem.1941.mcz
by commits＠source.squeak.org 06 Sep '16

06 Sep '16

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.1941.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.1941 Author: eem Time: 6 September 2016, 10:06:17.574 am UUID: ccc9d9be-c2f0-437a-bdfe-13dfc9c7225c Ancestors: VMMaker.oscog-cb.1940 Improve stack backtrace printing for full blocks. =============== Diff against VMMaker.oscog-cb.1940 =============== Item was changed: ----- Method: StackInterpreter>>findSelectorOfMethod: (in category 'debug support') ----- + findSelectorOfMethod: meth + | classObj classDict classDictSize methodArray i | + (objectMemory addressCouldBeObj: meth) ifFalse: - findSelectorOfMethod: methArg - | meth classObj classDict classDictSize methodArray i | - (objectMemory addressCouldBeObj: methArg) ifFalse: [^objectMemory nilObject]. + (objectMemory isForwarded: meth) ifTrue: + [^self findSelectorOfMethod: (objectMemory followForwarded: meth)]. - (objectMemory isForwarded: methArg) - ifTrue: [meth := objectMemory followForwarded: methArg] - ifFalse: [meth := methArg]. (objectMemory isOopCompiledMethod: meth) ifFalse: [^objectMemory nilObject]. + (self maybeSelectorOfMethod: meth) ifNotNil: + [:selector| ^selector]. - NewspeakVM ifTrue: - [(self maybeSelectorOfMethod: meth) ifNotNil: - [:selector| ^selector]]. classObj := self safeMethodClassOf: meth. (self addressCouldBeClassObj: classObj) ifTrue: [classDict := objectMemory fetchPointer: MethodDictionaryIndex ofObject: classObj. classDictSize := objectMemory numSlotsOf: classDict. classDictSize > MethodArrayIndex ifTrue: [methodArray := objectMemory fetchPointer: MethodArrayIndex ofObject: classDict. i := 0. [i < (classDictSize - SelectorStart)] whileTrue: [meth = (objectMemory fetchPointer: i ofObject: methodArray) ifTrue: [^(objectMemory fetchPointer: i + SelectorStart ofObject: classDict)]. i := i + 1]]]. ^objectMemory nilObject! Item was changed: ----- Method: StackInterpreter>>maybeSelectorOfMethod: (in category 'debug support') ----- maybeSelectorOfMethod: methodObj "Answer the selector of a method, assuming its penultimate literal is either a symbol or a pointer object whose first slot references the method and whose second slot is a symbol (i.e. an AdditionalMethodState). If a Symbol can't be found answer nil. This isn't satisfactory, as it puts a lot of information + into the VM, but it is needed for adequate crash debugging at Cadence. + With full blocks as of 9/2016 the last literal of a CompiledBlock is a back pointer + to the enclosing block or compiled method." + | ultimateLiteral penultimateLiteral maybeSelector | - into the VM, but it is needed for adequate crash debugging at Cadence." - | penultimateLiteral maybeSelector | self assert: (objectMemory isOopCompiledMethod: methodObj). + ultimateLiteral := self ultimateLiteralOf: methodObj. + (objectMemory isOopCompiledMethod: ultimateLiteral) ifTrue: + [^self maybeSelectorOfMethod: ultimateLiteral]. penultimateLiteral := self penultimateLiteralOf: methodObj. (objectMemory isWordsOrBytes: penultimateLiteral) ifTrue: [^(objectMemory fetchClassTagOfNonImm: penultimateLiteral) = (objectMemory fetchClassTagOfNonImm: (objectMemory splObj: SelectorDoesNotUnderstand)) ifTrue: [penultimateLiteral]]. ^((objectMemory isPointers: penultimateLiteral) and: [(objectMemory numSlotsOf: penultimateLiteral) >= 2 and: [(objectMemory fetchPointer: 0 ofObject: penultimateLiteral) = methodObj and: [maybeSelector := objectMemory fetchPointer: 1 ofObject: penultimateLiteral. (objectMemory isWordsOrBytes: maybeSelector) and: [(objectMemory fetchClassTagOfNonImm: maybeSelector) = (objectMemory fetchClassTagOfNonImm: (objectMemory splObj: SelectorDoesNotUnderstand))]]]]) ifTrue: [maybeSelector]! Item was added: + ----- Method: StackInterpreter>>ultimateLiteralOf: (in category 'debug printing') ----- + ultimateLiteralOf: aMethodOop + <api> + self assert: (objectMemory isOopCompiledMethod: aMethodOop). + ^self literal: (objectMemory literalCountOf: aMethodOop) - 1 ofMethod: aMethodOop!

1 0

[OpenSmalltalk/opensmalltalk-vm] fed097: add two more forgotten sqInts
by GitHub 06 Sep '16

06 Sep '16

Branch: refs/heads/Cog Home: https://github.com/OpenSmalltalk/opensmalltalk-vm Commit: fed09735d73bb87812eaccfa3e51440eada67c4d https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/fed09735d73bb87812… Author: Tobias Pape <tobias(a)netshed.de> Date: 2016-09-06 (Tue, 06 Sep 2016) Changed paths: M platforms/Mac OS/plugins/SqueakSSL/sqMacSSL.c M platforms/iOS/plugins/SqueakSSL/sqMacSSL.c Log Message: ----------- add two more forgotten sqInts - (there are more lurking in the declarations...)

1 0

[OpenSmalltalk/opensmalltalk-vm] 2a8ea3: add another sqInt inconsistency fix
by GitHub 05 Sep '16

05 Sep '16

Branch: refs/heads/Cog Home: https://github.com/OpenSmalltalk/opensmalltalk-vm Commit: 2a8ea3b6c2a14a796c104f1accd5f22adf6ad91a https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/2a8ea3b6c2a14a796c… Author: Tobias Pape <tobias(a)netshed.de> Date: 2016-09-05 (Mon, 05 Sep 2016) Changed paths: M platforms/Mac OS/plugins/SqueakSSL/sqMacSSL.c M platforms/iOS/plugins/SqueakSSL/sqMacSSL.c Log Message: ----------- add another sqInt inconsistency fix

1 0

← Newer
1
...
5
6
7
8
9
10
11
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

Vm-dev September 2016