Vm-dev December 2013

vm-dev@lists.squeakfoundation.org

27 participants
102 discussions

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

17 Dec '13

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.563.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.563 Author: eem Time: 16 December 2013, 3:41:22.598 pm UUID: 3116fc1b-f9a5-45f5-bc7e-4b5c68ec8247 Ancestors: VMMaker.oscog-eem.562 Avoid including the instrucitonPointer in the context when marrying the top frame during divorceAllFrames for voidVMState....If:. (how did this ever work??). Fix bogus assert failure in checkIfValidObjectRef:pc:cogMethod:. =============== Diff against VMMaker.oscog-eem.562 =============== Item was changed: ----- Method: Cogit>>checkIfValidObjectRef:pc:cogMethod: (in category 'garbage collection') ----- checkIfValidObjectRef: annotation pc: mcpc cogMethod: cogMethod <var: #mcpc type: #'char *'> <var: #sendTable type: #'sqInt *'> annotation = IsObjectReference ifTrue: [| literal | literal := backEnd literalBeforeFollowingAddress: mcpc asInteger. (objectRepresentation checkValidObjectReference: literal) ifFalse: [coInterpreter print: 'object ref leak in CM '; printHex: cogMethod asInteger; print: ' @ '; printHex: mcpc asInteger; cr. ^1]]. (self isSendAnnotation: annotation) ifTrue: [| entryPoint selectorOrCacheTag offset sendTable | entryPoint := backEnd callTargetFromReturnAddress: mcpc asInteger. + entryPoint <= methodZoneBase + ifTrue: + [offset := entryPoint] + ifFalse: + [self + offsetAndSendTableFor: entryPoint + annotation: annotation + into: [:off :table| offset := off. sendTable := table]]. - self - offsetAndSendTableFor: entryPoint - annotation: annotation - into: [:off :table| offset := off. sendTable := table]. selectorOrCacheTag := backEnd inlineCacheTagAt: mcpc asInteger. (entryPoint > methodZoneBase and: [offset ~= cmNoCheckEntryOffset and: [(self cCoerceSimple: entryPoint - offset to: #'CogMethod *') cmType ~= CMOpenPIC]]) ifTrue: "linked non-super send, cacheTag is a cacheTag" [(objectRepresentation checkValidInlineCacheTag: selectorOrCacheTag) ifFalse: [coInterpreter print: 'cache tag leak in CM '; printHex: cogMethod asInteger; print: ' @ '; printHex: mcpc asInteger; cr. ^1]] ifFalse: "unlinked send or super send; cacheTag is a selector" [(objectRepresentation checkValidObjectReference: selectorOrCacheTag) ifFalse: [coInterpreter print: 'selector leak in CM '; printHex: cogMethod asInteger; print: ' @ '; printHex: mcpc asInteger; cr. ^1]]]. ^0 "keep scanning"! Item was changed: ----- Method: StackInterpreter>>divorceAllFrames (in category 'frame access') ----- divorceAllFrames | activeContext | <inline: false> <var: #aPage type: #'StackPage *'> stackPage ~= 0 ifTrue: [self externalWriteBackHeadFramePointers]. + activeContext := self + ensureFrameIsMarried: framePointer + SP: stackPointer + BytesPerWord. - activeContext := self ensureFrameIsMarried: framePointer SP: stackPointer. 0 to: numStackPages - 1 do: [:i| | aPage | aPage := stackPages stackPageAt: i. (stackPages isFree: aPage) ifFalse: [self divorceFramesIn: aPage]]. self zeroStackPage. ^activeContext!

1 0

BlueBook BlockContext --why the sender is nil
by gettimothy 16 Dec '13

16 Dec '13

