Vm-dev December 2013

vm-dev@lists.squeakfoundation.org

27 participants
102 discussions

VM Maker: VMMaker.oscog-eem.544.mcz
by commits＠source.squeak.org 06 Dec '13

06 Dec '13

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.544.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.544 Author: eem Time: 6 December 2013, 2:30:22.885 pm UUID: 05bcbc40-679b-4d4e-ab31-a68b833a2b81 Ancestors: VMMaker.oscog-eem.543 Mo' mo' mo' betta. =============== Diff against VMMaker.oscog-eem.543 =============== Item was added: + ----- Method: VMMaker class>>generateEitherSqueakCogVM (in category 'configurations') ----- + generateEitherSqueakCogVM + ^self generateSqueakCogVMWithInterpreterClass: (self chooseCoInterpreterClassIfAbsent: [^self])! Item was added: + ----- Method: VMMaker class>>generateSqueakCogMTVM (in category 'configurations') ----- + generateSqueakCogMTVM + ^self generateSqueakCogVMWithInterpreterClass: CoInterpreterMT! Item was changed: ----- Method: VMMaker class>>generateSqueakCogVM (in category 'configurations') ----- generateSqueakCogVM + ^self generateSqueakCogVMWithInterpreterClass: CoInterpreter! - ^self generateSqueakCogVMWithInterpreterClass: (self chooseCoInterpreterClassIfAbsent: [^self])!

1 0

VM Maker: VMMaker.oscog-eem.543.mcz
by commits＠source.squeak.org 06 Dec '13

