Vm-dev July 2014

vm-dev@lists.squeakfoundation.org

22 participants
157 discussions

Re: [Vm-dev] VM Maker: VMMaker.oscog-eem.833.mcz
by Clément Bera 25 Jul '14

25 Jul '14

2014-07-24 11:35 GMT+02:00 <commits(a)source.squeak.org>: > > Eliot Miranda uploaded a new version of VMMaker to project VM Maker: > http://source.squeak.org/VMMaker/VMMaker.oscog-eem.833.mcz > > ==================== Summary ==================== > > Name: VMMaker.oscog-eem.833 > Author: eem > Time: 23 July 2014, 11:34:44.69 pm > UUID: ca999c15-a8a5-449e-82b8-8b9d683b3e1b > Ancestors: VMMaker.oscog-eem.832 > > Start adding the SistaV1 bytecode set to the Sista VMs. > Yeeeessss !!!!! I can't wait to see that. Btw, are you really committing this version at 3am ? > > Make Slang provide a comprehensible error message when > certain bytecodes are as-yet-unimplemented instead of > crashing horribly deep in interpreter dispatch inlining. > > Nuke a couple of the obsolete VMMaker subclasses. > > =============== Diff against VMMaker.oscog-eem.832 =============== > > Item was added: > + ----- Method: CCodeGenerator>>abortBlock (in category 'accessing') ----- > + abortBlock > + ^vmMaker ifNotNil: [:vmm| vmm abortBlock]! > > Item was added: > + ----- Method: Cogit > class>>initializeBytecodeTableForSqueakV3PlusClosuresSistaV1Hybrid (in > category 'class initialization') ----- > + initializeBytecodeTableForSqueakV3PlusClosuresSistaV1Hybrid > + "SimpleStackBasedCogit > initializeBytecodeTableForSqueakV3PlusClosuresSistaV1Hybrid" > + "StackToRegisterMappingCogit > initializeBytecodeTableForSqueakV3PlusClosuresSistaV1Hybrid" > + > + | v3Table v1Table | > + "N.B. Must do it backwards to evaluate > AltBlockCreationBytecodeSize & BlockCreationBytecodeSize correctly." > + self initializeBytecodeTableForSistaV1. > + v1Table := generatorTable. > + AltBlockCreationBytecodeSize := BlockCreationBytecodeSize. > + self initializeBytecodeTableForSqueakV3PlusClosures. > + v3Table := generatorTable. > + generatorTable := CArrayAccessor on: v3Table object, v1Table > object! > > Item was removed: > - MacOSPowerPCOS9VMMaker subclass: #MacOSPowerPCOS9BrowserVMMaker > - instanceVariableNames: '' > - classVariableNames: '' > - poolDictionaries: '' > - category: 'VMMaker-Building'! > - > - !MacOSPowerPCOS9BrowserVMMaker commentStamp: 'tpr 5/5/2003 12:26' prior: > 0! > - A Special subclass of VMMaker for building MAc OS-9 browser-plugin vms! > > Item was removed: > - ----- Method: MacOSPowerPCOS9BrowserVMMaker > class>>isActiveVMMakerClassFor: (in category 'initialisation') ----- > - isActiveVMMakerClassFor: platformName > - ^false! > > Item was removed: > - ----- Method: MacOSPowerPCOS9BrowserVMMaker>>initialize (in category > 'initialize') ----- > - initialize > - super initialize. > - forBrowser := true! > > Item was removed: > - VMMaker subclass: #MacOSPowerPCOS9VMMaker > - instanceVariableNames: '' > - classVariableNames: '' > - poolDictionaries: '' > - category: 'VMMaker-Building'! > - > - !MacOSPowerPCOS9VMMaker commentStamp: 'tpr 5/5/2003 12:27' prior: 0! > - A VMMaker subclass to suit Mac OS! > > Item was removed: > - ----- Method: MacOSPowerPCOS9VMMaker class>>isActiveVMMakerClassFor: (in > category 'initialisation') ----- > - isActiveVMMakerClassFor: platformName > - "Does this class claim to be that properly active subclass of > VMMaker for this platform?" > - > - ^platformName = 'Mac OS'" and: [Smalltalk platformSubtype = > 'PowerPC'] <- this used to be used but prevents any attempt to do the > crossplatform generation thang. How can we handle that bit properly?"! > > Item was removed: > - ----- Method: MacOSPowerPCOS9VMMaker>>createCodeGenerator (in category > 'initialize') ----- > - createCodeGenerator > - "Set up a CCodeGenerator for this VMMaker - Mac OS uses the global > struct and local def of the > - structure. The global struct/loca def regime appears to be about > 10% faster than the default > - regime for Smalltalk-intensive macro benchmarks for both the > Intel and gcc 4.0 compiler on x86. > - eem 12/10/2008 14:34 2.16 GHz Intel Core Duo MacBook Pro Mac OS X > 10.4.11" > - ^CCodeGeneratorGlobalStructure new > - vmMaker: self; > - structDefDefine: '1'; > - "structDefDefine: 'defined(PPC) || defined(_POWER) || > defined(__powerpc__) || defined(__ppc__)';" > - logger: logger; > - yourself! > > Item was changed: > ----- Method: RiscOSVMMaker>>createCodeGenerator (in category > 'initialize') ----- > createCodeGenerator > "set up a CCodeGenerator for this VMMaker - RiscOS uses the global > struct and no local def of the structure because of the global register > trickery" > ^CCodeGeneratorGlobalStructure new > vmMaker: self; > logger: logger; > + options: optionsDictionary; > yourself! > > Item was changed: > ----- Method: StackInterpreter class>>initializeBytecodeTable (in > category 'initialization') ----- > initializeBytecodeTable > "StackInterpreter initializeBytecodeTable" > > + (initializationOptions at: #bytecodeTableInitializer ifAbsent: > nil) ifNotNil: > + [:initalizer| ^self perform: initalizer]. > + > NewspeakVM ifTrue: > [^MULTIPLEBYTECODESETS > ifTrue: [self > initializeBytecodeTableForNewspeakV3PlusClosuresNewspeakV4Hybrid] > ifFalse: [self > initializeBytecodeTableForNewspeakV3PlusClosures]]. > > ^self initializeBytecodeTableForSqueakV3PlusClosures! > > Item was added: > + ----- Method: StackInterpreter > class>>initializeBytecodeTableForSqueakV3PlusClosuresSistaV1Hybrid (in > category 'initialization') ----- > + initializeBytecodeTableForSqueakV3PlusClosuresSistaV1Hybrid > + "StackInterpreter > initializeBytecodeTableForSqueakV3PlusClosuresSistaV1Hybrid" > + > + | v3Table v1Table | > + self initializeBytecodeTableForSistaV1. > + v1Table := BytecodeTable. > + AltBytecodeEncoderClassName := BytecodeEncoderClassName. > + AltLongStoreBytecode := LongStoreBytecode. > + self initializeBytecodeTableForSqueakV3PlusClosures. > + v3Table := BytecodeTable. > + BytecodeTable := v3Table, v1Table! > > Item was added: > + ----- Method: StackToRegisterMappingCogit > class>>initializeBytecodeTableForSqueakV3PlusClosuresSistaV1Hybrid (in > category 'class initialization') ----- > + initializeBytecodeTableForSqueakV3PlusClosuresSistaV1Hybrid > + "StackToRegisterMappingCogit > initializeBytecodeTableForSqueakV3PlusClosuresSistaV1Hybrid" > + > + super initializeBytecodeTableForSqueakV3PlusClosuresSistaV1Hybrid. > + isPushNilFunction := #squeakV3orSistaV1:Is:Push:Nil:. > + pushNilSizeFunction := #squeakV3orSistaV1PushNilSize:! > > Item was removed: > - ----- Method: TMethod>>buildCaseStmt: (in category 'transformations') > ----- > - buildCaseStmt: aSendNode > - "Build a case statement node for the given send of dispatchOn:in:." > - "Note: the first argument is the variable to be dispatched on. The > second argument is a constant node holding an array of unary selectors, > which will be turned into sends to self." > - > - ((aSendNode args size >= 2) and: > - [aSendNode args second isConstant and: > - [aSendNode args second value class = Array]]) ifFalse: [ > - self error: 'wrong node structure for a case statement'. > - ]. > - > - ^TCaseStmtNode new > - setExpression: aSendNode args first > - selectors: aSendNode args second value > - arguments: (aSendNode args copyFrom: 3 to: aSendNode args > size)! > > Item was added: > + ----- Method: TMethod>>buildCaseStmt:in: (in category 'transformations') > ----- > + buildCaseStmt: aSendNode in: aCodeGen > + "Build a case statement node for the given send of dispatchOn:in:." > + "Note: the first argument is the variable to be dispatched on. The > second argument is a constant node holding an array of unary selectors, > which will be turned into sends to self." > + > + | unimplemented errorMessage | > + ((aSendNode args size >= 2) and: > + [aSendNode args second isConstant and: > + [aSendNode args second value class = Array]]) ifFalse: > + [self error: 'wrong node structure for a case statement']. > + > + unimplemented := aSendNode args second value reject: [:s| self > definingClass includesSelector: s]. > + unimplemented isEmpty ifFalse: > + [errorMessage := 'The following selectors are > unimplemented: ', > + (String > streamContents: [:s| unimplemented do: [:sel| s crtab; store: sel]]). > + (self confirm: errorMessage > + orCancel: aCodeGen abortBlock) ifFalse: > + [self halt]]. > + > + ^TCaseStmtNode new > + setExpression: aSendNode args first > + selectors: aSendNode args second value > + arguments: (aSendNode args copyFrom: 3 to: aSendNode args > size)! > > Item was changed: > ----- Method: TMethod>>prepareMethodIn: (in category 'transformations') > ----- > prepareMethodIn: aCodeGen > "Record sends of builtin operators, map sends of the special > selector dispatchOn:in: > with case statement nodes, and map sends of caseOf:[otherwise:] > to switch statements. > As a hack also update the types of variables introduced to > implement cascades correctly. > This has to be done at the same time as this is done, so why not > piggy back here?" > extraVariableNumber ifNotNil: > [declarations keysAndValuesDo: > [:varName :decl| > decl isBlock ifTrue: > [self assert: ((varName beginsWith: > 'cascade') and: [varName last isDigit]). > locals add: varName. > self declarationAt: varName > put: (decl value: self value: > aCodeGen), ' ', varName]]]. > aCodeGen > pushScope: declarations > while:"N.B. nodesWithParentsDo: is bottom-up, hence > replacement is destructive and conserved." > [parseTree nodesWithParentsDo: > [:node :parent| > node isSend ifTrue: > [(aCodeGen isBuiltinSelector: node > selector) > ifTrue: > [node > isBuiltinOperator: true. > "If a to:by:do:'s > limit has side-effects, declare the limit variable, otherwise delete it > from the args" > (node selector = > #to:by:do: > and: [node args > size = 4]) ifTrue: > [| > limitExpr | > limitExpr > := node args first. > > (limitExpr anySatisfy: > > [:subNode| > > subNode isSend > > and: [(aCodeGen isBuiltinSelector: subNode selector) not > > and: [(subNode isStructSendIn: aCodeGen) not]]]) > > ifTrue: [locals add: node args last name] > > ifFalse: > > [node arguments: node args allButLast]]] > ifFalse: > [(CaseStatements > includes: node selector) ifTrue: > + [parent > replaceNodesIn: (Dictionary newFromPairs: { node. self buildCaseStmt: node > in: aCodeGen})]. > - [parent > replaceNodesIn: (Dictionary newFromPairs: { node. self buildCaseStmt: > node})]. > (#(caseOf: > #caseOf:otherwise:) includes: node selector) ifTrue: > [parent > replaceNodesIn: (Dictionary newFromPairs: { node. self buildSwitchStmt: > node parent: parent })]]]]]! > > Item was changed: > ----- Method: UnixVMMaker>>createCodeGenerator (in category > 'initialisation') ----- > createCodeGenerator > > ^CCodeGeneratorGlobalStructure new > vmMaker: self; > logger: logger; > + options: optionsDictionary; > yourself! > > Item was changed: > Object subclass: #VMMaker > + instanceVariableNames: 'inline forBrowser allPlugins > internalPlugins externalPlugins platformName sourceDirName > platformRootDirName logger interpreterClassName cogitClassName is64BitVM > optionsDictionary abortBlock' > - instanceVariableNames: 'inline forBrowser allPlugins > internalPlugins externalPlugins platformName sourceDirName > platformRootDirName logger interpreterClassName cogitClassName is64BitVM > optionsDictionary' > 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>>generateSqueakCogSistaVM (in category > 'configurations') ----- > generateSqueakCogSistaVM > "No primitives since we can use those for the Cog VM" > ^VMMaker > generate: CoInterpreter > and: SistaStackToRegisterMappingCogit > + with: #( MULTIPLEBYTECODESETS true > + bytecodeTableInitializer > initializeBytecodeTableForSqueakV3PlusClosuresSistaV1Hybrid) > to: (FileDirectory default pathFromURI: self sourceTree, > '/sistasrc') > platformDir: (FileDirectory default pathFromURI: self > sourceTree, '/platforms') > including: #()! > > Item was changed: > ----- Method: VMMaker class>>generateSqueakSpurCogSistaVM (in category > 'configurations') ----- > generateSqueakSpurCogSistaVM > "No primitives since we can use those for the Cog VM" > ^VMMaker > generate: CoInterpreter > and: SistaStackToRegisterMappingCogit > + with: #( ObjectMemory Spur32BitCoMemoryManager > + MULTIPLEBYTECODESETS true > + bytecodeTableInitializer > initializeBytecodeTableForSqueakV3PlusClosuresSistaV1Hybrid) > - with: #(ObjectMemory Spur32BitCoMemoryManager) > to: (FileDirectory default pathFromURI: self sourceTree, > '/spursistasrc') > platformDir: (FileDirectory default pathFromURI: self > sourceTree, '/platforms') > including:#()! > > Item was added: > + ----- Method: VMMaker>>abortBlock (in category 'accessing') ----- > + abortBlock > + ^abortBlock! > > Item was changed: > ----- Method: VMMaker>>generateEntire (in category 'generate sources') > ----- > generateEntire > "Generate the interp, internal plugins and exports as well as the > external plugins. > If this comes from a generator, log it for convenience." > + abortBlock := [^self]. > self configurationGeneratorNameOrNil ifNotNil: > [:generator| > logger cr; nextPutAll: (generator selector > copyReplaceAll: 'generate' with: ''). > interpreterClassName ifNotNil: > [logger space; nextPutAll: (CCodeGenerator > shortMonticelloDescriptionForClass: (Smalltalk classNamed: > interpreterClassName))]. > logger cr; flush]. > self generateMainVM. > self generateExternalPlugins! > > Item was changed: > ----- Method: Win32VMMaker>>createCodeGenerator (in category > 'initialize') ----- > createCodeGenerator > "Set up a CCodeGenerator for this VMMaker - On Windows we use the > gcc 2.95.x compiler > which does better without the global struct." > ^CCodeGeneratorGlobalStructure new > vmMaker: self; > structDefDefine: '0'; > "structDefDefine: 'defined(PPC) || defined(_POWER) || > defined(__powerpc__) || defined(__ppc__)';" > logger: logger; > + options: optionsDictionary; > yourself! > >

2 1

VM Maker: VMMaker.oscog-eem.834.mcz
by commits＠source.squeak.org 25 Jul '14