If you look at this (or attached, if it doesn't show up inline) picture from Eliot Miranda's Closure's Part I discussion , the naive <cough> me </cough> would spend two days wondering whey there are no senders. After all, its obvious that --sender: nil means that there are no senders. >From Squeak By Example, page 55 in the discussion of pseudo-variables, "nil is the unique instance of the class UndefinedObject". Which makes perfect sense. One of these days, I will get past paragraph 4 on this Closures Discussion, but boy, there are a lot of things going on under the hood there. (: Thanks for your patience as I try to grok this stuff. cheers. tty.

2 2

[commit][2831] Fix redef of BaseHeaderSize in platforms/Cross/plugins/ IA32ABI/ia32abicc.c.
by commits＠squeakvm.org 16 Dec '13

16 Dec '13

Revision: 2831 Author: eliot Date: 2013-12-11 16:38:39 -0800 (Wed, 11 Dec 2013) Log Message: ----------- Fix redef of BaseHeaderSize in platforms/Cross/plugins/IA32ABI/ia32abicc.c. Modified Paths: -------------- trunk/platforms/Cross/plugins/IA32ABI/ia32abicc.c Modified: trunk/platforms/Cross/plugins/IA32ABI/ia32abicc.c =================================================================== --- trunk/platforms/Cross/plugins/IA32ABI/ia32abicc.c 2013-12-12 00:37:38 UTC (rev 2830) +++ trunk/platforms/Cross/plugins/IA32ABI/ia32abicc.c 2013-12-12 00:38:39 UTC (rev 2831) @@ -52,7 +52,9 @@ # error cannot determine image word size/object header size #endif -#define BaseHeaderSize BytesPerOop +#if !defined(BaseHeaderSize) +# define BaseHeaderSize BytesPerOop +#endif #ifdef _MSC_VER # define alloca _alloca

5 15

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

13 Dec '13

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.562.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.562 Author: eem Time: 13 December 2013, 12:48:33.563 pm UUID: c612f6db-7bbc-4c69-86e4-65b2a90de879 Ancestors: VMMaker.oscog-eem.561 Generate better code for Spur's getInlineCacheClassTagFrom:into:. Refactor followNecessaryForwardingInMethod: to only compute the literal count once and, in Cog, to use the cmUsesMethodClass flag to avoid following methods without a super send anyway. Avoid following methodClass if not an Association (e.g. Newspeak). Fix SpurMemMgr>>firstIndexableField: =============== Diff against VMMaker.oscog-eem.561 =============== Item was changed: ----- Method: CoInterpreter>>actuallyFollowNecessaryForwardingInMethod: (in category 'lazy become') ----- actuallyFollowNecessaryForwardingInMethod: methodObj + "To avoid any chance of a forwarded object during super sends + we follow the methodClassAssociation. The forwarded object + send fault only copes with normal sends to instances." + | cogMethod header litCount | - "To avoid any chance of a forwarded object during super sends we follow the - methodClassAssociation. The forwarded object send fault only copes with - normal sends to instances." - | cogMethod header | <var: #cogMethod type: #'CogMethod *'> - super actuallyFollowNecessaryForwardingInMethod: methodObj. header := self rawHeaderOf: methodObj. (self isCogMethodReference: header) ifTrue: [cogMethod := self cCoerceSimple: header to: #'CogMethod *'. + "If the method class is not used we can avoid the forwarding + check for both the cogMehod and the bytecoded method." + cogMethod cmUsesMethodClass ifFalse: + [^self]. + cogit followForwardedLiteralsIn: cogMethod. + header := cogMethod methodHeader]. + litCount := self literalCountOfHeader: header. "Slang super expansion limitation" + super + actuallyFollowNecessaryForwardingInMethod: methodObj + literalCount: litCount! - cogMethod cmUsesMethodClass ifTrue: - [cogit followForwardedLiteralsIn: cogMethod]]! 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 + + objectMemory newSpaceBytes - "+ 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 + heapSize - memoryLimit: objectMemory memory + cogCodeSize + heapSize endOfMemory: objectMemory memory + cogCodeSize + 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! Item was changed: ----- Method: CogObjectRepresentationFor32BitSpur>>getInlineCacheClassTagFrom:into: (in category 'compile abstract instructions') ----- getInlineCacheClassTagFrom: sourceReg into: destReg "Extract the inline cache tag for the object in sourceReg into destReg. The inline cache tag for a given object is the value loaded in inline caches to distinguish objects of different classes. In Spur this is either the tags for immediates, (with 1 & 3 collapsed to 1 for SmallIntegers, and 2 collapsed to 0 for Characters), or the receiver's classIndex. Generate something like this: + Lentry: + movl rSource, rDest + andl $0x3, rDest + jz LnotImm + andl $1, rDest + j Lcmp + LnotImm: + movl 0(%edx), rDest + andl $0x3fffff, rDest + Lcmp: + At least on a 2.2GHz Intel Core i7 it is slightly faster, + 136m sends/sec vs 130m sends/sec for nfib in tinyBenchmarks, than Limm: andl $0x1, rDest j Lcmp Lentry: movl rSource, rDest andl $0x3, rDest jnz Limm movl 0(%edx), rDest andl $0x3fffff, rDest + Lcmp: - Lcmp " + | jumpNotImm entryLabel jumpCompare | + <var: #jumpNotImm type: #'AbstractInstruction *'> - | immLabel entryLabel jumpCompare | - <var: #immLabel type: #'AbstractInstruction *'> <var: #entryLabel type: #'AbstractInstruction *'> <var: #jumpCompare type: #'AbstractInstruction *'> + cogit AlignmentNops: (BytesPerWord max: 8). - cogit AlignmentNops: BytesPerWord. - immLabel := cogit Label. - cogit AndCq: 1 R: destReg. - jumpCompare := cogit Jump: 0. - cogit AlignmentNops: BytesPerWord. entryLabel := cogit Label. cogit MoveR: sourceReg R: destReg. cogit AndCq: objectMemory tagMask R: destReg. + jumpNotImm := cogit JumpZero: 0. + cogit AndCq: 1 R: destReg. + jumpCompare := cogit Jump: 0. - cogit JumpNonZero: immLabel. - self flag: #endianness. "Get least significant half of header word in destReg" + self flag: #endianness. + jumpNotImm jmpTarget: + (cogit MoveMw: 0 r: sourceReg R: destReg). + jumpCompare jmpTarget: + (cogit AndCq: objectMemory classIndexMask R: destReg). - cogit MoveMw: 0 r: sourceReg R: destReg. - cogit AndCq: objectMemory classIndexMask R: destReg. - jumpCompare jmpTarget: cogit Label. ^entryLabel! Item was changed: ----- Method: SpurMemoryManager>>firstIndexableField: (in category 'object format') ----- firstIndexableField: objOop "NOTE: overridden in various simulator subclasses to add coercion to CArray, so please duplicate any changes. There are only two important cases, both for objects with named inst vars, i.e. formats 2,3 & 5. The first indexable field for formats 2 & 5 is the slot count (by convention, even though that's off the end of the object). For 3 we must go to the class." | fmt classFormat | <returnTypeC: #'void *'> fmt := self formatOf: objOop. + fmt <= self weakArrayFormat ifTrue: + [fmt = self arrayFormat ifTrue: "array starts at 0." + [^self pointerForOop: objOop + self baseHeaderSize]. + fmt >= self indexablePointersFormat ifTrue: "indexable with inst vars; need to delve into the class format word" - fmt <= self lastPointerFormat ifTrue: "pointer; may need to delve into the class format word" - [(fmt between: self indexablePointersFormat and: self weakArrayFormat) ifTrue: [classFormat := self formatOfClass: (self fetchClassOfNonImm: objOop). ^self pointerForOop: objOop + self baseHeaderSize + ((self fixedFieldsOfClassFormat: classFormat) << self wordSize)]. + "otherwise not indexable" + ^0]. - ^self pointerForOop: objOop - + self baseHeaderSize - + ((self numSlotsOf: objOop) << self wordSize)]. "All bit objects, and indeed CompiledMethod, though this is a non-no, start at 0" + (fmt >= self sixtyFourBitIndexableFormat + and: [fmt < self firstCompiledMethodFormat]) ifTrue: + [^self pointerForOop: objOop + self baseHeaderSize]. + "otherwise not indexable" + ^0! - self assert: fmt < self firstCompiledMethodFormat. - ^self pointerForOop: objOop + self baseHeaderSize! Item was changed: ----- Method: StackInterpreter>>actuallyFollowNecessaryForwardingInMethod: (in category 'lazy become') ----- actuallyFollowNecessaryForwardingInMethod: methodObj "To avoid any chance of a forwarded object during super sends we follow the methodClassAssociation. The forwarded object send fault only copes with normal sends to instances." - | assoc classObj | <option: #SpurObjectMemory> <inline: true> + self actuallyFollowNecessaryForwardingInMethod: methodObj + literalCount: (self literalCountOf: methodObj)! - assoc := self methodClassAssociationOf: methodObj. - (objectMemory isForwarded: assoc) ifTrue: - [assoc := objectMemory followForwarded: assoc. - self setMethodClassAssociationOf: methodObj to: assoc]. - classObj := objectMemory fetchPointer: ValueIndex ofObject: assoc. - (objectMemory isForwarded: classObj) ifTrue: - [classObj := objectMemory followForwarded: assoc. - objectMemory storePointer: ValueIndex ofObject: assoc withValue: classObj]! Item was added: + ----- Method: StackInterpreter>>actuallyFollowNecessaryForwardingInMethod:literalCount: (in category 'lazy become') ----- + actuallyFollowNecessaryForwardingInMethod: methodObj literalCount: litCount + "To avoid any chance of a forwarded object during super sends we follow the + methodClassAssociation. The forwarded object send fault only copes with + normal sends to instances. Inline methodClassAssociation access for speed." + | assoc classObj | + <option: #SpurObjectMemory> + <inline: true> + assoc := self literal: litCount - 1 ofMethod: methodObj. + (objectMemory isForwarded: assoc) ifTrue: + [assoc := objectMemory followForwarded: assoc. + objectMemory + storePointer: litCount + LiteralStart - 1 + ofObject: methodObj + withValue: assoc]. + (objectMemory numSlotsOf: assoc) >= (ValueIndex + 1) ifTrue: + [classObj := objectMemory fetchPointer: ValueIndex ofObject: assoc. + (objectMemory isForwarded: classObj) ifTrue: + [classObj := objectMemory followForwarded: assoc. + objectMemory storePointer: ValueIndex ofObject: assoc withValue: classObj]]!

1 0

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

13 Dec '13

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.562.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.562 Author: eem Time: 13 December 2013, 12:36:44.297 pm UUID: 560c433d-5a56-4da9-a09d-dcc07160a342 Ancestors: VMMaker.oscog-eem.561 Refactor followNecessaryForwardingInMethod: to only compute the literal count once and, in Cog, to use the cmUsesMethodClass flag to avoid following methods without a super send anyway. Avoid following methodClass if not an Association (e.g. Newspeak). Fix SpurMemMgr>>firstIndexableField: Fix setting of endOfMemory in CoInterpreter>> readImageFromFile:HeapSize:StartingAt: =============== Diff against VMMaker.oscog-eem.561 =============== Item was changed: ----- Method: CoInterpreter>>actuallyFollowNecessaryForwardingInMethod: (in category 'lazy become') ----- actuallyFollowNecessaryForwardingInMethod: methodObj + "To avoid any chance of a forwarded object during super sends + we follow the methodClassAssociation. The forwarded object + send fault only copes with normal sends to instances." + | cogMethod header litCount | - "To avoid any chance of a forwarded object during super sends we follow the - methodClassAssociation. The forwarded object send fault only copes with - normal sends to instances." - | cogMethod header | <var: #cogMethod type: #'CogMethod *'> - super actuallyFollowNecessaryForwardingInMethod: methodObj. header := self rawHeaderOf: methodObj. (self isCogMethodReference: header) ifTrue: [cogMethod := self cCoerceSimple: header to: #'CogMethod *'. + "If the method class is not used we can avoid the forwarding + check for both the cogMehod and the bytecoded method." + cogMethod cmUsesMethodClass ifFalse: + [^self]. + cogit followForwardedLiteralsIn: cogMethod. + header := cogMethod methodHeader]. + litCount := self literalCountOfHeader: header. "Slang super expansion limitation" + super + actuallyFollowNecessaryForwardingInMethod: methodObj + literalCount: litCount! - cogMethod cmUsesMethodClass ifTrue: - [cogit followForwardedLiteralsIn: cogMethod]]! 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 + + objectMemory newSpaceBytes - "+ 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 + heapSize - memoryLimit: objectMemory memory + cogCodeSize + heapSize endOfMemory: objectMemory memory + cogCodeSize + 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! Item was changed: ----- Method: CogObjectRepresentationFor32BitSpur>>getInlineCacheClassTagFrom:into: (in category 'compile abstract instructions') ----- getInlineCacheClassTagFrom: sourceReg into: destReg "Extract the inline cache tag for the object in sourceReg into destReg. The inline cache tag for a given object is the value loaded in inline caches to distinguish objects of different classes. In Spur this is either the tags for immediates, (with 1 & 3 collapsed to 1 for SmallIntegers, and 2 collapsed to 0 for Characters), or the receiver's classIndex. Generate something like this: + Lentry: + movl rSource, rDest + andl $0x3, rDest + jz LnotImm + andl $1, rDest + j Lcmp + LnotImm: + movl 0(%edx), rDest + andl $0x3fffff, rDest + Lcmp: + At least on a 2.2GHz Intel Core i7 it is slightly faster, + 136m sends/sec vs 130m sends/sec for nfib in tinyBenchmarks, than Limm: andl $0x1, rDest j Lcmp Lentry: movl rSource, rDest andl $0x3, rDest jnz Limm movl 0(%edx), rDest andl $0x3fffff, rDest + Lcmp: - Lcmp " + | jumpNotImm entryLabel jumpCompare | + <var: #jumpNotImm type: #'AbstractInstruction *'> - | immLabel entryLabel jumpCompare | - <var: #immLabel type: #'AbstractInstruction *'> <var: #entryLabel type: #'AbstractInstruction *'> <var: #jumpCompare type: #'AbstractInstruction *'> + cogit AlignmentNops: (BytesPerWord max: 8). - cogit AlignmentNops: BytesPerWord. - immLabel := cogit Label. - cogit AndCq: 1 R: destReg. - jumpCompare := cogit Jump: 0. - cogit AlignmentNops: BytesPerWord. entryLabel := cogit Label. cogit MoveR: sourceReg R: destReg. cogit AndCq: objectMemory tagMask R: destReg. + jumpNotImm := cogit JumpZero: 0. + cogit AndCq: 1 R: destReg. + jumpCompare := cogit Jump: 0. - cogit JumpNonZero: immLabel. - self flag: #endianness. "Get least significant half of header word in destReg" + self flag: #endianness. + jumpNotImm jmpTarget: + (cogit MoveMw: 0 r: sourceReg R: destReg). + jumpCompare jmpTarget: + (cogit AndCq: objectMemory classIndexMask R: destReg). - cogit MoveMw: 0 r: sourceReg R: destReg. - cogit AndCq: objectMemory classIndexMask R: destReg. - jumpCompare jmpTarget: cogit Label. ^entryLabel! Item was changed: ----- Method: SpurMemoryManager>>firstIndexableField: (in category 'object format') ----- firstIndexableField: objOop "NOTE: overridden in various simulator subclasses to add coercion to CArray, so please duplicate any changes. There are only two important cases, both for objects with named inst vars, i.e. formats 2,3 & 5. The first indexable field for formats 2 & 5 is the slot count (by convention, even though that's off the end of the object). For 3 we must go to the class." | fmt classFormat | <returnTypeC: #'void *'> fmt := self formatOf: objOop. + fmt <= self weakArrayFormat ifTrue: + [fmt = self arrayFormat ifTrue: "array starts at 0." + [^self pointerForOop: objOop + self baseHeaderSize]. + fmt >= self indexablePointersFormat ifTrue: "indexable with inst vars; need to delve into the class format word" - fmt <= self lastPointerFormat ifTrue: "pointer; may need to delve into the class format word" - [(fmt between: self indexablePointersFormat and: self weakArrayFormat) ifTrue: [classFormat := self formatOfClass: (self fetchClassOfNonImm: objOop). ^self pointerForOop: objOop + self baseHeaderSize + ((self fixedFieldsOfClassFormat: classFormat) << self wordSize)]. + "otherwise not indexable" + ^0]. - ^self pointerForOop: objOop - + self baseHeaderSize - + ((self numSlotsOf: objOop) << self wordSize)]. "All bit objects, and indeed CompiledMethod, though this is a non-no, start at 0" + (fmt >= self sixtyFourBitIndexableFormat + and: [fmt < self firstCompiledMethodFormat]) ifTrue: + [^self pointerForOop: objOop + self baseHeaderSize]. + "otherwise not indexable" + ^0! - self assert: fmt < self firstCompiledMethodFormat. - ^self pointerForOop: objOop + self baseHeaderSize! Item was changed: ----- Method: StackInterpreter>>actuallyFollowNecessaryForwardingInMethod: (in category 'lazy become') ----- actuallyFollowNecessaryForwardingInMethod: methodObj "To avoid any chance of a forwarded object during super sends we follow the methodClassAssociation. The forwarded object send fault only copes with normal sends to instances." - | assoc classObj | <option: #SpurObjectMemory> <inline: true> + self actuallyFollowNecessaryForwardingInMethod: methodObj + literalCount: (self literalCountOf: methodObj)! - assoc := self methodClassAssociationOf: methodObj. - (objectMemory isForwarded: assoc) ifTrue: - [assoc := objectMemory followForwarded: assoc. - self setMethodClassAssociationOf: methodObj to: assoc]. - classObj := objectMemory fetchPointer: ValueIndex ofObject: assoc. - (objectMemory isForwarded: classObj) ifTrue: - [classObj := objectMemory followForwarded: assoc. - objectMemory storePointer: ValueIndex ofObject: assoc withValue: classObj]! Item was added: + ----- Method: StackInterpreter>>actuallyFollowNecessaryForwardingInMethod:literalCount: (in category 'lazy become') ----- + actuallyFollowNecessaryForwardingInMethod: methodObj literalCount: litCount + "To avoid any chance of a forwarded object during super sends we follow the + methodClassAssociation. The forwarded object send fault only copes with + normal sends to instances. Inline methodClassAssociation access for speed." + | assoc classObj | + <option: #SpurObjectMemory> + <inline: true> + assoc := self literal: litCount - 1 ofMethod: methodObj. + (objectMemory isForwarded: assoc) ifTrue: + [assoc := objectMemory followForwarded: assoc. + objectMemory + storePointer: litCount + LiteralStart - 1 + ofObject: methodObj + withValue: assoc]. + (self numSlotsOf: assoc) >= (ValueIndex + 1) ifTrue: + [classObj := objectMemory fetchPointer: ValueIndex ofObject: assoc. + (objectMemory isForwarded: classObj) ifTrue: + [classObj := objectMemory followForwarded: assoc. + objectMemory storePointer: ValueIndex ofObject: assoc withValue: classObj]]!

1 0

[commit][2832] CogVM source as per VMMaker.oscog-eem.561
by commits＠squeakvm.org 12 Dec '13

12 Dec '13

Revision: 2832 Author: eliot Date: 2013-12-12 14:53:13 -0800 (Thu, 12 Dec 2013) Log Message: ----------- CogVM source as per VMMaker.oscog-eem.561 Simplify StackInterpreter>>arrayValueOf: (isWordsOrBytes: already filters-out immediates). Remove RPATH spec from unix builds. Spur: Fix swizzling of Spur objStacks on start-up. Spur now snapshots and resumes. Beef up the objStack asserts and printing to identify my prior malfeasance. Modified Paths: -------------- branches/Cog/nscogsrc/plugins/UnixOSProcessPlugin/UnixOSProcessPlugin.c branches/Cog/nscogsrc/vm/cogit.c branches/Cog/nscogsrc/vm/cogit.h branches/Cog/nscogsrc/vm/cogmethod.h 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/platforms/unix/config/make.prg.in branches/Cog/scripts/findUnofficialFiles branches/Cog/spursrc/vm/cointerp.c branches/Cog/spursrc/vm/cointerp.h branches/Cog/spursrc/vm/gcc3x-cointerp.c branches/Cog/spursrc/vm/interp.h branches/Cog/spursrc/vm/vmCallback.h branches/Cog/spurstacksrc/vm/gcc3x-interp.c branches/Cog/spurstacksrc/vm/interp.c branches/Cog/spurstacksrc/vm/interp.h branches/Cog/spurstacksrc/vm/vmCallback.h branches/Cog/src/plugins/UnixOSProcessPlugin/UnixOSProcessPlugin.c 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/plugins/UnixOSProcessPlugin/UnixOSProcessPlugin.c =================================================================== --- branches/Cog/nscogsrc/plugins/UnixOSProcessPlugin/UnixOSProcessPlugin.c 2013-12-12 00:38:39 UTC (rev 2831) +++ branches/Cog/nscogsrc/plugins/UnixOSProcessPlugin/UnixOSProcessPlugin.c 2013-12-12 22:53:13 UTC (rev 2832) @@ -1,9 +1,9 @@ /* Automatically generated by - VMPluginCodeGenerator VMMaker.oscog-eem.517 uuid: 14ff7126-70ec-4cc4-9f55-70256e6a3d35 + VMPluginCodeGenerator VMMaker.oscog-eem.561 uuid: 13467880-93b9-4137-9bbc-7ebfd22436ab from - UnixOSProcessPlugin VMConstruction-Plugins-OSProcessPlugin.oscog-eem.44 uuid: 946fd79a-b249-4f25-8d13-11c6a087296f + UnixOSProcessPlugin VMConstruction-Plugins-OSProcessPlugin.oscog-eem.45 uuid: 7e7b595f-3783-417f-b514-4f5323e0a3c1 */ -static char __buildInfo[] = "UnixOSProcessPlugin VMConstruction-Plugins-OSProcessPlugin.oscog-eem.44 uuid: 946fd79a-b249-4f25-8d13-11c6a087296f " __DATE__ ; +static char __buildInfo[] = "UnixOSProcessPlugin VMConstruction-Plugins-OSProcessPlugin.oscog-eem.45 uuid: 7e7b595f-3783-417f-b514-4f5323e0a3c1 " __DATE__ ; /* D T Lewis - UnixOSProcessPlugin.c translated from class UnixOSProcessPlugin of OSProcessPlugin version 4.3.3 Cog */ @@ -318,9 +318,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "UnixOSProcessPlugin VMConstruction-Plugins-OSProcessPlugin.oscog-eem.44 (i)" + "UnixOSProcessPlugin VMConstruction-Plugins-OSProcessPlugin.oscog-eem.45 (i)" #else - "UnixOSProcessPlugin VMConstruction-Plugins-OSProcessPlugin.oscog-eem.44 (e)" + "UnixOSProcessPlugin VMConstruction-Plugins-OSProcessPlugin.oscog-eem.45 (e)" #endif ; static void *originalSigHandlers[NSIG]; Modified: branches/Cog/nscogsrc/vm/cogit.c =================================================================== --- branches/Cog/nscogsrc/vm/cogit.c 2013-12-12 00:38:39 UTC (rev 2831) +++ branches/Cog/nscogsrc/vm/cogit.c 2013-12-12 22:53:13 UTC (rev 2832) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator * VMMaker.oscog-eem.554 uuid: a666e7e4-245e-4e8a-9536-3aefd4509f47 + CCodeGenerator VMMaker.oscog-eem.561 uuid: 13467880-93b9-4137-9bbc-7ebfd22436ab from - StackToRegisterMappingCogit * VMMaker.oscog-eem.554 uuid: a666e7e4-245e-4e8a-9536-3aefd4509f47 + StackToRegisterMappingCogit VMMaker.oscog-eem.561 uuid: 13467880-93b9-4137-9bbc-7ebfd22436ab */ -static char __buildInfo[] = "StackToRegisterMappingCogit * VMMaker.oscog-eem.554 uuid: a666e7e4-245e-4e8a-9536-3aefd4509f47 " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.561 uuid: 13467880-93b9-4137-9bbc-7ebfd22436ab " __DATE__ ; char *__cogitBuildInfo = __buildInfo; Modified: branches/Cog/nscogsrc/vm/cogit.h =================================================================== --- branches/Cog/nscogsrc/vm/cogit.h 2013-12-12 00:38:39 UTC (rev 2831) +++ branches/Cog/nscogsrc/vm/cogit.h 2013-12-12 22:53:13 UTC (rev 2832) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator * VMMaker.oscog-eem.554 uuid: a666e7e4-245e-4e8a-9536-3aefd4509f47 + CCodeGenerator VMMaker.oscog-eem.561 uuid: 13467880-93b9-4137-9bbc-7ebfd22436ab */ Modified: branches/Cog/nscogsrc/vm/cogmethod.h =================================================================== --- branches/Cog/nscogsrc/vm/cogmethod.h 2013-12-12 00:38:39 UTC (rev 2831) +++ branches/Cog/nscogsrc/vm/cogmethod.h 2013-12-12 22:53:13 UTC (rev 2832) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.554 uuid: a666e7e4-245e-4e8a-9536-3aefd4509f47 + CCodeGenerator VMMaker.oscog-eem.561 uuid: 13467880-93b9-4137-9bbc-7ebfd22436ab */ typedef struct { Modified: branches/Cog/nscogsrc/vm/cointerp.c =================================================================== --- branches/Cog/nscogsrc/vm/cointerp.c 2013-12-12 00:38:39 UTC (rev 2831) +++ branches/Cog/nscogsrc/vm/cointerp.c 2013-12-12 22:53:13 UTC (rev 2832) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.558 uuid: ef7afd3b-c404-472c-a05a-9d9c6d905052 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.561 uuid: 13467880-93b9-4137-9bbc-7ebfd22436ab from - CoInterpreter VMMaker.oscog-eem.558 uuid: ef7afd3b-c404-472c-a05a-9d9c6d905052 + CoInterpreter VMMaker.oscog-eem.561 uuid: 13467880-93b9-4137-9bbc-7ebfd22436ab */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.558 uuid: ef7afd3b-c404-472c-a05a-9d9c6d905052 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.561 uuid: 13467880-93b9-4137-9bbc-7ebfd22436ab " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -1143,7 +1143,7 @@ static void rewriteMethodCacheEntryForExternalPrimitiveToFunction(void (*localPrimAddress)(void)); static sqInt roomToPushNArgs(sqInt n); static void runLeakCheckerForFullGC(sqInt fullGCFlag); -static usqInt safeObjectAfter(sqInt oop); +static sqInt safeObjectAfter(sqInt oop); static sqInt safePrintStringOf(sqInt oop); usqInt scavengeThresholdAddress(void); EXPORT(sqInt) sendInvokeCallbackContext(VMCallbackContext *vmCallbackContext); @@ -2030,7 +2030,7 @@ /* 575 */ (void (*)(void))0, 0 }; static void (*externalPrimitiveTable[MaxExternalPrimitiveTableSize + 1 /* 4097 */])(void); -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.558"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.561"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; @@ -5666,7 +5666,6 @@ /* begin internalPush: */ longAtPointerput((localSP -= BytesPerOop), longAt((rcvr + BaseHeaderSize) + (byte3 << ShiftForWord))); } - null; goto l4; } if (opType == 3) { @@ -5676,7 +5675,6 @@ assert(GIV(method) == (iframeMethod(localFP))); object = longAt((GIV(method) + BaseHeaderSize) + ((byte3 + LiteralStart) << ShiftForWord)); longAtPointerput((localSP -= BytesPerOop), object); - null; goto l4; } if (opType == 4) { @@ -5690,7 +5688,6 @@ object2 = longAt((oop + BaseHeaderSize) + (ValueIndex << ShiftForWord)); longAtPointerput((localSP -= BytesPerOop), object2); - null; goto l4; } top = longAtPointer(localSP); @@ -13716,8 +13713,7 @@ arrayValueOf(sqInt arrayOop) { DECL_MAYBE_SQ_GLOBAL_STRUCT if (((arrayOop & 1) == 0) - && (((arrayOop & 1) == 0) - && (isWordsOrBytesNonImm(arrayOop)))) { + && (isWordsOrBytesNonImm(arrayOop))) { return ((void *) (pointerForOop(arrayOop + BaseHeaderSize))); } /* begin primitiveFail */ @@ -20877,8 +20873,7 @@ arrayOop = longAt((objectPointer + BaseHeaderSize) + (fieldIndex << ShiftForWord)); /* begin arrayValueOf: */ if (((arrayOop & 1) == 0) - && (((arrayOop & 1) == 0) - && (isWordsOrBytesNonImm(arrayOop)))) { + && (isWordsOrBytesNonImm(arrayOop))) { return ((void *) (pointerForOop(arrayOop + BaseHeaderSize))); } /* begin primitiveFail */ @@ -23729,15 +23724,17 @@ sqInt header1; sqInt header2; sqInt header3; + sqInt header4; usqInt lastWord; sqInt newFreeChunk; sqInt newOop; - usqInt next; + sqInt next; sqInt oop; sqInt realHeader; sqInt sz; sqInt sz1; sqInt sz2; + sqInt sz3; sqInt target; usqInt w; @@ -23748,7 +23745,21 @@ /* begin objectAfterWhileForwarding: */ header2 = longAt(oop); if ((header2 & MarkBit) == 0) { - next = ((sqInt) (objectAfter(oop))); + /* begin objectAfter: */ + if (!(asserta(oopisLessThan(oop, GIV(freeStart))))) { + error("no objects after the end of memory"); + } + if (((longAt(oop)) & TypeMask) == HeaderTypeFree) { + sz2 = (longAt(oop)) & AllButTypeMask; + } + else { + /* begin sizeBitsOf: */ + header3 = longAt(oop); + sz2 = ((header3 & TypeMask) == HeaderTypeSizeAndClass + ? (longAt(oop - (BytesPerWord * 2))) & LongSizeMask + : header3 & SizeMask); + } + next = (oop + sz2) + (headerTypeBytes[(longAt(oop + sz2)) & TypeMask]); goto l1; } fwdBlock1 = (header2 & AllButMarkBitAndTypeMask) << 1; @@ -23763,7 +23774,7 @@ else { sz1 = realHeader & SizeMask; } - next = ((sqInt) ((oop + sz1) + (headerTypeBytes[(longAt(oop + sz1)) & TypeMask]))); + next = (oop + sz1) + (headerTypeBytes[(longAt(oop + sz1)) & TypeMask]); l1: /* end objectAfterWhileForwarding: */; if (!(((longAt(oop)) & TypeMask) == HeaderTypeFree)) { @@ -23817,18 +23828,18 @@ } /* begin safeObjectAfter: */ if (((longAt(newFreeChunk)) & TypeMask) == HeaderTypeFree) { - sz2 = (longAt(newFreeChunk)) & AllButTypeMask; + sz3 = (longAt(newFreeChunk)) & AllButTypeMask; } else { /* begin sizeBitsOf: */ - header3 = longAt(newFreeChunk); - sz2 = ((header3 & TypeMask) == HeaderTypeSizeAndClass + header4 = longAt(newFreeChunk); + sz3 = ((header4 & TypeMask) == HeaderTypeSizeAndClass ? (longAt(newFreeChunk - (BytesPerWord * 2))) & LongSizeMask - : header3 & SizeMask); + : header4 & SizeMask); } - next = ((newFreeChunk + sz2) >= GIV(freeStart) + next = ((newFreeChunk + sz3) >= GIV(freeStart) ? GIV(freeStart) - : (newFreeChunk + sz2) + (headerTypeBytes[(longAt(newFreeChunk + sz2)) & TypeMask])); + : (newFreeChunk + sz3) + (headerTypeBytes[(longAt(newFreeChunk + sz3)) & TypeMask])); assert((next == GIV(freeStart)) || (next == (oopFromChunk(GIV(compEnd))))); if (next == GIV(freeStart)) { @@ -50038,7 +50049,7 @@ given object or free chunk in memory. Return freeStart when enumeration is complete. This is for assertion checking only. */ -static usqInt +static sqInt safeObjectAfter(sqInt oop) { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt header; Modified: branches/Cog/nscogsrc/vm/cointerp.h =================================================================== --- branches/Cog/nscogsrc/vm/cointerp.h 2013-12-12 00:38:39 UTC (rev 2831) +++ branches/Cog/nscogsrc/vm/cointerp.h 2013-12-12 22:53:13 UTC (rev 2832) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.558 uuid: ef7afd3b-c404-472c-a05a-9d9c6d905052 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.561 uuid: 13467880-93b9-4137-9bbc-7ebfd22436ab */ Modified: branches/Cog/nscogsrc/vm/gcc3x-cointerp.c =================================================================== --- branches/Cog/nscogsrc/vm/gcc3x-cointerp.c 2013-12-12 00:38:39 UTC (rev 2831) +++ branches/Cog/nscogsrc/vm/gcc3x-cointerp.c 2013-12-12 22:53:13 UTC (rev 2832) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.558 uuid: ef7afd3b-c404-472c-a05a-9d9c6d905052 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.561 uuid: 13467880-93b9-4137-9bbc-7ebfd22436ab from - CoInterpreter VMMaker.oscog-eem.558 uuid: ef7afd3b-c404-472c-a05a-9d9c6d905052 + CoInterpreter VMMaker.oscog-eem.561 uuid: 13467880-93b9-4137-9bbc-7ebfd22436ab */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.558 uuid: ef7afd3b-c404-472c-a05a-9d9c6d905052 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.561 uuid: 13467880-93b9-4137-9bbc-7ebfd22436ab " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -1146,7 +1146,7 @@ static void rewriteMethodCacheEntryForExternalPrimitiveToFunction(void (*localPrimAddress)(void)); static sqInt roomToPushNArgs(sqInt n); static void runLeakCheckerForFullGC(sqInt fullGCFlag); -static usqInt safeObjectAfter(sqInt oop); +static sqInt safeObjectAfter(sqInt oop); static sqInt safePrintStringOf(sqInt oop); usqInt scavengeThresholdAddress(void); EXPORT(sqInt) sendInvokeCallbackContext(VMCallbackContext *vmCallbackContext); @@ -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.558"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.561"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; @@ -5675,7 +5675,6 @@ /* begin internalPush: */ longAtPointerput((localSP -= BytesPerOop), longAt((rcvr + BaseHeaderSize) + (byte3 << ShiftForWord))); } - null; goto l4; } if (opType == 3) { @@ -5685,7 +5684,6 @@ assert(GIV(method) == (iframeMethod(localFP))); object = longAt((GIV(method) + BaseHeaderSize) + ((byte3 + LiteralStart) << ShiftForWord)); longAtPointerput((localSP -= BytesPerOop), object); - null; goto l4; } if (opType == 4) { @@ -5699,7 +5697,6 @@ object2 = longAt((oop + BaseHeaderSize) + (ValueIndex << ShiftForWord)); longAtPointerput((localSP -= BytesPerOop), object2); - null; goto l4; } top = longAtPointer(localSP); @@ -13725,8 +13722,7 @@ arrayValueOf(sqInt arrayOop) { DECL_MAYBE_SQ_GLOBAL_STRUCT if (((arrayOop & 1) == 0) - && (((arrayOop & 1) == 0) - && (isWordsOrBytesNonImm(arrayOop)))) { + && (isWordsOrBytesNonImm(arrayOop))) { return ((void *) (pointerForOop(arrayOop + BaseHeaderSize))); } /* begin primitiveFail */ @@ -20886,8 +20882,7 @@ arrayOop = longAt((objectPointer + BaseHeaderSize) + (fieldIndex << ShiftForWord)); /* begin arrayValueOf: */ if (((arrayOop & 1) == 0) - && (((arrayOop & 1) == 0) - && (isWordsOrBytesNonImm(arrayOop)))) { + && (isWordsOrBytesNonImm(arrayOop))) { return ((void *) (pointerForOop(arrayOop + BaseHeaderSize))); } /* begin primitiveFail */ @@ -23738,15 +23733,17 @@ sqInt header1; sqInt header2; sqInt header3; + sqInt header4; usqInt lastWord; sqInt newFreeChunk; sqInt newOop; - usqInt next; + sqInt next; sqInt oop; sqInt realHeader; sqInt sz; sqInt sz1; sqInt sz2; + sqInt sz3; sqInt target; usqInt w; @@ -23757,7 +23754,21 @@ /* begin objectAfterWhileForwarding: */ header2 = longAt(oop); if ((header2 & MarkBit) == 0) { - next = ((sqInt) (objectAfter(oop))); + /* begin objectAfter: */ + if (!(asserta(oopisLessThan(oop, GIV(freeStart))))) { + error("no objects after the end of memory"); + } + if (((longAt(oop)) & TypeMask) == HeaderTypeFree) { + sz2 = (longAt(oop)) & AllButTypeMask; + } + else { + /* begin sizeBitsOf: */ + header3 = longAt(oop); + sz2 = ((header3 & TypeMask) == HeaderTypeSizeAndClass + ? (longAt(oop - (BytesPerWord * 2))) & LongSizeMask + : header3 & SizeMask); + } + next = (oop + sz2) + (headerTypeBytes[(longAt(oop + sz2)) & TypeMask]); goto l1; } fwdBlock1 = (header2 & AllButMarkBitAndTypeMask) << 1; @@ -23772,7 +23783,7 @@ else { sz1 = realHeader & SizeMask; } - next = ((sqInt) ((oop + sz1) + (headerTypeBytes[(longAt(oop + sz1)) & TypeMask]))); + next = (oop + sz1) + (headerTypeBytes[(longAt(oop + sz1)) & TypeMask]); l1: /* end objectAfterWhileForwarding: */; if (!(((longAt(oop)) & TypeMask) == HeaderTypeFree)) { @@ -23826,18 +23837,18 @@ } /* begin safeObjectAfter: */ if (((longAt(newFreeChunk)) & TypeMask) == HeaderTypeFree) { - sz2 = (longAt(newFreeChunk)) & AllButTypeMask; + sz3 = (longAt(newFreeChunk)) & AllButTypeMask; } else { /* begin sizeBitsOf: */ - header3 = longAt(newFreeChunk); - sz2 = ((header3 & TypeMask) == HeaderTypeSizeAndClass + header4 = longAt(newFreeChunk); + sz3 = ((header4 & TypeMask) == HeaderTypeSizeAndClass ? (longAt(newFreeChunk - (BytesPerWord * 2))) & LongSizeMask - : header3 & SizeMask); + : header4 & SizeMask); } - next = ((newFreeChunk + sz2) >= GIV(freeStart) + next = ((newFreeChunk + sz3) >= GIV(freeStart) ? GIV(freeStart) - : (newFreeChunk + sz2) + (headerTypeBytes[(longAt(newFreeChunk + sz2)) & TypeMask])); + : (newFreeChunk + sz3) + (headerTypeBytes[(longAt(newFreeChunk + sz3)) & TypeMask])); assert((next == GIV(freeStart)) || (next == (oopFromChunk(GIV(compEnd))))); if (next == GIV(freeStart)) { @@ -50047,7 +50058,7 @@ given object or free chunk in memory. Return freeStart when enumeration is complete. This is for assertion checking only. */ -static usqInt +static sqInt safeObjectAfter(sqInt oop) { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt header; Modified: branches/Cog/nscogsrc/vm/interp.h =================================================================== --- branches/Cog/nscogsrc/vm/interp.h 2013-12-12 00:38:39 UTC (rev 2831) +++ branches/Cog/nscogsrc/vm/interp.h 2013-12-12 22:53:13 UTC (rev 2832) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.558 uuid: ef7afd3b-c404-472c-a05a-9d9c6d905052 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.561 uuid: 13467880-93b9-4137-9bbc-7ebfd22436ab */ #define VM_PROXY_MAJOR 1 Modified: branches/Cog/nscogsrc/vm/vmCallback.h =================================================================== --- branches/Cog/nscogsrc/vm/vmCallback.h 2013-12-12 00:38:39 UTC (rev 2831) +++ branches/Cog/nscogsrc/vm/vmCallback.h 2013-12-12 22:53:13 UTC (rev 2832) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.558 uuid: ef7afd3b-c404-472c-a05a-9d9c6d905052 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.561 uuid: 13467880-93b9-4137-9bbc-7ebfd22436ab */ #define VM_CALLBACK_INC 1 Property changes on: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h ___________________________________________________________________ Modified: checkindate - Wed Dec 11 16:36:32 PST 2013 + Thu Dec 12 14:52:39 PST 2013 Modified: branches/Cog/platforms/unix/config/make.prg.in =================================================================== --- branches/Cog/platforms/unix/config/make.prg.in 2013-12-12 00:38:39 UTC (rev 2831) +++ branches/Cog/platforms/unix/config/make.prg.in 2013-12-12 22:53:13 UTC (rev 2832) @@ -2,7 +2,7 @@ # # Author: Ian.Piumarta(a)inria.fr # -# Last edited: Thu Jan 21 14:59:38 PST 2010 by eliot (support for .cpp) +# Last edited: Thu Dec 12 10:36:03 PST 2013 by eliot (eliminate -R from LINK) o = .o a = .a @@ -16,5 +16,5 @@ $(LDFLAGS) $(XLDFLAGS) -export-dynamic -c -o LINK = $(LIBTOOL) --mode=link \ $(CC) $(CFLAGS) $(XCFLAGS) \ - $(LDFLAGS) $(XLDFLAGS) -export-dynamic -R$(libdir) -o + $(LDFLAGS) $(XLDFLAGS) -export-dynamic -o RANLIB = : Modified: branches/Cog/scripts/findUnofficialFiles =================================================================== --- branches/Cog/scripts/findUnofficialFiles 2013-12-12 00:38:39 UTC (rev 2831) +++ branches/Cog/scripts/findUnofficialFiles 2013-12-12 22:53:13 UTC (rev 2832) @@ -1,4 +1,4 @@ #!/bin/sh # List any files with an un-checked-in package version comment "* VMMaker-..." -find "${@-src}" -name .svn -prune -o $ -type f -a -name '*.[ch]' $ \ - -exec fgrep -l '* VMMaker' {} \; +find ${@-src nscogsrc stacksrc spursrc spurstacksrc} -name .svn -prune -o $ -type f -a -name '*.[ch]' $ \ + -exec egrep -l '\* VMMaker|\* VMConstruction' {} \; Modified: branches/Cog/spursrc/vm/cointerp.c =================================================================== --- branches/Cog/spursrc/vm/cointerp.c 2013-12-12 00:38:39 UTC (rev 2831) +++ branches/Cog/spursrc/vm/cointerp.c 2013-12-12 22:53:13 UTC (rev 2832) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.560 uuid: db9cf7fa-a7d7-4b48-9e9d-32c8d43e330f + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.561 uuid: 13467880-93b9-4137-9bbc-7ebfd22436ab from - CoInterpreter VMMaker.oscog-eem.560 uuid: db9cf7fa-a7d7-4b48-9e9d-32c8d43e330f + CoInterpreter VMMaker.oscog-eem.561 uuid: 13467880-93b9-4137-9bbc-7ebfd22436ab */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.560 uuid: db9cf7fa-a7d7-4b48-9e9d-32c8d43e330f " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.561 uuid: 13467880-93b9-4137-9bbc-7ebfd22436ab " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -1431,6 +1431,7 @@ _iss sqInt numClassTablePages; _iss sqInt longRunningPrimitiveCheckSemaphore; _iss sqInt tempOop; +_iss char * objStackInvalidBecause; _iss SpurNewSpaceSpace eden; _iss sqInt profileProcess; _iss sqInt profileSemaphore; @@ -1438,7 +1439,7 @@ _iss sqInt ephemeronList; _iss sqInt needGCFlag; _iss sqInt extraRootCount; -_iss char * objStackInvalidBecause; +_iss sqInt invalidObjStackPage; _iss sqInt previousRememberedSetSize; _iss unsigned char * classTableBitmap; _iss sqInt longRunningPrimitiveCheckMethod; @@ -1446,7 +1447,6 @@ _iss sqInt lastMethodCacheProbeWrite; _iss sqInt lkupClass; _iss sqInt profileMethod; -_iss sqInt invalidObjStackPage; _iss usqLong nextWakeupUsecs; _iss sqInt preemptionYields; _iss sqInt cogCompiledCodeCompactionCalledFor; @@ -2162,7 +2162,7 @@ 0 }; static void (*externalPrimitiveTable[MaxExternalPrimitiveTableSize + 1 /* 4097 */])(void); usqInt heapBase; -const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.560]"; +const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.561]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; @@ -11584,9 +11584,8 @@ void * arrayValueOf(sqInt arrayOop) { DECL_MAYBE_SQ_GLOBAL_STRUCT - if (((arrayOop & 1) == 0) - && (((arrayOop & 3) == 0) - && (((((usqInt) (longAt(arrayOop))) >> 24) & 0x1F) > 5))) { + if (((arrayOop & 3) == 0) + && (((((usqInt) (longAt(arrayOop))) >> 24) & 0x1F) > 5)) { return ((void *) (pointerForOop(arrayOop + BaseHeaderSize))); } /* begin primitiveFail */ @@ -20880,9 +20879,8 @@ arrayOop = longAt((objectPointer + (BaseHeaderSize)) + (fieldIndex << 2)); /* begin arrayValueOf: */ - if (((arrayOop & 1) == 0) - && (((arrayOop & 3) == 0) - && (((((usqInt) (longAt(arrayOop))) >> 24) & 0x1F) > 5))) { + if (((arrayOop & 3) == 0) + && (((((usqInt) (longAt(arrayOop))) >> 24) & 0x1F) > 5)) { return ((void *) (pointerForOop(arrayOop + BaseHeaderSize))); } /* begin primitiveFail */ @@ -26608,6 +26606,7 @@ sqInt freeOrNextPage; sqInt index; char *ns; + sqInt page; if (!(isValidObjStackPagemyIndex(objStackPage, myx))) { return 0; @@ -26619,6 +26618,11 @@ GIV(invalidObjStackPage) = objStackPage; return 0; } + if (freeOrNextPage == (longAt((objStackPage + (BaseHeaderSize)) + (ObjStackNextx << 2)))) { + GIV(objStackInvalidBecause) = "free page = next page"; + GIV(invalidObjStackPage) = freeOrNextPage; + return 0; + } if (!(isValidObjStackPagemyIndex(freeOrNextPage, myx))) { ns = malloc(((strlen(GIV(objStackInvalidBecause))) + (strlen(", on next page"))) + 2); strcpy(ns, GIV(objStackInvalidBecause)); @@ -26626,7 +26630,14 @@ return 0; } - freeOrNextPage = longAt((freeOrNextPage + (BaseHeaderSize)) + (ObjStackFreex << 2)); + page = longAt((freeOrNextPage + (BaseHeaderSize)) + (ObjStackFreex << 2)); + if ((page == freeOrNextPage) + || (page == objStackPage)) { + GIV(objStackInvalidBecause) = "circularity in free page list"; + GIV(invalidObjStackPage) = page; + return 0; + } + freeOrNextPage = page; } if (isFirstPage) { if (!(((myx >= (1 << (22 - 10))) && (myx <= (((1 << (22 - 10)) + 8) - 1))))) { @@ -26647,8 +26658,15 @@ return 0; } freeOrNextPage = longAt((objStackPage + (BaseHeaderSize)) + (ObjStackNextx << 2)); - return (freeOrNextPage == 0) - || (isValidObjStackPagemyIndexfirstPage(freeOrNextPage, myx, 0)); + if (freeOrNextPage == 0) { + return 1; + } + if (freeOrNextPage == objStackPage) { + GIV(objStackInvalidBecause) = "circularity in objStack page list"; + GIV(invalidObjStackPage) = objStackPage; + return 0; + } + return isValidObjStackPagemyIndexfirstPage(freeOrNextPage, myx, 0); } @@ -50305,6 +50323,7 @@ sqInt isFirstPage; sqInt isFreePage; sqInt isNextPage; + sqInt page; isFirstPage = pageType == ObjStackMyx; isNextPage = pageType == ObjStackNextx; @@ -50330,10 +50349,20 @@ /* begin cr */ printf("\n"); } - freeOrNextPage = longAt((objStackPage + (BaseHeaderSize)) + (ObjStackFreex << 2)); - while (freeOrNextPage != 0) { - printObjStackPagemyIndexpageType(freeOrNextPage, myx, ObjStackFreex); - freeOrNextPage = longAt((freeOrNextPage + (BaseHeaderSize)) + (ObjStackFreex << 2)); + if (isFirstPage) { + freeOrNextPage = longAt((objStackPage + (BaseHeaderSize)) + (ObjStackFreex << 2)); + while (freeOrNextPage != 0) { + printObjStackPagemyIndexpageType(freeOrNextPage, myx, ObjStackFreex); + page = longAt((freeOrNextPage + (BaseHeaderSize)) + (ObjStackFreex << 2)); + if ((page == freeOrNextPage) + || (page == objStackPage)) { + print("circularity in free page list!!"); + /* begin cr */ + printf("\n"); + page = 0; + } + freeOrNextPage = page; + } } freeOrNextPage = longAt((objStackPage + (BaseHeaderSize)) + (ObjStackNextx << 2)); if (freeOrNextPage != 0) { @@ -56804,6 +56833,7 @@ sqInt field; sqInt firstPage; sqInt index; + sqInt page; sqInt stackOrNil; firstPage = (stackOrNil = longAt((GIV(hiddenRootsObj) + (BaseHeaderSize)) + (objStackRootIndex << 2))); @@ -56825,20 +56855,34 @@ /* begin storePointer:ofObjStack:withValue: */ assert((formatOf(stackOrNil)) == (wordIndexableFormat())); null; - longAtput((stackOrNil + (BaseHeaderSize)) + (ObjStackNextx << 2), field); + longAtput((stackOrNil + (BaseHeaderSize)) + (index << 2), field); } } while(((index -= 1)) > ObjStackMyx); } while(((stackOrNil = field)) != 0); - while (1) { - stackOrNil = longAt((firstPage + (BaseHeaderSize)) + (ObjStackFreex << 2)); - if (!(stackOrNil != 0)) break; - field = swizzleObj(stackOrNil); - /* begin storePointer:ofObjStack:withValue: */ - assert((formatOf(firstPage)) == (wordIndexableFormat())); - null; - longAtput((firstPage + (BaseHeaderSize)) + (ObjStackFreex << 2), field); - firstPage = field; + if (((stackOrNil = longAt((firstPage + (BaseHeaderSize)) + (ObjStackFreex << 2)))) != 0) { + while (1) { + page = longAt((stackOrNil + (BaseHeaderSize)) + (ObjStackFreex << 2)); + if (!(page != 0)) break; + field = swizzleObj(page); + /* begin storePointer:ofObjStack:withValue: */ + assert((formatOf(stackOrNil)) == (wordIndexableFormat())); + null; + longAtput((stackOrNil + (BaseHeaderSize)) + (ObjStackFreex << 2), field); + stackOrNil = field; + } } + if (((stackOrNil = longAt((firstPage + (BaseHeaderSize)) + (ObjStackNextx << 2)))) != 0) { + while (1) { + page = longAt((stackOrNil + (BaseHeaderSize)) + (ObjStackNextx << 2)); + if (!(page != 0)) break; + field = swizzleObj(page); + /* begin storePointer:ofObjStack:withValue: */ + assert((formatOf(stackOrNil)) == (wordIndexableFormat())); + null; + longAtput((stackOrNil + (BaseHeaderSize)) + (ObjStackNextx << 2), field); + stackOrNil = field; + } + } assert(isValidObjStackAt(objStackRootIndex)); return longAt((GIV(hiddenRootsObj) + (BaseHeaderSize)) + (objStackRootIndex << 2)); } Modified: branches/Cog/spursrc/vm/cointerp.h =================================================================== --- branches/Cog/spursrc/vm/cointerp.h 2013-12-12 00:38:39 UTC (rev 2831) +++ branches/Cog/spursrc/vm/cointerp.h 2013-12-12 22:53:13 UTC (rev 2832) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.560 uuid: db9cf7fa-a7d7-4b48-9e9d-32c8d43e330f + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.561 uuid: 13467880-93b9-4137-9bbc-7ebfd22436ab */ Modified: branches/Cog/spursrc/vm/gcc3x-cointerp.c =================================================================== --- branches/Cog/spursrc/vm/gcc3x-cointerp.c 2013-12-12 00:38:39 UTC (rev 2831) +++ branches/Cog/spursrc/vm/gcc3x-cointerp.c 2013-12-12 22:53:13 UTC (rev 2832) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.560 uuid: db9cf7fa-a7d7-4b48-9e9d-32c8d43e330f + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.561 uuid: 13467880-93b9-4137-9bbc-7ebfd22436ab from - CoInterpreter VMMaker.oscog-eem.560 uuid: db9cf7fa-a7d7-4b48-9e9d-32c8d43e330f + CoInterpreter VMMaker.oscog-eem.561 uuid: 13467880-93b9-4137-9bbc-7ebfd22436ab */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.560 uuid: db9cf7fa-a7d7-4b48-9e9d-32c8d43e330f " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.561 uuid: 13467880-93b9-4137-9bbc-7ebfd22436ab " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -1434,6 +1434,7 @@ _iss sqInt numClassTablePages; _iss sqInt longRunningPrimitiveCheckSemaphore; _iss sqInt tempOop; +_iss char * objStackInvalidBecause; _iss SpurNewSpaceSpace eden; _iss sqInt profileProcess; _iss sqInt profileSemaphore; @@ -1441,7 +1442,7 @@ _iss sqInt ephemeronList; _iss sqInt needGCFlag; _iss sqInt extraRootCount; -_iss char * objStackInvalidBecause; +_iss sqInt invalidObjStackPage; _iss sqInt previousRememberedSetSize; _iss unsigned char * classTableBitmap; _iss sqInt longRunningPrimitiveCheckMethod; @@ -1449,7 +1450,6 @@ _iss sqInt lastMethodCacheProbeWrite; _iss sqInt lkupClass; _iss sqInt profileMethod; -_iss sqInt invalidObjStackPage; _iss usqLong nextWakeupUsecs; _iss sqInt preemptionYields; _iss sqInt cogCompiledCodeCompactionCalledFor; @@ -2165,7 +2165,7 @@ 0 }; static void (*externalPrimitiveTable[MaxExternalPrimitiveTableSize + 1 /* 4097 */])(void); usqInt heapBase; -const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.560]"; +const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.561]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; @@ -11593,9 +11593,8 @@ void * arrayValueOf(sqInt arrayOop) { DECL_MAYBE_SQ_GLOBAL_STRUCT - if (((arrayOop & 1) == 0) - && (((arrayOop & 3) == 0) - && (((((usqInt) (longAt(arrayOop))) >> 24) & 0x1F) > 5))) { + if (((arrayOop & 3) == 0) + && (((((usqInt) (longAt(arrayOop))) >> 24) & 0x1F) > 5)) { return ((void *) (pointerForOop(arrayOop + BaseHeaderSize))); } /* begin primitiveFail */ @@ -20889,9 +20888,8 @@ arrayOop = longAt((objectPointer + (BaseHeaderSize)) + (fieldIndex << 2)); /* begin arrayValueOf: */ - if (((arrayOop & 1) == 0) - && (((arrayOop & 3) == 0) - && (((((usqInt) (longAt(arrayOop))) >> 24) & 0x1F) > 5))) { + if (((arrayOop & 3) == 0) + && (((((usqInt) (longAt(arrayOop))) >> 24) & 0x1F) > 5)) { return ((void *) (pointerForOop(arrayOop + BaseHeaderSize))); } /* begin primitiveFail */ @@ -26617,6 +26615,7 @@ sqInt freeOrNextPage; sqInt index; char *ns; + sqInt page; if (!(isValidObjStackPagemyIndex(objStackPage, myx))) { return 0; @@ -26628,6 +26627,11 @@ GIV(invalidObjStackPage) = objStackPage; return 0; } + if (freeOrNextPage == (longAt((objStackPage + (BaseHeaderSize)) + (ObjStackNextx << 2)))) { + GIV(objStackInvalidBecause) = "free page = next page"; + GIV(invalidObjStackPage) = freeOrNextPage; + return 0; + } if (!(isValidObjStackPagemyIndex(freeOrNextPage, myx))) { ns = malloc(((strlen(GIV(objStackInvalidBecause))) + (strlen(", on next page"))) + 2); strcpy(ns, GIV(objStackInvalidBecause)); @@ -26635,7 +26639,14 @@ return 0; } - freeOrNextPage = longAt((freeOrNextPage + (BaseHeaderSize)) + (ObjStackFreex << 2)); + page = longAt((freeOrNextPage + (BaseHeaderSize)) + (ObjStackFreex << 2)); + if ((page == freeOrNextPage) + || (page == objStackPage)) { + GIV(objStackInvalidBecause) = "circularity in free page list"; + GIV(invalidObjStackPage) = page; + return 0; + } + freeOrNextPage = page; } if (isFirstPage) { if (!(((myx >= (1 << (22 - 10))) && (myx <= (((1 << (22 - 10)) + 8) - 1))))) { @@ -26656,8 +26667,15 @@ return 0; } freeOrNextPage = longAt((objStackPage + (BaseHeaderSize)) + (ObjStackNextx << 2)); - return (freeOrNextPage == 0) - || (isValidObjStackPagemyIndexfirstPage(freeOrNextPage, myx, 0)); + if (freeOrNextPage == 0) { + return 1; + } + if (freeOrNextPage == objStackPage) { + GIV(objStackInvalidBecause) = "circularity in objStack page list"; + GIV(invalidObjStackPage) = objStackPage; + return 0; + } + return isValidObjStackPagemyIndexfirstPage(freeOrNextPage, myx, 0); } @@ -50314,6 +50332,7 @@ sqInt isFirstPage; sqInt isFreePage; sqInt isNextPage; + sqInt page; isFirstPage = pageType == ObjStackMyx; isNextPage = pageType == ObjStackNextx; @@ -50339,10 +50358,20 @@ /* begin cr */ printf("\n"); } - freeOrNextPage = longAt((objStackPage + (BaseHeaderSize)) + (ObjStackFreex << 2)); - while (freeOrNextPage != 0) { - printObjStackPagemyIndexpageType(freeOrNextPage, myx, ObjStackFreex); - freeOrNextPage = longAt((freeOrNextPage + (BaseHeaderSize)) + (ObjStackFreex << 2)); + if (isFirstPage) { + freeOrNextPage = longAt((objStackPage + (BaseHeaderSize)) + (ObjStackFreex << 2)); + while (freeOrNextPage != 0) { + printObjStackPagemyIndexpageType(freeOrNextPage, myx, ObjStackFreex); + page = longAt((freeOrNextPage + (BaseHeaderSize)) + (ObjStackFreex << 2)); + if ((page == freeOrNextPage) + || (page == objStackPage)) { + print("circularity in free page list!!"); + /* begin cr */ + printf("\n"); + page = 0; + } + freeOrNextPage = page; + } } freeOrNextPage = longAt((objStackPage + (BaseHeaderSize)) + (ObjStackNextx << 2)); if (freeOrNextPage != 0) { @@ -56813,6 +56842,7 @@ sqInt field; sqInt firstPage; sqInt index; + sqInt page; sqInt stackOrNil; firstPage = (stackOrNil = longAt((GIV(hiddenRootsObj) + (BaseHeaderSize)) + (objStackRootIndex << 2))); @@ -56834,20 +56864,34 @@ /* begin storePointer:ofObjStack:withValue: */ assert((formatOf(stackOrNil)) == (wordIndexableFormat())); null; - longAtput((stackOrNil + (BaseHeaderSize)) + (ObjStackNextx << 2), field); + longAtput((stackOrNil + (BaseHeaderSize)) + (index << 2), field); } } while(((index -= 1)) > ObjStackMyx); } while(((stackOrNil = field)) != 0); - while (1) { - stackOrNil = longAt((firstPage + (BaseHeaderSize)) + (ObjStackFreex << 2)); - if (!(stackOrNil != 0)) break; - field = swizzleObj(stackOrNil); - /* begin storePointer:ofObjStack:withValue: */ - assert((formatOf(firstPage)) == (wordIndexableFormat())); - null; - longAtput((firstPage + (BaseHeaderSize)) + (ObjStackFreex << 2), field); - firstPage = field; + if (((stackOrNil = longAt((firstPage + (BaseHeaderSize)) + (ObjStackFreex << 2)))) != 0) { + while (1) { + page = longAt((stackOrNil + (BaseHeaderSize)) + (ObjStackFreex << 2)); + if (!(page != 0)) break; + field = swizzleObj(page); + /* begin storePointer:ofObjStack:withValue: */ + assert((formatOf(stackOrNil)) == (wordIndexableFormat())); + null; + longAtput((stackOrNil + (BaseHeaderSize)) + (ObjStackFreex << 2), field); + stackOrNil = field; + } } + if (((stackOrNil = longAt((firstPage + (BaseHeaderSize)) + (ObjStackNextx << 2)))) != 0) { + while (1) { + page = longAt((stackOrNil + (BaseHeaderSize)) + (ObjStackNextx << 2)); + if (!(page != 0)) break; + field = swizzleObj(page); + /* begin storePointer:ofObjStack:withValue: */ + assert((formatOf(stackOrNil)) == (wordIndexableFormat())); + null; + longAtput((stackOrNil + (BaseHeaderSize)) + (ObjStackNextx << 2), field); + stackOrNil = field; + } + } assert(isValidObjStackAt(objStackRootIndex)); return longAt((GIV(hiddenRootsObj) + (BaseHeaderSize)) + (objStackRootIndex << 2)); } Modified: branches/Cog/spursrc/vm/interp.h =================================================================== --- branches/Cog/spursrc/vm/interp.h 2013-12-12 00:38:39 UTC (rev 2831) +++ branches/Cog/spursrc/vm/interp.h 2013-12-12 22:53:13 UTC (rev 2832) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.560 uuid: db9cf7fa-a7d7-4b48-9e9d-32c8d43e330f + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.561 uuid: 13467880-93b9-4137-9bbc-7ebfd22436ab */ #define VM_PROXY_MAJOR 1 Modified: branches/Cog/spursrc/vm/vmCallback.h =================================================================== --- branches/Cog/spursrc/vm/vmCallback.h 2013-12-12 00:38:39 UTC (rev 2831) +++ branches/Cog/spursrc/vm/vmCallback.h 2013-12-12 22:53:13 UTC (rev 2832) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.560 uuid: db9cf7fa-a7d7-4b48-9e9d-32c8d43e330f + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.561 uuid: 13467880-93b9-4137-9bbc-7ebfd22436ab */ #define VM_CALLBACK_INC 1 Modified: branches/Cog/spurstacksrc/vm/gcc3x-interp.c =================================================================== --- branches/Cog/spurstacksrc/vm/gcc3x-interp.c 2013-12-12 00:38:39 UTC (rev 2831) +++ branches/Cog/spurstacksrc/vm/gcc3x-interp.c 2013-12-12 22:53:13 UTC (rev 2832) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.560 uuid: db9cf7fa-a7d7-4b48-9e9d-32c8d43e330f + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.561 uuid: 13467880-93b9-4137-9bbc-7ebfd22436ab from - StackInterpreter VMMaker.oscog-eem.560 uuid: db9cf7fa-a7d7-4b48-9e9d-32c8d43e330f + StackInterpreter VMMaker.oscog-eem.561 uuid: 13467880-93b9-4137-9bbc-7ebfd22436ab */ -static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.560 uuid: db9cf7fa-a7d7-4b48-9e9d-32c8d43e330f " __DATE__ ; +static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.561 uuid: 13467880-93b9-4137-9bbc-7ebfd22436ab " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -1243,6 +1243,7 @@ _iss sqInt numStackPages; _iss sqInt tempOop; _iss sqLong nextProfileTick; +_iss char * objStackInvalidBecause; _iss SpurNewSpaceSpace eden; _iss sqInt profileProcess; _iss sqInt tenureThreshold; @@ -1250,7 +1251,7 @@ _iss sqInt needGCFlag; _iss sqInt numPages; _iss sqInt extraRootCount; -_iss char * objStackInvalidBecause; +_iss sqInt invalidObjStackPage; _iss sqInt previousRememberedSetSize; _iss unsigned char * classTableBitmap; _iss sqInt longRunningPrimitiveCheckMethod; @@ -1259,7 +1260,6 @@ _iss sqInt lastMethodCacheProbeWrite; _iss sqInt profileMethod; _iss sqInt growHeadroom; -_iss sqInt invalidObjStackPage; _iss usqLong nextWakeupUsecs; _iss sqInt preemptionYields; _iss sqInt profileSemaphore; @@ -1955,7 +1955,7 @@ 0 }; char * breakSelector; sqInt breakSelectorLength = -1; -const char *interpreterVersion = "Croquet Closure Stack VM [StackInterpreter VMMaker.oscog-eem.560]"; +const char *interpreterVersion = "Croquet Closure Stack VM [StackInterpreter VMMaker.oscog-eem.561]"; volatile int sendTrace; sqInt suppressHeartbeatFlag; @@ -12058,9 +12058,8 @@ void * arrayValueOf(sqInt arrayOop) { DECL_MAYBE_SQ_GLOBAL_STRUCT - if (((arrayOop & 1) == 0) - && (((arrayOop & 3) == 0) - && (((((usqInt) (longAt(arrayOop))) >> 24) & 0x1F) > 5))) { + if (((arrayOop & 3) == 0) + && (((((usqInt) (longAt(arrayOop))) >> 24) & 0x1F) > 5)) { return ((void *) (pointerForOop(arrayOop + BaseHeaderSize))); } /* begin primitiveFail */ @@ -18782,9 +18781,8 @@ arrayOop = longAt((objectPointer + (BaseHeaderSize)) + (fieldIndex << 2)); /* begin arrayValueOf: */ - if (((arrayOop & 1) == 0) - && (((arrayOop & 3) == 0) - && (((((usqInt) (longAt(arrayOop))) >> 24) & 0x1F) > 5))) { + if (((arrayOop & 3) == 0) + && (((((usqInt) (longAt(arrayOop))) >> 24) & 0x1F) > 5)) { return ((void *) (pointerForOop(arrayOop + BaseHeaderSize))); } /* begin primitiveFail */ @@ -23939,6 +23937,7 @@ sqInt freeOrNextPage; sqInt index; char *ns; + sqInt page; if (!(isValidObjStackPagemyIndex(objStackPage, myx))) { return 0; @@ -23950,6 +23949,11 @@ GIV(invalidObjStackPage) = objStackPage; return 0; } + if (freeOrNextPage == (longAt((objStackPage + (BaseHeaderSize)) + (ObjStackNextx << 2)))) { + GIV(objStackInvalidBecause) = "free page = next page"; + GIV(invalidObjStackPage) = freeOrNextPage; + return 0; + } if (!(isValidObjStackPagemyIndex(freeOrNextPage, myx))) { ns = malloc(((strlen(GIV(objStackInvalidBecause))) + (strlen(", on next page"))) + 2); strcpy(ns, GIV(objStackInvalidBecause)); @@ -23957,7 +23961,14 @@ return 0; } - freeOrNextPage = longAt((freeOrNextPage + (BaseHeaderSize)) + (ObjStackFreex << 2)); + page = longAt((freeOrNextPage + (BaseHeaderSize)) + (ObjStackFreex << 2)); + if ((page == freeOrNextPage) + || (page == objStackPage)) { + GIV(objStackInvalidBecause) = "circularity in free page list"; + GIV(invalidObjStackPage) = page; + return 0; + } + freeOrNextPage = page; } if (isFirstPage) { if (!(((myx >= (1 << (22 - 10))) && (myx <= (((1 << (22 - 10)) + 8) - 1))))) { @@ -23978,8 +23989,15 @@ return 0; } freeOrNextPage = longAt((objStackPage + (BaseHeaderSize)) + (ObjStackNextx << 2)); - return (freeOrNextPage == 0) - || (isValidObjStackPagemyIndexfirstPage(freeOrNextPage, myx, 0)); + if (freeOrNextPage == 0) { + return 1; + } + if (freeOrNextPage == objStackPage) { + GIV(objStackInvalidBecause) = "circularity in objStack page list"; + GIV(invalidObjStackPage) = objStackPage; + return 0; + } + return isValidObjStackPagemyIndexfirstPage(freeOrNextPage, myx, 0); } @@ -46360,6 +46378,7 @@ sqInt isFirstPage; sqInt isFreePage; sqInt isNextPage; + sqInt page; isFirstPage = pageType == ObjStackMyx; isNextPage = pageType == ObjStackNextx; @@ -46385,10 +46404,20 @@ /* begin cr */ printf("\n"); } - freeOrNextPage = longAt((objStackPage + (BaseHeaderSize)) + (ObjStackFreex << 2)); - while (freeOrNextPage != 0) { - printObjStackPagemyIndexpageType(freeOrNextPage, myx, ObjStackFreex); - freeOrNextPage = longAt((freeOrNextPage + (BaseHeaderSize)) + (ObjStackFreex << 2)); + if (isFirstPage) { + freeOrNextPage = longAt((objStackPage + (BaseHeaderSize)) + (ObjStackFreex << 2)); + while (freeOrNextPage != 0) { + printObjStackPagemyIndexpageType(freeOrNextPage, myx, ObjStackFreex); + page = longAt((freeOrNextPage + (BaseHeaderSize)) + (ObjStackFreex << 2)); + if ((page == freeOrNextPage) + || (page == objStackPage)) { + print("circularity in free page list!!"); + /* begin cr */ + printf("\n"); + page = 0; + } + freeOrNextPage = page; + } } freeOrNextPage = longAt((objStackPage + (BaseHeaderSize)) + (ObjStackNextx << 2)); if (freeOrNextPage != 0) { @@ -52350,6 +52379,7 @@ sqInt field; sqInt firstPage; sqInt index; + sqInt page; sqInt stackOrNil; firstPage = (stackOrNil = longAt((GIV(hiddenRootsObj) + (BaseHeaderSize)) + (objStackRootIndex << 2))); @@ -52371,20 +52401,34 @@ /* begin storePointer:ofObjStack:withValue: */ assert((formatOf(stackOrNil)) == (wordIndexableFormat())); null; - longAtput((stackOrNil + (BaseHeaderSize)) + (ObjStackNextx << 2), field); + longAtput((stackOrNil + (BaseHeaderSize)) + (index << 2), field); } } while(((index -= 1)) > ObjStackMyx); } while(((stackOrNil = field)) != 0); - while (1) { - stackOrNil = longAt((firstPage + (BaseHeaderSize)) + (ObjStackFreex << 2)); - if (!(stackOrNil != 0)) break; - field = swizzleObj(stackOrNil); - /* begin storePointer:ofObjStack:withValue: */ - assert((formatOf(firstPage)) == (wordIndexableFormat())); - null; - longAtput((firstPage + (BaseHeaderSize)) + (ObjStackFreex << 2), field); - firstPage = field; + if (((stackOrNil = longAt((firstPage + (BaseHeaderSize)) + (ObjStackFreex << 2)))) != 0) { + while (1) { + page = longAt((stackOrNil + (BaseHeaderSize)) + (ObjStackFreex << 2)); + if (!(page != 0)) break; + field = swizzleObj(page); + /* begin storePointer:ofObjStack:withValue: */ + assert((formatOf(stackOrNil)) == (wordIndexableFormat())); + null; + longAtput((stackOrNil + (BaseHeaderSize)) + (ObjStackFreex << 2), field); + stackOrNil = field; + } } + if (((stackOrNil = longAt((firstPage + (BaseHeaderSize)) + (ObjStackNextx << 2)))) != 0) { + while (1) { + page = longAt((stackOrNil + (BaseHeaderSize)) + (ObjStackNextx << 2)); + if (!(page != 0)) break; + field = swizzleObj(page); + /* begin storePointer:ofObjStack:withValue: */ + assert((formatOf(stackOrNil)) == (wordIndexableFormat())); + null; + longAtput((stackOrNil + (BaseHeaderSize)) + (ObjStackNextx << 2), field); + stackOrNil = field; + } + } assert(isValidObjStackAt(objStackRootIndex)); return longAt((GIV(hiddenRootsObj) + (BaseHeaderSize)) + (objStackRootIndex << 2)); } Modified: branches/Cog/spurstacksrc/vm/interp.c =================================================================== --- branches/Cog/spurstacksrc/vm/interp.c 2013-12-12 00:38:39 UTC (rev 2831) +++ branches/Cog/spurstacksrc/vm/interp.c 2013-12-12 22:53:13 UTC (rev 2832) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.560 uuid: db9cf7fa-a7d7-4b48-9e9d-32c8d43e330f + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.561 uuid: 13467880-93b9-4137-9bbc-7ebfd22436ab from - StackInterpreter VMMaker.oscog-eem.560 uuid: db9cf7fa-a7d7-4b48-9e9d-32c8d43e330f + StackInterpreter VMMaker.oscog-eem.561 uuid: 13467880-93b9-4137-9bbc-7ebfd22436ab */ -static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.560 uuid: db9cf7fa-a7d7-4b48-9e9d-32c8d43e330f " __DATE__ ; +static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.561 uuid: 13467880-93b9-4137-9bbc-7ebfd22436ab " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -1240,6 +1240,7 @@ _iss sqInt numStackPages; _iss sqInt tempOop; _iss sqLong nextProfileTick; +_iss char * objStackInvalidBecause; _iss SpurNewSpaceSpace eden; _iss sqInt profileProcess; _iss sqInt tenureThreshold; @@ -1247,7 +1248,7 @@ _iss sqInt needGCFlag; _iss sqInt numPages; _iss sqInt extraRootCount; -_iss char * objStackInvalidBecause; +_iss sqInt invalidObjStackPage; _iss sqInt previousRememberedSetSize; _iss unsigned char * classTableBitmap; _iss sqInt longRunningPrimitiveCheckMethod; @@ -1256,7 +1257,6 @@ _iss sqInt lastMethodCacheProbeWrite; _iss sqInt profileMethod; _iss sqInt growHeadroom; -_iss sqInt invalidObjStackPage; _iss usqLong nextWakeupUsecs; _iss sqInt preemptionYields; _iss sqInt profileSemaphore; @@ -1952,7 +1952,7 @@ 0 }; char * breakSelector; sqInt breakSelectorLength = -1; -const char *interpreterVersion = "Croquet Closure Stack VM [StackInterpreter VMMaker.oscog-eem.560]"; +const char *interpreterVersion = "Croquet Closure Stack VM [StackInterpreter VMMaker.oscog-eem.561]"; volatile int sendTrace; sqInt suppressHeartbeatFlag; @@ -12049,9 +12049,8 @@ void * arrayValueOf(sqInt arrayOop) { DECL_MAYBE_SQ_GLOBAL_STRUCT - if (((arrayOop & 1) == 0) - && (((arrayOop & 3) == 0) - && (((((usqInt) (longAt(arrayOop))) >> 24) & 0x1F) > 5))) { + if (((arrayOop & 3) == 0) + && (((((usqInt) (longAt(arrayOop))) >> 24) & 0x1F) > 5)) { return ((void *) (pointerForOop(arrayOop + BaseHeaderSize))); } /* begin primitiveFail */ @@ -18773,9 +18772,8 @@ arrayOop = longAt((objectPointer + (BaseHeaderSize)) + (fieldIndex << 2)); /* begin arrayValueOf: */ - if (((arrayOop & 1) == 0) - && (((arrayOop & 3) == 0) - && (((((usqInt) (longAt(arrayOop))) >> 24) & 0x1F) > 5))) { + if (((arrayOop & 3) == 0) + && (((((usqInt) (longAt(arrayOop))) >> 24) & 0x1F) > 5)) { return ((void *) (pointerForOop(arrayOop + BaseHeaderSize))); } /* begin primitiveFail */ @@ -23930,6 +23928,7 @@ sqInt freeOrNextPage; sqInt index; char *ns; + sqInt page; if (!(isValidObjStackPagemyIndex(objStackPage, myx))) { return 0; @@ -23941,6 +23940,11 @@ GIV(invalidObjStackPage) = objStackPage; return 0; } + if (freeOrNextPage == (longAt((objStackPage + (BaseHeaderSize)) + (ObjStackNextx << 2)))) { + GIV(objStackInvalidBecause) = "free page = next page"; + GIV(invalidObjStackPage) = freeOrNextPage; + return 0; + } if (!(isValidObjStackPagemyIndex(freeOrNextPage, myx))) { ns = malloc(((strlen(GIV(objStackInvalidBecause))) + (strlen(", on next page"))) + 2); strcpy(ns, GIV(objStackInvalidBecause)); @@ -23948,7 +23952,14 @@ return 0; } - freeOrNextPage = longAt((freeOrNextPage + (BaseHeaderSize)) + (ObjStackFreex << 2)); + page = longAt((freeOrNextPage + (BaseHeaderSize)) + (ObjStackFreex << 2)); + if ((page == freeOrNextPage) + || (page == objStackPage)) { + GIV(objStackInvalidBecause) = "circularity in free page list"; + GIV(invalidObjStackPage) = page; + return 0; + } + freeOrNextPage = page; } if (isFirstPage) { if (!(((myx >= (1 << (22 - 10))) && (myx <= (((1 << (22 - 10)) + 8) - 1))))) { @@ -23969,8 +23980,15 @@ return 0; } freeOrNextPage = longAt((objStackPage + (BaseHeaderSize)) + (ObjStackNextx << 2)); - return (freeOrNextPage == 0) - || (isValidObjStackPagemyIndexfirstPage(freeOrNextPage, myx, 0)); + if (freeOrNextPage == 0) { + return 1; + } + if (freeOrNextPage == objStackPage) { + GIV(objStackInvalidBecause) = "circularity in objStack page list"; + GIV(invalidObjStackPage) = objStackPage; + return 0; + } + return isValidObjStackPagemyIndexfirstPage(freeOrNextPage, myx, 0); } @@ -46351,6 +46369,7 @@ sqInt isFirstPage; sqInt isFreePage; sqInt isNextPage; + sqInt page; isFirstPage = pageType == ObjStackMyx; isNextPage = pageType == ObjStackNextx; @@ -46376,10 +46395,20 @@ /* begin cr */ printf("\n"); } - freeOrNextPage = longAt((objStackPage + (BaseHeaderSize)) + (ObjStackFreex << 2)); - while (freeOrNextPage != 0) { - printObjStackPagemyIndexpageType(freeOrNextPage, myx, ObjStackFreex); - freeOrNextPage = longAt((freeOrNextPage + (BaseHeaderSize)) + (ObjStackFreex << 2)); + if (isFirstPage) { + freeOrNextPage = longAt((objStackPage + (BaseHeaderSize)) + (ObjStackFreex << 2)); + while (freeOrNextPage != 0) { + printObjStackPagemyIndexpageType(freeOrNextPage, myx, ObjStackFreex); + page = longAt((freeOrNextPage + (BaseHeaderSize)) + (ObjStackFreex << 2)); + if ((page == freeOrNextPage) + || (page == objStackPage)) { + print("circularity in free page list!!"); + /* begin cr */ + printf("\n"); + page = 0; + } + freeOrNextPage = page; + } } freeOrNextPage = longAt((objStackPage + (BaseHeaderSize)) + (ObjStackNextx << 2)); if (freeOrNextPage != 0) { @@ -52341,6 +52370,7 @@ sqInt field; sqInt firstPage; sqInt index; + sqInt page; sqInt stackOrNil; firstPage = (stackOrNil = longAt((GIV(hiddenRootsObj) + (BaseHeaderSize)) + (objStackRootIndex << 2))); @@ -52362,20 +52392,34 @@ /* begin storePointer:ofObjStack:withValue: */ assert((formatOf(stackOrNil)) == (wordIndexableFormat())); null; - longAtput((stackOrNil + (BaseHeaderSize)) + (ObjStackNextx << 2), field); + longAtput((stackOrNil + (BaseHeaderSize)) + (index << 2), field); } } while(((index -= 1)) > ObjStackMyx); } while(((stackOrNil = field)) != 0); - while (1) { - stackOrNil = longAt((firstPage + (BaseHeaderSize)) + (ObjStackFreex << 2)); @@ Diff output truncated at 50000 characters. @@

1 0

[Vm-dev] OSProcessPlugin: VMConstruction-Plugins-OSProcessPlugin.oscog-eem.45.mcz
by squeak-dev-noreply＠lists.squeakfoundation.org 12 Dec '13

12 Dec '13

Eliot Miranda uploaded a new version of VMConstruction-Plugins-OSProcessPlugin to project OSProcessPlugin: http://www.squeaksource.com/OSProcessPlugin/VMConstruction-Plugins-OSProces… ==================== Summary ==================== Name: VMConstruction-Plugins-OSProcessPlugin.oscog-eem.45 Author: eem Time: 12 December 2013, 2:46:50.772 pm UUID: 7e7b595f-3783-417f-b514-4f5323e0a3c1 Ancestors: VMConstruction-Plugins-OSProcessPlugin.oscog-eem.44 Use #= rather than #== when comparing. Matters during simulation when oops can concievably be large integers.

1 0

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

12 Dec '13

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.561.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.561 Author: eem Time: 12 December 2013, 2:36:45.762 pm UUID: 13467880-93b9-4137-9bbc-7ebfd22436ab Ancestors: VMMaker.oscog-eem.560 Fix swizzling of Spur objStacks on start-up. Spur now snapshots and resumes. Beef up the objStack asserts and printing to identify my prior malfeasance. Add some interpreter proxy plumbing to SpurMemoryManager. Simplify StackInterpreter>>arrayValueOf: (isWordsOrBytes: already filters-out immediates). Change ensureMultiThreadingOverridesAreUpToDate to the new trunk initPattern:return: from initPattern:notifying:return:. If this bites you just implement initPattern:return: on Parser supplying nil as the thing to notify. =============== Diff against VMMaker.oscog-eem.560 =============== Item was changed: ----- Method: CogVMSimulator>>ensureMultiThreadingOverridesAreUpToDate (in category 'initialization') ----- ensureMultiThreadingOverridesAreUpToDate "Make sure the CoInterpreterMT switch methods are implemented. These methods select between CoInterpreterMT's implementation or CoInterpreter's implementation depending on cogThreadManager being non-nil or nil respectively. i.e. they allow us to use this one simulator class to simulate for both CoInterpreterMT and CoInterpreter." | thisClass me mtInterpreterClass | thisClass := thisContext methodClass. mtInterpreterClass := thisClass superclass. me := thisClass name, '>>', thisContext method selector. "We want override switches for everything implemented by CoInterpreter and CoInterpreterMT that is either not implemented by CogVMSimulator or already implemented by CogVMSimulator as an override switch." (mtInterpreterClass selectors select: [:sel| (mtInterpreterClass superclass whichClassIncludesSelector: sel) notNil and: [(thisClass organization categoryOfElement: sel) ifNil: [true] ifNotNil: [:cat| cat == #'multi-threading simulation switch']]]) do: [:sel| | argNames desiredSource | argNames := Parser new initPattern: (mtInterpreterClass sourceCodeAt: sel) - notifying: nil return: [:pattern| pattern second]. desiredSource := String streamContents: [:str| argNames isEmpty ifTrue: [str nextPutAll: sel] ifFalse: [sel keywords with: argNames do: [:kw :arg| str nextPutAll: kw; space; nextPutAll: arg; space]. str skip: -1]. str crtab; nextPutAll: '"This method includes or excludes ', mtInterpreterClass name, ' methods as required.'; crtab; nextPutAll: ' Auto-generated by ', me, '"'; cr; crtab; nextPutAll: '^self perform: '; store: sel; crtab: 2; nextPutAll: 'withArguments: {'. argNames do: [:arg| str nextPutAll: arg] separatedBy: [str nextPut: $.; space]. str nextPut: $}; crtab: 2; nextPutAll: 'inSuperclass: (cogThreadManager ifNil: ['; print: mtInterpreterClass superclass; nextPutAll: '] ifNotNil: ['; print: mtInterpreterClass; nextPutAll: '])']. desiredSource ~= (thisClass sourceCodeAt: sel ifAbsent: ['']) asString ifTrue: [((thisClass includesSelector: sel) and: [(thisClass compiledMethodAt: sel) messages includesAnyOf: #(halt halt:)]) ifTrue: [self transcript cr; nextPutAll: 'WARNING, because of halts, not generating '; nextPutAll: desiredSource; cr; flush] ifFalse: [thisClass compile: desiredSource classified: #'multi-threading simulation switch']]]. "Make sure obsolete CoInterpreterMT switch methods are deleted." ((thisContext methodClass organization listAtCategoryNamed: #'multi-threading simulation switch') select: [:sel| (mtInterpreterClass whichClassIncludesSelector: sel) isNil]) do: [:sel| thisClass removeSelector: sel]! Item was changed: ----- Method: Spur32BitMMLECoSimulator>>isIntegerObject: (in category 'object testing') ----- isIntegerObject: oop "This list records the valid senders of isIntegerObject: as we replace uses of isIntegerObject: by isImmediate: where appropriate." | sel | sel := thisContext sender method selector. (#( DoIt DoItIn: on:do: "from the debugger" makeBaseFrameFor: quickFetchInteger:ofObject: frameOfMarriedContext: objCouldBeClassObj: isMarriedOrWidowedContext: shortPrint: bytecodePrimAt bytecodePrimAtPut commonAt: commonAtPut: loadFloatOrIntFrom: positive32BitValueOf: primitiveExternalCall checkedIntegerValueOf: bytecodePrimAtPut commonAtPut: primitiveVMParameter checkIsStillMarriedContext:currentFP: displayBitsOf:Left:Top:Right:Bottom: fetchStackPointerOf: primitiveContextAt primitiveContextAtPut subscript:with:storing:format: printContext: compare31or32Bits:equal: signed64BitValueOf: primDigitMultiply:negative: digitLength: isNegativeIntegerValueOf: magnitude64BitValueOf: primitiveMakePoint primitiveAsCharacter primitiveInputSemaphore baseFrameReturn primitiveExternalCall primDigitCompare: isLiveContext: numPointerSlotsOf: fileValueOf: loadBitBltDestForm fetchIntOrFloat:ofObject:ifNil: fetchIntOrFloat:ofObject: loadBitBltSourceForm loadPoint:from: primDigitAdd: primDigitSubtract: positive64BitValueOf: digitBitLogic:with:opIndex: signed32BitValueOf: isNormalized: primDigitDiv:negative: bytesOrInt:growTo: primitiveNewMethod isCogMethodReference: functionForPrimitiveExternalCall: genSpecialSelectorArithmetic genSpecialSelectorComparison ensureContextHasBytecodePC: instVar:ofContext: ceBaseFrameReturn: inlineCacheTagForInstance: primitiveObjectAtPut commonVariable:at:put:cacheIndex: primDigitBitShiftMagnitude: externalInstVar:ofContext: primitiveGrowMemoryByAtLeast primitiveFileSetPosition cogMethodDoesntLookKosher: shortPrintOop: primitiveSizeInBytesOfInstance + bereaveAllMarriedContextsForSnapshotFlushingExternalPrimitivesIf: + primitiveForwardSignalToSemaphore) includes: sel) ifFalse: - bereaveAllMarriedContextsForSnapshotFlushingExternalPrimitivesIf:) includes: sel) ifFalse: [self halt]. ^super isIntegerObject: oop! Item was added: + ----- Method: SpurMemoryManager>>arrayValueOf: (in category 'simulation only') ----- + arrayValueOf: arrayOop + "hack around the CoInterpreter/ObjectMemory split refactoring" + <doNotGenerate> + ^coInterpreter arrayValueOf: arrayOop! Item was added: + ----- Method: SpurMemoryManager>>getThisSessionID (in category 'simulation only') ----- + getThisSessionID + "hack around the CoInterpreter/ObjectMemory split refactoring" + <doNotGenerate> + ^coInterpreter getThisSessionID! 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." + | page freeOrNextPage index | - | 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]. + freeOrNextPage = (self fetchPointer: ObjStackNextx ofObject: objStackPage) ifTrue: + [objStackInvalidBecause := 'free page = next page'. + invalidObjStackPage := freeOrNextPage. + ^false]. (self isValidObjStackPage: freeOrNextPage myIndex: myx) ifFalse: [objStackInvalidBecause := self stretch: objStackInvalidBecause cat: ', on next page'. ^false]. + page := self fetchPointer: ObjStackFreex ofObject: freeOrNextPage. + (page = freeOrNextPage + or: [page = objStackPage]) ifTrue: + [objStackInvalidBecause := 'circularity in free page list'. + invalidObjStackPage := page. + ^false]. + freeOrNextPage := page]. - 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 ifTrue: + [^true]. + freeOrNextPage = objStackPage ifTrue: + [objStackInvalidBecause := 'circularity in objStack page list'. + invalidObjStackPage := objStackPage. + ^false]. + ^self isValidObjStackPage: freeOrNextPage myIndex: myx firstPage: false! - ^freeOrNextPage = 0 - or: [self isValidObjStackPage: freeOrNextPage myIndex: myx firstPage: false]! Item was changed: ----- Method: SpurMemoryManager>>printObjStackPage:myIndex:pageType: (in category 'obj stacks') ----- printObjStackPage: objStackPage myIndex: myx pageType: pageType + | freeOrNextPage page isFirstPage isNextPage isFreePage | - | 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: 'topx: '; printNum: (self fetchPointer: ObjStackTopx ofObject: objStackPage); print: ' next: '; printHex: (self fetchPointer: ObjStackNextx ofObject: objStackPage). isFirstPage ifTrue: [coInterpreter print: ' free: '; printHex: (self fetchPointer: ObjStackFreex ofObject: objStackPage)]. coInterpreter cr]. + isFirstPage ifTrue: + [freeOrNextPage := self fetchPointer: ObjStackFreex ofObject: objStackPage. + [freeOrNextPage ~= 0] whileTrue: + [self printObjStackPage: freeOrNextPage myIndex: myx pageType: ObjStackFreex. + page := self fetchPointer: ObjStackFreex ofObject: freeOrNextPage. + (page = freeOrNextPage + or: [page = objStackPage]) ifTrue: + [coInterpreter print: 'circularity in free page list!!!!'; cr. + page := 0]. + freeOrNextPage := page]]. - 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 changed: ----- Method: SpurMemoryManager>>swizzleObjStackAt: (in category 'obj stacks') ----- swizzleObjStackAt: objStackRootIndex "On load, swizzle the pointers in an obj stack. Answer the obj stack's oop." + | firstPage page stackOrNil index field | - | firstPage stackOrNil index field | firstPage := stackOrNil := self fetchPointer: objStackRootIndex ofObject: hiddenRootsObj. stackOrNil = nilObj ifTrue: [^stackOrNil]. [self assert: (self numSlotsOfAny: stackOrNil) = ObjStackPageSlots. self assert: (self fetchPointer: ObjStackMyx ofObject: stackOrNil) = objStackRootIndex. "There are four fixed slots in an obj stack, and a Topx of 0 indicates empty, so if there were 5 slots in an oop stack, full would be 2, and the last 0-rel index is 4. Hence the last index is topx + fixed slots - 1, or topx + ObjStackNextx" index := (self fetchPointer: ObjStackTopx ofObject: stackOrNil) + ObjStackNextx. "swizzle fields including ObjStackNextx and leave field containing the next link." [field := self fetchPointer: index ofObject: stackOrNil. (field = 0 or: [self isImmediate: field]) ifFalse: [field := segmentManager swizzleObj: field. + self storePointer: index ofObjStack: stackOrNil withValue: field]. - self storePointer: ObjStackNextx ofObjStack: stackOrNil withValue: field]. (index := index - 1) > ObjStackMyx] whileTrue. (stackOrNil := field) ~= 0] whileTrue. + (stackOrNil := self fetchPointer: ObjStackFreex ofObject: firstPage) ~= 0 ifTrue: + [[page := self fetchPointer: ObjStackFreex ofObject: stackOrNil. + page ~= 0] whileTrue: + [field := segmentManager swizzleObj: page. + self storePointer: ObjStackFreex ofObjStack: stackOrNil withValue: field. + stackOrNil := field]]. + (stackOrNil := self fetchPointer: ObjStackNextx ofObject: firstPage) ~= 0 ifTrue: + [[page := self fetchPointer: ObjStackNextx ofObject: stackOrNil. + page ~= 0] whileTrue: + [field := segmentManager swizzleObj: page. + self storePointer: ObjStackNextx ofObjStack: stackOrNil withValue: field. + stackOrNil := field]]. - [stackOrNil := self fetchPointer: ObjStackFreex ofObject: firstPage. - stackOrNil ~= 0] whileTrue: - [field := segmentManager swizzleObj: stackOrNil. - self storePointer: ObjStackFreex ofObjStack: firstPage withValue: field. - firstPage := field]. self assert: (self isValidObjStackAt: objStackRootIndex). ^self fetchPointer: objStackRootIndex ofObject: hiddenRootsObj! Item was changed: ----- Method: StackInterpreter>>arrayValueOf: (in category 'utilities') ----- arrayValueOf: arrayOop "Return the address of first indexable field of resulting array object, or fail if the instance variable does not contain an indexable bytes or words object." "Note: May be called by translated primitive code." <returnTypeC: #'void *'> + (objectMemory isWordsOrBytes: arrayOop) ifTrue: - ((objectMemory isNonIntegerObject: arrayOop) - and: [objectMemory isWordsOrBytes: arrayOop]) ifTrue: [^self cCoerceSimple: (self pointerForOop: arrayOop + BaseHeaderSize) to: #'void *']. self primitiveFail!

1 0

[commit][2830] CogVM source as per VMMaker.oscog-eem.560
by commits＠squeakvm.org 12 Dec '13

12 Dec '13

Revision: 2830 Author: eliot Date: 2013-12-11 16:37:38 -0800 (Wed, 11 Dec 2013) Log Message: ----------- CogVM source as per VMMaker.oscog-eem.560 Also have to swizzle along the chain of free objStack pages. Print value of topX field when printing objStacks. Modified Paths: -------------- branches/Cog/spursrc/vm/cointerp.c branches/Cog/spursrc/vm/cointerp.h branches/Cog/spursrc/vm/gcc3x-cointerp.c branches/Cog/spursrc/vm/interp.h branches/Cog/spursrc/vm/vmCallback.h branches/Cog/spurstacksrc/vm/gcc3x-interp.c branches/Cog/spurstacksrc/vm/interp.c branches/Cog/spurstacksrc/vm/interp.h branches/Cog/spurstacksrc/vm/vmCallback.h Property Changed: ---------------- branches/Cog/platforms/Cross/vm/sqSCCSVersion.h Property changes on: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h ___________________________________________________________________ Modified: checkindate - Wed Dec 11 16:06:51 PST 2013 + Wed Dec 11 16:36:32 PST 2013 Modified: branches/Cog/spursrc/vm/cointerp.c =================================================================== --- branches/Cog/spursrc/vm/cointerp.c 2013-12-12 00:07:34 UTC (rev 2829) +++ branches/Cog/spursrc/vm/cointerp.c 2013-12-12 00:37:38 UTC (rev 2830) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.559 uuid: 91b925f5-c776-4549-82a7-d10b0853e0f7 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.560 uuid: db9cf7fa-a7d7-4b48-9e9d-32c8d43e330f from - CoInterpreter VMMaker.oscog-eem.559 uuid: 91b925f5-c776-4549-82a7-d10b0853e0f7 + CoInterpreter VMMaker.oscog-eem.560 uuid: db9cf7fa-a7d7-4b48-9e9d-32c8d43e330f */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.559 uuid: 91b925f5-c776-4549-82a7-d10b0853e0f7 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.560 uuid: db9cf7fa-a7d7-4b48-9e9d-32c8d43e330f " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2162,7 +2162,7 @@ 0 }; static void (*externalPrimitiveTable[MaxExternalPrimitiveTableSize + 1 /* 4097 */])(void); usqInt heapBase; -const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.559]"; +const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.560]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; @@ -6363,7 +6363,6 @@ /* begin internalPush: */ longAtPointerput((localSP -= BytesPerOop), longAt((rcvr1 + (BaseHeaderSize)) + (byte3 << 2))); } - null; goto l4; } if (opType == 3) { @@ -6373,7 +6372,6 @@ assert(GIV(method) == (iframeMethod(localFP))); object = longAt((GIV(method) + (BaseHeaderSize)) + ((byte3 + LiteralStart) << 2)); longAtPointerput((localSP -= BytesPerOop), object); - null; goto l4; } if (opType == 4) { @@ -6401,7 +6399,6 @@ /* begin internalPush: */ longAtPointerput((localSP -= BytesPerOop), longAt((litVar1 + (BaseHeaderSize)) + (ValueIndex << 2))); - null; goto l4; } top = longAtPointer(localSP); @@ -50322,7 +50319,9 @@ /* begin tab */ /* begin printChar: */ putchar(' '); - print("next: "); + print("topx: "); + printNum(longAt((objStackPage + (BaseHeaderSize)) + (ObjStackTopx << 2))); + print(" next: "); printHex(longAt((objStackPage + (BaseHeaderSize)) + (ObjStackNextx << 2))); if (isFirstPage) { print(" free: "); @@ -56838,7 +56837,7 @@ assert((formatOf(firstPage)) == (wordIndexableFormat())); null; longAtput((firstPage + (BaseHeaderSize)) + (ObjStackFreex << 2), field); - firstPage = stackOrNil; + firstPage = field; } assert(isValidObjStackAt(objStackRootIndex)); return longAt((GIV(hiddenRootsObj) + (BaseHeaderSize)) + (objStackRootIndex << 2)); Modified: branches/Cog/spursrc/vm/cointerp.h =================================================================== --- branches/Cog/spursrc/vm/cointerp.h 2013-12-12 00:07:34 UTC (rev 2829) +++ branches/Cog/spursrc/vm/cointerp.h 2013-12-12 00:37:38 UTC (rev 2830) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.559 uuid: 91b925f5-c776-4549-82a7-d10b0853e0f7 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.560 uuid: db9cf7fa-a7d7-4b48-9e9d-32c8d43e330f */ Modified: branches/Cog/spursrc/vm/gcc3x-cointerp.c =================================================================== --- branches/Cog/spursrc/vm/gcc3x-cointerp.c 2013-12-12 00:07:34 UTC (rev 2829) +++ branches/Cog/spursrc/vm/gcc3x-cointerp.c 2013-12-12 00:37:38 UTC (rev 2830) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.559 uuid: 91b925f5-c776-4549-82a7-d10b0853e0f7 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.560 uuid: db9cf7fa-a7d7-4b48-9e9d-32c8d43e330f from - CoInterpreter VMMaker.oscog-eem.559 uuid: 91b925f5-c776-4549-82a7-d10b0853e0f7 + CoInterpreter VMMaker.oscog-eem.560 uuid: db9cf7fa-a7d7-4b48-9e9d-32c8d43e330f */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.559 uuid: 91b925f5-c776-4549-82a7-d10b0853e0f7 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.560 uuid: db9cf7fa-a7d7-4b48-9e9d-32c8d43e330f " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2165,7 +2165,7 @@ 0 }; static void (*externalPrimitiveTable[MaxExternalPrimitiveTableSize + 1 /* 4097 */])(void); usqInt heapBase; -const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.559]"; +const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.560]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; @@ -6372,7 +6372,6 @@ /* begin internalPush: */ longAtPointerput((localSP -= BytesPerOop), longAt((rcvr1 + (BaseHeaderSize)) + (byte3 << 2))); } - null; goto l4; } if (opType == 3) { @@ -6382,7 +6381,6 @@ assert(GIV(method) == (iframeMethod(localFP))); object = longAt((GIV(method) + (BaseHeaderSize)) + ((byte3 + LiteralStart) << 2)); longAtPointerput((localSP -= BytesPerOop), object); - null; goto l4; } if (opType == 4) { @@ -6410,7 +6408,6 @@ /* begin internalPush: */ longAtPointerput((localSP -= BytesPerOop), longAt((litVar1 + (BaseHeaderSize)) + (ValueIndex << 2))); - null; goto l4; } top = longAtPointer(localSP); @@ -50331,7 +50328,9 @@ /* begin tab */ /* begin printChar: */ putchar(' '); - print("next: "); + print("topx: "); + printNum(longAt((objStackPage + (BaseHeaderSize)) + (ObjStackTopx << 2))); + print(" next: "); printHex(longAt((objStackPage + (BaseHeaderSize)) + (ObjStackNextx << 2))); if (isFirstPage) { print(" free: "); @@ -56847,7 +56846,7 @@ assert((formatOf(firstPage)) == (wordIndexableFormat())); null; longAtput((firstPage + (BaseHeaderSize)) + (ObjStackFreex << 2), field); - firstPage = stackOrNil; + firstPage = field; } assert(isValidObjStackAt(objStackRootIndex)); return longAt((GIV(hiddenRootsObj) + (BaseHeaderSize)) + (objStackRootIndex << 2)); Modified: branches/Cog/spursrc/vm/interp.h =================================================================== --- branches/Cog/spursrc/vm/interp.h 2013-12-12 00:07:34 UTC (rev 2829) +++ branches/Cog/spursrc/vm/interp.h 2013-12-12 00:37:38 UTC (rev 2830) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.559 uuid: 91b925f5-c776-4549-82a7-d10b0853e0f7 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.560 uuid: db9cf7fa-a7d7-4b48-9e9d-32c8d43e330f */ #define VM_PROXY_MAJOR 1 Modified: branches/Cog/spursrc/vm/vmCallback.h =================================================================== --- branches/Cog/spursrc/vm/vmCallback.h 2013-12-12 00:07:34 UTC (rev 2829) +++ branches/Cog/spursrc/vm/vmCallback.h 2013-12-12 00:37:38 UTC (rev 2830) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.559 uuid: 91b925f5-c776-4549-82a7-d10b0853e0f7 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.560 uuid: db9cf7fa-a7d7-4b48-9e9d-32c8d43e330f */ #define VM_CALLBACK_INC 1 Modified: branches/Cog/spurstacksrc/vm/gcc3x-interp.c =================================================================== --- branches/Cog/spurstacksrc/vm/gcc3x-interp.c 2013-12-12 00:07:34 UTC (rev 2829) +++ branches/Cog/spurstacksrc/vm/gcc3x-interp.c 2013-12-12 00:37:38 UTC (rev 2830) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.559 uuid: 91b925f5-c776-4549-82a7-d10b0853e0f7 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.560 uuid: db9cf7fa-a7d7-4b48-9e9d-32c8d43e330f from - StackInterpreter VMMaker.oscog-eem.559 uuid: 91b925f5-c776-4549-82a7-d10b0853e0f7 + StackInterpreter VMMaker.oscog-eem.560 uuid: db9cf7fa-a7d7-4b48-9e9d-32c8d43e330f */ -static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.559 uuid: 91b925f5-c776-4549-82a7-d10b0853e0f7 " __DATE__ ; +static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.560 uuid: db9cf7fa-a7d7-4b48-9e9d-32c8d43e330f " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -1955,7 +1955,7 @@ 0 }; char * breakSelector; sqInt breakSelectorLength = -1; -const char *interpreterVersion = "Croquet Closure Stack VM [StackInterpreter VMMaker.oscog-eem.559]"; +const char *interpreterVersion = "Croquet Closure Stack VM [StackInterpreter VMMaker.oscog-eem.560]"; volatile int sendTrace; sqInt suppressHeartbeatFlag; @@ -46374,7 +46374,9 @@ /* begin tab */ /* begin printChar: */ putchar(' '); - print("next: "); + print("topx: "); + printNum(longAt((objStackPage + (BaseHeaderSize)) + (ObjStackTopx << 2))); + print(" next: "); printHex(longAt((objStackPage + (BaseHeaderSize)) + (ObjStackNextx << 2))); if (isFirstPage) { print(" free: "); @@ -52381,7 +52383,7 @@ assert((formatOf(firstPage)) == (wordIndexableFormat())); null; longAtput((firstPage + (BaseHeaderSize)) + (ObjStackFreex << 2), field); - firstPage = stackOrNil; + firstPage = field; } assert(isValidObjStackAt(objStackRootIndex)); return longAt((GIV(hiddenRootsObj) + (BaseHeaderSize)) + (objStackRootIndex << 2)); Modified: branches/Cog/spurstacksrc/vm/interp.c =================================================================== --- branches/Cog/spurstacksrc/vm/interp.c 2013-12-12 00:07:34 UTC (rev 2829) +++ branches/Cog/spurstacksrc/vm/interp.c 2013-12-12 00:37:38 UTC (rev 2830) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.559 uuid: 91b925f5-c776-4549-82a7-d10b0853e0f7 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.560 uuid: db9cf7fa-a7d7-4b48-9e9d-32c8d43e330f from - StackInterpreter VMMaker.oscog-eem.559 uuid: 91b925f5-c776-4549-82a7-d10b0853e0f7 + StackInterpreter VMMaker.oscog-eem.560 uuid: db9cf7fa-a7d7-4b48-9e9d-32c8d43e330f */ -static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.559 uuid: 91b925f5-c776-4549-82a7-d10b0853e0f7 " __DATE__ ; +static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.560 uuid: db9cf7fa-a7d7-4b48-9e9d-32c8d43e330f " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -1952,7 +1952,7 @@ 0 }; char * breakSelector; sqInt breakSelectorLength = -1; -const char *interpreterVersion = "Croquet Closure Stack VM [StackInterpreter VMMaker.oscog-eem.559]"; +const char *interpreterVersion = "Croquet Closure Stack VM [StackInterpreter VMMaker.oscog-eem.560]"; volatile int sendTrace; sqInt suppressHeartbeatFlag; @@ -46365,7 +46365,9 @@ /* begin tab */ /* begin printChar: */ putchar(' '); - print("next: "); + print("topx: "); + printNum(longAt((objStackPage + (BaseHeaderSize)) + (ObjStackTopx << 2))); + print(" next: "); printHex(longAt((objStackPage + (BaseHeaderSize)) + (ObjStackNextx << 2))); if (isFirstPage) { print(" free: "); @@ -52372,7 +52374,7 @@ assert((formatOf(firstPage)) == (wordIndexableFormat())); null; longAtput((firstPage + (BaseHeaderSize)) + (ObjStackFreex << 2), field); - firstPage = stackOrNil; + firstPage = field; } assert(isValidObjStackAt(objStackRootIndex)); return longAt((GIV(hiddenRootsObj) + (BaseHeaderSize)) + (objStackRootIndex << 2)); Modified: branches/Cog/spurstacksrc/vm/interp.h =================================================================== --- branches/Cog/spurstacksrc/vm/interp.h 2013-12-12 00:07:34 UTC (rev 2829) +++ branches/Cog/spurstacksrc/vm/interp.h 2013-12-12 00:37:38 UTC (rev 2830) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.559 uuid: 91b925f5-c776-4549-82a7-d10b0853e0f7 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.560 uuid: db9cf7fa-a7d7-4b48-9e9d-32c8d43e330f */ #define VM_PROXY_MAJOR 1 Modified: branches/Cog/spurstacksrc/vm/vmCallback.h =================================================================== --- branches/Cog/spurstacksrc/vm/vmCallback.h 2013-12-12 00:07:34 UTC (rev 2829) +++ branches/Cog/spurstacksrc/vm/vmCallback.h 2013-12-12 00:37:38 UTC (rev 2830) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.559 uuid: 91b925f5-c776-4549-82a7-d10b0853e0f7 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.560 uuid: db9cf7fa-a7d7-4b48-9e9d-32c8d43e330f */ #define VM_CALLBACK_INC 1

