[Vm-dev] VM Maker: VMMaker.oscog-eem.694.mcz

[commits at source.squeak.org]

Eliot Miranda uploaded a new version of VMMaker to project VM Maker:
http://source.squeak.org/VMMaker/VMMaker.oscog-eem.694.mcz

==================== Summary ====================

Name: VMMaker.oscog-eem.694
Author: eem
Time: 1 May 2014, 9:16:40.725 am
UUID: 5341b4ba-e0ba-4cd8-a041-4716689d8810
Ancestors: VMMaker.oscog-eem.693

Fix the CoInterpreterMT generation regression caused by
moving to the VMMaker image.

Better comment NewObjectMemory class>>
prepareToBeAddedToCodeGenerator:

=============== Diff against VMMaker.oscog-eem.693 ===============

Item was changed:
  ----- Method: NewObjectMemory class>>prepareToBeAddedToCodeGenerator: (in category 'translation') -----
  prepareToBeAddedToCodeGenerator: aCodeGen
+ 	"Remove the methods and instance variables we don't use."
+ 
+ 	self ~~ NewObjectMemory ifTrue: "No Need to repeat in NewCoObjectMemory"
- 	"Remove the instance variables we don't use."
- 	self ~~ NewObjectMemory ifTrue:
  		[^self].
+ 
  	aCodeGen
  		removeMethodForSelector: #markPhase; "we implement markPhase:"
  		removeMethodForSelector: #printWronglySizedContexts. "we implement printWronglySizedContexts:"
  	"This class uses freeStart in place of freeBlock.  It does
  	 not maintain an allocationCount nor stats there-of.
  	 Having an interpreter that uses a stack zone, it doesn't
  	 need an optimized context allocator."
  	aCodeGen
  		removeVariable: 'freeBlock';
  		removeVariable: 'allocationCount';
  		removeVariable: 'allocationsBetweenGCs';
  		removeVariable: 'statAllocationCount';
  		removeVariable: 'freeContexts';
  		removeVariable: 'freeLargeContexts';
  		removeVariable: 'statGCEndTime' "replaced by statGCEndUsecs"!

Item was changed:
  ----- Method: VMMaker class>>generateEitherSqueakCogVM (in category 'configurations') -----
  generateEitherSqueakCogVM
+ 	| coInterpreterClass |
+ 	coInterpreterClass := self chooseCoInterpreterClassIfAbsent: [^self].
+ 	^self generateSqueakCogVMWithInterpreterClass: coInterpreterClass
+ 		  options: ((coInterpreterClass includesBehavior: CoInterpreterMT)
+ 					ifTrue: [#(COGMTVM true)]
+ 					ifFalse: [#()])!
- 	^self generateSqueakCogVMWithInterpreterClass: (self chooseCoInterpreterClassIfAbsent: [^self])!

Item was changed:
  ----- Method: VMMaker class>>generateSqueakCogMTVM (in category 'configurations') -----
  generateSqueakCogMTVM
+ 	^self generateSqueakCogVMWithInterpreterClass: CoInterpreterMT
+ 		  options: #(COGMTVM true)!
- 	^self generateSqueakCogVMWithInterpreterClass: CoInterpreterMT!

Item was changed:
  ----- Method: VMMaker class>>generateSqueakCogVM (in category 'configurations') -----
  generateSqueakCogVM
+ 	^self generateSqueakCogVMWithInterpreterClass: CoInterpreter
+ 		  options: #()!
- 	^self generateSqueakCogVMWithInterpreterClass: CoInterpreter!

Item was removed:
- ----- Method: VMMaker class>>generateSqueakCogVMWithInterpreterClass: (in category 'confs-support') -----
- generateSqueakCogVMWithInterpreterClass: interpreterClass
- 	^VMMaker
- 		generate: interpreterClass
- 		and: StackToRegisterMappingCogit
- 		to: (FileDirectory default pathFromURI: self sourceTree, '/src')
- 		platformDir: (FileDirectory default pathFromURI: self sourceTree, '/platforms')
- 		including:#(	ADPCMCodecPlugin AsynchFilePlugin
- 					BalloonEnginePlugin B3DAcceleratorPlugin BMPReadWriterPlugin BitBltSimulation BochsIA32Plugin
- 					CameraPlugin CroquetPlugin DSAPlugin DeflatePlugin DropPlugin
- 					"FT2Plugin" FFTPlugin FileCopyPlugin FilePlugin FloatArrayPlugin FloatMathPlugin
- 					GeniePlugin HostWindowPlugin IA32ABIPlugin ImmX11Plugin InternetConfigPlugin
- 					JPEGReadWriter2Plugin JPEGReaderPlugin JoystickTabletPlugin KlattSynthesizerPlugin
- 					LargeIntegersPlugin LocalePlugin MIDIPlugin MacMenubarPlugin Matrix2x3Plugin
- 					MiscPrimitivePlugin Mpeg3Plugin QuicktimePlugin RePlugin
- 					ScratchPlugin SecurityPlugin SerialPlugin SocketPlugin
- 					SoundCodecPlugin SoundGenerationPlugin SoundPlugin SqueakSSLPlugin StarSqueakPlugin
- 					ThreadedFFIPlugin ThreadedARMFFIPlugin ThreadedIA32FFIPlugin
- 					UnicodePlugin UnixAioPlugin UUIDPlugin UnixOSProcessPlugin
- 					Win32OSProcessPlugin VMProfileLinuxSupportPlugin VMProfileMacSupportPlugin WeDoPlugin)
- 					
- !

Item was added:
+ ----- Method: VMMaker class>>generateSqueakCogVMWithInterpreterClass:options: (in category 'confs-support') -----
+ generateSqueakCogVMWithInterpreterClass: interpreterClass options: optionsArray
+ 	^VMMaker
+ 		generate: interpreterClass
+ 		and: StackToRegisterMappingCogit
+ 		with: optionsArray
+ 		to: (FileDirectory default pathFromURI: self sourceTree, '/src')
+ 		platformDir: (FileDirectory default pathFromURI: self sourceTree, '/platforms')
+ 		including:#(	ADPCMCodecPlugin AsynchFilePlugin
+ 					BalloonEnginePlugin B3DAcceleratorPlugin BMPReadWriterPlugin BitBltSimulation BochsIA32Plugin
+ 					CameraPlugin CroquetPlugin DSAPlugin DeflatePlugin DropPlugin
+ 					"FT2Plugin" FFTPlugin FileCopyPlugin FilePlugin FloatArrayPlugin FloatMathPlugin
+ 					GeniePlugin HostWindowPlugin IA32ABIPlugin ImmX11Plugin InternetConfigPlugin
+ 					JPEGReadWriter2Plugin JPEGReaderPlugin JoystickTabletPlugin KlattSynthesizerPlugin
+ 					LargeIntegersPlugin LocalePlugin MIDIPlugin MacMenubarPlugin Matrix2x3Plugin
+ 					MiscPrimitivePlugin Mpeg3Plugin QuicktimePlugin RePlugin
+ 					ScratchPlugin SecurityPlugin SerialPlugin SocketPlugin
+ 					SoundCodecPlugin SoundGenerationPlugin SoundPlugin SqueakSSLPlugin StarSqueakPlugin
+ 					ThreadedFFIPlugin ThreadedARMFFIPlugin ThreadedIA32FFIPlugin
+ 					UnicodePlugin UnixAioPlugin UUIDPlugin UnixOSProcessPlugin
+ 					Win32OSProcessPlugin VMProfileLinuxSupportPlugin VMProfileMacSupportPlugin WeDoPlugin)!