25 Jul '14

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.834.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.834 Author: eem Time: 25 July 2014, 8:00:25.579 am UUID: 56c11930-453f-42ad-bc3f-d21b2ff16c86 Ancestors: VMMaker.oscog-eem.833 Sista: Implement all of the missing SistaV1 bytecodes in the StackInterpreter except the class trap bytecode. Define the class trap selector's SOA index. Make the undefined case error message more informative and write it to the transcript. =============== Diff against VMMaker.oscog-eem.833 =============== Item was changed: ----- Method: ObjectMemory class>>initializeSpecialObjectIndices (in category 'initialization') ----- initializeSpecialObjectIndices "Initialize indices into specialObjects array." NilObject := 0. FalseObject := 1. TrueObject := 2. SchedulerAssociation := 3. ClassBitmap := 4. ClassSmallInteger := 5. ClassByteString := ClassString := 6. "N.B. Actually class ByteString" ClassArray := 7. "SmalltalkDictionary := 8." "Do not delete!!" ClassFloat := 9. ClassMethodContext := 10. ClassBlockContext := 11. ClassPoint := 12. ClassLargePositiveInteger := 13. TheDisplay := 14. ClassMessage := 15. "ClassCompiledMethod := 16. unused by the VM" TheLowSpaceSemaphore := 17. ClassSemaphore := 18. ClassCharacter := 19. SelectorDoesNotUnderstand := 20. SelectorCannotReturn := 21. ProcessSignalingLowSpace := 22. "was TheInputSemaphore" SpecialSelectors := 23. CharacterTable := 24. SelectorMustBeBoolean := 25. ClassByteArray := 26. "ClassProcess := 27. unused" CompactClasses := 28. TheTimerSemaphore := 29. TheInterruptSemaphore := 30. SelectorCannotInterpret := 34. "Was MethodContextProto := 35." ClassBlockClosure := 36. "Was BlockContextProto := 37." ExternalObjectsArray := 38. ClassMutex := 39. "Was: ClassTranslatedMethod := 40." ProcessInExternalCodeTag := 40. TheFinalizationSemaphore := 41. ClassLargeNegativeInteger := 42. ClassExternalAddress := 43. ClassExternalStructure := 44. ClassExternalData := 45. ClassExternalFunction := 46. ClassExternalLibrary := 47. SelectorAboutToReturn := 48. SelectorRunWithIn := 49. SelectorAttemptToAssign := 50. "PrimErrTableIndex := 51. in VMClass class>>initializePrimitiveErrorCodes" ClassAlien := 52. SelectorInvokeCallback := 53. ClassUnsafeAlien := 54. ClassWeakFinalizer := 55. ForeignCallbackProcess := 56. SelectorUnknownBytecode := 57. + SelectorCounterTripped := 58. + SelectorClassTrap := 59 - SelectorCounterTripped := 58 ! Item was changed: ----- Method: SpurMemoryManager class>>initializeSpecialObjectIndices (in category 'class initialization') ----- initializeSpecialObjectIndices "Initialize indices into specialObjects array." NilObject := 0. FalseObject := 1. TrueObject := 2. SchedulerAssociation := 3. ClassBitmap := 4. ClassSmallInteger := 5. ClassByteString := ClassString := 6. "N.B. Actually class ByteString" ClassArray := 7. "SmalltalkDictionary := 8." "Do not delete!!" ClassFloat := 9. ClassMethodContext := 10. "ClassBlockContext := 11. unused by the VM" ClassPoint := 12. ClassLargePositiveInteger := 13. TheDisplay := 14. ClassMessage := 15. "ClassCompiledMethod := 16. unused by the VM" TheLowSpaceSemaphore := 17. ClassSemaphore := 18. ClassCharacter := 19. SelectorDoesNotUnderstand := 20. SelectorCannotReturn := 21. ProcessSignalingLowSpace := 22. "was TheInputSemaphore" SpecialSelectors := 23. CharacterTable := nil. "Must be unused by the VM" SelectorMustBeBoolean := 25. ClassByteArray := 26. "ClassProcess := 27. unused" CompactClasses := 28. TheTimerSemaphore := 29. TheInterruptSemaphore := 30. SelectorCannotInterpret := 34. "Was MethodContextProto := 35." ClassBlockClosure := 36. "Was BlockContextProto := 37." ExternalObjectsArray := 38. ClassMutex := 39. "Was: ClassTranslatedMethod := 40." ProcessInExternalCodeTag := 40. TheFinalizationSemaphore := 41. ClassLargeNegativeInteger := 42. ClassExternalAddress := 43. ClassExternalStructure := 44. ClassExternalData := 45. ClassExternalFunction := 46. ClassExternalLibrary := 47. SelectorAboutToReturn := 48. SelectorRunWithIn := 49. SelectorAttemptToAssign := 50. "PrimErrTableIndex := 51. in VMClass class>>initializePrimitiveErrorCodes" ClassAlien := 52. SelectorInvokeCallback := 53. ClassUnsafeAlien := 54. ClassWeakFinalizer := 55. ForeignCallbackProcess := 56. SelectorUnknownBytecode := 57. + SelectorCounterTripped := 58. + SelectorClassTrap := 59! - SelectorCounterTripped := 58! Item was changed: ----- Method: StackInterpreter class>>initializeBytecodeTableForSistaV1 (in category 'initialization') ----- initializeBytecodeTableForSistaV1 "See e.g. the cass comment for EncoderForSistaV1" "StackInterpreter initializeBytecodeTableForSistaV1" "Note: This table will be used to generate a C switch statement." BytecodeTable := Array new: 256. self table: BytecodeTable from: #( "1 byte bytecodes" ( 0 15 pushReceiverVariableBytecode) ( 16 31 pushLiteralVariable16CasesBytecode) ( 32 63 pushLiteralConstantBytecode) ( 64 75 pushTemporaryVariableBytecode) ( 76 pushReceiverBytecode) ( 77 pushConstantTrueBytecode) ( 78 pushConstantFalseBytecode) ( 79 pushConstantNilBytecode) ( 80 pushConstantZeroBytecode) ( 81 pushConstantOneBytecode) ( 82 extPushPseudoVariable) ( 83 duplicateTopBytecode) ( 84 87 unknownBytecode) ( 88 returnReceiver) ( 89 returnTrue) ( 90 returnFalse) ( 91 returnNil) ( 92 returnTopFromMethod) ( 93 returnNilFromBlock) ( 94 returnTopFromBlock) + ( 95 extNopBytecode) - ( 95 extNop) ( 96 bytecodePrimAdd) ( 97 bytecodePrimSubtract) ( 98 bytecodePrimLessThanSistaV1) "for booleanCheatSistaV1:" ( 99 bytecodePrimGreaterThanSistaV1) "for booleanCheatSistaV1:" (100 bytecodePrimLessOrEqualSistaV1) "for booleanCheatSistaV1:" (101 bytecodePrimGreaterOrEqualSistaV1) "for booleanCheatSistaV1:" (102 bytecodePrimEqualSistaV1) "for booleanCheatSistaV1:" (103 bytecodePrimNotEqualSistaV1) "for booleanCheatSistaV1:" (104 bytecodePrimMultiply) (105 bytecodePrimDivide) (106 bytecodePrimMod) (107 bytecodePrimMakePoint) (108 bytecodePrimBitShift) (109 bytecodePrimDiv) (110 bytecodePrimBitAnd) (111 bytecodePrimBitOr) (112 bytecodePrimAt) (113 bytecodePrimAtPut) (114 bytecodePrimSize) (115 bytecodePrimNext) "i.e. a 0 arg special selector" (116 bytecodePrimNextPut) "i.e. a 1 arg special selector" (117 bytecodePrimAtEnd) (118 bytecodePrimIdenticalSistaV1) "for booleanCheatSistaV1:" (119 bytecodePrimClass) (120 bytecodePrimSpecialSelector24) "was blockCopy:" (121 bytecodePrimValue) (122 bytecodePrimValueWithArg) (123 bytecodePrimDo) "i.e. a 1 arg special selector" (124 bytecodePrimNew) "i.e. a 0 arg special selector" (125 bytecodePrimNewWithArg) "i.e. a 1 arg special selector" (126 bytecodePrimPointX) "i.e. a 0 arg special selector" (127 bytecodePrimPointY) "i.e. a 0 arg special selector" (128 143 sendLiteralSelector0ArgsBytecode) (144 159 sendLiteralSelector1ArgBytecode) (160 175 sendLiteralSelector2ArgsBytecode) (176 183 shortUnconditionalJump) (184 191 shortConditionalJumpTrue) (192 199 shortConditionalJumpFalse) (200 207 storeAndPopReceiverVariableBytecode) (208 215 storeAndPopTemporaryVariableBytecode) (216 popStackBytecode) (217 223 unknownBytecode) "2 byte bytecodes" (224 extABytecode) (225 extBBytecode) (226 extPushReceiverVariableBytecode) (227 extPushLiteralVariableBytecode) (228 extPushLiteralBytecode) (229 longPushTemporaryVariableBytecode) (230 pushClosureTempsBytecode) (231 pushNewArrayBytecode) (232 extPushIntegerBytecode) (233 extPushCharacterBytecode) (234 extSendBytecode) (235 extSendSuperBytecode) (236 extTrapOnBehaviorsBytecode) (237 extUnconditionalJump) (238 extJumpIfTrue) (239 extJumpIfFalse) (240 extStoreAndPopReceiverVariableBytecode) (241 extStoreAndPopLiteralVariableBytecode) (242 longStoreAndPopTemporaryVariableBytecode) (243 extStoreReceiverVariableBytecode) (244 extStoreLiteralVariableBytecode) (245 longStoreTemporaryVariableBytecode) (246 247 unknownBytecode) "3 byte bytecodes" (248 callPrimitiveBytecode) (249 unknownBytecode) "reserved for Push Float" (250 extPushClosureBytecode) (251 pushRemoteTempLongBytecode) (252 storeRemoteTempLongBytecode) (253 storeAndPopRemoteTempLongBytecode) (254 255 unknownBytecode) )! Item was added: + ----- Method: StackInterpreter>>booleanCheatFalseSistaV1 (in category 'utilities') ----- + booleanCheatFalseSistaV1 + "cheat the interpreter out of the pleasure of handling the next bytecode IFF it is a jump-on-boolean. Which it is, often enough when the current bytecode is something like bytecodePrimEqual" + <sharedCodeNamed: 'booleanCheatFalseSistaV1' inCase: #bytecodePrimGreaterThanSistaV1> + | bytecode offset | + + bytecode := self fetchByte. "assume next bytecode is jumpIfFalse (99%)" + self internalPop: 2. + (bytecode < 199 and: [bytecode > 191]) ifTrue: "short jumpIfFalse" + [^self jump: bytecode - 191]. + + bytecode = 239 ifTrue: "long jumpIfFalse" + [offset := self fetchByte. + ^self jump: offset]. + + "not followed by a jumpIfFalse; (un)do instruction fetch and push boolean result" + self cppIf: MULTIPLEBYTECODESETS + ifTrue: [currentBytecode := bytecode + bytecodeSetSelector] + ifFalse: [currentBytecode := bytecode]. + self internalPush: objectMemory falseObject! Item was added: + ----- Method: StackInterpreter>>booleanCheatSistaV1: (in category 'utilities') ----- + booleanCheatSistaV1: cond + "cheat the interpreter out of the pleasure of handling the next bytecode IFF it is a jump-on-boolean. Which it is, often enough when the current bytecode is something like bytecodePrimEqual" + <inline: true> + + cond + ifTrue: [self booleanCheatTrueSistaV1] + ifFalse: [self booleanCheatFalseSistaV1]! Item was added: + ----- Method: StackInterpreter>>booleanCheatTrueSistaV1 (in category 'utilities') ----- + booleanCheatTrueSistaV1 + "cheat the interpreter out of the pleasure of handling the next bytecode IFF it is a jump-on-boolean. Which it is, often enough when the current bytecode is something like bytecodePrimEqual" + <sharedCodeNamed: 'booleanCheatTrueSistaV1' inCase: #bytecodePrimLessThanSistaV1> + | bytecode offset | + + bytecode := self fetchByte. "assume next bytecode is jumpIfFalse (99%)" + self internalPop: 2. + bytecode >= 192 ifTrue: + [bytecode <= 199 ifTrue: "short jumpIfFalse 192 - 199" + [^self fetchNextBytecode]. + bytecode = 239 ifTrue: "long jumpIfFalse" + [self fetchByte. + ^self fetchNextBytecode]. + bytecode = 238 ifTrue: "long jumpIfTrue 238" + [offset := self fetchByte. + ^self jump: offset]]. + + "not followed by a jumpIfFalse; (un)do instruction fetch and push boolean result" + self cppIf: MULTIPLEBYTECODESETS + ifTrue: [currentBytecode := bytecode + bytecodeSetSelector] + ifFalse: [currentBytecode := bytecode]. + self internalPush: objectMemory trueObject! Item was added: + ----- Method: StackInterpreter>>bytecodePrimEqualSistaV1 (in category 'common selector sends') ----- + bytecodePrimEqualSistaV1 + | rcvr arg aBool | + rcvr := self internalStackValue: 1. + arg := self internalStackValue: 0. + (self areIntegers: rcvr and: arg) ifTrue: [^self booleanCheatSistaV1: rcvr = arg]. + + self initPrimCall. + aBool := self primitiveFloatEqual: rcvr toArg: arg. + self successful ifTrue: [^self booleanCheatSistaV1: aBool]. + + messageSelector := self specialSelector: 6. + argumentCount := 1. + self normalSend! Item was added: + ----- Method: StackInterpreter>>bytecodePrimGreaterOrEqualSistaV1 (in category 'common selector sends') ----- + bytecodePrimGreaterOrEqualSistaV1 + | rcvr arg aBool | + rcvr := self internalStackValue: 1. + arg := self internalStackValue: 0. + (self areIntegers: rcvr and: arg) ifTrue: + ["The C code can avoid detagging since tagged integers are still signed. + But this means the simulator must override to do detagging." + ^self cCode: [self booleanCheatSistaV1: rcvr >= arg] + inSmalltalk: [self booleanCheatSistaV1: (objectMemory integerValueOf: rcvr) >= (objectMemory integerValueOf: arg)]]. + + self initPrimCall. + aBool := self primitiveFloatGreaterOrEqual: rcvr toArg: arg. + self successful ifTrue: [^self booleanCheatSistaV1: aBool]. + + messageSelector := self specialSelector: 5. + argumentCount := 1. + self normalSend! Item was added: + ----- Method: StackInterpreter>>bytecodePrimGreaterThanSistaV1 (in category 'common selector sends') ----- + bytecodePrimGreaterThanSistaV1 + | rcvr arg aBool | + rcvr := self internalStackValue: 1. + arg := self internalStackValue: 0. + (self areIntegers: rcvr and: arg) ifTrue: + ["The C code can avoid detagging since tagged integers are still signed. + But this means the simulator must override to do detagging." + ^self cCode: [self booleanCheatSistaV1: rcvr > arg] + inSmalltalk: [self booleanCheatSistaV1: (objectMemory integerValueOf: rcvr) > (objectMemory integerValueOf: arg)]]. + + self initPrimCall. + aBool := self primitiveFloatGreater: rcvr thanArg: arg. + self successful ifTrue: [^self booleanCheatSistaV1: aBool]. + + messageSelector := self specialSelector: 3. + argumentCount := 1. + self normalSend! Item was added: + ----- Method: StackInterpreter>>bytecodePrimIdenticalSistaV1 (in category 'common selector sends') ----- + bytecodePrimIdenticalSistaV1 + | rcvr arg | + rcvr := self internalStackValue: 1. + arg := self internalStackValue: 0. + (objectMemory isOopForwarded: rcvr) ifTrue: + [rcvr := self handleSpecialSelectorSendFaultFor: rcvr]. + (objectMemory isOopForwarded: arg) ifTrue: + [arg := self handleSpecialSelectorSendFaultFor: arg]. + self booleanCheatSistaV1: rcvr = arg! Item was added: + ----- Method: StackInterpreter>>bytecodePrimLessOrEqualSistaV1 (in category 'common selector sends') ----- + bytecodePrimLessOrEqualSistaV1 + | rcvr arg aBool | + rcvr := self internalStackValue: 1. + arg := self internalStackValue: 0. + (self areIntegers: rcvr and: arg) ifTrue: + ["The C code can avoid detagging since tagged integers are still signed. + But this means the simulator must override to do detagging." + ^self cCode: [self booleanCheatSistaV1: rcvr <= arg] + inSmalltalk: [self booleanCheatSistaV1: (objectMemory integerValueOf: rcvr) <= (objectMemory integerValueOf: arg)]]. + + self initPrimCall. + aBool := self primitiveFloatLessOrEqual: rcvr toArg: arg. + self successful ifTrue: [^self booleanCheatSistaV1: aBool]. + + messageSelector := self specialSelector: 4. + argumentCount := 1. + self normalSend! Item was added: + ----- Method: StackInterpreter>>bytecodePrimLessThanSistaV1 (in category 'common selector sends') ----- + bytecodePrimLessThanSistaV1 + | rcvr arg aBool | + rcvr := self internalStackValue: 1. + arg := self internalStackValue: 0. + (self areIntegers: rcvr and: arg) ifTrue: + ["The C code can avoid detagging since tagged integers are still signed. + But this means the simulator must override to do detagging." + ^self cCode: [self booleanCheatSistaV1: rcvr < arg] + inSmalltalk: [self booleanCheatSistaV1: (objectMemory integerValueOf: rcvr) < (objectMemory integerValueOf: arg)]]. + + self initPrimCall. + aBool := self primitiveFloatLess: rcvr thanArg: arg. + self successful ifTrue: [^ self booleanCheatSistaV1: aBool]. + + messageSelector := self specialSelector: 2. + argumentCount := 1. + self normalSend! Item was added: + ----- Method: StackInterpreter>>bytecodePrimNotEqualSistaV1 (in category 'common selector sends') ----- + bytecodePrimNotEqualSistaV1 + | rcvr arg aBool | + rcvr := self internalStackValue: 1. + arg := self internalStackValue: 0. + (self areIntegers: rcvr and: arg) ifTrue: [^self booleanCheatSistaV1: rcvr ~= arg]. + + self initPrimCall. + aBool := self primitiveFloatEqual: rcvr toArg: arg. + self successful ifTrue: [^self booleanCheatSistaV1: aBool not]. + + messageSelector := self specialSelector: 7. + argumentCount := 1. + self normalSend! Item was changed: ----- Method: StackInterpreter>>extNopBytecode (in category 'miscellaneous bytecodes') ----- extNopBytecode + "SistaV1 94 01011111 Nop" + "NewspeakV4: 221 11011101 Nop" + self fetchNextBytecode. - "221 11011101 Nop" extA := extB := 0! Item was added: + ----- Method: StackInterpreter>>extPushCharacterBytecode (in category 'stack bytecodes') ----- + extPushCharacterBytecode + "SistaV1: * 233 11101001 iiiiiiii Push Character #iiiiiiii (+ Extend B * 256)" + | value | + value := self fetchByte + (extB << 8). + self fetchNextBytecode. + self internalPush: (objectMemory characterObjectOf: value). + extB := 0! Item was added: + ----- Method: StackInterpreter>>extPushPseudoVariable (in category 'stack bytecodes') ----- + extPushPseudoVariable + "SistaV1: * 82 01010010 Push thisContext, (then e.g. Extend 1 = push thisProcess)" + extA + caseOf: { + [0] -> [self pushActiveContextBytecode]. + [1] -> [self internalPush: self activeProcess] } + otherwise: + [self respondToUnknownBytecode]. + self fetchNextBytecode. + extA := 0! Item was added: + ----- Method: StackInterpreter>>pushClosureTempsBytecode (in category 'stack bytecodes') ----- + pushClosureTempsBytecode + "SistaV1: 230 11100110 iiiiiiii PushNClosureTemps iiiiiiii" + | nTemps | + nTemps := self fetchByte. + self fetchNextBytecode. + 1 to: nTemps do: + [:i| + self internalPush: objectMemory nilObject]! Item was added: + ----- Method: StackInterpreter>>returnNilFromBlock (in category 'return bytecodes') ----- + returnNilFromBlock + "Return nil to the caller of the current block activation." + localReturnValue := objectMemory nilObject. + self commonCallerReturn! Item was changed: ----- Method: StackInterpreter>>returnTopFromBlock (in category 'return bytecodes') ----- returnTopFromBlock + "Return top-of-stack to the caller of the current block activation." - "Return to the caller of the current block activation." localReturnValue := self internalStackTop. self commonCallerReturn! Item was changed: ----- Method: TMethod>>buildCaseStmt:in: (in category 'transformations') ----- buildCaseStmt: aSendNode in: aCodeGen "Build a case statement node for the given send of dispatchOn:in:." "Note: the first argument is the variable to be dispatched on. The second argument is a constant node holding an array of unary selectors, which will be turned into sends to self." | unimplemented errorMessage | ((aSendNode args size >= 2) and: [aSendNode args second isConstant and: [aSendNode args second value class = Array]]) ifFalse: [self error: 'wrong node structure for a case statement']. unimplemented := aSendNode args second value reject: [:s| self definingClass includesSelector: s]. unimplemented isEmpty ifFalse: + [errorMessage := 'The following selectors in case statement "', (aSendNode printString copyUpTo: $#), '..." are unimplemented: ', - [errorMessage := 'The following selectors are unimplemented: ', (String streamContents: [:s| unimplemented do: [:sel| s crtab; store: sel]]). + aCodeGen logger nextPutAll: errorMessage; cr; flush. (self confirm: errorMessage orCancel: aCodeGen abortBlock) ifFalse: [self halt]]. ^TCaseStmtNode new setExpression: aSendNode args first selectors: aSendNode args second value arguments: (aSendNode args copyFrom: 3 to: aSendNode args size)! Item was changed: SharedPool subclass: #VMObjectIndices instanceVariableNames: '' + classVariableNames: 'ActiveProcessIndex CharacterTable CharacterValueIndex ClassAlien ClassArray ClassBitmap ClassBlockClosure ClassBlockContext ClassByteArray ClassByteString ClassCharacter ClassExternalAddress ClassExternalData ClassExternalFunction ClassExternalLibrary ClassExternalStructure ClassFloat ClassLargeNegativeInteger ClassLargePositiveInteger ClassMessage ClassMethodContext ClassMutex ClassPoint ClassSemaphore ClassSmallInteger ClassString ClassUnsafeAlien ClassWeakFinalizer ClosureCopiedValuesIndex ClosureFirstCopiedValueIndex ClosureIndex ClosureNumArgsIndex ClosureOuterContextIndex ClosureStartPCIndex CompactClasses ConstMinusOne ConstOne ConstTwo ConstZero ExcessSignalsIndex ExternalObjectsArray FalseObject FirstLinkIndex ForeignCallbackProcess HeaderIndex InstanceSpecificationIndex InstructionPointerIndex KeyIndex LastLinkIndex LiteralStart MessageArgumentsIndex MessageLookupClassIndex MessageSelectorIndex MethodArrayIndex MethodDictionaryIndex MethodIndex MyListIndex NextLinkIndex NilObject PrimErrTableIndex PriorityIndex ProcessInExternalCodeTag ProcessListsIndex ProcessSignalingLowSpace ReceiverIndex SchedulerAssociation SelectorAboutToReturn SelectorAttemptToAssign SelectorCannotInterpret SelectorCannotReturn SelectorClassTrap SelectorCounterTripped SelectorDoesNotUnderstand SelectorInvokeCallback SelectorMustBeBoolean SelectorRunWithIn SelectorStart SelectorUnknownBytecode SenderIndex SpecialSelectors StackPointerIndex StreamArrayIndex StreamIndexIndex StreamReadLimitIndex StreamWriteLimitIndex SuperclassIndex SuspendedContextIndex TheDisplay TheFinalizationSemaphore TheInputSemaphore TheInterruptSemaphore TheLowSpaceSemaphore TheTimerSemaphore TrueObject ValueIndex XIndex YIndex' - classVariableNames: 'ActiveProcessIndex CharacterTable CharacterValueIndex ClassAlien ClassArray ClassBitmap ClassBlockClosure ClassBlockContext ClassByteArray ClassByteString ClassCharacter ClassExternalAddress ClassExternalData ClassExternalFunction ClassExternalLibrary ClassExternalStructure ClassFloat ClassLargeNegativeInteger ClassLargePositiveInteger ClassMessage ClassMethodContext ClassMutex ClassPoint ClassSemaphore ClassSmallInteger ClassString ClassUnsafeAlien ClassWeakFinalizer ClosureCopiedValuesIndex ClosureFirstCopiedValueIndex ClosureIndex ClosureNumArgsIndex ClosureOuterContextIndex ClosureStartPCIndex CompactClasses ConstMinusOne ConstOne ConstTwo ConstZero ExcessSignalsIndex ExternalObjectsArray FalseObject FirstLinkIndex ForeignCallbackProcess HeaderIndex InstanceSpecificationIndex InstructionPointerIndex KeyIndex LastLinkIndex LiteralStart MessageArgumentsIndex MessageLookupClassIndex MessageSelectorIndex MethodArrayIndex MethodDictionaryIndex MethodIndex MyListIndex NextLinkIndex NilObject PrimErrTableIndex PriorityIndex ProcessInExternalCodeTag ProcessListsIndex ProcessSignalingLowSpace ReceiverIndex SchedulerAssociation SelectorAboutToReturn SelectorAttemptToAssign SelectorCannotInterpret SelectorCannotReturn SelectorCounterTripped SelectorDoesNotUnderstand SelectorInvokeCallback SelectorMustBeBoolean SelectorRunWithIn SelectorStart SelectorUnknownBytecode SenderIndex SpecialSelectors StackPointerIndex StreamArrayIndex StreamIndexIndex StreamReadLimitIndex StreamWriteLimitIndex SuperclassIndex SuspendedContextIndex TheDisplay TheFinalizationSemaphore TheInputSemaphore TheInterruptSemaphore TheLowSpaceSemaphore TheTimerSemaphore TrueObject ValueIndex XIndex YIndex' poolDictionaries: '' category: 'VMMaker-Interpreter'! !VMObjectIndices commentStamp: '<historical>' prior: 0! I am a shared pool for the constants that define object layout and well-known objects shared between the object memories (e.g. ObjectMemory, NewObjectMemory), the interpreters (e.g. StackInterpreter, CoInterpreter) and the object representations (e.g. ObjectRepresentationForSqueakV3). self classPool declare: #Foo from: StackInterpreter classPool (ObjectMemory classPool keys select: [:k| (k beginsWith: 'Class') and: [(k endsWith: 'Index') not]]) do: [:k| self classPool declare: k from: ObjectMemory classPool]!