06 Dec '13

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.543.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.543 Author: eem Time: 6 December 2013, 2:20:33.659 pm UUID: 460f2b89-5b70-49d3-8fc6-cbaaf02eb6a3 Ancestors: VMMaker.oscog-eem.542 Mo' mo' betta... =============== Diff against VMMaker.oscog-eem.542 =============== Item was added: + ----- Method: VMMaker>>configurationGeneratorNameOrNil (in category 'generate sources') ----- + configurationGeneratorNameOrNil + "Search the sender chain for the first method in VMMaker class protocol configurations, and answer it if found, + otherwise answer nil. This allows us to name the configuration being generated." + ^thisContext findContextSuchThat: + [:ctxt| + ctxt receiver == VMMaker + and: [ctxt method methodReference category = #configurations]]! Item was changed: ----- Method: VMMaker>>configurationNameIfAny (in category 'generate sources') ----- configurationNameIfAny + ^self configurationGeneratorNameOrNil - ^(thisContext findContextSuchThat: [:ctxt| ctxt receiver == VMMaker and: [ctxt method methodReference category = #configurations]]) ifNotNil: [:ctxt| (self class configuirationNameFromSelector: ctxt selector), ' '] ifNil: [' ']! Item was changed: ----- Method: VMMaker>>generateEntire (in category 'generate sources') ----- generateEntire "Generate the interp, internal plugins and exports as well as the external plugins. If this comes from a generator, log it for convenience." + self configurationGeneratorNameOrNil ifNotNil: + [:generator| + logger cr; nextPutAll: (generator selector copyReplaceAll: 'generate' with: ''). + interpreterClassName ifNotNil: [logger space; nextPutAll: interpreterClassName]. + logger cr; flush]. - (thisContext findContextSuchThat: [:ctxt| ctxt selector == #generateConfiguration]) ifNotNil: - [:root| - (thisContext findContextSuchThat: [:ctxt| ctxt sender == root]) ifNotNil: - [:generator| - logger cr; nextPutAll: (generator selector copyReplaceAll: 'generate' with: ''). - interpreterClassName ifNotNil: [logger space; nextPutAll: interpreterClassName]. - logger cr; flush]]. self generateMainVM. self generateExternalPlugins!

1 0

VM Maker: VMMaker.oscog-eem.542.mcz
by commits＠source.squeak.org 06 Dec '13

06 Dec '13

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.542.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.542 Author: eem Time: 6 December 2013, 2:13:39.319 pm UUID: e3b3cd61-d781-4934-bc89-dcf72256eb95 Ancestors: VMMaker.oscog-eem.541 Mo' betta automation for generating VMs. =============== Diff against VMMaker.oscog-eem.541 =============== Item was added: + ----- Method: VMMaker class>>configuirationNameFromSelector: (in category 'confs-support') ----- + configuirationNameFromSelector: aSelector + ^(aSelector piecesCutWhere: [:a :b| a isLowercase and: [b isUppercase]]) allButFirst fold: [:a :b| a, ' ', b]! Item was changed: ----- Method: VMMaker class>>generateConfiguration (in category 'configurations') ----- generateConfiguration "VMMaker generateConfiguration" | configCategoryName selectors | configCategoryName := self class whichCategoryIncludesSelector: thisContext selector. selectors := Set new. self class organization categories do: [:cat| (cat endsWith: configCategoryName) ifTrue: [selectors addAll: (self class organization listAtCategoryNamed: cat)]]. selectors remove: thisContext selector. selectors := selectors asArray sort. (UIManager default + chooseFrom: (selectors collect: [:sel| self configuirationNameFromSelector: sel]) - chooseFrom: (selectors collect: - [:sel| (sel piecesCutWhere: [:a :b| a isLowercase and: [b isUppercase]]) allButFirst - fold: [:a :b| a, ' ', b]]) values: selectors) ifNotNil: [:choice| self perform: choice]! Item was added: + ----- Method: VMMaker>>configurationNameIfAny (in category 'generate sources') ----- + configurationNameIfAny + ^(thisContext findContextSuchThat: [:ctxt| ctxt receiver == VMMaker and: [ctxt method methodReference category = #configurations]]) + ifNotNil: [:ctxt| (self class configuirationNameFromSelector: ctxt selector), ' '] + ifNil: [' ']! Item was changed: ----- Method: VMMaker>>needsToRegenerateCogitFile (in category 'generate sources') ----- needsToRegenerateCogitFile "Check the timestamp for the relevant classes and then the timestamp for the main source file (e.g. interp.c) file if it already exists. Answer if the file needs regenerating." | cogitClass cogitClasses tStamp | cogitClasses := (cogitClass := self cogitClass) withAllSuperclasses copyUpThrough: Cogit. cogitClasses addAllLast: (cogitClass ancilliaryClasses: self options). tStamp := cogitClasses inject: 0 into: [:tS :cl| tS max: cl timeStamp]. "don't translate if the file is newer than my timeStamp" (self coreVMDirectory entryAt: cogitClass sourceFileName ifAbsent: [nil]) ifNotNil: [:fstat| tStamp < fstat modificationTime ifTrue: + [^self confirm: 'The ', self configurationNameIfAny, cogitClass printString, ' classes have not been modified since\ the source file was last generated.\Do you still want to regenerate it?' withCRs]]. - [^self confirm: 'The ', cogitClass printString, ' classes have not been modified since\ the source file was last generated.\Do you still want to regenerate it?' withCRs]]. ^true ! Item was changed: ----- Method: VMMaker>>needsToRegenerateInterpreterFile (in category 'initialize') ----- needsToRegenerateInterpreterFile "Check the timestamp for the relevant classes and then the timestamp for the main source file (e.g. interp.c) if it already exists. Answer if the file needs regenerating." | classes tStamp | classes := self interpreterClass withAllSuperclasses copyUpTo: VMClass. self interpreterClass objectMemoryClass ifNotNil: [:objectMemoryClass| classes addAllLast: (objectMemoryClass withAllSuperclasses copyUpTo: VMClass)]. classes copy do: [:class| classes addAllLast: (class ancilliaryClasses: self options)]. tStamp := classes inject: 0 into: [:tS :cl| tS max: cl timeStamp]. "don't translate if the file is newer than my timeStamp" (self coreVMDirectory entryAt: self interpreterFilename ifAbsent: [nil]) ifNotNil: [:fstat| tStamp < fstat modificationTime ifTrue: + [^self confirm: 'The ', self configurationNameIfAny, 'interpreter classes have not been modified since\ the interpreter file was last generated.\Do you still want to regenerate their source file?' withCRs]]. - [^self confirm: 'The interpreter classes have not been modified since\ the interpreter file was last generated.\Do you still want to regenerate their source file?' withCRs]]. ^true !

1 0

VM Maker: VMMaker.oscog-eem.541.mcz
by commits＠source.squeak.org 06 Dec '13

06 Dec '13

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.541.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.541 Author: eem Time: 6 December 2013, 2:01:29.152 pm UUID: 36c98389-c272-4d87-8a91-f7351a903087 Ancestors: VMMaker.oscog-eem.540 More automation for generating VMs. =============== Diff against VMMaker.oscog-eem.540 =============== Item was added: + ----- Method: VMMaker class>>chooseCoInterpreterClassIfAbsent: (in category 'confs-support') ----- + chooseCoInterpreterClassIfAbsent: ifAbsentBlock + ^Smalltalk classNamed: + ([:choices| + choices + at: (UIManager default chooseFrom: choices) + ifAbsent: ifAbsentBlock] + value: #(CoInterpreter CoInterpreterMT))! Item was added: + ----- Method: VMMaker class>>generateAllConfigurationsUnderVersionControl (in category 'configurations') ----- + generateAllConfigurationsUnderVersionControl + self generateNewspeakCogVM; + generateSqueakCogVMWithInterpreterClass: CoInterpreter; + generateSqueakCogVMWithInterpreterClass: CoInterpreterMT; + generateSqueakStackVM; + generateSqueakSpurCogVM; + generateSqueakSpurStackVM! Item was changed: ----- Method: VMMaker class>>generateSqueakCogVM (in category 'configurations') ----- generateSqueakCogVM + ^self generateSqueakCogVMWithInterpreterClass: (self chooseCoInterpreterClassIfAbsent: [^self])! - ^VMMaker - generate: (Smalltalk at: ([:choices| choices at: (UIManager default chooseFrom: choices) ifAbsent: [^self]] - value: #(CoInterpreter CoInterpreterMT))) - and: StackToRegisterMappingCogit - with: #( MULTIPLEBYTECODESETS false - NewspeakVM false) - to: (FileDirectory default pathFromURI: 'oscogvm/src') - platformDir: (FileDirectory default pathFromURI: 'oscogvm/platforms') - including:#( ADPCMCodecPlugin AsynchFilePlugin BalloonEnginePlugin B3DAcceleratorPlugin - BMPReadWriterPlugin BitBltSimulation BochsIA32Plugin CroquetPlugin DSAPlugin - DeflatePlugin DropPlugin FT2Plugin FFTPlugin FileCopyPlugin FilePlugin FloatArrayPlugin - FloatMathPlugin GeniePlugin HostWindowPlugin IA32ABIPlugin InternetConfigPlugin - JPEGReadWriter2Plugin JPEGReaderPlugin JoystickTabletPlugin KlattSynthesizerPlugin - LargeIntegersPlugin LocalePlugin MIDIPlugin MacMenubarPlugin Matrix2x3Plugin - MiscPrimitivePlugin Mpeg3Plugin QuicktimePlugin RePlugin SecurityPlugin SerialPlugin - SocketPlugin SoundCodecPlugin SoundGenerationPlugin SoundPlugin SqueakSSLPlugin StarSqueakPlugin - ThreadedIA32FFIPlugin UnixAioPlugin UUIDPlugin UnixOSProcessPlugin - Win32OSProcessPlugin VMProfileLinuxSupportPlugin VMProfileMacSupportPlugin)! Item was added: + ----- Method: VMMaker class>>generateSqueakCogVMWithInterpreterClass: (in category 'confs-support') ----- + generateSqueakCogVMWithInterpreterClass: interpreterClass + ^VMMaker + generate: interpreterClass + and: StackToRegisterMappingCogit + with: #( MULTIPLEBYTECODESETS false + NewspeakVM false) + to: (FileDirectory default pathFromURI: 'oscogvm/src') + platformDir: (FileDirectory default pathFromURI: 'oscogvm/platforms') + including:#( ADPCMCodecPlugin AsynchFilePlugin BalloonEnginePlugin B3DAcceleratorPlugin + BMPReadWriterPlugin BitBltSimulation BochsIA32Plugin CroquetPlugin DSAPlugin + DeflatePlugin DropPlugin FT2Plugin FFTPlugin FileCopyPlugin FilePlugin FloatArrayPlugin + FloatMathPlugin GeniePlugin HostWindowPlugin IA32ABIPlugin InternetConfigPlugin + JPEGReadWriter2Plugin JPEGReaderPlugin JoystickTabletPlugin KlattSynthesizerPlugin + LargeIntegersPlugin LocalePlugin MIDIPlugin MacMenubarPlugin Matrix2x3Plugin + MiscPrimitivePlugin Mpeg3Plugin QuicktimePlugin RePlugin SecurityPlugin SerialPlugin + SocketPlugin SoundCodecPlugin SoundGenerationPlugin SoundPlugin SqueakSSLPlugin StarSqueakPlugin + ThreadedIA32FFIPlugin UnixAioPlugin UUIDPlugin UnixOSProcessPlugin + Win32OSProcessPlugin VMProfileLinuxSupportPlugin VMProfileMacSupportPlugin)! Item was changed: ----- Method: VMMaker class>>generateSqueakSpurCogVM (in category 'configurations') ----- generateSqueakSpurCogVM ^VMMaker + generate: CoInterpreter - generate: (Smalltalk at: ([:choices| choices at: (UIManager default chooseFrom: choices) ifAbsent: [^self]] - value: #(CoInterpreter CoInterpreterMT))) and: StackToRegisterMappingCogit with: #( ObjectMemory Spur32BitCoMemoryManager MULTIPLEBYTECODESETS false NewspeakVM false) to: (FileDirectory default pathFromURI: 'oscogvm/spursrc') platformDir: (FileDirectory default pathFromURI: 'oscogvm/platforms') including:#()!

1 0

VM Maker: VMMaker.oscog-eem.540.mcz
by commits＠source.squeak.org 06 Dec '13

06 Dec '13

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.540.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.540 Author: eem Time: 6 December 2013, 1:48:51.024 pm UUID: dad5722f-20ac-4d1a-af92-4bad5cf49199 Ancestors: VMMaker.oscog-eem.539 Fix setting of endOfMemory on load in SqueakV3 VMs. =============== Diff against VMMaker.oscog-eem.539 =============== Item was changed: ----- Method: CoInterpreter>>readImageFromFile:HeapSize:StartingAt: (in category 'image save/restore') ----- readImageFromFile: f HeapSize: desiredHeapSize StartingAt: imageOffset "Read an image from the given file stream, allocating the given amount of memory to its object heap. Fail if the image has an unknown format or requires more than the given amount of memory." "Details: This method detects when the image was stored on a machine with the opposite byte ordering from this machine and swaps the bytes automatically. Furthermore, it allows the header information to start 512 bytes into the file, since some file transfer programs for the Macintosh apparently prepend a Mac-specific header of this size. Note that this same 512 bytes of prefix area could also be used to store an exec command on Unix systems, allowing one to launch Smalltalk by invoking the image name as a command." "This code is based on C code by Ian Piumarta and Smalltalk code by Tim Rowledge. Many thanks to both of you!!!!" | swapBytes headerStart headerSize dataSize oldBaseAddr minimumMemory heapSize bytesRead bytesToShift firstSegSize hdrNumStackPages hdrEdenBytes hdrCogCodeSize headerFlags hdrMaxExtSemTabSize | <var: #f type: #sqImageFile> <var: #dataSize type: #'size_t'> <var: #desiredHeapSize type: #usqInt> <var: #headerStart type: #squeakFileOffsetType> <var: #imageOffset type: #squeakFileOffsetType> metaclassNumSlots := 6. "guess Metaclass instSize" classNameIndex := 6. "guess (Class instVarIndexFor: 'name' ifAbsent: []) - 1" swapBytes := self checkImageVersionFrom: f startingAt: imageOffset. headerStart := (self sqImageFilePosition: f) - BytesPerWord. "record header start position" headerSize := self getLongFromFile: f swap: swapBytes. dataSize := self getLongFromFile: f swap: swapBytes. oldBaseAddr := self getLongFromFile: f swap: swapBytes. objectMemory specialObjectsOop: (self getLongFromFile: f swap: swapBytes). objectMemory lastHash: (self getLongFromFile: f swap: swapBytes). "N.B. not used." savedWindowSize := self getLongFromFile: f swap: swapBytes. headerFlags := self getLongFromFile: f swap: swapBytes. self setImageHeaderFlagsFrom: headerFlags. extraVMMemory := self getLongFromFile: f swap: swapBytes. "N.B. not used." hdrNumStackPages := self getShortFromFile: f swap: swapBytes. "4 stack pages is small. Should be able to run with as few as three. 4 should be comfortable but slow. 8 is a reasonable default. Can be changed via vmParameterAt: 43 put: n. Can be set as a preference (Info.plist, VM.ini, command line etc). If desiredNumStackPages is already non-zero then it has been set as a preference. Ignore (but preserve) the header's default." numStackPages := desiredNumStackPages ~= 0 ifTrue: [desiredNumStackPages] ifFalse: [hdrNumStackPages = 0 ifTrue: [self defaultNumStackPages] ifFalse: [hdrNumStackPages]]. desiredNumStackPages := hdrNumStackPages. "This slot holds the size of the native method zone in 1k units. (pad to word boundary)." hdrCogCodeSize := (self getShortFromFile: f swap: swapBytes) * 1024. cogCodeSize := desiredCogCodeSize ~= 0 ifTrue: [desiredCogCodeSize] ifFalse: [hdrCogCodeSize = 0 ifTrue: [self defaultCogCodeSize] ifFalse: [hdrCogCodeSize]]. hdrEdenBytes := self getLongFromFile: f swap: swapBytes. objectMemory edenBytes: (desiredEdenBytes ~= 0 ifTrue: [desiredEdenBytes] ifFalse: [hdrEdenBytes = 0 ifTrue: [objectMemory defaultEdenBytes] ifFalse: [hdrEdenBytes]]). desiredEdenBytes := hdrEdenBytes. hdrMaxExtSemTabSize := self getShortFromFile: f swap: swapBytes. hdrMaxExtSemTabSize ~= 0 ifTrue: [self setMaxExtSemSizeTo: hdrMaxExtSemTabSize]. "pad to word boundary. This slot can be used for anything else that will fit in 16 bits. Preserve it to be polite to other VMs." the2ndUnknownShort := self getShortFromFile: f swap: swapBytes. firstSegSize := self getLongFromFile: f swap: swapBytes. objectMemory firstSegmentSize: firstSegSize. "compare memory requirements with availability" minimumMemory := cogCodeSize "no need to include the stackZone; this is alloca'ed" + dataSize + objectMemory newSpaceBytes + self interpreterAllocationReserveBytes. heapSize := cogCodeSize "no need to include the stackZone; this is alloca'ed" + desiredHeapSize "+ edenBytes" "don't include edenBytes; this is part of the heap and so part of desiredHeapSize" + self interpreterAllocationReserveBytes. heapSize < minimumMemory ifTrue: [self insufficientMemorySpecifiedError]. "allocate a contiguous block of memory for the Squeak heap and ancilliary data structures" objectMemory memory: (self allocateMemory: heapSize minimum: minimumMemory imageFile: f headerSize: headerSize) asUnsignedInteger. objectMemory memory ifNil: [self insufficientMemoryAvailableError]. heapBase := objectMemory setHeapBase: objectMemory memory + cogCodeSize + memoryLimit: objectMemory memory + cogCodeSize + heapSize + endOfMemory: objectMemory memory + cogCodeSize + dataSize. - memoryLimit: objectMemory memory + heapSize - endOfMemory: objectMemory memory + dataSize. "position file after the header" self sqImageFile: f Seek: headerStart + headerSize. "read in the image in bulk, then swap the bytes if necessary" bytesRead := objectMemory readHeapFromImageFile: f dataBytes: dataSize. bytesRead ~= dataSize ifTrue: [self unableToReadImageError]. self ensureImageFormatIsUpToDate: swapBytes. "compute difference between old and new memory base addresses" bytesToShift := objectMemory memoryBaseForImageRead - oldBaseAddr. self initializeInterpreter: bytesToShift. "adjusts all oops to new location" self initializeCodeGenerator. ^dataSize!

1 0

VM Maker: VMMaker.oscog-eem.539.mcz
by commits＠source.squeak.org 06 Dec '13

06 Dec '13

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.539.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.539 Author: eem Time: 6 December 2013, 1:31:28.164 pm UUID: b6a1dcf2-b6e4-4e22-9430-c660b115800b Ancestors: VMMaker.oscog-eem.538 Slight streamlining in followForwardingPointersInStackZone:, plus fixing followjng of frameMethodObject vs frameMethod in machine-code frames. =============== Diff against VMMaker.oscog-eem.538 =============== Item was changed: ----- Method: CoInterpreter>>followForwardingPointersInStackZone: (in category 'object memory support') ----- followForwardingPointersInStackZone: theBecomeEffectsFlags "Spur's become: is lazy, turning the becommed object into a forwarding object to the other. The read-barrier is minimised by arranging that forwarding pointers will fail a method cache probe, since notionally objects' internals are accessed only via sending messages to them, the exception is primitives that access the internals of the non-receiver argument(s). To avoid a read barrier on bytecode, literal and inst var fetch we scan the receivers and methods in the stack zone and follow any forwarded ones. This is of course way cheaper than scanning all of memory as in the old become." | theIPPtr | <inline: false> <var: #thePage type: #'StackPage *'> <var: #theSP type: #'char *'> <var: #theFP type: #'char *'> <var: #callerFP type: #'char *'> <var: #theIPPtr type: #usqInt> (theBecomeEffectsFlags anyMask: BecameCompiledMethodFlag) ifTrue: [(objectMemory isForwarded: method) ifTrue: [theIPPtr := instructionPointer - method. method := objectMemory followForwarded: method. instructionPointer := method + theIPPtr]. (objectMemory isForwarded: newMethod) ifTrue: [newMethod := objectMemory followForwarded: newMethod]]. self assert: stackPage ~= 0. 0 to: numStackPages - 1 do: [:i| | thePage theSP theFP callerFP oop offset | thePage := stackPages stackPageAt: i. thePage isFree ifFalse: [theSP := thePage headSP. theFP := thePage headFP. "Skip the instruction pointer on top of stack of inactive pages." thePage = stackPage ifTrue: [theIPPtr := 0] ifFalse: [theIPPtr := theSP asUnsignedInteger. theSP := theSP + BytesPerWord]. [self assert: (thePage addressIsInPage: theFP). self assert: (theIPPtr = 0 or: [thePage addressIsInPage: theIPPtr asVoidPointer]). offset := self frameStackedReceiverOffset: theFP. oop := stackPages longAt: theFP + offset. + (objectMemory isOopForwarded: oop) ifTrue: - ((objectMemory isNonImmediate: oop) - and: [(objectMemory isForwarded: oop)]) ifTrue: [stackPages longAt: theFP + offset put: (objectMemory followForwarded: oop)]. ((self frameHasContext: theFP) and: [(objectMemory isForwarded: (self frameContext: theFP))]) ifTrue: [stackPages longAt: theFP + FoxThisContext put: (objectMemory followForwarded: (self frameContext: theFP))]. (self isMachineCodeFrame: theFP) ifTrue: + [oop := stackPages longAt: theFP + FoxMFReceiver. + (objectMemory isOopForwarded: oop) ifTrue: - [oop := stackPages longAt: theFP + FoxIFReceiver. - ((objectMemory isNonImmediate: oop) - and: [(objectMemory isForwarded: oop)]) ifTrue: [stackPages + longAt: theFP + FoxMFReceiver - longAt: theFP + FoxIFReceiver put: (objectMemory followForwarded: oop)]. + oop := (self mframeHomeMethod: theFP) methodObject. + self assert: (objectMemory isForwarded: oop) not] - self assert: (objectMemory isForwarded: (self frameMethodObject: theFP)) not] ifFalse: [oop := stackPages longAt: theFP + FoxIFReceiver. + (objectMemory isOopForwarded: oop) ifTrue: - ((objectMemory isNonImmediate: oop) - and: [(objectMemory isForwarded: oop)]) ifTrue: [stackPages longAt: theFP + FoxIFReceiver put: (objectMemory followForwarded: oop)]. + oop := self iframeMethod: theFP. - oop := self frameMethod: theFP. (objectMemory isForwarded: oop) ifTrue: + [| newOop delta | + newOop := objectMemory followForwarded: oop. + delta := newOop - oop. - [| delta | - delta := (objectMemory followForwarded: oop) - oop. (theIPPtr ~= 0 + and: [(stackPages longAt: theIPPtr) > oop]) ifTrue: - and: [(stackPages longAt: theIPPtr) > (self frameMethod: theFP)]) ifTrue: [stackPages longAt: theIPPtr put: (stackPages longAt: theIPPtr) + delta]. stackPages longAt: theFP + FoxIFSavedIP put: (stackPages longAt: theFP + FoxIFSavedIP) + delta. stackPages longAt: theFP + FoxMethod + put: (oop := newOop)]]. + self followNecessaryForwardingInMethod: oop. - put: (objectMemory followForwarded: oop)]]. - self followNecessaryForwardingInMethod: (self frameMethod: theFP). (callerFP := self frameCallerFP: theFP) ~= 0] whileTrue: [theIPPtr := (theFP + FoxCallerSavedIP) asUnsignedInteger. theFP := callerFP]]]! Item was changed: ----- Method: StackInterpreter>>followForwardingPointersInStackZone: (in category 'object memory support') ----- followForwardingPointersInStackZone: theBecomeEffectsFlags "Spur's become: is lazy, turning the becommed object into a forwarding object to the other. The read-barrier is minimised by arranging that forwarding pointers will fail a method cache probe, since notionally objects' internals are accessed only via sending messages to them, the exception is primitives that access the internals of the non-receiver argument(s). To avoid a read barrier on bytecode, literal and inst var fetch we scan the receivers and methods in the stack zone and follow any forwarded ones. This is of course way cheaper than scanning all of memory as in the old become." | theIPPtr | <inline: false> <var: #thePage type: #'StackPage *'> <var: #theSP type: #'char *'> <var: #theFP type: #'char *'> <var: #callerFP type: #'char *'> <var: #theIPPtr type: #usqInt> (theBecomeEffectsFlags anyMask: BecameCompiledMethodFlag) ifTrue: [(objectMemory isForwarded: method) ifTrue: [theIPPtr := instructionPointer - method. method := objectMemory followForwarded: method. instructionPointer := method + theIPPtr]. (objectMemory isForwarded: newMethod) ifTrue: [newMethod := objectMemory followForwarded: newMethod]]. self assert: stackPage ~= 0. 0 to: numStackPages - 1 do: [:i| | thePage theSP theFP callerFP theIP oop | thePage := stackPages stackPageAt: i. thePage isFree ifFalse: [theSP := thePage headSP. theFP := thePage headFP. "Skip the instruction pointer on top of stack of inactive pages." thePage = stackPage ifTrue: [theIPPtr := 0] ifFalse: [theIPPtr := theSP asUnsignedInteger. theSP := theSP + BytesPerWord]. [self assert: (thePage addressIsInPage: theFP). self assert: (theIPPtr = 0 or: [thePage addressIsInPage: theIPPtr asVoidPointer]). oop := stackPages longAt: theFP + FoxReceiver. + (objectMemory isOopForwarded: oop) ifTrue: - ((objectMemory isNonImmediate: oop) - and: [(objectMemory isForwarded: oop)]) ifTrue: [stackPages longAt: theFP + FoxReceiver put: (objectMemory followForwarded: oop)]. theIP := (theFP + (self frameStackedReceiverOffset: theFP)) asUnsignedInteger. "reuse theIP; its just an offset here" oop := stackPages longAt: theIP. + (objectMemory isOopForwarded: oop) ifTrue: - ((objectMemory isNonImmediate: oop) - and: [(objectMemory isForwarded: oop)]) ifTrue: [stackPages longAt: theIP put: (objectMemory followForwarded: oop)]. ((self frameHasContext: theFP) and: [(objectMemory isForwarded: (self frameContext: theFP))]) ifTrue: [stackPages longAt: theFP + FoxThisContext put: (objectMemory followForwarded: (self frameContext: theFP))]. oop := self frameMethod: theFP. (objectMemory isForwarded: oop) ifTrue: + [| newOop delta | + newOop := objectMemory followForwarded: oop. - [| delta | theIPPtr ~= 0 ifTrue: [self assert: (stackPages longAt: theIPPtr) > (self frameMethod: theFP). + delta := newOop - oop. - delta := (objectMemory followForwarded: oop) - oop. stackPages longAt: theIPPtr put: (stackPages longAt: theIPPtr) + delta]. stackPages longAt: theFP + FoxMethod + put: (oop := newOop)]. + self followNecessaryForwardingInMethod: oop. - put: (objectMemory followForwarded: oop)]. - self followNecessaryForwardingInMethod: (self frameMethod: theFP). (callerFP := self frameCallerFP: theFP) ~= 0] whileTrue: [theIPPtr := (theFP + FoxCallerSavedIP) asUnsignedInteger. theFP := callerFP]]]!

1 0

VM Maker: VMMaker.oscog-eem.538.mcz
by commits＠source.squeak.org 06 Dec '13

06 Dec '13

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.538.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.538 Author: eem Time: 6 December 2013, 11:25:41.549 am UUID: 6b6d8ba7-4913-4563-9d01-da880441f843 Ancestors: VMMaker.oscog-eem.537 Fix translation of var := TStmtList so that the value of the last statement is assigned, not the first. Fix the concatenation of the assert-failure reason in isValidObjStackPage:myIndex:firstPage: so that it works in C. Remove the assert in updateRootOfObjStackAt:with: so that the intermediate state of a partially followed objStack is not reported as an assert-failure. Add a print routine for pages of an objStack. [ All to fix broken assert code :-) ] Slang: Generate the CoInterpreter *before* the Cogit so that the objectMemory and interpreter classes have initialized *before* the Cogit is generated. Otherwise the Cogit can be generated with values from the wrong interpreter/objectMemory. =============== Diff against VMMaker.oscog-eem.537 =============== Item was changed: ----- Method: SpurMemoryManager>>ensureRoomOnObjStackAt: (in category 'obj stacks') ----- ensureRoomOnObjStackAt: objStackRootIndex "An obj stack is a stack of objects stored in a hidden root slot, such as the markStack or the ephemeronQueue. It is a linked list of segments, with the hot end at the head of the list. It is a word object. The stack pointer is in ObjStackTopx and 0 means empty. The list goes through ObjStackNextx. We don't want to shrink objStacks, since they're used in GC and its good to keep their memory around. So unused pages created by popping emptying pages are kept on the ObjStackFreex list." | stackOrNil freeOrNewPage | stackOrNil := self fetchPointer: objStackRootIndex ofObject: hiddenRootsObj. (stackOrNil = nilObj or: [(self fetchPointer: ObjStackTopx ofObject: stackOrNil) >= ObjStackLimit]) ifTrue: [freeOrNewPage := stackOrNil = nilObj ifTrue: [0] ifFalse: [self fetchPointer: ObjStackFreex ofObject: stackOrNil]. freeOrNewPage ~= 0 ifTrue: "the free page list is always on the new page." [self storePointer: ObjStackFreex ofObjStack: stackOrNil withValue: 0. self assert: (marking not or: [self isMarked: freeOrNewPage])] ifFalse: [freeOrNewPage := self allocateSlotsInOldSpace: ObjStackPageSlots format: self wordIndexableFormat classIndex: self wordSizeClassIndexPun. freeOrNewPage ifNil: [self error: 'no memory to allocate or extend obj stack']. self storePointer: ObjStackFreex ofObjStack: freeOrNewPage withValue: 0.. marking ifTrue: [self setIsMarkedOf: freeOrNewPage to: true]]. self storePointer: ObjStackMyx ofObjStack: freeOrNewPage withValue: objStackRootIndex; storePointer: ObjStackNextx ofObjStack: freeOrNewPage withValue: (stackOrNil = nilObj ifTrue: [0] ifFalse: [stackOrNil]); storePointer: ObjStackTopx ofObjStack: freeOrNewPage withValue: 0; storePointer: objStackRootIndex ofObject: hiddenRootsObj withValue: freeOrNewPage. self assert: (self isValidObjStackAt: objStackRootIndex). "Added a new page; now update and answer the relevant cached first page." + stackOrNil := self updateRootOfObjStackAt: objStackRootIndex with: freeOrNewPage]. - ^self updateRootOfObjStackAt: objStackRootIndex with: freeOrNewPage]. self assert: (self isValidObjStackAt: objStackRootIndex). ^stackOrNil! Item was changed: ----- Method: SpurMemoryManager>>isValidObjStackPage:myIndex:firstPage: (in category 'obj stacks') ----- isValidObjStackPage: objStackPage myIndex: myx firstPage: isFirstPage "Answer if the obj stack at stackRootIndex is valid." | freeOrNextPage index | <inline: false> (self isValidObjStackPage: objStackPage myIndex: myx) ifFalse: [^false]. freeOrNextPage := self fetchPointer: ObjStackFreex ofObject: objStackPage. [freeOrNextPage ~= 0] whileTrue: [isFirstPage ifFalse: [objStackInvalidBecause := 'free page on other than first page'. invalidObjStackPage := objStackPage. ^false]. (self isValidObjStackPage: freeOrNextPage myIndex: myx) ifFalse: + [objStackInvalidBecause := self stretch: objStackInvalidBecause cat: ', on next page'. - [objStackInvalidBecause := self str: objStackInvalidBecause cat: ', on next page'. ^false]. freeOrNextPage := self fetchPointer: ObjStackFreex ofObject: freeOrNextPage]. isFirstPage ifTrue: [(myx between: self classTableRootSlots and: self classTableRootSlots + self hiddenRootSlots - 1) ifFalse: [objStackInvalidBecause := 'myx out of range'. invalidObjStackPage := objStackPage. ^false]. (self fetchPointer: myx ofObject: hiddenRootsObj) = objStackPage ifFalse: [objStackInvalidBecause := 'firstPage is not root'. invalidObjStackPage := objStackPage. ^false]]. index := self fetchPointer: ObjStackTopx ofObject: objStackPage. (index between: 0 and: ObjStackLimit) ifFalse: [objStackInvalidBecause := 'bad topx'. invalidObjStackPage := objStackPage. ^false]. freeOrNextPage := self fetchPointer: ObjStackNextx ofObject: objStackPage. ^freeOrNextPage = 0 or: [self isValidObjStackPage: freeOrNextPage myIndex: myx firstPage: false]! Item was changed: ----- Method: SpurMemoryManager>>popObjStack: (in category 'obj stacks') ----- popObjStack: objStack | topx top nextPage myx | self assert: (self isValidObjStack: objStack). topx := self fetchPointer: ObjStackTopx ofObject: objStack. topx = 0 ifTrue: [self assert: (self fetchPointer: ObjStackNextx ofObject: objStack) = 0. self cCode: [] "for debugging markAndTrace: set (MarkStackRecord := OrderedCollection new)" inSmalltalk: [(self fetchPointer: ObjStackMyx ofObject: objStack) = MarkStackRootIndex ifTrue: [MarkStackRecord ifNotNil: [MarkStackRecord addLast: {#EMPTY. nil}]]]. ^nil]. topx := topx - 1. top := self fetchPointer: topx + ObjStackFixedSlots ofObject: objStack. self cCode: [] "for debugging markAndTrace: set (MarkStackRecord := OrderedCollection new)" inSmalltalk: [(self fetchPointer: ObjStackMyx ofObject: objStack) = MarkStackRootIndex ifTrue: [MarkStackRecord ifNotNil: [(MarkStackRecord last first = #push and: [MarkStackRecord last last = top]) ifTrue: [MarkStackRecord removeLast] ifFalse: [MarkStackRecord addLast: {#pop. top}]]]]. self storePointer: ObjStackTopx ofObject: objStack withValue: topx. (topx = 0 and: [(nextPage := self fetchPointer: ObjStackNextx ofObject: objStack) ~= 0]) ifTrue: [self storePointer: ObjStackFreex ofObjStack: nextPage withValue: objStack. self storePointer: ObjStackNextx ofObjStack: objStack withValue: 0. myx := self fetchPointer: ObjStackMyx ofObject: objStack. self updateRootOfObjStackAt: myx with: nextPage]. + self assert: (self isValidObjStack: objStack). ^top! Item was added: + ----- Method: SpurMemoryManager>>printObjStack: (in category 'obj stacks') ----- + printObjStack: objStack + <api> + objStack = nilObj + ifTrue: + [coInterpreter print: 'nil'; cr] + ifFalse: + [self printObjStackPage: objStack + myIndex: (self fetchPointer: ObjStackMyx ofObject: objStack) + pageType: ObjStackMyx]! Item was added: + ----- Method: SpurMemoryManager>>printObjStackPage:myIndex:pageType: (in category 'obj stacks') ----- + printObjStackPage: objStackPage myIndex: myx pageType: pageType + | freeOrNextPage isFirstPage isNextPage isFreePage | + <inline: false> + isFirstPage := pageType = ObjStackMyx. + isNextPage := pageType = ObjStackNextx. + isFreePage := pageType = ObjStackFreex. + self printObjStackPage: objStackPage + myIndex: myx + tag: (isFirstPage ifTrue: ['head'] ifFalse: [isFreePage ifTrue: ['free'] ifFalse: ['next']]). + (isFirstPage or: [isNextPage]) ifTrue: + [coInterpreter tab; print: 'next: '; printHex: (self fetchPointer: ObjStackNextx ofObject: objStackPage). + isFirstPage ifTrue: + [coInterpreter print: ' free: '; printHex: (self fetchPointer: ObjStackFreex ofObject: objStackPage)]. + coInterpreter cr]. + freeOrNextPage := self fetchPointer: ObjStackFreex ofObject: objStackPage. + [freeOrNextPage ~= 0] whileTrue: + [self printObjStackPage: freeOrNextPage myIndex: myx pageType: ObjStackFreex. + freeOrNextPage := self fetchPointer: ObjStackFreex ofObject: freeOrNextPage]. + freeOrNextPage := self fetchPointer: ObjStackNextx ofObject: objStackPage. + freeOrNextPage ~= 0 ifTrue: + [self printObjStackPage: freeOrNextPage myIndex: myx pageType: ObjStackNextx]! Item was added: + ----- Method: SpurMemoryManager>>printObjStackPage:myIndex:tag: (in category 'obj stacks') ----- + printObjStackPage: objStackPage myIndex: myx tag: pageType + <var: 'pageType' type: #'char *'> + <inline: false> + coInterpreter + print: pageType; space; printHex: objStackPage; space; + print: 'cx '; printNum: (self classIndexOf: objStackPage); + print: ' ('; printNum: self wordSizeClassIndexPun; + print: ') fmt '; printNum: (self formatOf: objStackPage); + print: ' ('; printNum: self wordIndexableFormat; + print: ') sz '; printNum: (self numSlotsOfAny: objStackPage); + print: ' ('; printNum: ObjStackPageSlots; + print: ') myx: '; printNum: (self fetchPointer: ObjStackMyx ofObject: objStackPage); + print: ' ('; printNum: myx; + print: ((self isMarked: objStackPage) ifTrue: [') mkd'] ifFalse: [') unmkd']); + cr! Item was changed: ----- Method: SpurMemoryManager>>updateRootOfObjStackAt:with: (in category 'obj stacks') ----- updateRootOfObjStackAt: objStackRootIndex with: newRootPage self storePointer: objStackRootIndex ofObject: hiddenRootsObj withValue: newRootPage. objStackRootIndex caseOf: { [MarkStackRootIndex] -> [markStack := newRootPage]. [WeaklingStackRootIndex] -> [weaklingStack := newRootPage]. [EphemeronQueueRootIndex] -> [ephemeronQueue := newRootPage] }. - self assert: (self isValidObjStack: newRootPage). ^newRootPage! Item was changed: ----- Method: TAssignmentNode>>emitCCodeOn:level:generator: (in category 'C code generation') ----- emitCCodeOn: aStream level: level generator: aCodeGen expression isSwitch ifTrue: [^expression emitCCodeOn: aStream addToEndOfCases: self level: level generator: aCodeGen]. expression isLiteralArrayDeclaration ifTrue: [^self emitLiteralArrayDeclarationOn: aStream level: level generator: aCodeGen]. (expression isSend and: [expression isValueExpansion]) ifTrue: [^self emitValueExpansionOn: aStream level: level generator: aCodeGen]. + (expression isStmtList and: [expression statements size > 1]) ifTrue: + [^self emitStatementListExpansion: expression on: aStream level: level generator: aCodeGen]. variable emitCCodeOn: aStream level: level generator: aCodeGen. self isVariableUpdatingAssignment ifTrue: [aStream space; nextPutAll: expression selector; "+ or -" nextPut: $=; space. expression args first emitCCodeAsArgumentOn: aStream level: level generator: aCodeGen] ifFalse: [aStream space; nextPut: $=; space. expression emitCCodeAsArgumentOn: aStream level: level generator: aCodeGen]! Item was added: + ----- Method: TAssignmentNode>>emitStatementListExpansion:on:level:generator: (in category 'C code generation') ----- + emitStatementListExpansion: stmtList on: aStream level: level generator: aCodeGen + | lastStmt copy | + lastStmt := stmtList statements last. + lastStmt = variable ifTrue: + [^expression emitCCodeOn: aStream level: level generator: aCodeGen]. + copy := stmtList copy. + copy statements + at: stmtList statements size + put: (TAssignmentNode new + setVariable: variable + expression: lastStmt). + copy emitCCodeOn: aStream level: level generator: aCodeGen! Item was added: + ----- Method: VMClass>>stretch:cat: (in category 'C library extensions') ----- + stretch: s1 cat: s2 + <var: 's1' type: #'char *'> + <var: 's2' type: #'char *'> + | ns | + <var: 'ns' type: #'char *'> + ^self + cCode: + [ns := self malloc: (self strlen: s1) + (self strlen: s2) + 2. + self str: ns cpy: s1. + self str: ns cat: s2] + inSmalltalk: [self str: s1 cat: s2]! Item was changed: ----- Method: VMMaker>>generateMainVM (in category 'generate sources') ----- generateMainVM + "Generate the interp (and optionally the cogit), internal plugins and exports. + N.B. generateInterpreterFile *must* preceed generateCogitFile so that + the objectMemory and interpreter classes are initialized before the Cogit + code is generated." - "generate the interp (and optionally the cogit), internal plugins and exports" + self generateInterpreterFile; + generateCogitFile; - self generateCogitFile; - generateInterpreterFile; processFilesForCoreVM; generateInternalPlugins; generateExportsFile!

1 0

[commit][2819] CogVM source as per VMMaker.oscog-eem.537.
by commits＠squeakvm.org 06 Dec '13

06 Dec '13

Revision: 2819 Author: eliot Date: 2013-12-05 15:21:33 -0800 (Thu, 05 Dec 2013) Log Message: ----------- CogVM source as per VMMaker.oscog-eem.537. Fix ObjectMemory's isForwarded:/isOopForwarded: macros, rescuing compilation of the "classic" VMs. Modified Paths: -------------- branches/Cog/nscogsrc/vm/cointerp.c branches/Cog/nscogsrc/vm/cointerp.h branches/Cog/nscogsrc/vm/gcc3x-cointerp.c branches/Cog/nscogsrc/vm/interp.h branches/Cog/nscogsrc/vm/vmCallback.h branches/Cog/src/vm/cointerp.c branches/Cog/src/vm/cointerp.h branches/Cog/src/vm/cointerpmt.c branches/Cog/src/vm/cointerpmt.h branches/Cog/src/vm/gcc3x-cointerp.c branches/Cog/src/vm/gcc3x-cointerpmt.c branches/Cog/src/vm/interp.h branches/Cog/src/vm/vmCallback.h branches/Cog/stacksrc/vm/gcc3x-interp.c branches/Cog/stacksrc/vm/interp.c branches/Cog/stacksrc/vm/interp.h branches/Cog/stacksrc/vm/vmCallback.h Property Changed: ---------------- branches/Cog/platforms/Cross/vm/sqSCCSVersion.h Modified: branches/Cog/nscogsrc/vm/cointerp.c =================================================================== --- branches/Cog/nscogsrc/vm/cointerp.c 2013-12-05 20:14:48 UTC (rev 2818) +++ branches/Cog/nscogsrc/vm/cointerp.c 2013-12-05 23:21:33 UTC (rev 2819) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.536 uuid: c021f329-3f3a-469b-a838-24e74c1be39c + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.537 uuid: 16e0cc2f-0c26-4d21-b1bf-1dde0d99b08b from - CoInterpreter VMMaker.oscog-eem.536 uuid: c021f329-3f3a-469b-a838-24e74c1be39c + CoInterpreter VMMaker.oscog-eem.537 uuid: 16e0cc2f-0c26-4d21-b1bf-1dde0d99b08b */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.536 uuid: c021f329-3f3a-469b-a838-24e74c1be39c " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.537 uuid: 16e0cc2f-0c26-4d21-b1bf-1dde0d99b08b " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2033,7 +2033,7 @@ /* 575 */ (void (*)(void))0, 0 }; static void (*externalPrimitiveTable[MaxExternalPrimitiveTableSize + 1 /* 4097 */])(void); -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.536"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.537"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; @@ -2062,8 +2062,8 @@ #define initialEnterSmalltalkExecutive() enterSmalltalkExecutiveImplementation() #define instFormatFieldLSB() 8 #define instFormatFieldWidth() 4 -#define isForwarded() false -#define isOopForwarded() false +#define isForwarded(oop) false +#define isOopForwarded(oop) false #define memory() memory #define mostRecentlyUsedPage() GIV(mostRecentlyUsedPage) #define nextOpenPIC methodObject Modified: branches/Cog/nscogsrc/vm/cointerp.h =================================================================== --- branches/Cog/nscogsrc/vm/cointerp.h 2013-12-05 20:14:48 UTC (rev 2818) +++ branches/Cog/nscogsrc/vm/cointerp.h 2013-12-05 23:21:33 UTC (rev 2819) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.536 uuid: c021f329-3f3a-469b-a838-24e74c1be39c + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.537 uuid: 16e0cc2f-0c26-4d21-b1bf-1dde0d99b08b */ @@ -262,6 +262,6 @@ } while (0) #define instFormatFieldLSB() 8 #define instFormatFieldWidth() 4 -#define isForwarded() false -#define isOopForwarded() false +#define isForwarded(oop) false +#define isOopForwarded(oop) false Modified: branches/Cog/nscogsrc/vm/gcc3x-cointerp.c =================================================================== --- branches/Cog/nscogsrc/vm/gcc3x-cointerp.c 2013-12-05 20:14:48 UTC (rev 2818) +++ branches/Cog/nscogsrc/vm/gcc3x-cointerp.c 2013-12-05 23:21:33 UTC (rev 2819) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.536 uuid: c021f329-3f3a-469b-a838-24e74c1be39c + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.537 uuid: 16e0cc2f-0c26-4d21-b1bf-1dde0d99b08b from - CoInterpreter VMMaker.oscog-eem.536 uuid: c021f329-3f3a-469b-a838-24e74c1be39c + CoInterpreter VMMaker.oscog-eem.537 uuid: 16e0cc2f-0c26-4d21-b1bf-1dde0d99b08b */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.536 uuid: c021f329-3f3a-469b-a838-24e74c1be39c " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.537 uuid: 16e0cc2f-0c26-4d21-b1bf-1dde0d99b08b " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2036,7 +2036,7 @@ /* 575 */ (void (*)(void))0, 0 }; static void (*externalPrimitiveTable[MaxExternalPrimitiveTableSize + 1 /* 4097 */])(void); -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.536"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.537"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; @@ -2065,8 +2065,8 @@ #define initialEnterSmalltalkExecutive() enterSmalltalkExecutiveImplementation() #define instFormatFieldLSB() 8 #define instFormatFieldWidth() 4 -#define isForwarded() false -#define isOopForwarded() false +#define isForwarded(oop) false +#define isOopForwarded(oop) false #define memory() memory #define mostRecentlyUsedPage() GIV(mostRecentlyUsedPage) #define nextOpenPIC methodObject Modified: branches/Cog/nscogsrc/vm/interp.h =================================================================== --- branches/Cog/nscogsrc/vm/interp.h 2013-12-05 20:14:48 UTC (rev 2818) +++ branches/Cog/nscogsrc/vm/interp.h 2013-12-05 23:21:33 UTC (rev 2819) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.536 uuid: c021f329-3f3a-469b-a838-24e74c1be39c + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.537 uuid: 16e0cc2f-0c26-4d21-b1bf-1dde0d99b08b */ #define VM_PROXY_MAJOR 1 Modified: branches/Cog/nscogsrc/vm/vmCallback.h =================================================================== --- branches/Cog/nscogsrc/vm/vmCallback.h 2013-12-05 20:14:48 UTC (rev 2818) +++ branches/Cog/nscogsrc/vm/vmCallback.h 2013-12-05 23:21:33 UTC (rev 2819) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.536 uuid: c021f329-3f3a-469b-a838-24e74c1be39c + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.537 uuid: 16e0cc2f-0c26-4d21-b1bf-1dde0d99b08b */ #define VM_CALLBACK_INC 1 Property changes on: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h ___________________________________________________________________ Modified: checkindate - Thu Dec 5 12:10:12 PST 2013 + Thu Dec 5 15:20:31 PST 2013 Modified: branches/Cog/src/vm/cointerp.c =================================================================== --- branches/Cog/src/vm/cointerp.c 2013-12-05 20:14:48 UTC (rev 2818) +++ branches/Cog/src/vm/cointerp.c 2013-12-05 23:21:33 UTC (rev 2819) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.536 uuid: c021f329-3f3a-469b-a838-24e74c1be39c + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.537 uuid: 16e0cc2f-0c26-4d21-b1bf-1dde0d99b08b from - CoInterpreter VMMaker.oscog-eem.536 uuid: c021f329-3f3a-469b-a838-24e74c1be39c + CoInterpreter VMMaker.oscog-eem.537 uuid: 16e0cc2f-0c26-4d21-b1bf-1dde0d99b08b */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.536 uuid: c021f329-3f3a-469b-a838-24e74c1be39c " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.537 uuid: 16e0cc2f-0c26-4d21-b1bf-1dde0d99b08b " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2023,7 +2023,7 @@ /* 575 */ (void (*)(void))0, 0 }; static void (*externalPrimitiveTable[MaxExternalPrimitiveTableSize + 1 /* 4097 */])(void); -const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.536]"; +const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.537]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; @@ -2052,8 +2052,8 @@ #define initialEnterSmalltalkExecutive() enterSmalltalkExecutiveImplementation() #define instFormatFieldLSB() 8 #define instFormatFieldWidth() 4 -#define isForwarded() false -#define isOopForwarded() false +#define isForwarded(oop) false +#define isOopForwarded(oop) false #define memory() memory #define mostRecentlyUsedPage() GIV(mostRecentlyUsedPage) #define nextOpenPIC methodObject @@ -5607,7 +5607,6 @@ /* begin internalPush: */ longAtPointerput((localSP -= BytesPerOop), longAt((rcvr + BaseHeaderSize) + (byte3 << ShiftForWord))); } - null; goto l4; } if (opType == 3) { @@ -5617,7 +5616,6 @@ assert(GIV(method) == (iframeMethod(localFP))); object = longAt((GIV(method) + BaseHeaderSize) + ((byte3 + LiteralStart) << ShiftForWord)); longAtPointerput((localSP -= BytesPerOop), object); - null; goto l4; } if (opType == 4) { @@ -5631,7 +5629,6 @@ object2 = longAt((oop + BaseHeaderSize) + (ValueIndex << ShiftForWord)); longAtPointerput((localSP -= BytesPerOop), object2); - null; goto l4; } top = longAtPointer(localSP); Modified: branches/Cog/src/vm/cointerp.h =================================================================== --- branches/Cog/src/vm/cointerp.h 2013-12-05 20:14:48 UTC (rev 2818) +++ branches/Cog/src/vm/cointerp.h 2013-12-05 23:21:33 UTC (rev 2819) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.536 uuid: c021f329-3f3a-469b-a838-24e74c1be39c + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.537 uuid: 16e0cc2f-0c26-4d21-b1bf-1dde0d99b08b */ @@ -258,6 +258,6 @@ } while (0) #define instFormatFieldLSB() 8 #define instFormatFieldWidth() 4 -#define isForwarded() false -#define isOopForwarded() false +#define isForwarded(oop) false +#define isOopForwarded(oop) false Modified: branches/Cog/src/vm/cointerpmt.c =================================================================== --- branches/Cog/src/vm/cointerpmt.c 2013-12-05 20:14:48 UTC (rev 2818) +++ branches/Cog/src/vm/cointerpmt.c 2013-12-05 23:21:33 UTC (rev 2819) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.517 uuid: 14ff7126-70ec-4cc4-9f55-70256e6a3d35 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.537 uuid: 16e0cc2f-0c26-4d21-b1bf-1dde0d99b08b from - CoInterpreterMT VMMaker.oscog-eem.517 uuid: 14ff7126-70ec-4cc4-9f55-70256e6a3d35 + CoInterpreterMT VMMaker.oscog-eem.537 uuid: 16e0cc2f-0c26-4d21-b1bf-1dde0d99b08b */ -static char __buildInfo[] = "CoInterpreterMT VMMaker.oscog-eem.517 uuid: 14ff7126-70ec-4cc4-9f55-70256e6a3d35 " __DATE__ ; +static char __buildInfo[] = "CoInterpreterMT VMMaker.oscog-eem.537 uuid: 16e0cc2f-0c26-4d21-b1bf-1dde0d99b08b " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -255,7 +255,6 @@ #define InstructionPointerIndex 1 #define KeyIndex 0 #define LargeContextBit 0x40000 -#define LargeContextBytes 252 #define LargeContextSize 252 #define LargeContextSlots 62 #define LastLinkIndex 1 @@ -454,7 +453,7 @@ sqInt cePositive32BitIntegerFor(usqInt anInteger); sqInt ceReturnToInterpreter(sqInt anOop); sqInt ceSendAborttonumArgs(sqInt selector, sqInt rcvr, sqInt numArgs); -sqInt ceSendFromInLineCacheMiss(CogMethod *oPIC); +sqInt ceSendFromInLineCacheMiss(CogMethod *cogMethodOrPIC); sqInt ceSendMustBeBoolean(sqInt anObject); sqInt ceSendsupertonumArgs(sqInt selector, sqInt superNormalBar, sqInt rcvr, sqInt numArgs); void ceStackOverflow(sqInt contextSwitchIfNotNil); @@ -520,6 +519,7 @@ sqInt compactClassAt(sqInt ccIndex); sqInt compactClassIndexOfHeader(sqInt header); sqInt compactClassIndexOf(sqInt oop); +static sqInt compactIndexOfClass(sqInt aClassOop); static sqInt compare31or32Bitsequal(sqInt obj1, sqInt obj2); void compilationBreakpointFor(sqInt selectorOop); static sqInt containOnlyOops(sqInt array); @@ -597,7 +597,7 @@ static sqInt findHomeForContext(sqInt aContext); static sqInt findMethodWithPrimitiveFromContextUpToContext(sqInt primitive, sqInt senderContext, sqInt homeContext); static sqInt findMethodWithPrimitiveFromFPUpToContext(sqInt primitive, char *startFP, sqInt homeContext); -static void findNewMethodInClassTag(sqInt classTag); +static void findNewMethodInClassTag(sqInt classTagArg); sqInt findSelectorOfMethod(sqInt methArg); static char * findSPOfon(char *theFP, StackPage *thePage); void findStringBeginningWith(char *aCString); @@ -718,7 +718,6 @@ static sqInt isContext(sqInt oop); sqInt isFloatObject(sqInt oop); static sqInt isForwardedClassTag(sqInt classTag); -static sqInt isForwarded(sqInt oop); static sqInt isFrameonPage(char *aFrame, StackPage *aPage); static sqInt isFree(StackPage * self_in_isFree); sqInt isImmediate(sqInt anOop); @@ -735,7 +734,6 @@ sqInt isNonIntegerObject(sqInt objectPointer); static sqInt isNullExternalPrimitiveCall(sqInt aMethodObj); sqInt isOopCompiledMethod(sqInt oop); -static sqInt isOopForwarded(sqInt oop); sqInt isOopImmutable(sqInt anOop); sqInt isOopMutable(sqInt anOop); sqInt isPointers(sqInt oop); @@ -748,7 +746,7 @@ static sqInt isWeakNonImm(sqInt oop); sqInt isWeak(sqInt oop); static sqInt isWidowedContext(sqInt aOnceMarriedContext); -static sqInt isWordsOrBytesNonInt(sqInt oop); +static sqInt isWordsOrBytesNonImm(sqInt oop); sqInt isWordsOrBytes(sqInt oop); sqInt isWords(sqInt oop); sqInt isWriteMediatedContextInstVarIndex(sqInt index); @@ -1141,6 +1139,7 @@ EXPORT(void) printFramesOnStackPageListInUse(void); static void printFrameThingandFrameat(char *name, char *theFP, char *address); static void printFrameThingat(char *name, char *address); +static void printFrameThingatextraString(char *name, char *address, char *extraStringOrNil); static void printFrameThingatextra(char *name, char *address, sqInt extraValue); sqInt printFrame(char *theFP); void printFrameWithSP(char *theFP, char *theSP); @@ -1148,6 +1147,8 @@ void printInstancesOf(sqInt aClassOop); static void printLogEntryAt(sqInt i); void printMemory(void); +void printMethodCache(void); +void printMethodCacheFor(sqInt thing); void printMethodDictionaryOf(sqInt behavior); void printMethodDictionary(sqInt dictionary); void printMethodReferencesTo(sqInt anOop); @@ -1313,6 +1314,7 @@ static sqInt validInstructionPointerinFrame(usqInt anInstrPointer, char *fp); sqInt validInstructionPointerinMethodframePointer(usqInt instrPointer, usqInt aMethod, char *fp); static sqInt validStackPageBaseFrames(void); +static sqInt validStackPageBaseFrame(StackPage *aPage); static void verifyCleanHeaders(void); sqInt vmEndianness(void); usqInt vmOwnerLockAddress(void); @@ -1326,6 +1328,7 @@ sqInt withoutForwardingOnandsendToCogit(sqInt obj1, sqInt obj2, sqInt (*selector)(sqInt,sqInt)); sqInt withoutForwardingOnandwithsendToCogit(sqInt obj1, sqInt obj2, sqInt aBool, sqInt (*selector)(sqInt,sqInt,sqInt)); static sqInt withSmallIntegerTags(char *value); +static sqInt wordSize(void); static sqInt wordSwapped(sqInt w); static sqInt writeImageFileIO(void); usqInt youngStartAddress(void); @@ -1348,9 +1351,9 @@ _iss usqInt instructionPointer; _iss sqInt argumentCount; _iss usqInt newMethod; +_iss sqInt messageSelector; _iss usqInt youngStart; _iss StackPage * pages; -_iss sqInt messageSelector; _iss char * stackBasePlus1; _iss sqInt traceLogIndex; _iss sqInt remapBufferCount; @@ -1408,7 +1411,6 @@ _iss sqInt rootTableOverflowed; _iss usqLong statGCEndUsecs; _iss sqInt statSweepCount; -_iss sqInt cogCodeSize; _iss usqInt compEnd; _iss sqInt flagInterpretedMethods; _iss sqInt metaclassNumSlots; @@ -1417,6 +1419,7 @@ _iss sqInt statProcessSwitch; _iss sqInt backwardJumpCount; _iss sqInt checkThreadActivation; +_iss sqInt cogCodeSize; _iss sqInt foreignCallbackProcessSlot; _iss usqInt fwdTableLast; _iss usqLong gcStartUsecs; @@ -1459,7 +1462,6 @@ _iss sqInt maxExtSemTabSizeSet; _iss sqInt memoryIsScarce; _iss usqLong statIGCDeltaUsecs; -_iss sqInt classByteArrayCompactIndex; _iss sqInt deferSmash; _iss sqInt deferredSmash; _iss sqInt gcBiasToGrow; @@ -1473,6 +1475,7 @@ _iss usqLong statCodeCompactionUsecs; _iss sqInt statRootTableCount; _iss sqInt statSurvivorCount; +_iss sqInt classByteArrayCompactIndex; _iss sqInt gcSemaphoreIndex; _iss sqInt imageHeaderFlags; _iss usqLong longRunningPrimitiveGCUsecs; @@ -1523,11 +1526,11 @@ sqInt maxLiteralCountForCompile = MaxLiteralCountForCompile /* 60 */; sqInt inIOProcessEvents; sqInt checkForLeaks; -static usqInt heapBase; sqInt desiredEdenBytes; sqInt desiredNumStackPages; sqInt extraVMMemory; sqInt desiredCogCodeSize; +static usqInt heapBase; sqInt breakSelectorLength = -1; sqInt deferDisplayUpdates; sqInt disownCount; @@ -2118,7 +2121,7 @@ /* 575 */ (void (*)(void))0, 0 }; static void (*externalPrimitiveTable[MaxExternalPrimitiveTableSize + 1 /* 4097 */])(void); -const char *interpreterVersion = "Croquet Closure Cog MT VM [CoInterpreterMT VMMaker.oscog-eem.517]"; +const char *interpreterVersion = "Croquet Closure Cog MT VM [CoInterpreterMT VMMaker.oscog-eem.537]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; sqInt willNotThreadWarnCount; @@ -2149,6 +2152,8 @@ #define getNumThreads() GIV(numThreads) #define instFormatFieldLSB() 8 #define instFormatFieldWidth() 4 +#define isForwarded(oop) false +#define isOopForwarded(oop) false #define memory() memory #define mostRecentlyUsedPage() GIV(mostRecentlyUsedPage) #define nextOpenPIC methodObject @@ -4811,6 +4816,7 @@ GIV(framePointer) = localFP; ceEnterCogCodePopReceiverReg(); + null; goto l158; } localIP = pointerForOop(longAt(localFP + FoxIFSavedIP)); @@ -4825,7 +4831,7 @@ /* begin fetchNextBytecode */ currentBytecode = byteAtPointer(++localIP); - /* return self */ + null; l158: /* end baseFrameReturn */; goto l155; } @@ -5009,7 +5015,9 @@ /* begin literal: */ assert(GIV(method) == (iframeMethod(localFP))); litVar = longAt((GIV(method) + BaseHeaderSize) + ((variableIndex + LiteralStart) << ShiftForWord)); - + if (isForwarded(litVar)) { + litVar = followForwarded(litVar); + } /* begin storePointer:ofObject:withValue: */ if ((((usqInt) litVar)) < (((usqInt) GIV(youngStart)))) { possibleRootStoreIntovalue(litVar, longAtPointer(localSP)); @@ -5061,7 +5069,9 @@ /* begin literal: */ assert(GIV(method) == (iframeMethod(localFP))); litVar = longAt((GIV(method) + BaseHeaderSize) + ((variableIndex + LiteralStart) << ShiftForWord)); - + if (isForwarded(litVar)) { + litVar = followForwarded(litVar); + } /* begin storePointer:ofObject:withValue: */ if ((((usqInt) litVar)) < (((usqInt) GIV(youngStart)))) { possibleRootStoreIntovalue(litVar, longAtPointer(localSP)); @@ -5214,7 +5224,73 @@ GIV(instructionPointer) = oopForPointer(localIP); GIV(stackPointer) = localSP; GIV(framePointer) = localFP; - + if ((isOopForwarded(GIV(messageSelector))) + || (0)) { + if (isOopForwarded(GIV(messageSelector))) { + GIV(messageSelector) = handleForwardedSelectorFaultFor(GIV(messageSelector)); + } + + /* begin lookupInMethodCacheSel:classTag: */ + + /* shift drops two low-order zeros from addresses */ + + hash = GIV(messageSelector) ^ lkupClassTag; + + /* first probe */ + + probe = hash & MethodCacheMask; + if (((GIV(methodCache)[probe + MethodCacheSelector]) == GIV(messageSelector)) + && ((GIV(methodCache)[probe + MethodCacheClass]) == lkupClassTag)) { + GIV(newMethod) = GIV(methodCache)[probe + MethodCacheMethod]; + primitiveFunctionPointer = ((void (*)()) (GIV(methodCache)[probe + MethodCachePrimFunction])); + ok = 1; + goto l163; + } + + /* second probe */ + + probe = (((usqInt) hash) >> 1) & MethodCacheMask; + if (((GIV(methodCache)[probe + MethodCacheSelector]) == GIV(messageSelector)) + && ((GIV(methodCache)[probe + MethodCacheClass]) == lkupClassTag)) { + GIV(newMethod) = GIV(methodCache)[probe + MethodCacheMethod]; + primitiveFunctionPointer = ((void (*)()) (GIV(methodCache)[probe + MethodCachePrimFunction])); + ok = 1; + goto l163; + } + probe = (((usqInt) hash) >> 2) & MethodCacheMask; + if (((GIV(methodCache)[probe + MethodCacheSelector]) == GIV(messageSelector)) + && ((GIV(methodCache)[probe + MethodCacheClass]) == lkupClassTag)) { + GIV(newMethod) = GIV(methodCache)[probe + MethodCacheMethod]; + primitiveFunctionPointer = ((void (*)()) (GIV(methodCache)[probe + MethodCachePrimFunction])); + ok = 1; + goto l163; + } + ok = 0; + l163: /* end lookupInMethodCacheSel:classTag: */; + if (ok) { + /* begin ifAppropriateCompileToNativeCode:selector: */ + VM_LABEL(1ifAppropriateCompileToNativeCodeselector); + methodHeader1 = longAt((GIV(newMethod) + BaseHeaderSize) + (HeaderIndex << ShiftForWord)); + if (isCogMethodReference(methodHeader1)) { + + /* makeBaseFrame: can create cog methods with nil selectors. */ + + cogMethod1 = ((CogMethod *) methodHeader1); + if (((cogMethod1->selector)) == GIV(nilObj)) { + setSelectorOfto(cogMethod1, GIV(messageSelector)); + } + } + else { + if (((((usqInt) methodHeader1) >> 10) & 0xFF) <= maxLiteralCountForCompile) { + cogselector(GIV(newMethod), GIV(messageSelector)); + } + else { + maybeFlagMethodAsInterpreted(GIV(newMethod)); + } + } + goto l165; + } + } GIV(lkupClass) = lkupClassTag; lookupMethodInClass(GIV(lkupClass)); /* begin internalizeIPandSP */ @@ -5661,7 +5737,9 @@ /* begin literal: */ assert(GIV(method) == (iframeMethod(localFP))); litVar = longAt((GIV(method) + BaseHeaderSize) + ((byte3 + LiteralStart) << ShiftForWord)); - + if (isForwarded(litVar)) { + litVar = followForwarded(litVar); + } /* begin storePointer:ofObject:withValue: */ if ((((usqInt) litVar)) < (((usqInt) GIV(youngStart)))) { possibleRootStoreIntovalue(litVar, top); @@ -5885,7 +5963,7 @@ localSP = pointerForOop(GIV(stackPointer)); localFP = pointerForOop(GIV(framePointer)); if (popValues) { - for (i = 0; i <= (size - 1); i += 1) { + for (i = 0; i < size; i += 1) { /* Assume: have just allocated a new Array; it must be young. Thus, can use unchecked stores. */ @@ -5895,7 +5973,7 @@ localSP += size * BytesPerOop; } else { - for (i = 0; i <= (size - 1); i += 1) { + for (i = 0; i < size; i += 1) { longAtput((array + BaseHeaderSize) + (i << ShiftForWord), GIV(nilObj)); } } @@ -6038,7 +6116,7 @@ GIV(traceLogIndex) = (GIV(traceLogIndex) + 3) % TraceBufferSize; } if (numCopied > 0) { - for (i = 0; i <= (numCopied - 1); i += 1) { + for (i = 0; i < numCopied; i += 1) { /* Assume: have just allocated a new BlockClosure; it must be young. Thus, can use unchecked stores. */ @@ -8743,9 +8821,13 @@ VM_LABEL(0bytecodePrimIdentical); rcvr = longAtPointer(localSP + (1 * BytesPerOop)); - + if (isOopForwarded(rcvr)) { + rcvr = handleSpecialSelectorSendFaultForfpsp(rcvr, localFP, localSP); + } arg = longAtPointer(localSP + (0 * BytesPerOop)); - + if (isOopForwarded(arg)) { + arg = handleSpecialSelectorSendFaultForfpsp(arg, localFP, localSP); + } /* begin booleanCheat: */ if (rcvr == arg) { goto booleanCheatTrue; @@ -8764,7 +8846,9 @@ VM_LABEL(0bytecodePrimClass); rcvr = longAtPointer(localSP); - + if (isOopForwarded(rcvr)) { + rcvr = handleSpecialSelectorSendFaultForfpsp(rcvr, localFP, localSP); + } /* begin internalStackTopPut: */ aValue = ((rcvr & 1) ? longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassInteger << ShiftForWord)) @@ -9482,7 +9566,7 @@ else { primitiveFunctionPointer = primitiveInvokeObjectAsMethod; } - for (p = 0; p <= (CacheProbeMax - 1); p += 1) { + for (p = 0; p < CacheProbeMax; p += 1) { probe = (((usqInt) hash) >> p) & MethodCacheMask; if ((GIV(methodCache)[probe + MethodCacheSelector]) == 0) { @@ -9512,7 +9596,7 @@ /* ...and zap the following entries */ GIV(lastMethodCacheProbeWrite) = probe; - for (p = 1; p <= (CacheProbeMax - 1); p += 1) { + for (p = 1; p < CacheProbeMax; p += 1) { probe = (((usqInt) hash) >> p) & MethodCacheMask; GIV(methodCache)[probe + MethodCacheSelector] = 0; } @@ -9798,7 +9882,7 @@ { DECL_MAYBE_SQ_GLOBAL_STRUCT if (((arrayOop & 1) == 0) && (((arrayOop & 1) == 0) - && (isWordsOrBytesNonInt(arrayOop)))) { + && (isWordsOrBytesNonImm(arrayOop)))) { return ((void *) (pointerForOop(arrayOop + BaseHeaderSize))); } /* begin primitiveFail */ @@ -10003,7 +10087,7 @@ sqInt i; StackPage *thePage; - for (i = 0; i <= (GIV(numStackPages) - 1); i += 1) { + for (i = 0; i < GIV(numStackPages); i += 1) { /* begin stackPageAt: */ thePage = stackPageAtpages(i, GIV(pages)); if (!(isFree(thePage))) { @@ -10186,12 +10270,6 @@ sqInt objHeader2; sqInt objHeaderBytes; sqInt objHeaderType; - sqInt objOop; - sqInt objOop1; - sqInt objOop2; - sqInt objOop3; - sqInt objOop4; - sqInt objOop5; sqInt objSize; sqInt oop1; sqInt oop11; @@ -11892,12 +11970,13 @@ /* Send from an Open PIC when the first-level method lookup probe has failed, or to continue when PIC creation has failed (e.g. because we're out of - code space). */ + code space), + or when a send has failed due to a forwarded receiver. */ /* self printFrame: stackPage headFP WithSP: stackPage headSP */ /* self printStringOf: selector */ sqInt -ceSendFromInLineCacheMiss(CogMethod *oPIC) +ceSendFromInLineCacheMiss(CogMethod *cogMethodOrPIC) { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt ccIndex; sqInt classTag; @@ -11909,7 +11988,7 @@ sqInt selector; sqInt top; - numArgs = (oPIC->cmNumArgs); + numArgs = (cogMethodOrPIC->cmNumArgs); /* skip return pc */ @@ -11921,12 +12000,12 @@ ? (longAt(rcvr - BaseHeaderSize)) & AllButTypeMask : longAt(((longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (CompactClasses << ShiftForWord))) + BaseHeaderSize) + ((ccIndex - 1) << ShiftForWord)))); GIV(argumentCount) = numArgs; - if (lookupInMethodCacheSelclassTag((oPIC->selector), classTag)) { + if (lookupInMethodCacheSelclassTag((cogMethodOrPIC->selector), classTag)) { /* check for coggability because method is in the cache */ /* begin ifAppropriateCompileToNativeCode:selector: */ - selector = (oPIC->selector); + selector = (cogMethodOrPIC->selector); methodHeader = longAt((GIV(newMethod) + BaseHeaderSize) + (HeaderIndex << ShiftForWord)); if (isCogMethodReference(methodHeader)) { @@ -11947,7 +12026,14 @@ } } else { - GIV(messageSelector) = (oPIC->selector); + GIV(messageSelector) = (cogMethodOrPIC->selector); + if ((isOopForwarded(GIV(messageSelector))) + || (0)) { + if (isOopForwarded(GIV(messageSelector))) { + GIV(messageSelector) = handleForwardedSelectorFaultFor(GIV(messageSelector)); + } + + } if (((errSelIdx = lookupMethodNoMNUEtcInClass(classTag))) != 0) { handleMNUInMachineCodeToclassForMessage(errSelIdx, rcvr, classTag); assert(0); @@ -12045,9 +12131,8 @@ classObj = longAt((classPointer + BaseHeaderSize) + (SuperclassIndex << ShiftForWord)); classTag = classObj; } - canLinkCacheTag = 0 - || ((!(isYoungObject(classTag))) - || (canLinkToYoungClasses())); + canLinkCacheTag = (canLinkToYoungClasses()) + || (!(isYoungObject(classTag))); GIV(argumentCount) = numArgs; if (lookupInMethodCacheSelclassTag(selector, classTag)) { @@ -12409,7 +12494,7 @@ static sqInt cheapAddressCouldBeInHeap(sqInt address) { DECL_MAYBE_SQ_GLOBAL_STRUCT - return ((address & ((BytesPerWord) - 1)) == 0) + return ((address & (4 - 1)) == 0) && ((oopisGreaterThanOrEqualTo(address, startOfMemory())) && ((((usqInt) address)) < (((usqInt) GIV(freeStart))))); } @@ -13098,7 +13183,9 @@ return 0; } frameCtxt = longAt(theFP + FoxThisContext); - + if (isForwarded(frameCtxt)) { + frameCtxt = followForwarded(frameCtxt); + } return frameCtxt == aContext; } @@ -13259,7 +13346,7 @@ ok = ok && (checkOkayFields(GIV(messageSelector))); ok = ok && (checkOkayFields(GIV(newMethod))); ok = ok && (checkOkayFields(GIV(lkupClass))); - for (i = 0; i <= (MethodCacheEntries - 1); i += MethodCacheEntrySize) { + for (i = 0; i < MethodCacheEntries; i += MethodCacheEntrySize) { oopOrZero = GIV(methodCache)[i + MethodCacheSelector]; if (!(oopOrZero == 0)) { ok = ok && (checkOkayFields(GIV(methodCache)[i + MethodCacheSelector])); @@ -13377,7 +13464,7 @@ printf("\n"); return 0; } - unusedBit = 536870912; + unusedBit = 0x20000000; if (!(((longAt(oop)) & unusedBit) == 0)) { print("oop "); @@ -13482,7 +13569,7 @@ assert(pageListIsWellFormed()); } ok = 1; - for (i = 0; i <= (GIV(numStackPages) - 1); i += 1) { + for (i = 0; i < GIV(numStackPages); i += 1) { /* begin stackPageAt: */ thePage = stackPageAtpages(i, GIV(pages)); if (!(isFree(thePage))) { @@ -13628,7 +13715,7 @@ char *theSP; ok = 1; - for (i = 0; i <= (GIV(numStackPages) - 1); i += 1) { + for (i = 0; i < GIV(numStackPages); i += 1) { /* begin stackPageAt: */ thePage = stackPageAtpages(i, GIV(pages)); if (!(isFree(thePage))) { @@ -13900,7 +13987,7 @@ } length = stSizeOf(name); srcName = ((char *) (arrayValueOf(name))); - for (i = 0; i <= (length - 1); i += 1) { + for (i = 0; i < length; i += 1) { if (!((srcName[i]) == (className[i]))) { return 0; } @@ -14004,7 +14091,7 @@ sqInt i; GIV(traceLogIndex) = 0; - for (i = 0; i <= (TraceBufferSize - 1); i += 1) { + for (i = 0; i < TraceBufferSize; i += 1) { GIV(traceLog)[i] = 0; } } @@ -14209,6 +14296,24 @@ } +/* Check that a class the VM assumes is compact has the right index. */ + +static sqInt +compactIndexOfClass(sqInt aClassOop) +{ DECL_MAYBE_SQ_GLOBAL_STRUCT + sqInt cct; + sqInt index; + + cct = longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (CompactClasses << ShiftForWord)); + for (index = ((lengthOf(cct)) - 1); index >= 0; index += -2) { + if ((longAt((cct + BaseHeaderSize) + (index << ShiftForWord))) == aClassOop) { + return index + 1; + } + } + return 0; +} + + /* May set success to false */ /* First compare two ST integers... */ @@ -14625,7 +14730,7 @@ /* N.B. the expression ((numCopied - i) * BytesPerWord)) skips the return address */ - for (i = 0; i <= (numCopied - 1); i += 1) { + for (i = 0; i < numCopied; i += 1) { /* Assume: have just allocated a new BlockClosure; it must be young. Thus, can use unchecked stores. */ @@ -15068,7 +15173,7 @@ } activeContext = marryFrameSP(GIV(framePointer), GIV(stackPointer)); l1: /* end ensureFrameIsMarried:SP: */; - for (i = 0; i <= (GIV(numStackPages) - 1); i += 1) { + for (i = 0; i < GIV(numStackPages); i += 1) { /* begin stackPageAt: */ aPage = stackPageAtpages(i, GIV(pages)); if (!(isFree(aPage))) { @@ -15412,13 +15517,13 @@ return null; } if ((GIV(primTraceLog)[GIV(primTraceLogIndex)]) != 0) { - for (i = GIV(primTraceLogIndex); i <= (PrimTraceLogSize - 1); i += 1) { + for (i = GIV(primTraceLogIndex); i < PrimTraceLogSize; i += 1) { printPrimLogEntryAt(i); /* begin cr */ printf("\n"); } } - for (i = 0; i <= (GIV(primTraceLogIndex) - 1); i += 1) { + for (i = 0; i < GIV(primTraceLogIndex); i += 1) { printPrimLogEntryAt(i); /* begin cr */ printf("\n"); @@ -17262,7 +17367,7 @@ /* begin arrayValueOf: */ if (((arrayOop & 1) == 0) && (((arrayOop & 1) == 0) - && (isWordsOrBytesNonInt(arrayOop)))) { + && (isWordsOrBytesNonImm(arrayOop)))) { return ((void *) (pointerForOop(arrayOop + BaseHeaderSize))); } /* begin primitiveFail */ @@ -17693,7 +17798,7 @@ && (((((usqInt)rcvr)) >= (startOfMemory())) && (((((usqInt)rcvr)) < GIV(freeStart)) && (((longAt(rcvr)) & TypeMask) != HeaderTypeGC))))) - && (!0)) { + && (!(isOopForwarded(rcvr)))) { rclass = ((rcvr & 1) ? longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassInteger << ShiftForWord)) : (((ccIndex = (((usqInt) (longAt(rcvr))) >> 12) & 0x1F)) == 0 @@ -17888,54 +17993,57 @@ */ static void -findNewMethodInClassTag(sqInt classTag) +findNewMethodInClassTag(sqInt classTagArg) { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt class; + sqInt classTag; CogMethod *cogMethod; + CogMethod *cogMethod1; sqInt hash; + sqInt hash1; sqInt methodHeader; + sqInt methodHeader1; sqInt ok; - sqInt oop; - sqInt oop1; sqInt probe; + sqInt probe1; /* begin lookupInMethodCacheSel:classTag: */ /* shift drops two low-order zeros from addresses */ - hash = GIV(messageSelector) ^ classTag; + hash1 = GIV(messageSelector) ^ classTagArg; /* first probe */ - probe = hash & MethodCacheMask; - if (((GIV(methodCache)[probe + MethodCacheSelector]) == GIV(messageSelector)) - && ((GIV(methodCache)[probe + MethodCacheClass]) == classTag)) { - GIV(newMethod) = GIV(methodCache)[probe + MethodCacheMethod]; - primitiveFunctionPointer = ((void (*)()) (GIV(methodCache)[probe + MethodCachePrimFunction])); + probe1 = hash1 & MethodCacheMask; + if (((GIV(methodCache)[probe1 + MethodCacheSelector]) == GIV(messageSelector)) + && ((GIV(methodCache)[probe1 + MethodCacheClass]) == classTagArg)) { + GIV(newMethod) = GIV(methodCache)[probe1 + MethodCacheMethod]; + primitiveFunctionPointer = ((void (*)()) (GIV(methodCache)[probe1 + MethodCachePrimFunction])); ok = 1; - goto l1; + goto l2; } /* second probe */ - probe = (((usqInt) hash) >> 1) & MethodCacheMask; - if (((GIV(methodCache)[probe + MethodCacheSelector]) == GIV(messageSelector)) - && ((GIV(methodCache)[probe + MethodCacheClass]) == classTag)) { - GIV(newMethod) = GIV(methodCache)[probe + MethodCacheMethod]; - primitiveFunctionPointer = ((void (*)()) (GIV(methodCache)[probe + MethodCachePrimFunction])); + probe1 = (((usqInt) hash1) >> 1) & MethodCacheMask; + if (((GIV(methodCache)[probe1 + MethodCacheSelector]) == GIV(messageSelector)) + && ((GIV(methodCache)[probe1 + MethodCacheClass]) == classTagArg)) { + GIV(newMethod) = GIV(methodCache)[probe1 + MethodCacheMethod]; + primitiveFunctionPointer = ((void (*)()) (GIV(methodCache)[probe1 + MethodCachePrimFunction])); ok = 1; - goto l1; + goto l2; } - probe = (((usqInt) hash) >> 2) & MethodCacheMask; - if (((GIV(methodCache)[probe + MethodCacheSelector]) == GIV(messageSelector)) - && ((GIV(methodCache)[probe + MethodCacheClass]) == classTag)) { - GIV(newMethod) = GIV(methodCache)[probe + MethodCacheMethod]; - primitiveFunctionPointer = ((void (*)()) (GIV(methodCache)[probe + MethodCachePrimFunction])); + probe1 = (((usqInt) hash1) >> 2) & MethodCacheMask; + if (((GIV(methodCache)[probe1 + MethodCacheSelector]) == GIV(messageSelector)) + && ((GIV(methodCache)[probe1 + MethodCacheClass]) == classTagArg)) { + GIV(newMethod) = GIV(methodCache)[probe1 + MethodCacheMethod]; + primitiveFunctionPointer = ((void (*)()) (GIV(methodCache)[probe1 + MethodCachePrimFunction])); ok = 1; - goto l1; + goto l2; } ok = 0; -l1: /* end lookupInMethodCacheSel:classTag: */; +l2: /* end lookupInMethodCacheSel:classTag: */; if (ok) { /* begin ifAppropriateCompileToNativeCode:selector: */ methodHeader = longAt((GIV(newMethod) + BaseHeaderSize) + (HeaderIndex << ShiftForWord)); @@ -17959,10 +18067,76 @@ } else { - /* entry was not found in the cache; look it up the hard way */ + /* entry was not found in the cache; perhaps soemthing was forwarded. */ + classTag = classTagArg; + if ((isOopForwarded(GIV(messageSelector))) + || (0)) { + if (isOopForwarded(GIV(messageSelector))) { + GIV(messageSelector) = handleForwardedSelectorFaultFor(GIV(messageSelector)); + } + + /* begin lookupInMethodCacheSel:classTag: */ + + /* shift drops two low-order zeros from addresses */ + + hash = GIV(messageSelector) ^ classTag; + + /* first probe */ + + probe = hash & MethodCacheMask; + if (((GIV(methodCache)[probe + MethodCacheSelector]) == GIV(messageSelector)) + && ((GIV(methodCache)[probe + MethodCacheClass]) == classTag)) { + GIV(newMethod) = GIV(methodCache)[probe + MethodCacheMethod]; + primitiveFunctionPointer = ((void (*)()) (GIV(methodCache)[probe + MethodCachePrimFunction])); + ok = 1; + goto l1; + } + + /* second probe */ + + probe = (((usqInt) hash) >> 1) & MethodCacheMask; + if (((GIV(methodCache)[probe + MethodCacheSelector]) == GIV(messageSelector)) + && ((GIV(methodCache)[probe + MethodCacheClass]) == classTag)) { + GIV(newMethod) = GIV(methodCache)[probe + MethodCacheMethod]; + primitiveFunctionPointer = ((void (*)()) (GIV(methodCache)[probe + MethodCachePrimFunction])); + ok = 1; + goto l1; + } + probe = (((usqInt) hash) >> 2) & MethodCacheMask; + if (((GIV(methodCache)[probe + MethodCacheSelector]) == GIV(messageSelector)) + && ((GIV(methodCache)[probe + MethodCacheClass]) == classTag)) { + GIV(newMethod) = GIV(methodCache)[probe + MethodCacheMethod]; + primitiveFunctionPointer = ((void (*)()) (GIV(methodCache)[probe + MethodCachePrimFunction])); + ok = 1; + goto l1; + } + ok = 0; + l1: /* end lookupInMethodCacheSel:classTag: */; + if (ok) { + /* begin ifAppropriateCompileToNativeCode:selector: */ + methodHeader1 = longAt((GIV(newMethod) + BaseHeaderSize) + (HeaderIndex << ShiftForWord)); + if (isCogMethodReference(methodHeader1)) { + + /* makeBaseFrame: can create cog methods with nil selectors. */ + + cogMethod1 = ((CogMethod *) methodHeader1); + if (((cogMethod1->selector)) == GIV(nilObj)) { + setSelectorOfto(cogMethod1, GIV(messageSelector)); + } + } + else { + if (((((usqInt) methodHeader1) >> 10) & 0xFF) <= maxLiteralCountForCompile) { + cogselector(GIV(newMethod), GIV(messageSelector)); + } + else { + maybeFlagMethodAsInterpreted(GIV(newMethod)); + } + } + return; + } + } class = classTag; - lookupMethodInClass(class); addNewMethodToCache(class); } @@ -17986,8 +18160,12 @@ && (((longAt(methArg)) & TypeMask) != HeaderTypeGC))))) { return GIV(nilObj); } - meth = methArg; - + if (isForwarded(methArg)) { + meth = followForwarded(methArg); + } + else { + meth = methArg; + } if (!(((meth & 1) == 0) && (((((usqInt) (longAt(meth))) >> (instFormatFieldLSB())) & 15) >= 12))) { return GIV(nilObj); @@ -18338,7 +18516,7 @@ { sqInt newFloatObj; - newFloatObj = eeInstantiateClassIndexformatnumSlots(ClassFloatCompactIndex, 6, 8 / (BytesPerWord)); + newFloatObj = eeInstantiateClassIndexformatnumSlots(ClassFloatCompactIndex, 6, ((sqInt) 8 >> 2)); storeFloatAtfrom(newFloatObj + (BaseHeaderSize), aFloat); return newFloatObj; } @@ -18428,14 +18606,14 @@ : byteAt((theFP + FoxIFrameFlags) + 1))))); ptr <= ((theFP + FoxCallerSavedIP) + BytesPerWord); ptr += BytesPerWord) { oop = longAt(ptr); if (((oop & 1) == 0) - && (0)) { + && (isForwarded(oop))) { longAtput(ptr, followForwarded(oop)); } } for (ptr = theSP; ptr <= (frameReceiverOffset(theFP)); ptr += BytesPerWord) { oop = longAt(ptr); if (((oop & 1) == 0) - && (0)) { + && (isForwarded(oop))) { longAtput(ptr, followForwarded(oop)); } } @@ -18464,15 +18642,15 @@ /* Spur's become: is lazy, turning the becommed object into a forwarding object to the other. The read-barrier is minimised by arranging that forwarding pointers will - fail a method cache probe, - since notionally objects' internals are accessed only via sending messages - to them (the exception - is primitives that access the internals of the non-receiver argument(s). - To avoid a read barrier on bytecode, literal and inst var fetch we scan - the receivers and methods - in the stack zone and follow any forwarded ones. This is of course way - cheaper than scanning all - of memory as in the old become. */ + fail a method cache + probe, since notionally objects' internals are accessed only via sending + messages to them, + the exception is primitives that access the internals of the non-receiver + argument(s). To avoid a read barrier on bytecode, literal and inst var + fetch we scan the receivers and + methods in the stack zone and follow any forwarded ones. This is of course + way cheaper + than scanning all of memory as in the old become. */ static void followForwardingPointersInStackZone(sqInt theBecomeEffectsFlags) @@ -18483,6 +18661,7 @@ sqInt delta; sqInt fieldIndex; sqInt i; + sqInt numArgs; sqInt offset; sqInt offset1; sqInt oop; @@ -18492,11 +18671,17 @@ char *theSP; if (theBecomeEffectsFlags & BecameCompiledMethodFlag) { - ; - + if (isForwarded(GIV(method))) { + theIPPtr = GIV(instructionPointer) - GIV(method); + GIV(method) = followForwarded(GIV(method)); + GIV(instructionPointer) = GIV(method) + theIPPtr; + } + if (isForwarded(GIV(newMethod))) { + GIV(newMethod) = followForwarded(GIV(newMethod)); + } } assert(GIV(stackPage) != 0); - for (i = 0; i <= (GIV(numStackPages) - 1); i += 1) { + for (i = 0; i < GIV(numStackPages); i += 1) { /* begin stackPageAt: */ thePage = stackPageAtpages(i, GIV(pages)); if (!(((thePage->baseFP)) == 0)) { @@ -18516,24 +18701,26 @@ assert(addressIsInPage(thePage, theFP)); assert((theIPPtr == 0) || (addressIsInPage(thePage, ((void *)theIPPtr)))); - offset = theFP + (frameStackedReceiverOffsetNumArgs(((((usqInt)(longAt(theFP + FoxMethod)))) < (startOfMemory()) - ? ((mframeCogMethod(theFP))->cmNumArgs) - : byteAt((theFP + FoxIFrameFlags) + 1)))); - oop = longAt(offset); + /* begin frameStackedReceiverOffsetNumArgs: */ + numArgs = ((((usqInt)(longAt(theFP + FoxMethod)))) < (startOfMemory()) + ? ((mframeCogMethod(theFP))->cmNumArgs) + : byteAt((theFP + FoxIFrameFlags) + 1)); + offset = (FoxCallerSavedIP + BytesPerWord) + (numArgs << ShiftForWord); + oop = longAt(theFP + offset); if (((oop & 1) == 0) - && (0)) { - longAtput(offset, followForwarded(oop)); + && (isForwarded(oop))) { + longAtput(theFP + offset, followForwarded(oop)); } if ((((((usqInt)(longAt(theFP + FoxMethod)))) < (startOfMemory()) ? ((longAt(theFP + FoxMethod)) & MFMethodFlagHasContextFlag) != 0 : (byteAt((theFP + FoxIFrameFlags) + 2)) != 0)) - && (0)) { + && (isForwarded(longAt(theFP + FoxThisContext)))) { longAtput(theFP + FoxThisContext, followForwarded(longAt(theFP + FoxThisContext))); } if ((((usqInt)(longAt(theFP + FoxMethod)))) < (startOfMemory())) { oop = longAt(theFP + FoxIFReceiver); if (((oop & 1) == 0) - && (0)) { + && (isForwarded(oop))) { longAtput(theFP + FoxIFReceiver, followForwarded(oop)); } assert(!(isForwarded(frameMethodObject(theFP)))); @@ -18541,19 +18728,43 @@ else { oop = longAt(theFP + FoxIFReceiver); if (((oop & 1) == 0) - && (0)) { + && (isForwarded(oop))) { longAtput(theFP + FoxIFReceiver, followForwarded(oop)); } oop = longAt(theFP + FoxMethod); - + if (isForwarded(oop)) { + delta = (followForwarded(oop)) - oop; + if ((theIPPtr != 0) + && ((longAt(theIPPtr)) > (longAt(theFP + FoxMethod)))) { + longAtput(theIPPtr, (longAt(theIPPtr)) + delta); + } + longAtput(theFP + FoxIFSavedIP, (longAt(theFP + FoxIFSavedIP)) + delta); + longAtput(theFP + FoxMethod, followForwarded(oop)); + } } /* begin followNecessaryForwardingInMethod: */ /* begin literal:ofMethod: */ offset1 = (literalCountOfHeader(headerOf(longAt(theFP + FoxMethod)))) - 1; assoc = longAt(((longAt(theFP + FoxMethod)) + BaseHeaderSize) + ((offset1 + LiteralStart) << ShiftForWord)); - + if (isForwarded(assoc)) { + assoc = followForwarded(assoc); + /* begin setMethodClassAssociationOf:to: */ + /* begin storePointer:ofObject:withValue: */ + fieldIndex = ((literalCountOfHeader(headerOf(longAt(theFP + FoxMethod)))) + LiteralStart) - 1; + if ((((usqInt) (longAt(theFP + FoxMethod)))) < (((usqInt) GIV(youngStart)))) { + possibleRootStoreIntovalue(longAt(theFP + FoxMethod), assoc); + } + longAtput(((longAt(theFP + FoxMethod)) + BaseHeaderSize) + (fieldIndex << ShiftForWord), assoc); + } classObj = longAt((assoc + BaseHeaderSize) + (ValueIndex << ShiftForWord)); - + if (isForwarded(classObj)) { + classObj = followForwarded(assoc); + /* begin storePointer:ofObject:withValue: */ + if ((((usqInt) assoc)) < (((usqInt) GIV(youngStart)))) { + possibleRootStoreIntovalue(assoc, classObj); + } + longAtput((assoc + BaseHeaderSize) + (ValueIndex << ShiftForWord), classObj); + } if (!(((callerFP = frameCallerFP(theFP))) != 0)) break; theIPPtr = ((usqInt)(theFP + FoxCallerSavedIP)); theFP = callerFP; @@ -18905,7 +19116,7 @@ sqInt i; StackPage *thePage; - for (i = 0; i <= (GIV(numStackPages) - 1); i += 1) { + for (i = 0; i < GIV(numStackPages); i += 1) { /* begin stackPageAt: */ thePage = stackPageAtpages(i, GIV(pages)); if ((!(isFree(thePage))) @@ -19728,7 +19939,7 @@ bitNo = 0; # if BytesPerWord > 4 - if (!(shifted < (1 << 32))) { + if (!(shifted < (1LL << 32))) { shifted = ((usqInt) shifted) >> 32; bitNo += 32; } @@ -20480,7 +20691,7 @@ GIV(pages) = ((StackPage *) pageStructBase); assert((((stackPageByteSize()) - (stackLimitBytes())) - (stackLimitOffset())) >= (stackPageHeadroom())); - for (index = 0; index <= (numPages - 1); index += 1) { + for (index = 0; index < numPages; index += 1) { /* begin stackPageAt: */ page = stackPageAtpages(index, GIV(pages)); (page->lastAddress = theStackPages + (index * GIV(bytesPerPage))); @@ -20500,7 +20711,7 @@ /* begin stackPageAt: */ page = stackPageAtpages(0, GIV(pages)); GIV(overflowLimit) = ((((page->baseAddress)) - ((page->realStackLimit))) * 3) / 5; - for (index = 0; index <= (numPages - 1); index += 1) { + for (index = 0; index < numPages; index += 1) { /* begin stackPageAt: */ page = stackPageAtpages(index, GIV(pages)); assert((pageIndexFor((page->baseAddress))) == index); @@ -20841,7 +21052,7 @@ sqInt integerValueOf(sqInt objectPointer) { - if ((objectPointer & 2147483648UL) != 0) { + if ((objectPointer & 0x80000000UL) != 0) { /* negative */ @@ -21091,7 +21302,7 @@ isCogMethodReference(sqInt methodHeader) { assert(((methodHeader & 1)) - || (((((usqInt)methodHeader)) < (maxCogMethodAddress())) + || (((((usqInt)methodHeader)) < (startOfMemory())) && ((((usqInt)methodHeader)) >= (minCogMethodAddress())))); return (methodHeader & 1) == 0; } @@ -21155,17 +21366,7 @@ return 0; } - -/* Compatibility wth SpurMemoryManager. In ObjectMemory, no forwarding - pointers are visible to the VM. */ - static sqInt -isForwarded(sqInt oop) -{ - return 0; -} - -static sqInt isFrameonPage(char *aFrame, StackPage *aPage) { char *theFP; @@ -21367,16 +21568,6 @@ && (((((usqInt) (longAt(oop))) >> (instFormatFieldLSB())) & 15) >= 12); } - -/* Compatibility wth SpurMemoryManager. In ObjectMemory, no forwarding - pointers are visible to the VM. */ - -static sqInt -isOopForwarded(sqInt oop) -{ - return 0; -} - sqInt isOopImmutable(sqInt anOop) { @@ -21540,7 +21731,11 @@ ? ((longAt(theFrame + FoxMethod)) & MFMethodFlagHasContextFlag) != 0 : (byteAt((theFrame + FoxIFrameFlags) + 2)) != 0))) { frameCtxt = longAt(theFrame + FoxThisContext); - + if (isForwarded(frameCtxt)) { + frameCtxt = followForwarded(frameCtxt); + /* begin setFrameContext:to: */ + longAtput(theFrame + FoxThisContext, frameCtxt); + } if (frameCtxt == aOnceMarriedContext) { /* It is still married! */ @@ -21557,13 +21752,13 @@ } -/* Answer true if the contains only indexable words or bytes (no oops). See +/* Answer if the contains only indexable words or bytes (no oops). See comment in formatOf: */ /* Note: Excludes CompiledMethods. */ static sqInt -isWordsOrBytesNonInt(sqInt oop) +isWordsOrBytesNonImm(sqInt oop) { sqInt fmt; @@ -21574,7 +21769,7 @@ } -/* Answer true if the contains only indexable words or bytes (no oops). See +/* Answer if the contains only indexable words or bytes (no oops). See comment in formatOf: */ /* Note: Excludes CompiledMethods. */ @@ -21583,11 +21778,11 @@ isWordsOrBytes(sqInt oop) { return ((oop & 1) == 0) - && (isWordsOrBytesNonInt(oop)); + && (isWordsOrBytesNonImm(oop)); } -/* Answer true if the argument contains only indexable words (no oops). See +/* Answer if the argument contains only indexable words (no oops). See comment in formatOf: */ @@ -22226,7 +22421,7 @@ if (!((fieldOop & 3) == 0)) { return 0; } - if ((fieldOop & 2147483648UL) == 0) { + if ((fieldOop & 0x80000000UL) == 0) { /* Internal pointer -- add segment offset */ @@ -22374,7 +22569,7 @@ && (((longAt(oop)) & TypeMask) != HeaderTypeGC))))) || (((oop & (BytesPerWord - 1)) != 0) || ((((longAt(oop)) & TypeMask) == HeaderTypeFree) - || (0))))) { + || (isForwarded(oop)))))) { printOop(oop); return; } @@ -23057,8 +23252,8 @@ sqInt sz; isSmall = (isNegative - ? magnitude <= 1073741824 - : magnitude < 1073741824); + ? magnitude <= 0x40000000 + : magnitude < 0x40000000); if (isSmall) { smallVal = ((sqInt) magnitude); if (isNegative) { @@ -23086,7 +23281,7 @@ } } newLargeInteger = instantiateClassindexableSize(largeClass, sz); - for (i = 0; i <= (sz - 1); i += 1) { + for (i = 0; i < sz; i += 1) { intValue = (magnitude >> (i * 8)) & 0xFF; byteAtput((newLargeInteger + BaseHeaderSize) + i, intValue); } @@ -23180,7 +23375,7 @@ return null; } value = 0; - for (i = 0; i <= (sz - 1); i += 1) { + for (i = 0; i < sz; i += 1) { value += (((sqLong) (byteAt((oop + BaseHeaderSize) + i)))) << (i * 8); } return value; @@ -23211,6 +23406,7 @@ StackPage *page; char *pointer; sqInt rawHeader; + sqInt rcvr; sqInt stackPtrIndex; sqInt theIP; sqInt theMethod; @@ -23218,6 +23414,9 @@ sqInt valuePointer; sqInt valuePointer1; + + /* theIP must be typed as signed because it is assigned ceCannotResumePC and so maybe implicitly typed as unsigned. */ + assert(isSingleContext(aContext)); assert(goodContextSize(aContext)); theIP = longAt((aContext + BaseHeaderSize) + (InstructionPointerIndex << ShiftForWord)); @@ -23237,6 +23436,12 @@ l2: /* end newStackPage */; longAtput((pointer = (page->baseAddress)), longAt((aContext + BaseHeaderSize) + (SenderIndex << ShiftForWord))); longAtput((pointer -= BytesPerWord), aContext); + + /* If the frame is a closure activation then the closure should be on the stack in + the pushed receiver position (closures receiver the value[:value:] messages). + Otherwise it should be the receiver proper. */ + + rcvr = longAt((aContext + BaseHeaderSize) + (ReceiverIndex << ShiftForWord)); maybeClosure = longAt((aContext + BaseHeaderSize) + (ClosureIndex << ShiftForWord)); if (maybeClosure != GIV(nilObj)) { /* begin quickFetchInteger:ofObject: */ @@ -23254,7 +23459,7 @@ : methodHeader); numArgs = (((usqInt) header) >> 25) & 15; - longAtput((pointer -= BytesPerWord), longAt((aContext + BaseHeaderSize) + (ReceiverIndex << ShiftForWord))); + longAtput((pointer -= BytesPerWord), rcvr); } for (i = 1; i <= numArgs; i += 1) { longAtput((pointer -= BytesPerWord), longAt((aContext + BaseHeaderSize) + ((ReceiverIndex + i) << ShiftForWord))); @@ -23327,7 +23532,7 @@ (page->baseFP = (page->headFP)); assert(frameHasContext((page->baseFP))); assert((frameNumArgs((page->baseFP))) == numArgs); @@ Diff output truncated at 50000 characters. @@

1 0

VM Maker: VMMaker.oscog-eem.537.mcz
by commits＠source.squeak.org 06 Dec '13

06 Dec '13

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.537.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.537 Author: eem Time: 5 December 2013, 3:13:42.744 pm UUID: 16e0cc2f-0c26-4d21-b1bf-1dde0d99b08b Ancestors: VMMaker.oscog-eem.536 Fix ObjectMemory's isForwarded:/isOopForwarded: macros. =============== Diff against VMMaker.oscog-eem.536 =============== Item was changed: ----- Method: ObjectMemory>>isForwarded: (in category 'interpreter access') ----- isForwarded: oop "Compatibility wth SpurMemoryManager. In ObjectMemory, no forwarding pointers are visible to the VM." <api> + <cmacro: '(oop) false'> - <cmacro: '() false'> <inline: true> ^false! Item was changed: ----- Method: ObjectMemory>>isOopForwarded: (in category 'interpreter access') ----- isOopForwarded: oop "Compatibility wth SpurMemoryManager. In ObjectMemory, no forwarding pointers are visible to the VM." <api> + <cmacro: '(oop) false'> - <cmacro: '() false'> <inline: true> ^false!

1 0

VM Maker: Cog-eem.125.mcz
by commits＠source.squeak.org 06 Dec '13

06 Dec '13

Eliot Miranda uploaded a new version of Cog to project VM Maker: http://source.squeak.org/VMMaker/Cog-eem.125.mcz ==================== Summary ==================== Name: Cog-eem.125 Author: eem Time: 5 December 2013, 3:04:34.318 pm UUID: 2621550b-a28f-498a-9731-2d7b34191391 Ancestors: Cog-eem.124 Fix the Spur bootstrap given it is broken on an updated trunk image. Any oop must be recomputed after GC. Snapshot must deal with the possibility that no large free chunks remain. The activeProcess must have its suspendedContext updated after each execution. =============== Diff against Cog-eem.124 =============== Item was changed: ----- Method: SpurBootstrap>>bootstrapImage (in category 'bootstrap image') ----- bootstrapImage oldHeap fullGC. oldHeapSize := oldHeap freeStart. + self initMaps. + self findRequiredGlobals. Transcript cr; nextPutAll: 'transforming image...'; flush. self cloneNilTrueAndFalse. self allocateFreeLists. self buildClassMap. self allocateClassTable. self cloneObjects. self fillInObjects. self fillInClassTable. newHeapSize := newHeap freeStart. newHeap initializePostBootstrap! Item was added: + ----- Method: SpurBootstrap>>initMaps (in category 'initialize-release') ----- + initMaps + map := Dictionary new: oldHeap memory size // 4. + reverseMap := Dictionary new: oldHeap memory size // 4. + classToIndex := Dictionary new: 1024. + literalMap := IdentityDictionary new. + methodClasses := Set new. + installedPrototypes := Set new. + sizeSym := rehashSym := classMetaclass := nil! Item was changed: ----- Method: SpurBootstrap>>on: (in category 'initialize-release') ----- on: imageName StackInterpreter initializeWithOptions: Dictionary new. oldInterpreter := StackInterpreterSimulator new. oldInterpreter openOn: imageName extraMemory: 0. oldHeap := oldInterpreter objectMemory. newHeap := Spur32BitMMLESimulator new. newHeap allocateMemoryOfSize: (oldHeap youngStart * 3 / 2 roundUpTo: 1024 * 1024) newSpaceSize: 1024 * 1024 stackSize: 1024 * 1024 codeSize: 0. newHeap setCheckForLeaks: 15 - 6. "don't check become; or newSpace; soooo many rehashes in bootstrap" + self initMaps! - map := Dictionary new: oldHeap memory size // 4. - reverseMap := Dictionary new: oldHeap memory size // 4. - classToIndex := Dictionary new: 1024. - literalMap := IdentityDictionary new. - methodClasses := Set new. - installedPrototypes := Set new! Item was changed: ----- Method: SpurBootstrap>>transform (in category 'bootstrap image') ----- transform | change | self rememberRehashSymbol. self findRequiredGlobals. self installModifiedMethods. self bootstrapImage. self validate. + self rememberRehashSymbol. self rehashImage. self followForwardingPointers. self scavengeImage. self freeForwarders. self compactImage. change := newHeapSize - oldHeapSize / oldHeapSize. Transcript nextPutAll: 'done.'; cr; nextPutAll: 'old heap size: '; print: oldHeapSize; cr; nextPutAll: 'initial new heap size: '; print: newHeapSize; cr; nextPutAll: 'change: '; print: (change * 100.0 roundTo: 0.01); nextPut: $%; cr; flush. newHeapSize := newHeap endOfMemory - newHeap scavenger eden limit - newHeap totalFreeListBytes. change := newHeapSize - oldHeapSize / oldHeapSize. Transcript nextPutAll: 'final new heap size: '; print: newHeapSize; cr; nextPutAll: 'change: '; print: (change * 100.0 roundTo: 0.01); nextPut: $%; cr; flush.! Item was changed: ----- Method: SpurBootstrap>>withExecutableInterpreter:do: (in category 'bootstrap methods') ----- withExecutableInterpreter: sim do: aBlock "With the oldInterpreter ready to execute code, evaluate aBlock, then return the interpreter (and the heap) to the ``just snapshotted'' state." | savedpc initialContext finalContext | sim initStackPages; loadInitialContext; internalizeIPandSP. initialContext := sim frameContext: sim localFP. savedpc := sim localIP. "sim printHeadFrame." aBlock value. "sim printHeadFrame." sim internalPush: sim localIP; externalizeIPandSP. "now undo the execution state" finalContext := sim voidVMStateForSnapshot. self assert: initialContext = finalContext. + self assert: sim localIP = savedpc. + sim objectMemory + storePointer: SuspendedContextIndex + ofObject: sim activeProcess + withValue: finalContext! - self assert: sim localIP = savedpc! Item was changed: ----- Method: SpurBootstrap>>writeSnapshotOfTransformedImageAs: (in category 'testing') ----- writeSnapshotOfTransformedImageAs: imageFileName "The bootstrapped image typically contains a few big free chunks and one huge free chunk. Test snapshot writing and loading by turning the largest non-huge chunks into segment bridges and saving." | penultimate ultimate heap sizes counts barriers sim | heap := TransformedImage veryDeepCopy. sim := StackInterpreterSimulator onObjectMemory: heap. sim bootstrapping: true. heap coInterpreter: sim. sim initializeInterpreter: 0; setImageHeaderFlagsFrom: ImageHeaderFlags; setDisplayForm: (Form extent: ImageScreenSize >> 16 @ (ImageScreenSize bitAnd: 16rFFFF)). heap allOldSpaceEntitiesDo: [:e| penultimate := ultimate. ultimate := e]. self assert: (heap isFreeObject: penultimate). self assert: (heap isSegmentBridge: ultimate). sizes := Bag new. heap allObjectsInFreeTree: (heap freeLists at: 0) do: [:f| sizes add: (heap bytesInObject: f)]. counts := sizes sortedCounts. self assert: counts last key = 1. "1 huge chunk" + counts size > 1 + ifTrue: + [self assert: ((counts at: counts size - 1) key > 2 + and: [(counts at: counts size - 1) value > 1024]). + barriers := (1 to: (counts at: counts size - 1) key) collect: + [:ign| heap allocateOldSpaceChunkOfExactlyBytes: (counts at: counts size - 1) value]. + barriers := barriers, {heap allocateOldSpaceChunkOfExactlyBytes: (heap bytesInObject: penultimate)}] + ifFalse: + [barriers := {heap allocateOldSpaceChunkOfExactlyBytes: (heap bytesInObject: penultimate)}]. - self assert: ((counts at: counts size - 1) key > 2 - and: [(counts at: counts size - 1) value > 1024]). - barriers := (1 to: (counts at: counts size - 1) key) collect: - [:ign| heap allocateOldSpaceChunkOfExactlyBytes: (counts at: counts size - 1) value]. - barriers := barriers, {heap allocateOldSpaceChunkOfExactlyBytes: (heap bytesInObject: penultimate)}. heap setEndOfMemory: barriers last. heap allOldSpaceEntitiesDo: [:e| penultimate := ultimate. ultimate := e]. self assert: (heap addressAfter: ultimate) = barriers last. heap checkFreeSpace. heap runLeakCheckerForFullGC: true. heap segmentManager initializeFromFreeChunks: (barriers sort collect: [:b| heap objectStartingAt: b]). heap checkFreeSpace. heap runLeakCheckerForFullGC: true. sim bereaveAndNormalizeContextsAndFlushExternalPrimitives. sim imageName: imageFileName. sim writeImageFileIO!

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

Vm-dev December 2013