Refactor + testing missing cases

hernanmd · Apr 19, 2022 · 97880e2 · 97880e2
1 parent e71e967
commit 97880e2
Show file tree

Hide file tree

Showing 3 changed files with 43 additions and 24 deletions.
diff --git a/smalltalksrc/VMMaker/SpurMemoryManager.class.st b/smalltalksrc/VMMaker/SpurMemoryManager.class.st
@@ -872,8 +872,9 @@ SpurMemoryManager class >> initialize [
 	ObjStackLimit := ObjStackPageSlots - ObjStackFixedSlots.
 
 	"The hiddenHootsObject contains the classTable pages and up to 8 additional objects.
-	 Currently we use four; the three objStacks, the mark stack, the weaklings and the
-	 mourn queue, and the rememberedSet."
+	 Currently we use five:
+	  - three objStacks: mark stack, weaklings and mourn queue
+	  - two remembered sets: for new and old spaces"
 	MarkStackRootIndex := self basicNew classTableRootSlots.
 	WeaklingStackRootIndex := MarkStackRootIndex + 1.
 	MournQueueRootIndex := MarkStackRootIndex + 2.
@@ -8926,7 +8927,7 @@ SpurMemoryManager >> newSpaceRefCountMask [
 { #category : #accessing }
 SpurMemoryManager >> newSpaceRememberedSet [
 
-	^ scavenger rememberedSet
+	^ newSpaceRememberedSet
 ]
 
 { #category : #accessing }

diff --git a/smalltalksrc/VMMakerTests/VMSpurOldSpaceGarbageCollectorTest.class.st b/smalltalksrc/VMMakerTests/VMSpurOldSpaceGarbageCollectorTest.class.st
@@ -115,7 +115,7 @@ VMSpurOldSpaceGarbageCollectorTest >> testAllocateObjectWithFreeSpaceSizeShouldP
 	self assert: memory needGCFlag
 ]
 
-{ #category : #tests }
+{ #category : #'tests-OldSpaceSize' }
 VMSpurOldSpaceGarbageCollectorTest >> testAnOldObjectNotReferencedShouldBeCollected [
 
 	| deltaFreeSpace |
@@ -138,7 +138,7 @@ VMSpurOldSpaceGarbageCollectorTest >> testAnOldObjectReferencedFromNewObjectShou
 	self assert: deltaFreeSpace equals: 0
 ]
 
-{ #category : #tests }
+{ #category : #'tests-OldSpaceSize' }
 VMSpurOldSpaceGarbageCollectorTest >> testAnOldObjectReferencedFromRememberedPermObjectShouldBeKept [
 
 	| oldObjectSize deltaFreeSpace |
@@ -165,7 +165,7 @@ VMSpurOldSpaceGarbageCollectorTest >> testAnOldObjectReferencedFromUnreferencedC
 	self assert: deltaFreeSpace equals: 0
 ]
 
-{ #category : #tests }
+{ #category : #'tests-OldSpaceSize' }
 VMSpurOldSpaceGarbageCollectorTest >> testAnOldObjectReferencedFromVMVariableShouldBeKept [
 
 	| oldOop objectSize deltaFreeSpace |

diff --git a/smalltalksrc/VMMakerTests/VMSpurScavengerTest.class.st b/smalltalksrc/VMMakerTests/VMSpurScavengerTest.class.st
@@ -391,24 +391,6 @@ VMSpurScavengerTest >> testReferencedObjectShouldSurviveScavenge [
 	self assert: (memory hashBitsOf: newReferencedObjectAddress) equals: referencedObjectHash
 ]
 
-{ #category : #'tests-6-scavenge-rememberedset' }
-VMSpurScavengerTest >> testRememberedObjectShouldSurviveScanvenge [
-
-	| oldObjectAddress rememberedObjectAddress rememberedObjectHash newRememberedObjectAddress |
-
-	"Create a young object and reference it from the old object"
-	oldObjectAddress := self newOldSpaceObjectWithSlots: 1.
-	rememberedObjectAddress := self newZeroSizedObject.
-	rememberedObjectHash := memory hashBitsOf: rememberedObjectAddress.
-	memory storePointer: 0 ofObject: oldObjectAddress withValue: rememberedObjectAddress.
-
-	memory doScavenge: 1 "TenureByAge".
-
-	"Remap our object address to its new location"
-	newRememberedObjectAddress := memory remapObj: rememberedObjectAddress.
-	self assert: (memory hashBitsOf: newRememberedObjectAddress) equals: rememberedObjectHash
-]
-
 { #category : #'tests-6-scavenge-rememberedset' }
 VMSpurScavengerTest >> testScanvengeTenureByAgeWithRSInRedZoneShouldShrink [
 
@@ -659,3 +641,39 @@ VMSpurScavengerTest >> testUnreferencedObjectGraphShouldNotSurviveScavenge [
 
 	self assertPastSpaceIsEmpty
 ]
+
+{ #category : #'tests-6-scavenge-rememberedset' }
+VMSpurScavengerTest >> testYoungObjectRememberedFromOldObjectShouldSurviveScanvenge [
+
+	| oldObjectAddress rememberedObjectAddress rememberedObjectHash newRememberedObjectAddress |
+
+	"Create a young object and reference it from the old object"
+	oldObjectAddress := self newOldSpaceObjectWithSlots: 1.
+	rememberedObjectAddress := self newZeroSizedObject.
+	rememberedObjectHash := memory hashBitsOf: rememberedObjectAddress.
+	memory storePointer: 0 ofObject: oldObjectAddress withValue: rememberedObjectAddress.
+
+	memory doScavenge: 1 "TenureByAge".
+
+	"Remap our object address to its new location"
+	newRememberedObjectAddress := memory remapObj: rememberedObjectAddress.
+	self assert: (memory hashBitsOf: newRememberedObjectAddress) equals: rememberedObjectHash
+]
+
+{ #category : #'tests-6-scavenge-rememberedset' }
+VMSpurScavengerTest >> testYoungObjectRememberedFromPermanentObjectShouldSurviveScanvenge [
+
+	| permObjectAddress rememberedObjectAddress rememberedObjectHash newRememberedObjectAddress |
+
+	"Create a young object and reference it from the perm object"
+	permObjectAddress := self newPermanentObjectWithSlots: 1.
+	rememberedObjectAddress := self newZeroSizedObject.
+	rememberedObjectHash := memory hashBitsOf: rememberedObjectAddress.
+	memory storePointer: 0 ofObject: permObjectAddress withValue: rememberedObjectAddress.
+
+	memory doScavenge: 1 "TenureByAge".
+
+	"Remap our object address to its new location"
+	newRememberedObjectAddress := memory remapObj: rememberedObjectAddress.
+	self assert: (memory hashBitsOf: newRememberedObjectAddress) equals: rememberedObjectHash
+]