1 0

VM Maker: Cog-eem.173.mcz
by commits＠source.squeak.org 25 Jul '14

25 Jul '14

Eliot Miranda uploaded a new version of Cog to project VM Maker: http://source.squeak.org/VMMaker/Cog-eem.173.mcz ==================== Summary ==================== Name: Cog-eem.173 Author: eem Time: 25 July 2014, 7:56:28.936 am UUID: c02d90e3-2670-4d88-807a-aebf086c2ba5 Ancestors: Cog-eem.172 Spur Bootstrap: Add the Sista trip & trp messages. Flush the uncategorized warning to the transcript. =============== Diff against Cog-eem.172 =============== Item was changed: ----- Method: SpurBootstrap class>>SmalltalkImagePROTOTYPErecreateSpecialObjectsArray (in category 'method prototypes') ----- SmalltalkImagePROTOTYPErecreateSpecialObjectsArray "Smalltalk recreateSpecialObjectsArray" "To external package developers: **** DO NOT OVERRIDE THIS METHOD. ***** If you are writing a plugin and need additional special object(s) for your own use, use addGCRoot() function and use own, separate special objects registry " "The Special Objects Array is an array of objects used by the Squeak virtual machine. Its contents are critical and accesses to it by the VM are unchecked, so don't even think of playing here unless you know what you are doing." | newArray | + newArray := Array new: 60. - newArray := Array new: 58. "Nil false and true get used throughout the interpreter" newArray at: 1 put: nil. newArray at: 2 put: false. newArray at: 3 put: true. "This association holds the active process (a ProcessScheduler)" newArray at: 4 put: (self specialObjectsArray at: 4) "(self bindingOf: #Processor) but it answers an Alias". "Numerous classes below used for type checking and instantiation" newArray at: 5 put: Bitmap. newArray at: 6 put: SmallInteger. newArray at: 7 put: ByteString. newArray at: 8 put: Array. newArray at: 9 put: Smalltalk. newArray at: 10 put: Float. newArray at: 11 put: MethodContext. newArray at: 12 put: BlockContext. newArray at: 13 put: Point. newArray at: 14 put: LargePositiveInteger. newArray at: 15 put: Display. newArray at: 16 put: Message. newArray at: 17 put: CompiledMethod. newArray at: 18 put: (self specialObjectsArray at: 18). "(low space Semaphore)" newArray at: 19 put: Semaphore. newArray at: 20 put: Character. newArray at: 21 put: #doesNotUnderstand:. newArray at: 22 put: #cannotReturn:. newArray at: 23 put: nil. "This is the process signalling low space." "An array of the 32 selectors that are compiled as special bytecodes, paired alternately with the number of arguments each takes." newArray at: 24 put: #( #+ 1 #- 1 #< 1 #> 1 #<= 1 #>= 1 #= 1 #~= 1 #* 1 #/ 1 #\\ 1 #@ 1 #bitShift: 1 #// 1 #bitAnd: 1 #bitOr: 1 #at: 1 #at:put: 2 #size 0 #next 0 #nextPut: 1 #atEnd 0 #== 1 #class 0 #blockCopy: 1 #value 0 #value: 1 #do: 1 #new 0 #new: 1 #x 0 #y 0 ). "An array of the 255 Characters in ascii order. Cog inlines table into machine code at: prim so do not regenerate it. This is nil in Spur, which has immediate Characters." newArray at: 25 put: (self specialObjectsArray at: 25). newArray at: 26 put: #mustBeBoolean. newArray at: 27 put: ByteArray. newArray at: 28 put: Process. "An array of up to 31 classes whose instances will have compact headers; an empty array in Spur" newArray at: 29 put: self compactClassesArray. newArray at: 30 put: (self specialObjectsArray at: 30). "(delay Semaphore)" newArray at: 31 put: (self specialObjectsArray at: 31). "(user interrupt Semaphore)" "Entries 32 - 34 unreferenced. Previously these contained prototype instances to be copied for fast initialization" newArray at: 32 put: nil. "was the prototype Float" newArray at: 33 put: nil. "was the prototype 4-byte LargePositiveInteger" newArray at: 34 put: nil. "was the prototype Point" newArray at: 35 put: #cannotInterpret:. newArray at: 36 put: nil. "was the prototype MethodContext" newArray at: 37 put: BlockClosure. newArray at: 38 put: nil. "was the prototype BlockContext" "array of objects referred to by external code" newArray at: 39 put: (self specialObjectsArray at: 39). "external semaphores" newArray at: 40 put: nil. "Reserved for Mutex in Cog VMs" newArray at: 41 put: ((self specialObjectsArray at: 39) ifNil: [LinkedList new]). "Reserved for a LinkedList instance for overlapped calls in CogMT" newArray at: 42 put: ((self specialObjectsArray at: 42) ifNil: [Semaphore new]). "finalization Semaphore" newArray at: 43 put: LargeNegativeInteger. "External objects for callout. Note: Written so that one can actually completely remove the FFI." newArray at: 44 put: (self at: #ExternalAddress ifAbsent: []). newArray at: 45 put: (self at: #ExternalStructure ifAbsent: []). newArray at: 46 put: (self at: #ExternalData ifAbsent: []). newArray at: 47 put: (self at: #ExternalFunction ifAbsent: []). newArray at: 48 put: (self at: #ExternalLibrary ifAbsent: []). newArray at: 49 put: #aboutToReturn:through:. newArray at: 50 put: #run:with:in:. "51 reserved for immutability message" newArray at: 51 put: #attemptToAssign:withIndex:. newArray at: 52 put: #(nil "nil => generic error" #'bad receiver' #'bad argument' #'bad index' #'bad number of arguments' #'inappropriate operation' #'unsupported operation' #'no modification' #'insufficient object memory' #'insufficient C memory' #'not found' #'bad method' #'internal error in named primitive machinery' #'object may move' #'resource limit exceeded' #'object is pinned' #'primitive write beyond end of object'). "53 to 55 are for Alien" newArray at: 53 put: (self at: #Alien ifAbsent: []). newArray at: 54 put: #invokeCallbackContext::. "use invokeCallback:stack:registers:jmpbuf: for old Alien callbacks." newArray at: 55 put: (self at: #UnsafeAlien ifAbsent: []). "Used to be WeakFinalizationList for WeakFinalizationList hasNewFinalization, obsoleted by ephemeron support." newArray at: 56 put: nil. "reserved for foreign callback process" newArray at: 57 put: (self specialObjectsArray at: 57 ifAbsent: []). newArray at: 58 put: #unusedBytecode. + "59 reserved for Sista counter tripped message" + newArray at: 59 put: #conditionalBranchCounterTrippedOn:. + "60 reserved for Sista class trap message" + newArray at: 60 put: #classTrapFor:. "Now replace the interpreter's reference in one atomic operation" self specialObjectsArray becomeForward: newArray! Item was changed: ----- Method: SpurBootstrap class>>categoryForClass:meta:selector: (in category 'method prototype categorization') ----- categoryForClass: className meta: isMeta selector: selector ^(isMeta ifTrue: [{ className. #class. selector }] ifFalse: [{ className. selector }]) caseOf: { [#(Behavior allInstancesOrNil)] -> [#enumerating]. [#(Behavior byteSizeOfInstance)] -> [#'accessing instances and variables']. [#(Behavior byteSizeOfInstanceOfSize:)] -> [#'accessing instances and variables']. [#(Behavior elementSize)] -> [#'accessing instances and variables']. [#(Behavior handleFailingBasicNew)] -> [#private]. [#(Behavior handleFailingBasicNew:)] -> [#private]. [#(Behavior handleFailingFailingBasicNew)] -> [#private]. [#(Behavior handleFailingFailingBasicNew:)] -> [#private]. [#(Behavior identityHash)] -> [#comparing]. [#(Behavior isEphemeronClass)] -> [#testing]. [#(Behavior isImmediateClass)] -> [#testing]. [#(Character identityHash)] -> [#comparing]. [#(ClassBuilder superclass:immediateSubclass:instanceVariableNames:classVariableNames:poolDictionaries:category:)] -> [#public]. [#(Context class allInstances)] -> [#enumerating]. [#(Context class allInstancesDo:)] -> [#enumerating]. [#(MethodContext class allInstances)] -> [#enumerating]. [#(MethodContext class allInstancesDo:)] -> [#enumerating]. [#(SmallInteger asCharacter)] -> [#converting]. } otherwise: [Transcript nextPutAll: className. isMeta ifTrue: [Transcript nextPutAll: ' class']. + Transcript nextPutAll: '>>'; store: selector; nextPutAll: ' is unclassified'; cr; flush. - Transcript nextPutAll: '>>'; store: selector; nextPutAll: ' is unclassified'; cr. ^Categorizer default]!

1 0

in all seriousness!
by Ben Coman 25 Jul '14

25 Jul '14

oh! I didn't know you vm guys were soophunny... I got a nice chuckle from this... sqAtomicOps.h #else /* LP32 || ILP32 else LP64 || ILP64 || LLP64 */ # error shurly shome mishtake; too drunk to shpot the programming muddle. hic. #endif

2 1

New CogVMs available
by Eliot Miranda 25 Jul '14

25 Jul '14

... at http://www.mirandabanda.org/files/Cog/VM/VM.r3056/. CogVM binaries as per VMMaker.oscog-eem.832/r3056 Add the time zone to the version info on Mac OS X and Win32. Fix bug in assigning parameter 55 (growth ratio at which to do a global GC). Add vmParameter 52 to answer the capacity of the root table (in Spur a.k.a. the rememberedSet). In the wake of the inlining change below (see Slang:), split lookupInMethodCacheSel:classTag: into inlineLookupInMethodCacheSel:classTag:, and use the inline version in internalFindNewMethod. Fix printStringOf: (used in e.g. frame print) to not print crs that would cause previous info to be overwritten. Spur: Fix bug with class table management and two-way become. Because two-way become may do an in-place swap obj1 & obj2 in SpurMemoryManager>>doBecome:and:copyHash: may not be forwarded after the inner become. Hence they should not be followed if not forwarded. The bug manifested as Object's identityHash changing: superclass is the first slot in a class. Following an unforwarded subclass of object yields Object. Setting the hash bits of the followed object smashes Object's identityHash. Thanks to Stephane Rollandin for finding the bug. More rationalization of the class table management post become. Now no post become scan of the class table is necessary at all. Add vm parameter 53 to answer the number of segments. Move the rememberedSet into a pinned object in oldSpace. Allow it to grow on demand, starting at 1k entries, doubling on each grow. Make sure to abort if the attempt to grow the remembered set fails. Try to grow by another 1k slots if doubling fails, then abort. Revise markAndTrace: given that markAndShouldScan: is inlined within it (see Slang changes below). Move the ephemeron processing into markAndShouldScan: out of the now unused numStringSlotsOf:ephemeronInactiveIf: circumlocution. Add activeAndDeferredScan: and numStrongSlotsOfInephemeral: in place of the double negative inactiveOrFailedToDeferScan: and hence inline numStrongSlotsOfInephemeral:. Increase the traceImmediatelySlotLimit. These changes plus the 2 repeats for compaction speed up global GC by at least x2. Change the defaultEdenBytes to 4Mb. Allow the number of compaction passes to vary, 2 on GC, 3 on GC for snapshot. Slang: Add support for inlining into the condition of ifTrue:/ifFalse: when it is marked as inline. Transform expr1 ifTrue:/ifFalse: [^expr2] by inlining ^expr2 into expr1. Transform expr ifTrue:/ifFalse: [statements] by replacing ^boolean occurrences in expr with gotos. -- Aloha, Eliot

2 2

VM Maker: Cog-eem.172.mcz
by commits＠source.squeak.org 24 Jul '14

24 Jul '14

Eliot Miranda uploaded a new version of Cog to project VM Maker: http://source.squeak.org/VMMaker/Cog-eem.172.mcz ==================== Summary ==================== Name: Cog-eem.172 Author: eem Time: 24 July 2014, 11:06:03.817 am UUID: e79f79a5-2e7a-4c15-996c-1de7d3d3d2be Ancestors: Cog-eem.171 Fix slip in categorizing uncategorized methods. =============== Diff against Cog-eem.171 =============== Item was changed: ----- Method: SpurBootstrapMonticelloPackagePatcher>>packagesAndPatches (in category 'private-accessing') ----- packagesAndPatches "SpurBootstrapMonticelloPackagePatcher new packagesAndPatches" packagesAndPatches ifNotNil: [^packagesAndPatches]. packagesAndPatches := Dictionary new. SpurBootstrap new prototypeClassNameMetaSelectorMethodDo: [:className :isMeta :selector :method| | class methodReference source | class := Smalltalk classNamed: className. isMeta ifTrue: [class := class class]. methodReference := (class includesSelector: selector) ifTrue: [(class >> selector) methodReference]. + (methodReference notNil + and: [methodReference category = Categorizer default]) ifTrue: - methodReference category = Categorizer default ifTrue: [methodReference := nil]. source := method getSourceFromFile asString allButFirst: method selector size - selector size. source first ~= selector first ifTrue: [source replaceFrom: 1 to: selector size with: selector startingAt: 1]. (packagesAndPatches at: (methodReference ifNotNil: [PackageOrganizer default packageOfMethod: methodReference] ifNil: [PackageOrganizer default packageOfClass: class]) ifAbsentPut: [OrderedCollection new]) add: (MCAddition of: (MCMethodDefinition className: className classIsMeta: isMeta selector: selector category: (methodReference ifNotNil: [methodReference category] ifNil: [SpurBootstrap categoryForClass: className meta: isMeta selector: selector]) timeStamp: method timeStamp source: source))]. ^packagesAndPatches!

1 0

VM Maker: Cog-eem.171.mcz
by commits＠source.squeak.org 24 Jul '14

24 Jul '14

