Vm-dev September 2014

vm-dev@lists.squeakfoundation.org

25 participants
90 discussions

VM Maker: VMMaker.oscog-eem.875.mcz
by commits＠source.squeak.org 08 Sep '14

08 Sep '14

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.875.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.875 Author: eem Time: 8 September 2014, 2:42:20.486 pm UUID: 79a4ffdf-9e0f-4b5c-9336-0af5d0eb447b Ancestors: VMMaker.oscog-eem.874 Cogit class and CogObjectRepresentation class also need to implement cogitClass. =============== Diff against VMMaker.oscog-eem.874 =============== Item was added: + ----- Method: CogObjectRepresentation class>>cogitClass (in category 'accessing class hierarchy') ----- + cogitClass + ^initializationOptions ifNotNil: + [Smalltalk classNamed: (initializationOptions + at: #Cogit + ifAbsent: [#SimpleStackBasedCogit])]! Item was added: + ----- Method: Cogit class>>cogitClass (in category 'accessing class hierarchy') ----- + cogitClass + ^Smalltalk classNamed: (initializationOptions + at: #Cogit + ifAbsent: [#SimpleStackBasedCogit])! Item was changed: ----- Method: Cogit class>>initializeWithOptions: (in category 'class initialization') ----- initializeWithOptions: optionsDictionary + { self. CogMethod. CogMethodSurrogate. CogObjectRepresentation } do: + [:superclass| + superclass withAllSubclasses do: + [:class| class initializationOptions: optionsDictionary]]. - self withAllSubclasses, - CogMethod withAllSubclasses, - CogMethodSurrogate withAllSubclasses - do: [:class| - class initializationOptions: optionsDictionary]. super initializeWithOptions: optionsDictionary. self initializeMiscConstants. "must preceed other initialization." self initializeErrorCodes. self initializeCogMethodConstants. self initializeAnnotationConstants. self initializeBytecodeTable. self initializePrimitiveTable!

1 0

VM Maker: VMMaker.oscog-eem.874.mcz
by commits＠source.squeak.org 08 Sep '14

08 Sep '14

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.874.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.874 Author: eem Time: 8 September 2014, 2:06:30.501 pm UUID: 8a6f15e2-ae6d-48ef-a502-75f0973938b5 Ancestors: VMMaker.oscog-eem.873 Slang: Further clean-up and fix of regression with options processing. Make sure the Cogit is added to options. Eliminate the cogitClassName from the VMMaker. =============== Diff against VMMaker.oscog-eem.873 =============== Item was changed: ----- Method: Cogit class>>tableFunctions (in category 'translation') ----- tableFunctions "self tableFunctions" + self cogitClass ~= self ifTrue: [^Set new]. - self getVMMaker ifNotNil: - [:vmMaker| vmMaker cogitClass ~= self ifTrue: [^Set new]]. generatorTable ifNil: [^Set new]. ^Set new addAll: (generatorTable object collect: [:ea| ea generator]); addAll: (generatorTable object select: [:ea| ea spanFunction notNil] thenCollect: [:ea| ea spanFunction]); addAll: (generatorTable object select: [:ea| ea needsFrameFunction notNil] thenCollect: [:ea| ea needsFrameFunction]); addAll: (primitiveTable object select: [:ea| ea notNil and: [ea primitiveGenerator notNil]] thenCollect: [:ea| ea primitiveGenerator]); addAll: (primitiveTable object select: [:ea| ea notNil and: [ea enabled notNil]] thenCollect: [:ea| ea enabled]); asSortedCollection: [:a :b| a caseInsensitiveLessOrEqual: b]! Item was changed: Object subclass: #VMMaker + instanceVariableNames: 'inline forBrowser allPlugins internalPlugins externalPlugins platformName sourceDirName platformRootDirName logger interpreterClassName is64BitVM optionsDictionary abortBlock' - instanceVariableNames: 'inline forBrowser allPlugins internalPlugins externalPlugins platformName sourceDirName platformRootDirName logger interpreterClassName cogitClassName is64BitVM optionsDictionary abortBlock' classVariableNames: 'DirNames' poolDictionaries: '' category: 'VMMaker-Building'! !VMMaker commentStamp: 'tpr 5/5/2003 12:28' prior: 0! This class builds a VM codebase from the in-image and on-file code. The platforms file tree you need can be downloaded via cvs from http://squeak.Sourceforge.net. See also the swiki (http://minnow.cc.gatech.edu/squeak/2106) for instructions. It is fairly configurable as to where directories live and can handle multiple platform's source trees at once. It's main purpose is to allow easy building of source trees with any combination of internal/external/unused plugins to suit your platform needs and capabilities. For example, the Acorn has no need of Sound or AsynchFile plugins since I haven't written any platform code for them. There is a simple UI tool for this VMMakerTool openInWorld will open a reasonably self explanatory tool with balloon help to explain all the fields - and a help window on top of that. There are some simple workspace & inspector commands, allowing scripted building: VMMaker default initializeAllExternal generateEntire for example will build sources for a system with all the plugins external whereas VMMaker default initializeAllInternal generateEntire would build all applicable plugins for internal compilation. (VMMaker forPlatform: 'Mac OS') initializeAllExternal generateEntire would build a source tree for a Mac even on a Windows machine (err, ignoring for now the irritation of lineends). If you have a slightly more complex configuration you want to use, perhaps with Socket and Serial support external (because for your case they are rarely used and saving the space has some value) then you could try (VMMaker default initializeAllInternalBut: #(SocketPlugin SerialPlugin) generateEntire More complex still would be (VMMaker default initializeInternal: #(BitBltPlugin MiscPrimsPlugin FilePlugin) external: #(SocketPlugin ZipPlugin B2DPlugin) which allows you to precisely list all the plugins to use. WARNING If you miss out a plugin you need, it won't be there. This message is really best suited to use by a UI like VMMakerTool. To save a configuration for later use, you need to send #saveConfiguration to an active instance of VMMaker. Obviously you could simply use (VMMaker default initializeAllInternalBut: #(SocketPlugin SerialPlugin) saveConfiguration but inspecting VMMaker default and altering the internalPlugins and externalPlugins or the boolean flags for inline or forBrowser followed by saving the configuration allows ultimate power for now. To load a saved configuration file, use #loadConfigurationFrom: aFilename whilst inspecting a VMMaker. The loaded state will completely override any pre-existing state, so take care. You can generate only parts of the source tree if you wish; as shown above #generateEntire will create the whole collection of internal and external plugins as well as the core VM. To create only the external plugins use #generateExternalPlugins, or create a single plugin with #generateExternalPlugin: name. To assemble the main VM including the internal plugins, use #generateMainVM. The interpreter 'interp.c' file is made with #generateInterpreterFile. You can generate a single internal plugin with #generateInternalPlugin: only if it has already been generated before; this interlocking is intended to make sure the named primitive table in the vm is correct. There are some rules to observe in order to use this:- - under the working directory (by default - you can configure it) you need a directory called 'platforms' (also configurable) with subdirectories named as the platform names returned by Smalltalk platformName (ie unix, RiscOS, Mac OS, etc - this isn't configurable). At the very least you need the one for your own platform and the pseudo-platform called 'Cross'. By adding a 'DirNames' entry for #machineType you can cross 'compile' for some other platform. Now all we need is a cross-compiler for the C code :-) - under this directory you must have a simple structure of directories for each generated plugin that you support on the platform, plus 'vm'. In each directory you place any/all platform specific files (and subdirectories) for that plugin. In 'misc' you can place any miscellaneous files such as makefiles, resources etc. For example, for unix you have platforms/ unix/ plugins/ AsynchFilePlugin / sqUnixAsynchfile.c vm/ sqGnu.h Profile/ misc/ makefile.in util/ ...etc Any plugins requiring platform files that you don't support shouldn't appear in the resulting code tree. If you try to include an unsupported plugin in the list to be made external, the VMMaker simply ignores it. However, if you include it in the list to be made internal you will get an error since that seems like a potentially serious source of confusion. There are three lists of plugins maintained herein:- 1) the list of all known generatable plugins. We scan this list and compare with the supported plugins as indicated by the file tree. 2) the list of chosen internal plugins. 3) the list of chosen external plugins. See initializeAllPlugins, initialiseAllExternal etc for fairly obvious usage. There is also a short list of directory names in the class variable 'DirNames' that you can alter if needed. Known problems:- a) since Squeak has really poor filename handling, you can't simply change the directory names to '/foo/bar/myEvilCodeBase' and expect it to work. You fix file names and I'll fix VMMaker :-) b) Squeak copying of a file loses the assorted permissions, filetype info and other useful bits. To workaround this problem, see the FileCopyPlugin, which provides the platform independent part of a simple access for the OS filecopy capability. So far there are functional plugins for unix, Mac and Acorn. DOS machines appear not to need one. This is less of a problem in practise now that unix, Acorn & Mac no longer copy files from /platforms to /src. inline <Boolean> - is the generated code to be inlined or not forBrowser <Boolean> - is this to be a build for in-Browser use? Only relevent to Macs allPlugins <Collection> - all the known possible plugins internalPlugins <Collection> - the plugins chosen to be generated for internal linking externalPlugins <Collection> - the plugins intended to be external plugins exportList <Collection> - a list of function names exported from plugins intended to be internal platformName <String> - the name of the platform for which we are building a source tree. It is possible to do 'cross-compiles' sourceDirName, platformRootDirName <String> - the name of the directory into which we write the generated sources and the name of the directory where we should find the platforms tree.! Item was changed: ----- Method: VMMaker class>>makerFor:and:with:to:platformDir: (in category 'utilities') ----- + makerFor: interpreterClass and: cogitClassOrNil with: optionsPairsArrayArg to: srcDirName platformDir: platDirName - makerFor: interpreterClass and: cogitClassOrNil with: optionsPairsArray to: srcDirName platformDir: platDirName "Initialize a VMMaker to generate the VM to the given target directory. Include plugins in pluginList. Example: (VMMaker generate: NewspeakInterpreter to: (FileDirectory default pathFromURI: 'cogvm/newspeaksrc') platformDir: (FileDirectory default pathFromURI: 'cogvm/platforms') including:#( AsynchFilePlugin FloatArrayPlugin RePlugin B2DPlugin FloatMathPlugin SecurityPlugin BMPReadWriterPlugin IA32ABI SocketPlugin BitBltPlugin JPEGReadWriter2Plugin SurfacePlugin DSAPrims JPEGReaderPlugin UUIDPlugin DropPlugin LargeIntegers UnixOSProcessPlugin FileCopyPlugin Matrix2x3Plugin Win32OSProcessPlugin FilePlugin MiscPrimitivePlugin ZipPlugin))" + | maker optionsPairsArray | - | maker | maker := self forPlatform: 'Cross'. maker sourceDirectoryName: srcDirName. maker platformRootDirectoryName: platDirName. maker interpreterClass: interpreterClass. + optionsPairsArray := (cogitClassOrNil isNil or: [optionsPairsArrayArg includes: #Cogit]) + ifNil: [optionsPairsArrayArg] + ifNotNil: [optionsPairsArrayArg, { #Cogit. cogitClassOrNil name }]. - cogitClassOrNil ifNotNil: [maker cogitClass: cogitClassOrNil]. maker options: optionsPairsArray. ^maker ! Item was changed: ----- Method: VMMaker>>buildCodeGeneratorForCogit (in category 'generate sources') ----- buildCodeGeneratorForCogit "Answer the code generator for translating the cogit." ^self + buildCodeGeneratorForCogit: self interpreterClass cogitClass - buildCodeGeneratorForCogit: self cogitClass includeAPIMethods: true initializeClasses: true! Item was changed: ----- Method: VMMaker>>buildCodeGeneratorForInterpreter:includeAPIMethods:initializeClasses: (in category 'generate sources') ----- buildCodeGeneratorForInterpreter: interpreterClass includeAPIMethods: getAPIMethods initializeClasses: initializeClasses "Answer the code generator for translating the interpreter." | cg interpreterClasses apicg | initializeClasses ifTrue: [interpreterClass initializeWithOptions: optionsDictionary]. (cg := self createCodeGenerator) vmClass: interpreterClass. "Construct interpreterClasses as all classes from interpreterClass & objectMemoryClass up to VMClass in superclass to subclass order." interpreterClasses := OrderedCollection new. {interpreterClass. interpreterClass objectMemoryClass} do: [:vmClass| | theClass | theClass := vmClass. [theClass ~~ VMClass] whileTrue: [interpreterClasses addFirst: theClass. theClass := theClass superclass]]. interpreterClasses addFirst: VMClass; addAllLast: (cg nonStructClassesForTranslationClasses: interpreterClasses). initializeClasses ifTrue: [interpreterClasses do: [:ic| (ic respondsTo: #initializeWithOptions:) ifTrue: [ic initializeWithOptions: optionsDictionary] ifFalse: [ic initialize]]. (cg structClassesForTranslationClasses: interpreterClasses) do: [:structClass| structClass initialize]]. cg addStructClasses: (cg structClassesForTranslationClasses: interpreterClasses). interpreterClasses do: [:ic| cg addClass: ic]. + getAPIMethods ifTrue: + [interpreterClass cogitClass ifNotNil: + [:cogitClass| + apicg := self + buildCodeGeneratorForCogit: cogitClass + includeAPIMethods: false + initializeClasses: false. + cg apiMethods: apicg selectAPIMethods]]. - (getAPIMethods - and: [self interpreterClass needsCogit]) ifTrue: - [apicg := self - buildCodeGeneratorForCogit: self cogitClass - includeAPIMethods: false - initializeClasses: false. - cg apiMethods: apicg selectAPIMethods]. cg removeConstant: #VMBIGENDIAN. "this should be defined in platforms/??/vm/sqConfig.h" ^cg! Item was removed: - ----- Method: VMMaker>>cogitClass (in category 'generate sources') ----- - cogitClass - ^(cogitClassName - ifNil: [self interpreterClass cogitClass] - ifNotNil: [Smalltalk classNamed: cogitClassName]) translationClass! Item was removed: - ----- Method: VMMaker>>cogitClass: (in category 'generate sources') ----- - cogitClass: aClass - - cogitClassName := aClass name asString! Item was removed: - ----- Method: VMMaker>>cogitClassName (in category 'generate sources') ----- - cogitClassName - ^cogitClassName! Item was changed: ----- Method: VMMaker>>generateCogitFile (in category 'generate sources') ----- generateCogitFile "Translate the Smalltalk description of the virtual machine into C. If 'self doInlining' is true, small method bodies are inlined to reduce procedure call overhead. On the PPC, this results in a factor of three speedup with only 30% increase in code size. Subclasses can use specialised versions of CCodeGenerator and interpreterClass." | cg cogitClass | + (cogitClass := self interpreterClass cogitClass) ifNil: [^nil]. - self interpreterClass needsCogit ifFalse: [^nil]. cg := [self buildCodeGeneratorForCogit] on: Notification do: [:ex| ex tag == #getVMMaker ifTrue: [ex resume: self] ifFalse: [(ex respondsTo: #rearmHandlerDuring:) ifTrue: [ex rearmHandlerDuring: [ex pass]] ifFalse: [ex pass]]]. self needsToRegenerateCogitFile ifFalse: [^nil]. - cogitClass := self cogitClass. cg removeUnneededBuiltins. cg inferTypesForImplicitlyTypedVariablesAndMethods. cg vmClass preGenerationHook: cg. cg storeCodeOnFile: (self sourceFilePathFor: cogitClass sourceFileName) doInlining: cogitClass doInlining. cg vmClass additionalHeadersDo: [:headerName :headerContents| | filePath | filePath := self coreVMDirectory fullNameFor: headerName. (cg needToGenerateHeader: headerName file: filePath contents: headerContents) ifTrue: [cg storeHeaderOnFile: filePath contents: headerContents]]. cogitClass apiExportHeaderName ifNotNil: [cg storeAPIExportHeader: cogitClass apiExportHeaderName OnFile: (self sourceFilePathFor: cogitClass apiExportHeaderName)]! Item was changed: ----- Method: VMMaker>>needsToRegenerateCogitFile (in category 'generate sources') ----- needsToRegenerateCogitFile "Check the timestamp for the relevant classes and then the timestamp for the main source file (e.g. interp.c) file if it already exists. Answer if the file needs regenerating." | cogitClass cogitClasses tStamp | + cogitClasses := (cogitClass := self interpreterClass cogitClass) withAllSuperclasses copyUpThrough: Cogit. - cogitClasses := (cogitClass := self cogitClass) withAllSuperclasses copyUpThrough: Cogit. cogitClasses addAllLast: (cogitClass ancilliaryClasses: self options). tStamp := cogitClasses inject: 0 into: [:tS :cl| tS max: cl timeStamp]. "don't translate if the file is newer than my timeStamp" (self coreVMDirectory entryAt: cogitClass sourceFileName ifAbsent: [nil]) ifNotNil: [:fstat| tStamp < fstat modificationTime ifTrue: [^self confirm: 'The ', self configurationNameIfAny, cogitClass printString, ' classes have not been modified since\ the source file was last generated.\Do you still want to regenerate it?' withCRs]]. ^true !

1 0

VM Maker: VMMaker.oscog-eem.873.mcz
by commits＠source.squeak.org 08 Sep '14

08 Sep '14

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.873.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.873 Author: eem Time: 8 September 2014, 11:36:16.145 am UUID: b4a15623-1d81-4824-87e9-d081a7c73331 Ancestors: VMMaker.oscog-eem.872 Slang: Base the computation of what's in the primitiveTable on the interpreterClass, not on StackInterpreter. Rewrite CCodeGenerator>>shouldIncludeMethodFor:selector: to ask the methodClass for the cogClass, interpreterClass and objectMemoryCLass, instead of assuming there's a vmMaker on hand. These classes can be computed from the class inst var initializationOptions, and hence be available even at run-time when Spur is computing accessor depths. Recategorize these methods. Drop CoInterpreter's CogitClass class var and a few methods as a result. Clean up the class hierarchuy computations in VMMaker's buildCodeGeneratorFor... methods. Harmonize RiscOSVMMaker & VMMaker's time stamp calculation. =============== Diff against VMMaker.oscog-eem.872 =============== Item was changed: ----- Method: CCodeGenerator>>shouldIncludeMethodFor:selector: (in category 'utilities') ----- shouldIncludeMethodFor: aClass selector: selector "Answer whether a method shoud be translated. Process optional methods by interpreting the argument to the option: pragma as either a Cogit class name or a class variable name or a variable name in VMBasicConstants. Exclude methods with the doNotGenerate pragma." | pragmas | + "where is pragmasAt: ??" (pragmas := (aClass >> selector) pragmas select: [:p| p keyword == #option:]) notEmpty ifTrue: [pragmas do: [:pragma| | key | key := pragma argumentAt: 1. + "If the option is the name of a subclass of Cogit, include it if it inherits from the Cogit class." + (Smalltalk classNamed: key) ifNotNil: + [:optionClass| + aClass cogitClass ifNotNil: + [:cogitClass| + (Cogit withAllSubclasses anySatisfy: [:c| c = cogitClass]) ifTrue: + [^cogitClass includesBehavior: optionClass]]]. + "Lookup options in options, class variables of the defining class, VMBasicConstants, the interpreterClass and the objectMemoryClass" + {aClass initializationOptions. + aClass. + VMBasicConstants. + aClass interpreterClass. + aClass objectMemoryClass} do: + [:scopeOrNil| + scopeOrNil ifNotNil: + [:scope| + (scope bindingOf: key) ifNotNil: + [:binding| + binding value ~~ false ifTrue: [^true]]]]]. - vmMaker ifNotNil: - [vmMaker cogitClassName ifNotNil: - [(Cogit withAllSubclasses anySatisfy: [:c| c name = key]) ifTrue: - [| cogitClass optionClass | - cogitClass := Smalltalk classNamed: vmMaker cogitClassName. - optionClass := Smalltalk classNamed: key. - ^cogitClass includesBehavior: optionClass]]. - ((vmClass - ifNotNil: [vmClass initializationOptions] - ifNil: [vmMaker options]) at: key ifAbsent: [false]) ifNotNil: - [:option| option ~~ false ifTrue: [^true]]]. - "Lookup options in class variables of the defining class, VMMaker, the interpreterClass and the objectMemoryClass" - ((vmMaker notNil and: [vmMaker interpreterClass notNil]) - ifTrue: [{aClass. VMBasicConstants. vmMaker interpreterClass. vmMaker interpreterClass objectMemoryClass}] - ifFalse: [{aClass. VMBasicConstants}]) do: - [:scope| - (scope bindingOf: key) ifNotNil: - [:binding| - binding value ~~ false ifTrue: [^true]]]]. ^false]. ^(aClass >> selector pragmaAt: #doNotGenerate) isNil! Item was changed: StackInterpreterPrimitives subclass: #CoInterpreter instanceVariableNames: 'cogit cogMethodZone gcMode cogCodeSize desiredCogCodeSize heapBase lastCoggableInterpretedBlockMethod reenterInterpreter deferSmash deferredSmash primTraceLog primTraceLogIndex traceLog traceLogIndex traceSources cogCompiledCodeCompactionCalledFor statCodeCompactionCount statCodeCompactionUsecs lastUncoggableInterpretedBlockMethod processHasThreadId flagInterpretedMethods maxLiteralCountForCompile minBackwardJumpCountForCompile noThreadingOfGUIThread' + classVariableNames: 'CSCallbackEnter CSCallbackLeave CSCheckEvents CSEnterCriticalSection CSExitCriticalSection CSOwnVM CSResume CSSignal CSSuspend CSSwitchIfNeccessary CSThreadBind CSThreadSchedulingLoop CSWait CSYield HasBeenReturnedFromMCPC MFMethodFlagFrameIsMarkedFlag MinBackwardJumpCountForCompile PrimTraceLogSize ReturnToInterpreter RumpCStackSize TraceBlockActivation TraceBlockCreation TraceBufferSize TraceCodeCompaction TraceContextSwitch TraceDisownVM TraceFullGC TraceIncrementalGC TraceIsFromInterpreter TraceIsFromMachineCode TraceOwnVM TracePreemptDisowningThread TraceSources TraceStackOverflow TraceThreadSwitch TraceVMCallback TraceVMCallbackReturn' - classVariableNames: 'CSCallbackEnter CSCallbackLeave CSCheckEvents CSEnterCriticalSection CSExitCriticalSection CSOwnVM CSResume CSSignal CSSuspend CSSwitchIfNeccessary CSThreadBind CSThreadSchedulingLoop CSWait CSYield CogitClass HasBeenReturnedFromMCPC MFMethodFlagFrameIsMarkedFlag MinBackwardJumpCountForCompile PrimTraceLogSize ReturnToInterpreter RumpCStackSize TraceBlockActivation TraceBlockCreation TraceBufferSize TraceCodeCompaction TraceContextSwitch TraceDisownVM TraceFullGC TraceIncrementalGC TraceIsFromInterpreter TraceIsFromMachineCode TraceOwnVM TracePreemptDisowningThread TraceSources TraceStackOverflow TraceThreadSwitch TraceVMCallback TraceVMCallbackReturn' poolDictionaries: 'CogMethodConstants VMStackFrameOffsets' category: 'VMMaker-JIT'! !CoInterpreter commentStamp: '<historical>' prior: 0! I am a variant of the StackInterpreter that can co-exist with the Cog JIT. I interpret unjitted methods, either because they have been found for the first time or because they are judged to be too big to JIT. See CogMethod class's comment for method interoperability.! Item was changed: + ----- Method: CoInterpreter class>>cogitClass (in category 'accessing class hierarchy') ----- - ----- Method: CoInterpreter class>>cogitClass (in category 'translation') ----- cogitClass + ^Smalltalk classNamed: (initializationOptions + at: #Cogit + ifAbsent: [#SimpleStackBasedCogit])! - "CogitClass := SimpleStackBasedCogit" - "CogitClass := StackToRegisterMappingCogit" - CogitClass isNil ifTrue: [CogitClass := SimpleStackBasedCogit]. - ^CogitClass! Item was changed: + ----- Method: CoInterpreter class>>primitivesClass (in category 'accessing class hierarchy') ----- - ----- Method: CoInterpreter class>>primitivesClass (in category 'translation') ----- primitivesClass ^CoInterpreterPrimitives! Item was changed: + ----- Method: CoInterpreterMT class>>primitivesClass (in category 'accessing class hierarchy') ----- - ----- Method: CoInterpreterMT class>>primitivesClass (in category 'translation') ----- primitivesClass ^CoInterpreterMT! Item was changed: + ----- Method: CogObjectRepresentationFor32BitSpur class>>defaultObjectMemoryClass (in category 'accessing class hierarchy') ----- - ----- Method: CogObjectRepresentationFor32BitSpur class>>defaultObjectMemoryClass (in category 'accessing') ----- defaultObjectMemoryClass "For in-image compilation." ^Spur32BitCoMemoryManager! Item was changed: + ----- Method: CogObjectRepresentationFor64BitSpur class>>defaultObjectMemoryClass (in category 'accessing class hierarchy') ----- - ----- Method: CogObjectRepresentationFor64BitSpur class>>defaultObjectMemoryClass (in category 'accessing') ----- defaultObjectMemoryClass "For in-image compilation. Spur64BitCoMemoryManager is as yet undefined." ^Smalltalk classNamed: #Spur64BitCoMemoryManager! Item was changed: + ----- Method: CogObjectRepresentationForSqueakV3 class>>defaultObjectMemoryClass (in category 'accessing class hierarchy') ----- - ----- Method: CogObjectRepresentationForSqueakV3 class>>defaultObjectMemoryClass (in category 'accessing') ----- defaultObjectMemoryClass "For in-image compilation." ^NewCoObjectMemory! Item was removed: - ----- Method: CogVMSimulator class>>chooseAndInitCogitClassWithOpts: (in category 'instance creation') ----- - chooseAndInitCogitClassWithOpts: opts - | classOrSymbol | - classOrSymbol := opts at: #Cogit ifAbsent: [Cogit chooseCogitClass]. - classOrSymbol isSymbol ifTrue: - [classOrSymbol := Smalltalk classNamed: classOrSymbol]. - (CoInterpreter classPool at: #CogitClass put: (classOrSymbol)) initializeWithOptions: opts! Item was changed: ----- Method: CogVMSimulator class>>initializeWithOptions:objectMemoryClass: (in category 'class initialization') ----- initializeWithOptions: optionsDictionaryOrArray objectMemoryClass: objectMemoryClassOrNil "The relevant ObjectMemory, Interpreter and Cogit classes must be initialized in order. This happens notionally every time we start the simulator, but in fact happens when ever we instantiate a simulator." - | cogitClassOrName | initializationOptions := optionsDictionaryOrArray isArray ifTrue: [Dictionary newFromPairs: optionsDictionaryOrArray] ifFalse: [optionsDictionaryOrArray]. (objectMemoryClassOrNil ifNil: [self objectMemoryClass]) initializeWithOptions: initializationOptions. self initializeWithOptions: initializationOptions. ((initializationOptions at: #COGMTVM ifAbsent: [false]) ifTrue: [CoInterpreterMT] ifFalse: [CoInterpreter]) initializeWithOptions: initializationOptions. - (initializationOptions includesKey: #Cogit) ifTrue: - [cogitClassOrName := initializationOptions at: #Cogit. - cogitClassOrName isSymbol ifTrue: - [cogitClassOrName := Smalltalk classNamed: cogitClassOrName]. - CoInterpreter classPool at: #CogitClass put: cogitClassOrName]. - (self cogitClass withAllSuperclasses copyUpTo: Cogit) reverseDo: [:c| c initializeWithOptions: initializationOptions]! Item was changed: ----- Method: CogVMSimulator>>codeGeneratorToComputeAccessorDepth (in category 'primitive support') ----- codeGeneratorToComputeAccessorDepth ^VMMaker new + cogitClass: self class cogitClass; - cogitClass: (Smalltalk classNamed: (self class initializationOptions - at: #Cogit - ifAbsent: [self class cogitClass name])); buildCodeGeneratorForInterpreter: CoInterpreterPrimitives includeAPIMethods: false initializeClasses: false! Item was changed: + ----- Method: Cogit class>>chooseCogitClass (in category 'accessing class hierarchy') ----- - ----- Method: Cogit class>>chooseCogitClass (in category 'accessing') ----- chooseCogitClass ^Smalltalk at: ([:choices| choices at: (UIManager default chooseFrom: choices) ifAbsent: [^nil]] value: (Cogit allSubclasses collect: [:ea| ea name]) sorted)! Item was changed: + ----- Method: Cogit class>>defaultObjectMemoryClass (in category 'accessing class hierarchy') ----- - ----- Method: Cogit class>>defaultObjectMemoryClass (in category 'accessing') ----- defaultObjectMemoryClass ^NewCoObjectMemory! Item was changed: + ----- Method: CurrentImageCoInterpreterFacade class>>objectMemoryClass (in category 'accessing class hierarchy') ----- - ----- Method: CurrentImageCoInterpreterFacade class>>objectMemoryClass (in category 'accessing') ----- objectMemoryClass ^self subclassResponsibility! Item was changed: + ----- Method: CurrentImageCoInterpreterFacade class>>objectRepresentationClass (in category 'accessing class hierarchy') ----- - ----- Method: CurrentImageCoInterpreterFacade class>>objectRepresentationClass (in category 'accessing') ----- objectRepresentationClass ^self subclassResponsibility! Item was changed: + ----- Method: CurrentImageCoInterpreterFacadeForSpurObjectRepresentation class>>objectMemoryClass (in category 'accessing class hierarchy') ----- - ----- Method: CurrentImageCoInterpreterFacadeForSpurObjectRepresentation class>>objectMemoryClass (in category 'accessing') ----- objectMemoryClass ^Spur32BitCoMemoryManager! Item was changed: + ----- Method: CurrentImageCoInterpreterFacadeForSpurObjectRepresentation class>>objectRepresentationClass (in category 'accessing class hierarchy') ----- - ----- Method: CurrentImageCoInterpreterFacadeForSpurObjectRepresentation class>>objectRepresentationClass (in category 'accessing') ----- objectRepresentationClass ^CogObjectRepresentationFor32BitSpur! Item was changed: + ----- Method: CurrentImageCoInterpreterFacadeForSqueakV3ObjectRepresentation class>>objectMemoryClass (in category 'accessing class hierarchy') ----- - ----- Method: CurrentImageCoInterpreterFacadeForSqueakV3ObjectRepresentation class>>objectMemoryClass (in category 'accessing') ----- objectMemoryClass ^NewCoObjectMemory! Item was changed: + ----- Method: CurrentImageCoInterpreterFacadeForSqueakV3ObjectRepresentation class>>objectRepresentationClass (in category 'accessing class hierarchy') ----- - ----- Method: CurrentImageCoInterpreterFacadeForSqueakV3ObjectRepresentation class>>objectRepresentationClass (in category 'accessing') ----- objectRepresentationClass ^CogObjectRepresentationForSqueakV3! Item was changed: ----- Method: RiscOSVMMaker>>needsToRegenerateInterpreterFile (in category 'initialize') ----- needsToRegenerateInterpreterFile + "Check the timestamp for the relevant classes and then the timestamp for the main + source file (e.g. interp.c) if it already exists. Answer if the file needs regenerating." - "check the timestamp for the relevant classes and then the timestamp for the interp.c file if it already exists. Return true if the file needs regenerating, false if not" + | classes tStamp fstat | + classes := self interpreterClass withAllSuperclasses copyUpTo: VMClass. + self interpreterClass objectMemoryClass ifNotNil: + [:objectMemoryClass| + classes addAllLast: (objectMemoryClass withAllSuperclasses copyUpTo: VMClass)]. + classes copy do: + [:class| classes addAllLast: (class ancilliaryClasses: self options)]. + tStamp := classes inject: 0 into: [:tS :cl| tS max: cl timeStamp]. - | tStamp fstat | - tStamp := (self interpreterClass withAllSuperclasses copyUpTo: ObjectMemory superclass), - (self interpreterClass ancilliaryClasses: self options) - inject: 0 into: [:tS :cl| tS max: cl timeStamp]. "don't translate if the file is newer than my timeStamp" "RiscOS keeps the interp file in a 'c' subdirectory of coreVMDirectory" (self coreVMDirectory directoryExists: 'c') ifFalse:[^true]. fstat := (self coreVMDirectory directoryNamed: 'c') entryAt: self interpreterFilename ifAbsent:[nil]. fstat ifNotNil:[tStamp < fstat modificationTime ifTrue:[^false]]. ^true ! Item was changed: + ----- Method: SpurMemoryManager class>>objectRepresentationClass (in category 'accessing class hierarchy') ----- - ----- Method: SpurMemoryManager class>>objectRepresentationClass (in category 'accessing') ----- objectRepresentationClass ^self subclassResponsibility! Item was changed: ----- Method: StackInterpreter class>>primitiveTable (in category 'constants') ----- primitiveTable | cg | cg := CCodeGenerator new. + cg vmClass: self. - cg vmClass: StackInterpreter. ^PrimitiveTable collect: [:thing| (thing isInteger "quick prims, 0 for fast primitve fail" or: [thing == #primitiveFail]) ifTrue: [thing] ifFalse: [(self primitivesClass whichClassIncludesSelector: thing) ifNil: [#primitiveFail] ifNotNil: [:class| (cg shouldIncludeMethodFor: class selector: thing) ifTrue: [thing] ifFalse: [#primitiveFail]]]]! Item was changed: + ----- Method: StackInterpreter class>>primitivesClass (in category 'accessing class hierarchy') ----- - ----- Method: StackInterpreter class>>primitivesClass (in category 'translation') ----- primitivesClass ^StackInterpreterPrimitives! Item was added: + ----- Method: VMClass class>>cogitClass (in category 'accessing class hierarchy') ----- + cogitClass + ^nil! Item was changed: + ----- Method: VMClass class>>coreInterpreterClass (in category 'accessing class hierarchy') ----- - ----- Method: VMClass class>>coreInterpreterClass (in category 'translation') ----- coreInterpreterClass "While the interpreterClass/vmClass for translation may be a subclass that holds a few primitives we want the actual interpreter name at the head of the generated file." ^((name endsWith: 'Primitives') and: [name beginsWith: superclass name]) ifTrue: [superclass] ifFalse: [self]! Item was added: + ----- Method: VMClass class>>interpreterClass (in category 'accessing class hierarchy') ----- + interpreterClass + ^self isInterpreterClass ifTrue: [self]! Item was changed: ----- Method: VMMaker>>buildCodeGeneratorForCogit:includeAPIMethods:initializeClasses: (in category 'generate sources') ----- buildCodeGeneratorForCogit: cogitClass includeAPIMethods: getAPIMethods initializeClasses: initializeClasses "Answer the code generator for translating the cogit." + | cg cogitClasses apicg | - | cg aClass cogitClasses apicg | cg := self createCogitCodeGenerator. cg vmClass: cogitClass. initializeClasses ifTrue: [{ cogitClass. self interpreterClass. self interpreterClass objectMemoryClass } do: [:cgc| (cgc respondsTo: #initializeWithOptions:) ifTrue: [cgc initializeWithOptions: optionsDictionary] ifFalse: [cgc initialize]]]. + cogitClasses := OrderedCollection withAll: (cogitClass withAllSuperclasses copyUpThrough: VMClass) reverse. - cogitClasses := OrderedCollection new. - aClass := cogitClass. - [cogitClasses addFirst: aClass. - aClass ~~ Cogit - and: [aClass inheritsFrom: Cogit]] whileTrue: - [aClass := aClass superclass]. - cogitClasses addFirst: VMClass. cogitClasses addAllLast: ((cogitClass ancilliaryClasses: optionsDictionary) reject: [:class| class isStructClass]). cogitClasses do: [:cgc| cg addClass: cgc]. cg addStructClasses: (cg structClassesForTranslationClasses: cogitClasses). getAPIMethods ifTrue: [apicg := self buildCodeGeneratorForInterpreter: self interpreterClass includeAPIMethods: false initializeClasses: false. cg apiMethods: apicg selectAPIMethods]. cg removeConstant: #VMBIGENDIAN. "this should be defined in platforms/??/vm/sqConfig.h" ^cg! Item was changed: ----- Method: VMMaker>>buildCodeGeneratorForInterpreter:includeAPIMethods:initializeClasses: (in category 'generate sources') ----- buildCodeGeneratorForInterpreter: interpreterClass includeAPIMethods: getAPIMethods initializeClasses: initializeClasses "Answer the code generator for translating the interpreter." + | cg interpreterClasses apicg | - | cg theClass interpreterClasses apicg | - interpreterClasses := OrderedCollection new. - initializeClasses ifTrue: [interpreterClass initializeWithOptions: optionsDictionary]. (cg := self createCodeGenerator) vmClass: interpreterClass. + "Construct interpreterClasses as all classes from interpreterClass & + objectMemoryClass up to VMClass in superclass to subclass order." + interpreterClasses := OrderedCollection new. + {interpreterClass. interpreterClass objectMemoryClass} do: + [:vmClass| | theClass | + theClass := vmClass. + [theClass ~~ VMClass] whileTrue: - theClass := interpreterClass. - [theClass ~~ VMClass] whileTrue: - [interpreterClasses addFirst: theClass. - theClass := theClass superclass]. - - cg vmClass objectMemoryClass ifNotNil: - [:objectMemoryClass| - theClass := objectMemoryClass. - [theClass ~~ VMClass] whileTrue: [interpreterClasses addFirst: theClass. theClass := theClass superclass]]. + interpreterClasses + addFirst: VMClass; + addAllLast: (cg nonStructClassesForTranslationClasses: interpreterClasses). - interpreterClasses addFirst: VMClass. - interpreterClasses addAllLast: (cg nonStructClassesForTranslationClasses: interpreterClasses). - initializeClasses ifTrue: [interpreterClasses do: [:ic| (ic respondsTo: #initializeWithOptions:) ifTrue: [ic initializeWithOptions: optionsDictionary] ifFalse: [ic initialize]]. (cg structClassesForTranslationClasses: interpreterClasses) do: [:structClass| structClass initialize]]. cg addStructClasses: (cg structClassesForTranslationClasses: interpreterClasses). interpreterClasses do: [:ic| cg addClass: ic]. (getAPIMethods + and: [self interpreterClass needsCogit]) ifTrue: - and: [self interpreterClass needsCogit]) ifTrue: [apicg := self buildCodeGeneratorForCogit: self cogitClass includeAPIMethods: false initializeClasses: false. cg apiMethods: apicg selectAPIMethods]. cg removeConstant: #VMBIGENDIAN. "this should be defined in platforms/??/vm/sqConfig.h" ^cg! Item was changed: ----- Method: VMMaker>>needsToRegenerateInterpreterFile (in category 'initialize') ----- needsToRegenerateInterpreterFile "Check the timestamp for the relevant classes and then the timestamp for the main source file (e.g. interp.c) if it already exists. Answer if the file needs regenerating." | classes tStamp | classes := self interpreterClass withAllSuperclasses copyUpTo: VMClass. self interpreterClass objectMemoryClass ifNotNil: [:objectMemoryClass| + classes addAllLast: (objectMemoryClass withAllSuperclasses copyUpTo: VMClass)]. - classes addAllLast: (objectMemoryClass withAllSuperclasses copyUpTo: VMClass)]. classes copy do: [:class| classes addAllLast: (class ancilliaryClasses: self options)]. tStamp := classes inject: 0 into: [:tS :cl| tS max: cl timeStamp]. "don't translate if the file is newer than my timeStamp" (self coreVMDirectory entryAt: self interpreterFilename ifAbsent: [nil]) ifNotNil: [:fstat| tStamp < fstat modificationTime ifTrue: [^self confirm: 'The ', self configurationNameIfAny, 'interpreter classes have not been modified since\ the interpreter file was last generated.\Do you still want to regenerate the source file?' withCRs]]. ^true !

1 0

Re: [Vm-dev] VM Maker: VMMaker-dtl.350.mcz
by Eliot Miranda 08 Sep '14

08 Sep '14

Hi David, thanks for this fix. But IMNRHO you're trying to make a silk purse out of a sow's ear. The method is broken in not handling negative integers. IMO it should handle negative receivers, and handle negative shifts properly. Further, this "popInteger... unPop" idiom is ugly and inefficient. The one pop once the result is computed works better, updating the stackPointer global only once with a write whose result is not needed, instead of the multiple pops which depend on prior modifications of stackPointer. I'm in the middle of something right now so can't provide a fix this instant. But I'll try and rewrite it asap. On Sat, Sep 6, 2014 at 8:45 PM, <commits(a)source.squeak.org> wrote: > > David T. Lewis uploaded a new version of VMMaker to project VM Maker: > http://source.squeak.org/VMMaker/VMMaker-dtl.350.mcz > > ==================== Summary ==================== > > Name: VMMaker-dtl.350 > Author: dtl > Time: 6 September 2014, 11:44:28.389 pm > UUID: 2ad132b0-5fb3-4580-b5a8-29af12c3cb81 > Ancestors: VMMaker-dtl.349 > > VMMaker 4.13.6 > > Fix primitiveBitShift (primitive 17) for sqInt declared 64 bits, as in a > VM for 64-bit image format 68002. > > In image format 68002, bit shift left failed because of return type > limited to a 32-bit large integer, but internally the primitive > successfully shifted left into a variable declared as a 64 bit sqInt.. The > simple fix (implemented here) is to declare the variable as 32 bit unsigned > to agree with the 32-bit logic of the existing primitive. > > Note that permitting a left shift into a 64 bit variable makes sense > generally, and the primitive could be recoded to accomodate this for shift > left, with the primitive answering positive64BitIntegerFor: rather than > positive32BitIntegerFor: in the case of a shift left to allow for the > greater range (not implemented in this update). > > With this update, all KernelTests-Numbers tests pass for the 64-bit image > format 68002. > > =============== Diff against VMMaker-dtl.349 =============== > > Item was changed: > ----- Method: InterpreterPrimitives>>primitiveBitShift (in category > 'arithmetic integer primitives') ----- > primitiveBitShift > | integerReceiver integerArgument shifted | > + <var: #shifted type: 'unsigned'> > + > integerArgument := self popInteger. > integerReceiver := self popPos32BitInteger. > self successful ifTrue: [ > integerArgument >= 0 ifTrue: [ > "Left shift -- must fail if we lose bits beyond 32" > self success: integerArgument <= 31. > shifted := integerReceiver << integerArgument. > self success: (shifted >> integerArgument) = > integerReceiver. > ] ifFalse: [ > "Right shift -- OK to lose bits" > self success: integerArgument >= -31. > shifted := integerReceiver >> (0 - > integerArgument). > ]. > ]. > self successful > ifTrue: [self push: (self positive32BitIntegerFor: > shifted)] > ifFalse: [self unPop: 2]! > > Item was changed: > ----- Method: VMMaker class>>versionString (in category 'version > testing') ----- > versionString > > "VMMaker versionString" > > + ^'4.13.6'! > - ^'4.13.7'! > > -- best, Eliot

1 0

CMakeVMaker(Squeak) update
by gettimothy 08 Sep '14

08 Sep '14

Howdy, My gig is down to a manageable workload and I will be dedicating a few hours a day to the CMakeVMaker(Squeak) project. First step, see if my documentation will help me get back up to speed quickly, because I have forgotten what I was doing (: cheers. tty

1 0

VM Maker: VMMaker.oscog-dtl.873.mcz
by commits＠source.squeak.org 07 Sep '14

07 Sep '14

David T. Lewis uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-dtl.873.mcz ==================== Summary ==================== Name: VMMaker.oscog-dtl.873 Author: dtl Time: 7 September 2014, 1:05:07.707 pm UUID: fc025445-88f2-407b-bf08-763f27c53502 Ancestors: VMMaker.oscog-eem.872 Merge VMMaker-dtl.350 Fix primitiveBitShift (primitive 17) for sqInt declared 64 bits, as in a VM for 64-bit image format 68002. In image format 68002, bit shift left failed because of return type limited to a 32-bit large integer, but internally the primitive successfully shifted left into a variable declared as a 64 bit sqInt. The simple fix (implemented here) is to declare the variable as 32 bit unsigned to agree with the 32-bit logic of the existing primitive. Note that permitting a left shift into a 64 bit variable makes sense generally, and the primitive could be recoded to accomodate this for shift left, with the primitive answering positive64BitIntegerFor: rather than positive32BitIntegerFor: in the case of a shift left to allow for the greater range (not implemented in this update). With this update, all KernelTests-Numbers tests pass for the 64-bit image format 68002. =============== Diff against VMMaker.oscog-eem.872 =============== Item was changed: ----- Method: InterpreterPrimitives>>primitiveBitShift (in category 'arithmetic integer primitives') ----- primitiveBitShift | integerReceiver integerArgument shifted | + <var: #shifted type: 'unsigned'> + integerArgument := self popInteger. integerReceiver := self popPos32BitInteger. self successful ifTrue: [ integerArgument >= 0 ifTrue: [ "Left shift -- must fail if we lose bits beyond 32" self success: integerArgument <= 31. shifted := integerReceiver << integerArgument. self success: (shifted >> integerArgument) = integerReceiver. ] ifFalse: [ "Right shift -- OK to lose bits" self success: integerArgument >= -31. shifted := integerReceiver >> (0 - integerArgument). ]. ]. self successful ifTrue: [self push: (self positive32BitIntegerFor: shifted)] ifFalse: [self unPop: 2]!

1 0

[commit][3071] VMMaker 4.13.6
by commits＠squeakvm.org 07 Sep '14

07 Sep '14

Revision: 3071 Author: lewis Date: 2014-09-06 20:45:50 -0700 (Sat, 06 Sep 2014) Log Message: ----------- VMMaker 4.13.6 Fix primitiveBitShift (primitive 17) for sqInt declared 64 bits, as in a VM for 64-bit image format 68002. In image format 68002, bit shift left failed because of return type limited to a 32-bit large integer, but internally the primitive successfully shifted left into a variable declared as a 64 bit sqInt.. The simple fix (implemented here) is to declare the variable as 32 bit unsigned to agree with the 32-bit logic of the existing primitive. Note that permitting a left shift into a 64 bit variable makes sense generally, and the primitive could be recoded to accomodate this for shift left, with the primitive answering positive64BitIntegerFor: rather than positive32BitIntegerFor: in the case of a shift left to allow for the greater range (not implemented in this update). With this update, all KernelTests-Numbers tests pass for the 64-bit image format 68002. Modified Paths: -------------- trunk/src/ckformat.c trunk/src/plugins/ADPCMCodecPlugin/ADPCMCodecPlugin.c trunk/src/plugins/AioPlugin/AioPlugin.c trunk/src/plugins/AsynchFilePlugin/AsynchFilePlugin.c trunk/src/plugins/B2DPlugin/B2DPlugin.c trunk/src/plugins/B3DAcceleratorPlugin/B3DAcceleratorPlugin.c trunk/src/plugins/BMPReadWriterPlugin/BMPReadWriterPlugin.c trunk/src/plugins/BitBltPlugin/BitBltPlugin.c trunk/src/plugins/CameraPlugin/CameraPlugin.c trunk/src/plugins/ClipboardExtendedPlugin/ClipboardExtendedPlugin.c trunk/src/plugins/CroquetPlugin/CroquetPlugin.c trunk/src/plugins/DBusPlugin/DBusPlugin.c trunk/src/plugins/DSAPrims/DSAPrims.c trunk/src/plugins/DropPlugin/DropPlugin.c trunk/src/plugins/FFTPlugin/FFTPlugin.c trunk/src/plugins/FT2Plugin/FT2Plugin.c trunk/src/plugins/FileCopyPlugin/FileCopyPlugin.c trunk/src/plugins/FilePlugin/FilePlugin.c trunk/src/plugins/FloatArrayPlugin/FloatArrayPlugin.c trunk/src/plugins/FloatMathPlugin/FloatMathPlugin.c trunk/src/plugins/GeniePlugin/GeniePlugin.c trunk/src/plugins/HostWindowPlugin/HostWindowPlugin.c trunk/src/plugins/JPEGReadWriter2Plugin/JPEGReadWriter2Plugin.c trunk/src/plugins/JPEGReaderPlugin/JPEGReaderPlugin.c trunk/src/plugins/JoystickTabletPlugin/JoystickTabletPlugin.c trunk/src/plugins/KedamaPlugin2/KedamaPlugin2.c trunk/src/plugins/Klatt/Klatt.c trunk/src/plugins/LargeIntegers/LargeIntegers.c trunk/src/plugins/LocalePlugin/LocalePlugin.c trunk/src/plugins/MIDIPlugin/MIDIPlugin.c trunk/src/plugins/Matrix2x3Plugin/Matrix2x3Plugin.c trunk/src/plugins/MiscPrimitivePlugin/MiscPrimitivePlugin.c trunk/src/plugins/Mpeg3Plugin/Mpeg3Plugin.c trunk/src/plugins/RePlugin/RePlugin.c trunk/src/plugins/RomePlugin/RomePlugin.c trunk/src/plugins/ScratchPlugin/ScratchPlugin.c trunk/src/plugins/SecurityPlugin/SecurityPlugin.c trunk/src/plugins/SerialPlugin/SerialPlugin.c trunk/src/plugins/SocketPlugin/SocketPlugin.c trunk/src/plugins/SoundCodecPrims/SoundCodecPrims.c trunk/src/plugins/SoundGenerationPlugin/SoundGenerationPlugin.c trunk/src/plugins/SoundPlugin/SoundPlugin.c trunk/src/plugins/Squeak3D/Squeak3D.c trunk/src/plugins/SqueakFFIPrims/SqueakFFIPrims.c trunk/src/plugins/SqueakSSL/SqueakSSL.c trunk/src/plugins/StarSqueakPlugin/StarSqueakPlugin.c trunk/src/plugins/UUIDPlugin/UUIDPlugin.c trunk/src/plugins/UnicodePlugin/UnicodePlugin.c trunk/src/plugins/UnixOSProcessPlugin/UnixOSProcessPlugin.c trunk/src/plugins/WeDoPlugin/WeDoPlugin.c trunk/src/plugins/XDisplayControlPlugin/XDisplayControlPlugin.c trunk/src/plugins.int trunk/src/vm/interp.c trunk/src/vm/interp.h trunk/src/vm/sqNamedPrims.h Modified: trunk/src/ckformat.c =================================================================== --- trunk/src/ckformat.c 2014-09-05 17:31:11 UTC (rev 3070) +++ trunk/src/ckformat.c 2014-09-07 03:45:50 UTC (rev 3071) @@ -5,7 +5,7 @@ /* Usage: ckformat imageFileName */ /* --- DO NOT EDIT THIS FILE --- */ -/* --- Automatically generated from class ImageFormat 2014-07-20T19:58:46.598+01:00--- */ +/* --- Automatically generated from class ImageFormat 2014-09-06T23:27:11.815+01:00--- */ /* --- Source code is in package ImageFormat in the VMMaker repository --- */ /* --- DO NOT EDIT THIS FILE --- */ Modified: trunk/src/plugins/ADPCMCodecPlugin/ADPCMCodecPlugin.c =================================================================== --- trunk/src/plugins/ADPCMCodecPlugin/ADPCMCodecPlugin.c 2014-09-05 17:31:11 UTC (rev 3070) +++ trunk/src/plugins/ADPCMCodecPlugin/ADPCMCodecPlugin.c 2014-09-07 03:45:50 UTC (rev 3071) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.5 with VMMaker 4.13.7 translated as C source on 20 July 2014 7:58:23 pm */ +/* Smalltalk from Squeak4.5 with VMMaker 4.13.6 translated as C source on 6 September 2014 11:27 pm */ /* Automatically generated by - VMPluginCodeGenerator * VMMaker-dtl.348 uuid: 869e87ed-0476-48a8-bca8-fe779633f9ae + VMPluginCodeGenerator * VMMaker-dtl.349 uuid: b3a12120-fb0b-443c-acc5-3f027c879f1a from - ADPCMCodecPlugin * VMMaker-dtl.348 uuid: 869e87ed-0476-48a8-bca8-fe779633f9ae + ADPCMCodecPlugin * VMMaker-dtl.349 uuid: b3a12120-fb0b-443c-acc5-3f027c879f1a */ -static char __buildInfo[] = "ADPCMCodecPlugin * VMMaker-dtl.348 uuid: 869e87ed-0476-48a8-bca8-fe779633f9ae " __DATE__ ; +static char __buildInfo[] = "ADPCMCodecPlugin * VMMaker-dtl.349 uuid: b3a12120-fb0b-443c-acc5-3f027c879f1a " __DATE__ ; @@ -70,9 +70,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "ADPCMCodecPlugin 20 July 2014 (i)" + "ADPCMCodecPlugin 6 September 2014 (i)" #else - "ADPCMCodecPlugin 20 July 2014 (e)" + "ADPCMCodecPlugin 6 September 2014 (e)" #endif ; Modified: trunk/src/plugins/AioPlugin/AioPlugin.c =================================================================== --- trunk/src/plugins/AioPlugin/AioPlugin.c 2014-09-05 17:31:11 UTC (rev 3070) +++ trunk/src/plugins/AioPlugin/AioPlugin.c 2014-09-07 03:45:50 UTC (rev 3071) @@ -1,6 +1,6 @@ -/* Smalltalk from Squeak4.5 with VMMaker 4.13.7 translated as C source on 20 July 2014 7:58:45 pm */ +/* Smalltalk from Squeak4.5 with VMMaker 4.13.6 translated as C source on 6 September 2014 11:27:11 pm */ /* Automatically generated by - VMPluginCodeGenerator * VMMaker-dtl.348 uuid: 869e87ed-0476-48a8-bca8-fe779633f9ae + VMPluginCodeGenerator * VMMaker-dtl.349 uuid: b3a12120-fb0b-443c-acc5-3f027c879f1a from UnixAioPlugin VMConstruction-Plugins-AioPlugin-eem.15 uuid: 0029df1c-3720-4b61-8579-4851417d24a7 */ @@ -88,9 +88,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "AioPlugin 20 July 2014 (i)" + "AioPlugin 6 September 2014 (i)" #else - "AioPlugin 20 July 2014 (e)" + "AioPlugin 6 September 2014 (e)" #endif ; Modified: trunk/src/plugins/AsynchFilePlugin/AsynchFilePlugin.c =================================================================== --- trunk/src/plugins/AsynchFilePlugin/AsynchFilePlugin.c 2014-09-05 17:31:11 UTC (rev 3070) +++ trunk/src/plugins/AsynchFilePlugin/AsynchFilePlugin.c 2014-09-07 03:45:50 UTC (rev 3071) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.5 with VMMaker 4.13.7 translated as C source on 20 July 2014 7:58:23 pm */ +/* Smalltalk from Squeak4.5 with VMMaker 4.13.6 translated as C source on 6 September 2014 11:27:01 pm */ /* Automatically generated by - SmartSyntaxPluginCodeGenerator * VMMaker-dtl.348 uuid: 869e87ed-0476-48a8-bca8-fe779633f9ae + SmartSyntaxPluginCodeGenerator * VMMaker-dtl.349 uuid: b3a12120-fb0b-443c-acc5-3f027c879f1a from - AsynchFilePlugin * VMMaker-dtl.348 uuid: 869e87ed-0476-48a8-bca8-fe779633f9ae + AsynchFilePlugin * VMMaker-dtl.349 uuid: b3a12120-fb0b-443c-acc5-3f027c879f1a */ -static char __buildInfo[] = "AsynchFilePlugin * VMMaker-dtl.348 uuid: 869e87ed-0476-48a8-bca8-fe779633f9ae " __DATE__ ; +static char __buildInfo[] = "AsynchFilePlugin * VMMaker-dtl.349 uuid: b3a12120-fb0b-443c-acc5-3f027c879f1a " __DATE__ ; @@ -67,9 +67,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "AsynchFilePlugin 20 July 2014 (i)" + "AsynchFilePlugin 6 September 2014 (i)" #else - "AsynchFilePlugin 20 July 2014 (e)" + "AsynchFilePlugin 6 September 2014 (e)" #endif ; static void * sCOAFfn; Modified: trunk/src/plugins/B2DPlugin/B2DPlugin.c =================================================================== --- trunk/src/plugins/B2DPlugin/B2DPlugin.c 2014-09-05 17:31:11 UTC (rev 3070) +++ trunk/src/plugins/B2DPlugin/B2DPlugin.c 2014-09-07 03:45:50 UTC (rev 3071) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.5 with VMMaker 4.13.7 translated as C source on 20 July 2014 7:58:27 pm */ +/* Smalltalk from Squeak4.5 with VMMaker 4.13.6 translated as C source on 6 September 2014 11:27:02 pm */ /* Automatically generated by - VMPluginCodeGenerator * VMMaker-dtl.348 uuid: 869e87ed-0476-48a8-bca8-fe779633f9ae + VMPluginCodeGenerator * VMMaker-dtl.349 uuid: b3a12120-fb0b-443c-acc5-3f027c879f1a from - BalloonEnginePlugin * VMMaker-dtl.348 uuid: 869e87ed-0476-48a8-bca8-fe779633f9ae + BalloonEnginePlugin * VMMaker-dtl.349 uuid: b3a12120-fb0b-443c-acc5-3f027c879f1a */ -static char __buildInfo[] = "BalloonEnginePlugin * VMMaker-dtl.348 uuid: 869e87ed-0476-48a8-bca8-fe779633f9ae " __DATE__ ; +static char __buildInfo[] = "BalloonEnginePlugin * VMMaker-dtl.349 uuid: b3a12120-fb0b-443c-acc5-3f027c879f1a " __DATE__ ; @@ -447,9 +447,9 @@ static void * loadBBFn; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "B2DPlugin 20 July 2014 (i)" + "B2DPlugin 6 September 2014 (i)" #else - "B2DPlugin 20 July 2014 (e)" + "B2DPlugin 6 September 2014 (e)" #endif ; static int* objBuffer; Modified: trunk/src/plugins/B3DAcceleratorPlugin/B3DAcceleratorPlugin.c =================================================================== --- trunk/src/plugins/B3DAcceleratorPlugin/B3DAcceleratorPlugin.c 2014-09-05 17:31:11 UTC (rev 3070) +++ trunk/src/plugins/B3DAcceleratorPlugin/B3DAcceleratorPlugin.c 2014-09-07 03:45:50 UTC (rev 3071) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.5 with VMMaker 4.13.7 translated as C source on 20 July 2014 7:58:35 pm */ +/* Smalltalk from Squeak4.5 with VMMaker 4.13.6 translated as C source on 6 September 2014 11:27:06 pm */ /* Automatically generated by - VMPluginCodeGenerator * VMMaker-dtl.348 uuid: 869e87ed-0476-48a8-bca8-fe779633f9ae + VMPluginCodeGenerator * VMMaker-dtl.349 uuid: b3a12120-fb0b-443c-acc5-3f027c879f1a from - B3DAcceleratorPlugin * VMMaker-dtl.348 uuid: 869e87ed-0476-48a8-bca8-fe779633f9ae + B3DAcceleratorPlugin * VMMaker-dtl.349 uuid: b3a12120-fb0b-443c-acc5-3f027c879f1a */ -static char __buildInfo[] = "B3DAcceleratorPlugin * VMMaker-dtl.348 uuid: 869e87ed-0476-48a8-bca8-fe779633f9ae " __DATE__ ; +static char __buildInfo[] = "B3DAcceleratorPlugin * VMMaker-dtl.349 uuid: b3a12120-fb0b-443c-acc5-3f027c879f1a " __DATE__ ; @@ -107,9 +107,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "B3DAcceleratorPlugin 20 July 2014 (i)" + "B3DAcceleratorPlugin 6 September 2014 (i)" #else - "B3DAcceleratorPlugin 20 July 2014 (e)" + "B3DAcceleratorPlugin 6 September 2014 (e)" #endif ; Modified: trunk/src/plugins/BMPReadWriterPlugin/BMPReadWriterPlugin.c =================================================================== --- trunk/src/plugins/BMPReadWriterPlugin/BMPReadWriterPlugin.c 2014-09-05 17:31:11 UTC (rev 3070) +++ trunk/src/plugins/BMPReadWriterPlugin/BMPReadWriterPlugin.c 2014-09-07 03:45:50 UTC (rev 3071) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.5 with VMMaker 4.13.7 translated as C source on 20 July 2014 7:58:23 pm */ +/* Smalltalk from Squeak4.5 with VMMaker 4.13.6 translated as C source on 6 September 2014 11:27:01 pm */ /* Automatically generated by - VMPluginCodeGenerator * VMMaker-dtl.348 uuid: 869e87ed-0476-48a8-bca8-fe779633f9ae + VMPluginCodeGenerator * VMMaker-dtl.349 uuid: b3a12120-fb0b-443c-acc5-3f027c879f1a from - BMPReadWriterPlugin * VMMaker-dtl.348 uuid: 869e87ed-0476-48a8-bca8-fe779633f9ae + BMPReadWriterPlugin * VMMaker-dtl.349 uuid: b3a12120-fb0b-443c-acc5-3f027c879f1a */ -static char __buildInfo[] = "BMPReadWriterPlugin * VMMaker-dtl.348 uuid: 869e87ed-0476-48a8-bca8-fe779633f9ae " __DATE__ ; +static char __buildInfo[] = "BMPReadWriterPlugin * VMMaker-dtl.349 uuid: b3a12120-fb0b-443c-acc5-3f027c879f1a " __DATE__ ; @@ -58,9 +58,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "BMPReadWriterPlugin 20 July 2014 (i)" + "BMPReadWriterPlugin 6 September 2014 (i)" #else - "BMPReadWriterPlugin 20 July 2014 (e)" + "BMPReadWriterPlugin 6 September 2014 (e)" #endif ; Modified: trunk/src/plugins/BitBltPlugin/BitBltPlugin.c =================================================================== --- trunk/src/plugins/BitBltPlugin/BitBltPlugin.c 2014-09-05 17:31:11 UTC (rev 3070) +++ trunk/src/plugins/BitBltPlugin/BitBltPlugin.c 2014-09-07 03:45:50 UTC (rev 3071) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.5 with VMMaker 4.13.7 translated as C source on 20 July 2014 7:58:28 pm */ +/* Smalltalk from Squeak4.5 with VMMaker 4.13.6 translated as C source on 6 September 2014 11:27:03 pm */ /* Automatically generated by - SmartSyntaxPluginCodeGenerator * VMMaker-dtl.348 uuid: 869e87ed-0476-48a8-bca8-fe779633f9ae + SmartSyntaxPluginCodeGenerator * VMMaker-dtl.349 uuid: b3a12120-fb0b-443c-acc5-3f027c879f1a from - BitBltSimulation * VMMaker-dtl.348 uuid: 869e87ed-0476-48a8-bca8-fe779633f9ae + BitBltSimulation * VMMaker-dtl.349 uuid: b3a12120-fb0b-443c-acc5-3f027c879f1a */ -static char __buildInfo[] = "BitBltSimulation * VMMaker-dtl.348 uuid: 869e87ed-0476-48a8-bca8-fe779633f9ae " __DATE__ ; +static char __buildInfo[] = "BitBltSimulation * VMMaker-dtl.349 uuid: b3a12120-fb0b-443c-acc5-3f027c879f1a " __DATE__ ; @@ -256,9 +256,9 @@ }; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "BitBltPlugin 20 July 2014 (i)" + "BitBltPlugin 6 September 2014 (i)" #else - "BitBltPlugin 20 July 2014 (e)" + "BitBltPlugin 6 September 2014 (e)" #endif ; static sqInt nWords; Modified: trunk/src/plugins/CameraPlugin/CameraPlugin.c =================================================================== --- trunk/src/plugins/CameraPlugin/CameraPlugin.c 2014-09-05 17:31:11 UTC (rev 3070) +++ trunk/src/plugins/CameraPlugin/CameraPlugin.c 2014-09-07 03:45:50 UTC (rev 3071) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.5 with VMMaker 4.13.7 translated as C source on 20 July 2014 7:58:37 pm */ +/* Smalltalk from Squeak4.5 with VMMaker 4.13.6 translated as C source on 6 September 2014 11:27:07 pm */ /* Automatically generated by - VMPluginCodeGenerator * VMMaker-dtl.348 uuid: 869e87ed-0476-48a8-bca8-fe779633f9ae + VMPluginCodeGenerator * VMMaker-dtl.349 uuid: b3a12120-fb0b-443c-acc5-3f027c879f1a from - CameraPlugin * VMMaker-dtl.348 uuid: 869e87ed-0476-48a8-bca8-fe779633f9ae + CameraPlugin * VMMaker-dtl.349 uuid: b3a12120-fb0b-443c-acc5-3f027c879f1a */ -static char __buildInfo[] = "CameraPlugin * VMMaker-dtl.348 uuid: 869e87ed-0476-48a8-bca8-fe779633f9ae " __DATE__ ; +static char __buildInfo[] = "CameraPlugin * VMMaker-dtl.349 uuid: b3a12120-fb0b-443c-acc5-3f027c879f1a " __DATE__ ; @@ -64,9 +64,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "CameraPlugin 20 July 2014 (i)" + "CameraPlugin 6 September 2014 (i)" #else - "CameraPlugin 20 July 2014 (e)" + "CameraPlugin 6 September 2014 (e)" #endif ; Modified: trunk/src/plugins/ClipboardExtendedPlugin/ClipboardExtendedPlugin.c =================================================================== --- trunk/src/plugins/ClipboardExtendedPlugin/ClipboardExtendedPlugin.c 2014-09-05 17:31:11 UTC (rev 3070) +++ trunk/src/plugins/ClipboardExtendedPlugin/ClipboardExtendedPlugin.c 2014-09-07 03:45:50 UTC (rev 3071) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.5 with VMMaker 4.13.7 translated as C source on 20 July 2014 7:58:37 pm */ +/* Smalltalk from Squeak4.5 with VMMaker 4.13.6 translated as C source on 6 September 2014 11:27:07 pm */ /* Automatically generated by - SmartSyntaxPluginCodeGenerator * VMMaker-dtl.348 uuid: 869e87ed-0476-48a8-bca8-fe779633f9ae + SmartSyntaxPluginCodeGenerator * VMMaker-dtl.349 uuid: b3a12120-fb0b-443c-acc5-3f027c879f1a from - ClipboardExtendedPlugin * VMMaker-dtl.348 uuid: 869e87ed-0476-48a8-bca8-fe779633f9ae + ClipboardExtendedPlugin * VMMaker-dtl.349 uuid: b3a12120-fb0b-443c-acc5-3f027c879f1a */ -static char __buildInfo[] = "ClipboardExtendedPlugin * VMMaker-dtl.348 uuid: 869e87ed-0476-48a8-bca8-fe779633f9ae " __DATE__ ; +static char __buildInfo[] = "ClipboardExtendedPlugin * VMMaker-dtl.349 uuid: b3a12120-fb0b-443c-acc5-3f027c879f1a " __DATE__ ; @@ -61,9 +61,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "ClipboardExtendedPlugin 20 July 2014 (i)" + "ClipboardExtendedPlugin 6 September 2014 (i)" #else - "ClipboardExtendedPlugin 20 July 2014 (e)" + "ClipboardExtendedPlugin 6 September 2014 (e)" #endif ; Modified: trunk/src/plugins/CroquetPlugin/CroquetPlugin.c =================================================================== --- trunk/src/plugins/CroquetPlugin/CroquetPlugin.c 2014-09-05 17:31:11 UTC (rev 3070) +++ trunk/src/plugins/CroquetPlugin/CroquetPlugin.c 2014-09-07 03:45:50 UTC (rev 3071) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.5 with VMMaker 4.13.7 translated as C source on 20 July 2014 7:58:29 pm */ +/* Smalltalk from Squeak4.5 with VMMaker 4.13.6 translated as C source on 6 September 2014 11:27:03 pm */ /* Automatically generated by - VMPluginCodeGenerator * VMMaker-dtl.348 uuid: 869e87ed-0476-48a8-bca8-fe779633f9ae + VMPluginCodeGenerator * VMMaker-dtl.349 uuid: b3a12120-fb0b-443c-acc5-3f027c879f1a from - CroquetPlugin * VMMaker-dtl.348 uuid: 869e87ed-0476-48a8-bca8-fe779633f9ae + CroquetPlugin * VMMaker-dtl.349 uuid: b3a12120-fb0b-443c-acc5-3f027c879f1a */ -static char __buildInfo[] = "CroquetPlugin * VMMaker-dtl.348 uuid: 869e87ed-0476-48a8-bca8-fe779633f9ae " __DATE__ ; +static char __buildInfo[] = "CroquetPlugin * VMMaker-dtl.349 uuid: b3a12120-fb0b-443c-acc5-3f027c879f1a " __DATE__ ; @@ -73,9 +73,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "CroquetPlugin 20 July 2014 (i)" + "CroquetPlugin 6 September 2014 (i)" #else - "CroquetPlugin 20 July 2014 (e)" + "CroquetPlugin 6 September 2014 (e)" #endif ; Modified: trunk/src/plugins/DBusPlugin/DBusPlugin.c =================================================================== --- trunk/src/plugins/DBusPlugin/DBusPlugin.c 2014-09-05 17:31:11 UTC (rev 3070) +++ trunk/src/plugins/DBusPlugin/DBusPlugin.c 2014-09-07 03:45:50 UTC (rev 3071) @@ -1,6 +1,6 @@ -/* Smalltalk from Squeak4.5 with VMMaker 4.13.7 translated as C source on 20 July 2014 7:58:37 pm */ +/* Smalltalk from Squeak4.5 with VMMaker 4.13.6 translated as C source on 6 September 2014 11:27:07 pm */ /* Automatically generated by - SmartSyntaxPluginCodeGenerator * VMMaker-dtl.348 uuid: 869e87ed-0476-48a8-bca8-fe779633f9ae + SmartSyntaxPluginCodeGenerator * VMMaker-dtl.349 uuid: b3a12120-fb0b-443c-acc5-3f027c879f1a from DBusPlugin DBus-Plugin-dtl.35 uuid: 2ae30f08-4793-4acb-876b-c443a5f5e665 */ @@ -143,9 +143,9 @@ static DBusMessageIter messageIter[DBUS_MAXIMUM_TYPE_RECURSION_DEPTH]; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "DBusPlugin 20 July 2014 (i)" + "DBusPlugin 6 September 2014 (i)" #else - "DBusPlugin 20 July 2014 (e)" + "DBusPlugin 6 September 2014 (e)" #endif ; static DBusMessage* writeMessage; Modified: trunk/src/plugins/DSAPrims/DSAPrims.c =================================================================== --- trunk/src/plugins/DSAPrims/DSAPrims.c 2014-09-05 17:31:11 UTC (rev 3070) +++ trunk/src/plugins/DSAPrims/DSAPrims.c 2014-09-07 03:45:50 UTC (rev 3071) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.5 with VMMaker 4.13.7 translated as C source on 20 July 2014 7:58:29 pm */ +/* Smalltalk from Squeak4.5 with VMMaker 4.13.6 translated as C source on 6 September 2014 11:27:03 pm */ /* Automatically generated by - VMPluginCodeGenerator * VMMaker-dtl.348 uuid: 869e87ed-0476-48a8-bca8-fe779633f9ae + VMPluginCodeGenerator * VMMaker-dtl.349 uuid: b3a12120-fb0b-443c-acc5-3f027c879f1a from - DSAPlugin * VMMaker-dtl.348 uuid: 869e87ed-0476-48a8-bca8-fe779633f9ae + DSAPlugin * VMMaker-dtl.349 uuid: b3a12120-fb0b-443c-acc5-3f027c879f1a */ -static char __buildInfo[] = "DSAPlugin * VMMaker-dtl.348 uuid: 869e87ed-0476-48a8-bca8-fe779633f9ae " __DATE__ ; +static char __buildInfo[] = "DSAPlugin * VMMaker-dtl.349 uuid: b3a12120-fb0b-443c-acc5-3f027c879f1a " __DATE__ ; @@ -67,9 +67,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "DSAPrims 20 July 2014 (i)" + "DSAPrims 6 September 2014 (i)" #else - "DSAPrims 20 July 2014 (e)" + "DSAPrims 6 September 2014 (e)" #endif ; static sqInt remainderDigitCount; Modified: trunk/src/plugins/DropPlugin/DropPlugin.c =================================================================== --- trunk/src/plugins/DropPlugin/DropPlugin.c 2014-09-05 17:31:11 UTC (rev 3070) +++ trunk/src/plugins/DropPlugin/DropPlugin.c 2014-09-07 03:45:50 UTC (rev 3071) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.5 with VMMaker 4.13.7 translated as C source on 20 July 2014 7:58:30 pm */ +/* Smalltalk from Squeak4.5 with VMMaker 4.13.6 translated as C source on 6 September 2014 11:27:03 pm */ /* Automatically generated by - VMPluginCodeGenerator * VMMaker-dtl.348 uuid: 869e87ed-0476-48a8-bca8-fe779633f9ae + VMPluginCodeGenerator * VMMaker-dtl.349 uuid: b3a12120-fb0b-443c-acc5-3f027c879f1a from - DropPlugin * VMMaker-dtl.348 uuid: 869e87ed-0476-48a8-bca8-fe779633f9ae + DropPlugin * VMMaker-dtl.349 uuid: b3a12120-fb0b-443c-acc5-3f027c879f1a */ -static char __buildInfo[] = "DropPlugin * VMMaker-dtl.348 uuid: 869e87ed-0476-48a8-bca8-fe779633f9ae " __DATE__ ; +static char __buildInfo[] = "DropPlugin * VMMaker-dtl.349 uuid: b3a12120-fb0b-443c-acc5-3f027c879f1a " __DATE__ ; @@ -62,9 +62,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "DropPlugin 20 July 2014 (i)" + "DropPlugin 6 September 2014 (i)" #else - "DropPlugin 20 July 2014 (e)" + "DropPlugin 6 September 2014 (e)" #endif ; Modified: trunk/src/plugins/FFTPlugin/FFTPlugin.c =================================================================== --- trunk/src/plugins/FFTPlugin/FFTPlugin.c 2014-09-05 17:31:11 UTC (rev 3070) +++ trunk/src/plugins/FFTPlugin/FFTPlugin.c 2014-09-07 03:45:50 UTC (rev 3071) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.5 with VMMaker 4.13.7 translated as C source on 20 July 2014 7:58:30 pm */ +/* Smalltalk from Squeak4.5 with VMMaker 4.13.6 translated as C source on 6 September 2014 11:27:03 pm */ /* Automatically generated by - VMPluginCodeGenerator * VMMaker-dtl.348 uuid: 869e87ed-0476-48a8-bca8-fe779633f9ae + VMPluginCodeGenerator * VMMaker-dtl.349 uuid: b3a12120-fb0b-443c-acc5-3f027c879f1a from - FFTPlugin * VMMaker-dtl.348 uuid: 869e87ed-0476-48a8-bca8-fe779633f9ae + FFTPlugin * VMMaker-dtl.349 uuid: b3a12120-fb0b-443c-acc5-3f027c879f1a */ -static char __buildInfo[] = "FFTPlugin * VMMaker-dtl.348 uuid: 869e87ed-0476-48a8-bca8-fe779633f9ae " __DATE__ ; +static char __buildInfo[] = "FFTPlugin * VMMaker-dtl.349 uuid: b3a12120-fb0b-443c-acc5-3f027c879f1a " __DATE__ ; @@ -68,9 +68,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "FFTPlugin 20 July 2014 (i)" + "FFTPlugin 6 September 2014 (i)" #else - "FFTPlugin 20 July 2014 (e)" + "FFTPlugin 6 September 2014 (e)" #endif ; static sqInt nu; Modified: trunk/src/plugins/FT2Plugin/FT2Plugin.c =================================================================== --- trunk/src/plugins/FT2Plugin/FT2Plugin.c 2014-09-05 17:31:11 UTC (rev 3070) +++ trunk/src/plugins/FT2Plugin/FT2Plugin.c 2014-09-07 03:45:50 UTC (rev 3071) @@ -1,4 +1,4 @@ -/* Smalltalk from Squeak4.5 with VMMaker 4.13.7 translated as C source on 20 July 2014 7:58:39 pm */ +/* Smalltalk from Squeak4.5 with VMMaker 4.13.6 translated as C source on 6 September 2014 11:27:08 pm */ /* Automatically generated by FT2PluginCodeGenerator * FreeType-nice.442 uuid: 9895a884-7d42-4783-9fb8-1a71ef244e16 from @@ -121,9 +121,9 @@ static FT_Library library; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "FT2Plugin 20 July 2014 (i)" + "FT2Plugin 6 September 2014 (i)" #else - "FT2Plugin 20 July 2014 (e)" + "FT2Plugin 6 September 2014 (e)" #endif ; Modified: trunk/src/plugins/FileCopyPlugin/FileCopyPlugin.c =================================================================== --- trunk/src/plugins/FileCopyPlugin/FileCopyPlugin.c 2014-09-05 17:31:11 UTC (rev 3070) +++ trunk/src/plugins/FileCopyPlugin/FileCopyPlugin.c 2014-09-07 03:45:50 UTC (rev 3071) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.5 with VMMaker 4.13.7 translated as C source on 20 July 2014 7:58:39 pm */ +/* Smalltalk from Squeak4.5 with VMMaker 4.13.6 translated as C source on 6 September 2014 11:27:08 pm */ /* Automatically generated by - SmartSyntaxPluginCodeGenerator * VMMaker-dtl.348 uuid: 869e87ed-0476-48a8-bca8-fe779633f9ae + SmartSyntaxPluginCodeGenerator * VMMaker-dtl.349 uuid: b3a12120-fb0b-443c-acc5-3f027c879f1a from - FileCopyPlugin * VMMaker-dtl.348 uuid: 869e87ed-0476-48a8-bca8-fe779633f9ae + FileCopyPlugin * VMMaker-dtl.349 uuid: b3a12120-fb0b-443c-acc5-3f027c879f1a */ -static char __buildInfo[] = "FileCopyPlugin * VMMaker-dtl.348 uuid: 869e87ed-0476-48a8-bca8-fe779633f9ae " __DATE__ ; +static char __buildInfo[] = "FileCopyPlugin * VMMaker-dtl.349 uuid: b3a12120-fb0b-443c-acc5-3f027c879f1a " __DATE__ ; @@ -57,9 +57,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "FileCopyPlugin 20 July 2014 (i)" + "FileCopyPlugin 6 September 2014 (i)" #else - "FileCopyPlugin 20 July 2014 (e)" + "FileCopyPlugin 6 September 2014 (e)" #endif ; Modified: trunk/src/plugins/FilePlugin/FilePlugin.c =================================================================== --- trunk/src/plugins/FilePlugin/FilePlugin.c 2014-09-05 17:31:11 UTC (rev 3070) +++ trunk/src/plugins/FilePlugin/FilePlugin.c 2014-09-07 03:45:50 UTC (rev 3071) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.5 with VMMaker 4.13.7 translated as C source on 20 July 2014 7:58:30 pm */ +/* Smalltalk from Squeak4.5 with VMMaker 4.13.6 translated as C source on 6 September 2014 11:27:04 pm */ /* Automatically generated by - VMPluginCodeGenerator * VMMaker-dtl.348 uuid: 869e87ed-0476-48a8-bca8-fe779633f9ae + VMPluginCodeGenerator * VMMaker-dtl.349 uuid: b3a12120-fb0b-443c-acc5-3f027c879f1a from - FilePlugin * VMMaker-dtl.348 uuid: 869e87ed-0476-48a8-bca8-fe779633f9ae + FilePlugin * VMMaker-dtl.349 uuid: b3a12120-fb0b-443c-acc5-3f027c879f1a */ -static char __buildInfo[] = "FilePlugin * VMMaker-dtl.348 uuid: 869e87ed-0476-48a8-bca8-fe779633f9ae " __DATE__ ; +static char __buildInfo[] = "FilePlugin * VMMaker-dtl.349 uuid: b3a12120-fb0b-443c-acc5-3f027c879f1a " __DATE__ ; @@ -100,9 +100,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "FilePlugin 20 July 2014 (i)" + "FilePlugin 6 September 2014 (i)" #else - "FilePlugin 20 July 2014 (e)" + "FilePlugin 6 September 2014 (e)" #endif ; static void * sCCPfn; Modified: trunk/src/plugins/FloatArrayPlugin/FloatArrayPlugin.c =================================================================== --- trunk/src/plugins/FloatArrayPlugin/FloatArrayPlugin.c 2014-09-05 17:31:11 UTC (rev 3070) +++ trunk/src/plugins/FloatArrayPlugin/FloatArrayPlugin.c 2014-09-07 03:45:50 UTC (rev 3071) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.5 with VMMaker 4.13.7 translated as C source on 20 July 2014 7:58:30 pm */ +/* Smalltalk from Squeak4.5 with VMMaker 4.13.6 translated as C source on 6 September 2014 11:27:04 pm */ /* Automatically generated by - VMPluginCodeGenerator * VMMaker-dtl.348 uuid: 869e87ed-0476-48a8-bca8-fe779633f9ae + VMPluginCodeGenerator * VMMaker-dtl.349 uuid: b3a12120-fb0b-443c-acc5-3f027c879f1a from - FloatArrayPlugin * VMMaker-dtl.348 uuid: 869e87ed-0476-48a8-bca8-fe779633f9ae + FloatArrayPlugin * VMMaker-dtl.349 uuid: b3a12120-fb0b-443c-acc5-3f027c879f1a */ -static char __buildInfo[] = "FloatArrayPlugin * VMMaker-dtl.348 uuid: 869e87ed-0476-48a8-bca8-fe779633f9ae " __DATE__ ; +static char __buildInfo[] = "FloatArrayPlugin * VMMaker-dtl.349 uuid: b3a12120-fb0b-443c-acc5-3f027c879f1a " __DATE__ ; @@ -72,9 +72,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "FloatArrayPlugin 20 July 2014 (i)" + "FloatArrayPlugin 6 September 2014 (i)" #else - "FloatArrayPlugin 20 July 2014 (e)" + "FloatArrayPlugin 6 September 2014 (e)" #endif ; Modified: trunk/src/plugins/FloatMathPlugin/FloatMathPlugin.c =================================================================== --- trunk/src/plugins/FloatMathPlugin/FloatMathPlugin.c 2014-09-05 17:31:11 UTC (rev 3070) +++ trunk/src/plugins/FloatMathPlugin/FloatMathPlugin.c 2014-09-07 03:45:50 UTC (rev 3071) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.5 with VMMaker 4.13.7 translated as C source on 20 July 2014 7:58:30 pm */ +/* Smalltalk from Squeak4.5 with VMMaker 4.13.6 translated as C source on 6 September 2014 11:27:04 pm */ /* Automatically generated by - VMPluginCodeGenerator * VMMaker-dtl.348 uuid: 869e87ed-0476-48a8-bca8-fe779633f9ae + VMPluginCodeGenerator * VMMaker-dtl.349 uuid: b3a12120-fb0b-443c-acc5-3f027c879f1a from - FloatMathPlugin * VMMaker-dtl.348 uuid: 869e87ed-0476-48a8-bca8-fe779633f9ae + FloatMathPlugin * VMMaker-dtl.349 uuid: b3a12120-fb0b-443c-acc5-3f027c879f1a */ -static char __buildInfo[] = "FloatMathPlugin * VMMaker-dtl.348 uuid: 869e87ed-0476-48a8-bca8-fe779633f9ae " __DATE__ ; +static char __buildInfo[] = "FloatMathPlugin * VMMaker-dtl.349 uuid: b3a12120-fb0b-443c-acc5-3f027c879f1a " __DATE__ ; @@ -79,9 +79,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "FloatMathPlugin 20 July 2014 (i)" + "FloatMathPlugin 6 September 2014 (i)" #else - "FloatMathPlugin 20 July 2014 (e)" + "FloatMathPlugin 6 September 2014 (e)" #endif ; Modified: trunk/src/plugins/GeniePlugin/GeniePlugin.c =================================================================== --- trunk/src/plugins/GeniePlugin/GeniePlugin.c 2014-09-05 17:31:11 UTC (rev 3070) +++ trunk/src/plugins/GeniePlugin/GeniePlugin.c 2014-09-07 03:45:50 UTC (rev 3071) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.5 with VMMaker 4.13.7 translated as C source on 20 July 2014 7:58:31 pm */ +/* Smalltalk from Squeak4.5 with VMMaker 4.13.6 translated as C source on 6 September 2014 11:27:04 pm */ /* Automatically generated by - SmartSyntaxPluginCodeGenerator * VMMaker-dtl.348 uuid: 869e87ed-0476-48a8-bca8-fe779633f9ae + SmartSyntaxPluginCodeGenerator * VMMaker-dtl.349 uuid: b3a12120-fb0b-443c-acc5-3f027c879f1a from - GeniePlugin * VMMaker-dtl.348 uuid: 869e87ed-0476-48a8-bca8-fe779633f9ae + GeniePlugin * VMMaker-dtl.349 uuid: b3a12120-fb0b-443c-acc5-3f027c879f1a */ -static char __buildInfo[] = "GeniePlugin * VMMaker-dtl.348 uuid: 869e87ed-0476-48a8-bca8-fe779633f9ae " __DATE__ ; +static char __buildInfo[] = "GeniePlugin * VMMaker-dtl.349 uuid: b3a12120-fb0b-443c-acc5-3f027c879f1a " __DATE__ ; @@ -61,9 +61,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "GeniePlugin v2.0 20 July 2014 (i)" + "GeniePlugin v2.0 6 September 2014 (i)" #else - "GeniePlugin v2.0 20 July 2014 (e)" + "GeniePlugin v2.0 6 September 2014 (e)" #endif ; Modified: trunk/src/plugins/HostWindowPlugin/HostWindowPlugin.c =================================================================== --- trunk/src/plugins/HostWindowPlugin/HostWindowPlugin.c 2014-09-05 17:31:11 UTC (rev 3070) +++ trunk/src/plugins/HostWindowPlugin/HostWindowPlugin.c 2014-09-07 03:45:50 UTC (rev 3071) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.5 with VMMaker 4.13.7 translated as C source on 20 July 2014 7:58:40 pm */ +/* Smalltalk from Squeak4.5 with VMMaker 4.13.6 translated as C source on 6 September 2014 11:27:09 pm */ /* Automatically generated by - SmartSyntaxPluginCodeGenerator * VMMaker-dtl.348 uuid: 869e87ed-0476-48a8-bca8-fe779633f9ae + SmartSyntaxPluginCodeGenerator * VMMaker-dtl.349 uuid: b3a12120-fb0b-443c-acc5-3f027c879f1a from - HostWindowPlugin * VMMaker-dtl.348 uuid: 869e87ed-0476-48a8-bca8-fe779633f9ae + HostWindowPlugin * VMMaker-dtl.349 uuid: b3a12120-fb0b-443c-acc5-3f027c879f1a */ -static char __buildInfo[] = "HostWindowPlugin * VMMaker-dtl.348 uuid: 869e87ed-0476-48a8-bca8-fe779633f9ae " __DATE__ ; +static char __buildInfo[] = "HostWindowPlugin * VMMaker-dtl.349 uuid: b3a12120-fb0b-443c-acc5-3f027c879f1a " __DATE__ ; @@ -66,9 +66,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "HostWindowPlugin 20 July 2014 (i)" + "HostWindowPlugin 6 September 2014 (i)" #else - "HostWindowPlugin 20 July 2014 (e)" + "HostWindowPlugin 6 September 2014 (e)" #endif ; Modified: trunk/src/plugins/JPEGReadWriter2Plugin/JPEGReadWriter2Plugin.c =================================================================== --- trunk/src/plugins/JPEGReadWriter2Plugin/JPEGReadWriter2Plugin.c 2014-09-05 17:31:11 UTC (rev 3070) +++ trunk/src/plugins/JPEGReadWriter2Plugin/JPEGReadWriter2Plugin.c 2014-09-07 03:45:50 UTC (rev 3071) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.5 with VMMaker 4.13.7 translated as C source on 20 July 2014 7:58:31 pm */ +/* Smalltalk from Squeak4.5 with VMMaker 4.13.6 translated as C source on 6 September 2014 11:27:04 pm */ /* Automatically generated by - SmartSyntaxPluginCodeGenerator * VMMaker-dtl.348 uuid: 869e87ed-0476-48a8-bca8-fe779633f9ae + SmartSyntaxPluginCodeGenerator * VMMaker-dtl.349 uuid: b3a12120-fb0b-443c-acc5-3f027c879f1a from - JPEGReadWriter2Plugin * VMMaker-dtl.348 uuid: 869e87ed-0476-48a8-bca8-fe779633f9ae + JPEGReadWriter2Plugin * VMMaker-dtl.349 uuid: b3a12120-fb0b-443c-acc5-3f027c879f1a */ -static char __buildInfo[] = "JPEGReadWriter2Plugin * VMMaker-dtl.348 uuid: 869e87ed-0476-48a8-bca8-fe779633f9ae " __DATE__ ; +static char __buildInfo[] = "JPEGReadWriter2Plugin * VMMaker-dtl.349 uuid: b3a12120-fb0b-443c-acc5-3f027c879f1a " __DATE__ ; @@ -68,9 +68,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "JPEGReadWriter2Plugin 20 July 2014 (i)" + "JPEGReadWriter2Plugin 6 September 2014 (i)" #else - "JPEGReadWriter2Plugin 20 July 2014 (e)" + "JPEGReadWriter2Plugin 6 September 2014 (e)" #endif ; Modified: trunk/src/plugins/JPEGReaderPlugin/JPEGReaderPlugin.c =================================================================== --- trunk/src/plugins/JPEGReaderPlugin/JPEGReaderPlugin.c 2014-09-05 17:31:11 UTC (rev 3070) +++ trunk/src/plugins/JPEGReaderPlugin/JPEGReaderPlugin.c 2014-09-07 03:45:50 UTC (rev 3071) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.5 with VMMaker 4.13.7 translated as C source on 20 July 2014 7:58:31 pm */ +/* Smalltalk from Squeak4.5 with VMMaker 4.13.6 translated as C source on 6 September 2014 11:27:04 pm */ /* Automatically generated by - VMPluginCodeGenerator * VMMaker-dtl.348 uuid: 869e87ed-0476-48a8-bca8-fe779633f9ae + VMPluginCodeGenerator * VMMaker-dtl.349 uuid: b3a12120-fb0b-443c-acc5-3f027c879f1a from - JPEGReaderPlugin * VMMaker-dtl.348 uuid: 869e87ed-0476-48a8-bca8-fe779633f9ae + JPEGReaderPlugin * VMMaker-dtl.349 uuid: b3a12120-fb0b-443c-acc5-3f027c879f1a */ -static char __buildInfo[] = "JPEGReaderPlugin * VMMaker-dtl.348 uuid: 869e87ed-0476-48a8-bca8-fe779633f9ae " __DATE__ ; +static char __buildInfo[] = "JPEGReaderPlugin * VMMaker-dtl.349 uuid: b3a12120-fb0b-443c-acc5-3f027c879f1a " __DATE__ ; @@ -136,9 +136,9 @@ static sqInt jsReadLimit; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "JPEGReaderPlugin 20 July 2014 (i)" + "JPEGReaderPlugin 6 September 2014 (i)" #else - "JPEGReaderPlugin 20 July 2014 (e)" + "JPEGReaderPlugin 6 September 2014 (e)" #endif ; static int *residuals; Modified: trunk/src/plugins/JoystickTabletPlugin/JoystickTabletPlugin.c =================================================================== --- trunk/src/plugins/JoystickTabletPlugin/JoystickTabletPlugin.c 2014-09-05 17:31:11 UTC (rev 3070) +++ trunk/src/plugins/JoystickTabletPlugin/JoystickTabletPlugin.c 2014-09-07 03:45:50 UTC (rev 3071) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.5 with VMMaker 4.13.7 translated as C source on 20 July 2014 7:58:31 pm */ +/* Smalltalk from Squeak4.5 with VMMaker 4.13.6 translated as C source on 6 September 2014 11:27:04 pm */ /* Automatically generated by - SmartSyntaxPluginCodeGenerator * VMMaker-dtl.348 uuid: 869e87ed-0476-48a8-bca8-fe779633f9ae + SmartSyntaxPluginCodeGenerator * VMMaker-dtl.349 uuid: b3a12120-fb0b-443c-acc5-3f027c879f1a from - JoystickTabletPlugin * VMMaker-dtl.348 uuid: 869e87ed-0476-48a8-bca8-fe779633f9ae + JoystickTabletPlugin * VMMaker-dtl.349 uuid: b3a12120-fb0b-443c-acc5-3f027c879f1a */ -static char __buildInfo[] = "JoystickTabletPlugin * VMMaker-dtl.348 uuid: 869e87ed-0476-48a8-bca8-fe779633f9ae " __DATE__ ; +static char __buildInfo[] = "JoystickTabletPlugin * VMMaker-dtl.349 uuid: b3a12120-fb0b-443c-acc5-3f027c879f1a " __DATE__ ; @@ -62,9 +62,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "JoystickTabletPlugin 20 July 2014 (i)" + "JoystickTabletPlugin 6 September 2014 (i)" #else - "JoystickTabletPlugin 20 July 2014 (e)" + "JoystickTabletPlugin 6 September 2014 (e)" #endif ; Modified: trunk/src/plugins/KedamaPlugin2/KedamaPlugin2.c =================================================================== --- trunk/src/plugins/KedamaPlugin2/KedamaPlugin2.c 2014-09-05 17:31:11 UTC (rev 3070) +++ trunk/src/plugins/KedamaPlugin2/KedamaPlugin2.c 2014-09-07 03:45:50 UTC (rev 3071) @@ -1,6 +1,6 @@ -/* Smalltalk from Squeak4.5 with VMMaker 4.13.7 translated as C source on 20 July 2014 7:58:41 pm */ +/* Smalltalk from Squeak4.5 with VMMaker 4.13.6 translated as C source on 6 September 2014 11:27:09 pm */ /* Automatically generated by - VMPluginCodeGenerator * VMMaker-dtl.348 uuid: 869e87ed-0476-48a8-bca8-fe779633f9ae + VMPluginCodeGenerator * VMMaker-dtl.349 uuid: b3a12120-fb0b-443c-acc5-3f027c879f1a from KedamaPlugin2 Kedama-Plugins-yo.1 uuid: 3fc7d691-0149-ba4d-a339-5d27cd44a2f8 */ @@ -123,9 +123,9 @@ static unsigned int kedamaRandomSeed; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "KedamaPlugin2 20 July 2014 (i)" + "KedamaPlugin2 6 September 2014 (i)" #else - "KedamaPlugin2 20 July 2014 (e)" + "KedamaPlugin2 6 September 2014 (e)" #endif ; static unsigned int randA; Modified: trunk/src/plugins/Klatt/Klatt.c =================================================================== --- trunk/src/plugins/Klatt/Klatt.c 2014-09-05 17:31:11 UTC (rev 3070) +++ trunk/src/plugins/Klatt/Klatt.c 2014-09-07 03:45:50 UTC (rev 3071) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.5 with VMMaker 4.13.7 translated as C source on 20 July 2014 7:58:32 pm */ +/* Smalltalk from Squeak4.5 with VMMaker 4.13.6 translated as C source on 6 September 2014 11:27:05 pm */ /* Automatically generated by - VMPluginCodeGenerator * VMMaker-dtl.348 uuid: 869e87ed-0476-48a8-bca8-fe779633f9ae + VMPluginCodeGenerator * VMMaker-dtl.349 uuid: b3a12120-fb0b-443c-acc5-3f027c879f1a from - KlattSynthesizerPlugin * VMMaker-dtl.348 uuid: 869e87ed-0476-48a8-bca8-fe779633f9ae + KlattSynthesizerPlugin * VMMaker-dtl.349 uuid: b3a12120-fb0b-443c-acc5-3f027c879f1a */ -static char __buildInfo[] = "KlattSynthesizerPlugin * VMMaker-dtl.348 uuid: 869e87ed-0476-48a8-bca8-fe779633f9ae " __DATE__ ; +static char __buildInfo[] = "KlattSynthesizerPlugin * VMMaker-dtl.349 uuid: b3a12120-fb0b-443c-acc5-3f027c879f1a " __DATE__ ; @@ -155,9 +155,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "Klatt 20 July 2014 (i)" + "Klatt 6 September 2014 (i)" #else - "Klatt 20 July 2014 (e)" + "Klatt 6 September 2014 (e)" #endif ; static float nlast; Modified: trunk/src/plugins/LargeIntegers/LargeIntegers.c =================================================================== --- trunk/src/plugins/LargeIntegers/LargeIntegers.c 2014-09-05 17:31:11 UTC (rev 3070) +++ trunk/src/plugins/LargeIntegers/LargeIntegers.c 2014-09-07 03:45:50 UTC (rev 3071) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.5 with VMMaker 4.13.7 translated as C source on 20 July 2014 7:58:33 pm */ +/* Smalltalk from Squeak4.5 with VMMaker 4.13.6 translated as C source on 6 September 2014 11:27:05 pm */ /* Automatically generated by - SmartSyntaxPluginCodeGenerator * VMMaker-dtl.348 uuid: 869e87ed-0476-48a8-bca8-fe779633f9ae + SmartSyntaxPluginCodeGenerator * VMMaker-dtl.349 uuid: b3a12120-fb0b-443c-acc5-3f027c879f1a from - LargeIntegersPlugin * VMMaker-dtl.348 uuid: 869e87ed-0476-48a8-bca8-fe779633f9ae + LargeIntegersPlugin * VMMaker-dtl.349 uuid: b3a12120-fb0b-443c-acc5-3f027c879f1a */ -static char __buildInfo[] = "LargeIntegersPlugin * VMMaker-dtl.348 uuid: 869e87ed-0476-48a8-bca8-fe779633f9ae " __DATE__ ; +static char __buildInfo[] = "LargeIntegersPlugin * VMMaker-dtl.349 uuid: b3a12120-fb0b-443c-acc5-3f027c879f1a " __DATE__ ; Modified: trunk/src/plugins/LocalePlugin/LocalePlugin.c =================================================================== --- trunk/src/plugins/LocalePlugin/LocalePlugin.c 2014-09-05 17:31:11 UTC (rev 3070) +++ trunk/src/plugins/LocalePlugin/LocalePlugin.c 2014-09-07 03:45:50 UTC (rev 3071) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.5 with VMMaker 4.13.7 translated as C source on 20 July 2014 7:58:33 pm */ +/* Smalltalk from Squeak4.5 with VMMaker 4.13.6 translated as C source on 6 September 2014 11:27:05 pm */ /* Automatically generated by - SmartSyntaxPluginCodeGenerator * VMMaker-dtl.348 uuid: 869e87ed-0476-48a8-bca8-fe779633f9ae + SmartSyntaxPluginCodeGenerator * VMMaker-dtl.349 uuid: b3a12120-fb0b-443c-acc5-3f027c879f1a from - LocalePlugin * VMMaker-dtl.348 uuid: 869e87ed-0476-48a8-bca8-fe779633f9ae + LocalePlugin * VMMaker-dtl.349 uuid: b3a12120-fb0b-443c-acc5-3f027c879f1a */ -static char __buildInfo[] = "LocalePlugin * VMMaker-dtl.348 uuid: 869e87ed-0476-48a8-bca8-fe779633f9ae " __DATE__ ; +static char __buildInfo[] = "LocalePlugin * VMMaker-dtl.349 uuid: b3a12120-fb0b-443c-acc5-3f027c879f1a " __DATE__ ; @@ -71,9 +71,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "LocalePlugin 20 July 2014 (i)" + "LocalePlugin 6 September 2014 (i)" #else - "LocalePlugin 20 July 2014 (e)" + "LocalePlugin 6 September 2014 (e)" #endif ; Modified: trunk/src/plugins/MIDIPlugin/MIDIPlugin.c =================================================================== --- trunk/src/plugins/MIDIPlugin/MIDIPlugin.c 2014-09-05 17:31:11 UTC (rev 3070) +++ trunk/src/plugins/MIDIPlugin/MIDIPlugin.c 2014-09-07 03:45:50 UTC (rev 3071) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.5 with VMMaker 4.13.7 translated as C source on 20 July 2014 7:58:42 pm */ +/* Smalltalk from Squeak4.5 with VMMaker 4.13.6 translated as C source on 6 September 2014 11:27:09 pm */ /* Automatically generated by - SmartSyntaxPluginCodeGenerator * VMMaker-dtl.348 uuid: 869e87ed-0476-48a8-bca8-fe779633f9ae + SmartSyntaxPluginCodeGenerator * VMMaker-dtl.349 uuid: b3a12120-fb0b-443c-acc5-3f027c879f1a from - MIDIPlugin * VMMaker-dtl.348 uuid: 869e87ed-0476-48a8-bca8-fe779633f9ae + MIDIPlugin * VMMaker-dtl.349 uuid: b3a12120-fb0b-443c-acc5-3f027c879f1a */ -static char __buildInfo[] = "MIDIPlugin * VMMaker-dtl.348 uuid: 869e87ed-0476-48a8-bca8-fe779633f9ae " __DATE__ ; +static char __buildInfo[] = "MIDIPlugin * VMMaker-dtl.349 uuid: b3a12120-fb0b-443c-acc5-3f027c879f1a " __DATE__ ; @@ -70,9 +70,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "MIDIPlugin 20 July 2014 (i)" + "MIDIPlugin 6 September 2014 (i)" #else - "MIDIPlugin 20 July 2014 (e)" + "MIDIPlugin 6 September 2014 (e)" #endif ; Modified: trunk/src/plugins/Matrix2x3Plugin/Matrix2x3Plugin.c =================================================================== --- trunk/src/plugins/Matrix2x3Plugin/Matrix2x3Plugin.c 2014-09-05 17:31:11 UTC (rev 3070) +++ trunk/src/plugins/Matrix2x3Plugin/Matrix2x3Plugin.c 2014-09-07 03:45:50 UTC (rev 3071) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.5 with VMMaker 4.13.7 translated as C source on 20 July 2014 7:58:33 pm */ +/* Smalltalk from Squeak4.5 with VMMaker 4.13.6 translated as C source on 6 September 2014 11:27:05 pm */ /* Automatically generated by - VMPluginCodeGenerator * VMMaker-dtl.348 uuid: 869e87ed-0476-48a8-bca8-fe779633f9ae + VMPluginCodeGenerator * VMMaker-dtl.349 uuid: b3a12120-fb0b-443c-acc5-3f027c879f1a from - Matrix2x3Plugin * VMMaker-dtl.348 uuid: 869e87ed-0476-48a8-bca8-fe779633f9ae + Matrix2x3Plugin * VMMaker-dtl.349 uuid: b3a12120-fb0b-443c-acc5-3f027c879f1a */ -static char __buildInfo[] = "Matrix2x3Plugin * VMMaker-dtl.348 uuid: 869e87ed-0476-48a8-bca8-fe779633f9ae " __DATE__ ; +static char __buildInfo[] = "Matrix2x3Plugin * VMMaker-dtl.349 uuid: b3a12120-fb0b-443c-acc5-3f027c879f1a " __DATE__ ; @@ -74,9 +74,9 @@ static double m23ResultY; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "Matrix2x3Plugin 20 July 2014 (i)" + "Matrix2x3Plugin 6 September 2014 (i)" #else - "Matrix2x3Plugin 20 July 2014 (e)" + "Matrix2x3Plugin 6 September 2014 (e)" #endif ; Modified: trunk/src/plugins/MiscPrimitivePlugin/MiscPrimitivePlugin.c =================================================================== --- trunk/src/plugins/MiscPrimitivePlugin/MiscPrimitivePlugin.c 2014-09-05 17:31:11 UTC (rev 3070) +++ trunk/src/plugins/MiscPrimitivePlugin/MiscPrimitivePlugin.c 2014-09-07 03:45:50 UTC (rev 3071) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.5 with VMMaker 4.13.7 translated as C source on 20 July 2014 7:58:33 pm */ +/* Smalltalk from Squeak4.5 with VMMaker 4.13.6 translated as C source on 6 September 2014 11:27:05 pm */ /* Automatically generated by - VMPluginCodeGenerator * VMMaker-dtl.348 uuid: 869e87ed-0476-48a8-bca8-fe779633f9ae + VMPluginCodeGenerator * VMMaker-dtl.349 uuid: b3a12120-fb0b-443c-acc5-3f027c879f1a from - MiscPrimitivePlugin * VMMaker-dtl.348 uuid: 869e87ed-0476-48a8-bca8-fe779633f9ae + MiscPrimitivePlugin * VMMaker-dtl.349 uuid: b3a12120-fb0b-443c-acc5-3f027c879f1a */ -static char __buildInfo[] = "MiscPrimitivePlugin * VMMaker-dtl.348 uuid: 869e87ed-0476-48a8-bca8-fe779633f9ae " __DATE__ ; +static char __buildInfo[] = "MiscPrimitivePlugin * VMMaker-dtl.349 uuid: b3a12120-fb0b-443c-acc5-3f027c879f1a " __DATE__ ; @@ -70,9 +70,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "MiscPrimitivePlugin 20 July 2014 (i)" + "MiscPrimitivePlugin 6 September 2014 (i)" #else - "MiscPrimitivePlugin 20 July 2014 (e)" + "MiscPrimitivePlugin 6 September 2014 (e)" #endif ; Modified: trunk/src/plugins/Mpeg3Plugin/Mpeg3Plugin.c =================================================================== --- trunk/src/plugins/Mpeg3Plugin/Mpeg3Plugin.c 2014-09-05 17:31:11 UTC (rev 3070) +++ trunk/src/plugins/Mpeg3Plugin/Mpeg3Plugin.c 2014-09-07 03:45:50 UTC (rev 3071) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.5 with VMMaker 4.13.7 translated as C source on 20 July 2014 7:58:42 pm */ +/* Smalltalk from Squeak4.5 with VMMaker 4.13.6 translated as C source on 6 September 2014 11:27:10 pm */ /* Automatically generated by - SmartSyntaxPluginCodeGenerator * VMMaker-dtl.348 uuid: 869e87ed-0476-48a8-bca8-fe779633f9ae + SmartSyntaxPluginCodeGenerator * VMMaker-dtl.349 uuid: b3a12120-fb0b-443c-acc5-3f027c879f1a from - Mpeg3Plugin * VMMaker-dtl.348 uuid: 869e87ed-0476-48a8-bca8-fe779633f9ae + Mpeg3Plugin * VMMaker-dtl.349 uuid: b3a12120-fb0b-443c-acc5-3f027c879f1a */ -static char __buildInfo[] = "Mpeg3Plugin * VMMaker-dtl.348 uuid: 869e87ed-0476-48a8-bca8-fe779633f9ae " __DATE__ ; +static char __buildInfo[] = "Mpeg3Plugin * VMMaker-dtl.349 uuid: b3a12120-fb0b-443c-acc5-3f027c879f1a " __DATE__ ; @@ -101,9 +101,9 @@ static sqInt maximumNumberOfFilesToWatch; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "Mpeg3Plugin 20 July 2014 (i)" + "Mpeg3Plugin 6 September 2014 (i)" #else - "Mpeg3Plugin 20 July 2014 (e)" + "Mpeg3Plugin 6 September 2014 (e)" #endif ; static mpeg3_t *mpegFiles[1024+1]; Modified: trunk/src/plugins/RePlugin/RePlugin.c =================================================================== --- trunk/src/plugins/RePlugin/RePlugin.c 2014-09-05 17:31:11 UTC (rev 3070) +++ trunk/src/plugins/RePlugin/RePlugin.c 2014-09-07 03:45:50 UTC (rev 3071) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.5 with VMMaker 4.13.7 translated as C source on 20 July 2014 7:58:33 pm */ +/* Smalltalk from Squeak4.5 with VMMaker 4.13.6 translated as C source on 6 September 2014 11:27:05 pm */ /* Automatically generated by - SmartSyntaxPluginCodeGenerator * VMMaker-dtl.348 uuid: 869e87ed-0476-48a8-bca8-fe779633f9ae + SmartSyntaxPluginCodeGenerator * VMMaker-dtl.349 uuid: b3a12120-fb0b-443c-acc5-3f027c879f1a from - RePlugin * VMMaker-dtl.348 uuid: 869e87ed-0476-48a8-bca8-fe779633f9ae + RePlugin * VMMaker-dtl.349 uuid: b3a12120-fb0b-443c-acc5-3f027c879f1a */ -static char __buildInfo[] = "RePlugin * VMMaker-dtl.348 uuid: 869e87ed-0476-48a8-bca8-fe779633f9ae " __DATE__ ; +static char __buildInfo[] = "RePlugin * VMMaker-dtl.349 uuid: b3a12120-fb0b-443c-acc5-3f027c879f1a " __DATE__ ; @@ -79,9 +79,9 @@ static sqInt matchFlags; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "RePlugin 20 July 2014 (i)" + "RePlugin 6 September 2014 (i)" #else - "RePlugin 20 July 2014 (e)" + "RePlugin 6 September 2014 (e)" #endif ; static int netMemory = 0; Modified: trunk/src/plugins/RomePlugin/RomePlugin.c =================================================================== --- trunk/src/plugins/RomePlugin/RomePlugin.c 2014-09-05 17:31:11 UTC (rev 3070) +++ trunk/src/plugins/RomePlugin/RomePlugin.c 2014-09-07 03:45:50 UTC (rev 3071) @@ -1,6 +1,6 @@ -/* Smalltalk from Squeak4.5 with VMMaker 4.13.7 translated as C source on 20 July 2014 7:58:44 pm */ +/* Smalltalk from Squeak4.5 with VMMaker 4.13.6 translated as C source on 6 September 2014 11:27:10 pm */ /* Automatically generated by - SmartSyntaxPluginCodeGenerator * VMMaker-dtl.348 uuid: 869e87ed-0476-48a8-bca8-fe779633f9ae + SmartSyntaxPluginCodeGenerator * VMMaker-dtl.349 uuid: b3a12120-fb0b-443c-acc5-3f027c879f1a from RomePlugin Rome-Plugin-yo.39 uuid: 4bc7d831-189d-43ce-8b6d-7e96cf20a234 */ @@ -199,9 +199,9 @@ static sqInt maxSurfaceID; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "RomePlugin yo.39 20 July 2014 (i)" + "RomePlugin yo.39 6 September 2014 (i)" #else - "RomePlugin yo.39 20 July 2014 (e)" + "RomePlugin yo.39 6 September 2014 (e)" #endif ; static fn_ioRegisterSurface registerSurfaceFn; Modified: trunk/src/plugins/ScratchPlugin/ScratchPlugin.c =================================================================== --- trunk/src/plugins/ScratchPlugin/ScratchPlugin.c 2014-09-05 17:31:11 UTC (rev 3070) +++ trunk/src/plugins/ScratchPlugin/ScratchPlugin.c 2014-09-07 03:45:50 UTC (rev 3071) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.5 with VMMaker 4.13.7 translated as C source on 20 July 2014 7:58:44 pm */ +/* Smalltalk from Squeak4.5 with VMMaker 4.13.6 translated as C source on 6 September 2014 11:27:11 pm */ /* Automatically generated by - VMPluginCodeGenerator * VMMaker-dtl.348 uuid: 869e87ed-0476-48a8-bca8-fe779633f9ae + VMPluginCodeGenerator * VMMaker-dtl.349 uuid: b3a12120-fb0b-443c-acc5-3f027c879f1a from - ScratchPlugin * VMMaker-dtl.348 uuid: 869e87ed-0476-48a8-bca8-fe779633f9ae + ScratchPlugin * VMMaker-dtl.349 uuid: b3a12120-fb0b-443c-acc5-3f027c879f1a */ -static char __buildInfo[] = "ScratchPlugin * VMMaker-dtl.348 uuid: 869e87ed-0476-48a8-bca8-fe779633f9ae " __DATE__ ; +static char __buildInfo[] = "ScratchPlugin * VMMaker-dtl.349 uuid: b3a12120-fb0b-443c-acc5-3f027c879f1a " __DATE__ ; @@ -89,9 +89,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "ScratchPlugin 20 July 2014 (i)" + "ScratchPlugin 6 September 2014 (i)" #else - "ScratchPlugin 20 July 2014 (e)" + "ScratchPlugin 6 September 2014 (e)" #endif ; Modified: trunk/src/plugins/SecurityPlugin/SecurityPlugin.c =================================================================== --- trunk/src/plugins/SecurityPlugin/SecurityPlugin.c 2014-09-05 17:31:11 UTC (rev 3070) +++ trunk/src/plugins/SecurityPlugin/SecurityPlugin.c 2014-09-07 03:45:50 UTC (rev 3071) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.5 with VMMaker 4.13.7 translated as C source on 20 July 2014 7:58:34 pm */ +/* Smalltalk from Squeak4.5 with VMMaker 4.13.6 translated as C source on 6 September 2014 11:27:05 pm */ /* Automatically generated by - VMPluginCodeGenerator * VMMaker-dtl.348 uuid: 869e87ed-0476-48a8-bca8-fe779633f9ae + VMPluginCodeGenerator * VMMaker-dtl.349 uuid: b3a12120-fb0b-443c-acc5-3f027c879f1a from - SecurityPlugin * VMMaker-dtl.348 uuid: 869e87ed-0476-48a8-bca8-fe779633f9ae + SecurityPlugin * VMMaker-dtl.349 uuid: b3a12120-fb0b-443c-acc5-3f027c879f1a */ -static char __buildInfo[] = "SecurityPlugin * VMMaker-dtl.348 uuid: 869e87ed-0476-48a8-bca8-fe779633f9ae " __DATE__ ; +static char __buildInfo[] = "SecurityPlugin * VMMaker-dtl.349 uuid: b3a12120-fb0b-443c-acc5-3f027c879f1a " __DATE__ ; @@ -80,9 +80,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "SecurityPlugin 20 July 2014 (i)" + "SecurityPlugin 6 September 2014 (i)" #else - "SecurityPlugin 20 July 2014 (e)" + "SecurityPlugin 6 September 2014 (e)" #endif ; Modified: trunk/src/plugins/SerialPlugin/SerialPlugin.c =================================================================== @@ Diff output truncated at 50000 characters. @@

1 0

VM Maker: VMMaker-dtl.350.mcz
by commits＠source.squeak.org 07 Sep '14

07 Sep '14

David T. Lewis uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker-dtl.350.mcz ==================== Summary ==================== Name: VMMaker-dtl.350 Author: dtl Time: 6 September 2014, 11:44:28.389 pm UUID: 2ad132b0-5fb3-4580-b5a8-29af12c3cb81 Ancestors: VMMaker-dtl.349 VMMaker 4.13.6 Fix primitiveBitShift (primitive 17) for sqInt declared 64 bits, as in a VM for 64-bit image format 68002. In image format 68002, bit shift left failed because of return type limited to a 32-bit large integer, but internally the primitive successfully shifted left into a variable declared as a 64 bit sqInt.. The simple fix (implemented here) is to declare the variable as 32 bit unsigned to agree with the 32-bit logic of the existing primitive. Note that permitting a left shift into a 64 bit variable makes sense generally, and the primitive could be recoded to accomodate this for shift left, with the primitive answering positive64BitIntegerFor: rather than positive32BitIntegerFor: in the case of a shift left to allow for the greater range (not implemented in this update). With this update, all KernelTests-Numbers tests pass for the 64-bit image format 68002. =============== Diff against VMMaker-dtl.349 =============== Item was changed: ----- Method: InterpreterPrimitives>>primitiveBitShift (in category 'arithmetic integer primitives') ----- primitiveBitShift | integerReceiver integerArgument shifted | + <var: #shifted type: 'unsigned'> + integerArgument := self popInteger. integerReceiver := self popPos32BitInteger. self successful ifTrue: [ integerArgument >= 0 ifTrue: [ "Left shift -- must fail if we lose bits beyond 32" self success: integerArgument <= 31. shifted := integerReceiver << integerArgument. self success: (shifted >> integerArgument) = integerReceiver. ] ifFalse: [ "Right shift -- OK to lose bits" self success: integerArgument >= -31. shifted := integerReceiver >> (0 - integerArgument). ]. ]. self successful ifTrue: [self push: (self positive32BitIntegerFor: shifted)] ifFalse: [self unPop: 2]! Item was changed: ----- Method: VMMaker class>>versionString (in category 'version testing') ----- versionString "VMMaker versionString" + ^'4.13.6'! - ^'4.13.7'!

1 0

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

06 Sep '14

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.872.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.872 Author: eem Time: 6 September 2014, 11:27:37.276 am UUID: 976a2fb3-3e7e-472c-836f-eb6b91ebe26a Ancestors: VMMaker.oscog-eem.871 And make sure CoInterpreterMT includes its own primitives. =============== Diff against VMMaker.oscog-eem.871 =============== Item was added: + ----- Method: CoInterpreterMT class>>primitivesClass (in category 'translation') ----- + primitivesClass + ^CoInterpreterMT!

1 0

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

06 Sep '14

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.871.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.871 Author: eem Time: 6 September 2014, 11:11:08.033 am UUID: 55559e8e-a9ae-4560-b462-1c3bcbad7852 Ancestors: VMMaker.oscog-eem.870 Base declaration of primitiveTable on vmClass, not implementor of declareCVarsIn: =============== Diff against VMMaker.oscog-eem.870 =============== 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"'. + aCCodeGenerator vmClass + declareInterpreterVersionIn: aCCodeGenerator - self declareInterpreterVersionIn: aCCodeGenerator defaultName: (threaded ifTrue: ['Cog MT'] ifFalse: ['Cog']). aCCodeGenerator var: #heapBase type: #usqInt; var: #statCodeCompactionUsecs type: #usqLong; 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: #primTraceLogIndex type: #'unsigned char'; var: #primTraceLog declareC: 'sqInt primTraceLog[256]'; var: #traceLog declareC: 'sqInt traceLog[TraceBufferSize /* ', TraceBufferSize printString, ' */]'; var: #traceSources type: #'char *' array: TraceSources! Item was changed: ----- Method: CoInterpreterMT class>>declareCVarsIn: (in category 'translation') ----- declareCVarsIn: aCCodeGenerator - "Override to avoid repeating CoInterpreter's declarations and add our own extensions, if any." - aCCodeGenerator addHeaderFile:'"sqAtomicOps.h"'. "For THRLOG" + aCCodeGenerator vmClass + declareInterpreterVersionIn: aCCodeGenerator - self declareInterpreterVersionIn: aCCodeGenerator defaultName: 'Cog MT'. aCCodeGenerator var: #disowningVMThread type: #'CogVMThread *'! Item was changed: ----- Method: StackInterpreter class>>declareCVarsIn: (in category 'translation') ----- declareCVarsIn: aCCodeGenerator + | vmClass | self class == thisContext methodClass ifFalse: [^self]. "Don't duplicate decls in subclasses" + vmClass := aCCodeGenerator vmClass. "Generate primitiveTable etc based on vmClass, not just StackInterpreter" aCCodeGenerator addHeaderFile:'<stddef.h> /* for e.g. alloca */'; addHeaderFile:'<setjmp.h>'; addHeaderFile:'"vmCallback.h"'; addHeaderFile:'"sqMemoryFence.h"'; addHeaderFile:'"dispdbg.h"'. + vmClass declareInterpreterVersionIn: aCCodeGenerator defaultName: 'Stack'. - self declareInterpreterVersionIn: aCCodeGenerator - defaultName: 'Stack'. aCCodeGenerator var: #interpreterProxy type: #'struct VirtualMachine*'. aCCodeGenerator declareVar: #sendTrace type: 'volatile int'; declareVar: #byteCount type: 'unsigned long'. "These need to be pointers or unsigned." self declareC: #(instructionPointer method newMethod) as: #usqInt in: aCCodeGenerator. "These are all pointers; char * because Slang has no support for C pointer arithmetic." self declareC: #(localIP localSP localFP stackPointer framePointer stackLimit stackMemory) as: #'char *' in: aCCodeGenerator. self declareC: #(stackPage overflowedPage) as: #'StackPage *' in: aCCodeGenerator. aCCodeGenerator removeVariable: 'stackPages'. "this is an implicit receiver in the translated code." "This defines bytecodeSetSelector as 0 if MULTIPLEBYTECODESETS is not defined, for the benefit of the interpreter on slow machines." aCCodeGenerator addConstantForBinding: (self bindingOf: #MULTIPLEBYTECODESETS). MULTIPLEBYTECODESETS == false ifTrue: [aCCodeGenerator removeVariable: 'extA'; removeVariable: 'extB'; removeVariable: 'bytecodeSetSelector']. aCCodeGenerator var: #methodCache declareC: 'long methodCache[MethodCacheSize + 1 /* ', (MethodCacheSize + 1) printString, ' */]'. aCCodeGenerator var: #atCache declareC: 'sqInt atCache[AtCacheTotalSize + 1 /* ', (AtCacheTotalSize + 1) printString, ' */]'. aCCodeGenerator var: #primitiveTable + declareC: 'void (*primitiveTable[MaxPrimitiveIndex + 2 /* ', (MaxPrimitiveIndex + 2) printString, ' */])(void) = ', vmClass primitiveTableString. + vmClass primitiveTable do: - declareC: 'void (*primitiveTable[MaxPrimitiveIndex + 2 /* ', (MaxPrimitiveIndex + 2) printString, ' */])(void) = ', self primitiveTableString. - self primitiveTable do: [:symbolOrNot| (symbolOrNot isSymbol and: [symbolOrNot ~~ #primitiveFail]) ifTrue: [(aCCodeGenerator methodNamed: symbolOrNot) ifNotNil: [:tMethod| tMethod returnType: #void]]]. + vmClass objectMemoryClass hasSpurMemoryManagerAPI - self objectMemoryClass hasSpurMemoryManagerAPI ifTrue: [aCCodeGenerator var: #primitiveAccessorDepthTable type: 'signed char' sizeString: 'MaxPrimitiveIndex + 2 /* ', (MaxPrimitiveIndex + 2) printString, ' */' + array: vmClass primitiveAccessorDepthTable] - array: self primitiveAccessorDepthTable] ifFalse: [aCCodeGenerator removeVariable: #primitiveAccessorDepthTable]. aCCodeGenerator var: #primitiveFunctionPointer declareC: 'void (*primitiveFunctionPointer)()'. aCCodeGenerator var: #externalPrimitiveTable declareC: 'void (*externalPrimitiveTable[MaxExternalPrimitiveTableSize + 1 /* ', (MaxExternalPrimitiveTableSize + 1) printString, ' */])(void)'. aCCodeGenerator var: #showSurfaceFn type: #'void *'. aCCodeGenerator var: #jmpBuf declareC: 'jmp_buf jmpBuf[MaxJumpBuf + 1 /* ', (MaxJumpBuf + 1) printString, ' */]'. aCCodeGenerator var: #suspendedCallbacks declareC: 'usqInt suspendedCallbacks[MaxJumpBuf + 1 /* ', (MaxJumpBuf + 1) printString, ' */]'. aCCodeGenerator var: #suspendedMethods declareC: 'usqInt suspendedMethods[MaxJumpBuf + 1 /* ', (MaxJumpBuf + 1) printString, ' */]'. aCCodeGenerator var: #interruptCheckChain declareC: 'void (*interruptCheckChain)(void) = 0'. aCCodeGenerator var: #breakSelector type: #'char *'; var: #breakSelectorLength declareC: 'sqInt breakSelectorLength = -1'. self declareCAsUSqLong: #(nextPollUsecs nextWakeupUsecs longRunningPrimitiveGCUsecs longRunningPrimitiveStartUsecs longRunningPrimitiveStopUsecs "these are high-frequency enough that they're overflowing quite quickly on modern hardware" statProcessSwitch statIOProcessEvents statForceInterruptCheck statCheckForEvents statStackOverflow statStackPageDivorce) in: aCCodeGenerator. aCCodeGenerator var: #nextProfileTick type: #sqLong!

1 0

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

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

Vm-dev September 2014