Fixing file sizes

hernanmd · Apr 7, 2023 · d6aaa1f · d6aaa1f
1 parent 0bcec2b
commit d6aaa1f
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 3 deletions.
diff --git a/smalltalksrc/VMMaker/SpurImageReader.class.st b/smalltalksrc/VMMaker/SpurImageReader.class.st
@@ -192,6 +192,10 @@ SpurImageReader >> readSegmentsFromImageFile: f header: aHeader [
 	<var: #f type: #sqImageFile>
 	<var: 'segInfo' type: #'SpurSegmentInfo *'>
 	<var: 'aHeader' type: #SpurImageHeaderStruct>
+	<var: #bytesRead type: #'size_t'>
+	<var: #totalBytesRead type: #'size_t'>
+	<var: #nextSegmentSize type: #'size_t'>
+
 	| bytesRead totalBytesRead bridgehead bridge nextSegmentSize oldBase newBase bridgeSpan |
 
 	self prepareSegmentsToRead.

diff --git a/smalltalksrc/VMMaker/SpurImageWriter.class.st b/smalltalksrc/VMMaker/SpurImageWriter.class.st
@@ -122,6 +122,9 @@ SpurImageWriter >> writeImageFile: imageFileName fromHeader: header [
 	<var: #imageFileName declareC: 'char *imageFileName'>
 	<var: #f type: #sqImageFile>
 	<var: #header type: #SpurImageHeaderStruct>
+	<var: #imageBytes type:#'size_t'>
+	<var: #bytesWritten type:#'size_t'>
+
 	| headerStart imageHeaderSize f imageBytes bytesWritten |
 	headerStart := 0.
 	imageHeaderSize := header imageHeaderSize.
@@ -196,6 +199,8 @@ SpurImageWriter >> writeSegment: segment nextSegment: nextSegment toFile: aBinar
 	<var: 'aBinaryStream' type: #sqImageFile>
 	<var: 'firstSavedBridgeWord' type: #usqLong>
 	<var: 'secondSavedBridgeWord' type: #usqLong>
+	<var: #nWritten type:#'size_t'>
+
 	<inline: false>
 
 	| pier1 pier2 firstSavedBridgeWord secondSavedBridgeWord nWritten |

diff --git a/smalltalksrc/VMMaker/SpurSegmentInfo.class.st b/smalltalksrc/VMMaker/SpurSegmentInfo.class.st
@@ -20,9 +20,12 @@ SpurSegmentInfo class >> instVarNamesAndTypesForTranslationDo: aBinaryBlock [
 		[:ivn|
 		aBinaryBlock
 			value: ivn
-			value: (ivn = 'swizzle'
-							ifTrue: [#sqInt]
-							ifFalse: [#usqInt])]
+			value: (ivn caseOf: {
+							['swizzle']				-> [#sqInt].
+							['savedSegSize']		-> [#'size_t'].
+							['segSize']				-> [#'size_t'].
+					} otherwise: [ #usqInt ])]
+
 ]
 
 { #category : #accessing }