Refactoring to use environment builder

hernanmd · Mar 18, 2022 · ff5ddab · ff5ddab
1 parent 0b9c289
commit ff5ddab
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 23 deletions.
diff --git a/smalltalksrc/VMMakerTests/VMImageReadingTest.class.st b/smalltalksrc/VMMakerTests/VMImageReadingTest.class.st
@@ -10,19 +10,19 @@ Class {
 { #category : #utilities }
 VMImageReadingTest >> loadImage [
 
-	| memoryManager |
-
-	memoryManager := MachineSimulatorMemoryManager new.
-	memoryManager initialAddress: initialAddress.
-	memoryManager wordSize: self wordSize.
-
-	interpreter := self newInterpreter.
-	interpreter memoryManager: memoryManager.
-
-	memory := interpreter objectMemory.
-	memory memoryManager: memoryManager.	
-	memory coInterpreter: interpreter.
-	interpreter objectMemory: memory.
+	environmentBuilder := VMSimulatedEnvironmentBuilder new.
+	environmentBuilder 
+		interpreterClass: self interpreterClass;
+		objectMemoryClass: self memoryClass;
+	 	initializationOptions: self initializationOptions;
+		wordSize: self wordSize;
+		initialCodeSize: self initialCodeSize; 
+		primitiveTraceLogSize: self primitiveTraceLogSize.
+
+	environmentBuilder build.
+
+	interpreter := environmentBuilder interpreter.
+	memory := environmentBuilder objectMemory.
 
 	interpreter openOn: self imageFileName extraMemory: 0.
 

diff --git a/smalltalksrc/VMMakerTests/VMSimpleStackBasedCogitAbstractTest.class.st b/smalltalksrc/VMMakerTests/VMSimpleStackBasedCogitAbstractTest.class.st
@@ -710,7 +710,7 @@ VMSimpleStackBasedCogitAbstractTest >> sentSelector: anObject [
 VMSimpleStackBasedCogitAbstractTest >> setUp [
 	super setUp.
 
-	initialAddress := environmentBuilder codeInitialAddress.
+	initialAddress := environmentBuilder memoryInitialAddress.
 
 	cogit := self newJitCompiler.
 	memory coInterpreter cogit: cogit.

diff --git a/smalltalksrc/VMMakerTests/VMSimulatedEnvironmentBuilder.class.st b/smalltalksrc/VMMakerTests/VMSimulatedEnvironmentBuilder.class.st
@@ -35,12 +35,6 @@ VMSimulatedEnvironmentBuilder >> build [
 	self doBuild
 ]
 
-{ #category : #accessing }
-VMSimulatedEnvironmentBuilder >> codeInitialAddress [
-
-	^ initialAddress 
-]
-
 { #category : #building }
 VMSimulatedEnvironmentBuilder >> doBuild [
 
@@ -121,6 +115,12 @@ VMSimulatedEnvironmentBuilder >> interpreterClass: aClass [
 	interpreterClass := aClass
 ]
 
+{ #category : #accessing }
+VMSimulatedEnvironmentBuilder >> memoryInitialAddress [
+
+	^ initialAddress 
+]
+
 { #category : #accessing }
 VMSimulatedEnvironmentBuilder >> methodCacheSize [
 	^ methodCacheSize

diff --git a/smalltalksrc/VMMakerTests/VMSpurNewSpaceStructureTest.class.st b/smalltalksrc/VMMakerTests/VMSpurNewSpaceStructureTest.class.st
@@ -78,19 +78,19 @@ VMSpurNewSpaceStructureTest >> testNewMemoryFutureSurvivorSpaceIsAtFutureSpaceSt
 { #category : #'tests-1-memory-initialization' }
 VMSpurNewSpaceStructureTest >> testNewMemoryLimitIsSumOfSpaces [
 
-	self assert: memory getMemoryMap oldSpaceEnd equals: oldSpaceSize + environmentBuilder newSpaceSize + environmentBuilder stackSpaceSize + environmentBuilder codeInitialAddress + self primitiveTraceLogSize + environmentBuilder methodCacheSize 
+	self assert: memory getMemoryMap oldSpaceEnd equals: oldSpaceSize + environmentBuilder newSpaceSize + environmentBuilder stackSpaceSize + environmentBuilder memoryInitialAddress + self primitiveTraceLogSize + environmentBuilder methodCacheSize 
 ]
 
 { #category : #'tests-1-memory-initialization' }
 VMSpurNewSpaceStructureTest >> testNewMemoryNewSpaceLimitIsNewSpaceStartPlusSize [
 
-	self assert: memory getMemoryMap newSpaceEnd equals: environmentBuilder newSpaceSize + environmentBuilder stackSpaceSize + environmentBuilder codeInitialAddress	+ self primitiveTraceLogSize + environmentBuilder methodCacheSize 
+	self assert: memory getMemoryMap newSpaceEnd equals: environmentBuilder newSpaceSize + environmentBuilder stackSpaceSize + environmentBuilder memoryInitialAddress	+ self primitiveTraceLogSize + environmentBuilder methodCacheSize 
 ]
 
 { #category : #'tests-1-memory-initialization' }
 VMSpurNewSpaceStructureTest >> testNewMemoryNewSpaceStartIsStackSize [
 
-	self assert: memory getMemoryMap newSpaceStart equals: environmentBuilder stackSpaceSize + environmentBuilder codeInitialAddress + self primitiveTraceLogSize + environmentBuilder methodCacheSize 
+	self assert: memory getMemoryMap newSpaceStart equals: environmentBuilder stackSpaceSize + environmentBuilder memoryInitialAddress + self primitiveTraceLogSize + environmentBuilder methodCacheSize 
 ]
 
 { #category : #'tests-1-memory-initialization' }