Eliot Miranda uploaded a new version of Cog to project VM Maker: http://source.squeak.org/VMMaker/Cog-eem.171.mcz ==================== Summary ==================== Name: Cog-eem.171 Author: eem Time: 24 July 2014, 11:01:54.111 am UUID: ffcca95f-67d7-4ad3-9350-8ae00f741126 Ancestors: Cog-eem.170 SpurBootstrap: Fix the class of the [Method]Context class>>allInstances[Do:] prototype. Provide categories for (we hope) all uncategorized methods. =============== Diff against Cog-eem.170 =============== Item was removed: - ----- Method: SpurBootstrap class>>ContextPROTOTYPEallInstances (in category 'method prototypes pharo') ----- - ContextPROTOTYPEallInstances - "Answer all instances of the receiver." - <primitive: 177> - "The primitive can fail because memory is low. If so, fall back on the old - enumeration code, which gives the system a chance to GC and/or grow. - Because aBlock might change the class of inst (for example, using become:), - it is essential to compute next before aBlock value: inst. - Only count until thisContext since this context has been created only to - compute the existing instances." - | inst insts next | - insts := WriteStream on: (Array new: 64). - inst := self someInstance. - [inst == thisContext or: [inst == nil]] whileFalse: - [next := inst nextInstance. - insts nextPut: inst. - inst := next]. - ^insts contents! Item was removed: - ----- Method: SpurBootstrap class>>ContextPROTOTYPEallInstancesDo: (in category 'method prototypes pharo') ----- - ContextPROTOTYPEallInstancesDo: aBlock - "Evaluate aBlock with each of the current instances of the receiver." - | instances inst next | - instances := self allInstancesOrNil. - instances ifNotNil: - [instances do: aBlock. - ^self]. - "allInstancesOrNil can fail because memory is low. If so, fall back on the old - enumeration code. Because aBlock might change the class of inst (for example, - using become:), it is essential to compute next before aBlock value: inst. - Only count until thisContext since evaluation of aBlock will create new contexts." - inst := self someInstance. - [inst == thisContext or: [inst == nil]] whileFalse: - [next := inst nextInstance. - aBlock value: inst. - inst := next]! Item was added: + ----- Method: SpurBootstrap class>>ContextclassPROTOTYPEallInstances (in category 'method prototypes pharo') ----- + ContextclassPROTOTYPEallInstances + "Answer all instances of the receiver." + <primitive: 177> + "The primitive can fail because memory is low. If so, fall back on the old + enumeration code, which gives the system a chance to GC and/or grow. + Because aBlock might change the class of inst (for example, using become:), + it is essential to compute next before aBlock value: inst. + Only count until thisContext since this context has been created only to + compute the existing instances." + | inst insts next | + insts := WriteStream on: (Array new: 64). + inst := self someInstance. + [inst == thisContext or: [inst == nil]] whileFalse: + [next := inst nextInstance. + insts nextPut: inst. + inst := next]. + ^insts contents! Item was added: + ----- Method: SpurBootstrap class>>ContextclassPROTOTYPEallInstancesDo: (in category 'method prototypes pharo') ----- + ContextclassPROTOTYPEallInstancesDo: aBlock + "Evaluate aBlock with each of the current instances of the receiver." + | instances inst next | + instances := self allInstancesOrNil. + instances ifNotNil: + [instances do: aBlock. + ^self]. + "allInstancesOrNil can fail because memory is low. If so, fall back on the old + enumeration code. Because aBlock might change the class of inst (for example, + using become:), it is essential to compute next before aBlock value: inst. + Only count until thisContext since evaluation of aBlock will create new contexts." + inst := self someInstance. + [inst == thisContext or: [inst == nil]] whileFalse: + [next := inst nextInstance. + aBlock value: inst. + inst := next]! Item was removed: - ----- Method: SpurBootstrap class>>MethodContextPROTOTYPEallInstances (in category 'method prototypes squeak') ----- - MethodContextPROTOTYPEallInstances - "Answer all instances of the receiver." - <primitive: 177> - "The primitive can fail because memory is low. If so, fall back on the old - enumeration code, which gives the system a chance to GC and/or grow. - Because aBlock might change the class of inst (for example, using become:), - it is essential to compute next before aBlock value: inst. - Only count until thisContext since this context has been created only to - compute the existing instances." - | inst insts next | - insts := WriteStream on: (Array new: 64). - inst := self someInstance. - [inst == thisContext or: [inst == nil]] whileFalse: - [next := inst nextInstance. - insts nextPut: inst. - inst := next]. - ^insts contents! Item was removed: - ----- Method: SpurBootstrap class>>MethodContextPROTOTYPEallInstancesDo: (in category 'method prototypes squeak') ----- - MethodContextPROTOTYPEallInstancesDo: aBlock - "Evaluate aBlock with each of the current instances of the receiver." - | instances inst next | - instances := self allInstancesOrNil. - instances ifNotNil: - [instances do: aBlock. - ^self]. - "allInstancesOrNil can fail because memory is low. If so, fall back on the old - enumeration code. Because aBlock might change the class of inst (for example, - using become:), it is essential to compute next before aBlock value: inst. - Only count until thisContext since evaluation of aBlock will create new contexts." - inst := self someInstance. - [inst == thisContext or: [inst == nil]] whileFalse: - [next := inst nextInstance. - aBlock value: inst. - inst := next]! Item was added: + ----- Method: SpurBootstrap class>>MethodContextclassPROTOTYPEallInstances (in category 'method prototypes squeak') ----- + MethodContextclassPROTOTYPEallInstances + "Answer all instances of the receiver." + <primitive: 177> + "The primitive can fail because memory is low. If so, fall back on the old + enumeration code, which gives the system a chance to GC and/or grow. + Because aBlock might change the class of inst (for example, using become:), + it is essential to compute next before aBlock value: inst. + Only count until thisContext since this context has been created only to + compute the existing instances." + | inst insts next | + insts := WriteStream on: (Array new: 64). + inst := self someInstance. + [inst == thisContext or: [inst == nil]] whileFalse: + [next := inst nextInstance. + insts nextPut: inst. + inst := next]. + ^insts contents! Item was added: + ----- Method: SpurBootstrap class>>MethodContextclassPROTOTYPEallInstancesDo: (in category 'method prototypes squeak') ----- + MethodContextclassPROTOTYPEallInstancesDo: aBlock + "Evaluate aBlock with each of the current instances of the receiver." + | instances inst next | + instances := self allInstancesOrNil. + instances ifNotNil: + [instances do: aBlock. + ^self]. + "allInstancesOrNil can fail because memory is low. If so, fall back on the old + enumeration code. Because aBlock might change the class of inst (for example, + using become:), it is essential to compute next before aBlock value: inst. + Only count until thisContext since evaluation of aBlock will create new contexts." + inst := self someInstance. + [inst == thisContext or: [inst == nil]] whileFalse: + [next := inst nextInstance. + aBlock value: inst. + inst := next]! Item was added: + ----- Method: SpurBootstrap class>>categoryForClass:meta:selector: (in category 'method prototype categorization') ----- + categoryForClass: className meta: isMeta selector: selector + ^(isMeta + ifTrue: [{ className. #class. selector }] + ifFalse: [{ className. selector }]) + caseOf: { + [#(Behavior allInstancesOrNil)] -> [#enumerating]. + [#(Behavior byteSizeOfInstance)] -> [#'accessing instances and variables']. + [#(Behavior byteSizeOfInstanceOfSize:)] -> [#'accessing instances and variables']. + [#(Behavior elementSize)] -> [#'accessing instances and variables']. + [#(Behavior handleFailingBasicNew)] -> [#private]. + [#(Behavior handleFailingBasicNew:)] -> [#private]. + [#(Behavior handleFailingFailingBasicNew)] -> [#private]. + [#(Behavior handleFailingFailingBasicNew:)] -> [#private]. + [#(Behavior identityHash)] -> [#comparing]. + [#(Behavior isEphemeronClass)] -> [#testing]. + [#(Behavior isImmediateClass)] -> [#testing]. + [#(Character identityHash)] -> [#comparing]. + [#(ClassBuilder superclass:immediateSubclass:instanceVariableNames:classVariableNames:poolDictionaries:category:)] + -> [#public]. + [#(Context class allInstances)] -> [#enumerating]. + [#(Context class allInstancesDo:)] -> [#enumerating]. + [#(MethodContext class allInstances)] -> [#enumerating]. + [#(MethodContext class allInstancesDo:)] -> [#enumerating]. + [#(SmallInteger asCharacter)] -> [#converting]. + } + otherwise: + [Transcript nextPutAll: className. + isMeta ifTrue: [Transcript nextPutAll: ' class']. + Transcript nextPutAll: '>>'; store: selector; nextPutAll: ' is unclassified'; cr. + ^Categorizer default]! Item was changed: ----- Method: SpurBootstrapMonticelloPackagePatcher>>packagesAndPatches (in category 'private-accessing') ----- packagesAndPatches "SpurBootstrapMonticelloPackagePatcher new packagesAndPatches" packagesAndPatches ifNotNil: [^packagesAndPatches]. packagesAndPatches := Dictionary new. SpurBootstrap new prototypeClassNameMetaSelectorMethodDo: [:className :isMeta :selector :method| | class methodReference source | class := Smalltalk classNamed: className. isMeta ifTrue: [class := class class]. methodReference := (class includesSelector: selector) ifTrue: [(class >> selector) methodReference]. + methodReference category = Categorizer default ifTrue: + [methodReference := nil]. source := method getSourceFromFile asString allButFirst: method selector size - selector size. source first ~= selector first ifTrue: [source replaceFrom: 1 to: selector size with: selector startingAt: 1]. (packagesAndPatches at: (methodReference ifNotNil: [PackageOrganizer default packageOfMethod: methodReference] + ifNil: [PackageOrganizer default packageOfClass: class]) - ifNil: [PackageOrganizer default packageOfClass: class]) ifAbsentPut: [OrderedCollection new]) add: (MCAddition of: (MCMethodDefinition className: className classIsMeta: isMeta selector: selector category: (methodReference ifNotNil: [methodReference category] + ifNil: [SpurBootstrap + categoryForClass: className + meta: isMeta + selector: selector]) - ifNil: [Categorizer default]) timeStamp: method timeStamp source: source))]. ^packagesAndPatches!

1 0

[commit][3056] Fix linux's makeproduct script
by commits＠squeakvm.org 24 Jul '14

24 Jul '14

Revision: 3056 Author: eliot Date: 2014-07-24 10:12:40 -0700 (Thu, 24 Jul 2014) Log Message: ----------- Fix linux's makeproduct script Modified Paths: -------------- branches/Cog/build.linux32x86/makeproduct Property Changed: ---------------- branches/Cog/platforms/Cross/vm/sqSCCSVersion.h Modified: branches/Cog/build.linux32x86/makeproduct =================================================================== --- branches/Cog/build.linux32x86/makeproduct 2014-07-24 17:11:23 UTC (rev 3055) +++ branches/Cog/build.linux32x86/makeproduct 2014-07-24 17:12:40 UTC (rev 3056) @@ -1,6 +1,6 @@ #!/bin/bash trap 'exit 2' HUP INT PIPE TERM -for d in newspeak.cog.spur newspeak.cog.spur squeak.cog.spur squeak.cog.v3; do +for d in newspeak.cog.spur newspeak.cog.v3 squeak.cog.spur squeak.cog.v3; do if test -d "$d"; then (cd $d;./makeallclean "$@") else Property changes on: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h ___________________________________________________________________ Modified: checkindate - Thu Jul 24 07:09:12 HST 2014 + Thu Jul 24 07:12:33 HST 2014

1 0

[commit][3055] Add the time zone to the version info on Mac OS X and Win32.
by commits＠squeakvm.org 24 Jul '14

24 Jul '14

