Vm-dev April 2016

vm-dev@lists.squeakfoundation.org

35 participants
202 discussions

[commit][3686] (Tobias, Bert) Change fullscreen behavior of Cocoa VMs.
by commits＠squeakvm.org 27 Apr '16

27 Apr '16

Revision: 3686 Author: topa Date: 2016-04-27 08:01:30 -0700 (Wed, 27 Apr 2016) Log Message: ----------- (Tobias, Bert) Change fullscreen behavior of Cocoa VMs. - remove slow fadein/fadeout - provide correct fullscreen options - enable 'Fullscreen' button in window title bar Modified Paths: -------------- branches/Cog/platforms/iOS/vm/English.lproj/MainMenu.xib branches/Cog/platforms/iOS/vm/OSX/sqSqueakOSXCGView.m branches/Cog/platforms/iOS/vm/OSX/sqSqueakOSXOpenGLView.m Modified: branches/Cog/platforms/iOS/vm/English.lproj/MainMenu.xib =================================================================== --- branches/Cog/platforms/iOS/vm/English.lproj/MainMenu.xib 2016-04-23 18:06:55 UTC (rev 3685) +++ branches/Cog/platforms/iOS/vm/English.lproj/MainMenu.xib 2016-04-27 15:01:30 UTC (rev 3686) @@ -508,7 +508,8 @@ </object> <string key="NSScreenRect">{{0, 0}, {2560, 1417}}</string> <string key="NSMaxSize">{10000000000000, 10000000000000}</string> - <bool key="NSWindowIsRestorable">YES</bool> + <int key="NSWindowCollectionBehavior">128</int> + <bool key="NSWindowIsRestorable">NO</bool> </object> <object class="NSCustomObject" id="976324537"> <string key="NSClassName">SqueakOSXAppDelegate</string> Modified: branches/Cog/platforms/iOS/vm/OSX/sqSqueakOSXCGView.m =================================================================== --- branches/Cog/platforms/iOS/vm/OSX/sqSqueakOSXCGView.m 2016-04-23 18:06:55 UTC (rev 3685) +++ branches/Cog/platforms/iOS/vm/OSX/sqSqueakOSXCGView.m 2016-04-27 15:01:30 UTC (rev 3686) @@ -624,7 +624,7 @@ return YES; } -- (void) ioSetFullScreen: (sqInt) fullScreen { +- (void) ioSetFullScreen: (sqInt) fullScreen { if ([self isInFullScreenMode] == YES && (fullScreen == 1)) return; @@ -633,17 +633,18 @@ if ([self isInFullScreenMode] == NO && (fullScreen == 1)) { self.savedScreenBoundsAtTimeOfFullScreen = (NSRect) [self bounds]; - [self fadeOut]; - [self enterFullScreenMode:[NSScreen mainScreen] withOptions: nil]; + NSDictionary* options = [NSDictionary dictionaryWithObjectsAndKeys: + [NSNumber numberWithInt: + NSApplicationPresentationHideDock | + NSApplicationPresentationHideMenuBar ], + NSFullScreenModeApplicationPresentationOptions, nil]; + [self enterFullScreenMode:[NSScreen mainScreen] withOptions:options]; extern struct VirtualMachine* interpreterProxy; interpreterProxy->fullDisplayUpdate(); - [self fadeIn]; } if ([self isInFullScreenMode] == YES && (fullScreen == 0)) { - [self fadeOut]; [self exitFullScreenModeWithOptions: NULL]; - [self fadeIn]; if ([self.window isKeyWindow] == NO) { [self.window makeKeyAndOrderFront: self]; // NOT SURE IF THIS IS NEEDED, MORE TESTING [self.window setContentSize: self.savedScreenBoundsAtTimeOfFullScreen.size]; @@ -651,37 +652,4 @@ } } -- (void)fadeOut { - CGDisplayErr err; - - err = CGAcquireDisplayFadeReservation((CGDisplayReservationInterval)kCGMaxDisplayReservationInterval, - &fadeToken); - if (err == kCGErrorSuccess) { - CGDisplayFade(fadeToken, - ((sqSqueakOSXInfoPlistInterface*) gDelegateApp.squeakApplication.infoPlistInterfaceLogic).SqueakUIFadeForFullScreenInSeconds, - (CGDisplayBlendFraction)kCGDisplayBlendNormal, - (CGDisplayBlendFraction)kCGDisplayBlendSolidColor, - 0.0f, - 0.0f, - 0.0f, - TRUE); - } -} - -- (void)fadeIn { - CGDisplayErr err; - - err = CGDisplayFade(fadeToken, - ((sqSqueakOSXInfoPlistInterface*) gDelegateApp.squeakApplication.infoPlistInterfaceLogic).SqueakUIFadeForFullScreenInSeconds, - (CGDisplayBlendFraction)kCGDisplayBlendSolidColor, - (CGDisplayBlendFraction)kCGDisplayBlendNormal, - 0.0f, - 0.0f, - 0.0f, - TRUE); - if (err == kCGErrorSuccess) { - CGReleaseDisplayFadeReservation(fadeToken); - } -} - @end Modified: branches/Cog/platforms/iOS/vm/OSX/sqSqueakOSXOpenGLView.m =================================================================== --- branches/Cog/platforms/iOS/vm/OSX/sqSqueakOSXOpenGLView.m 2016-04-23 18:06:55 UTC (rev 3685) +++ branches/Cog/platforms/iOS/vm/OSX/sqSqueakOSXOpenGLView.m 2016-04-27 15:01:30 UTC (rev 3686) @@ -713,7 +713,7 @@ return YES; } -- (void) ioSetFullScreen: (sqInt) fullScreen { +- (void) ioSetFullScreen: (sqInt) fullScreen { if ([self isInFullScreenMode] == YES && (fullScreen == 1)) return; @@ -722,17 +722,18 @@ if ([self isInFullScreenMode] == NO && (fullScreen == 1)) { self.savedScreenBoundsAtTimeOfFullScreen = (NSRect) [self bounds]; - [self fadeOut]; - [self enterFullScreenMode:[NSScreen mainScreen] withOptions: nil]; + NSDictionary* options = [NSDictionary dictionaryWithObjectsAndKeys: + [NSNumber numberWithInt: + NSApplicationPresentationHideDock | + NSApplicationPresentationHideMenuBar ], + NSFullScreenModeApplicationPresentationOptions, nil]; + [self enterFullScreenMode:[NSScreen mainScreen] withOptions:options]; extern struct VirtualMachine* interpreterProxy; interpreterProxy->fullDisplayUpdate(); - [self fadeIn]; } if ([self isInFullScreenMode] == YES && (fullScreen == 0)) { - [self fadeOut]; [self exitFullScreenModeWithOptions: NULL]; - [self fadeIn]; if ([self.window isKeyWindow] == NO) { [self.window makeKeyAndOrderFront: self]; // NOT SURE IF THIS IS NEEDED, MORE TESTING [self.window setContentSize: self.savedScreenBoundsAtTimeOfFullScreen.size]; @@ -740,39 +741,6 @@ } } -- (void)fadeOut { - CGDisplayErr err; - - err = CGAcquireDisplayFadeReservation((CGDisplayReservationInterval)kCGMaxDisplayReservationInterval, - &fadeToken); - if (err == kCGErrorSuccess) { - CGDisplayFade(fadeToken, - ((sqSqueakOSXInfoPlistInterface*) gDelegateApp.squeakApplication.infoPlistInterfaceLogic).SqueakUIFadeForFullScreenInSeconds, - (CGDisplayBlendFraction)kCGDisplayBlendNormal, - (CGDisplayBlendFraction)kCGDisplayBlendSolidColor, - 0.0f, - 0.0f, - 0.0f, - TRUE); - } -} - -- (void)fadeIn { - CGDisplayErr err; - - err = CGDisplayFade(fadeToken, - ((sqSqueakOSXInfoPlistInterface*) gDelegateApp.squeakApplication.infoPlistInterfaceLogic).SqueakUIFadeForFullScreenInSeconds, - (CGDisplayBlendFraction)kCGDisplayBlendSolidColor, - (CGDisplayBlendFraction)kCGDisplayBlendNormal, - 0.0f, - 0.0f, - 0.0f, - TRUE); - if (err == kCGErrorSuccess) { - CGReleaseDisplayFadeReservation(fadeToken); - } -} - - (void) preDrawThelayers { }

3 3

VM Maker: VMMaker.oscog-eem.1848.mcz
by commits＠source.squeak.org 27 Apr '16

27 Apr '16

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.1848.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.1848 Author: eem Time: 26 April 2016, 5:06:28.431902 pm UUID: d9bc9a1b-451c-48b8-ba81-4c932fc83ca0 Ancestors: VMMaker.oscog-eem.1847 In 1848 Giuseppe Verdi wishes to replace soprano Eugenia Tadolini as Lady Macbeth for the first Naples performance of his opera Macbeth on the grounds that her voice and appearance are too beautiful. Add printActivationsOf: and have it and printContextReferencesTo: print the pcs of the contexts they find. Eliminate duplication in [directed]SuperclassSend. Fix the order of the annotation names to fix disassembly in the simulator given VMMaker.oscog-eem.1847. Print the homeOffset as well as the homeMethod in embedded block methods. A few minor changes to eliminate C compiler warnings. =============== Diff against VMMaker.oscog-eem.1847 =============== 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 - HasBytecodePC IsRelativeCall + HasBytecodePC IsNSSendCall IsSendCall IsSuperSend IsDirectedSuperSend IsNSSelfSend IsNSDynamicSuperSend IsNSImplicitReceiverSend). AnnotationsWithBytecodePCs := #(HasBytecodePC IsNSSendCall IsSendCall IsSuperSend IsDirectedSuperSend IsNSSelfSend IsNSDynamicSuperSend IsNSImplicitReceiverSend)! Item was changed: ----- Method: Cogit>>printMethodHeader:on: (in category 'disassembly') ----- printMethodHeader: cogMethod on: aStream <doNotGenerate> self cCode: '' inSmalltalk: [cogMethod isInteger ifTrue: [^self printMethodHeader: (self cogMethodOrBlockSurrogateAt: cogMethod) on: aStream]]. aStream ensureCr. cogMethod asInteger printOn: aStream base: 16. cogMethod cmType = CMMethod ifTrue: [aStream crtab; nextPutAll: 'objhdr: '. cogMethod objectHeader printOn: aStream base: 16]. cogMethod cmType = CMBlock ifTrue: [aStream crtab; nextPutAll: 'homemth: '. cogMethod cmHomeMethod asUnsignedInteger printOn: aStream base: 16. + aStream + nextPutAll: ' (offset '; print: cogMethod homeOffset; nextPut: $); + crtab; nextPutAll: 'startpc: '; print: cogMethod startpc]. - aStream crtab; nextPutAll: 'startpc: '; print: cogMethod startpc]. aStream crtab; nextPutAll: 'nArgs: '; print: cogMethod cmNumArgs; tab; nextPutAll: 'type: '; print: cogMethod cmType. (cogMethod cmType ~= 0 and: [cogMethod cmType ~= CMBlock]) ifTrue: [aStream crtab; nextPutAll: 'blksiz: '. cogMethod blockSize printOn: aStream base: 16. cogMethod cmType = CMMethod ifTrue: [aStream crtab; nextPutAll: 'method: '. cogMethod methodObject printOn: aStream base: 16. aStream crtab; nextPutAll: 'mthhdr: '. cogMethod methodHeader printOn: aStream base: 16]. aStream crtab; nextPutAll: 'selctr: '. cogMethod selector printOn: aStream base: 16. (coInterpreter lookupAddress: cogMethod selector) ifNotNil: [:string| aStream nextPut: $=; nextPutAll: string]. cogMethod cmType = CMMethod ifTrue: [aStream crtab; nextPutAll: 'blkentry: '. cogMethod blockEntryOffset printOn: aStream base: 16. cogMethod blockEntryOffset ~= 0 ifTrue: [aStream nextPutAll: ' => '. cogMethod asInteger + cogMethod blockEntryOffset printOn: aStream base: 16]]]. cogMethod cmType = CMClosedPIC ifTrue: [aStream crtab; nextPutAll: 'cPICNumCases: '. cogMethod cPICNumCases printOn: aStream base: 16; tab; nextPutAll: 'cpicHasMNUCase: '; nextPutAll: (cogMethod cpicHasMNUCase ifTrue: ['yes'] ifFalse: ['no'])] ifFalse: [aStream crtab; nextPutAll: 'stackCheckOffset: '. cogMethod stackCheckOffset printOn: aStream base: 16. cogMethod stackCheckOffset > 0 ifTrue: [aStream nextPut: $/. cogMethod asInteger + cogMethod stackCheckOffset printOn: aStream base: 16]. cogMethod cmType = CMBlock ifTrue: [aStream crtab; nextPutAll: 'cbUsesInstVars '; nextPutAll: (cogMethod cbUsesInstVars ifTrue: ['yes'] ifFalse: ['no'])] ifFalse: [aStream crtab; nextPutAll: 'cmRefersToYoung: '; nextPutAll: (cogMethod cmRefersToYoung ifTrue: ['yes'] ifFalse: ['no']); tab; nextPutAll: 'cmIsFullBlock: '; nextPutAll: (cogMethod cmIsFullBlock ifTrue: ['yes'] ifFalse: ['no'])]. cogMethod cmType = CMMethod ifTrue: [([cogMethod nextMethodOrIRCs] on: MessageNotUnderstood do: [:ex| nil]) ifNotNil: [:nmoircs| aStream crtab; nextPutAll: 'nextMethodOrIRCs: '. nmoircs = 0 ifTrue: [aStream print: nmoircs] ifFalse: [coInterpreter printHex: nmoircs]]. ([cogMethod counters] on: MessageNotUnderstood do: [:ex| nil]) ifNotNil: [:cntrs| aStream crtab; nextPutAll: 'counters: '. cntrs = 0 ifTrue: [aStream print: cntrs] ifFalse: [coInterpreter printHex: cntrs]]]]. aStream cr; flush! Item was changed: ----- Method: Cogit>>warnMultiple:selectors: (in category 'debug printing') ----- warnMultiple: cogMethod selectors: aSelectorOop <inline: true> + self cCode: 'extern void *firstIndexableField(sqInt)'. self cCode: [self fp: #stderr r: 'Warning, attempt to use method with selector %.*s and selector %.*s\n' i: (self cCoerceSimple: (objectMemory numBytesOf: cogMethod selector) to: #int) n: (self cCoerceSimple: (objectMemory firstIndexableField: cogMethod selector) to: #'char *') t: (objectMemory numBytesOf: aSelectorOop) f: (self cCoerceSimple: (objectMemory firstIndexableField: aSelectorOop) to: #'char *')] inSmalltalk: [self warn: 'Warning, attempt to use method with selector ', (coInterpreter stringOf: cogMethod selector), ' and selector ', (coInterpreter stringOf: aSelectorOop)]! Item was added: + ----- Method: NewObjectMemory>>printActivationsOf: (in category 'debug printing') ----- + printActivationsOf: aMethodObj + "Scan the heap printing the oops of any and all contexts that refer to anOop" + | oop | + <api> + oop := self firstAccessibleObject. + [oop = nil] whileFalse: + [((self isContextNonImm: oop) + and: [aMethodObj = (self fetchPointer: MethodIndex ofObject: oop)]) ifTrue: + [coInterpreter + printHex: oop; printOopShort: oop; print: ' pc '; + printHex: (self fetchPointer: InstructionPointerIndex ofObject: oop); cr]. + oop := self accessibleObjectAfter: oop]! Item was changed: ----- Method: NewObjectMemory>>printContextReferencesTo: (in category 'debug printing') ----- printContextReferencesTo: anOop "Scan the heap printing the oops of any and all contexts that refer to anOop" | oop i | <api> oop := self firstAccessibleObject. [oop = nil] whileFalse: [(self isContextNonImm: oop) ifTrue: [i := CtxtTempFrameStart + (coInterpreter fetchStackPointerOf: oop)]. [(i := i - 1) >= 0] whileTrue: [anOop = (self fetchPointer: i ofObject: oop) ifTrue: + [coInterpreter + printHex: oop; print: ' @ '; printNum: i; space; printOopShort: oop; + print: ' pc '; printHex: (self fetchPointer: InstructionPointerIndex ofObject: oop); cr. - [coInterpreter printHex: oop; print: ' @ '; printNum: i; space; printOopShort: oop; cr. i := 0]]. oop := self accessibleObjectAfter: oop]! Item was added: + ----- Method: ObjectMemory>>printActivationsOf: (in category 'debug printing') ----- + printActivationsOf: aMethodObj + "Scan the heap printing the oops of any and all contexts that refer to anOop" + | oop | + <api> + oop := self firstAccessibleObject. + [oop = nil] whileFalse: + [((self isContextNonImm: oop) + and: [aMethodObj = (self fetchPointer: MethodIndex ofObject: oop)]) ifTrue: + [self interpreter + printHex: oop; printOopShort: oop; print: ' pc '; + printHex: (self fetchPointer: InstructionPointerIndex ofObject: oop); cr]. + oop := self accessibleObjectAfter: oop]! Item was changed: ----- Method: SpurMemoryManager>>lowSpaceThreshold: (in category 'free space') ----- lowSpaceThreshold: threshold lowSpaceThreshold := threshold. + "N.B. The threshold > 0 guard eliminates a warning when + self lowSpaceThreshold: 0 + is inlined into setSignalLowSpaceFlagAndSaveProcess" + (threshold > 0 + and: [totalFreeOldSpace < threshold]) ifTrue: - totalFreeOldSpace < threshold ifTrue: [self growOldSpaceByAtLeast: threshold - totalFreeOldSpace]. self assert: totalFreeOldSpace >= lowSpaceThreshold! Item was added: + ----- Method: SpurMemoryManager>>printActivationsOf: (in category 'debug printing') ----- + printActivationsOf: aMethodObj + "Scan the heap printing the oops of any and all contexts that refer to anOop" + <api> + self allObjectsDo: + [:obj| + ((self isContextNonImm: obj) + and: [aMethodObj = (self fetchPointer: MethodIndex ofObject: obj)]) ifTrue: + [coInterpreter + printHex: obj; printOopShort: obj; print: ' pc '; + printHex: (self fetchPointer: InstructionPointerIndex ofObject: obj); cr]]! Item was changed: ----- Method: SpurMemoryManager>>printContextReferencesTo: (in category 'debug printing') ----- printContextReferencesTo: anOop "Scan the heap printing the oops of any and all contexts that refer to anOop" <api> self allObjectsDo: [:obj| | i | (self isContextNonImm: obj) ifTrue: [i := CtxtTempFrameStart + (coInterpreter fetchStackPointerOf: obj). [(i := i - 1) >= 0] whileTrue: [anOop = (self fetchPointer: i ofObject: obj) ifTrue: + [coInterpreter + printHex: obj; print: ' @ '; printNum: i; space; printOopShort: obj; + print: ' pc '; printHex: (self fetchPointer: InstructionPointerIndex ofObject: obj); cr. - [coInterpreter printHex: obj; print: ' @ '; printNum: i; space; printOopShort: obj; cr. i := 0]]]]! Item was changed: ----- Method: StackInterpreter>>directedSuperclassSend (in category 'send bytecodes') ----- directedSuperclassSend "Send a message to self, starting lookup with the superclass of the class on top of stack." "Assume: messageSelector and argumentCount have been set, and that the receiver and arguments have been pushed onto the stack," "Note: This method is inlined into the interpreter dispatch loop." <sharedCodeInCase: #extSendSuperBytecode> <option: #SistaVM> | class superclass | class := self internalPopStack. (objectMemory isForwarded: class) ifTrue: [class := objectMemory followForwarded: class]. superclass := self superclassOf: class. + "classTagForClass: uses ensureBehaviorHash:" - objectMemory ensureBehaviorHash: superclass. lkupClassTag := objectMemory classTagForClass: superclass. "To maintain the invariant that all receivers are unforwarded we need an explicit read barrier in the super send cases. Even though we always follow receivers on become e.g. super doSomethingWith: (self become: other) forwards the receiver self pushed on the stack." self ensureReceiverUnforwarded. self assert: lkupClassTag ~= objectMemory nilObject. self commonSendOrdinary! Item was changed: ----- Method: StackInterpreter>>longPrintOop: (in category 'debug printing') ----- longPrintOop: oop <api> | fmt lastIndex startIP bytecodesPerLine column | ((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| | fieldOop | fieldOop := objectMemory fetchLong32: i ofObject: oop. self space; printNum: i; space; printHex: fieldOop; 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%08lx: ", (unsigned long)(oop+BaseHeaderSize+index-1))' - [self cCode: 'printf("0x%08lx: ", 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>>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 isWords: oop) ifTrue: [lastIndex := 64 min: ((objectMemory numBytesOf: oop) / objectMemory wordSize). lastIndex > 0 ifTrue: [1 to: lastIndex do: [:index| 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%08lx: ", (unsigned long)(oop+BaseHeaderSize+index-1))' - [self cCode: 'printf("0x%08lx: ", 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>>superclassSend (in category 'send bytecodes') ----- superclassSend "Send a message to self, starting lookup with the superclass of the class containing the currently executing method." "Assume: messageSelector and argumentCount have been set, and that the receiver and arguments have been pushed onto the stack," "Note: This method is inlined into the interpreter dispatch loop." <sharedCodeInCase: #singleExtendedSuperBytecode> | superclass | superclass := self superclassOf: (self methodClassOf: method). + "classTagForClass: uses ensureBehaviorHash:" - objectMemory ensureBehaviorHash: superclass. lkupClassTag := objectMemory classTagForClass: superclass. "To maintain the invariant that all receivers are unforwarded we need an explicit read barrier in the super send cases. Even though we always follow receivers on become e.g. super doSomethingWith: (self become: other) forwards the receiver self pushed on the stack." self ensureReceiverUnforwarded. self assert: lkupClassTag ~= objectMemory nilObject. self commonSendOrdinary!

1 0

Why do superclassSend ensureBehaviorHash:
by Nicolas Cellier 27 Apr '16

27 Apr '16

Hi, I see that superclassSend sends: objectMemory ensureBehaviorHash: superclass. and just after it does lkupClassTag := objectMemory classTagForClass: superclass. But classTagForClass: is doing the same as above: <api> self assert: (coInterpreter addressCouldBeClassObj: classObj). ^self ensureBehaviorHash: classObj So we are sending ensureBehaviorHash: twice... It sounds un-ncecessary or is there a tricky reason to this? Moreover, it sounds like ensureBehaviorHash: will begin with self assert: (coInterpreter addressCouldBeClassObj: aBehavior). So again, we are asserting twice the same thing, aren't we?

2 1

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

26 Apr '16

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.1847.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.1847 Author: eem Time: 26 April 2016, 8:49:48.651885 am UUID: cc80350d-f8a9-47e6-960f-a0e31e20d725 Ancestors: VMMaker.oscog-cb.1846 primitiveVoidVMStateForMethod: ensureAllContextsWithMethodHaveBytecodePCs: should widow contexts, otherwise "separated" but not yet widowed contexts may persist.. Cogit: reorder annotation constants to simplify isPCMappedAnnotation:. Simulation: fix receivers of integerObjectOf: in recent multiply prim changes. =============== Diff against VMMaker.oscog-cb.1846 =============== Item was changed: ----- Method: CoInterpreter>>ensureAllContextsWithMethodHaveBytecodePCs: (in category 'frame access') ----- ensureAllContextsWithMethodHaveBytecodePCs: methodObj "Map all native pcs to bytecoded pcs in all contexts on methodObj. Used to implement primitiveVoidVMStateForMethod." objectMemory allObjectsDo: [:oop| ((objectMemory isContextNonImm: oop) and: [(objectMemory fetchPointer: MethodIndex ofObject: oop) = methodObj]) ifTrue: [(self isMarriedOrWidowedContext: oop) ifTrue: + "Since any machine-code frame activations of the method have been divorced + there should only be interpreted activations of marriecd contexts." + [(self isWidowedContext: oop) ifFalse: + [self deny: (self isMachineCodeFrame: (self frameOfMarriedContext: oop))]] - [(self checkIsStillMarriedContext: oop currentFP: stackPage headFP) ifTrue: - [self assert: (self isMachineCodeFrame: (self frameOfMarriedContext: oop)) not]] ifFalse: [self ensureContextHasBytecodePC: oop]]]! 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. - HasBytecodePC := 4. - IsRelativeCall := 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 HasBytecodePC IsRelativeCall IsNSSendCall IsSendCall IsSuperSend IsDirectedSuperSend IsNSSelfSend IsNSDynamicSuperSend IsNSImplicitReceiverSend). AnnotationsWithBytecodePCs := #(HasBytecodePC IsNSSendCall IsSendCall IsSuperSend IsDirectedSuperSend IsNSSelfSend IsNSDynamicSuperSend IsNSImplicitReceiverSend)! Item was changed: ----- Method: Cogit>>isPCMappedAnnotation: (in category 'method map') ----- isPCMappedAnnotation: annotation + "See Cogit class>>initializeAnnotationConstants" <inline: true> + ^annotation >= HasBytecodePC! - ^annotation >= IsSendCall - or: [annotation = HasBytecodePC - or: [NewspeakVM and: [annotation = IsNSSendCall]]]! Item was changed: ----- Method: InterpreterPrimitives>>primitiveMultiply (in category 'arithmetic integer primitives') ----- primitiveMultiply | integerRcvr integerArg integerResult overflow | integerRcvr := self stackIntegerValue: 1. integerArg := self stackIntegerValue: 0. self successful ifTrue: [overflow := integerRcvr > 0 ifTrue: [integerArg > 0 ifTrue: [integerRcvr > (objectMemory maxSmallInteger / integerArg)] ifFalse: [integerArg < (objectMemory minSmallInteger / integerRcvr)]] ifFalse: [integerArg > 0 ifTrue: [integerRcvr < (objectMemory minSmallInteger / integerArg)] ifFalse: [(integerRcvr < 0) and: [integerArg < (objectMemory maxSmallInteger / integerRcvr)]]]. overflow ifTrue: [self primitiveFail] ifFalse: [integerResult := integerRcvr * integerArg. + self pop: 2 thenPush: (objectMemory integerObjectOf: integerResult)]]! - self pop: 2 thenPush: (self integerObjectOf: integerResult)]]! Item was changed: ----- Method: StackInterpreter>>bytecodePrimMultiply (in category 'common selector sends') ----- bytecodePrimMultiply | rcvr arg result overflow oop | rcvr := self internalStackValue: 1. arg := self internalStackValue: 0. (objectMemory areIntegers: rcvr and: arg) ifTrue: [rcvr := objectMemory integerValueOf: rcvr. arg := objectMemory integerValueOf: arg. overflow := rcvr > 0 ifTrue: [arg > 0 ifTrue: [rcvr > (objectMemory maxSmallInteger / arg)] ifFalse: [arg < (objectMemory minSmallInteger / rcvr)]] ifFalse: [arg > 0 ifTrue: [rcvr < (objectMemory minSmallInteger / arg)] ifFalse: [(rcvr < 0) and: [arg < (objectMemory maxSmallInteger / rcvr)]]]. overflow ifFalse: [result := rcvr * arg. + oop := objectMemory integerObjectOf: result. - oop := self integerObjectOf: result. self internalPop: 2 thenPush: oop. ^self fetchNextBytecode "success"]] ifFalse: [self initPrimCall. self externalizeIPandSP. self primitiveFloatMultiply: rcvr byArg: arg. self internalizeIPandSP. self successful ifTrue: [^ self fetchNextBytecode "success"]]. messageSelector := self specialSelector: 8. argumentCount := 1. self normalSend!

1 0

VM Maker: VMMaker.oscog-cb.1846.mcz
by commits＠source.squeak.org 26 Apr '16

26 Apr '16

ClementBera uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-cb.1846.mcz ==================== Summary ==================== Name: VMMaker.oscog-cb.1846 Author: cb Time: 26 April 2016, 9:34:11.962387 am UUID: 1722de25-959a-41b4-ab92-b31c62fa8ec0 Ancestors: VMMaker.oscog-eem.1845 Added convenience methods to simulate new sista primitive allMachineCodeMethods (Maybe it shouldn't be a sista primitive ?). Fixed the primitive so that it shorten the array answered instead of answering an array ending with many nil. =============== Diff against VMMaker.oscog-eem.1845 =============== Item was changed: ----- Method: CoInterpreterPrimitives>>primitiveAllMethodsCompiledToMachineCode (in category 'method introspection primitives') ----- primitiveAllMethodsCompiledToMachineCode <export: true> <option: #SistaCogit> + | arrayObj nEntries maxNumEntries | - | arrayObj | argumentCount ~= 0 ifTrue: [^self primitiveFailFor: PrimErrBadNumArgs]. + maxNumEntries := cogit numMethods + objectMemory minSlotsForShortening. + arrayObj := objectMemory + instantiateClass: (objectMemory splObj: ClassArray) + indexableSize: maxNumEntries. - arrayObj := objectMemory instantiateClass: (objectMemory splObj: ClassArray) indexableSize: cogit numMethods. arrayObj ifNil: [^-1]. + nEntries := cogit methodsCompiledToMachineCodeInto: arrayObj. + (nEntries < maxNumEntries) ifTrue: + [objectMemory shorten: arrayObj toIndexableSize: nEntries]. - cogit methodsCompiledToMachineCodeInto: arrayObj. self pop: 1 thenPush: arrayObj! Item was changed: ----- Method: CogMethodZone>>methodsCompiledToMachineCodeInto: (in category 'method zone introspection') ----- methodsCompiledToMachineCodeInto: arrayObj <api> - <returnTypeC: #void> <var: #cogMethod type: #'CogMethod *'> | cogMethod methodIndex | methodIndex := 0. cogMethod := cogit cCoerceSimple: baseAddress to: #'CogMethod *'. [cogMethod < self limitZony] whileTrue: [cogMethod cmType = CMMethod ifTrue: + [objectMemory + storePointerUnchecked: methodIndex + ofObject: arrayObj + withValue: cogMethod methodObject. - [objectMemory storePointerUnchecked: methodIndex ofObject: arrayObj withValue: cogMethod methodObject. methodIndex := methodIndex + 1]. cogMethod := self methodAfter: cogMethod]. + ^ methodIndex ! Item was added: + ----- Method: SistaCogit>>methodsCompiledToMachineCodeInto: (in category 'simulation only') ----- + methodsCompiledToMachineCodeInto: arrayObject + <doNotGenerate> + ^methodZone methodsCompiledToMachineCodeInto: arrayObject! Item was added: + ----- Method: SistaCogit>>numMethods (in category 'simulation only') ----- + numMethods + <doNotGenerate> + ^methodZone numMethods!

1 0

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

26 Apr '16

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.1845.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.1845 Author: eem Time: 25 April 2016, 6:40:35.00415 pm UUID: 8e0d7f76-6c62-4a86-98f5-2bb923f3bf98 Ancestors: VMMaker.oscog-nice.1844 Debugging: Add printContextReferencesTo: Cogit: Fix regression in VMMaker.oscog-eem.1823 when merging the two map enumerators into one that affects Sista. The merged enumerator must extend IsSendAnnotations with the AnnotationExtension. Inline label maintennance funcs. =============== Diff against VMMaker.oscog-nice.1844 =============== Item was changed: ----- Method: CogAbstractInstruction>>setLabelOffset: (in category 'generate machine code') ----- setLabelOffset: aValue "Hack: To arrange that the block method field pushed in a block entry has its MFMethodFlagIsBlockFlag bit set we provide labels with an offset. The offset for the fakeHeader reference is MFMethodFlagIsBlockFlag. See compileBlockFrameBuild:" + <inline: true> ^operands at: 1 put: aValue! Item was changed: ----- Method: Cogit>>mapFor:bcpc:performUntil:arg: (in category 'method map') ----- mapFor: cogMethod bcpc: startbcpc performUntil: functionSymbol arg: arg "Machine-code <-> bytecode pc mapping support. Evaluate functionSymbol for each mcpc, bcpc pair in the map until the function returns non-zero, answering that result, or 0 if it fails to. To cut down on number of arguments. and to be usable for both pc-mapping and method introspection, we encode the annotation and the isBackwardBranch flag in the same parameter. Guilty as charged." <var: #cogMethod type: #'CogBlockMethod *'> <var: #functionSymbol declareC: 'sqInt (*functionSymbol)(BytecodeDescriptor *desc, sqInt annotationAndIsBackwardBranch, char *mcpc, sqInt bcpc, void *arg)'> <var: #arg type: #'void *'> <inline: true> | isInBlock mcpc bcpc endbcpc map mapByte homeMethod aMethodObj result latestContinuation byte descriptor bsOffset nExts annotation | <var: #descriptor type: #'BytecodeDescriptor *'> <var: #homeMethod type: #'CogMethod *'> self assert: cogMethod stackCheckOffset > 0. mcpc := cogMethod asUnsignedInteger + cogMethod stackCheckOffset. "The stack check maps to the start of the first bytecode, the first bytecode being effectively after frame build." result := self perform: functionSymbol with: nil with: 0 + (HasBytecodePC << 1) with: (self cCoerceSimple: mcpc to: #'char *') with: startbcpc with: arg. result ~= 0 ifTrue: [^result]. bcpc := startbcpc. "In both CMMethod and CMBlock cases find the start of the map and skip forward to the bytecode pc map entry for the stack check." cogMethod cmType = CMMethod ifTrue: [isInBlock := false. homeMethod := self cCoerceSimple: cogMethod to: #'CogMethod *'. self assert: startbcpc = (coInterpreter startPCOfMethodHeader: homeMethod methodHeader). map := self mapStartFor: homeMethod. annotation := (objectMemory byteAt: map) >> AnnotationShift. self assert: (annotation = IsAbsPCReference or: [annotation = IsObjectReference or: [annotation = IsRelativeCall or: [annotation = IsDisplacementX2N]]]). latestContinuation := startbcpc. aMethodObj := homeMethod methodObject. endbcpc := (objectMemory numBytesOf: aMethodObj) - 1. bsOffset := self bytecodeSetOffsetForHeader: homeMethod methodHeader. "If the method has a primitive, skip it and the error code store, if any; Logically. these come before the stack check and so must be ignored." bcpc := bcpc + (self deltaToSkipPrimAndErrorStoreIn: aMethodObj header: homeMethod methodHeader)] ifFalse: [isInBlock := true. self assert: bcpc = cogMethod startpc. homeMethod := cogMethod cmHomeMethod. map := self findMapLocationForMcpc: cogMethod asUnsignedInteger + (self sizeof: CogBlockMethod) inMethod: homeMethod. self assert: map ~= 0. annotation := (objectMemory byteAt: map) >> AnnotationShift. self assert: (annotation >> AnnotationShift = HasBytecodePC "fiducial" or: [annotation >> AnnotationShift = IsDisplacementX2N]). [(annotation := (objectMemory byteAt: map) >> AnnotationShift) ~= HasBytecodePC] whileTrue: [map := map - 1]. map := map - 1. "skip fiducial; i.e. the map entry for the pc immediately following the method header." aMethodObj := homeMethod methodObject. bcpc := startbcpc - (self blockCreationBytecodeSizeForHeader: homeMethod methodHeader). bsOffset := self bytecodeSetOffsetForHeader: homeMethod methodHeader. byte := (objectMemory fetchByte: bcpc ofObject: aMethodObj) + bsOffset. descriptor := self generatorAt: byte. endbcpc := self nextBytecodePCFor: descriptor at: bcpc exts: -1 in: aMethodObj. bcpc := startbcpc]. nExts := 0. self inlineCacheTagsAreIndexes ifTrue: [enumeratingCogMethod := homeMethod]. "Now skip up through the bytecode pc map entry for the stack check." [(objectMemory byteAt: map) >> AnnotationShift ~= HasBytecodePC] whileTrue: [map := map - 1]. map := map - 1. [(mapByte := objectMemory byteAt: map) ~= MapEnd] whileTrue: "defensive; we exit on bcpc" [mapByte >= FirstAnnotation ifTrue: [| nextBcpc isBackwardBranch | annotation := mapByte >> AnnotationShift. mcpc := mcpc + ((mapByte bitAnd: DisplacementMask) * backEnd codeGranularity). (self isPCMappedAnnotation: annotation) ifTrue: + [(annotation = IsSendCall + and: [(mapByte := objectMemory byteAt: map - 1) >> AnnotationShift = IsAnnotationExtension]) ifTrue: + [annotation := annotation + (mapByte bitAnd: DisplacementMask). + map := map - 1]. + [byte := (objectMemory fetchByte: bcpc ofObject: aMethodObj) + bsOffset. - [[byte := (objectMemory fetchByte: bcpc ofObject: aMethodObj) + bsOffset. descriptor := self generatorAt: byte. isInBlock ifTrue: [bcpc >= endbcpc ifTrue: [^0]] ifFalse: [(descriptor isReturn and: [bcpc >= latestContinuation]) ifTrue: [^0]. (descriptor isBranch or: [descriptor isBlockCreation]) ifTrue: [| targetPC | targetPC := self latestContinuationPCFor: descriptor at: bcpc exts: nExts in: aMethodObj. latestContinuation := latestContinuation max: targetPC]]. nextBcpc := self nextBytecodePCFor: descriptor at: bcpc exts: nExts in: aMethodObj. descriptor isMapped or: [isInBlock and: [descriptor isMappedInBlock]]] whileFalse: [bcpc := nextBcpc. nExts := descriptor isExtension ifTrue: [nExts + 1] ifFalse: [0]]. + isBackwardBranch := descriptor isBranch - isBackwardBranch := descriptor isBranch and: [self isBackwardBranch: descriptor at: bcpc exts: nExts in: aMethodObj]. + result := self perform: functionSymbol - result := self perform: functionSymbol with: descriptor with: (isBackwardBranch ifTrue: [annotation << 1 + 1] ifFalse: [annotation << 1]) with: (self cCoerceSimple: mcpc to: #'char *') with: bcpc with: arg. result ~= 0 ifTrue: [^result]. bcpc := nextBcpc. nExts := descriptor isExtension ifTrue: [nExts + 1] ifFalse: [0]]] ifFalse: [self assert: (mapByte >> AnnotationShift = IsDisplacementX2N or: [mapByte >> AnnotationShift = IsAnnotationExtension]). mapByte < (IsAnnotationExtension << AnnotationShift) ifTrue: [mcpc := mcpc + ((mapByte - DisplacementX2N << AnnotationShift) * backEnd codeGranularity)]]. map := map - 1]. ^0! Item was changed: ----- Method: Cogit>>preenMethodLabel (in category 'compile abstract instructions') ----- preenMethodLabel "The methodLabel serves as the reference to the start of the current code object being produced (CMMethod, CMClosedPIC etc), but it also carries type flags for the frame method field, set via the labelOffset. So we must clean the flags on each compilation to avoid stale lags being left behind from previous compilations." + <inline: true> methodLabel setLabelOffset: 0! Item was added: + ----- Method: NewObjectMemory>>printContextReferencesTo: (in category 'debug printing') ----- + printContextReferencesTo: anOop + "Scan the heap printing the oops of any and all contexts that refer to anOop" + | oop i | + <api> + oop := self firstAccessibleObject. + [oop = nil] whileFalse: + [(self isContextNonImm: oop) ifTrue: + [i := CtxtTempFrameStart + (coInterpreter fetchStackPointerOf: oop)]. + [(i := i - 1) >= 0] whileTrue: + [anOop = (self fetchPointer: i ofObject: oop) ifTrue: + [coInterpreter printHex: oop; print: ' @ '; printNum: i; space; printOopShort: oop; cr. + i := 0]]. + oop := self accessibleObjectAfter: oop]! Item was changed: ----- Method: NewObjectMemory>>printReferencesTo: (in category 'debug printing') ----- printReferencesTo: anOop "Scan the heap printing the oops of any and all objects that refer to anOop" | oop i | <api> oop := self firstAccessibleObject. [oop = nil] whileFalse: [((self isPointersNonImm: oop) or: [self isCompiledMethod: oop]) ifTrue: [(self isCompiledMethod: oop) ifTrue: [i := (self literalCountOf: oop) + LiteralStart] ifFalse: [(self isContextNonImm: oop) ifTrue: [i := CtxtTempFrameStart + (coInterpreter fetchStackPointerOf: oop)] ifFalse: [i := self lengthOf: oop]]. [(i := i - 1) >= 0] whileTrue: [anOop = (self fetchPointer: i ofObject: oop) ifTrue: + [coInterpreter printHex: oop; print: ' @ '; printNum: i; space; printOopShort: oop; cr. - [self interpreter printHex: oop; print: ' @ '; printNum: i; space; printOopShort: oop; cr. i := 0]]]. oop := self accessibleObjectAfter: oop]! Item was added: + ----- Method: ObjectMemory>>printContextReferencesTo: (in category 'debug printing') ----- + printContextReferencesTo: anOop + "Scan the heap printing the oops of any and all contexts that refer to anOop" + | oop i | + <api> + oop := self firstAccessibleObject. + [oop = nil] whileFalse: + [(self isContextNonImm: oop) ifTrue: + [i := CtxtTempFrameStart + (self fetchStackPointerOf: oop)]. + [(i := i - 1) >= 0] whileTrue: + [anOop = (self fetchPointer: i ofObject: oop) ifTrue: + [self interpreter printHex: oop; print: ' @ '; printNum: i; space; printOopShort: oop; cr. + i := 0]]. + oop := self accessibleObjectAfter: oop]! Item was added: + ----- Method: SpurMemoryManager>>printContextReferencesTo: (in category 'debug printing') ----- + printContextReferencesTo: anOop + "Scan the heap printing the oops of any and all contexts that refer to anOop" + <api> + self allObjectsDo: + [:obj| | i | + (self isContextNonImm: obj) ifTrue: + [i := CtxtTempFrameStart + (coInterpreter fetchStackPointerOf: obj). + [(i := i - 1) >= 0] whileTrue: + [anOop = (self fetchPointer: i ofObject: obj) ifTrue: + [coInterpreter printHex: obj; print: ' @ '; printNum: i; space; printOopShort: obj; cr. + i := 0]]]]!

1 0

VM Maker: VMMaker.oscog-nice.1844.mcz
by commits＠source.squeak.org 25 Apr '16

25 Apr '16

Nicolas Cellier uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-nice.1844.mcz ==================== Summary ==================== Name: VMMaker.oscog-nice.1844 Author: nice Time: 25 April 2016, 11:13:38.071 pm UUID: a0e829f0-7d01-424f-a6d3-520759f4a30d Ancestors: VMMaker.oscog-nice.1843 Change overflow tests in precondition rather than postcondition for small integer multiplication. Because integer overflow is undefined behaviour, and because we can't rely on undefined behaviour, the compiler has a license to eliminate the post-condition as dead code (at least since iso c89 acception). Post-condition currently works because we use -fwrapv compiler flag, but relying on specific compiler flags is bad practice in the long term. The pre-condition test is not much more expensive and we can avoid a isIntegerObject: test in post-condition, so there's no reason to not follow the C99 standard. Anyway, Cog will detect and accelerate these multiplication with just (integer multiply, jump on overflow) instructions, so we're speaking of the fallback code here (like in case of byte code simulation). Note that I used a 64 bits (sqLong) result and signedInteger64For: in my own branch to completely eliminate overflow in 32bits and go beyond SmallInteger limits. I did not reproduce it here because it's a departure from SmallInteger primitive that states: "Primitive. Multiply the receiver by the argument and answer with the result if it is a SmallInteger. Fail if the argument or the result is not a SmallInteger. Essential. No Lookup. See Object documentation whatIsAPrimitive." Maybe we could implement this large integer trick in bytecodePrimMultiply (since it already has special case for Float argument, why not for large integer result...)... =============== Diff against VMMaker.oscog-nice.1843 =============== Item was changed: ----- Method: InterpreterPrimitives>>primitiveMultiply (in category 'arithmetic integer primitives') ----- primitiveMultiply + | integerRcvr integerArg integerResult overflow | - | integerRcvr integerArg integerResult | integerRcvr := self stackIntegerValue: 1. integerArg := self stackIntegerValue: 0. self successful ifTrue: + [overflow := integerRcvr > 0 + ifTrue: [integerArg > 0 + ifTrue: [integerRcvr > (objectMemory maxSmallInteger / integerArg)] + ifFalse: [integerArg < (objectMemory minSmallInteger / integerRcvr)]] + ifFalse: [integerArg > 0 + ifTrue: [integerRcvr < (objectMemory minSmallInteger / integerArg)] + ifFalse: [(integerRcvr < 0) and: [integerArg < (objectMemory maxSmallInteger / integerRcvr)]]]. + overflow + ifTrue: [self primitiveFail] + ifFalse: + [integerResult := integerRcvr * integerArg. + self pop: 2 thenPush: (self integerObjectOf: integerResult)]]! - [integerResult := integerRcvr * integerArg. - "check for C overflow by seeing if computation is reversible" - ((integerArg = 0) or: [(integerResult // integerArg) = integerRcvr]) - ifTrue: [self pop2AndPushIntegerIfOK: integerResult] - ifFalse: [self primitiveFail]]! Item was changed: ----- Method: StackInterpreter>>bytecodePrimMultiply (in category 'common selector sends') ----- bytecodePrimMultiply + | rcvr arg result overflow oop | - | rcvr arg result | rcvr := self internalStackValue: 1. arg := self internalStackValue: 0. (objectMemory areIntegers: rcvr and: arg) ifTrue: [rcvr := objectMemory integerValueOf: rcvr. arg := objectMemory integerValueOf: arg. + overflow := rcvr > 0 + ifTrue: [arg > 0 + ifTrue: [rcvr > (objectMemory maxSmallInteger / arg)] + ifFalse: [arg < (objectMemory minSmallInteger / rcvr)]] + ifFalse: [arg > 0 + ifTrue: [rcvr < (objectMemory minSmallInteger / arg)] + ifFalse: [(rcvr < 0) and: [arg < (objectMemory maxSmallInteger / rcvr)]]]. + overflow + ifFalse: + [result := rcvr * arg. + oop := self integerObjectOf: result. + self internalPop: 2 thenPush: oop. + ^self fetchNextBytecode "success"]] - result := rcvr * arg. - (arg = 0 - or: [(result // arg) = rcvr and: [objectMemory isIntegerValue: result]]) ifTrue: - [self internalPop: 2 thenPush: (objectMemory integerObjectOf: result). - ^self fetchNextBytecode "success"]] ifFalse: [self initPrimCall. self externalizeIPandSP. self primitiveFloatMultiply: rcvr byArg: arg. self internalizeIPandSP. self successful ifTrue: [^ self fetchNextBytecode "success"]]. messageSelector := self specialSelector: 8. argumentCount := 1. self normalSend!

1 0

Re: [Vm-dev] VM Maker: VMMaker.oscog-nice.1843.mcz
by Nicolas Cellier 25 Apr '16

25 Apr '16

And thanks to Esteban for pointing me to the bug. 2016-04-25 21:22 GMT+02:00 <commits(a)source.squeak.org>: > > Nicolas Cellier uploaded a new version of VMMaker to project VM Maker: > http://source.squeak.org/VMMaker/VMMaker.oscog-nice.1843.mcz > > ==================== Summary ==================== > > Name: VMMaker.oscog-nice.1843 > Author: nice > Time: 25 April 2016, 8:24:03.731 pm > UUID: 9ef5d374-ae5e-437a-9116-cde9d708c0d7 > Ancestors: VMMaker.oscog-cb.1842 > > Fix my recent bug for signed 32bit long access (introduced beginning of > April). > > One symptom is: > (Alien newGC: 4) > signedLongAt: 1 put: -16r7287E552; > signedLongAt: 1 > > I incorrecly used the signed value (integerValue) in one branch, and the > magnitude (value) in the other branch... > This is an incorrect copy/paste from maybeInlinePositive32BitIntegerFor: > in my ultimate #if SPURVM refactoring. > > While at it, avoid the confusion by using a better variable name > (magnitude), and eliminate UB related to computing opposite of INT_MIN by > explicitely using unsigned type. > > =============== Diff against VMMaker.oscog-cb.1842 =============== > > Item was changed: > ----- Method: StackInterpreter>>noInlineSigned32BitIntegerFor: (in > category 'primitive support') ----- > noInlineSigned32BitIntegerFor: integerValue > "Answer a full 32 bit integer object for the given integer value." > <notOption: #Spur64BitMemoryManager> > + | newLargeInteger magnitude largeClass | > - | newLargeInteger value largeClass | > <inline: false> > + <var: 'magnitude' type: 'unsigned int'> > (objectMemory isIntegerValue: integerValue) ifTrue: > [^objectMemory integerObjectOf: integerValue]. > self deny: objectMemory hasSixtyFourBitImmediates. > integerValue < 0 > ifTrue: [largeClass := > ClassLargeNegativeIntegerCompactIndex. > + magnitude := 0 asUnsignedInteger - > integerValue] > - value := 0 - integerValue] > ifFalse: [largeClass := > ClassLargePositiveIntegerCompactIndex. > + magnitude := integerValue]. > - value := integerValue]. > newLargeInteger := objectMemory > > eeInstantiateSmallClassIndex: largeClass > format: > (objectMemory byteFormatForNumBytes: 4) > numSlots: 1. > self cppIf: SPURVM > ifTrue: > ["Memory is 8 byte aligned in Spur, make sure that > oversized bytes are set to zero" > + objectMemory storeLong32: 0 ofObject: > newLargeInteger withValue: (objectMemory byteSwapped32IfBigEndian: > magnitude). > - objectMemory storeLong32: 0 ofObject: > newLargeInteger withValue: (objectMemory byteSwapped32IfBigEndian: > integerValue). > objectMemory storeLong32: 1 ofObject: > newLargeInteger withValue: 0] > ifFalse: > + [objectMemory storeLong32: 0 ofObject: > newLargeInteger withValue: (objectMemory byteSwapped32IfBigEndian: > magnitude)]. > - [objectMemory storeLong32: 0 ofObject: > newLargeInteger withValue: (objectMemory byteSwapped32IfBigEndian: value)]. > ^newLargeInteger! > >

2 1

VM Maker: VMMaker.oscog-nice.1843.mcz
by commits＠source.squeak.org 25 Apr '16

25 Apr '16

Nicolas Cellier uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-nice.1843.mcz ==================== Summary ==================== Name: VMMaker.oscog-nice.1843 Author: nice Time: 25 April 2016, 8:24:03.731 pm UUID: 9ef5d374-ae5e-437a-9116-cde9d708c0d7 Ancestors: VMMaker.oscog-cb.1842 Fix my recent bug for signed 32bit long access (introduced beginning of April). One symptom is: (Alien newGC: 4) signedLongAt: 1 put: -16r7287E552; signedLongAt: 1 I incorrecly used the signed value (integerValue) in one branch, and the magnitude (value) in the other branch... This is an incorrect copy/paste from maybeInlinePositive32BitIntegerFor: in my ultimate #if SPURVM refactoring. While at it, avoid the confusion by using a better variable name (magnitude), and eliminate UB related to computing opposite of INT_MIN by explicitely using unsigned type. =============== Diff against VMMaker.oscog-cb.1842 =============== Item was changed: ----- Method: StackInterpreter>>noInlineSigned32BitIntegerFor: (in category 'primitive support') ----- noInlineSigned32BitIntegerFor: integerValue "Answer a full 32 bit integer object for the given integer value." <notOption: #Spur64BitMemoryManager> + | newLargeInteger magnitude largeClass | - | newLargeInteger value largeClass | <inline: false> + <var: 'magnitude' type: 'unsigned int'> (objectMemory isIntegerValue: integerValue) ifTrue: [^objectMemory integerObjectOf: integerValue]. self deny: objectMemory hasSixtyFourBitImmediates. integerValue < 0 ifTrue: [largeClass := ClassLargeNegativeIntegerCompactIndex. + magnitude := 0 asUnsignedInteger - integerValue] - value := 0 - integerValue] ifFalse: [largeClass := ClassLargePositiveIntegerCompactIndex. + magnitude := integerValue]. - value := integerValue]. newLargeInteger := objectMemory eeInstantiateSmallClassIndex: largeClass format: (objectMemory byteFormatForNumBytes: 4) numSlots: 1. self cppIf: SPURVM ifTrue: ["Memory is 8 byte aligned in Spur, make sure that oversized bytes are set to zero" + objectMemory storeLong32: 0 ofObject: newLargeInteger withValue: (objectMemory byteSwapped32IfBigEndian: magnitude). - objectMemory storeLong32: 0 ofObject: newLargeInteger withValue: (objectMemory byteSwapped32IfBigEndian: integerValue). objectMemory storeLong32: 1 ofObject: newLargeInteger withValue: 0] ifFalse: + [objectMemory storeLong32: 0 ofObject: newLargeInteger withValue: (objectMemory byteSwapped32IfBigEndian: magnitude)]. - [objectMemory storeLong32: 0 ofObject: newLargeInteger withValue: (objectMemory byteSwapped32IfBigEndian: value)]. ^newLargeInteger!

1 0

VM Maker: VMMaker.oscog-cb.1842.mcz
by commits＠source.squeak.org 25 Apr '16

25 Apr '16

ClementBera uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-cb.1842.mcz ==================== Summary ==================== Name: VMMaker.oscog-cb.1842 Author: cb Time: 25 April 2016, 5:43:54.079924 pm UUID: 2ce5e12d-6660-475e-ae31-cf98d07390dd Ancestors: VMMaker.oscog-nice.1841 Added a primitive to answer all the methods present in the machine code zone. allMachineCodeMethods <primitive: 'primitiveAllMethodsCompiledToMachineCode' module:''> ^#() This way inferencing types from runtime information in the image is easier as one can ask the VM which method have type information, then ask for the type information of the method which have some. =============== Diff against VMMaker.oscog-nice.1841 =============== Item was added: + ----- Method: CoInterpreterPrimitives>>primitiveAllMethodsCompiledToMachineCode (in category 'method introspection primitives') ----- + primitiveAllMethodsCompiledToMachineCode + <export: true> + <option: #SistaCogit> + | arrayObj | + argumentCount ~= 0 ifTrue: + [^self primitiveFailFor: PrimErrBadNumArgs]. + arrayObj := objectMemory instantiateClass: (objectMemory splObj: ClassArray) indexableSize: cogit numMethods. + arrayObj ifNil: [^-1]. + cogit methodsCompiledToMachineCodeInto: arrayObj. + self pop: 1 thenPush: arrayObj! Item was added: + ----- Method: CogMethodZone>>methodsCompiledToMachineCodeInto: (in category 'method zone introspection') ----- + methodsCompiledToMachineCodeInto: arrayObj + <api> + <returnTypeC: #void> + <var: #cogMethod type: #'CogMethod *'> + | cogMethod methodIndex | + methodIndex := 0. + cogMethod := cogit cCoerceSimple: baseAddress to: #'CogMethod *'. + [cogMethod < self limitZony] whileTrue: + [cogMethod cmType = CMMethod ifTrue: + [objectMemory storePointerUnchecked: methodIndex ofObject: arrayObj withValue: cogMethod methodObject. + methodIndex := methodIndex + 1]. + cogMethod := self methodAfter: cogMethod]. + ! Item was changed: ----- Method: CogMethodZone>>numMethods (in category 'accessing') ----- numMethods + <api> ^methodCount!

1 0

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

Vm-dev April 2016