- Removing screenSize from the header

- Categorizing method
hernanmd · Jan 17, 2023 · cf889b3 · cf889b3
1 parent 76df288
commit cf889b3
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 26 deletions.
diff --git a/smalltalksrc/VMMaker/SpurImageHeaderStruct.class.st b/smalltalksrc/VMMaker/SpurImageHeaderStruct.class.st
@@ -16,7 +16,6 @@ Class {
 		'swapBytes',
 		'hdrLastHash',
 		'imageFormat',
-		'screenSize',
 		'imageHeaderSize'
 	],
 	#category : #'VMMaker-ImageFormat'
@@ -226,18 +225,6 @@ SpurImageHeaderStruct >> oldBaseAddr: anObject [
 	oldBaseAddr := anObject
 ]
 
-{ #category : #accessing }
-SpurImageHeaderStruct >> screenSize [
-
-	^ screenSize
-]
-
-{ #category : #accessing }
-SpurImageHeaderStruct >> screenSize: anObject [
-
-	screenSize := anObject
-]
-
 { #category : #accessing }
 SpurImageHeaderStruct >> swapBytes [
 

diff --git a/smalltalksrc/VMMaker/SpurImageWriter.class.st b/smalltalksrc/VMMaker/SpurImageWriter.class.st
@@ -101,7 +101,7 @@ SpurImageWriter >> writeHeader: header toFile: f [
 	self putLong: header oldBaseAddr toFile: f.
 	self putLong: header initialSpecialObjectsOop toFile: f.
 	self putLong: header hdrLastHash toFile: f.
-	self putLong: header screenSize toFile: f.
+	self putLong: 0 toFile: f. "Was ScreenSize"
 	self putLong: header headerFlags toFile: f.
 	self putWord32: header extraVMMemory toFile: f.
 	self putShort: header hdrNumStackPages toFile: f.

diff --git a/smalltalksrc/VMMaker/StackInterpreter.class.st b/smalltalksrc/VMMaker/StackInterpreter.class.st
@@ -10476,7 +10476,6 @@ StackInterpreter >> newHeader [
 	header oldBaseAddr: objectMemory getMemoryMap oldSpaceStart.
 	header initialSpecialObjectsOop: objectMemory specialObjectsOop.
 	header hdrLastHash: objectMemory lastHash.
-	header screenSize: 0.
 	header headerFlags: self getImageHeaderFlags.
 	header extraVMMemory: (self getExtraVMMemory ifNil: [ 0 ]).
 	header hdrNumStackPages: self getDesiredNumStackPages.

diff --git a/smalltalksrc/VMMakerTests/VMSpurMemoryManagerTest.class.st b/smalltalksrc/VMMakerTests/VMSpurMemoryManagerTest.class.st
@@ -102,6 +102,16 @@ VMSpurMemoryManagerTest >> createArrayClass [
 
 ]
 
+{ #category : #helpers }
+VMSpurMemoryManagerTest >> createEphemeronClass [
+	ourEphemeronClass := self newObjectWithSlots: 3.
+	memory 
+		storePointer: "InstanceSpecificationIndex" 2
+		ofObject: ourEphemeronClass
+		withValue: (memory integerObjectOf: Ephemeron format).
+	memory ensureBehaviorHash: ourEphemeronClass.
+]
+
 { #category : #utils }
 VMSpurMemoryManagerTest >> createLargeIntegerClasses [
 
@@ -123,16 +133,6 @@ VMSpurMemoryManagerTest >> createLargeIntegerClasses [
 		withValue: classLargeNegativeInteger.
 ]
 
-{ #category : #helpers }
-VMSpurMemoryManagerTest >> createEphemeronClass [
-	ourEphemeronClass := self newObjectWithSlots: 3.
-	memory 
-		storePointer: "InstanceSpecificationIndex" 2
-		ofObject: ourEphemeronClass
-		withValue: (memory integerObjectOf: Ephemeron format).
-	memory ensureBehaviorHash: ourEphemeronClass.
-]
-
 { #category : #helpers }
 VMSpurMemoryManagerTest >> createMethodOopFromHostMethod: aPharoCompiledMethod [
 

diff --git a/smalltalksrc/VMMakerTests/VMSpurOldSpaceGarbageCollectorTest.class.st b/smalltalksrc/VMMakerTests/VMSpurOldSpaceGarbageCollectorTest.class.st
@@ -280,7 +280,7 @@ VMSpurOldSpaceGarbageCollectorTest >> testArrayOfPermanentObjectsPointingToOldOb
 		self assert: (originalHashes at: i) equals: (memory hashBitsOf: (memory fetchPointer: i - 1 ofObject: permArray))]
 ]
 
-{ #category : #'tests' }
+{ #category : #'tests-OldSpaceSize' }
 VMSpurOldSpaceGarbageCollectorTest >> testDoNotCollectRoots [
 
 	memory fullGC.