Improving checks and adding CRumpStack

smalltalksrc/VMMaker/Spur32BitCoMemoryManager.class.st

@@ -74,15 +74,7 @@ Spur32BitCoMemoryManager >> checkMemoryMap [
 	 Being young would cause them to be scavenged.
 	 Being old would cause them to be remembered if stored into (but wait, they don't get stored into)."
 
-	self assert: (self isYoungObject: memoryMap newSpaceStart).
-	self assert: (self isYoungObject: memoryMap newSpaceEnd - self wordSize).
-	self assert: (self isOldObject: memoryMap newSpaceStart) not.
-	self assert: (self isOldObject: memoryMap newSpaceEnd - self wordSize) not.
-	self assert: (self isYoungObject: memoryMap newSpaceEnd) not.
-	self assert: (self isYoungObject: memoryMap oldSpaceStart) not.
-	self assert: (self isYoungObject: memoryMap oldSpaceEnd) not.
-	self assert: (self isOldObject: memoryMap oldSpaceStart).
-	self assert: (self isOldObject: memoryMap oldSpaceEnd).
+	super checkMemoryMap.
 
 	"we would like the following to be true, but we either choose one boundary check for
 	 cogMethods vs objects (isMachineCodeFrame: et al) or one boundary check for

smalltalksrc/VMMaker/Spur64BitCoMemoryManager.class.st

@@ -74,15 +74,7 @@ Spur64BitCoMemoryManager >> checkMemoryMap [
 	 Being young would cause them to be scavenged.
 	 Being old would cause them to be remembered if stored into (but wait, they don't get stored into)."
 
-	self assert: (self isYoungObject: memoryMap newSpaceStart).
-	self assert: (self isYoungObject: memoryMap newSpaceEnd - self wordSize).
-	self assert: (self isOldObject: memoryMap newSpaceStart) not.
-	self assert: (self isOldObject: memoryMap newSpaceEnd - self wordSize) not.
-	self assert: (self isYoungObject: memoryMap newSpaceEnd) not.
-	self assert: (self isYoungObject: memoryMap oldSpaceStart) not.
-	self assert: (self isYoungObject: memoryMap oldSpaceEnd) not.
-	self assert: (self isOldObject: memoryMap oldSpaceStart).
-	self assert: (self isOldObject: memoryMap oldSpaceEnd).
+	super checkMemoryMap.
 
 	"we would like the following to be true, but we either choose one boundary check for
 	 cogMethods vs objects (isMachineCodeFrame: et al) or one boundary check for

smalltalksrc/VMMaker/SpurMemoryManager.class.st

@@ -3390,18 +3390,8 @@ SpurMemoryManager >> checkHeapIntegrity: excludeUnmarkedObjs classIndicesShouldB
 
 { #category : #'debug support' }
 SpurMemoryManager >> checkMemoryMap [
-	self assert: (self isYoungObject: memoryMap newSpaceStart).
-	self assert: (self isYoungObject: memoryMap newSpaceEnd - self wordSize).
-	self assert: (self isOldObject: memoryMap newSpaceStart) not.
-	self assert: (self isOldObject: memoryMap newSpaceEnd - self wordSize) not.
-	self assert: (self isYoungObject: memoryMap newSpaceEnd) not.
-	self assert: (self isYoungObject: memoryMap oldSpaceStart) not.
-	self assert: (self isYoungObject: memoryMap oldSpaceEnd) not.
-	self assert: (self isOldObject: memoryMap newSpaceEnd).
-	self assert: (self isOldObject: memoryMap oldSpaceStart).
-	
-	self flag: #todo.
-"	self assert: (self isOldObject: memoryMap oldSpaceEnd)"
+
+	self getMemoryMap checkMemoryMap
 ]
 
 { #category : #'debug support' }

smalltalksrc/VMMaker/VMClass.class.st

@@ -876,6 +876,9 @@ VMClass >> majorVersion [
 VMClass >> malloc: size [
 	<doNotGenerate>
 	| address region |
+
+	size = 0 ifTrue: [ ^ nil ].
+
 	address := memoryManager allocate: size.
 	region := memoryManager regionAtAddress: address.
 	^ CNewArrayAccessor new

smalltalksrc/VMMaker/VMMemoryMap.class.st

@@ -130,6 +130,22 @@ VMMemoryMap >> allocationReserve: anInteger [
 	allocationReserve := anInteger 
 ]
 
+{ #category : #asserting }
+VMMemoryMap >> checkMemoryMap [
+
+	self assert: (self isYoungObject: self newSpaceStart).
+	self assert: (self isYoungObject: self newSpaceEnd - memoryMapConfiguration wordSize).
+	self assert: (self isOldObject: self newSpaceStart) not.
+	self assert: (self isOldObject: self newSpaceEnd - memoryMapConfiguration wordSize) not.
+	self assert: (self isYoungObject: self newSpaceEnd) not.
+	self assert: (self isYoungObject: self oldSpaceStart) not.
+	self assert: (self isYoungObject: self oldSpaceEnd) not.
+	self assert: (self isOldObject: self oldSpaceStart).
+	self assert: (self isOldObject: self oldSpaceEnd - memoryMapConfiguration wordSize).
+	self assert: (self isOldObject: self oldSpaceEnd) not.
+
+]
+
 { #category : #accessing }
 VMMemoryMap >> initialHeadroom [
 	^ initialHeadroom

smalltalksrc/VMMaker/VMMemoryMapConfiguration.class.st

@@ -47,3 +47,9 @@ VMMemoryMapConfiguration >> stackPagesInitialAddress [
 
 	^ self subclassResponsibility 
 ]
+
+{ #category : #accessing }
+VMMemoryMapConfiguration >> wordSize [
+
+	^ self subclassResponsibility
+]

smalltalksrc/VMMaker/VMMemoryMapConfigurationFor32Bits.class.st

@@ -27,3 +27,9 @@ VMMemoryMapConfigurationFor32Bits >> permSpaceInitialAddress [
 
 	^ 16r80000000 "(2048 MB)"
 ]
+
+{ #category : #accessing }
+VMMemoryMapConfigurationFor32Bits >> wordSize [
+
+	^ 4
+]

smalltalksrc/VMMaker/VMMemoryMapConfigurationFor64Bits.class.st

@@ -33,3 +33,9 @@ VMMemoryMapConfigurationFor64Bits >> stackPagesInitialAddress [
 
 	^ 16r200000000 "8GB"
 ]
+
+{ #category : #accessing }
+VMMemoryMapConfigurationFor64Bits >> wordSize [
+
+	^ 8
+]

smalltalksrc/VMMakerTests/VMSimulatedEnvironmentBuilder.class.st

@@ -48,7 +48,7 @@ VMSimulatedEnvironmentBuilder >> doBuild [
  	newSpaceSize := self roundToPageSize: (edenSize * 7 / 5).
 	stackSpaceSize := 9 * 4096.
 	methodCacheSize := 4096 * wordSize.
-	rumpCStackSize := 0.
+	rumpCStackSize := 4096.
 
 	initialAddress := 16r1000000.