Fixing types

hernanmd · Apr 27, 2022 · 1de5fed · 1de5fed
1 parent 0f13ae4
commit 1de5fed
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 3 deletions.
diff --git a/smalltalksrc/VMMaker/SpurImageHeaderStruct.class.st b/smalltalksrc/VMMaker/SpurImageHeaderStruct.class.st
@@ -35,7 +35,7 @@ SpurImageHeaderStruct class >> instVarNamesAndTypesForTranslationDo: aBinaryBloc
 	"enumerate aBinaryBlock with the names and C type strings for the inst vars to include in a struct of this type."
 
 	<var: #dataSize type: #size_t>
-	<var: #desiredHeapSize type: #usqInt>
+	<var: #desiredHeapSize type: #size_t>
 	<var: #headerStart type: #squeakFileOffsetType>
 
 	self filteredInstVarNames do:
@@ -44,7 +44,7 @@ SpurImageHeaderStruct class >> instVarNamesAndTypesForTranslationDo: aBinaryBloc
 			value: ivn
 			value: (ivn caseOf: {
 						['dataSize']				-> [#'size_t'].
-						['desiredHeapSize']	-> [#'usqInt'].
+						['desiredHeapSize']	-> [#'size_t'].
 						['headerStart']			-> [#'squeakFileOffsetType'].
 				} otherwise: [ #'sqInt' ])]
 ]

diff --git a/smalltalksrc/VMMaker/SpurMemoryManager.class.st b/smalltalksrc/VMMaker/SpurMemoryManager.class.st
@@ -6060,6 +6060,7 @@ SpurMemoryManager >> imageFormatVersion [
 { #category : #snapshot }
 SpurMemoryManager >> imageSizeToWrite [
 	"when asked, newSpace should be empty."
+	<returnTypeC: #'size_t'> 
 	self assert: self newSpaceIsEmpty.
 	^segmentManager totalBytesInNonEmptySegments + self totalBytesInPermanentSpace.
 ]
@@ -12097,6 +12098,7 @@ SpurMemoryManager >> totalByteSizeOf: oop [
 { #category : #accessing }
 SpurMemoryManager >> totalBytesInPermanentSpace [
 
+	<returnTypeC: #'size_t'> 
 	^ permSpaceFreeStart - memoryMap permSpaceStart
 ]
 

diff --git a/smalltalksrc/VMMaker/SpurSegmentManager.class.st b/smalltalksrc/VMMaker/SpurSegmentManager.class.st
@@ -668,7 +668,11 @@ SpurSegmentManager >> swizzleObj: objOop [
 
 { #category : #snapshot }
 SpurSegmentManager >> totalBytesInNonEmptySegments [
+
+	<var: #total type: #'size_t'>
+
 	| total |
+
 	total := 0.
 	0 to: numSegments - 1 do:
 		[:i|

diff --git a/smalltalksrc/VMMaker/StackInterpreter.class.st b/smalltalksrc/VMMaker/StackInterpreter.class.st
@@ -10481,7 +10481,8 @@ StackInterpreter >> newHeader [
 	| header sizeToWrite |
 
 	<var: #header type: #'SpurImageHeaderStruct'>
-	<returnTypeC: #SpurImageHeaderStruct>	
+	<returnTypeC: #SpurImageHeaderStruct>
+	<var: #sizeToWrite type: #'size_t'>
 
 	self simulationOnly: [ header := SpurImageHeaderStruct new ].