Revision: 3055 Author: eliot Date: 2014-07-24 10:11:23 -0700 (Thu, 24 Jul 2014) Log Message: ----------- Add the time zone to the version info on Mac OS X and Win32. Nuke the win32 version.h wart and simplify & update win32's version.c. Modified Paths: -------------- branches/Cog/build.macos32x86/newspeak.cog.spur/CoreVM.xcodeproj/project.pbxproj branches/Cog/build.macos32x86/newspeak.cog.spur/makevm branches/Cog/build.macos32x86/newspeak.cog.v3/CoreVM.xcodeproj/project.pbxproj branches/Cog/build.macos32x86/newspeak.cog.v3/makevm branches/Cog/build.macos32x86/newspeak.stack.spur/CoreVM.xcodeproj/project.pbxproj branches/Cog/build.macos32x86/newspeak.stack.spur/makevm branches/Cog/build.macos32x86/newspeak.stack.v3/CoreVM.xcodeproj/project.pbxproj branches/Cog/build.macos32x86/newspeak.stack.v3/makevm branches/Cog/build.macos32x86/squeak.cog.spur/CoreMTVM.xcodeproj/project.pbxproj branches/Cog/build.macos32x86/squeak.cog.spur/CoreVM.xcodeproj/project.pbxproj branches/Cog/build.macos32x86/squeak.cog.spur/makevm branches/Cog/build.macos32x86/squeak.cog.v3/CoreMTVM.xcodeproj/project.pbxproj branches/Cog/build.macos32x86/squeak.cog.v3/CoreVM.xcodeproj/project.pbxproj branches/Cog/build.macos32x86/squeak.cog.v3/makevm branches/Cog/build.macos32x86/squeak.sista.spur/CoreVM.xcodeproj/project.pbxproj branches/Cog/build.macos32x86/squeak.sista.spur/makevm branches/Cog/build.macos32x86/squeak.sista.v3/CoreVM.xcodeproj/project.pbxproj branches/Cog/build.macos32x86/squeak.sista.v3/makevm branches/Cog/build.macos32x86/squeak.stack.spur/CoreVM.xcodeproj/project.pbxproj branches/Cog/build.macos32x86/squeak.stack.spur/makevm branches/Cog/build.macos32x86/squeak.stack.v3/CoreVM.xcodeproj/project.pbxproj branches/Cog/build.macos32x86/squeak.stack.v3/makevm branches/Cog/build.win32x86/newspeak.cog.spur/Makefile branches/Cog/build.win32x86/newspeak.cog.v3/Makefile branches/Cog/build.win32x86/newspeak.stack.spur/Makefile branches/Cog/build.win32x86/newspeak.stack.v3/Makefile branches/Cog/build.win32x86/squeak.cog.spur/Makefile branches/Cog/build.win32x86/squeak.cog.v3/Makefile branches/Cog/build.win32x86/squeak.stack.spur/Makefile branches/Cog/build.win32x86/squeak.stack.v3/Makefile branches/Cog/platforms/Mac OS/vm/version.c branches/Cog/platforms/win32/vm/version.c Removed Paths: ------------- branches/Cog/platforms/win32/vm/version.h Property Changed: ---------------- branches/Cog/platforms/Cross/vm/sqSCCSVersion.h Modified: branches/Cog/build.macos32x86/newspeak.cog.spur/CoreVM.xcodeproj/project.pbxproj =================================================================== --- branches/Cog/build.macos32x86/newspeak.cog.spur/CoreVM.xcodeproj/project.pbxproj 2014-07-24 08:23:09 UTC (rev 3054) +++ branches/Cog/build.macos32x86/newspeak.cog.spur/CoreVM.xcodeproj/project.pbxproj 2014-07-24 17:11:23 UTC (rev 3055) @@ -1462,6 +1462,7 @@ GCC_PREPROCESSOR_DEFINITIONS = ( "DEBUGVM=0", "USE_GLOBAL_STRUCT=0", + "TZ=\"$TZ\"", "MULTIPLEBYTECODESETS=1", NO_ISNAN, TARGET_API_MAC_CARBON, @@ -1503,6 +1504,7 @@ GCC_PREPROCESSOR_DEFINITIONS = ( "DEBUGVM=0", "USE_GLOBAL_STRUCT=0", + "TZ=\"$TZ\"", "MULTIPLEBYTECODESETS=1", HAVE_SYS_TIME_H, SQUEAK_BUILTIN_PLUGIN, @@ -1536,6 +1538,7 @@ "DEBUGVM=1", "VM_LABEL(foo)=0", "USE_GLOBAL_STRUCT=0", + "TZ=\"$TZ\"", "MULTIPLEBYTECODESETS=1", NO_ISNAN, TARGET_API_MAC_CARBON, @@ -1590,6 +1593,7 @@ "NDEBUG=1", "DEBUGVM=0", "USE_GLOBAL_STRUCT=0", + "TZ=\"$TZ\"", "MULTIPLEBYTECODESETS=1", TARGET_API_MAC_CARBON, SQUEAK_BUILTIN_PLUGIN, @@ -1642,6 +1646,7 @@ "NDEBUG=1", "DEBUGVM=0", "USE_GLOBAL_STRUCT=0", + "TZ=\"$TZ\"", "MULTIPLEBYTECODESETS=1", NO_ISNAN, TARGET_API_MAC_CARBON, @@ -1683,6 +1688,7 @@ GCC_PREPROCESSOR_DEFINITIONS = ( "DEBUGVM=1", "USE_GLOBAL_STRUCT=0", + "TZ=\"$TZ\"", "MULTIPLEBYTECODESETS=1", HAVE_SYS_TIME_H, SQUEAK_BUILTIN_PLUGIN, @@ -1709,6 +1715,7 @@ "NDEBUG=1", "DEBUGVM=0", "USE_GLOBAL_STRUCT=0", + "TZ=\"$TZ\"", "MULTIPLEBYTECODESETS=1", HAVE_SYS_TIME_H, SQUEAK_BUILTIN_PLUGIN, @@ -1739,6 +1746,7 @@ GCC_PREPROCESSOR_DEFINITIONS = ( "NDEBUG=1", "USE_GLOBAL_STRUCT=0", + "TZ=\"$TZ\"", "MULTIPLEBYTECODESETS=1", HAVE_SYS_TIME_H, SQUEAK_BUILTIN_PLUGIN, Modified: branches/Cog/build.macos32x86/newspeak.cog.spur/makevm =================================================================== --- branches/Cog/build.macos32x86/newspeak.cog.spur/makevm 2014-07-24 08:23:09 UTC (rev 3054) +++ branches/Cog/build.macos32x86/newspeak.cog.spur/makevm 2014-07-24 17:11:23 UTC (rev 3055) @@ -57,6 +57,7 @@ echo rm \"build/CoreVM.build/$BUILD_CONFIGURATION/$OBJDIR/version.o\" rm "build/CoreVM.build/$BUILD_CONFIGURATION/$OBJDIR/version.o" echo CoreVM xcodebuild -project CoreVM.xcodeproj -configuration $BUILD_CONFIGURATION +export TZ="`date +%Z`" xcodebuild -project CoreVM.xcodeproj -configuration $BUILD_CONFIGURATION if [ -d "$DEST" ]; then mv build/$BUILD_CONFIGURATION/Newspeak\ Virtual\ Machine.app/* "$DEST" Modified: branches/Cog/build.macos32x86/newspeak.cog.v3/CoreVM.xcodeproj/project.pbxproj =================================================================== --- branches/Cog/build.macos32x86/newspeak.cog.v3/CoreVM.xcodeproj/project.pbxproj 2014-07-24 08:23:09 UTC (rev 3054) +++ branches/Cog/build.macos32x86/newspeak.cog.v3/CoreVM.xcodeproj/project.pbxproj 2014-07-24 17:11:23 UTC (rev 3055) @@ -1464,6 +1464,7 @@ GCC_PREPROCESSOR_DEFINITIONS = ( "DEBUGVM=0", "USE_GLOBAL_STRUCT=0", + "TZ=\"$TZ\"", "MULTIPLEBYTECODESETS=1", NO_ISNAN, TARGET_API_MAC_CARBON, @@ -1504,6 +1505,7 @@ GCC_PREPROCESSOR_DEFINITIONS = ( "DEBUGVM=0", "USE_GLOBAL_STRUCT=0", + "TZ=\"$TZ\"", "MULTIPLEBYTECODESETS=1", HAVE_SYS_TIME_H, SQUEAK_BUILTIN_PLUGIN, @@ -1536,6 +1538,7 @@ "DEBUGVM=1", "VM_LABEL(foo)=0", "USE_GLOBAL_STRUCT=0", + "TZ=\"$TZ\"", "MULTIPLEBYTECODESETS=1", NO_ISNAN, TARGET_API_MAC_CARBON, @@ -1589,6 +1592,7 @@ "NDEBUG=1", "DEBUGVM=0", "USE_GLOBAL_STRUCT=0", + "TZ=\"$TZ\"", "MULTIPLEBYTECODESETS=1", TARGET_API_MAC_CARBON, SQUEAK_BUILTIN_PLUGIN, @@ -1640,6 +1644,7 @@ "NDEBUG=1", "DEBUGVM=0", "USE_GLOBAL_STRUCT=0", + "TZ=\"$TZ\"", "MULTIPLEBYTECODESETS=1", NO_ISNAN, TARGET_API_MAC_CARBON, @@ -1680,6 +1685,7 @@ GCC_PREPROCESSOR_DEFINITIONS = ( "DEBUGVM=1", "USE_GLOBAL_STRUCT=0", + "TZ=\"$TZ\"", "MULTIPLEBYTECODESETS=1", HAVE_SYS_TIME_H, SQUEAK_BUILTIN_PLUGIN, @@ -1704,6 +1710,7 @@ "NDEBUG=1", "DEBUGVM=0", "USE_GLOBAL_STRUCT=0", + "TZ=\"$TZ\"", "MULTIPLEBYTECODESETS=1", HAVE_SYS_TIME_H, SQUEAK_BUILTIN_PLUGIN, @@ -1732,6 +1739,7 @@ GCC_PREPROCESSOR_DEFINITIONS = ( "NDEBUG=1", "USE_GLOBAL_STRUCT=0", + "TZ=\"$TZ\"", "MULTIPLEBYTECODESETS=1", HAVE_SYS_TIME_H, SQUEAK_BUILTIN_PLUGIN, Modified: branches/Cog/build.macos32x86/newspeak.cog.v3/makevm =================================================================== --- branches/Cog/build.macos32x86/newspeak.cog.v3/makevm 2014-07-24 08:23:09 UTC (rev 3054) +++ branches/Cog/build.macos32x86/newspeak.cog.v3/makevm 2014-07-24 17:11:23 UTC (rev 3055) @@ -57,6 +57,7 @@ echo rm \"build/CoreVM.build/$BUILD_CONFIGURATION/$OBJDIR/version.o\" rm "build/CoreVM.build/$BUILD_CONFIGURATION/$OBJDIR/version.o" echo CoreVM xcodebuild -project CoreVM.xcodeproj -configuration $BUILD_CONFIGURATION +export TZ="`date +%Z`" xcodebuild -project CoreVM.xcodeproj -configuration $BUILD_CONFIGURATION if [ -d "$DEST" ]; then mv build/$BUILD_CONFIGURATION/Newspeak\ Virtual\ Machine.app/* "$DEST" Modified: branches/Cog/build.macos32x86/newspeak.stack.spur/CoreVM.xcodeproj/project.pbxproj =================================================================== --- branches/Cog/build.macos32x86/newspeak.stack.spur/CoreVM.xcodeproj/project.pbxproj 2014-07-24 08:23:09 UTC (rev 3054) +++ branches/Cog/build.macos32x86/newspeak.stack.spur/CoreVM.xcodeproj/project.pbxproj 2014-07-24 17:11:23 UTC (rev 3055) @@ -1440,6 +1440,7 @@ GCC_PREPROCESSOR_DEFINITIONS = ( "DEBUGVM=0", "USE_GLOBAL_STRUCT=0", + "TZ=\"$TZ\"", "MULTIPLEBYTECODESETS=1", NO_ISNAN, TARGET_API_MAC_CARBON, @@ -1480,6 +1481,7 @@ GCC_PREPROCESSOR_DEFINITIONS = ( "DEBUGVM=0", "USE_GLOBAL_STRUCT=0", + "TZ=\"$TZ\"", "MULTIPLEBYTECODESETS=1", HAVE_SYS_TIME_H, SQUEAK_BUILTIN_PLUGIN, @@ -1512,6 +1514,7 @@ "DEBUGVM=1", "VM_LABEL(foo)=0", "USE_GLOBAL_STRUCT=0", + "TZ=\"$TZ\"", "MULTIPLEBYTECODESETS=1", NO_ISNAN, TARGET_API_MAC_CARBON, @@ -1565,6 +1568,7 @@ "NDEBUG=1", "DEBUGVM=0", "USE_GLOBAL_STRUCT=0", + "TZ=\"$TZ\"", "MULTIPLEBYTECODESETS=1", TARGET_API_MAC_CARBON, SQUEAK_BUILTIN_PLUGIN, @@ -1616,6 +1620,7 @@ "NDEBUG=1", "DEBUGVM=0", "USE_GLOBAL_STRUCT=0", + "TZ=\"$TZ\"", "MULTIPLEBYTECODESETS=1", NO_ISNAN, TARGET_API_MAC_CARBON, @@ -1656,6 +1661,7 @@ GCC_PREPROCESSOR_DEFINITIONS = ( "DEBUGVM=1", "USE_GLOBAL_STRUCT=0", + "TZ=\"$TZ\"", "MULTIPLEBYTECODESETS=1", HAVE_SYS_TIME_H, SQUEAK_BUILTIN_PLUGIN, @@ -1680,6 +1686,7 @@ "NDEBUG=1", "DEBUGVM=0", "USE_GLOBAL_STRUCT=0", + "TZ=\"$TZ\"", "MULTIPLEBYTECODESETS=1", HAVE_SYS_TIME_H, SQUEAK_BUILTIN_PLUGIN, @@ -1708,6 +1715,7 @@ GCC_PREPROCESSOR_DEFINITIONS = ( "NDEBUG=1", "USE_GLOBAL_STRUCT=0", + "TZ=\"$TZ\"", "MULTIPLEBYTECODESETS=1", HAVE_SYS_TIME_H, SQUEAK_BUILTIN_PLUGIN, Modified: branches/Cog/build.macos32x86/newspeak.stack.spur/makevm =================================================================== --- branches/Cog/build.macos32x86/newspeak.stack.spur/makevm 2014-07-24 08:23:09 UTC (rev 3054) +++ branches/Cog/build.macos32x86/newspeak.stack.spur/makevm 2014-07-24 17:11:23 UTC (rev 3055) @@ -57,6 +57,7 @@ echo rm \"build/CoreVM.build/$BUILD_CONFIGURATION/$OBJDIR/version.o\" rm "build/CoreVM.build/$BUILD_CONFIGURATION/$OBJDIR/version.o" echo CoreVM xcodebuild -project CoreVM.xcodeproj -configuration $BUILD_CONFIGURATION +export TZ="`date +%Z`" xcodebuild -project CoreVM.xcodeproj -configuration $BUILD_CONFIGURATION if [ -d "$DEST" ]; then mv build/$BUILD_CONFIGURATION/Newspeak\ Virtual\ Machine.app/* "$DEST" Modified: branches/Cog/build.macos32x86/newspeak.stack.v3/CoreVM.xcodeproj/project.pbxproj =================================================================== --- branches/Cog/build.macos32x86/newspeak.stack.v3/CoreVM.xcodeproj/project.pbxproj 2014-07-24 08:23:09 UTC (rev 3054) +++ branches/Cog/build.macos32x86/newspeak.stack.v3/CoreVM.xcodeproj/project.pbxproj 2014-07-24 17:11:23 UTC (rev 3055) @@ -1444,6 +1444,7 @@ GCC_PREPROCESSOR_DEFINITIONS = ( "DEBUGVM=0", "USE_GLOBAL_STRUCT=0", + "TZ=\"$TZ\"", "MULTIPLEBYTECODESETS=1", NO_ISNAN, TARGET_API_MAC_CARBON, @@ -1484,6 +1485,7 @@ GCC_PREPROCESSOR_DEFINITIONS = ( "DEBUGVM=0", "USE_GLOBAL_STRUCT=0", + "TZ=\"$TZ\"", "MULTIPLEBYTECODESETS=1", HAVE_SYS_TIME_H, SQUEAK_BUILTIN_PLUGIN, @@ -1516,6 +1518,7 @@ "DEBUGVM=1", "VM_LABEL(foo)=0", "USE_GLOBAL_STRUCT=0", + "TZ=\"$TZ\"", "MULTIPLEBYTECODESETS=1", NO_ISNAN, TARGET_API_MAC_CARBON, @@ -1569,6 +1572,7 @@ "NDEBUG=1", "DEBUGVM=0", "USE_GLOBAL_STRUCT=0", + "TZ=\"$TZ\"", "MULTIPLEBYTECODESETS=1", TARGET_API_MAC_CARBON, SQUEAK_BUILTIN_PLUGIN, @@ -1620,6 +1624,7 @@ "NDEBUG=1", "DEBUGVM=0", "USE_GLOBAL_STRUCT=0", + "TZ=\"$TZ\"", "MULTIPLEBYTECODESETS=1", NO_ISNAN, TARGET_API_MAC_CARBON, @@ -1660,6 +1665,7 @@ GCC_PREPROCESSOR_DEFINITIONS = ( "DEBUGVM=1", "USE_GLOBAL_STRUCT=0", + "TZ=\"$TZ\"", "MULTIPLEBYTECODESETS=1", HAVE_SYS_TIME_H, SQUEAK_BUILTIN_PLUGIN, @@ -1684,6 +1690,7 @@ "NDEBUG=1", "DEBUGVM=0", "USE_GLOBAL_STRUCT=0", + "TZ=\"$TZ\"", "MULTIPLEBYTECODESETS=1", HAVE_SYS_TIME_H, SQUEAK_BUILTIN_PLUGIN, @@ -1712,6 +1719,7 @@ GCC_PREPROCESSOR_DEFINITIONS = ( "NDEBUG=1", "USE_GLOBAL_STRUCT=0", + "TZ=\"$TZ\"", "MULTIPLEBYTECODESETS=1", HAVE_SYS_TIME_H, SQUEAK_BUILTIN_PLUGIN, Modified: branches/Cog/build.macos32x86/newspeak.stack.v3/makevm =================================================================== --- branches/Cog/build.macos32x86/newspeak.stack.v3/makevm 2014-07-24 08:23:09 UTC (rev 3054) +++ branches/Cog/build.macos32x86/newspeak.stack.v3/makevm 2014-07-24 17:11:23 UTC (rev 3055) @@ -57,6 +57,7 @@ echo rm \"build/CoreVM.build/$BUILD_CONFIGURATION/$OBJDIR/version.o\" rm "build/CoreVM.build/$BUILD_CONFIGURATION/$OBJDIR/version.o" echo CoreVM xcodebuild -project CoreVM.xcodeproj -configuration $BUILD_CONFIGURATION +export TZ="`date +%Z`" xcodebuild -project CoreVM.xcodeproj -configuration $BUILD_CONFIGURATION if [ -d "$DEST" ]; then mv build/$BUILD_CONFIGURATION/Newspeak\ Virtual\ Machine.app/* "$DEST" Modified: branches/Cog/build.macos32x86/squeak.cog.spur/CoreMTVM.xcodeproj/project.pbxproj =================================================================== --- branches/Cog/build.macos32x86/squeak.cog.spur/CoreMTVM.xcodeproj/project.pbxproj 2014-07-24 08:23:09 UTC (rev 3054) +++ branches/Cog/build.macos32x86/squeak.cog.spur/CoreMTVM.xcodeproj/project.pbxproj 2014-07-24 17:11:23 UTC (rev 3055) @@ -1613,6 +1613,7 @@ "COGMTVM=1", "DEBUGVM=0", "USE_GLOBAL_STRUCT=0", + "TZ=\"$TZ\"", NO_ISNAN, TARGET_API_MAC_CARBON, SQUEAK_BUILTIN_PLUGIN, @@ -1653,6 +1654,7 @@ "COGMTVM=1", "DEBUGVM=0", "USE_GLOBAL_STRUCT=0", + "TZ=\"$TZ\"", HAVE_SYS_TIME_H, SQUEAK_BUILTIN_PLUGIN, TARGET_API_MAC_CARBON, @@ -1683,6 +1685,7 @@ "COGMTVM=1", "DEBUGVM=1", "USE_GLOBAL_STRUCT=0", + "TZ=\"$TZ\"", NO_ISNAN, TARGET_API_MAC_CARBON, SQUEAK_BUILTIN_PLUGIN, @@ -1737,6 +1740,7 @@ "COGMTVM=1", "DEBUGVM=0", "USE_GLOBAL_STRUCT=0", + "TZ=\"$TZ\"", TARGET_API_MAC_CARBON, SQUEAK_BUILTIN_PLUGIN, HAVE_SYS_TIME_H, @@ -1788,6 +1792,7 @@ "COGMTVM=1", "DEBUGVM=0", "USE_GLOBAL_STRUCT=0", + "TZ=\"$TZ\"", NO_ISNAN, TARGET_API_MAC_CARBON, SQUEAK_BUILTIN_PLUGIN, @@ -1828,6 +1833,7 @@ "COGMTVM=1", "DEBUGVM=1", "USE_GLOBAL_STRUCT=0", + "TZ=\"$TZ\"", HAVE_SYS_TIME_H, SQUEAK_BUILTIN_PLUGIN, TARGET_API_MAC_CARBON, @@ -1851,6 +1857,7 @@ "COGMTVM=1", "DEBUGVM=0", "USE_GLOBAL_STRUCT=0", + "TZ=\"$TZ\"", HAVE_SYS_TIME_H, SQUEAK_BUILTIN_PLUGIN, TARGET_API_MAC_CARBON, @@ -1879,6 +1886,7 @@ "NDEBUG=1", "COGMTVM=1", "USE_GLOBAL_STRUCT=0", + "TZ=\"$TZ\"", HAVE_SYS_TIME_H, SQUEAK_BUILTIN_PLUGIN, TARGET_API_MAC_CARBON, Modified: branches/Cog/build.macos32x86/squeak.cog.spur/CoreVM.xcodeproj/project.pbxproj =================================================================== --- branches/Cog/build.macos32x86/squeak.cog.spur/CoreVM.xcodeproj/project.pbxproj 2014-07-24 08:23:09 UTC (rev 3054) +++ branches/Cog/build.macos32x86/squeak.cog.spur/CoreVM.xcodeproj/project.pbxproj 2014-07-24 17:11:23 UTC (rev 3055) @@ -1615,6 +1615,7 @@ "COGMTVM=0", "DEBUGVM=0", "USE_GLOBAL_STRUCT=0", + "TZ=\"$TZ\"", NO_ISNAN, TARGET_API_MAC_CARBON, SQUEAK_BUILTIN_PLUGIN, @@ -1656,6 +1657,7 @@ "COGMTVM=0", "DEBUGVM=0", "USE_GLOBAL_STRUCT=0", + "TZ=\"$TZ\"", HAVE_SYS_TIME_H, SQUEAK_BUILTIN_PLUGIN, TARGET_API_MAC_CARBON, @@ -1687,6 +1689,7 @@ "COGMTVM=0", "DEBUGVM=1", "USE_GLOBAL_STRUCT=0", + "TZ=\"$TZ\"", NO_ISNAN, TARGET_API_MAC_CARBON, SQUEAK_BUILTIN_PLUGIN, @@ -1740,6 +1743,7 @@ "COGMTVM=0", "DEBUGVM=0", "USE_GLOBAL_STRUCT=0", + "TZ=\"$TZ\"", TARGET_API_MAC_CARBON, SQUEAK_BUILTIN_PLUGIN, HAVE_SYS_TIME_H, @@ -1791,6 +1795,7 @@ "COGMTVM=0", "DEBUGVM=0", "USE_GLOBAL_STRUCT=0", + "TZ=\"$TZ\"", NO_ISNAN, TARGET_API_MAC_CARBON, SQUEAK_BUILTIN_PLUGIN, @@ -1832,6 +1837,7 @@ "COGMTVM=0", "DEBUGVM=1", "USE_GLOBAL_STRUCT=0", + "TZ=\"$TZ\"", HAVE_SYS_TIME_H, SQUEAK_BUILTIN_PLUGIN, TARGET_API_MAC_CARBON, @@ -1857,6 +1863,7 @@ "COGMTVM=0", "DEBUGVM=0", "USE_GLOBAL_STRUCT=0", + "TZ=\"$TZ\"", HAVE_SYS_TIME_H, SQUEAK_BUILTIN_PLUGIN, TARGET_API_MAC_CARBON, @@ -1887,6 +1894,7 @@ "NDEBUG=1", "COGMTVM=0", "USE_GLOBAL_STRUCT=0", + "TZ=\"$TZ\"", HAVE_SYS_TIME_H, SQUEAK_BUILTIN_PLUGIN, TARGET_API_MAC_CARBON, Modified: branches/Cog/build.macos32x86/squeak.cog.spur/makevm =================================================================== --- branches/Cog/build.macos32x86/squeak.cog.spur/makevm 2014-07-24 08:23:09 UTC (rev 3054) +++ branches/Cog/build.macos32x86/squeak.cog.spur/makevm 2014-07-24 17:11:23 UTC (rev 3055) @@ -63,6 +63,7 @@ echo rm \"build/$VMXCP.build/$BUILD_CONFIGURATION/$OBJDIR/version.o\" rm "build/$VMXCP.build/$BUILD_CONFIGURATION/$OBJDIR/version.o" echo $VMXCP xcodebuild -project $VMXCP.xcodeproj -configuration $BUILD_CONFIGURATION +export TZ="`date +%Z`" xcodebuild -project $VMXCP.xcodeproj -configuration $BUILD_CONFIGURATION if [ -d "$DEST" ]; then mv build/$BUILD_CONFIGURATION/$APP/* "$DEST" Modified: branches/Cog/build.macos32x86/squeak.cog.v3/CoreMTVM.xcodeproj/project.pbxproj =================================================================== --- branches/Cog/build.macos32x86/squeak.cog.v3/CoreMTVM.xcodeproj/project.pbxproj 2014-07-24 08:23:09 UTC (rev 3054) +++ branches/Cog/build.macos32x86/squeak.cog.v3/CoreMTVM.xcodeproj/project.pbxproj 2014-07-24 17:11:23 UTC (rev 3055) @@ -1617,6 +1617,7 @@ "COGMTVM=1", "DEBUGVM=0", "USE_GLOBAL_STRUCT=0", + "TZ=\"$TZ\"", NO_ISNAN, TARGET_API_MAC_CARBON, SQUEAK_BUILTIN_PLUGIN, @@ -1657,6 +1658,7 @@ "COGMTVM=1", "DEBUGVM=0", "USE_GLOBAL_STRUCT=0", + "TZ=\"$TZ\"", HAVE_SYS_TIME_H, SQUEAK_BUILTIN_PLUGIN, TARGET_API_MAC_CARBON, @@ -1687,6 +1689,7 @@ "COGMTVM=1", "DEBUGVM=1", "USE_GLOBAL_STRUCT=0", + "TZ=\"$TZ\"", NO_ISNAN, TARGET_API_MAC_CARBON, SQUEAK_BUILTIN_PLUGIN, @@ -1741,6 +1744,7 @@ "COGMTVM=1", "DEBUGVM=0", "USE_GLOBAL_STRUCT=0", + "TZ=\"$TZ\"", TARGET_API_MAC_CARBON, SQUEAK_BUILTIN_PLUGIN, HAVE_SYS_TIME_H, @@ -1792,6 +1796,7 @@ "COGMTVM=1", "DEBUGVM=0", "USE_GLOBAL_STRUCT=0", + "TZ=\"$TZ\"", NO_ISNAN, TARGET_API_MAC_CARBON, SQUEAK_BUILTIN_PLUGIN, @@ -1832,6 +1837,7 @@ "COGMTVM=1", "DEBUGVM=1", "USE_GLOBAL_STRUCT=0", + "TZ=\"$TZ\"", HAVE_SYS_TIME_H, SQUEAK_BUILTIN_PLUGIN, TARGET_API_MAC_CARBON, @@ -1855,6 +1861,7 @@ "COGMTVM=1", "DEBUGVM=0", "USE_GLOBAL_STRUCT=0", + "TZ=\"$TZ\"", HAVE_SYS_TIME_H, SQUEAK_BUILTIN_PLUGIN, TARGET_API_MAC_CARBON, @@ -1883,6 +1890,7 @@ "NDEBUG=1", "COGMTVM=1", "USE_GLOBAL_STRUCT=0", + "TZ=\"$TZ\"", HAVE_SYS_TIME_H, SQUEAK_BUILTIN_PLUGIN, TARGET_API_MAC_CARBON, Modified: branches/Cog/build.macos32x86/squeak.cog.v3/CoreVM.xcodeproj/project.pbxproj =================================================================== --- branches/Cog/build.macos32x86/squeak.cog.v3/CoreVM.xcodeproj/project.pbxproj 2014-07-24 08:23:09 UTC (rev 3054) +++ branches/Cog/build.macos32x86/squeak.cog.v3/CoreVM.xcodeproj/project.pbxproj 2014-07-24 17:11:23 UTC (rev 3055) @@ -1619,6 +1619,7 @@ "COGMTVM=0", "DEBUGVM=0", "USE_GLOBAL_STRUCT=0", + "TZ=\"$TZ\"", NO_ISNAN, TARGET_API_MAC_CARBON, SQUEAK_BUILTIN_PLUGIN, @@ -1659,6 +1660,7 @@ "COGMTVM=0", "DEBUGVM=0", "USE_GLOBAL_STRUCT=0", + "TZ=\"$TZ\"", HAVE_SYS_TIME_H, SQUEAK_BUILTIN_PLUGIN, TARGET_API_MAC_CARBON, @@ -1689,6 +1691,7 @@ "COGMTVM=0", "DEBUGVM=1", "USE_GLOBAL_STRUCT=0", + "TZ=\"$TZ\"", NO_ISNAN, TARGET_API_MAC_CARBON, SQUEAK_BUILTIN_PLUGIN, @@ -1743,6 +1746,7 @@ "COGMTVM=0", "DEBUGVM=0", "USE_GLOBAL_STRUCT=0", + "TZ=\"$TZ\"", TARGET_API_MAC_CARBON, SQUEAK_BUILTIN_PLUGIN, HAVE_SYS_TIME_H, @@ -1794,6 +1798,7 @@ "COGMTVM=0", "DEBUGVM=0", "USE_GLOBAL_STRUCT=0", + "TZ=\"$TZ\"", NO_ISNAN, TARGET_API_MAC_CARBON, SQUEAK_BUILTIN_PLUGIN, @@ -1834,6 +1839,7 @@ "COGMTVM=0", "DEBUGVM=1", "USE_GLOBAL_STRUCT=0", + "TZ=\"$TZ\"", HAVE_SYS_TIME_H, SQUEAK_BUILTIN_PLUGIN, TARGET_API_MAC_CARBON, @@ -1857,6 +1863,7 @@ "COGMTVM=0", "DEBUGVM=0", "USE_GLOBAL_STRUCT=0", + "TZ=\"$TZ\"", HAVE_SYS_TIME_H, SQUEAK_BUILTIN_PLUGIN, TARGET_API_MAC_CARBON, @@ -1885,6 +1892,7 @@ "NDEBUG=1", "COGMTVM=0", "USE_GLOBAL_STRUCT=0", + "TZ=\"$TZ\"", HAVE_SYS_TIME_H, SQUEAK_BUILTIN_PLUGIN, TARGET_API_MAC_CARBON, Modified: branches/Cog/build.macos32x86/squeak.cog.v3/makevm =================================================================== --- branches/Cog/build.macos32x86/squeak.cog.v3/makevm 2014-07-24 08:23:09 UTC (rev 3054) +++ branches/Cog/build.macos32x86/squeak.cog.v3/makevm 2014-07-24 17:11:23 UTC (rev 3055) @@ -63,6 +63,7 @@ echo rm \"build/$VMXCP.build/$BUILD_CONFIGURATION/$OBJDIR/version.o\" rm "build/$VMXCP.build/$BUILD_CONFIGURATION/$OBJDIR/version.o" echo $VMXCP xcodebuild -project $VMXCP.xcodeproj -configuration $BUILD_CONFIGURATION +export TZ="`date +%Z`" xcodebuild -project $VMXCP.xcodeproj -configuration $BUILD_CONFIGURATION if [ -d "$DEST" ]; then mv build/$BUILD_CONFIGURATION/$APP/* "$DEST" Modified: branches/Cog/build.macos32x86/squeak.sista.spur/CoreVM.xcodeproj/project.pbxproj =================================================================== --- branches/Cog/build.macos32x86/squeak.sista.spur/CoreVM.xcodeproj/project.pbxproj 2014-07-24 08:23:09 UTC (rev 3054) +++ branches/Cog/build.macos32x86/squeak.sista.spur/CoreVM.xcodeproj/project.pbxproj 2014-07-24 17:11:23 UTC (rev 3055) @@ -1613,6 +1613,7 @@ "COGMTVM=0", "DEBUGVM=0", "USE_GLOBAL_STRUCT=0", + "TZ=\"$TZ\"", NO_ISNAN, TARGET_API_MAC_CARBON, SQUEAK_BUILTIN_PLUGIN, @@ -1653,6 +1654,7 @@ "COGMTVM=0", "DEBUGVM=0", "USE_GLOBAL_STRUCT=0", + "TZ=\"$TZ\"", HAVE_SYS_TIME_H, SQUEAK_BUILTIN_PLUGIN, TARGET_API_MAC_CARBON, @@ -1683,6 +1685,7 @@ "COGMTVM=0", "DEBUGVM=1", "USE_GLOBAL_STRUCT=0", + "TZ=\"$TZ\"", NO_ISNAN, TARGET_API_MAC_CARBON, SQUEAK_BUILTIN_PLUGIN, @@ -1737,6 +1740,7 @@ "COGMTVM=0", "DEBUGVM=0", "USE_GLOBAL_STRUCT=0", + "TZ=\"$TZ\"", TARGET_API_MAC_CARBON, SQUEAK_BUILTIN_PLUGIN, HAVE_SYS_TIME_H, @@ -1788,6 +1792,7 @@ "COGMTVM=0", "DEBUGVM=0", "USE_GLOBAL_STRUCT=0", + "TZ=\"$TZ\"", NO_ISNAN, TARGET_API_MAC_CARBON, SQUEAK_BUILTIN_PLUGIN, @@ -1828,6 +1833,7 @@ "COGMTVM=0", "DEBUGVM=1", "USE_GLOBAL_STRUCT=0", + "TZ=\"$TZ\"", HAVE_SYS_TIME_H, SQUEAK_BUILTIN_PLUGIN, TARGET_API_MAC_CARBON, @@ -1851,6 +1857,7 @@ "COGMTVM=0", "DEBUGVM=0", "USE_GLOBAL_STRUCT=0", + "TZ=\"$TZ\"", HAVE_SYS_TIME_H, SQUEAK_BUILTIN_PLUGIN, TARGET_API_MAC_CARBON, @@ -1879,6 +1886,7 @@ "NDEBUG=1", "COGMTVM=0", "USE_GLOBAL_STRUCT=0", + "TZ=\"$TZ\"", HAVE_SYS_TIME_H, SQUEAK_BUILTIN_PLUGIN, TARGET_API_MAC_CARBON, Modified: branches/Cog/build.macos32x86/squeak.sista.spur/makevm =================================================================== --- branches/Cog/build.macos32x86/squeak.sista.spur/makevm 2014-07-24 08:23:09 UTC (rev 3054) +++ branches/Cog/build.macos32x86/squeak.sista.spur/makevm 2014-07-24 17:11:23 UTC (rev 3055) @@ -63,6 +63,7 @@ echo rm \"build/$VMXCP.build/$BUILD_CONFIGURATION/$OBJDIR/version.o\" rm "build/$VMXCP.build/$BUILD_CONFIGURATION/$OBJDIR/version.o" echo $VMXCP xcodebuild -project $VMXCP.xcodeproj -configuration $BUILD_CONFIGURATION +export TZ="`date +%Z`" xcodebuild -project $VMXCP.xcodeproj -configuration $BUILD_CONFIGURATION if [ -d "$DEST" ]; then mv build/$BUILD_CONFIGURATION/$APP/* "$DEST" Modified: branches/Cog/build.macos32x86/squeak.sista.v3/CoreVM.xcodeproj/project.pbxproj =================================================================== --- branches/Cog/build.macos32x86/squeak.sista.v3/CoreVM.xcodeproj/project.pbxproj 2014-07-24 08:23:09 UTC (rev 3054) +++ branches/Cog/build.macos32x86/squeak.sista.v3/CoreVM.xcodeproj/project.pbxproj 2014-07-24 17:11:23 UTC (rev 3055) @@ -1617,6 +1617,7 @@ "COGMTVM=0", "DEBUGVM=0", "USE_GLOBAL_STRUCT=0", + "TZ=\"$TZ\"", NO_ISNAN, TARGET_API_MAC_CARBON, SQUEAK_BUILTIN_PLUGIN, @@ -1657,6 +1658,7 @@ "COGMTVM=0", "DEBUGVM=0", "USE_GLOBAL_STRUCT=0", + "TZ=\"$TZ\"", HAVE_SYS_TIME_H, SQUEAK_BUILTIN_PLUGIN, TARGET_API_MAC_CARBON, @@ -1687,6 +1689,7 @@ "COGMTVM=0", "DEBUGVM=1", "USE_GLOBAL_STRUCT=0", + "TZ=\"$TZ\"", NO_ISNAN, TARGET_API_MAC_CARBON, SQUEAK_BUILTIN_PLUGIN, @@ -1741,6 +1744,7 @@ "COGMTVM=0", "DEBUGVM=0", "USE_GLOBAL_STRUCT=0", + "TZ=\"$TZ\"", TARGET_API_MAC_CARBON, SQUEAK_BUILTIN_PLUGIN, HAVE_SYS_TIME_H, @@ -1792,6 +1796,7 @@ "COGMTVM=0", "DEBUGVM=0", "USE_GLOBAL_STRUCT=0", + "TZ=\"$TZ\"", NO_ISNAN, TARGET_API_MAC_CARBON, SQUEAK_BUILTIN_PLUGIN, @@ -1832,6 +1837,7 @@ "COGMTVM=0", "DEBUGVM=1", "USE_GLOBAL_STRUCT=0", + "TZ=\"$TZ\"", HAVE_SYS_TIME_H, SQUEAK_BUILTIN_PLUGIN, TARGET_API_MAC_CARBON, @@ -1855,6 +1861,7 @@ "COGMTVM=0", "DEBUGVM=0", "USE_GLOBAL_STRUCT=0", + "TZ=\"$TZ\"", HAVE_SYS_TIME_H, SQUEAK_BUILTIN_PLUGIN, TARGET_API_MAC_CARBON, @@ -1883,6 +1890,7 @@ "NDEBUG=1", "COGMTVM=0", "USE_GLOBAL_STRUCT=0", + "TZ=\"$TZ\"", HAVE_SYS_TIME_H, SQUEAK_BUILTIN_PLUGIN, TARGET_API_MAC_CARBON, Modified: branches/Cog/build.macos32x86/squeak.sista.v3/makevm =================================================================== --- branches/Cog/build.macos32x86/squeak.sista.v3/makevm 2014-07-24 08:23:09 UTC (rev 3054) +++ branches/Cog/build.macos32x86/squeak.sista.v3/makevm 2014-07-24 17:11:23 UTC (rev 3055) @@ -63,6 +63,7 @@ echo rm \"build/$VMXCP.build/$BUILD_CONFIGURATION/$OBJDIR/version.o\" rm "build/$VMXCP.build/$BUILD_CONFIGURATION/$OBJDIR/version.o" echo $VMXCP xcodebuild -project $VMXCP.xcodeproj -configuration $BUILD_CONFIGURATION +export TZ="`date +%Z`" xcodebuild -project $VMXCP.xcodeproj -configuration $BUILD_CONFIGURATION if [ -d "$DEST" ]; then mv build/$BUILD_CONFIGURATION/$APP/* "$DEST" Modified: branches/Cog/build.macos32x86/squeak.stack.spur/CoreVM.xcodeproj/project.pbxproj =================================================================== --- branches/Cog/build.macos32x86/squeak.stack.spur/CoreVM.xcodeproj/project.pbxproj 2014-07-24 08:23:09 UTC (rev 3054) +++ branches/Cog/build.macos32x86/squeak.stack.spur/CoreVM.xcodeproj/project.pbxproj 2014-07-24 17:11:23 UTC (rev 3055) @@ -1592,6 +1592,7 @@ GCC_PREPROCESSOR_DEFINITIONS = ( "DEBUGVM=0", "USE_GLOBAL_STRUCT=0", + "TZ=\"$TZ\"", "VM_LABEL(foo)=0", NO_ISNAN, TARGET_API_MAC_CARBON, @@ -1632,6 +1633,7 @@ GCC_PREPROCESSOR_DEFINITIONS = ( "DEBUGVM=0", "USE_GLOBAL_STRUCT=0", + "TZ=\"$TZ\"", "VM_LABEL(foo)=0", HAVE_SYS_TIME_H, SQUEAK_BUILTIN_PLUGIN, @@ -1662,6 +1664,7 @@ GCC_PREPROCESSOR_DEFINITIONS = ( "DEBUGVM=1", "USE_GLOBAL_STRUCT=0", + "TZ=\"$TZ\"", "VM_LABEL(foo)=0", NO_ISNAN, TARGET_API_MAC_CARBON, @@ -1716,6 +1719,7 @@ "NDEBUG=1", "DEBUGVM=0", "USE_GLOBAL_STRUCT=0", + "TZ=\"$TZ\"", TARGET_API_MAC_CARBON, SQUEAK_BUILTIN_PLUGIN, HAVE_SYS_TIME_H, @@ -1766,6 +1770,7 @@ "NDEBUG=1", "DEBUGVM=0", "USE_GLOBAL_STRUCT=0", + "TZ=\"$TZ\"", NO_ISNAN, TARGET_API_MAC_CARBON, SQUEAK_BUILTIN_PLUGIN, @@ -1805,6 +1810,7 @@ GCC_PREPROCESSOR_DEFINITIONS = ( "DEBUGVM=1", "USE_GLOBAL_STRUCT=0", + "TZ=\"$TZ\"", "VM_LABEL(foo)=0", HAVE_SYS_TIME_H, SQUEAK_BUILTIN_PLUGIN, @@ -1828,6 +1834,7 @@ "NDEBUG=1", "DEBUGVM=0", "USE_GLOBAL_STRUCT=0", + "TZ=\"$TZ\"", HAVE_SYS_TIME_H, SQUEAK_BUILTIN_PLUGIN, TARGET_API_MAC_CARBON, @@ -1855,6 +1862,7 @@ GCC_PREPROCESSOR_DEFINITIONS = ( "NDEBUG=1", "USE_GLOBAL_STRUCT=0", + "TZ=\"$TZ\"", HAVE_SYS_TIME_H, SQUEAK_BUILTIN_PLUGIN, TARGET_API_MAC_CARBON, Modified: branches/Cog/build.macos32x86/squeak.stack.spur/makevm =================================================================== --- branches/Cog/build.macos32x86/squeak.stack.spur/makevm 2014-07-24 08:23:09 UTC (rev 3054) +++ branches/Cog/build.macos32x86/squeak.stack.spur/makevm 2014-07-24 17:11:23 UTC (rev 3055) @@ -59,6 +59,7 @@ echo rm \"build/$VMXCP.build/$BUILD_CONFIGURATION/$OBJDIR/version.o\" rm "build/$VMXCP.build/$BUILD_CONFIGURATION/$OBJDIR/version.o" echo $VMXCP xcodebuild -project $VMXCP.xcodeproj -configuration $BUILD_CONFIGURATION +export TZ="`date +%Z`" xcodebuild -project $VMXCP.xcodeproj -configuration $BUILD_CONFIGURATION if [ -d "$DEST" ]; then mv build/$BUILD_CONFIGURATION/$APP/* "$DEST" Modified: branches/Cog/build.macos32x86/squeak.stack.v3/CoreVM.xcodeproj/project.pbxproj =================================================================== --- branches/Cog/build.macos32x86/squeak.stack.v3/CoreVM.xcodeproj/project.pbxproj 2014-07-24 08:23:09 UTC (rev 3054) +++ branches/Cog/build.macos32x86/squeak.stack.v3/CoreVM.xcodeproj/project.pbxproj 2014-07-24 17:11:23 UTC (rev 3055) @@ -1596,6 +1596,7 @@ GCC_PREPROCESSOR_DEFINITIONS = ( "DEBUGVM=0", "USE_GLOBAL_STRUCT=0", + "TZ=\"$TZ\"", "VM_LABEL(foo)=0", NO_ISNAN, TARGET_API_MAC_CARBON, @@ -1636,6 +1637,7 @@ GCC_PREPROCESSOR_DEFINITIONS = ( "DEBUGVM=0", "USE_GLOBAL_STRUCT=0", + "TZ=\"$TZ\"", "VM_LABEL(foo)=0", HAVE_SYS_TIME_H, SQUEAK_BUILTIN_PLUGIN, @@ -1666,6 +1668,7 @@ GCC_PREPROCESSOR_DEFINITIONS = ( "DEBUGVM=1", "USE_GLOBAL_STRUCT=0", + "TZ=\"$TZ\"", "VM_LABEL(foo)=0", NO_ISNAN, TARGET_API_MAC_CARBON, @@ -1720,6 +1723,7 @@ "NDEBUG=1", "DEBUGVM=0", "USE_GLOBAL_STRUCT=0", + "TZ=\"$TZ\"", TARGET_API_MAC_CARBON, SQUEAK_BUILTIN_PLUGIN, HAVE_SYS_TIME_H, @@ -1770,6 +1774,7 @@ "NDEBUG=1", "DEBUGVM=0", "USE_GLOBAL_STRUCT=0", + "TZ=\"$TZ\"", NO_ISNAN, TARGET_API_MAC_CARBON, SQUEAK_BUILTIN_PLUGIN, @@ -1809,6 +1814,7 @@ GCC_PREPROCESSOR_DEFINITIONS = ( "DEBUGVM=1", "USE_GLOBAL_STRUCT=0", + "TZ=\"$TZ\"", "VM_LABEL(foo)=0", HAVE_SYS_TIME_H, SQUEAK_BUILTIN_PLUGIN, @@ -1832,6 +1838,7 @@ "NDEBUG=1", "DEBUGVM=0", "USE_GLOBAL_STRUCT=0", + "TZ=\"$TZ\"", HAVE_SYS_TIME_H, SQUEAK_BUILTIN_PLUGIN, TARGET_API_MAC_CARBON, @@ -1859,6 +1866,7 @@ GCC_PREPROCESSOR_DEFINITIONS = ( "NDEBUG=1", "USE_GLOBAL_STRUCT=0", + "TZ=\"$TZ\"", HAVE_SYS_TIME_H, SQUEAK_BUILTIN_PLUGIN, TARGET_API_MAC_CARBON, Modified: branches/Cog/build.macos32x86/squeak.stack.v3/makevm =================================================================== --- branches/Cog/build.macos32x86/squeak.stack.v3/makevm 2014-07-24 08:23:09 UTC (rev 3054) +++ branches/Cog/build.macos32x86/squeak.stack.v3/makevm 2014-07-24 17:11:23 UTC (rev 3055) @@ -59,6 +59,7 @@ echo rm \"build/$VMXCP.build/$BUILD_CONFIGURATION/$OBJDIR/version.o\" rm "build/$VMXCP.build/$BUILD_CONFIGURATION/$OBJDIR/version.o" echo $VMXCP xcodebuild -project $VMXCP.xcodeproj -configuration $BUILD_CONFIGURATION +export TZ="`date +%Z`" xcodebuild -project $VMXCP.xcodeproj -configuration $BUILD_CONFIGURATION if [ -d "$DEST" ]; then mv build/$BUILD_CONFIGURATION/$APP/* "$DEST" Modified: branches/Cog/build.win32x86/newspeak.cog.spur/Makefile =================================================================== --- branches/Cog/build.win32x86/newspeak.cog.spur/Makefile 2014-07-24 08:23:09 UTC (rev 3054) +++ branches/Cog/build.win32x86/newspeak.cog.spur/Makefile 2014-07-24 17:11:23 UTC (rev 3055) @@ -127,8 +127,9 @@ NOBUILTIN:= -D_MT -fno-builtin-printf -fno-builtin-putchar -fno-builtin-fprintf CFLAGS:= $(INCLUDEPATH) -msse2 -ggdb2 -mwindows -mthreads -mno-cygwin -mwin32 \ -mno-rtd -mms-bitfields -mno-accumulate-outgoing-args $(OFLAGS) $(NOBUILTIN) +TZ:=$(shell date +%Z) DEFS:= -D'VM_NAME="$(VM_NAME)"' -DDEBUGVM=$(DEBUGVM) \ - -DNO_SERVICE -DNO_STD_FILE_SUPPORT \ + -DNO_SERVICE -DNO_STD_FILE_SUPPORT -D'TZ="$(TZ)"' \ $(WINDEFS) -DNO_ISNAN -DNO_SERVICE $(NDEBUG) -DLSB_FIRST -DX86 $(XDEFS) XDEFS:= -DSQUEAK_BUILTIN_PLUGIN INCLUDES:= -I. -I$(VMDIR) -I$(WIN32DIR) -I$(CROSSDIR) -I$(DXDIR) $(XINC) @@ -141,11 +142,11 @@ # Newer cygwins want --export-all-symbols in place of --export-dynamic. # LD:= gcc -EXPORT:=--export-dynamic -#EXPORT:=--export-all-symbols -BASELDFLAGS:=-mno-cygwin -mthreads -Wl,--large-address-aware,$(EXPORT) -L/usr/lib/mingw -LDFLAGS:= -mwindows $(BASELDFLAGS) -CONSOLELDFLAGS:= -mconsole $(BASELDFLAGS) +EXPORT:=--export-dynamic +#EXPORT:=--export-all-symbols +BASELDFLAGS:=-mno-cygwin -mthreads -Wl,--large-address-aware,$(EXPORT) -L/usr/lib/mingw +LDFLAGS:= -mwindows $(BASELDFLAGS) +CONSOLELDFLAGS:= -mconsole $(BASELDFLAGS) STDLIBS:= -lddraw -ldinput -lopengl32 -lwsock32 -lcomdlg32 -lole32 -lwinmm \ -lversion -lwininet -luser32 -lgdi32 -lpsapi -lkernel32 -lcrtdll \ -ldsound -lsecur32 Modified: branches/Cog/build.win32x86/newspeak.cog.v3/Makefile =================================================================== --- branches/Cog/build.win32x86/newspeak.cog.v3/Makefile 2014-07-24 08:23:09 UTC (rev 3054) +++ branches/Cog/build.win32x86/newspeak.cog.v3/Makefile 2014-07-24 17:11:23 UTC (rev 3055) @@ -127,8 +127,9 @@ NOBUILTIN:= -D_MT -fno-builtin-printf -fno-builtin-putchar -fno-builtin-fprintf CFLAGS:= $(INCLUDEPATH) -msse2 -ggdb2 -mwindows -mthreads -mno-cygwin -mwin32 \ -mno-rtd -mms-bitfields -mno-accumulate-outgoing-args $(OFLAGS) $(NOBUILTIN) +TZ:=$(shell date +%Z) DEFS:= -D'VM_NAME="$(VM_NAME)"' -DDEBUGVM=$(DEBUGVM) \ - -DNO_SERVICE -DNO_STD_FILE_SUPPORT \ + -DNO_SERVICE -DNO_STD_FILE_SUPPORT -D'TZ="$(TZ)"' \ $(WINDEFS) -DNO_ISNAN -DNO_SERVICE $(NDEBUG) -DLSB_FIRST -DX86 $(XDEFS) XDEFS:= -DSQUEAK_BUILTIN_PLUGIN INCLUDES:= -I. -I$(VMDIR) -I$(WIN32DIR) -I$(CROSSDIR) -I$(DXDIR) $(XINC) @@ -141,11 +142,11 @@ # Newer cygwins want --export-all-symbols in place of --export-dynamic. # LD:= gcc -EXPORT:=--export-dynamic -#EXPORT:=--export-all-symbols -BASELDFLAGS:=-mno-cygwin -mthreads -Wl,--large-address-aware,$(EXPORT) -L/usr/lib/mingw -LDFLAGS:= -mwindows $(BASELDFLAGS) -CONSOLELDFLAGS:= -mconsole $(BASELDFLAGS) +EXPORT:=--export-dynamic +#EXPORT:=--export-all-symbols +BASELDFLAGS:=-mno-cygwin -mthreads -Wl,--large-address-aware,$(EXPORT) -L/usr/lib/mingw +LDFLAGS:= -mwindows $(BASELDFLAGS) +CONSOLELDFLAGS:= -mconsole $(BASELDFLAGS) STDLIBS:= -lddraw -ldinput -lopengl32 -lwsock32 -lcomdlg32 -lole32 -lwinmm \ -lversion -lwininet -luser32 -lgdi32 -lpsapi -lkernel32 -lcrtdll \ -ldsound -lsecur32 Modified: branches/Cog/build.win32x86/newspeak.stack.spur/Makefile =================================================================== --- branches/Cog/build.win32x86/newspeak.stack.spur/Makefile 2014-07-24 08:23:09 UTC (rev 3054) +++ branches/Cog/build.win32x86/newspeak.stack.spur/Makefile 2014-07-24 17:11:23 UTC (rev 3055) @@ -128,8 +128,9 @@ NOBUILTIN:= -D_MT -fno-builtin-printf -fno-builtin-putchar -fno-builtin-fprintf CFLAGS:= $(INCLUDEPATH) -msse2 -ggdb2 -mwindows -mthreads -mno-cygwin -mwin32 \ -mno-rtd -mms-bitfields -mno-accumulate-outgoing-args $(OFLAGS) $(NOBUILTIN) +TZ:=$(shell date +%Z) DEFS:= -D'VM_NAME="$(VM_NAME)"' -DDEBUGVM=$(DEBUGVM) \ - -DNO_SERVICE -DNO_STD_FILE_SUPPORT \ + -DNO_SERVICE -DNO_STD_FILE_SUPPORT -D'TZ="$(TZ)"' \ $(WINDEFS) -DNO_ISNAN -DNO_SERVICE $(NDEBUG) -DLSB_FIRST -DX86 $(XDEFS) XDEFS:= -DSQUEAK_BUILTIN_PLUGIN INCLUDES:= -I. -I$(VMDIR) -I$(WIN32DIR) -I$(CROSSDIR) -I$(DXDIR) $(XINC) @@ -142,11 +143,11 @@ # Newer cygwins want --export-all-symbols in place of --export-dynamic. # LD:= gcc -EXPORT:=--export-dynamic -#EXPORT:=--export-all-symbols -BASELDFLAGS:=-mno-cygwin -mthreads -Wl,--large-address-aware,$(EXPORT) -L/usr/lib/mingw -LDFLAGS:= -mwindows $(BASELDFLAGS) -CONSOLELDFLAGS:= -mconsole $(BASELDFLAGS) +EXPORT:=--export-dynamic +#EXPORT:=--export-all-symbols +BASELDFLAGS:=-mno-cygwin -mthreads -Wl,--large-address-aware,$(EXPORT) -L/usr/lib/mingw +LDFLAGS:= -mwindows $(BASELDFLAGS) +CONSOLELDFLAGS:= -mconsole $(BASELDFLAGS) STDLIBS:= -lddraw -ldinput -lopengl32 -lwsock32 -lcomdlg32 -lole32 -lwinmm \ -lversion -lwininet -luser32 -lgdi32 -lpsapi -lkernel32 -lcrtdll \ -ldsound -lsecur32 Modified: branches/Cog/build.win32x86/newspeak.stack.v3/Makefile =================================================================== --- branches/Cog/build.win32x86/newspeak.stack.v3/Makefile 2014-07-24 08:23:09 UTC (rev 3054) +++ branches/Cog/build.win32x86/newspeak.stack.v3/Makefile 2014-07-24 17:11:23 UTC (rev 3055) @@ -128,8 +128,9 @@ NOBUILTIN:= -D_MT -fno-builtin-printf -fno-builtin-putchar -fno-builtin-fprintf CFLAGS:= $(INCLUDEPATH) -msse2 -ggdb2 -mwindows -mthreads -mno-cygwin -mwin32 \ -mno-rtd -mms-bitfields -mno-accumulate-outgoing-args $(OFLAGS) $(NOBUILTIN) +TZ:=$(shell date +%Z) DEFS:= -D'VM_NAME="$(VM_NAME)"' -DDEBUGVM=$(DEBUGVM) \ - -DNO_SERVICE -DNO_STD_FILE_SUPPORT \ + -DNO_SERVICE -DNO_STD_FILE_SUPPORT -D'TZ="$(TZ)"' \ $(WINDEFS) -DNO_ISNAN -DNO_SERVICE $(NDEBUG) -DLSB_FIRST -DX86 $(XDEFS) XDEFS:= -DSQUEAK_BUILTIN_PLUGIN INCLUDES:= -I. -I$(VMDIR) -I$(WIN32DIR) -I$(CROSSDIR) -I$(DXDIR) $(XINC) @@ -142,11 +143,11 @@ # Newer cygwins want --export-all-symbols in place of --export-dynamic. # LD:= gcc -EXPORT:=--export-dynamic -#EXPORT:=--export-all-symbols -BASELDFLAGS:=-mno-cygwin -mthreads -Wl,--large-address-aware,$(EXPORT) -L/usr/lib/mingw -LDFLAGS:= -mwindows $(BASELDFLAGS) -CONSOLELDFLAGS:= -mconsole $(BASELDFLAGS) +EXPORT:=--export-dynamic +#EXPORT:=--export-all-symbols +BASELDFLAGS:=-mno-cygwin -mthreads -Wl,--large-address-aware,$(EXPORT) -L/usr/lib/mingw +LDFLAGS:= -mwindows $(BASELDFLAGS) +CONSOLELDFLAGS:= -mconsole $(BASELDFLAGS) STDLIBS:= -lddraw -ldinput -lopengl32 -lwsock32 -lcomdlg32 -lole32 -lwinmm \ -lversion -lwininet -luser32 -lgdi32 -lpsapi -lkernel32 -lcrtdll \ -ldsound -lsecur32 Modified: branches/Cog/build.win32x86/squeak.cog.spur/Makefile =================================================================== --- branches/Cog/build.win32x86/squeak.cog.spur/Makefile 2014-07-24 08:23:09 UTC (rev 3054) +++ branches/Cog/build.win32x86/squeak.cog.spur/Makefile 2014-07-24 17:11:23 UTC (rev 3055) @@ -131,8 +131,9 @@ NOBUILTIN:= -D_MT -fno-builtin-printf -fno-builtin-putchar -fno-builtin-fprintf CFLAGS:= $(INCLUDEPATH) -msse2 -ggdb2 -mwindows -mthreads -mno-cygwin -mwin32 \ -mno-rtd -mms-bitfields -mno-accumulate-outgoing-args $(OFLAGS) $(NOBUILTIN) +TZ:=$(shell date +%Z) DEFS:= $(COGDEFS) $(WINVER) -DWIN32 -DWIN32_FILE_SUPPORT -DNO_ISNAN \ - -DNO_SERVICE -DNO_STD_FILE_SUPPORT \ + -DNO_SERVICE -DNO_STD_FILE_SUPPORT -D'TZ="$(TZ)"' \ $(NDEBUG) -DLSB_FIRST -D'VM_NAME="$(VM_NAME)"' -DX86 $(XDEFS) $(CROQUET) XDEFS:= -DSQUEAK_BUILTIN_PLUGIN INCLUDES:= -I. -I$(VMDIR) -I$(WIN32DIR) -I$(CROSSDIR) -I$(DXDIR) $(XINC) Modified: branches/Cog/build.win32x86/squeak.cog.v3/Makefile =================================================================== --- branches/Cog/build.win32x86/squeak.cog.v3/Makefile 2014-07-24 08:23:09 UTC (rev 3054) +++ branches/Cog/build.win32x86/squeak.cog.v3/Makefile 2014-07-24 17:11:23 UTC (rev 3055) @@ -151,8 +151,9 @@ NOBUILTIN:= -D_MT -fno-builtin-printf -fno-builtin-putchar -fno-builtin-fprintf CFLAGS:= $(INCLUDEPATH) -msse2 -ggdb2 -mwindows -mthreads -mno-cygwin -mwin32 \ -mno-rtd -mms-bitfields -mno-accumulate-outgoing-args $(OFLAGS) $(NOBUILTIN) +TZ:=$(shell date +%Z) DEFS:= $(COGDEFS) $(WINVER) -DWIN32 -DWIN32_FILE_SUPPORT -DNO_ISNAN \ - -DNO_SERVICE -DNO_STD_FILE_SUPPORT \ + -DNO_SERVICE -DNO_STD_FILE_SUPPORT -D'TZ="$(TZ)"' \ $(NDEBUG) -DLSB_FIRST -D'VM_NAME="$(VM_NAME)"' -DX86 $(XDEFS) $(CROQUET) XDEFS:= -DSQUEAK_BUILTIN_PLUGIN INCLUDES:= -I. -I$(VMDIR) -I$(WIN32DIR) -I$(CROSSDIR) -I$(DXDIR) $(XINC) @@ -165,11 +166,11 @@ # Newer cygwins want --export-all-symbols in place of --export-dynamic. # LD:= gcc -EXPORT:=--export-dynamic -#EXPORT:=--export-all-symbols -BASELDFLAGS:=-mno-cygwin -mthreads -Wl,--large-address-aware,$(EXPORT) -L/usr/lib/mingw -LDFLAGS:= -mwindows $(BASELDFLAGS) -CONSOLELDFLAGS:= -mconsole $(BASELDFLAGS) +EXPORT:=--export-dynamic +#EXPORT:=--export-all-symbols +BASELDFLAGS:=-mno-cygwin -mthreads -Wl,--large-address-aware,$(EXPORT) -L/usr/lib/mingw +LDFLAGS:= -mwindows $(BASELDFLAGS) +CONSOLELDFLAGS:= -mconsole $(BASELDFLAGS) STDLIBS:= -lddraw -ldinput -lopengl32 -lwsock32 -lcomdlg32 -lole32 -lwinmm \ -lversion -lwininet -luser32 -lgdi32 -lpsapi -lkernel32 -lcrtdll \ -ldsound -lsecur32 Modified: branches/Cog/build.win32x86/squeak.stack.spur/Makefile =================================================================== --- branches/Cog/build.win32x86/squeak.stack.spur/Makefile 2014-07-24 08:23:09 UTC (rev 3054) +++ branches/Cog/build.win32x86/squeak.stack.spur/Makefile 2014-07-24 17:11:23 UTC (rev 3055) @@ -132,8 +132,9 @@ NOBUILTIN:= -D_MT -fno-builtin-printf -fno-builtin-putchar -fno-builtin-fprintf CFLAGS:= $(INCLUDEPATH) -msse2 -ggdb2 -mwindows -mthreads -mno-cygwin -mwin32 \ -mno-rtd -mms-bitfields -mno-accumulate-outgoing-args $(OFLAGS) $(NOBUILTIN) +TZ:=$(shell date +%Z) DEFS:= $(COGDEFS) $(WINVER) -DWIN32 -DWIN32_FILE_SUPPORT -DNO_ISNAN \ - -DNO_SERVICE -DNO_STD_FILE_SUPPORT \ + -DNO_SERVICE -DNO_STD_FILE_SUPPORT -D'TZ="$(TZ)"' \ $(NDEBUG) -DLSB_FIRST -D'VM_NAME="$(VM_NAME)"' -DX86 $(XDEFS) $(CROQUET) XDEFS:= -DSQUEAK_BUILTIN_PLUGIN INCLUDES:= -I. -I$(VMDIR) -I$(WIN32DIR) -I$(CROSSDIR) -I$(DXDIR) $(XINC) @@ -146,11 +147,11 @@ # Newer cygwins want --export-all-symbols in place of --export-dynamic. # LD:= gcc -EXPORT:=--export-dynamic -#EXPORT:=--export-all-symbols -BASELDFLAGS:=-mno-cygwin -mthreads -Wl,--large-address-aware,$(EXPORT) -L/usr/lib/mingw -LDFLAGS:= -mwindows $(BASELDFLAGS) -CONSOLELDFLAGS:= -mconsole $(BASELDFLAGS) +EXPORT:=--export-dynamic +#EXPORT:=--export-all-symbols +BASELDFLAGS:=-mno-cygwin -mthreads -Wl,--large-address-aware,$(EXPORT) -L/usr/lib/mingw +LDFLAGS:= -mwindows $(BASELDFLAGS) +CONSOLELDFLAGS:= -mconsole $(BASELDFLAGS) STDLIBS:= -lddraw -ldinput -lopengl32 -lwsock32 -lcomdlg32 -lole32 -lwinmm \ -lversion -lwininet -luser32 -lgdi32 -lpsapi -lkernel32 -lcrtdll \ -ldsound -lsecur32 Modified: branches/Cog/build.win32x86/squeak.stack.v3/Makefile =================================================================== --- branches/Cog/build.win32x86/squeak.stack.v3/Makefile 2014-07-24 08:23:09 UTC (rev 3054) +++ branches/Cog/build.win32x86/squeak.stack.v3/Makefile 2014-07-24 17:11:23 UTC (rev 3055) @@ -132,8 +132,9 @@ NOBUILTIN:= -D_MT -fno-builtin-printf -fno-builtin-putchar -fno-builtin-fprintf CFLAGS:= $(INCLUDEPATH) -msse2 -ggdb2 -mwindows -mthreads -mno-cygwin -mwin32 \ -mno-rtd -mms-bitfields -mno-accumulate-outgoing-args $(OFLAGS) $(NOBUILTIN) +TZ:=$(shell date +%Z) DEFS:= $(COGDEFS) $(WINVER) -DWIN32 -DWIN32_FILE_SUPPORT -DNO_ISNAN \ - -DNO_SERVICE -DNO_STD_FILE_SUPPORT \ + -DNO_SERVICE -DNO_STD_FILE_SUPPORT -D'TZ="$(TZ)"' \ $(NDEBUG) -DLSB_FIRST -D'VM_NAME="$(VM_NAME)"' -DX86 $(XDEFS) $(CROQUET) XDEFS:= -DSQUEAK_BUILTIN_PLUGIN INCLUDES:= -I. -I$(VMDIR) -I$(WIN32DIR) -I$(CROSSDIR) -I$(DXDIR) $(XINC) @@ -146,11 +147,11 @@ # Newer cygwins want --export-all-symbols in place of --export-dynamic. # LD:= gcc -EXPORT:=--export-dynamic -#EXPORT:=--export-all-symbols -BASELDFLAGS:=-mno-cygwin -mthreads -Wl,--large-address-aware,$(EXPORT) -L/usr/lib/mingw -LDFLAGS:= -mwindows $(BASELDFLAGS) -CONSOLELDFLAGS:= -mconsole $(BASELDFLAGS) +EXPORT:=--export-dynamic +#EXPORT:=--export-all-symbols +BASELDFLAGS:=-mno-cygwin -mthreads -Wl,--large-address-aware,$(EXPORT) -L/usr/lib/mingw +LDFLAGS:= -mwindows $(BASELDFLAGS) +CONSOLELDFLAGS:= -mconsole $(BASELDFLAGS) STDLIBS:= -lddraw -ldinput -lopengl32 -lwsock32 -lcomdlg32 -lole32 -lwinmm \ -lversion -lwininet -luser32 -lgdi32 -lpsapi -lkernel32 -lcrtdll \ -ldsound -lsecur32 Property changes on: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h ___________________________________________________________________ Modified: checkindate - Wed Jul 23 22:20:26 HST 2014 + Thu Jul 24 07:09:12 HST 2014 Modified: branches/Cog/platforms/Mac OS/vm/version.c =================================================================== --- branches/Cog/platforms/Mac OS/vm/version.c 2014-07-24 08:23:09 UTC (rev 3054) +++ branches/Cog/platforms/Mac OS/vm/version.c 2014-07-24 17:11:23 UTC (rev 3055) @@ -2,4 +2,14 @@ # define __VERSION__ "Unknown" #endif -char vmBuildString[] = "Mac OS X built on "__DATE__" "__TIME__" Compiler: "__VERSION__; +#if !defined(TZ) +# define TZ "" +# define SPACER "" +#else +# define SPACER " " +#endif + +char vmBuildString[] = \ + "Mac OS X built on " \ + __DATE__" "__TIME__ SPACER TZ \ + " Compiler: " __VERSION__; Modified: branches/Cog/platforms/win32/vm/version.c =================================================================== --- branches/Cog/platforms/win32/vm/version.c 2014-07-24 08:23:09 UTC (rev 3054) +++ branches/Cog/platforms/win32/vm/version.c 2014-07-24 17:11:23 UTC (rev 3055) @@ -1,3 +1,35 @@ -#include "version.h" +#if !defined(TZ) +# define TZ "" +# define SPACER "" +#else +# define SPACER " " +#endif -char vmBuildString[] = VM_BUILD_STRING; +#ifdef _MSC_VER +# if _MSC_VER >= 1900 + define the version string here +# elif _MSC_VER >= 1800 +# define __VERSION__ "Microsoft Visual Studio 2013" +# elif _MSC_VER >= 1700 +# define __VERSION__ "Microsoft Visual Studio 2012" +# elif _MSC_VER >= 1600 +# define __VERSION__ "Microsoft Visual Studio 2010" +# elif _MSC_VER >= 1500 +# define __VERSION__ "Microsoft Visual Studio 2008" +# elif _MSC_VER >= 1400 +# define __VERSION__ "Microsoft Visual Studio 2005" +# elif _MSC_VER >= 1300 +# define __VERSION__ "Microsoft Visual Studio 2003" +# elif _MSC_VER >= 1200 +# define __VERSION__ "Microsoft Visual Studio 6" +# elif _MSC_VER >= 1100 +# define __VERSION__ "Microsoft Visual Studio 5" +# else + define the version string here +# endif //MSVC versions +#endif //MSVC versions + +char vmBuildString[] = \ + "Win32 built on " \ + __DATE__" "__TIME__ SPACER TZ \ + " Compiler: " __VERSION__; Deleted: branches/Cog/platforms/win32/vm/version.h =================================================================== --- branches/Cog/platforms/win32/vm/version.h 2014-07-24 08:23:09 UTC (rev 3054) +++ branches/Cog/platforms/win32/vm/version.h 2014-07-24 17:11:23 UTC (rev 3055) @@ -1,17 +0,0 @@ -#ifdef _MSC_VER -#if _MSC_VER >= 1600 -define the type string here -#elif _MSC_VER >= 1500 -#define VM_BUILD_STRING "Win32 built on " __DATE__ " "__TIME__ " Compiler: Microsoft Visual Studio 2008" -#elif _MSC_VER >= 1400 -#define VM_BUILD_STRING "Win32 built on " __DATE__ " "__TIME__ " Compiler: Microsoft Visual Studio 2005" -#elif _MSC_VER >= 1300 -#define VM_BUILD_STRING "Win32 built on " __DATE__ " "__TIME__ " Compiler: Microsoft Visual Studio 2003" -#elif _MSC_VER >= 1200 -#define VM_BUILD_STRING "Win32 built on " __DATE__ " "__TIME__ " Compiler: Microsoft Visual Studio 6" -#else -define the type string here -#endif //MSVC versions -#else -#define VM_BUILD_STRING "Win32 built on " __DATE__ " "__TIME__ " Compiler: "__VERSION__ -#endif

