Moving allocation of the stackPages to the memory map

hernanmd · Apr 4, 2022 · 0d044fd · 0d044fd
1 parent 1c194ce
commit 0d044fd
Show file tree

Hide file tree

Showing 5 changed files with 68 additions and 20 deletions.
diff --git a/smalltalksrc/VMMaker/StackInterpreter.class.st b/smalltalksrc/VMMaker/StackInterpreter.class.st
@@ -7560,13 +7560,11 @@ StackInterpreter >> initStackPages [
 	stackPageBytes := self stackPageByteSize.
 	stackPagesBytes := self computeStackZoneSize.
 
-	theStackMemory := self
-		                  cCode: [ self alloca: stackPagesBytes ]
-		                  inSmalltalk: [ 
-		                  stackPages
-			                  initializeWithByteSize: stackPagesBytes
-			                  for: self ].
-	self cCode: [ self me: theStackMemory ms: 0 et: stackPagesBytes ].
+	theStackMemory :=  stackPages
+									initializeWithByteSize: stackPagesBytes
+									inMemoryMap: objectMemory getMemoryMap
+									for: self.
+
 	stackPages
 		initializeStack: theStackMemory
 		numSlots: stackPagesBytes / objectMemory wordSize

diff --git a/smalltalksrc/VMMaker/VMMemoryMap.class.st b/smalltalksrc/VMMaker/VMMemoryMap.class.st
@@ -17,7 +17,9 @@ Class {
 		'oldSpaceMask',
 		'initialCodeZoneSize',
 		'codeZoneStart',
-		'codeZoneEnd'
+		'codeZoneEnd',
+		'stackPagesStart',
+		'stackPagesEnd'
 	],
 	#category : #'VMMaker-Memory'
 }
@@ -141,6 +143,16 @@ VMMemoryMap >> allocatePermObjectsSpace [
 	self permSpaceEnd: self permSpaceStart + permSpaceSize	
 ]
 
+{ #category : #allocating }
+VMMemoryMap >> allocateStackPages: initialStackSize [ 
+
+	self stackPagesStart: (self allocateMemory: initialStackSize BaseAddress: memoryMapConfiguration stackPagesInitialAddress).
+
+	self stackPagesStart ifNil: [ self insufficientMemoryAvailableError ].
+
+	self stackPagesEnd: self stackPagesStart + initialStackSize.
+]
+
 { #category : #accessing }
 VMMemoryMap >> allocationReserve [
 	^ allocationReserve
@@ -363,6 +375,30 @@ VMMemoryMap >> setOldSpaceEnd: anInteger [
 
 ]
 
+{ #category : #accessing }
+VMMemoryMap >> stackPagesEnd [
+
+	^ stackPagesEnd
+]
+
+{ #category : #accessing }
+VMMemoryMap >> stackPagesEnd: anObject [
+
+	stackPagesEnd := anObject
+]
+
+{ #category : #accessing }
+VMMemoryMap >> stackPagesStart [
+
+	^ stackPagesStart
+]
+
+{ #category : #accessing }
+VMMemoryMap >> stackPagesStart: anObject [
+
+	stackPagesStart := anObject
+]
+
 { #category : #accessing }
 VMMemoryMap >> startOfObjectMemory [
 

diff --git a/smalltalksrc/VMMaker/VMMemoryMapConfigurationFor32Bits.class.st b/smalltalksrc/VMMaker/VMMemoryMapConfigurationFor32Bits.class.st
@@ -28,6 +28,12 @@ VMMemoryMapConfigurationFor32Bits >> permSpaceInitialAddress [
 	^ 16r80000000 "(2048 MB)"
 ]
 
+{ #category : #'initial addresses' }
+VMMemoryMapConfigurationFor32Bits >> stackPagesInitialAddress [
+
+	^ 16r0F000000 "(240 MB)"
+]
+
 { #category : #accessing }
 VMMemoryMapConfigurationFor32Bits >> wordSize [
 	<doNotGenerate>

diff --git a/smalltalksrc/VMMaker/VMStackPages.class.st b/smalltalksrc/VMMaker/VMStackPages.class.st
@@ -248,18 +248,26 @@ VMStackPages >> initializeStack: theStackPages numSlots: stackSlots pageSize: sl
 ]
 
 { #category : #initialization }
-VMStackPages >> initializeWithByteSize: byteSize "<Integer>" for: anInterpreter [ "<CoInterpreter>" "^<Array of: <Integer>"
-	"Initialize the stackPages memory for simulation.  To keep access monitoring
-	 in one place we defer to the coInterpreter for accessing memory.  Answer the
-	 base address of th ememory."
-	<doNotGenerate>
-	coInterpreter := anInterpreter.
-	objectMemory := coInterpreter objectMemory.
-
-	minStackAddress := objectMemory memoryManager allocate: byteSize.
-	maxStackAddress := minStackAddress + byteSize.
+VMStackPages >> initializeWithByteSize: byteSize inMemoryMap: aMemoryMap for: anInterpreter [ 
+
+	<inline: true>
+
+	| stackAddress |
+
+	aMemoryMap allocateStackPages: byteSize.
+	stackAddress := aMemoryMap stackPagesStart.
+
+	self 
+		cCode: [] 
+		inSmalltalk: [ 
+			coInterpreter := anInterpreter.
+			objectMemory := coInterpreter objectMemory.
+			minStackAddress := stackAddress.
+			maxStackAddress := minStackAddress + byteSize.
+	].
+
 
-	^ minStackAddress 
+	^ stackAddress 
 ]
 
 { #category : #'page access' }

diff --git a/smalltalksrc/VMMakerTests/VMSimulatedEnvironmentBuilder.class.st b/smalltalksrc/VMMakerTests/VMSimulatedEnvironmentBuilder.class.st
@@ -57,9 +57,9 @@ VMSimulatedEnvironmentBuilder >> doBuild [
 	memoryManager wordSize: wordSize.
 
 	interpreter memoryManager: memoryManager.
+	objectMemory memoryManager: memoryManager.
 	objectMemory createMemoryMap.
 
-	objectMemory memoryManager: memoryManager.	
 	objectMemory coInterpreter: interpreter.
 
 	objectMemory