Fixing Tests

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

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/smalltalksrc/VMMakerTests/VMSimpleStackBasedCogitAbstractTest.class.st b/smalltalksrc/VMMakerTests/VMSimpleStackBasedCogitAbstractTest.class.st
@@ -21,7 +21,8 @@ Class {
 		'machineSimulator',
 		'send1TrampolineAddress',
 		'send2TrampolineAddress',
-		'send3TrampolineAddress'
+		'send3TrampolineAddress',
+		'initialAddress'
 	],
 	#pools : [
 		'CogAbstractRegisters',
@@ -710,8 +711,6 @@ VMSimpleStackBasedCogitAbstractTest >> sentSelector: anObject [
 VMSimpleStackBasedCogitAbstractTest >> setUp [
 	super setUp.
 
-	initialAddress := environmentBuilder memoryInitialAddress.
-
 	cogit := self newJitCompiler.
 	memory coInterpreter cogit: cogit.
 	memory cogit: cogit.
@@ -727,6 +726,9 @@ VMSimpleStackBasedCogitAbstractTest >> setUp [
 
 	cogit setStackAlignment: 16 expectedSPOffset: 0 expectedFPOffset: 0.
 	cogit initializeBackend.
+
+	initialAddress := environmentBuilder memoryInitialAddress.
+
 	cogit methodZone manageFrom: initialAddress to: initialAddress + self initialCodeSize.
 	cogit methodZoneBase: initialAddress.
 	cogit minCallAddress: initialAddress.
@@ -737,7 +739,7 @@ VMSimpleStackBasedCogitAbstractTest >> setUp [
 	machineSimulator := cogit processor machineSimulator.
 
 	cogit generateStackPointerCapture.
-	cogit methodZone manageFrom: cogit cogCodeBase to: initialAddress + self initialCodeSize.
+	cogit methodZone manageFrom: cogit cogCodeBase to: environmentBuilder memoryInitialAddress + self initialCodeSize.
 
 	memory coInterpreter numStackPages: 8.
 

diff --git a/smalltalksrc/VMMakerTests/VMSimpleStackBasedCogitMegamorphicPICTest.class.st b/smalltalksrc/VMMakerTests/VMSimpleStackBasedCogitMegamorphicPICTest.class.st
@@ -12,7 +12,7 @@ VMSimpleStackBasedCogitMegamorphicPICTest >> setUp [
 	self setUpCogMethodEntry.
 
 	memory coInterpreter
-		moveMethodCacheToMemoryAt: initialAddress "+ The guard page? memory cogCodeBase" + self initialCodeSize + environmentBuilder stackSpaceSize.
+		moveMethodCacheToMemoryAt: environmentBuilder memoryInitialAddress "+ The guard page? memory cogCodeBase" + self initialCodeSize + environmentBuilder stackSpaceSize.
 	specialSelectorsArray := self newOldSpaceObjectWithSlots: 2.
 	memory coInterpreter
 		specialSelectorArray: specialSelectorsArray;