1 0

VM Maker: VMMaker.oscog-eem.833.mcz
by commits＠source.squeak.org 24 Jul '14

24 Jul '14

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.833.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.833 Author: eem Time: 23 July 2014, 11:34:44.69 pm UUID: ca999c15-a8a5-449e-82b8-8b9d683b3e1b Ancestors: VMMaker.oscog-eem.832 Start adding the SistaV1 bytecode set to the Sista VMs. Make Slang provide a comprehensible error message when certain bytecodes are as-yet-unimplemented instead of crashing horribly deep in interpreter dispatch inlining. Nuke a couple of the obsolete VMMaker subclasses. =============== Diff against VMMaker.oscog-eem.832 =============== Item was added: + ----- Method: CCodeGenerator>>abortBlock (in category 'accessing') ----- + abortBlock + ^vmMaker ifNotNil: [:vmm| vmm abortBlock]! Item was added: + ----- Method: Cogit class>>initializeBytecodeTableForSqueakV3PlusClosuresSistaV1Hybrid (in category 'class initialization') ----- + initializeBytecodeTableForSqueakV3PlusClosuresSistaV1Hybrid + "SimpleStackBasedCogit initializeBytecodeTableForSqueakV3PlusClosuresSistaV1Hybrid" + "StackToRegisterMappingCogit initializeBytecodeTableForSqueakV3PlusClosuresSistaV1Hybrid" + + | v3Table v1Table | + "N.B. Must do it backwards to evaluate AltBlockCreationBytecodeSize & BlockCreationBytecodeSize correctly." + self initializeBytecodeTableForSistaV1. + v1Table := generatorTable. + AltBlockCreationBytecodeSize := BlockCreationBytecodeSize. + self initializeBytecodeTableForSqueakV3PlusClosures. + v3Table := generatorTable. + generatorTable := CArrayAccessor on: v3Table object, v1Table object! Item was removed: - MacOSPowerPCOS9VMMaker subclass: #MacOSPowerPCOS9BrowserVMMaker - instanceVariableNames: '' - classVariableNames: '' - poolDictionaries: '' - category: 'VMMaker-Building'! - - !MacOSPowerPCOS9BrowserVMMaker commentStamp: 'tpr 5/5/2003 12:26' prior: 0! - A Special subclass of VMMaker for building MAc OS-9 browser-plugin vms! Item was removed: - ----- Method: MacOSPowerPCOS9BrowserVMMaker class>>isActiveVMMakerClassFor: (in category 'initialisation') ----- - isActiveVMMakerClassFor: platformName - ^false! Item was removed: - ----- Method: MacOSPowerPCOS9BrowserVMMaker>>initialize (in category 'initialize') ----- - initialize - super initialize. - forBrowser := true! Item was removed: - VMMaker subclass: #MacOSPowerPCOS9VMMaker - instanceVariableNames: '' - classVariableNames: '' - poolDictionaries: '' - category: 'VMMaker-Building'! - - !MacOSPowerPCOS9VMMaker commentStamp: 'tpr 5/5/2003 12:27' prior: 0! - A VMMaker subclass to suit Mac OS! Item was removed: - ----- Method: MacOSPowerPCOS9VMMaker class>>isActiveVMMakerClassFor: (in category 'initialisation') ----- - isActiveVMMakerClassFor: platformName - "Does this class claim to be that properly active subclass of VMMaker for this platform?" - - ^platformName = 'Mac OS'" and: [Smalltalk platformSubtype = 'PowerPC'] <- this used to be used but prevents any attempt to do the crossplatform generation thang. How can we handle that bit properly?"! Item was removed: - ----- Method: MacOSPowerPCOS9VMMaker>>createCodeGenerator (in category 'initialize') ----- - createCodeGenerator - "Set up a CCodeGenerator for this VMMaker - Mac OS uses the global struct and local def of the - structure. The global struct/loca def regime appears to be about 10% faster than the default - regime for Smalltalk-intensive macro benchmarks for both the Intel and gcc 4.0 compiler on x86. - eem 12/10/2008 14:34 2.16 GHz Intel Core Duo MacBook Pro Mac OS X 10.4.11" - ^CCodeGeneratorGlobalStructure new - vmMaker: self; - structDefDefine: '1'; - "structDefDefine: 'defined(PPC) || defined(_POWER) || defined(__powerpc__) || defined(__ppc__)';" - logger: logger; - yourself! Item was changed: ----- Method: RiscOSVMMaker>>createCodeGenerator (in category 'initialize') ----- createCodeGenerator "set up a CCodeGenerator for this VMMaker - RiscOS uses the global struct and no local def of the structure because of the global register trickery" ^CCodeGeneratorGlobalStructure new vmMaker: self; logger: logger; + options: optionsDictionary; yourself! Item was changed: ----- Method: StackInterpreter class>>initializeBytecodeTable (in category 'initialization') ----- initializeBytecodeTable "StackInterpreter initializeBytecodeTable" + (initializationOptions at: #bytecodeTableInitializer ifAbsent: nil) ifNotNil: + [:initalizer| ^self perform: initalizer]. + NewspeakVM ifTrue: [^MULTIPLEBYTECODESETS ifTrue: [self initializeBytecodeTableForNewspeakV3PlusClosuresNewspeakV4Hybrid] ifFalse: [self initializeBytecodeTableForNewspeakV3PlusClosures]]. ^self initializeBytecodeTableForSqueakV3PlusClosures! Item was added: + ----- Method: StackInterpreter class>>initializeBytecodeTableForSqueakV3PlusClosuresSistaV1Hybrid (in category 'initialization') ----- + initializeBytecodeTableForSqueakV3PlusClosuresSistaV1Hybrid + "StackInterpreter initializeBytecodeTableForSqueakV3PlusClosuresSistaV1Hybrid" + + | v3Table v1Table | + self initializeBytecodeTableForSistaV1. + v1Table := BytecodeTable. + AltBytecodeEncoderClassName := BytecodeEncoderClassName. + AltLongStoreBytecode := LongStoreBytecode. + self initializeBytecodeTableForSqueakV3PlusClosures. + v3Table := BytecodeTable. + BytecodeTable := v3Table, v1Table! Item was added: + ----- Method: StackToRegisterMappingCogit class>>initializeBytecodeTableForSqueakV3PlusClosuresSistaV1Hybrid (in category 'class initialization') ----- + initializeBytecodeTableForSqueakV3PlusClosuresSistaV1Hybrid + "StackToRegisterMappingCogit initializeBytecodeTableForSqueakV3PlusClosuresSistaV1Hybrid" + + super initializeBytecodeTableForSqueakV3PlusClosuresSistaV1Hybrid. + isPushNilFunction := #squeakV3orSistaV1:Is:Push:Nil:. + pushNilSizeFunction := #squeakV3orSistaV1PushNilSize:! Item was removed: - ----- Method: TMethod>>buildCaseStmt: (in category 'transformations') ----- - buildCaseStmt: aSendNode - "Build a case statement node for the given send of dispatchOn:in:." - "Note: the first argument is the variable to be dispatched on. The second argument is a constant node holding an array of unary selectors, which will be turned into sends to self." - - ((aSendNode args size >= 2) and: - [aSendNode args second isConstant and: - [aSendNode args second value class = Array]]) ifFalse: [ - self error: 'wrong node structure for a case statement'. - ]. - - ^TCaseStmtNode new - setExpression: aSendNode args first - selectors: aSendNode args second value - arguments: (aSendNode args copyFrom: 3 to: aSendNode args size)! Item was added: + ----- Method: TMethod>>buildCaseStmt:in: (in category 'transformations') ----- + buildCaseStmt: aSendNode in: aCodeGen + "Build a case statement node for the given send of dispatchOn:in:." + "Note: the first argument is the variable to be dispatched on. The second argument is a constant node holding an array of unary selectors, which will be turned into sends to self." + + | unimplemented errorMessage | + ((aSendNode args size >= 2) and: + [aSendNode args second isConstant and: + [aSendNode args second value class = Array]]) ifFalse: + [self error: 'wrong node structure for a case statement']. + + unimplemented := aSendNode args second value reject: [:s| self definingClass includesSelector: s]. + unimplemented isEmpty ifFalse: + [errorMessage := 'The following selectors are unimplemented: ', + (String streamContents: [:s| unimplemented do: [:sel| s crtab; store: sel]]). + (self confirm: errorMessage + orCancel: aCodeGen abortBlock) ifFalse: + [self halt]]. + + ^TCaseStmtNode new + setExpression: aSendNode args first + selectors: aSendNode args second value + arguments: (aSendNode args copyFrom: 3 to: aSendNode args size)! Item was changed: ----- Method: TMethod>>prepareMethodIn: (in category 'transformations') ----- prepareMethodIn: aCodeGen "Record sends of builtin operators, map sends of the special selector dispatchOn:in: with case statement nodes, and map sends of caseOf:[otherwise:] to switch statements. As a hack also update the types of variables introduced to implement cascades correctly. This has to be done at the same time as this is done, so why not piggy back here?" extraVariableNumber ifNotNil: [declarations keysAndValuesDo: [:varName :decl| decl isBlock ifTrue: [self assert: ((varName beginsWith: 'cascade') and: [varName last isDigit]). locals add: varName. self declarationAt: varName put: (decl value: self value: aCodeGen), ' ', varName]]]. aCodeGen pushScope: declarations while:"N.B. nodesWithParentsDo: is bottom-up, hence replacement is destructive and conserved." [parseTree nodesWithParentsDo: [:node :parent| node isSend ifTrue: [(aCodeGen isBuiltinSelector: node selector) ifTrue: [node isBuiltinOperator: true. "If a to:by:do:'s limit has side-effects, declare the limit variable, otherwise delete it from the args" (node selector = #to:by:do: and: [node args size = 4]) ifTrue: [| limitExpr | limitExpr := node args first. (limitExpr anySatisfy: [:subNode| subNode isSend and: [(aCodeGen isBuiltinSelector: subNode selector) not and: [(subNode isStructSendIn: aCodeGen) not]]]) ifTrue: [locals add: node args last name] ifFalse: [node arguments: node args allButLast]]] ifFalse: [(CaseStatements includes: node selector) ifTrue: + [parent replaceNodesIn: (Dictionary newFromPairs: { node. self buildCaseStmt: node in: aCodeGen})]. - [parent replaceNodesIn: (Dictionary newFromPairs: { node. self buildCaseStmt: node})]. (#(caseOf: #caseOf:otherwise:) includes: node selector) ifTrue: [parent replaceNodesIn: (Dictionary newFromPairs: { node. self buildSwitchStmt: node parent: parent })]]]]]! Item was changed: ----- Method: UnixVMMaker>>createCodeGenerator (in category 'initialisation') ----- createCodeGenerator ^CCodeGeneratorGlobalStructure new vmMaker: self; logger: logger; + options: optionsDictionary; yourself! Item was changed: Object subclass: #VMMaker + instanceVariableNames: 'inline forBrowser allPlugins internalPlugins externalPlugins platformName sourceDirName platformRootDirName logger interpreterClassName cogitClassName is64BitVM optionsDictionary abortBlock' - instanceVariableNames: 'inline forBrowser allPlugins internalPlugins externalPlugins platformName sourceDirName platformRootDirName logger interpreterClassName cogitClassName is64BitVM optionsDictionary' 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>>generateSqueakCogSistaVM (in category 'configurations') ----- generateSqueakCogSistaVM "No primitives since we can use those for the Cog VM" ^VMMaker generate: CoInterpreter and: SistaStackToRegisterMappingCogit + with: #( MULTIPLEBYTECODESETS true + bytecodeTableInitializer initializeBytecodeTableForSqueakV3PlusClosuresSistaV1Hybrid) to: (FileDirectory default pathFromURI: self sourceTree, '/sistasrc') platformDir: (FileDirectory default pathFromURI: self sourceTree, '/platforms') including: #()! Item was changed: ----- Method: VMMaker class>>generateSqueakSpurCogSistaVM (in category 'configurations') ----- generateSqueakSpurCogSistaVM "No primitives since we can use those for the Cog VM" ^VMMaker generate: CoInterpreter and: SistaStackToRegisterMappingCogit + with: #( ObjectMemory Spur32BitCoMemoryManager + MULTIPLEBYTECODESETS true + bytecodeTableInitializer initializeBytecodeTableForSqueakV3PlusClosuresSistaV1Hybrid) - with: #(ObjectMemory Spur32BitCoMemoryManager) to: (FileDirectory default pathFromURI: self sourceTree, '/spursistasrc') platformDir: (FileDirectory default pathFromURI: self sourceTree, '/platforms') including:#()! Item was added: + ----- Method: VMMaker>>abortBlock (in category 'accessing') ----- + abortBlock + ^abortBlock! Item was changed: ----- Method: VMMaker>>generateEntire (in category 'generate sources') ----- generateEntire "Generate the interp, internal plugins and exports as well as the external plugins. If this comes from a generator, log it for convenience." + abortBlock := [^self]. self configurationGeneratorNameOrNil ifNotNil: [:generator| logger cr; nextPutAll: (generator selector copyReplaceAll: 'generate' with: ''). interpreterClassName ifNotNil: [logger space; nextPutAll: (CCodeGenerator shortMonticelloDescriptionForClass: (Smalltalk classNamed: interpreterClassName))]. logger cr; flush]. self generateMainVM. self generateExternalPlugins! Item was changed: ----- Method: Win32VMMaker>>createCodeGenerator (in category 'initialize') ----- createCodeGenerator "Set up a CCodeGenerator for this VMMaker - On Windows we use the gcc 2.95.x compiler which does better without the global struct." ^CCodeGeneratorGlobalStructure new vmMaker: self; structDefDefine: '0'; "structDefDefine: 'defined(PPC) || defined(_POWER) || defined(__powerpc__) || defined(__ppc__)';" logger: logger; + options: optionsDictionary; yourself!

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

Vm-dev July 2014