Vm-dev June 2012

vm-dev@lists.squeakfoundation.org

35 participants
74 discussions

VM Maker: VMMaker-dtl.277.mcz
by commits＠source.squeak.org 27 Jun '12

27 Jun '12

David T. Lewis uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker-dtl.277.mcz ==================== Summary ==================== Name: VMMaker-dtl.277 Author: dtl Time: 26 June 2012, 8:39:44.148 pm UUID: 032a79ed-1936-4170-84a8-1a57b85ec0a7 Ancestors: VMMaker-dtl.276 VMMaker 4.9.5 Unix-4.9.4-ikp.1.cs patches from Ian to resolve issues with LargeIntegersPlugin and Mpeg3Plugin builds =============== Diff against VMMaker-dtl.276 =============== Item was changed: ----- Method: LargeIntegersPlugin>>digitMontgomery:times:modulo:mInvModB: (in category 'oop functions') ----- digitMontgomery: firstLarge times: secondLarge modulo: thirdLarge mInvModB: mInv | firstLen secondLen thirdLen prod | <var: #over type: 'unsigned char '> firstLen := self byteSizeOfBytes: firstLarge. secondLen := self byteSizeOfBytes: secondLarge. thirdLen := self byteSizeOfBytes: thirdLarge. + firstLen <= thirdLen ifFalse: [^interpreterProxy primitiveFail]. + secondLen <= thirdLen ifFalse: [^interpreterProxy primitiveFail]. + (mInv >= 0 and: [mInv <= 255]) ifFalse: [^interpreterProxy primitiveFail]. - firstLen <= thirdLen ifFalse: [^self error: 'firstLarge must be less than thirdLarge']. - secondLen <= thirdLen ifFalse: [^self error: 'secondLarge must be less than thirdLarge']. - (mInv >= 0 and: [mInv <= 255]) ifFalse: [^self error: 'mInvMod256 must be between 0 and 255']. self remapOop: #(firstLarge secondLarge thirdLarge) in: [prod := interpreterProxy instantiateClass: interpreterProxy classLargePositiveInteger indexableSize: thirdLen]. self cdigitMontgomery: (interpreterProxy firstIndexableField: firstLarge) len: firstLen times: (interpreterProxy firstIndexableField: secondLarge) len: secondLen modulo: (interpreterProxy firstIndexableField: thirdLarge) len: thirdLen mInvModB: mInv into: (interpreterProxy firstIndexableField: prod). ^self normalizePositive: prod! Item was added: + ----- Method: Mpeg3Plugin class>>requiredMethodNames (in category 'initialize-release') ----- + requiredMethodNames + "answer the list of method names that should be retained for export or other support reasons" + + ^#( + checkFileEntry: "referenced in mpeg3tValueOf" + makeFileEntry: "primitiveMPEG3Open, primitiveMPEG3OpenABuffer" + removeFileEntry: "primitiveMPEG3Close" + )! Item was changed: ----- Method: VMMaker class>>versionString (in category 'version testing') ----- versionString "VMMaker versionString" + ^'4.9.5'! - ^'4.9.4'!

1 0

VM Maker: VMMaker.oscog-eem.176.mcz
by commits＠source.squeak.org 27 Jun '12

