Refactoring tests to use the environmentBuilder

smalltalksrc/VMMakerTests/VMLookUpTest.class.st

@@ -94,7 +94,8 @@ VMLookUpTest >> setUp [
 		withValue: processorListArray.
 	memory lastHash: 1.
 
-	interpreter setBreakSelector: nil
+	interpreter setBreakSelector: nil.
+
 ]
 
 { #category : #tests }
@@ -464,7 +465,7 @@ VMLookUpTest >> testPrimitivePerformFindsMethodOop [
 	interpreter primitivePerform.
 
 	self assert: interpreter newMethod equals: methodOop.
-	self assert: interpreter instructionPointer equals: methodOop + objectHeaderSize + wordSize - 1 "+ header object + header of compiledMethod - (1)"
+	self assert: interpreter instructionPointer equals: methodOop + self objectHeaderSize + wordSize - 1 "+ header object + header of compiledMethod - (1)"
 
 	"(1) the Instruction Pointer is set to be just before the bytecode to execute, so fetchNextBytecode will fetch the first bytecode ( #justActivateNewMethod: )"
 ]

smalltalksrc/VMMakerTests/VMObjectLayoutTests.class.st

@@ -25,15 +25,15 @@ VMObjectLayoutTests >> installClassIntoClassTableWithInstSpec: aFormatInt instSi
 VMObjectLayoutTests >> objSizeWithNumberOfSlots: numberOfSlots [ 
 	| objSize |
 	"always have at least one slot for forwarders"
-	numberOfSlots = 0 ifTrue: [ ^ objectHeaderSize + 8 ].
+	numberOfSlots = 0 ifTrue: [ ^ self objectHeaderSize + 8 ].
 
 	objSize := numberOfSlots * wordSize.
 	"we align to 8 bytes"
 	objSize % 8 = 0 ifFalse: [ objSize := objSize + wordSize ].
 
 	"extra header for big objects"	
-	numberOfSlots > 254 ifTrue: [ objSize := objSize + objectHeaderSize ].
-	^ objectHeaderSize + objSize
+	numberOfSlots > 254 ifTrue: [ objSize := objSize + self objectHeaderSize ].
+	^ self objectHeaderSize + objSize
 
 ]
 
@@ -224,7 +224,7 @@ VMObjectLayoutTests >> testObjectWith0SlotsIsAreAlwaysAligned [
 	class := self installClassIntoClassTableWithInstSpec: 1 instSize: slots.
 	obj1oop := memory instantiateClass: class.
 	obj2oop := memory instantiateClass: class.
-	self assert: obj2oop - obj1oop equals: objectHeaderSize + memory allocationUnit
+	self assert: obj2oop - obj1oop equals: self objectHeaderSize + memory allocationUnit
 ]
 
 { #category : #tests }
@@ -233,7 +233,7 @@ VMObjectLayoutTests >> testObjectWith0SlotsIsAreAlwaysWithAtLeastOneSlotsForForw
 	slots := 0.
 	class := self installClassIntoClassTableWithInstSpec: 1 instSize: slots.
 	oop := memory instantiateClass: class.
-	self assert: (memory bytesInObject: oop) equals: objectHeaderSize + memory allocationUnit.
+	self assert: (memory bytesInObject: oop) equals: self objectHeaderSize + memory allocationUnit.
 ]
 
 { #category : #tests }
@@ -260,7 +260,7 @@ VMObjectLayoutTests >> testObjectWithMoreThan254SlotsHasTwoHeaders [
 			installClassIntoClassTableWithInstSpec: 1
 			instSize: slots.
 		objOop := memory instantiateClass: class.
-		bigOopHeader := memory baseHeader: objOop - objectHeaderSize.	"header before the main header"
+		bigOopHeader := memory baseHeader: objOop - self objectHeaderSize.	"header before the main header"
 		numSlots := bigOopHeader bitAnd: mask.
 		self assert: numSlots equals: slots ]
 ]

smalltalksrc/VMMakerTests/VMPrimitiveCallingTest.class.st

@@ -31,8 +31,8 @@ VMPrimitiveCallingTest >> setUp [
 
 	"Initializing the primTraceLog table"
 	interpreter movePrimTraceLogToMemoryAt:
-		cogit methodZoneBase + interpreter cogCodeSize + stackSpaceSize
-		+ methodCacheSize.
+		cogit methodZoneBase + interpreter cogCodeSize + environmentBuilder stackSpaceSize 
+		+ environmentBuilder methodCacheSize.
 
 	classLargeInteger := self newClassInOldSpaceWithSlots: 0 instSpec: memory firstByteFormat.
 

smalltalksrc/VMMakerTests/VMSimpleStackBasedCogitAbstractTest.class.st

@@ -710,6 +710,8 @@ VMSimpleStackBasedCogitAbstractTest >> sentSelector: anObject [
 VMSimpleStackBasedCogitAbstractTest >> setUp [
 	super setUp.
 
+	initialAddress := environmentBuilder codeInitialAddress.
+
 	cogit := self newJitCompiler.
 	memory coInterpreter cogit: cogit.
 	memory cogit: cogit.

smalltalksrc/VMMakerTests/VMSimpleStackBasedCogitMegamorphicPICTest.class.st

@@ -12,7 +12,7 @@ VMSimpleStackBasedCogitMegamorphicPICTest >> setUp [
 	self setUpCogMethodEntry.
 
 	memory coInterpreter
-		moveMethodCacheToMemoryAt: initialAddress "+ The guard page? memory cogCodeBase" + self initialCodeSize + stackSpaceSize.
+		moveMethodCacheToMemoryAt: initialAddress "+ The guard page? memory cogCodeBase" + self initialCodeSize + environmentBuilder stackSpaceSize.
 	specialSelectorsArray := self newOldSpaceObjectWithSlots: 2.
 	memory coInterpreter
 		specialSelectorArray: specialSelectorsArray;

smalltalksrc/VMMakerTests/VMSimulatedEnvironmentBuilder.class.st

@@ -9,7 +9,12 @@ Class {
 		'objectMemoryClass',
 		'wordSize',
 		'initialCodeSize',
-		'primitiveTraceLogSize'
+		'primitiveTraceLogSize',
+		'oldSpaceSize',
+		'initialAddress',
+		'stackSpaceSize',
+		'methodCacheSize',
+		'newSpaceSize'
 	],
 	#category : #'VMMakerTests-Builders'
 }
@@ -30,13 +35,18 @@ VMSimulatedEnvironmentBuilder >> build [
 	self doBuild
 ]
 
+{ #category : #accessing }
+VMSimulatedEnvironmentBuilder >> codeInitialAddress [
+
+	^ initialAddress 
+]
+
 { #category : #building }
 VMSimulatedEnvironmentBuilder >> doBuild [
 
 	"100 k at least to put the class table in the old space.
 	Get total size be a multiple of 4K so Unicorn CPU emulator accepts it"
-	| oldSpaceSize newSpaceSize stackSpaceSize methodCacheSize rumpCStackSize initialAddress memoryManager edenSize |
-	oldSpaceSize := 2048 * 1024.
+	| rumpCStackSize memoryManager edenSize |
 
 	"Check #scavengerDenominator in SpurMemoryManager"
 	edenSize := 2 * 1024 + interpreter interpreterAllocationReserveBytes.
@@ -93,6 +103,14 @@ VMSimulatedEnvironmentBuilder >> initializationOptions: aCollection [
 	initializationOptions := aCollection
 ]
 
+{ #category : #initialization }
+VMSimulatedEnvironmentBuilder >> initialize [
+
+	super initialize.
+	oldSpaceSize := 2048 * 1024.
+
+]
+
 { #category : #accessing }
 VMSimulatedEnvironmentBuilder >> interpreter [
 	^ interpreter
@@ -103,6 +121,16 @@ VMSimulatedEnvironmentBuilder >> interpreterClass: aClass [
 	interpreterClass := aClass
 ]
 
+{ #category : #accessing }
+VMSimulatedEnvironmentBuilder >> methodCacheSize [
+	^ methodCacheSize
+]
+
+{ #category : #accessing }
+VMSimulatedEnvironmentBuilder >> newSpaceSize [
+	^ newSpaceSize
+]
+
 { #category : #accessing }
 VMSimulatedEnvironmentBuilder >> objectMemory [
 	^ objectMemory
@@ -113,6 +141,11 @@ VMSimulatedEnvironmentBuilder >> objectMemoryClass: aClass [
 	objectMemoryClass := aClass
 ]
 
+{ #category : #accessing }
+VMSimulatedEnvironmentBuilder >> oldSpaceSize [
+	^ oldSpaceSize
+]
+
 { #category : #accessing }
 VMSimulatedEnvironmentBuilder >> primitiveTraceLogSize: anInteger [ 
 	primitiveTraceLogSize := anInteger
@@ -130,6 +163,11 @@ VMSimulatedEnvironmentBuilder >> roundToPageSize: anInteger [
 	^ anInteger + (pageSize - remainder)
 ]
 
+{ #category : #accessing }
+VMSimulatedEnvironmentBuilder >> stackSpaceSize [
+	^ stackSpaceSize
+]
+
 { #category : #accessing }
 VMSimulatedEnvironmentBuilder >> wordSize: anInteger [ 
 	wordSize := anInteger

smalltalksrc/VMMakerTests/VMSpurMemoryManagerTest.class.st

@@ -2,18 +2,12 @@ Class {
 	#name : #VMSpurMemoryManagerTest,
 	#superclass : #ParametrizedTestCase,
 	#instVars : [
-		'newSpaceSize',
 		'memory',
 		'interpreter',
 		'oldSpaceSize',
 		'nextIndex',
-		'objectHeaderSize',
 		'zeroSizedObjectClassIndex',
-		'emptyObjectSize',
-		'initialAddress',
-		'stackSpaceSize',
 		'stackBuilder',
-		'methodCacheSize',
 		'rumpCStackSize',
 		'wordSize',
 		'methodBuilder',
@@ -69,6 +63,13 @@ VMSpurMemoryManagerTest >> createMethodOopFromPharoMethod: aPharoCompiledMethod
 	^ methodOop
 ]
 
+{ #category : #accessing }
+VMSpurMemoryManagerTest >> emptyObjectSize [ 
+
+	"It is the header plus a word, padded to 8 bytes alignment"
+	^ self objectHeaderSize + "memory wordSize" 8
+]
+
 { #category : #accessing }
 VMSpurMemoryManagerTest >> initialCodeSize [
 	^ 0
@@ -404,6 +405,12 @@ VMSpurMemoryManagerTest >> nextOrdinaryClassIndex [
 		ifNotNil: [ nextIndex := nextIndex + 1 ]
 ]
 
+{ #category : #accessing }
+VMSpurMemoryManagerTest >> objectHeaderSize [
+
+	^ memory baseHeaderSize 
+]
+
 { #category : #helpers }
 VMSpurMemoryManagerTest >> primitiveTraceLogSize [
 	^ 0
@@ -463,6 +470,8 @@ VMSpurMemoryManagerTest >> setUp [
 		memory: memory;
 		methodBuilder: methodBuilder;
 		yourself.
+
+	oldSpaceSize := environmentBuilder oldSpaceSize
 ]
 
 { #category : #running }
@@ -511,11 +520,7 @@ VMSpurMemoryManagerTest >> setUpUsingImage [
 	interpreter openOn: 'YourImageHere.image'.
 	interpreter initStackPages.
 	interpreter loadInitialContext.
-
-	objectHeaderSize := 8 "bytes. Always.".
-	emptyObjectSize := objectHeaderSize + 8 "minimum required single empty slot, to use for forwarders".
-
-	newSpaceSize := memory getMemoryMap newSpaceEnd - memory getMemoryMap newSpaceStart.
+
 	oldSpaceSize := memory oldSpaceSize.
 
 	methodBuilder := VMCompiledCodeBuilder new
@@ -534,7 +539,7 @@ VMSpurMemoryManagerTest >> setUpUsingImage [
 { #category : #accessing }
 VMSpurMemoryManagerTest >> sizeOfObjectWithSlots: slots [
 
-	^ objectHeaderSize + ((slots min: 1 "at least one for the forwarder pointer") * memory wordSize "bytes")
+	^ self objectHeaderSize + ((slots min: 1 "at least one for the forwarder pointer") * memory wordSize "bytes")
 ]
 
 { #category : #accessing }

smalltalksrc/VMMakerTests/VMSpurNewSpaceStructureTest.class.st

@@ -9,7 +9,7 @@ VMSpurNewSpaceStructureTest >> fillEden [
 
 	"Allocate enough objects to fill the eden."
 	1
-		to: memory scavenger eden size // emptyObjectSize
+		to: memory scavenger eden size // self emptyObjectSize
 		do: [ :index | self newZeroSizedObject ]
 ]
 
@@ -21,7 +21,7 @@ VMSpurNewSpaceStructureTest >> testInstantiateNewObjectMovesFreeStartAfterObject
 	self newZeroSizedObject.
 
 	"New zero sized object has 64bit header + 1 * 64bit empty slot = 16bytes"
-	self assert: memory freeStart equals: freeStartBefore + emptyObjectSize
+	self assert: memory freeStart equals: freeStartBefore + self emptyObjectSize
 ]
 
 { #category : #'tests-2-instantiation' }
@@ -32,7 +32,7 @@ VMSpurNewSpaceStructureTest >> testInstantiateNewObjectWithSlotMovesFreeStartAft
 	self newObjectWithSlots: 0.
 
 	"New zero sized object has 64bit header + 1 * 64bit empty slot = 16bytes"
-	self assert: memory freeStart equals: freeStartBefore + emptyObjectSize
+	self assert: memory freeStart equals: freeStartBefore + self emptyObjectSize
 ]
 
 { #category : #'tests-1-memory-initialization' }
@@ -46,7 +46,7 @@ VMSpurNewSpaceStructureTest >> testNewMemoryEdenIsRestOfNewSpace [
 
 	self
 		assert: memory scavenger eden size
-		equals: newSpaceSize - memory scavenger pastSpace size - memory scavenger futureSpace size
+		equals: environmentBuilder newSpaceSize - memory scavenger pastSpace size - memory scavenger futureSpace size
 ]
 
 { #category : #'tests-1-memory-initialization' }
@@ -64,7 +64,7 @@ VMSpurNewSpaceStructureTest >> testNewMemoryFutureSpaceEndIsAtTheStartOfEden [
 { #category : #'tests-1-memory-initialization' }
 VMSpurNewSpaceStructureTest >> testNewMemoryFutureSpaceIsRoughlyOneSeventhOfNewSpace [
 
-	self assert: memory scavenger futureSpace size equals: (newSpaceSize // 7 truncateTo: memory allocationUnit)
+	self assert: memory scavenger futureSpace size equals: (environmentBuilder newSpaceSize // 7 truncateTo: memory allocationUnit)
 ]
 
 { #category : #'tests-1-memory-initialization' }
@@ -78,19 +78,19 @@ VMSpurNewSpaceStructureTest >> testNewMemoryFutureSurvivorSpaceIsAtFutureSpaceSt
 { #category : #'tests-1-memory-initialization' }
 VMSpurNewSpaceStructureTest >> testNewMemoryLimitIsSumOfSpaces [
 
-	self assert: memory getMemoryMap oldSpaceEnd equals: oldSpaceSize + newSpaceSize + stackSpaceSize + initialAddress + self primitiveTraceLogSize + methodCacheSize 
+	self assert: memory getMemoryMap oldSpaceEnd equals: oldSpaceSize + environmentBuilder newSpaceSize + environmentBuilder stackSpaceSize + environmentBuilder codeInitialAddress + self primitiveTraceLogSize + environmentBuilder methodCacheSize 
 ]
 
 { #category : #'tests-1-memory-initialization' }
 VMSpurNewSpaceStructureTest >> testNewMemoryNewSpaceLimitIsNewSpaceStartPlusSize [
 
-	self assert: memory getMemoryMap newSpaceEnd equals: newSpaceSize + stackSpaceSize + initialAddress	+ self primitiveTraceLogSize + methodCacheSize 
+	self assert: memory getMemoryMap newSpaceEnd equals: environmentBuilder newSpaceSize + environmentBuilder stackSpaceSize + environmentBuilder codeInitialAddress	+ self primitiveTraceLogSize + environmentBuilder methodCacheSize 
 ]
 
 { #category : #'tests-1-memory-initialization' }
 VMSpurNewSpaceStructureTest >> testNewMemoryNewSpaceStartIsStackSize [
 
-	self assert: memory getMemoryMap newSpaceStart equals: stackSpaceSize + initialAddress + self primitiveTraceLogSize + methodCacheSize 
+	self assert: memory getMemoryMap newSpaceStart equals: environmentBuilder stackSpaceSize + environmentBuilder codeInitialAddress + self primitiveTraceLogSize + environmentBuilder methodCacheSize 
 ]
 
 { #category : #'tests-1-memory-initialization' }
@@ -117,7 +117,7 @@ VMSpurNewSpaceStructureTest >> testNewMemoryPastSpaceIsAtTheStartOfNewSpace [
 { #category : #'tests-1-memory-initialization' }
 VMSpurNewSpaceStructureTest >> testNewMemoryPastSpaceIsRoughlyOneSeventhOfNewSpace [
 
-	self assert: memory scavenger pastSpaceBytes equals: (newSpaceSize // 7 truncateTo: memory allocationUnit)
+	self assert: memory scavenger pastSpaceBytes equals: (environmentBuilder newSpaceSize // 7 truncateTo: memory allocationUnit)
 ]
 
 { #category : #'tests-2-instantiation' }

smalltalksrc/VMMakerTests/VMSpurOldSpaceGarbageCollectorTest.class.st

@@ -86,7 +86,7 @@ VMSpurOldSpaceGarbageCollectorTest >> testAllocateObjectBiggerThanSizeOfFreeSpac
 VMSpurOldSpaceGarbageCollectorTest >> testAllocateObjectWithFreeSpaceSize [
 
 	| anObjectOop slotsNumber |
-	slotsNumber := memory totalFreeOldSpace - (objectHeaderSize * 2) / memory wordSize.
+	slotsNumber := memory totalFreeOldSpace - (self objectHeaderSize * 2) / memory wordSize.
 
 	anObjectOop := self newOldSpaceObjectWithSlots: slotsNumber. "Big object have 2 wordSize of header"
 
@@ -97,7 +97,7 @@ VMSpurOldSpaceGarbageCollectorTest >> testAllocateObjectWithFreeSpaceSize [
 VMSpurOldSpaceGarbageCollectorTest >> testAllocateObjectWithFreeSpaceSizeShouldBeZero [
 
 	| anObjectOop slotsNumber |
-	slotsNumber := memory totalFreeOldSpace - (objectHeaderSize * 2) / memory wordSize.
+	slotsNumber := memory totalFreeOldSpace - (self objectHeaderSize * 2) / memory wordSize.
 
 	anObjectOop := self newObjectWithSlots: slotsNumber. "Big object have 2 wordSize of header"