[Vm-dev] VM Maker: VMMaker.oscog-eem.1785.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.1785.mcz

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

Name: VMMaker.oscog-eem.1785
Author: eem
Time: 8 April 2016, 12:03:55.572746 pm
UUID: 86955b14-8c52-4082-b99a-87a9c1ec24ef
Ancestors: VMMaker.oscog-cb.1784

Fix a slip in the fix to CogVMSimulator initialization in VMMaker.oscog-eem.1780.

=============== Diff against VMMaker.oscog-cb.1784 ===============

Item was added:
+ ----- Method: CogVMSimulator class>>initializeWithOptions: (in category 'initialization') -----
+ initializeWithOptions: optionsDictionary
+ 	super initializeWithOptions: optionsDictionary.
+ 
+ 	ByteCountsPerMicrosecond := initializationOptions
+ 										at: #ByteCountsPerMicrosecond
+ 										ifAbsent: [100]!

Item was changed:
  ----- Method: CogVMSimulator class>>initializeWithOptions:objectMemoryClass: (in category 'class initialization') -----
  initializeWithOptions: optionsDictionaryOrArray objectMemoryClass: objectMemoryClassOrNil
  	"The relevant ObjectMemory, Interpreter and Cogit classes must be initialized in order.
  	 This happens notionally every time we start the simulator,
  	 but in fact happens when ever we instantiate a simulator."
  	initializationOptions := optionsDictionaryOrArray isArray
  							ifTrue: [Dictionary newFromPairs: optionsDictionaryOrArray]
  							ifFalse: [optionsDictionaryOrArray].
+ 
  	(objectMemoryClassOrNil ifNil: [self objectMemoryClass])
  		initializeWithOptions: initializationOptions.
  
+ 	self initializeWithOptions: initializationOptions.
- 	((initializationOptions at: #COGMTVM ifAbsent: [false])
- 			ifTrue: [CoInterpreterMT]
- 			ifFalse: [CoInterpreter])
- 		initializeWithOptions: initializationOptions.
  
- 	ByteCountsPerMicrosecond := initializationOptions
- 										at: #ByteCountsPerMicrosecond
- 										ifAbsent: [100].
- 
  	(self cogitClass withAllSuperclasses copyUpTo: Cogit) reverseDo:
  		[:c| c initializeWithOptions: initializationOptions]!