Exporting to C

smalltalksrc/VMMaker/AbstractImageAccess.class.st

@@ -42,7 +42,6 @@ AbstractImageAccess >> extractImageVersionFrom: fileVersion into: header [
 	"Read and verify the image file version number and return true if the the given image file needs to be byte-swapped. As a side effect, position the file stream just after the version number of the image header. This code prints a warning and does a hard-exit if it cannot find a valid version number."
 	"This code is based on C code by Ian Piumarta."
 
-	<inline: false>
 	| version firstVersion |
 	<var: #file type: #sqImageFile>
 	<var: #imageOffset type: #squeakFileOffsetType>

smalltalksrc/VMMaker/Cogit.class.st

@@ -513,7 +513,9 @@ Cogit class >> declareCVarsIn: aCCodeGenerator [
 		addHeaderFile:'"sqCogStackAlignment.h"';
 		addHeaderFile:'"dispdbg.h"'; "must precede cointerp.h & cogit.h otherwise NoDbgRegParms gets screwed up"
 		addHeaderFile:'"cogmethod.h"'.
+
 	aCCodeGenerator
+		addHeaderFile:'"vmMemoryMap.h"';	
 		addHeaderFile:'"cointerp.h"';
 		addHeaderFile:'"cogit.h"';
 		addHeaderFile:'<stdint.h>'.

smalltalksrc/VMMaker/SpurImageReader.class.st

@@ -177,7 +177,6 @@ SpurImageReader >> readSegmentsFromImageFile: f header: aHeader [
 	 segment that specify the distance to and the size of the subsequent segment."
 
 	<var: #f type: #sqImageFile>
-	<inline: false>
 	<var: 'segInfo' type: #'SpurSegmentInfo *'>
 	<var: 'aHeader' type: #SpurImageHeaderStruct>
 	| bytesRead totalBytesRead bridgehead bridge nextSegmentSize oldBase newBase bridgeSpan |

smalltalksrc/VMMaker/SpurImageWriter.class.st

@@ -189,7 +189,6 @@ SpurImageWriter >> writeImageSegmentsToFile: aBinaryStream [
 
 	<var: 'aBinaryStream' type: #sqImageFile>
 	<var: 'aSegment' type:#'SpurSegmentInfo *'>
-	<inline: false>
 
 	| total |
 

smalltalksrc/VMMaker/SpurMemoryManager.class.st

@@ -5701,6 +5701,9 @@ SpurMemoryManager >> getMaxOldSpaceSize [
 { #category : #accessing }
 SpurMemoryManager >> getMemoryMap [
 
+	<api>
+	<returnTypeC: #'VMMemoryMap *'> 
+
 	^ memoryMap
 ]
 

smalltalksrc/VMMaker/StackInterpreter.class.st

@@ -480,7 +480,9 @@ StackInterpreter class >> additionalHeadersDo: aBinaryBlock [
 	 any additional header files that need to be generated."
 	aBinaryBlock
 		value: 'vmCallback.h'
-		value: self vmCallbackHeader
+		value: self vmCallbackHeader.
+
+	VMMemoryMap generateHeader: aBinaryBlock
 ]
 
 { #category : #translation }
@@ -498,6 +500,7 @@ StackInterpreter class >> ancilliaryClasses [
 		LibFFI.
 		CogStackPage.
 		SpurImageHeaderStruct.
+		AbstractImageAccess. "I am putting the abstract superclass... because I cannot make it work else"
 		self imageReaderClass.
 		self imageWriterClass}
 ]
@@ -521,6 +524,7 @@ StackInterpreter class >> declareCVarsIn: aCCodeGenerator [
 		addHeaderFile:'"vmCallback.h"';
 		addHeaderFile:'"sqMemoryFence.h"';
 		addHeaderFile:'"dispdbg.h"';
+		addHeaderFile:'"vmMemoryMap.h"';
 
 "This cannot be properly expressed in slang.
 If ffi is put as a separate header, slang will sort the header and put it outside the #ifdef"

smalltalksrc/VMMaker/VMCallbackContext.class.st

@@ -62,7 +62,7 @@ VMCallbackContext class >> printTypedefOn: aStream [
 		newLine
 ]
 
-{ #category : #asserting }
+{ #category : #translation }
 VMCallbackContext class >> shouldBeGenerated [
 
 	^ false

smalltalksrc/VMMaker/VMMemoryMap.class.st

@@ -17,13 +17,35 @@ VMMemoryMap class >> filteredInstVarNames [
 	^ super filteredInstVarNames copyWithout: #memoryManager
 ]
 
+{ #category : #translation }
+VMMemoryMap class >> generateHeader: aBinaryBlock [
+
+	aBinaryBlock
+		value: 'vmMemoryMap.h'
+		value: (String streamContents: [ :s | 
+				 self printTypedefOn: s.
+				 s cr ])
+]
+
 { #category : #translation }
 VMMemoryMap class >> instVarNamesAndTypesForTranslationDo: aBinaryBlock [
 
 	self filteredInstVarNames do: [ :aName |
 		aBinaryBlock value: aName value: #'usqInt'  ]
 ]
 
+{ #category : #translation }
+VMMemoryMap class >> needsTypeTag [
+
+	^true
+]
+
+{ #category : #translation }
+VMMemoryMap class >> shouldBeGenerated [
+
+	^ false
+]
+
 { #category : #accessing }
 VMMemoryMap >> memoryManager [
 
@@ -86,6 +108,8 @@ VMMemoryMap >> oldSpaceStart: anObject [
 { #category : #accessing }
 VMMemoryMap >> startOfObjectMemory [
 
+	<api>
+
 	"The first object space in the memory map is the newSpace."
 	^ self newSpaceStart 
 ]

smalltalksrc/VMMakerCompatibilityForPharo6/PharoVMMaker.class.st

@@ -6,7 +6,9 @@ Class {
 	#superclass : #Object,
 	#instVars : [
 		'outputDirectory',
-		'stopOnErrors'
+		'stopOnErrors',
+		'generatePlugins',
+		'wordSizesToGenerate'
 	],
 	#category : #'VMMakerCompatibilityForPharo6-CommandLine'
 }
@@ -49,7 +51,7 @@ PharoVMMaker >> generate: interpreterClass memoryManager: memoryManager compiler
 { #category : #generation }
 PharoVMMaker >> generate: interpreterClass memoryManager: memoryManager compilerClass: compilerClass options: options [
 
-	| platformDirectory |
+	| platformDirectory vmmaker |
 
 	Author useAuthor: 'vmMaker' during: [
 
@@ -59,57 +61,91 @@ PharoVMMaker >> generate: interpreterClass memoryManager: memoryManager compiler
 
 		[ 
 
-		(VMMaker
+		vmmaker := VMMaker
 			makerFor: interpreterClass
 			and: compilerClass
 			with: {#ObjectMemory. memoryManager name.
 					 #bytecodeTableInitializer. #initializeBytecodeTableForSistaV1} , options
 			to: platformDirectory
 			platformDir:platformDirectory
 			including: #()
-			configuration: VMMakerConfiguration)
+			configuration: VMMakerConfiguration.
+
+		vmmaker
 				stopOnErrors: stopOnErrors;
 				internal: #() external: #(FilePlugin SurfacePlugin FloatArrayPlugin);
 				generateInterpreterFile;
-				generateCogitFiles;
-				generateExternalPlugins] valueSupplyingAnswer:true.]
+				generateCogitFiles.
+		generatePlugins ifTrue: [ vmmaker generateExternalPlugins ]] valueSupplyingAnswer:true.]
 ]
 
 { #category : #generation }
 PharoVMMaker >> generateCoInterpreter [
 
-	self generate: CoInterpreter memoryManager: Spur64BitCoMemoryManager.
-	self generate: CoInterpreter memoryManager: Spur32BitCoMemoryManager.	
+	self generates64Bits ifTrue: [self generate: CoInterpreter memoryManager: Spur64BitCoMemoryManager].
+	self generates32Bits ifTrue: [ self generate: CoInterpreter memoryManager: Spur32BitCoMemoryManager ].
+
+]
+
+{ #category : #accessing }
+PharoVMMaker >> generatePlugins [
+
+	^ generatePlugins
+]
+
+{ #category : #accessing }
+PharoVMMaker >> generatePlugins: anObject [
+
+	generatePlugins := anObject
 ]
 
 { #category : #generation }
 PharoVMMaker >> generateSistaVM [
 
-	self
-		generate: CoInterpreter
-		memoryManager: Spur64BitCoMemoryManager
-		compilerClass: SistaCogit
-		options: #( SistaVM true ).
-	self
-		generate: CoInterpreter
-		memoryManager: Spur32BitCoMemoryManager
-		compilerClass: SistaCogit
-		options: #( SistaVM true )
+	self generates64Bits ifTrue: [	
+			self
+				generate: CoInterpreter
+				memoryManager: Spur64BitCoMemoryManager
+				compilerClass: SistaCogit
+				options: #( SistaVM true )].
+
+
+	self generates32Bits ifTrue: [
+			self
+				generate: CoInterpreter
+				memoryManager: Spur32BitCoMemoryManager
+				compilerClass: SistaCogit
+				options: #( SistaVM true )].
+
+
 ]
 
 { #category : #generation }
 PharoVMMaker >> generateStackVM [
 
-	self generate: StackInterpreter memoryManager: Spur64BitMemoryManager.
-	self generate: StackInterpreter memoryManager: Spur32BitMemoryManager.
+	self generates64Bits ifTrue: [self generate: StackInterpreter memoryManager: Spur64BitMemoryManager].
+	self generates32Bits ifTrue: [ self generate: StackInterpreter memoryManager: Spur32BitMemoryManager ].
 
+]
+
+{ #category : #testing }
+PharoVMMaker >> generates32Bits [
 
+	^ wordSizesToGenerate includes: 4
+]
+
+{ #category : #testing }
+PharoVMMaker >> generates64Bits [
+
+	^ wordSizesToGenerate includes: 8
 ]
 
 { #category : #accessing }
 PharoVMMaker >> initialize [
 	super initialize.
-	stopOnErrors := false
+	stopOnErrors := false.
+	generatePlugins := true.
+	wordSizesToGenerate := #(4 8).
 ]
 
 { #category : #accessing }
@@ -137,3 +173,15 @@ PharoVMMaker >> stopOnErrors [
 PharoVMMaker >> stopOnErrors: anObject [
 	stopOnErrors := anObject
 ]
+
+{ #category : #accessing }
+PharoVMMaker >> wordSizesToGenerate [
+
+	^ wordSizesToGenerate
+]
+
+{ #category : #accessing }
+PharoVMMaker >> wordSizesToGenerate: anObject [
+
+	wordSizesToGenerate := anObject
+]