Fixing tests

hernanmd · May 2, 2022 · 8e2eb70 · 8e2eb70
1 parent 0c18ab1
commit 8e2eb70
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 53 deletions.
diff --git a/smalltalksrc/VMMaker/SpurMemoryManager.class.st b/smalltalksrc/VMMaker/SpurMemoryManager.class.st
@@ -1971,7 +1971,7 @@ SpurMemoryManager >> allocateMemoryOfSize: memoryBytes initialAddress: initialAd
 ]
 
 { #category : #initialization }
-SpurMemoryManager >> allocateMemoryOfSize: memoryBytes newSpaceSize: newSpaceBytes stackSize: stackBytes codeSize: codeBytes methodCacheSize: methodCacheSize primitiveTraceLogSize: primitiveLogSize rumpCStackSize: rumpCStackSize initialAddress: initialAddress permSpaceSize: permSpaceSize [
+SpurMemoryManager >> allocateMemoryOfSize: memoryBytes newSpaceSize: newSpaceBytes stackSize: stackBytes codeSize: codeBytes methodCacheSize: methodCacheSize primitiveTraceLogSize: primitiveLogSize rumpCStackSize: rumpCStackSize permSpaceSize: permSpaceSize [
 
 	"Intialize the receiver for bootsraping an image.
 	 Set up a large oldSpace and an empty newSpace and set-up freeStart and scavengeThreshold
@@ -1983,14 +1983,14 @@ SpurMemoryManager >> allocateMemoryOfSize: memoryBytes newSpaceSize: newSpaceByt
 
 	self assert: (memoryBytes \\ self allocationUnit = 0 and: [ 
 			 newSpaceBytes \\ self allocationUnit = 0 and: [ 
-				 codeBytes \\ self allocationUnit = 0 and: [ 
-					 initialAddress \\ self allocationUnit = 0 ] ] ]).
+				 codeBytes \\ self allocationUnit = 0 ] ]).
 
 	memoryManager ifNil: [ 
 		memoryManager := SlangMemoryManager new.
 		memoryManager wordSize: self wordSize ].
 
-	coInterpreter movePrimTraceLogToMemoryAt: (memoryManager allocate: primitiveLogSize).
+	primitiveLogSize ~= 0 
+		ifTrue: [ coInterpreter movePrimTraceLogToMemoryAt: (memoryManager allocate: primitiveLogSize)].
 
 	memoryMap 		
 		allocationReserve: coInterpreter interpreterAllocationReserveBytes;

diff --git a/smalltalksrc/VMMakerTests/VMMachineSimulatorTest.class.st b/smalltalksrc/VMMakerTests/VMMachineSimulatorTest.class.st
@@ -21,7 +21,7 @@ VMMachineSimulatorTest >> testInstructionExceptionHasCorrectInstructionAddress [
 		cogit JumpNonZero: label.
 
 		"This instruction should not be called"
-		lastInstruction := cogit Call: 16rFFFFF0.  ].
+		lastInstruction := cogit Call: cogit methodZoneBase + 16r1000.  ].
 
 	[	self machineSimulator
 			startAt: cogInitialAddress
@@ -50,7 +50,7 @@ VMMachineSimulatorTest >> testInstructionExceptionIsRaisedAsUnicornError [
 		cogit JumpNonZero: label.
 
 		"This instruction should not be called"
-		lastInstruction := cogit Call: 16rFFFFF0.  ].
+		lastInstruction := cogit Call: cogit methodZoneBase + 16rFFFFF0.  ].
 
 	[	self machineSimulator
 			startAt: cogInitialAddress
@@ -73,7 +73,7 @@ VMMachineSimulatorTest >> testMemoryAccessExceptionComesWithCorrectAddress [
 		cogit MoveCq: 16rFFFF0000 R: TempReg.
 		invalidAccessInstruction := cogit MoveMb: 0 r: TempReg R: ClassReg.
 		"This instruction should not be called"
-		lastInstruction := cogit Call: 16rFFFFF0.  ].
+		lastInstruction := cogit Call: cogit methodZoneBase + 16rFFFFF0.  ].
 
 	invalidAddressHandled := false.
 
@@ -364,7 +364,7 @@ VMMachineSimulatorTest >> testMemoryAccessExceptionInstructionPointerInCorrectAd
 
 		invalidAccessInstruction := cogit MoveMb: 0 r: TempReg R: ClassReg.
 		"This instruction should not be called"
-		lastInstruction := cogit Call: 16rFFFFF0.  ].
+		lastInstruction := cogit Call: cogit methodZoneBase + 16rFFFFF0.  ].
 
 	invalidAddressHandled := false.
 
@@ -401,7 +401,7 @@ VMMachineSimulatorTest >> testNormalExecutionCountIsRespected [
 		cogit JumpNonZero: label.
 
 		"This instruction should not be called"
-		lastInstruction := cogit Call: 16rFFFFF0.  ].
+		lastInstruction := cogit Call: cogit methodZoneBase + 16rFFFFF0.  ].
 
 	self machineSimulator
 		startAt: cogInitialAddress
@@ -427,7 +427,7 @@ VMMachineSimulatorTest >> testNormalExecutionCountIsRespectedAndHasCorrectInstru
 		jumpInstruction := cogit JumpNonZero: label.
 
 		"This instruction should not be called"
-		lastInstruction := cogit Call: 16rFFFFF0.  ].
+		lastInstruction := cogit Call: cogit methodZoneBase + 16rFFFFF0.  ].
 
 	self machineSimulator
 		startAt: cogInitialAddress
