Hi STON image reader & writer

hernanmd · Jan 18, 2022 · 881e96f · 881e96f
1 parent f12e6eb
commit 881e96f
Show file tree

Hide file tree

Showing 4 changed files with 78 additions and 6 deletions.
diff --git a/smalltalksrc/VMMaker/STONImageReader.class.st b/smalltalksrc/VMMaker/STONImageReader.class.st
@@ -0,0 +1,16 @@
+Class {
+	#name : #STONImageReader,
+	#superclass : #AbstractImageAccess,
+	#category : #'VMMaker-ImageFormat'
+}
+
+{ #category : #reading }
+STONImageReader >> readHeaderFrom: f startingAt: headerStart [ "Unnecesary"
+
+	<var: #f type: #sqImageFile>
+	<var: #headerStart type: #squeakFileOffsetType>
+	<var: #header type: #SpurImageHeaderStruct>
+	<returnTypeC: #SpurImageHeaderStruct>
+
+	^ STON reader on: f; next
+]
diff --git a/smalltalksrc/VMMaker/STONImageWriter.class.st b/smalltalksrc/VMMaker/STONImageWriter.class.st
@@ -0,0 +1,13 @@
+Class {
+	#name : #STONImageWriter,
+	#superclass : #AbstractImageAccess,
+	#category : #'VMMaker-ImageFormat'
+}
+
+{ #category : #writing }
+STONImageWriter >> writeHeader: header toFile: f [
+
+	STON writer
+		on: f;
+		nextPut: header
+]
diff --git a/smalltalksrc/VMMakerTests/VMAbstractImageFormatTest.class.st b/smalltalksrc/VMMakerTests/VMAbstractImageFormatTest.class.st
@@ -24,12 +24,6 @@ VMAbstractImageFormatTest >> readHeader [
 
 { #category : #actions }
 VMAbstractImageFormatTest >> saveImage [
-
-	interpreter setExtraVMMemory: 0.
-
-	interpreter imageName: self imageFileName.
-	interpreter preemptionYields: false.
-	interpreter setImageHeaderFlagsFrom: 0.
 
 	interpreter writeImageFileIO.
 
@@ -45,6 +39,11 @@ VMAbstractImageFormatTest >> setUp [
 	memory splObj: FalseObject put: memory falseObject.
 	memory splObj: TrueObject put: memory trueObject.	
 
+	interpreter setExtraVMMemory: 0.
+	interpreter imageName: self imageFileName.
+	interpreter preemptionYields: false.
+	interpreter setImageHeaderFlagsFrom: 0.
+
 	imageReader := SpurImageReader newWithMemory: memory andInterpreter: interpreter 
 ]
 

diff --git a/smalltalksrc/VMMakerTests/VMSTONImageHeaderWritingTest.class.st b/smalltalksrc/VMMakerTests/VMSTONImageHeaderWritingTest.class.st
@@ -0,0 +1,44 @@
+Class {
+	#name : #VMSTONImageHeaderWritingTest,
+	#superclass : #VMSpurImageHeaderWritingTest,
+	#category : #'VMMakerTests-MemoryTests'
+}
+
+{ #category : #initialization }
+VMSTONImageHeaderWritingTest >> headerFileName [
+
+	^ 'header.ston'
+]
+
+{ #category : #initialization }
+VMSTONImageHeaderWritingTest >> readHeader [
+
+	| header |
+
+	header := self headerFileName asFileReference readStreamDo: [ :f | 
+		          imageReader readHeaderFrom: f startingAt: 0 ].
+
+	^ header
+]
+
+{ #category : #initialization }
+VMSTONImageHeaderWritingTest >> saveImage [
+
+	| imageWriter |
+
+	imageWriter := STONImageWriter
+		               newWithMemory: memory
+		               andInterpreter: interpreter.
+
+	self headerFileName asFileReference writeStreamDo: [ :file | 
+		imageWriter writeHeader: interpreter newHeader toFile: file ]
+]
+
+{ #category : #initialization }
+VMSTONImageHeaderWritingTest >> setUp [
+
+	super setUp.
+
+	imageReader := STONImageReader newWithMemory: memory andInterpreter: interpreter.
+
+]