1 0

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

12 Dec '13

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.560.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.560 Author: eem Time: 11 December 2013, 4:29:24.437 pm UUID: db9cf7fa-a7d7-4b48-9e9d-32c8d43e330f Ancestors: VMMaker.oscog-eem.559 Also have to swizzle along the chain of free objStack pages. Print value of topX field when printing objStacks. =============== Diff against VMMaker.oscog-eem.559 =============== Item was changed: ----- 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: 'topx: '; printNum: (self fetchPointer: ObjStackTopx ofObject: objStackPage); print: ' next: '; printHex: (self fetchPointer: ObjStackNextx ofObject: objStackPage). - [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 changed: ----- Method: SpurMemoryManager>>swizzleObjStackAt: (in category 'obj stacks') ----- swizzleObjStackAt: objStackRootIndex "On load, swizzle the pointers in an obj stack. Answer the obj stack's oop." | firstPage stackOrNil index field | firstPage := stackOrNil := self fetchPointer: objStackRootIndex ofObject: hiddenRootsObj. stackOrNil = nilObj ifTrue: [^stackOrNil]. [self assert: (self numSlotsOfAny: stackOrNil) = ObjStackPageSlots. self assert: (self fetchPointer: ObjStackMyx ofObject: stackOrNil) = objStackRootIndex. "There are four fixed slots in an obj stack, and a Topx of 0 indicates empty, so if there were 5 slots in an oop stack, full would be 2, and the last 0-rel index is 4. Hence the last index is topx + fixed slots - 1, or topx + ObjStackNextx" index := (self fetchPointer: ObjStackTopx ofObject: stackOrNil) + ObjStackNextx. "swizzle fields including ObjStackNextx and leave field containing the next link." [field := self fetchPointer: index ofObject: stackOrNil. (field = 0 or: [self isImmediate: field]) ifFalse: [field := segmentManager swizzleObj: field. self storePointer: ObjStackNextx ofObjStack: stackOrNil withValue: field]. (index := index - 1) > ObjStackMyx] whileTrue. (stackOrNil := field) ~= 0] whileTrue. [stackOrNil := self fetchPointer: ObjStackFreex ofObject: firstPage. stackOrNil ~= 0] whileTrue: [field := segmentManager swizzleObj: stackOrNil. self storePointer: ObjStackFreex ofObjStack: firstPage withValue: field. + firstPage := field]. - firstPage := stackOrNil]. self assert: (self isValidObjStackAt: objStackRootIndex). ^self fetchPointer: objStackRootIndex ofObject: hiddenRootsObj!

1 0

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

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

Vm-dev December 2013