@@ -498,7 +498,7 @@ VMMachineSimulatorTest >> testNormalExecutionUntilAddressIsRespected [
 		cogit JumpNonZero: label.
 
 		"This instruction should not be called"
-		lastInstruction := cogit Call: 16rFFFFF0.  ].
+		lastInstruction := cogit Call: cogit methodZoneBase + 16rFFFFF0.  ].
 
 	self
 		runFrom: cogInitialAddress

diff --git a/smalltalksrc/VMMakerTests/VMSimpleStackBasedCogitAbstractTest.class.st b/smalltalksrc/VMMakerTests/VMSimpleStackBasedCogitAbstractTest.class.st
@@ -180,6 +180,8 @@ VMSimpleStackBasedCogitAbstractTest >> compileTrampoline: aBlock named: aTrampol
 
 	cogit methodZoneBase: cogit methodZone freeStart.
 
+	cogInitialAddress := cogit methodZoneBase.	
+
 	^ startAddress
 ]
 

diff --git a/smalltalksrc/VMMakerTests/VMSimpleStackBasedCogitBytecodeTest.class.st b/smalltalksrc/VMMakerTests/VMSimpleStackBasedCogitBytecodeTest.class.st
@@ -48,11 +48,7 @@ VMSimpleStackBasedCogitBytecodeTest >> doPopIntoReceiverVariableBytecodeStoresVa
 	"The object is filled with nils.
 	Push false into the stack and execute the store and pop bytecode."	
 	self pushAddress: memory falseObject.
-
-	"Set an address as store check trampoline.
-	The bytecode below will jump to it if it is a old -> young store"
-	cogit objectRepresentation ceStoreCheckTrampoline: memory nilObject.
-
+
 	"The first byte of the push receiver instance variable bytecode family is used to identify which variable (0-based again)"
 	cogit byte0: instanceVariableToWrite - 1.		
 	self compile: [ 

diff --git a/smalltalksrc/VMMakerTests/VMSimpleStackBasedCogitMegamorphicPICTest.class.st b/smalltalksrc/VMMakerTests/VMSimpleStackBasedCogitMegamorphicPICTest.class.st
@@ -1,6 +1,9 @@
 Class {
 	#name : #VMSimpleStackBasedCogitMegamorphicPICTest,
 	#superclass : #VMSimpleStackBasedCogitAbstractTest,
+	#pools : [
+		'VMMethodCacheConstants'
+	],
 	#category : #'VMMakerTests-JitTests'
 }
 
@@ -12,7 +15,8 @@ VMSimpleStackBasedCogitMegamorphicPICTest >> setUp [
 	self setUpCogMethodEntry.
 
 	memory coInterpreter
-		moveMethodCacheToMemoryAt: environmentBuilder memoryInitialAddress "+ The guard page? memory cogCodeBase" + self initialCodeSize + environmentBuilder stackSpaceSize.
+		moveMethodCacheToMemoryAt: (memory memoryManager allocate: MethodCacheEntrySize * MethodCacheSize * (interpreter sizeof: #sqInt)).
+
 	specialSelectorsArray := self newOldSpaceObjectWithSlots: 2.
 	memory coInterpreter
 		specialSelectorArray: specialSelectorsArray;

diff --git a/smalltalksrc/VMMakerTests/VMSimulatedEnvironmentBuilder.class.st b/smalltalksrc/VMMakerTests/VMSimulatedEnvironmentBuilder.class.st
@@ -70,7 +70,6 @@ VMSimulatedEnvironmentBuilder >> doBuild [
 		methodCacheSize: methodCacheSize
 		primitiveTraceLogSize: (self roundToPageSize: primitiveTraceLogSize)
 		rumpCStackSize: self rumpCStackSize
-		initialAddress: initialAddress
 		permSpaceSize: permSpaceSize.
 
 	objectMemory initializePostBootstrap.

diff --git a/smalltalksrc/VMMakerTests/VMSpurNewSpaceStructureTest.class.st b/smalltalksrc/VMMakerTests/VMSpurNewSpaceStructureTest.class.st
@@ -75,41 +75,6 @@ VMSpurNewSpaceStructureTest >> testNewMemoryFutureSurvivorSpaceIsAtFutureSpaceSt
 	self assert: memory scavenger futureSurvivorStart equals: memory scavenger futureSpace start
 ]
 
-{ #category : #'tests-1-memory-initialization' }
-VMSpurNewSpaceStructureTest >> testNewMemoryLimitIsSumOfSpaces [
-
-	self
-		assert: memory getMemoryMap oldSpaceEnd
-		equals: oldSpaceSize + environmentBuilder newSpaceSize
-			+ environmentBuilder rumpCStackSize
-			+ 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 rumpCStackSize
-			+ environmentBuilder memoryInitialAddress
-			+ self primitiveTraceLogSize + environmentBuilder methodCacheSize
-]
-
-{ #category : #'tests-1-memory-initialization' }
-VMSpurNewSpaceStructureTest >> testNewMemoryNewSpaceStartIsStackSize [
-
-	self
-		assert: memory getMemoryMap newSpaceStart
-		equals: environmentBuilder stackSpaceSize
-			+ environmentBuilder rumpCStackSize
-			+ environmentBuilder memoryInitialAddress
-			+ self primitiveTraceLogSize + environmentBuilder methodCacheSize
-]
-
 { #category : #'tests-1-memory-initialization' }
 VMSpurNewSpaceStructureTest >> testNewMemoryPastSpaceEndIsAtTheStartOfFutureSpace [