27 Jun '12

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.176.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.176 Author: eem Time: 26 June 2012, 3:33:34.126 pm UUID: 6bd2ee1f-4fbf-4172-8f57-1b7b5d7aa05c Ancestors: VMMaker.oscog-eem.175 Some nicer syntactic sugar for determinign instances of Array ByteString Character and Float. =============== Diff against VMMaker.oscog-eem.175 =============== Item was changed: ----- Method: StackInterpreter>>bytecodePrimSize (in category 'common selector sends') ----- bytecodePrimSize | rcvr sz isString isArray | self initPrimCall. rcvr := self internalStackTop. "Shortcut the mega-lookup for ByteString and Array, the two big consumers of cycles here. Both of these have compact class indices and neither has any added fields." + isString := self isInstanceOfClassByteString: rcvr. - isString := objectMemory - is: rcvr - instanceOf: (objectMemory splObj: ClassString) - compactClassIndex: ClassByteStringCompactIndex. isString ifTrue: [sz := objectMemory lengthOf: rcvr. self internalStackTopPut: (objectMemory integerObjectOf: sz). ^self fetchNextBytecode]. + isArray := self isInstanceOfClassArray: rcvr. - isArray := objectMemory - is: rcvr - instanceOf: (objectMemory splObj: ClassArray) - compactClassIndex: ClassArrayCompactIndex. isArray ifTrue: [sz := objectMemory lengthOf: rcvr. self internalStackTopPut: (objectMemory integerObjectOf: sz). ^self fetchNextBytecode]. messageSelector := self specialSelector: 18. argumentCount := 0. self normalSend! Item was changed: ----- Method: StackInterpreter>>commonVariable:at:put:cacheIndex: (in category 'indexing primitive support') ----- commonVariable: rcvr at: index put: value cacheIndex: atIx "This code assumes the receiver has been identified at location atIx in the atCache." + | stSize fmt fixedFields valToPut isCharacter | - | stSize fmt fixedFields valToPut | <inline: true> stSize := atCache at: atIx+AtCacheSize. ((self oop: index isGreaterThanOrEqualTo: 1) and: [self oop: index isLessThanOrEqualTo: stSize]) ifTrue: [fmt := atCache at: atIx+AtCacheFmt. fmt <= 4 ifTrue: [self assert: (objectMemory isContextNonInt: rcvr) not. fixedFields := atCache at: atIx+AtCacheFixedFields. ^objectMemory storePointer: index + fixedFields - 1 ofObject: rcvr withValue: value]. fmt < 8 ifTrue: "Bitmap" [valToPut := self positive32BitValueOf: value. self successful ifTrue: [objectMemory storeLong32: index - 1 ofObject: rcvr withValue: valToPut]. ^nil]. fmt >= 16 "Note fmt >= 16 is an artificial flag for strings" + ifTrue: [isCharacter := self isInstanceOfClassCharacter: value. + isCharacter ifFalse: - ifTrue: [(objectMemory - is: value - instanceOf: (objectMemory splObj: ClassCharacter) - compactClassIndex: 0) ifFalse: [^self primitiveFailFor: PrimErrBadArgument]. valToPut := objectMemory fetchPointer: CharacterValueIndex ofObject: value] ifFalse: [(fmt >= 12 and: [index < (self firstByteIndexOfMethod: rcvr)]) ifTrue: "CompiledMethod" [^self primitiveFailFor: PrimErrBadIndex]. valToPut := value]. (objectMemory isIntegerObject: valToPut) ifTrue: [valToPut := objectMemory integerValueOf: valToPut. ((valToPut >= 0) and: [valToPut <= 255]) ifFalse: [^self primitiveFailFor: PrimErrBadArgument]. ^objectMemory storeByte: index - 1 ofObject: rcvr withValue: valToPut]]. ^self primitiveFailFor: ((objectMemory formatOf: rcvr) <= 1 ifTrue: [PrimErrBadReceiver] ifFalse: [PrimErrBadIndex])! Item was added: + ----- Method: StackInterpreter>>isInstanceOfClassArray: (in category 'primitive support') ----- + isInstanceOfClassArray: oop + <inline: true> + ^objectMemory + is: oop + instanceOf: (objectMemory splObj: ClassArray) + compactClassIndex: ClassArrayCompactIndex! Item was added: + ----- Method: StackInterpreter>>isInstanceOfClassByteString: (in category 'primitive support') ----- + isInstanceOfClassByteString: oop + <inline: true> + ^objectMemory + is: oop + instanceOf: (objectMemory splObj: ClassString) + compactClassIndex: ClassByteStringCompactIndex! Item was added: + ----- Method: StackInterpreter>>isInstanceOfClassCharacter: (in category 'primitive support') ----- + isInstanceOfClassCharacter: oop + <inline: true> + ^objectMemory + is: oop + instanceOf: (objectMemory splObj: ClassCharacter) + compactClassIndex: 0! Item was added: + ----- Method: StackInterpreter>>isInstanceOfClassFloat: (in category 'primitive support') ----- + isInstanceOfClassFloat: oop + <inline: true> + ^objectMemory + is: oop + instanceOf: (objectMemory splObj: ClassFloat) + compactClassIndex: ClassFloatCompactIndex! Item was changed: ----- Method: StackInterpreterPrimitives>>primitiveDoNamedPrimitiveWithArgs (in category 'plugin primitives') ----- primitiveDoNamedPrimitiveWithArgs "Simulate an primitiveExternalCall invocation (e.g. for the Debugger). Do not cache anything. e.g. ContextPart>>tryNamedPrimitiveIn: aCompiledMethod for: aReceiver withArgs: arguments" | argumentArray arraySize methodArg methodHeader moduleName functionName moduleLength functionLength spec addr primRcvr ctxtRcvr isArray | <var: #addr declareC: 'void (*addr)()'> argumentArray := self stackTop. (objectMemory isArray: argumentArray) ifFalse: [^self primitiveFailFor: -2]. "invalid args" arraySize := objectMemory fetchWordLengthOf: argumentArray. self success: (self roomToPushNArgs: arraySize). methodArg := self stackObjectValue: 2. self successful ifFalse: [^self primitiveFailFor: -2]. "invalid args" (objectMemory isOopCompiledMethod: methodArg) ifFalse: [^self primitiveFailFor: -2]. "invalid args" methodHeader := self headerOf: methodArg. (self literalCountOfHeader: methodHeader) > 2 ifFalse: [^self primitiveFailFor: -3]. "invalid methodArg state" + spec := objectMemory fetchPointer: 1 "first literal" ofObject: methodArg. + isArray := self isInstanceOfClassArray: spec. - isArray := objectMemory - is: (spec := objectMemory fetchPointer: 1 "first literal" ofObject: methodArg) - instanceOf: (objectMemory splObj: ClassArray) - compactClassIndex: ClassArrayCompactIndex. (isArray and: [(objectMemory lengthOf: spec) = 4 and: [(self primitiveIndexOfMethodHeader: methodHeader) = 117]]) ifFalse: [^self primitiveFailFor: -3]. "invalid methodArg state" (self argumentCountOfMethodHeader: methodHeader) = arraySize ifFalse: [^self primitiveFailFor: -2]. "invalid args (Array args wrong size)" "The function has not been loaded yet. Fetch module and function name." moduleName := objectMemory fetchPointer: 0 ofObject: spec. moduleName = objectMemory nilObject ifTrue: [moduleLength := 0] ifFalse: [self success: (objectMemory isBytes: moduleName). moduleLength := objectMemory lengthOf: moduleName. self cCode: '' inSmalltalk: [ (#('FloatArrayPlugin' 'Matrix2x3Plugin') includes: (self stringOf: moduleName)) "??" ifTrue: [moduleLength := 0 "Cause all of these to fail"]]]. functionName := objectMemory fetchPointer: 1 ofObject: spec. self success: (objectMemory isBytes: functionName). functionLength := objectMemory lengthOf: functionName. self successful ifFalse: [^self primitiveFailFor: -3]. "invalid methodArg state" addr := self ioLoadExternalFunction: functionName + BaseHeaderSize OfLength: functionLength FromModule: moduleName + BaseHeaderSize OfLength: moduleLength. addr = 0 ifTrue: [^self primitiveFailFor: -1]. "could not find function; answer generic failure (see below)" "Cannot fail this primitive from now on. Can only fail the external primitive." objectMemory pushRemappableOop: (argumentArray := self popStack). objectMemory pushRemappableOop: (primRcvr := self popStack). objectMemory pushRemappableOop: self popStack. "the method" objectMemory pushRemappableOop: self popStack. "the context receiver" self push: primRcvr. "replace context receiver with actual receiver" argumentCount := arraySize. 1 to: arraySize do: [:index| self push: (objectMemory fetchPointer: index - 1 ofObject: argumentArray)]. "Run the primitive (sets primFailCode)" lkupClass := objectMemory nilObject. self callExternalPrimitive: addr. ctxtRcvr := objectMemory popRemappableOop. methodArg := objectMemory popRemappableOop. primRcvr := objectMemory popRemappableOop. argumentArray := objectMemory popRemappableOop. self successful ifFalse: "If primitive failed, then restore state for failure code" [self pop: arraySize + 1. self push: ctxtRcvr. self push: methodArg. self push: primRcvr. self push: argumentArray. argumentCount := 3. "Hack. A nil prim error code (primErrorCode = 1) is interpreted by the image as meaning this primitive is not implemented. So to pass back nil as an error code we use -1 to indicate generic failure." primFailCode = 1 ifTrue: [primFailCode := -1]]!

1 0

VM Maker: VMMaker.oscog-eem.175.mcz
by commits＠source.squeak.org 26 Jun '12

26 Jun '12

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.175.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.175 Author: eem Time: 26 June 2012, 1:02:32.636 pm UUID: a4adf9bf-b651-46c9-babd-bcc27b62d599 Ancestors: VMMaker.oscog-eem.174 Warn about api methods being removed. Move stringForCString: up to StackInterpreter. =============== Diff against VMMaker.oscog-eem.174 =============== Item was changed: ----- Method: CCodeGenerator>>reportShouldNotBeRemoved:varList: (in category 'inlining') ----- reportShouldNotBeRemoved: removed varList: varList "Report whether any of the removed methods are still used." | varListAsStrings shouldNotBeRemoved | varListAsStrings := varList collect: [ :sym | sym asString ]. shouldNotBeRemoved := Set new. + removed do: + [:m| + m isAPIMethod ifTrue: + [shouldNotBeRemoved add: m selector]]. methods do: [:m| (m selector = #interpret or: [removed includes: m selector]) ifFalse: [m allCalls do: [:sel| (removed includesKey: sel) ifTrue: [shouldNotBeRemoved add: sel]]]]. vmClass additionalSelectorTables do: [:selectorTable| selectorTable do: [:selOrInteger| selOrInteger isInteger ifFalse: [(removed includesKey: selOrInteger) ifTrue: [shouldNotBeRemoved add: selOrInteger]]]]. shouldNotBeRemoved do: [:sel| | str | str := String streamContents: [:strm| | them | strm nextPutAll: 'Removed '; nextPutAll: sel; nextPutAll: ' because it refers to the local variable'. them := (removed at: sel) freeVariableReferences asSet intersection: varListAsStrings. them size > 1 ifTrue: [strm nextPut: $s. them := self sortStrings: them]. them do: [:var| strm space; nextPutAll: var]. strm nextPutAll: ' of interpret.'; cr; nextPutAll: 'But it is either used outside of interpret or exported!!!!'; cr]. logger ensureCr; show: str. self inform: str]! Item was removed: - ----- Method: CoInterpreter>>stringForCString: (in category 'primitive support') ----- - stringForCString: aCString - "Answer a new String copied from a null-terminated C string, - or nil if out of memory. - Caution: This may invoke the garbage collector." - <api> - <var: 'aCString' type: 'const char *'> - | len newString | - len := self strlen: aCString. - newString := objectMemory instantiateClass: objectMemory classString indexableSize: len. - newString isNil ifFalse: - [self st: (self arrayValueOf: newString) - rn: aCString - cpy: len]. "(char *)strncpy()" - ^newString! Item was added: + ----- Method: StackInterpreter>>stringForCString: (in category 'primitive support') ----- + stringForCString: aCString + "Answer a new String copied from a null-terminated C string, + or nil if out of memory. + Caution: This may invoke the garbage collector." + <api> + <var: 'aCString' type: 'const char *'> + | len newString | + len := self strlen: aCString. + newString := objectMemory instantiateClass: objectMemory classString indexableSize: len. + newString isNil ifFalse: + [self st: (self arrayValueOf: newString) + rn: aCString + cpy: len]. "(char *)strncpy()" + ^newString!

1 0

VM Maker: VMMaker.oscog-eem.174.mcz
by commits＠source.squeak.org 26 Jun '12

26 Jun '12

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.174.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.174 Author: eem Time: 26 June 2012, 12:28:31.674 pm UUID: 28bc956b-53cc-4f7c-a763-09fb8a576071 Ancestors: VMMaker.oscog-eem.173 Comment some return implementations. Make the array initializer creator non-static (clients can prepend "static" if required). Make frame flags printing more concise. =============== Diff against VMMaker.oscog-eem.173 =============== Item was added: + ----- Method: CCodeGenerator>>arrayInitializerCalled:for:type: (in category 'utilities') ----- + arrayInitializerCalled: varName for: array type: cType + "array is a literal array or a CArray on some array." + | sequence lastLine | + sequence := array isCollection ifTrue: [array] ifFalse: [array object]. + lastLine := 0. + ^String streamContents: + [:s| + s nextPutAll: cType; + space; + nextPutAll: varName; + nextPutAll: '[] = {'; crtab: 2. + sequence + do: [:element| s nextPutAll: (self cLiteralFor: element)] + separatedBy: + [s nextPut: $,. + (s position - lastLine) > 76 + ifTrue: [s crtab: 2. lastLine := s position] + ifFalse: [s space]]. + s crtab; nextPut: $}; cr]! Item was removed: - ----- Method: CCodeGenerator>>staticArrayInitializerCalled:for:type: (in category 'utilities') ----- - staticArrayInitializerCalled: varName for: array type: cType - "array is a literal array or a CArray on some array." - | sequence lastLine | - sequence := array isCollection ifTrue: [array] ifFalse: [array object]. - lastLine := 0. - ^String streamContents: - [:s| - s nextPutAll: 'static '; - nextPutAll: cType; - space; - nextPutAll: varName; - nextPutAll: '[] = {'; crtab: 2. - sequence - do: [:element| s nextPutAll: (self cLiteralFor: element)] - separatedBy: - [s nextPut: $,. - (s position - lastLine) > 76 - ifTrue: [s crtab: 2. lastLine := s position] - ifFalse: [s space]]. - s crtab; nextPut: $}; cr]! Item was changed: ----- Method: CoInterpreter class>>declareCVarsIn: (in category 'translation') ----- declareCVarsIn: aCCodeGenerator "Override to avoid repeating StackInterpreter's declarations and add our own extensions" | threaded | self class == thisContext methodClass ifFalse: [^self]. "Don't duplicate decls in subclasses" threaded := aCCodeGenerator vmClass isThreadedVM. aCCodeGenerator addHeaderFile:'"sqCogStackAlignment.h"'; addHeaderFile:'"cogmethod.h"'; addHeaderFile: (threaded ifTrue: ['"cointerpmt.h"'] ifFalse: ['"cointerp.h"']); addHeaderFile:'"cogit.h"'. self declareInterpreterVersionIn: aCCodeGenerator defaultName: (threaded ifTrue: ['Cog MT'] ifFalse: ['Cog']). aCCodeGenerator var: #heapBase declareC: 'static usqInt heapBase'; var: #maxLiteralCountForCompile declareC: 'sqInt maxLiteralCountForCompile = MaxLiteralCountForCompile /* ', MaxLiteralCountForCompile printString, ' */'; var: #minBackwardJumpCountForCompile declareC: 'sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* ', MinBackwardJumpCountForCompile printString, ' */'. aCCodeGenerator var: #reenterInterpreter declareC: 'jmp_buf reenterInterpreter; /* private export */'. aCCodeGenerator var: #statCodeCompactionUsecs type: #usqLong. aCCodeGenerator var: #primTraceLogIndex type: #'unsigned char'; var: #primTraceLog declareC: 'sqInt primTraceLog[256]'; var: #traceLog declareC: 'sqInt traceLog[TraceBufferSize /* ', TraceBufferSize printString, ' */]'; var: #traceSources declareC: (aCCodeGenerator + arrayInitializerCalled: 'traceSources' - staticArrayInitializerCalled: 'traceSources' for: TraceSources type: 'char *')! Item was changed: ----- Method: CoInterpreter>>baseFrameReturn (in category 'return bytecodes') ----- baseFrameReturn + "Return from a baseFrame (the bottom frame in a stackPage). The context to + return to (which may be married) is stored in the first word of the stack." <inline: true> | contextToReturnTo retToContext theFP theSP thePage newPage frameAbove | <var: #theFP type: #'char *'> <var: #theSP type: #'char *'> <var: #thePage type: #'StackPage *'> <var: #newPage type: #'StackPage *'> <var: #frameAbove type: #'char *'> contextToReturnTo := self frameCallerContext: localFP. "The stack page is effectively free now, so free it. We must free it to be correct in determining if contextToReturnTo is still married, and in case makeBaseFrameFor: cogs a method, which may cause a code compaction, in which case the frame must be free to avoid the relocation machinery tracing the dead frame. Since freeing now temporarily violates the page-list ordering invariant, use the assert-free version." stackPages freeStackPageNoAssert: stackPage. retToContext := self isContext: contextToReturnTo. (retToContext and: [self isStillMarriedContext: contextToReturnTo]) ifTrue: [theFP := self frameOfMarriedContext: contextToReturnTo. thePage := stackPages stackPageFor: theFP. theFP = thePage headFP ifTrue: [theSP := thePage headSP] ifFalse: ["Returning to some interior frame, presumably because of a sender assignment. Move the frames above to another page (they may be in use, e.g. via coroutining). Make the interior frame the top frame." frameAbove := self findFrameAbove: theFP inPage: thePage. "Since we've just deallocated a page we know that newStackPage won't deallocate an existing one." newPage := self newStackPage. self assert: newPage = stackPage. self moveFramesIn: thePage through: frameAbove toPage: newPage. stackPages markStackPageMostRecentlyUsed: newPage. theFP := thePage headFP. theSP := thePage headSP]] ifFalse: [(retToContext and: [objectMemory isIntegerObject: (objectMemory fetchPointer: InstructionPointerIndex ofObject: contextToReturnTo)]) ifFalse: [| contextToReturnFrom | contextToReturnFrom := stackPages longAt: stackPage baseAddress - BytesPerWord. self tearDownAndRebuildFrameForCannotReturnBaseFrameReturnFrom: contextToReturnFrom to: contextToReturnTo returnValue: localReturnValue. ^self externalCannotReturn: localReturnValue from: contextToReturnFrom]. "We must void the instructionPointer to stop it being updated if makeBaseFrameFor: cogs a method, which may cause a code compaction." instructionPointer := 0. thePage := self makeBaseFrameFor: contextToReturnTo. theFP := thePage headFP. theSP := thePage headSP]. self setStackPageAndLimit: thePage. self assert: (stackPages stackPageFor: theFP) = stackPage. localSP := theSP. localFP := theFP. localIP := self pointerForOop: self internalStackTop. localIP asUnsignedInteger < objectMemory startOfMemory ifTrue: [localIP asUnsignedInteger ~= cogit ceReturnToInterpreterPC ifTrue: ["localIP in the cog method zone indicates a return to machine code." ^self returnToMachineCodeFrame]. localIP := self pointerForOop: (self iframeSavedIP: localFP)]. self assert: (self checkIsStillMarriedContext: contextToReturnTo currentFP: localFP). self setMethod: (self iframeMethod: localFP). self internalStackTopPut: localReturnValue. ^self fetchNextBytecode! Item was changed: ----- Method: CoInterpreter>>ceReturnToInterpreter: (in category 'trampolines') ----- ceReturnToInterpreter: anOop + "Perform a return from a machine code frame to an interpreted frame. + The machine code has executed a return instruction when the return address + is set to ceReturnToInterpreterPC. Return the result and switch to the interpreter." <api> self assert: ((objectMemory isIntegerObject: anOop) or: [objectMemory addressCouldBeObj: anOop]). self flag: 'are you really sure setStackPageAndLimit: is needed?'. "I think you're only doing this for the markStackPageMostRecentlyUsed: and that's probably not needed either" self setStackPageAndLimit: stackPage. self assert: (self isMachineCodeFrame: framePointer) not. self setMethod: (self iframeMethod: framePointer). self assertValidExecutionPointe: (self iframeSavedIP: framePointer) r: framePointer s: stackPointer imbar: true. instructionPointer := self iframeSavedIP: framePointer. self push: anOop. self siglong: reenterInterpreter jmp: ReturnToInterpreter. "NOTREACHED" ^nil! Item was changed: ----- Method: CoInterpreter>>commonReturn (in category 'return bytecodes') ----- commonReturn + "Do an ^-return (return form method), perhaps checking for unwinds if this is a block activation. + Note: Assumed to be inlined into the dispatch loop." - "Note: Assumed to be inlined into the dispatch loop." | closure home unwindContextOrNilOrZero frameToReturnTo contextToReturnTo theFP callerFP newPage | <var: #frameToReturnTo type: #'char *'> <var: #theFP type: #'char *'> <var: #callerFP type: #'char *'> <var: #newPage type: #'StackPage *'> <var: #thePage type: #'StackPage *'> <sharedCodeNamed: 'commonReturn' inCase: 120> "If this is a method simply return to the sender/caller." (self frameIsBlockActivation: localFP) ifFalse: [^self commonCallerReturn]. "Since this is a block activation the closure is on the stack above any args and the frame." closure := self pushedReceiverOrClosureOfFrame: localFP. home := nil. "Walk the closure's lexical chain to find the context or frame to return from (home)." [closure ~~ objectMemory nilObject] whileTrue: [home := objectMemory fetchPointer: ClosureOuterContextIndex ofObject: closure. closure := objectMemory fetchPointer: ClosureIndex ofObject: home]. "home is to be returned from provided there is no unwind-protect activation between this frame and home's sender. Search for an unwind. findUnwindThroughContext: will answer either the context for an unwind-protect activation or nilObj if the sender cannot be found or 0 if no unwind is found but the sender is. We must update the current page's headFrame pointers to enable the search to identify widowed contexts correctly." self writeBackHeadFramePointers. unwindContextOrNilOrZero := self internalFindUnwindThroughContext: home. unwindContextOrNilOrZero = objectMemory nilObject ifTrue: ["error: can't find home on chain; cannot return" ^self internalCannotReturn: localReturnValue]. unwindContextOrNilOrZero ~~ 0 ifTrue: [^self internalAboutToReturn: localReturnValue through: unwindContextOrNilOrZero]. "Now we know home is on the sender chain. We could be returning to either a context or a frame. Find out which." contextToReturnTo := nil. (self isMarriedOrWidowedContext: home) ifTrue: [self assert: (self checkIsStillMarriedContext: home currentFP: localFP). theFP := self frameOfMarriedContext: home. (self isBaseFrame: theFP) ifTrue: [contextToReturnTo := self frameCallerContext: theFP] ifFalse: [frameToReturnTo := self frameCallerFP: theFP]] ifFalse: [contextToReturnTo := objectMemory fetchPointer: SenderIndex ofObject: home. ((self isContext: contextToReturnTo) and: [self isMarriedOrWidowedContext: contextToReturnTo]) ifTrue: [self assert: (self checkIsStillMarriedContext: contextToReturnTo currentFP: localFP). frameToReturnTo := self frameOfMarriedContext: contextToReturnTo. contextToReturnTo := nil]]. "If returning to a context we must make a frame for it unless it is dead." contextToReturnTo ~= nil ifTrue: [frameToReturnTo := self establishFrameForContextToReturnTo: contextToReturnTo. frameToReturnTo == 0 ifTrue: ["error: home's sender is dead; cannot return" ^self internalCannotReturn: localReturnValue]]. "Now we have a frame to return to. If it is on a different page we must free intervening pages and nil out intervening contexts. We must free intervening stack pages because if we leave the pages to be divorced then their contexts will be divorced with intact senders and instruction pointers. This code is similar to primitiveTerminateTo. We must move any frames on itervening pages above the frame linked to because these may be in use, e.g. via co-routining (see baseFrameReturn)." self assert: stackPages pageListIsWellFormed. newPage := stackPages stackPageFor: frameToReturnTo. newPage ~~ stackPage ifTrue: [| currentCtx thePage nextCntx | currentCtx := self frameCallerContext: stackPage baseFP. self assert: (self isContext: currentCtx). stackPages freeStackPage: stackPage. [(self isMarriedOrWidowedContext: currentCtx) and: [(stackPages stackPageFor: (theFP := self frameOfMarriedContext: currentCtx)) = newPage]] whileFalse: [(self isMarriedOrWidowedContext: currentCtx) ifTrue: [thePage := stackPages stackPageFor: theFP. theFP ~= thePage headFP ifTrue: ["Since we've just deallocated a page we know that newStackPage won't deallocate an existing one." self moveFramesIn: thePage through: (self findFrameAbove: theFP inPage: thePage) toPage: self newStackPage]. currentCtx := self frameCallerContext: thePage baseFP. self freeStackPage: thePage] ifFalse: [nextCntx := objectMemory fetchPointer: SenderIndex ofObject: currentCtx. self markContextAsDead: currentCtx. currentCtx := nextCntx]]. self setStackPageAndLimit: newPage. localSP := stackPage headSP. localFP := stackPage headFP]. "Two cases. Returning to the top frame on a new page or an interior frame on the current page. The top frame has its instruction pointer on top of stack. An interior frame has its instruction pointer in the caller frame. We need to peel back any frames on the page until we get to the correct frame." localFP = frameToReturnTo ifTrue: [localIP := self pointerForOop: self internalStackTop] ifFalse: [[callerFP := localFP. localFP := self frameCallerFP: localFP. localFP ~~ frameToReturnTo] whileTrue. localIP := self frameCallerSavedIP: callerFP. localSP := (self frameCallerSP: callerFP) - BytesPerWord]. localIP asUnsignedInteger < objectMemory startOfMemory ifTrue: [localIP asUnsignedInteger ~= cogit ceReturnToInterpreterPC ifTrue: ["localIP in the cog method zone indicates a return to machine code." ^self returnToMachineCodeFrame]. localIP := self pointerForOop: (self iframeSavedIP: localFP)]. "pop the saved IP, push the return value and continue." self internalStackTopPut: localReturnValue. self setMethod: (self iframeMethod: localFP). ^self fetchNextBytecode! Item was changed: ----- Method: CoInterpreter>>printFrameFlagsForFP: (in category 'debug printing') ----- printFrameFlagsForFP: theFP | address it | <inline: false> <var: #theFP type: #'char *'> <var: #address type: #'char *'> (self isMachineCodeFrame: theFP) ifTrue: [address := theFP + FoxMethod. it := (stackPages longAt: address) bitAnd: 16r7] ifFalse: [address := theFP + FoxIFrameFlags. it := stackPages longAt: address]. self printHexPtr: address; print: ((self isMachineCodeFrame: theFP) ifTrue: [': mcfrm flags: '] ifFalse: [':intfrm flags: ']); printHex: it. it ~= 0 ifTrue: [self printChar: $=; printNum: it]. self print: ' numArgs: '; printNum: (self frameNumArgs: theFP); + print: ((self frameHasContext: theFP) ifTrue: [' hasContext'] ifFalse: [' noContext']); + print: ((self frameIsBlockActivation: theFP) ifTrue: [' isBlock'] ifFalse: [' notBlock']); - print: ' hasContext: '; printNum: (self frameHasContext: theFP); - print: ' isBlock: '; printNum: (self frameIsBlockActivation: theFP); cr! Item was changed: ----- Method: StackInterpreter>>baseFrameReturn (in category 'return bytecodes') ----- baseFrameReturn + "Return from a baseFrame (the bottom frame in a stackPage). The context to + return to (which may be married) is stored in the saved instruction pointer slot." <inline: true> | contextToReturnTo isAContext theFP theSP thePage frameAbove | <var: #theFP type: #'char *'> <var: #theSP type: #'char *'> <var: #thePage type: #'StackPage *'> <var: #frameAbove type: #'char *'> contextToReturnTo := self frameCallerContext: localFP. isAContext := self isContext: contextToReturnTo. (isAContext and: [self isStillMarriedContext: contextToReturnTo]) ifTrue: [theFP := self frameOfMarriedContext: contextToReturnTo. thePage := stackPages stackPageFor: theFP. theFP = thePage headFP ifTrue: [theSP := thePage headSP. stackPages freeStackPageNoAssert: stackPage "for a short time invariant is violated; assert follows"] ifFalse: ["Returning to some interior frame, presumably because of a sender assignment. Move the frames above to another page (they may be in use, e.g. via coroutining). Make the interior frame the top frame." frameAbove := self findFrameAbove: theFP inPage: thePage. "Reuse the page we're exiting, which avoids allocating a new page and manipulating the page list to mark the page we're entering as least recently used (to avoid it being deallocated when allocating a new page)." self moveFramesIn: thePage through: frameAbove toPage: stackPage. theFP := thePage headFP. theSP := thePage headSP]] ifFalse: [(isAContext and: [objectMemory isIntegerObject: (objectMemory fetchPointer: InstructionPointerIndex ofObject: contextToReturnTo)]) ifFalse: [^self internalCannotReturn: localReturnValue]. thePage := self makeBaseFrameFor: contextToReturnTo. theFP := thePage headFP. theSP := thePage headSP. stackPages freeStackPageNoAssert: stackPage "for a short time invariant is violated; assert follows"]. self setStackPageAndLimit: thePage. self assert: (stackPages stackPageFor: theFP) = stackPage. localSP := theSP. localFP := theFP. self setMethod: (self frameMethod: localFP). localIP := self pointerForOop: self internalStackTop. self internalStackTopPut: localReturnValue. self assert: (self checkIsStillMarriedContext: contextToReturnTo currentFP: localFP). ^self fetchNextBytecode! Item was changed: ----- Method: StackInterpreter>>commonReturn (in category 'return bytecodes') ----- commonReturn + "Do an ^-return (return form method), perhaps checking for unwinds if this is a block activation. + Note: Assumed to be inlined into the dispatch loop." - "Note: Assumed to be inlined into the dispatch loop." | closure home unwindContextOrNilOrZero frameToReturnTo contextToReturnTo theFP callerFP newPage | <var: #frameToReturnTo type: #'char *'> <var: #theFP type: #'char *'> <var: #callerFP type: #'char *'> <var: #newPage type: #'StackPage *'> <var: #thePage type: #'StackPage *'> <sharedCodeNamed: 'commonReturn' inCase: 120> "If this is a method simply return to the sender/caller." (self frameIsBlockActivation: localFP) ifFalse: [^self commonCallerReturn]. "Since this is a block activation the closure is on the stack above any args and the frame." closure := self pushedReceiverOrClosureOfFrame: localFP. home := nil. "Walk the closure's lexical chain to find the context or frame to return from (home)." [closure ~~ objectMemory nilObject] whileTrue: [home := objectMemory fetchPointer: ClosureOuterContextIndex ofObject: closure. closure := objectMemory fetchPointer: ClosureIndex ofObject: home]. "home is to be returned from provided there is no unwind-protect activation between this frame and home's sender. Search for an unwind. findUnwindThroughContext: will answer either the context for an unwind-protect activation or nilObj if the sender cannot be found or 0 if no unwind is found but the sender is. We must update the current page's headFrame pointers to enable the search to identify widowed contexts correctly." self writeBackHeadFramePointers. unwindContextOrNilOrZero := self internalFindUnwindThroughContext: home. unwindContextOrNilOrZero = objectMemory nilObject ifTrue: ["error: can't find home on chain; cannot return" ^self internalCannotReturn: localReturnValue]. unwindContextOrNilOrZero ~~ 0 ifTrue: [^self internalAboutToReturn: localReturnValue through: unwindContextOrNilOrZero]. "Now we know home is on the sender chain. We could be returning to either a context or a frame. Find out which." contextToReturnTo := nil. (self isMarriedOrWidowedContext: home) ifTrue: [self assert: (self checkIsStillMarriedContext: home currentFP: localFP). theFP := self frameOfMarriedContext: home. (self isBaseFrame: theFP) ifTrue: [contextToReturnTo := self frameCallerContext: theFP] ifFalse: [frameToReturnTo := self frameCallerFP: theFP]] ifFalse: [contextToReturnTo := objectMemory fetchPointer: SenderIndex ofObject: home. ((self isContext: contextToReturnTo) and: [self isMarriedOrWidowedContext: contextToReturnTo]) ifTrue: [self assert: (self checkIsStillMarriedContext: contextToReturnTo currentFP: localFP). frameToReturnTo := self frameOfMarriedContext: contextToReturnTo. contextToReturnTo := nil]]. "If returning to a context we must make a frame for it unless it is dead." contextToReturnTo ~= nil ifTrue: [frameToReturnTo := self establishFrameForContextToReturnTo: contextToReturnTo. frameToReturnTo == 0 ifTrue: ["error: home's sender is dead; cannot return" ^self internalCannotReturn: localReturnValue]]. "Now we have a frame to return to. If it is on a different page we must free intervening pages and nil out intervening contexts. We must free intervening stack pages because if we leave the pages to be divorced then their contexts will be divorced with intact senders and instruction pointers. This code is similar to primitiveTerminateTo. We must move any frames on itervening pages above the frame linked to because these may be in use, e.g. via co-routining (see baseFrameReturn)." self assert: stackPages pageListIsWellFormed. newPage := stackPages stackPageFor: frameToReturnTo. newPage ~~ stackPage ifTrue: [| currentCtx thePage nextCntx | currentCtx := self frameCallerContext: stackPage baseFP. self assert: (self isContext: currentCtx). stackPages freeStackPage: stackPage. [self assert: (self isContext: currentCtx). (self isMarriedOrWidowedContext: currentCtx) and: [(stackPages stackPageFor: (theFP := self frameOfMarriedContext: currentCtx)) = newPage]] whileFalse: [(self isMarriedOrWidowedContext: currentCtx) ifTrue: [thePage := stackPages stackPageFor: theFP. theFP ~= thePage headFP ifTrue: ["Since we've just deallocated a page we know that newStackPage won't deallocate an existing one." self moveFramesIn: thePage through: (self findFrameAbove: theFP inPage: thePage) toPage: self newStackPage]. currentCtx := self frameCallerContext: thePage baseFP. self freeStackPage: thePage] ifFalse: [nextCntx := objectMemory fetchPointer: SenderIndex ofObject: currentCtx. self markContextAsDead: currentCtx. currentCtx := nextCntx]]. self setStackPageAndLimit: newPage. localSP := stackPage headSP. localFP := stackPage headFP]. "Two cases. Returning to the top frame on a new page or an interior frame on the current page. The top frame has its instruction pointer on top of stack. An interior frame has its instruction pointer in the caller frame. We need to peel back any frames on the page until we get to the correct frame." localFP = frameToReturnTo ifTrue: "pop the saved IP, push the return value and continue." [localIP := self pointerForOop: self internalStackTop] ifFalse: [[callerFP := localFP. localFP := self frameCallerFP: localFP. localFP ~~ frameToReturnTo] whileTrue. localIP := self frameCallerSavedIP: callerFP. localSP := (self frameCallerSP: callerFP) - BytesPerWord]. self internalStackTopPut: localReturnValue. self setMethod: (self frameMethod: localFP). ^self fetchNextBytecode! Item was changed: ----- Method: StackInterpreter>>printFrameFlagsForFP: (in category 'debug printing') ----- printFrameFlagsForFP: theFP | address it | <inline: false> <var: #theFP type: #'char *'> <var: #address type: #'char *'> address := theFP + FoxFrameFlags. it := stackPages longAt: address. self printHexPtr: address; print: ': flags: '; printHex: it. it ~= 0 ifTrue: [self printChar: $=; printNum: it]. self print: ' numArgs: '; printNum: (self frameNumArgs: theFP); + print: ((self frameHasContext: theFP) ifTrue: [' hasContext'] ifFalse: [' noContext']); + print: ((self frameIsBlockActivation: theFP) ifTrue: [' isBlock'] ifFalse: [' notBlock']); - print: ' hasContext: '; printNum: (self frameHasContext: theFP); - print: ' isBlock: '; printNum: (self frameIsBlockActivation: theFP); cr! Item was changed: ----- Method: TAssignmentNode>>emitLiteralArrayDeclarationOn:level:generator: (in category 'C code generation') ----- emitLiteralArrayDeclarationOn: aStream level: level generator: aCCodeGen | type | type := expression args last value. self assert: type last = $*. aStream crtab: level; + nextPutAll: '{ static '; + nextPutAll: (aCCodeGen arrayInitializerCalled: 'aLiteralArray' for: expression args first value type: type allButLast); - nextPutAll: '{ '; - nextPutAll: (aCCodeGen staticArrayInitializerCalled: 'aLiteralArray' for: expression args first value type: type allButLast); nextPut: $;; crtab: level + 1; nextPutAll: variable name; nextPutAll: ' = aLiteralArray;'; crtab: level; nextPut: $}; cr! Item was changed: ----- Method: VMClass>>sizeof: (in category 'translation support') ----- sizeof: objectSymbolOrClass <doNotGenerate> | index | objectSymbolOrClass isInteger ifTrue: [self flag: #Dan. ^BytesPerWord]. objectSymbolOrClass isSymbol ifTrue: [(objectSymbolOrClass last == $* or: [#long == objectSymbolOrClass or: [#'unsigned long' == objectSymbolOrClass]]) ifTrue: [^BytesPerWord]. index := #( #sqLong #usqLong #double #int #'unsigned int' #float #short #'unsigned short' #char #'unsigned char' #'signed char') indexOf: objectSymbolOrClass + ifAbsent: + [objectSymbolOrClass = #sqInt ifTrue: [^BytesPerOop]. + self error: 'unrecognized C type name']. - ifAbsent: [self error: 'unrecognized C type name']. ^#(8 8 8 4 4 4 2 2 1 1 1) at: index]. ^(objectSymbolOrClass isBehavior ifTrue: [objectSymbolOrClass] ifFalse: [objectSymbolOrClass class]) alignedByteSizeOf: objectSymbolOrClass forClient: self!

1 0

VM Maker: VMMaker.oscog-eem.173.mcz
by commits＠source.squeak.org 26 Jun '12

26 Jun '12

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.173.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.173 Author: eem Time: 26 June 2012, 9:40:33.301 am UUID: abe6a6dd-40dd-4e34-98b2-ae778d5f7e03 Ancestors: VMMaker.oscog-eem.172 Fix simulator dev MNUs for unimplemented methods. =============== Diff against VMMaker.oscog-eem.172 =============== Item was changed: ----- Method: CogVMSimulator>>doesNotUnderstand: (in category 'error handling') ----- doesNotUnderstand: aMessage "If this is a doit and the objectMemory understands, pass it on." (thisContext findContextSuchThat: [:ctxt| ctxt selector == #evaluate:in:to:notifying:ifFail:logged:]) ifNotNil: + [(objectMemory class whichClassIncludesSelector: aMessage selector) ifNotNil: + [:implementingClass| + (implementingClass inheritsFrom: Object) ifTrue: "i.e. VMClass and below" + [Transcript nextPutAll: 'warning: redirecting to objectMemory'; cr; flush. + aMessage lookupClass: nil. + ^aMessage sentTo: objectMemory]]. + (cogit class whichClassIncludesSelector: aMessage selector) ifNotNil: + [:implementingClass| + (implementingClass inheritsFrom: Object) ifTrue: "i.e. VMClass and below" + [Transcript nextPutAll: 'warning: redirecting to cogit'; cr; flush. + aMessage lookupClass: nil. + ^aMessage sentTo: cogit]]]. - [((objectMemory class whichClassIncludesSelector: aMessage selector) inheritsFrom: Object) ifTrue: "i.e. VMClass and below" - [Transcript nextPutAll: 'warning: redirecting to objectMemory'; cr; flush. - aMessage lookupClass: nil. - ^aMessage sentTo: objectMemory]. - ((cogit class whichClassIncludesSelector: aMessage selector) inheritsFrom: Object) ifTrue: "i.e. VMClass and below" - [Transcript nextPutAll: 'warning: redirecting to cogit'; cr; flush. - aMessage lookupClass: nil. - ^aMessage sentTo: cogit]]. ^super doesNotUnderstand: aMessage! Item was changed: ----- Method: StackInterpreterSimulator>>doesNotUnderstand: (in category 'error handling') ----- doesNotUnderstand: aMessage "If this is a doit and the objectMemory understands, pass it on." (thisContext findContextSuchThat: [:ctxt| ctxt selector == #evaluate:in:to:notifying:ifFail:logged:]) ifNotNil: + [(objectMemory class whichClassIncludesSelector: aMessage selector) ifNotNil: + [:implementingClass| + (implementingClass inheritsFrom: Object) ifTrue: "i.e. VMClass and below" + [Transcript nextPutAll: 'warning: redirecting to objectMemory'; cr; flush. + aMessage lookupClass: nil. + ^aMessage sentTo: objectMemory]]]. - [((objectMemory class whichClassIncludesSelector: aMessage selector) inheritsFrom: Object) ifTrue: "i.e. VMClass and below" - [Transcript nextPutAll: 'warning: redirecting to objectMemory'; cr; flush. - aMessage lookupClass: nil. - ^aMessage sentTo: objectMemory]]. ^super doesNotUnderstand: aMessage!

1 0

VM Maker: VMMaker.oscog-eem.172.mcz
by commits＠source.squeak.org 26 Jun '12

26 Jun '12

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.172.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.172 Author: eem Time: 26 June 2012, 9:27:13.912 am UUID: c6173744-0587-45bd-9e94-4f7996c90e47 Ancestors: VMMaker.oscog-eem.171 Finish moving add of bytecodeSetSelector to fetchNextBytecode from interpret. Various simulation print/debug routines need to change or revert. =============== Diff against VMMaker.oscog-eem.171 =============== Item was changed: ----- Method: CogVMSimulator>>logOfBytesVerify:fromFileNamed:fromStart: (in category 'testing') ----- logOfBytesVerify: nBytes fromFileNamed: fileName fromStart: loggingStart "Verify a questionable interpreter against a successful run" "self logOfBytesVerify: 10000 fromFileNamed: 'clone32Bytecodes.log' " | logFile rightWord prevCtxt | logFile := (FileStream readOnlyFileNamed: fileName) binary. transcript clear. byteCount := 0. quitBlock := [^ self]. self initStackPages. self loadInitialContext. self internalizeIPandSP. self fetchNextBytecode. prevCtxt := 0. prevCtxt := prevCtxt. [byteCount < nBytes] whileTrue: [ " byteCount > 14560 ifTrue: [self externalizeIPandSP. prevCtxt = activeContext ifFalse: [prevCtxt := activeContext. transcript cr; nextPutAll: (self printTop: 2); endEntry]. transcript cr; print: byteCount; nextPutAll: ': ' , (activeContext hex); space; print: (instructionPointer - method - (BaseHeaderSize - 2)); nextPutAll: ': <' , (self byteAt: localIP) hex , '>'; space; nextPutAll: (self symbolic: currentBytecode at: localIP inMethod: method); space; print: (self stackPointerIndex - TempFrameStart + 1); endEntry. byteCount = 14590 ifTrue: [self halt]]. " loggingStart >= byteCount ifTrue: [rightWord := logFile nextWord. + currentBytecode = rightWord ifFalse: - currentBytecode + bytecodeSetSelector = rightWord ifFalse: [self halt: 'halt at ', byteCount printString]]. + self dispatchOn: currentBytecode in: BytecodeTable. - self dispatchOn: currentBytecode + bytecodeSetSelector in: BytecodeTable. self incrementByteCount]. self externalizeIPandSP. logFile close. self inform: nBytes printString , ' bytecodes verfied.'! Item was changed: ----- Method: CogVMSimulator>>logOfBytesWrite:toFileNamed:fromStart: (in category 'testing') ----- logOfBytesWrite: nBytes toFileNamed: fileName fromStart: loggingStart "Write a log file for testing a flaky interpreter on the same image" "self logOfBytesWrite: 10000 toFileNamed: 'clone32Bytecodes.log' " | logFile | logFile := (FileStream newFileNamed: fileName) binary. transcript clear. byteCount := 0. quitBlock := [^ self]. self initStackPages. self loadInitialContext. self internalizeIPandSP. self fetchNextBytecode. [byteCount < nBytes] whileTrue: [byteCount >= loggingStart ifTrue: + [logFile nextWordPut: currentBytecode]. + self dispatchOn: currentBytecode in: BytecodeTable. - [logFile nextWordPut: currentBytecode + bytecodeSetSelector]. - self dispatchOn: currentBytecode + bytecodeSetSelector in: BytecodeTable. self incrementByteCount]. self externalizeIPandSP. logFile close! Item was changed: ----- Method: CogVMSimulator>>logOfSendsVerify:fromFileNamed:fromStart: (in category 'testing') ----- logOfSendsVerify: nSends fromFileNamed: fileName fromStart: loggingStart "Write a log file for testing a flaky interpreter on the same image" "self logOfSendsWrite: 10000 toFileNamed: 'clone32Messages.log' " | logFile priorFrame rightSelector prevCtxt | logFile := FileStream readOnlyFileNamed: fileName. transcript clear. byteCount := 0. sendCount := 0. priorFrame := localFP. quitBlock := [^ self]. self initStackPages. self loadInitialContext. self internalizeIPandSP. self fetchNextBytecode. prevCtxt := 0. prevCtxt := prevCtxt. [sendCount < nSends] whileTrue: [ " byteCount>500 ifTrue: [byteCount>550 ifTrue: [self halt]. self externalizeIPandSP. prevCtxt = localFP ifFalse: [prevCtxt := localFP. transcript cr; nextPutAll: (self printTop: 2); endEntry]. transcript cr; print: byteCount; nextPutAll: ': ' , (localFP hex); space; print: (instructionPointer - method - (BaseHeaderSize - 2)); nextPutAll: ': <' , (self byteAt: localIP) hex , '>'; space; nextPutAll: (self symbolic: currentBytecode at: localIP inMethod: method); space; print: (self stackPointerIndex - TempFrameStart + 1); endEntry. ]. " + self dispatchOn: currentBytecode in: BytecodeTable. + localFP = priorFrame ifFalse: - self dispatchOn: currentBytecode + bytecodeSetSelector in: BytecodeTable. - localFP == priorFrame ifFalse: [sendCount := sendCount + 1. loggingStart >= sendCount ifTrue: [rightSelector := logFile nextLine. (self stringOf: messageSelector) = rightSelector ifFalse: [self halt: 'halt at ', sendCount printString]]. priorFrame := localFP]. self incrementByteCount]. self externalizeIPandSP. logFile close. self inform: nSends printString , ' sends verfied.'! Item was changed: ----- Method: CogVMSimulator>>logOfSendsWrite:toFileNamed:fromStart: (in category 'testing') ----- logOfSendsWrite: nSends toFileNamed: fileName fromStart: loggingStart "Write a log file for testing a flaky interpreter on the same image" "self logOfSendsWrite: 10000 toFileNamed: 'clone32Messages.log' fromStart: 2500" | logFile priorFrame | logFile := FileStream newFileNamed: fileName. transcript clear. byteCount := 0. sendCount := 0. priorFrame := localFP. quitBlock := [^ self]. self initStackPages. self loadInitialContext. self internalizeIPandSP. self fetchNextBytecode. [sendCount < nSends] whileTrue: + [self dispatchOn: currentBytecode in: BytecodeTable. - [self dispatchOn: currentBytecode + bytecodeSetSelector in: BytecodeTable. localFP == priorFrame ifFalse: [sendCount >= loggingStart ifTrue: [sendCount := sendCount + 1. logFile nextPutAll: (self stringOf: messageSelector); cr]. priorFrame := localFP]. self incrementByteCount]. self externalizeIPandSP. logFile close! Item was changed: ----- Method: CogVMSimulator>>printCurrentBytecodeOn: (in category 'debug printing') ----- printCurrentBytecodeOn: aStream | code | code := currentBytecode radix: 16. aStream ensureCr; print: localIP - method - 3; tab. bytecodeSetSelector > 0 ifTrue: [aStream nextPutAll: 'ALT ']. aStream nextPut: (code size < 2 ifTrue: [$0] ifFalse: [code at: 1]); nextPut: code last; space; + nextPutAll: (BytecodeTable at: currentBytecode + 1); - nextPutAll: (BytecodeTable at: currentBytecode + bytecodeSetSelector + 1); space; nextPut: $(; print: byteCount + 1; nextPut: $)! Item was changed: ----- Method: StackInterpreterSimulator>>logOfBytesVerify:fromFileNamed:fromStart: (in category 'testing') ----- logOfBytesVerify: nBytes fromFileNamed: fileName fromStart: loggingStart "Verify a questionable interpreter against a successful run" "self logOfBytesVerify: 10000 fromFileNamed: 'clone32Bytecodes.log' " | logFile rightWord prevCtxt | logFile := (FileStream readOnlyFileNamed: fileName) binary. transcript clear. byteCount := 0. quitBlock := [^ self]. self initStackPages. self loadInitialContext. self internalizeIPandSP. self fetchNextBytecode. prevCtxt := 0. prevCtxt := prevCtxt. [byteCount < nBytes] whileTrue: [ " byteCount > 14560 ifTrue: [self externalizeIPandSP. prevCtxt = activeContext ifFalse: [prevCtxt := activeContext. transcript cr; nextPutAll: (self printTop: 2); endEntry]. transcript cr; print: byteCount; nextPutAll: ': ' , (activeContext hex); space; print: (instructionPointer - method - (BaseHeaderSize - 2)); nextPutAll: ': <' , (self byteAt: localIP) hex , '>'; space; nextPutAll: (self symbolic: currentBytecode at: localIP inMethod: method); space; print: (self stackPointerIndex - TempFrameStart + 1); endEntry. byteCount = 14590 ifTrue: [self halt]]. " loggingStart >= byteCount ifTrue: [rightWord := logFile nextWord. currentBytecode = rightWord ifFalse: [self halt: 'halt at ', byteCount printString]]. + self dispatchOn: currentBytecode in: BytecodeTable. - self dispatchOn: currentBytecode + bytecodeSetSelector in: BytecodeTable. self incrementByteCount]. self externalizeIPandSP. logFile close. self inform: nBytes printString , ' bytecodes verfied.'! Item was changed: ----- Method: StackInterpreterSimulator>>logOfBytesWrite:toFileNamed:fromStart: (in category 'testing') ----- logOfBytesWrite: nBytes toFileNamed: fileName fromStart: loggingStart "Write a log file for testing a flaky interpreter on the same image" "self logOfBytesWrite: 10000 toFileNamed: 'clone32Bytecodes.log' " | logFile | logFile := (FileStream newFileNamed: fileName) binary. transcript clear. byteCount := 0. quitBlock := [^ self]. self initStackPages. self loadInitialContext. self internalizeIPandSP. self fetchNextBytecode. [byteCount < nBytes] whileTrue: [byteCount >= loggingStart ifTrue: + [logFile nextWordPut: currentBytecode]. + self dispatchOn: currentBytecode in: BytecodeTable. - [logFile nextWordPut: currentBytecode + bytecodeSetSelector]. - self dispatchOn: currentBytecode + bytecodeSetSelector in: BytecodeTable. self incrementByteCount]. self externalizeIPandSP. logFile close! Item was changed: ----- Method: StackInterpreterSimulator>>logOfSendsVerify:fromFileNamed:fromStart: (in category 'testing') ----- logOfSendsVerify: nSends fromFileNamed: fileName fromStart: loggingStart "Write a log file for testing a flaky interpreter on the same image" "self logOfSendsWrite: 10000 toFileNamed: 'clone32Messages.log' " | logFile priorFrame rightSelector prevCtxt | logFile := FileStream readOnlyFileNamed: fileName. transcript clear. byteCount := 0. sendCount := 0. priorFrame := localFP. quitBlock := [^ self]. self initStackPages. self loadInitialContext. self internalizeIPandSP. self fetchNextBytecode. prevCtxt := 0. prevCtxt := prevCtxt. [sendCount < nSends] whileTrue: [ " byteCount>500 ifTrue: [byteCount>550 ifTrue: [self halt]. self externalizeIPandSP. prevCtxt = localFP ifFalse: [prevCtxt := localFP. transcript cr; nextPutAll: (self printTop: 2); endEntry]. transcript cr; print: byteCount; nextPutAll: ': ' , (localFP hex); space; print: (instructionPointer - method - (BaseHeaderSize - 2)); nextPutAll: ': <' , (self byteAt: localIP) hex , '>'; space; nextPutAll: (self symbolic: currentBytecode at: localIP inMethod: method); space; print: (self stackPointerIndex - TempFrameStart + 1); endEntry. ]. " + self dispatchOn: currentBytecode in: BytecodeTable. - self dispatchOn: currentBytecode + bytecodeSetSelector in: BytecodeTable. localFP = priorFrame ifFalse: [sendCount := sendCount + 1. loggingStart >= sendCount ifTrue: [rightSelector := logFile nextLine. (self stringOf: messageSelector) = rightSelector ifFalse: [self halt: 'halt at ', sendCount printString]]. priorFrame := localFP]. self incrementByteCount]. self externalizeIPandSP. logFile close. self inform: nSends printString , ' sends verfied.'! Item was changed: ----- Method: StackInterpreterSimulator>>logOfSendsWrite:toFileNamed:fromStart: (in category 'testing') ----- logOfSendsWrite: nSends toFileNamed: fileName fromStart: loggingStart "Write a log file for testing a flaky interpreter on the same image" "self logOfSendsWrite: 10000 toFileNamed: 'clone32Messages.log' " | logFile priorFrame | logFile := FileStream newFileNamed: fileName. transcript clear. byteCount := 0. sendCount := 0. priorFrame := localFP. quitBlock := [^ self]. self initStackPages. self loadInitialContext. self internalizeIPandSP. self fetchNextBytecode. [sendCount < nSends] whileTrue: + [self dispatchOn: currentBytecode in: BytecodeTable. - [self dispatchOn: currentBytecode + bytecodeSetSelector in: BytecodeTable. localFP = priorFrame ifFalse: [sendCount >= loggingStart ifTrue: [sendCount := sendCount + 1. logFile nextPutAll: (self stringOf: messageSelector); cr]. priorFrame := localFP]. self incrementByteCount]. self externalizeIPandSP. logFile close! Item was changed: ----- Method: StackInterpreterSimulator>>printCurrentBytecodeOn: (in category 'debug printing') ----- printCurrentBytecodeOn: aStream | code | code := currentBytecode radix: 16. aStream ensureCr; print: localIP - method - 3; tab. bytecodeSetSelector > 0 ifTrue: [aStream nextPutAll: 'ALT ']. aStream nextPut: (code size < 2 ifTrue: [$0] ifFalse: [code at: 1]); nextPut: code last; space; + nextPutAll: (BytecodeTable at: currentBytecode + 1); - nextPutAll: (BytecodeTable at: currentBytecode + bytecodeSetSelector + 1); space; nextPut: $(; print: byteCount + 1; nextPut: $)! Item was changed: ----- Method: StackInterpreterSimulator>>run (in category 'testing') ----- run "Just run" + quitBlock := [| topWindow | + + (displayView notNil + and: [topWindow := displayView outermostMorphThat: + [:m| m isSystemWindow and: [World submorphs includes: m]]. + topWindow notNil + and: [UIManager default confirm: 'close?']]) ifTrue: + [topWindow delete]. - quitBlock := [([transcript dependents anyOne outermostMorphThat: [:m| m isSystemWindow]] - on: Error - do: [:ex| nil]) - ifNotNil: [:window| (UIManager default confirm: 'close?') ifTrue: [window delete]]. ^self]. self initStackPages. self loadInitialContext. self internalizeIPandSP. self fetchNextBytecode. [true] whileTrue: [self assertValidExecutionPointers. atEachStepBlock value. "N.B. may be nil" + self dispatchOn: currentBytecode in: BytecodeTable. - self dispatchOn: currentBytecode + bytecodeSetSelector in: BytecodeTable. self incrementByteCount]. localIP := localIP - 1. "undo the pre-increment of IP before returning" self externalizeIPandSP! Item was changed: ----- Method: StackInterpreterSimulator>>runAtEachStep: (in category 'testing') ----- runAtEachStep: aBlock self initStackPages. self loadInitialContext. self internalizeIPandSP. self fetchNextBytecode. [true] whileTrue: [self assertValidExecutionPointers. aBlock value: currentBytecode. + self dispatchOn: currentBytecode in: BytecodeTable. - self dispatchOn: currentBytecode + bytecodeSetSelector in: BytecodeTable. self incrementByteCount]. localIP := localIP - 1. "undo the pre-increment of IP before returning" self externalizeIPandSP! Item was changed: ----- Method: StackInterpreterSimulator>>runAtEachStep:breakCount: (in category 'testing') ----- runAtEachStep: aBlock breakCount: breakCount self initStackPages. self loadInitialContext. self internalizeIPandSP. self fetchNextBytecode. [true] whileTrue: [self assertValidExecutionPointers. aBlock value: currentBytecode. + self dispatchOn: currentBytecode in: BytecodeTable. - self dispatchOn: currentBytecode + bytecodeSetSelector in: BytecodeTable. self incrementByteCount. byteCount = breakCount ifTrue: [self halt]]. localIP := localIP - 1. "undo the pre-increment of IP before returning" self externalizeIPandSP! Item was changed: ----- Method: StackInterpreterSimulator>>runForNBytes: (in category 'testing') ----- runForNBytes: nBytecodes "Do nByteCodes more bytecode dispatches. Keep byteCount up to date. This can be run repeatedly." | endCount | self initStackPages. self loadInitialContext. endCount := byteCount + nBytecodes. self internalizeIPandSP. self fetchNextBytecode. [byteCount < endCount] whileTrue: + [self dispatchOn: currentBytecode in: BytecodeTable. - [self dispatchOn: currentBytecode + bytecodeSetSelector in: BytecodeTable. self incrementByteCount]. localIP := localIP - 1. "undo the pre-increment of IP before returning" self externalizeIPandSP! Item was changed: ----- Method: StackInterpreterSimulator>>runWithBreakCount: (in category 'testing') ----- runWithBreakCount: theBreakCount "Just run, halting when byteCount is reached" + quitBlock := [| topWindow | + + (displayView notNil + and: [topWindow := displayView outermostMorphThat: + [:m| m isSystemWindow and: [World submorphs includes: m]]. + topWindow notNil + and: [UIManager default confirm: 'close?']]) ifTrue: + [topWindow delete]. - quitBlock := [(displayView notNil - and: [UIManager default confirm: 'close?']) ifTrue: - [(displayView outermostMorphThat: [:m| m isSystemWindow]) ifNotNil: - [:topWindow| topWindow delete]]. ^self]. breakCount := theBreakCount. self initStackPages. self loadInitialContext. self internalizeIPandSP. self fetchNextBytecode. [true] whileTrue: [self assertValidExecutionPointers. + self dispatchOn: currentBytecode in: BytecodeTable. - self dispatchOn: currentBytecode + bytecodeSetSelector in: BytecodeTable. self incrementByteCount]. localIP := localIP - 1. "undo the pre-increment of IP before returning" self externalizeIPandSP! Item was changed: ----- Method: StackInterpreterSimulator>>test (in category 'testing') ----- test self initStackPages. self loadInitialContext. transcript clear. byteCount := 0. breakCount := -1. quitBlock := [^self]. printSends := printReturns := true. self internalizeIPandSP. self fetchNextBytecode. [true] whileTrue: [self assertValidExecutionPointers. printFrameAtEachStep ifTrue: [self printFrame: localFP WithSP: localSP]. printBytecodeAtEachStep ifTrue: [self printCurrentBytecodeOn: Transcript. Transcript cr; flush]. + self dispatchOn: currentBytecode in: BytecodeTable. - self dispatchOn: currentBytecode + bytecodeSetSelector in: BytecodeTable. self incrementByteCount. byteCount = breakCount ifTrue: ["printFrameAtEachStep :=" printBytecodeAtEachStep := true. self halt: 'hit breakCount break-point']]. self externalizeIPandSP! Item was changed: ----- Method: StackInterpreterSimulator>>test1 (in category 'testing') ----- test1 self initStackPages. self loadInitialContext. transcript clear. byteCount := 0. breakCount := -1. self setBreakSelector: #blockCopy:. quitBlock := [^self]. printSends := printReturns := true. self internalizeIPandSP. self fetchNextBytecode. [true] whileTrue: [self assertValidExecutionPointers. "byteCount >= 22283 ifTrue: [(self checkIsStillMarriedContext: 22186072 currentFP: localFP) ifFalse: [self halt]]." (printBytecodeAtEachStep "and: [self isMarriedOrWidowedContext: 22189568]") ifTrue: ["| thePage | thePage := stackPages stackPageFor: (self frameOfMarriedContext: 22189568). thePage == stackPage ifTrue: [self shortPrintFrameAndCallers: localFP SP: localSP] ifFalse: [self shortPrintFrameAndCallers: thePage headFrameFP SP: thePage headFrameSP]." self printCurrentBytecodeOn: Transcript. Transcript cr; flush]. + self dispatchOn: currentBytecode in: BytecodeTable. - self dispatchOn: currentBytecode + bytecodeSetSelector in: BytecodeTable. self incrementByteCount. byteCount = breakCount ifTrue: ["printFrameAtEachStep := true." printSends := printBytecodeAtEachStep := true. self halt: 'hit breakCount break-point']]. self externalizeIPandSP! Item was changed: ----- Method: StackInterpreterSimulator>>testBreakCount:printSends:printFrames:printBytecodes: (in category 'testing') ----- testBreakCount: breakCount printSends: shouldPrintSends printFrames: shouldPrintFrames printBytecodes: shouldPrintBytecodes self initStackPages. self loadInitialContext. transcript clear. byteCount := 0. quitBlock := [^self]. printSends := true & shouldPrintSends. "true & foo allows evaluating printFoo := true in the debugger" printFrameAtEachStep := true & shouldPrintFrames. printBytecodeAtEachStep := true & shouldPrintBytecodes. self internalizeIPandSP. self fetchNextBytecode. [true] whileTrue: [self assertValidExecutionPointers. printFrameAtEachStep ifTrue: [self printFrame: localFP WithSP: localSP]. printBytecodeAtEachStep ifTrue: [self printCurrentBytecodeOn: Transcript. Transcript cr; flush]. + self dispatchOn: currentBytecode in: BytecodeTable. - self dispatchOn: currentBytecode + bytecodeSetSelector in: BytecodeTable. self incrementByteCount. byteCount = breakCount ifTrue: ["printFrameAtEachStep :=" printBytecodeAtEachStep := true. self halt: 'hit breakCount break-point']]. self externalizeIPandSP!

1 0

VM Maker: VMMaker-dtl.276.mcz
by commits＠source.squeak.org 26 Jun '12

26 Jun '12

David T. Lewis uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker-dtl.276.mcz ==================== Summary ==================== Name: VMMaker-dtl.276 Author: dtl Time: 26 June 2012, 7:19:34.52 am UUID: 8ca183d8-1667-4b12-bcb9-9679eed75702 Ancestors: VMMaker-dtl.275 Put CompiledMethod>>requiresConcreteImplementation in package VMMaker. This was miscategorized in my development image, hence missing from the ;VMMaker package. =============== Diff against VMMaker-dtl.275 =============== Item was added: + ----- Method: CompiledMethod>>requiresConcreteImplementation (in category '*VMMaker-translation') ----- + requiresConcreteImplementation + | marker | + marker := self markerOrNil. + ^ marker notNil and: [marker = #subclassResponsibility].!

1 0

VM Maker: VMMaker.oscog-eem.171.mcz
by commits＠source.squeak.org 26 Jun '12

26 Jun '12

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.171.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.171 Author: eem Time: 25 June 2012, 7:52:11.789 pm UUID: c7fe70ad-ea30-4ba0-9645-a4060894480e Ancestors: VMMaker.oscog-eem.170 Fix super expansions once again. Eliding the final return is ok, but it means ReturnNode needs to add it back in. Further, AssignmentNode would need to do something special for super expansions with returns at other than the last statement, so raise an error if seen. Move add of bytecodeSetSelector to fetchNextBytecode from interpret so that e.g. dispatch in sqGnu.h doesn't have to duplicate offset by bytecodeSetSelector. =============== Diff against VMMaker.oscog-eem.170 =============== Item was added: + ----- Method: AssignmentNode>>anyReturns: (in category '*VMMaker-C translation') ----- + anyReturns: aSequenceOfNodes + aSequenceOfNodes do: + [:node| + node nodesDo: + [:n| + n isReturn ifTrue: + [^true]]]. + ^false! Item was changed: ----- Method: AssignmentNode>>asTranslatorNodeIn: (in category '*VMMaker-C translation') ----- asTranslatorNodeIn: aTMethod "make a CCodeGenerator equivalent of me" | varNode valueNode | varNode := variable asTranslatorNodeIn: aTMethod. valueNode := value asTranslatorNodeIn: aTMethod. valueNode isStmtList ifFalse: [^TAssignmentNode new setVariable: varNode expression: valueNode; comment: comment]. + "This is a super expansion. We are in trouble if any statement other than the last is a return." + (self anyReturns: valueNode statements allButLast) ifTrue: + [self error: 'haven''t implemented pushing down assignments into other than the last return']. + "As of 6/25/2012 19:30 superExpansionNodeFor:args: elides the final return." + self assert: valueNode statements last isReturn not. ^TStmtListNode new setStatements: valueNode statements allButLast, { TAssignmentNode new setVariable: varNode expression: valueNode statements last; comment: comment }; yourself! Item was changed: ----- Method: CoInterpreter>>baseFrameReturn (in category 'return bytecodes') ----- baseFrameReturn + <inline: true> | contextToReturnTo retToContext theFP theSP thePage newPage frameAbove | <var: #theFP type: #'char *'> <var: #theSP type: #'char *'> <var: #thePage type: #'StackPage *'> <var: #newPage type: #'StackPage *'> <var: #frameAbove type: #'char *'> contextToReturnTo := self frameCallerContext: localFP. "The stack page is effectively free now, so free it. We must free it to be correct in determining if contextToReturnTo is still married, and in case makeBaseFrameFor: cogs a method, which may cause a code compaction, in which case the frame must be free to avoid the relocation machinery tracing the dead frame. Since freeing now temporarily violates the page-list ordering invariant, use the assert-free version." stackPages freeStackPageNoAssert: stackPage. retToContext := self isContext: contextToReturnTo. (retToContext and: [self isStillMarriedContext: contextToReturnTo]) ifTrue: [theFP := self frameOfMarriedContext: contextToReturnTo. thePage := stackPages stackPageFor: theFP. theFP = thePage headFP ifTrue: [theSP := thePage headSP] ifFalse: ["Returning to some interior frame, presumably because of a sender assignment. Move the frames above to another page (they may be in use, e.g. via coroutining). Make the interior frame the top frame." frameAbove := self findFrameAbove: theFP inPage: thePage. "Since we've just deallocated a page we know that newStackPage won't deallocate an existing one." newPage := self newStackPage. self assert: newPage = stackPage. self moveFramesIn: thePage through: frameAbove toPage: newPage. stackPages markStackPageMostRecentlyUsed: newPage. theFP := thePage headFP. theSP := thePage headSP]] ifFalse: [(retToContext and: [objectMemory isIntegerObject: (objectMemory fetchPointer: InstructionPointerIndex ofObject: contextToReturnTo)]) ifFalse: [| contextToReturnFrom | contextToReturnFrom := stackPages longAt: stackPage baseAddress - BytesPerWord. self tearDownAndRebuildFrameForCannotReturnBaseFrameReturnFrom: contextToReturnFrom to: contextToReturnTo returnValue: localReturnValue. ^self externalCannotReturn: localReturnValue from: contextToReturnFrom]. "We must void the instructionPointer to stop it being updated if makeBaseFrameFor: cogs a method, which may cause a code compaction." instructionPointer := 0. thePage := self makeBaseFrameFor: contextToReturnTo. theFP := thePage headFP. theSP := thePage headSP]. self setStackPageAndLimit: thePage. self assert: (stackPages stackPageFor: theFP) = stackPage. localSP := theSP. localFP := theFP. localIP := self pointerForOop: self internalStackTop. localIP asUnsignedInteger < objectMemory startOfMemory ifTrue: [localIP asUnsignedInteger ~= cogit ceReturnToInterpreterPC ifTrue: ["localIP in the cog method zone indicates a return to machine code." ^self returnToMachineCodeFrame]. localIP := self pointerForOop: (self iframeSavedIP: localFP)]. self assert: (self checkIsStillMarriedContext: contextToReturnTo currentFP: localFP). self setMethod: (self iframeMethod: localFP). self internalStackTopPut: localReturnValue. ^self fetchNextBytecode! Item was changed: ----- Method: CogVMSimulator>>interpret (in category 'interpreter shell') ----- interpret "This is the main interpreter loop. It normally loops forever, fetching and executing bytecodes. When running in the context of a web browser plugin VM, however, it must return control to the web browser periodically. This should done only when the state of the currently running Squeak thread is safely stored in the object heap. Since this is the case at the moment that a check for interrupts is performed, that is when we return to the browser if it is time to do so. Interrupt checks happen quite frequently. Override for simulation to insert bytecode breakpoint support." <inline: false> "If stacklimit is zero then the stack pages have not been initialized." stackLimit = 0 ifTrue: [^self initStackPagesAndInterpret]. "record entry time when running as a browser plug-in" self browserPluginInitialiseIfNeeded. self internalizeIPandSP. self fetchNextBytecode. [true] whileTrue: [self assertValidExecutionPointers. atEachStepBlock value. "N.B. may be nil" + self dispatchOn: currentBytecode in: BytecodeTable. - self dispatchOn: currentBytecode + bytecodeSetSelector in: BytecodeTable. self incrementByteCount]. localIP := localIP - 1. "undo the pre-increment of IP before returning" self externalizeIPandSP. ^nil ! Item was changed: ----- Method: ReturnNode>>asTranslatorNodeIn: (in category '*VMMaker-C translation') ----- asTranslatorNodeIn: aTMethod + "Make a CCodeGenerator equivalent of a return." + | exprTranslation lastExpr | + exprTranslation := expr asTranslatorNodeIn: aTMethod. - "Make a CCodeGenerator equivalent of a return. - Since super calls are expanded the return must be elided from super expansions." (expr isMessage + and: [expr receiver isVariableNode + and: [expr receiver key = 'super' + and: [exprTranslation isStmtList]]]) ifTrue: + ["super expansions containing returns are fine, and (as of 6/25/2012 19:27) the last + return is elided from the expansion by TMethod>>superExpansionNodeFor:args:. + So we need to ensure the last expression is a return and simply reuse any other + returns in the expansion." + exprTranslation statements last isReturn ifFalse: + [lastExpr := exprTranslation statements removeLast. + exprTranslation statements addLast: + (TReturnNode new + setExpression: lastExpr; + comment: comment; + yourself)]. + ^exprTranslation]. - and: [expr receiver isVariableNode and: [expr receiver key = 'super']]) ifTrue: - [^expr asTranslatorNodeIn: aTMethod]. ^TReturnNode new + setExpression: exprTranslation; + comment: comment; + yourself! - setExpression: (expr asTranslatorNodeIn: aTMethod); - comment: comment! Item was changed: ----- Method: StackInterpreter>>baseFrameReturn (in category 'return bytecodes') ----- baseFrameReturn + <inline: true> | contextToReturnTo isAContext theFP theSP thePage frameAbove | <var: #theFP type: #'char *'> <var: #theSP type: #'char *'> <var: #thePage type: #'StackPage *'> <var: #frameAbove type: #'char *'> contextToReturnTo := self frameCallerContext: localFP. isAContext := self isContext: contextToReturnTo. (isAContext and: [self isStillMarriedContext: contextToReturnTo]) ifTrue: [theFP := self frameOfMarriedContext: contextToReturnTo. thePage := stackPages stackPageFor: theFP. theFP = thePage headFP ifTrue: [theSP := thePage headSP. stackPages freeStackPageNoAssert: stackPage "for a short time invariant is violated; assert follows"] ifFalse: ["Returning to some interior frame, presumably because of a sender assignment. Move the frames above to another page (they may be in use, e.g. via coroutining). Make the interior frame the top frame." frameAbove := self findFrameAbove: theFP inPage: thePage. "Reuse the page we're exiting, which avoids allocating a new page and manipulating the page list to mark the page we're entering as least recently used (to avoid it being deallocated when allocating a new page)." self moveFramesIn: thePage through: frameAbove toPage: stackPage. theFP := thePage headFP. theSP := thePage headSP]] ifFalse: [(isAContext and: [objectMemory isIntegerObject: (objectMemory fetchPointer: InstructionPointerIndex ofObject: contextToReturnTo)]) ifFalse: [^self internalCannotReturn: localReturnValue]. thePage := self makeBaseFrameFor: contextToReturnTo. theFP := thePage headFP. theSP := thePage headSP. stackPages freeStackPageNoAssert: stackPage "for a short time invariant is violated; assert follows"]. self setStackPageAndLimit: thePage. self assert: (stackPages stackPageFor: theFP) = stackPage. localSP := theSP. localFP := theFP. self setMethod: (self frameMethod: localFP). localIP := self pointerForOop: self internalStackTop. self internalStackTopPut: localReturnValue. self assert: (self checkIsStillMarriedContext: contextToReturnTo currentFP: localFP). ^self fetchNextBytecode! Item was changed: ----- Method: StackInterpreter>>fetchNextBytecode (in category 'interpreter shell') ----- fetchNextBytecode "This method fetches the next instruction (bytecode). Each bytecode method is responsible for fetching the next bytecode, preferably as early as possible to allow the memory system time to process the request before the next dispatch." + self cppIf: MULTIPLEBYTECODESETS + ifTrue: [currentBytecode := self fetchByte + bytecodeSetSelector] + ifFalse: [currentBytecode := self fetchByte]! - currentBytecode := self fetchByte. - ! Item was changed: ----- Method: StackInterpreter>>interpret (in category 'interpreter shell') ----- interpret "This is the main interpreter loop. It normally loops forever, fetching and executing bytecodes. When running in the context of a browser plugin VM, however, it must return control to the browser periodically. This should done only when the state of the currently running Squeak thread is safely stored in the object heap. Since this is the case at the moment that a check for interrupts is performed, that is when we return to the browser if it is time to do so. Interrupt checks happen quite frequently." <inline: false> "If stacklimit is zero then the stack pages have not been initialized." stackLimit = 0 ifTrue: [^self initStackPagesAndInterpret]. "record entry time when running as a browser plug-in" self browserPluginInitialiseIfNeeded. self internalizeIPandSP. self fetchNextBytecode. + [true] whileTrue: [self dispatchOn: currentBytecode in: BytecodeTable]. - [true] whileTrue: [self dispatchOn: currentBytecode + bytecodeSetSelector in: BytecodeTable]. localIP := localIP - 1. "undo the pre-increment of IP before returning" self externalizeIPandSP. ^nil !

1 0

issue tracker update mails
by Camillo Bruni 26 Jun '12

26 Jun '12

Could we add issue update mails from http://code.google.com/p/cog TODO: Please add cog(a)googlecode.com to the mailing list (this has to be done manually) best cami

1 0

[commit] r2561 - Accurate comments for plugins.ext, plugins.int & their use in HowToBuild.
by commits＠squeakvm.org 26 Jun '12

26 Jun '12

Author: eliot Date: 2012-06-25 16:53:39 -0700 (Mon, 25 Jun 2012) New Revision: 2561 Modified: branches/Cog/cygwinbuild/HowToBuild branches/Cog/cygwinbuild/plugins.ext branches/Cog/cygwinbuild/plugins.int branches/Cog/macbuild/HowToBuild branches/Cog/macbuild/plugins.ext branches/Cog/macbuild/plugins.int branches/Cog/nsbuild/cygwinbuild/HowToBuild branches/Cog/nsbuild/cygwinbuild/plugins.ext branches/Cog/nsbuild/cygwinbuild/plugins.int branches/Cog/nsbuild/macbuild/plugins.int branches/Cog/nsbuild/unixbuild/HowToBuild branches/Cog/nsbuild/unixbuild/bld/plugins.ext branches/Cog/nsbuild/unixbuild/bld/plugins.int branches/Cog/nscogbuild/cygwinbuild/HowToBuild branches/Cog/nscogbuild/cygwinbuild/plugins.ext branches/Cog/nscogbuild/cygwinbuild/plugins.int branches/Cog/nscogbuild/macbuild/plugins.int branches/Cog/nscogbuild/unixbuild/HowToBuild branches/Cog/nscogbuild/unixbuild/bld/plugins.ext branches/Cog/nscogbuild/unixbuild/bld/plugins.int branches/Cog/stackbuild/cygwinbuild/HowToBuild branches/Cog/stackbuild/cygwinbuild/plugins.ext branches/Cog/stackbuild/cygwinbuild/plugins.int branches/Cog/stackbuild/macbuild/HowToBuild branches/Cog/stackbuild/macbuild/plugins.ext branches/Cog/stackbuild/macbuild/plugins.int branches/Cog/unixbuild/HowToBuild branches/Cog/unixbuild/bld/plugins.ext branches/Cog/unixbuild/bld/plugins.int branches/Cog/unixbuild/mtbld/plugins.ext branches/Cog/unixbuild/mtbld/plugins.int Log: Accurate comments for plugins.ext, plugins.int & their use in HowToBuild. Modified: branches/Cog/cygwinbuild/HowToBuild =================================================================== --- branches/Cog/cygwinbuild/HowToBuild 2012-06-22 01:46:42 UTC (rev 2560) +++ branches/Cog/cygwinbuild/HowToBuild 2012-06-25 23:53:39 UTC (rev 2561) @@ -30,6 +30,8 @@ 4. At the end of this process you should have a brand new Croquet VM in the cygwinbuild/build/vm folder (make sure you copy Croquet.map along with it) +N.B. The plugin set is defined by plugins.ext and plugins.int in the build dir. + 3a. The cygwin makefile supports building three VM configurations, product, assert and debug, building product by default. To build a configuration simply type make configuration, e.g. Modified: branches/Cog/cygwinbuild/plugins.ext =================================================================== --- branches/Cog/cygwinbuild/plugins.ext 2012-06-22 01:46:42 UTC (rev 2560) +++ branches/Cog/cygwinbuild/plugins.ext 2012-06-25 23:53:39 UTC (rev 2561) @@ -1,4 +1,4 @@ -# List of external plugins. +# Copied, perhaps edited, from ../src/examplePlugins.ext EXTERNAL_PLUGINS = \ BochsIA32Plugin \ SqueakFFIPrims \ Modified: branches/Cog/cygwinbuild/plugins.int =================================================================== --- branches/Cog/cygwinbuild/plugins.int 2012-06-22 01:46:42 UTC (rev 2560) +++ branches/Cog/cygwinbuild/plugins.int 2012-06-25 23:53:39 UTC (rev 2561) @@ -1,4 +1,4 @@ -# Automatically generated makefile include for internal plugins +# Copied, perhaps edited, from ../src/examplePlugins.int INTERNAL_PLUGINS = \ ADPCMCodecPlugin \ AsynchFilePlugin \ Modified: branches/Cog/macbuild/HowToBuild =================================================================== --- branches/Cog/macbuild/HowToBuild 2012-06-22 01:46:42 UTC (rev 2560) +++ branches/Cog/macbuild/HowToBuild 2012-06-25 23:53:39 UTC (rev 2561) @@ -37,3 +37,5 @@ 4. At the end of this process you should have a brand new Croquet.app in the macbuild folder (or Fast.app Assert.app and Debug.app if you've used mvm). + +N.B. The plugin set is defined by plugins.ext and plugins.int in the build dir. Modified: branches/Cog/macbuild/plugins.ext =================================================================== --- branches/Cog/macbuild/plugins.ext 2012-06-22 01:46:42 UTC (rev 2560) +++ branches/Cog/macbuild/plugins.ext 2012-06-25 23:53:39 UTC (rev 2561) @@ -1,4 +1,4 @@ -# Automatically generated makefile include for external plugins +# Copied, perhaps edited, from ../src/examplePlugins.ext EXTERNAL_PLUGINS = \ BochsIA32Plugin \ CroquetPlugin \ Modified: branches/Cog/macbuild/plugins.int =================================================================== --- branches/Cog/macbuild/plugins.int 2012-06-22 01:46:42 UTC (rev 2560) +++ branches/Cog/macbuild/plugins.int 2012-06-25 23:53:39 UTC (rev 2561) @@ -1,4 +1,4 @@ -# Automatically generated makefile include for internal plugins +# Copied, perhaps edited, from ../src/examplePlugins.int INTERNAL_PLUGINS = \ ADPCMCodecPlugin \ AsynchFilePlugin \ Modified: branches/Cog/nsbuild/cygwinbuild/HowToBuild =================================================================== --- branches/Cog/nsbuild/cygwinbuild/HowToBuild 2012-06-22 01:46:42 UTC (rev 2560) +++ branches/Cog/nsbuild/cygwinbuild/HowToBuild 2012-06-25 23:53:39 UTC (rev 2561) @@ -30,6 +30,8 @@ 4. At the end of this process you should have a brand new Croquet VM in the cygwinbuild/build/vm folder (make sure you copy Croquet.map along with it) +N.B. The plugin set is defined by plugins.ext and plugins.int in the build dir. + 3a. The cygwin makefile supports building three VM configurations, product, assert and debug, building product by default. To build a configuration simply type make configuration, e.g. Modified: branches/Cog/nsbuild/cygwinbuild/plugins.ext =================================================================== --- branches/Cog/nsbuild/cygwinbuild/plugins.ext 2012-06-22 01:46:42 UTC (rev 2560) +++ branches/Cog/nsbuild/cygwinbuild/plugins.ext 2012-06-25 23:53:39 UTC (rev 2561) @@ -1,2 +1,2 @@ -# List of external plugins. +# Copied, perhaps edited, from ../../nssrc/examplePlugins.ext EXTERNAL_PLUGINS = Modified: branches/Cog/nsbuild/cygwinbuild/plugins.int =================================================================== --- branches/Cog/nsbuild/cygwinbuild/plugins.int 2012-06-22 01:46:42 UTC (rev 2560) +++ branches/Cog/nsbuild/cygwinbuild/plugins.int 2012-06-25 23:53:39 UTC (rev 2561) @@ -1,4 +1,4 @@ -# Automatically generated makefile include for internal plugins +# Copied, perhaps edited, from ../../nssrc/examplePlugins.int INTERNAL_PLUGINS = \ AsynchFilePlugin \ BMPReadWriterPlugin \ Modified: branches/Cog/nsbuild/macbuild/plugins.int =================================================================== --- branches/Cog/nsbuild/macbuild/plugins.int 2012-06-22 01:46:42 UTC (rev 2560) +++ branches/Cog/nsbuild/macbuild/plugins.int 2012-06-25 23:53:39 UTC (rev 2561) @@ -1,4 +1,4 @@ -# Automatically generated makefile include for external plugins +# Copied, perhaps edited, from ../../nssrc/examplePlugins.int INTERNAL_PLUGINS = \ AsynchFilePlugin \ BMPReadWriterPlugin \ Modified: branches/Cog/nsbuild/unixbuild/HowToBuild =================================================================== --- branches/Cog/nsbuild/unixbuild/HowToBuild 2012-06-22 01:46:42 UTC (rev 2560) +++ branches/Cog/nsbuild/unixbuild/HowToBuild 2012-06-25 23:53:39 UTC (rev 2561) @@ -23,7 +23,9 @@ 4. At the end of it you'll get a new VM in the path provided via -prefix +N.B. The plugin set is defined by plugins.ext and plugins.int in the build dir. + 3a. For an assert-enabled VM do ../../../platforms/unix/config/configure --without-vm-display-fbdev --without-npsqueak --with-src=nssrc --disable-cogit CFLAGS="-g -O1 -msse2 -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -DNO_VM_PROFILE=1 -DDEBUGVM=0" LIBS=-lpthread Modified: branches/Cog/nsbuild/unixbuild/bld/plugins.ext =================================================================== --- branches/Cog/nsbuild/unixbuild/bld/plugins.ext 2012-06-22 01:46:42 UTC (rev 2560) +++ branches/Cog/nsbuild/unixbuild/bld/plugins.ext 2012-06-25 23:53:39 UTC (rev 2561) @@ -1,2 +1,2 @@ -# List of external plugins. +# Copied, perhaps edited, from ../../../nssrc/examplePlugins.ext EXTERNAL_PLUGINS = \ Modified: branches/Cog/nsbuild/unixbuild/bld/plugins.int =================================================================== --- branches/Cog/nsbuild/unixbuild/bld/plugins.int 2012-06-22 01:46:42 UTC (rev 2560) +++ branches/Cog/nsbuild/unixbuild/bld/plugins.int 2012-06-25 23:53:39 UTC (rev 2561) @@ -1,4 +1,4 @@ -# Automatically generated makefile include for external plugins +# Copied, perhaps edited, from ../../../nssrc/examplePlugins.int INTERNAL_PLUGINS = \ AsynchFilePlugin \ BMPReadWriterPlugin \ Modified: branches/Cog/nscogbuild/cygwinbuild/HowToBuild =================================================================== --- branches/Cog/nscogbuild/cygwinbuild/HowToBuild 2012-06-22 01:46:42 UTC (rev 2560) +++ branches/Cog/nscogbuild/cygwinbuild/HowToBuild 2012-06-25 23:53:39 UTC (rev 2561) @@ -30,6 +30,9 @@ 4. At the end of this process you should have a brand new Croquet VM in the cygwinbuild/build/vm folder (make sure you copy Croquet.map along with it) +N.B. The plugin set is defined by plugins.ext and plugins.int in the build dir. + + 3a. The cygwin makefile supports building three VM configurations, product, assert and debug, building product by default. To build a configuration simply type make configuration, e.g. Modified: branches/Cog/nscogbuild/cygwinbuild/plugins.ext =================================================================== --- branches/Cog/nscogbuild/cygwinbuild/plugins.ext 2012-06-22 01:46:42 UTC (rev 2560) +++ branches/Cog/nscogbuild/cygwinbuild/plugins.ext 2012-06-25 23:53:39 UTC (rev 2561) @@ -1,2 +1,2 @@ -# List of external plugins. +# Copied, perhaps edited, from ../../nscogsrc/examplePlugins.ext EXTERNAL_PLUGINS = Modified: branches/Cog/nscogbuild/cygwinbuild/plugins.int =================================================================== --- branches/Cog/nscogbuild/cygwinbuild/plugins.int 2012-06-22 01:46:42 UTC (rev 2560) +++ branches/Cog/nscogbuild/cygwinbuild/plugins.int 2012-06-25 23:53:39 UTC (rev 2561) @@ -1,4 +1,4 @@ -# Automatically generated makefile include for internal plugins +# Copied, perhaps edited, from ../../nscogsrc/examplePlugins.int INTERNAL_PLUGINS = \ AsynchFilePlugin \ BMPReadWriterPlugin \ Modified: branches/Cog/nscogbuild/macbuild/plugins.int =================================================================== --- branches/Cog/nscogbuild/macbuild/plugins.int 2012-06-22 01:46:42 UTC (rev 2560) +++ branches/Cog/nscogbuild/macbuild/plugins.int 2012-06-25 23:53:39 UTC (rev 2561) @@ -1,4 +1,4 @@ -# Automatically generated makefile include for external plugins +# Copied, perhaps edited, from ../../nscogsrc/examplePlugins.int INTERNAL_PLUGINS = \ AsynchFilePlugin \ BMPReadWriterPlugin \ Modified: branches/Cog/nscogbuild/unixbuild/HowToBuild =================================================================== --- branches/Cog/nscogbuild/unixbuild/HowToBuild 2012-06-22 01:46:42 UTC (rev 2560) +++ branches/Cog/nscogbuild/unixbuild/HowToBuild 2012-06-25 23:53:39 UTC (rev 2561) @@ -25,7 +25,9 @@ 4. At the end of it you'll get a new VM in the path provided via -prefix +N.B. The plugin set is defined by plugins.ext and plugins.int in the build dir. + 3a. For an assert-enabled VM do ../../../platforms/unix/config/configure --without-vm-display-fbdev --without-npsqueak --with-src=nscogsrc CFLAGS="-g -O1 -msse2 -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -DITIMER_HEARTBEAT=1 -DNO_VM_PROFILE=1 -DDEBUGVM=0" LIBS="-lpthread -luuid" Modified: branches/Cog/nscogbuild/unixbuild/bld/plugins.ext =================================================================== --- branches/Cog/nscogbuild/unixbuild/bld/plugins.ext 2012-06-22 01:46:42 UTC (rev 2560) +++ branches/Cog/nscogbuild/unixbuild/bld/plugins.ext 2012-06-25 23:53:39 UTC (rev 2561) @@ -1,2 +1,2 @@ -# List of external plugins. +# Copied, perhaps edited, from ../../../nscogsrc/examplePlugins.ext EXTERNAL_PLUGINS = \ Modified: branches/Cog/nscogbuild/unixbuild/bld/plugins.int =================================================================== --- branches/Cog/nscogbuild/unixbuild/bld/plugins.int 2012-06-22 01:46:42 UTC (rev 2560) +++ branches/Cog/nscogbuild/unixbuild/bld/plugins.int 2012-06-25 23:53:39 UTC (rev 2561) @@ -1,4 +1,4 @@ -# Automatically generated makefile include for external plugins +# Copied, perhaps edited, from ../../../nscogsrc/examplePlugins.int INTERNAL_PLUGINS = \ AsynchFilePlugin \ BMPReadWriterPlugin \ Modified: branches/Cog/stackbuild/cygwinbuild/HowToBuild =================================================================== --- branches/Cog/stackbuild/cygwinbuild/HowToBuild 2012-06-22 01:46:42 UTC (rev 2560) +++ branches/Cog/stackbuild/cygwinbuild/HowToBuild 2012-06-25 23:53:39 UTC (rev 2561) @@ -30,6 +30,9 @@ 4. At the end of this process you should have a brand new Croquet VM in the cygwinbuild/build/vm folder (make sure you copy Croquet.map along with it) +N.B. The plugin set is defined by plugins.ext and plugins.int in the build dir. + + 3a. The cygwin makefile supports building three VM configurations, product, assert and debug, building product by default. To build a configuration simply type make configuration, e.g. Modified: branches/Cog/stackbuild/cygwinbuild/plugins.ext =================================================================== --- branches/Cog/stackbuild/cygwinbuild/plugins.ext 2012-06-22 01:46:42 UTC (rev 2560) +++ branches/Cog/stackbuild/cygwinbuild/plugins.ext 2012-06-25 23:53:39 UTC (rev 2561) @@ -1,4 +1,4 @@ -# List of external plugins. +# Copied, perhaps edited, from ../../src/examplePlugins.ext EXTERNAL_PLUGINS = \ SqueakFFIPrims \ Win32OSProcessPlugin Modified: branches/Cog/stackbuild/cygwinbuild/plugins.int =================================================================== --- branches/Cog/stackbuild/cygwinbuild/plugins.int 2012-06-22 01:46:42 UTC (rev 2560) +++ branches/Cog/stackbuild/cygwinbuild/plugins.int 2012-06-25 23:53:39 UTC (rev 2561) @@ -1,4 +1,4 @@ -# Automatically generated makefile include for internal plugins +# Copied, perhaps edited, from ../../src/examplePlugins.int INTERNAL_PLUGINS = \ ADPCMCodecPlugin \ AsynchFilePlugin \ Modified: branches/Cog/stackbuild/macbuild/HowToBuild =================================================================== --- branches/Cog/stackbuild/macbuild/HowToBuild 2012-06-22 01:46:42 UTC (rev 2560) +++ branches/Cog/stackbuild/macbuild/HowToBuild 2012-06-25 23:53:39 UTC (rev 2561) @@ -25,3 +25,5 @@ 4. At the end of this process you should have a brand new Croquet.app in the macbuild folder (or Fast.app Assert.app and Debug.app if you've used mvm). + +N.B. The plugin set is defined by plugins.ext and plugins.int in the build dir. Modified: branches/Cog/stackbuild/macbuild/plugins.ext =================================================================== --- branches/Cog/stackbuild/macbuild/plugins.ext 2012-06-22 01:46:42 UTC (rev 2560) +++ branches/Cog/stackbuild/macbuild/plugins.ext 2012-06-25 23:53:39 UTC (rev 2561) @@ -1,4 +1,4 @@ -# Automatically generated makefile include for external plugins +# Copied, perhaps edited, from ../../src/examplePlugins.ext EXTERNAL_PLUGINS = \ CroquetPlugin \ SqueakFFIPrims \ Modified: branches/Cog/stackbuild/macbuild/plugins.int =================================================================== --- branches/Cog/stackbuild/macbuild/plugins.int 2012-06-22 01:46:42 UTC (rev 2560) +++ branches/Cog/stackbuild/macbuild/plugins.int 2012-06-25 23:53:39 UTC (rev 2561) @@ -1,4 +1,4 @@ -# Automatically generated makefile include for internal plugins +# Copied, perhaps edited, from ../../src/examplePlugins.int INTERNAL_PLUGINS = \ ADPCMCodecPlugin \ AsynchFilePlugin \ Modified: branches/Cog/unixbuild/HowToBuild =================================================================== --- branches/Cog/unixbuild/HowToBuild 2012-06-22 01:46:42 UTC (rev 2560) +++ branches/Cog/unixbuild/HowToBuild 2012-06-25 23:53:39 UTC (rev 2561) @@ -37,7 +37,9 @@ 4. At the end of it you'll get a new VM in the path provided via -prefix +N.B. The plugin set is defined by plugins.ext and plugins.int in the build dir. + 3a. For an assert-enabled VM do ../../platforms/unix/config/configure --without-npsqueak CFLAGS="-g -O1 -msse2 -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -DITIMER_HEARTBEAT=1 -DNO_VM_PROFILE=1 -DCOGMTVM=0 -DDEBUGVM=0" LIBS=-lpthread Modified: branches/Cog/unixbuild/bld/plugins.ext =================================================================== --- branches/Cog/unixbuild/bld/plugins.ext 2012-06-22 01:46:42 UTC (rev 2560) +++ branches/Cog/unixbuild/bld/plugins.ext 2012-06-25 23:53:39 UTC (rev 2561) @@ -1,4 +1,4 @@ -# Automatically generated makefile include for external plugins +# Copied, perhaps edited, from ../../src/examplePlugins.ext EXTERNAL_PLUGINS = \ B3DAcceleratorPlugin \ BochsIA32Plugin \ Modified: branches/Cog/unixbuild/bld/plugins.int =================================================================== --- branches/Cog/unixbuild/bld/plugins.int 2012-06-22 01:46:42 UTC (rev 2560) +++ branches/Cog/unixbuild/bld/plugins.int 2012-06-25 23:53:39 UTC (rev 2561) @@ -1,4 +1,4 @@ -# Automatically generated makefile include for internal plugins +# Copied, perhaps edited, from ../../src/examplePlugins.int INTERNAL_PLUGINS = \ ADPCMCodecPlugin \ AsynchFilePlugin \ Modified: branches/Cog/unixbuild/mtbld/plugins.ext =================================================================== --- branches/Cog/unixbuild/mtbld/plugins.ext 2012-06-22 01:46:42 UTC (rev 2560) +++ branches/Cog/unixbuild/mtbld/plugins.ext 2012-06-25 23:53:39 UTC (rev 2561) @@ -1,4 +1,4 @@ -# Automatically generated makefile include for external plugins +# Copied, perhaps edited, from ../../src/examplePlugins.ext EXTERNAL_PLUGINS = \ B3DAcceleratorPlugin \ BochsIA32Plugin \ Modified: branches/Cog/unixbuild/mtbld/plugins.int =================================================================== --- branches/Cog/unixbuild/mtbld/plugins.int 2012-06-22 01:46:42 UTC (rev 2560) +++ branches/Cog/unixbuild/mtbld/plugins.int 2012-06-25 23:53:39 UTC (rev 2561) @@ -1,4 +1,4 @@ -# Automatically generated makefile include for internal plugins +# Copied, perhaps edited, from ../../src/examplePlugins.int INTERNAL_PLUGINS = \ ADPCMCodecPlugin \ AsynchFilePlugin \

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

Vm-dev June 2012