Merge pull request #488 from pharo-project/feat/permSpace

Adding Support for PermSpace

Author: guillep

CMakeLists.txt

@@ -41,6 +41,7 @@ set(APPNAME			"Pharo"         CACHE STRING                 "VM Application name"
 set(FLAVOUR			"CoInterpreter" CACHE STRING                 "The kind of VM to generate. Possible values: StackVM, CoInterpreter")
 set(PHARO_LIBRARY_PATH		"@executable_path/Plugins" CACHE STRING      "The RPATH to use in the build")
 set(ICEBERG_DEFAULT_REMOTE	"scpUrl"        CACHE STRING                 "If Iceberg uses HTTPS (httpsUrl) or tries first with SSH (scpUrl)")
+set(IMAGE_FORMAT	"SpurFormat"	CACHE STRING				 "Image Format to use in the builtVM (SpurFormat / ComposedFormat)")
 
 if(VERBOSE_BUILD)
     set(CMAKE_VERBOSE_MAKEFILE TRUE)
@@ -335,6 +336,7 @@ add_compile_options(
     -Wno-unused-local-typedef
     -Wno-incompatible-pointer-types
     -Wno-shift-negative-value
+    -Wno-unknown-warning-option
 )
 
 

Jenkinsfile

@@ -103,18 +103,18 @@ def recordCygwinVersions(buildDirectory){
 	archiveArtifacts artifacts: "${buildDirectory}/cygwinVersions.txt"
 }
 
-def runBuild(platformName, configuration, headless = true){
+def runBuild(platformName, configuration, headless = true, someAdditionalParameters = ""){
 	cleanWs()
 
 	def platform = headless ? platformName : "${platformName}-stockReplacement"
 	def buildDirectory = headless ? "build" :"build-stockReplacement"
-	def additionalParameters = ""
+	def additionalParameters = someAdditionalParameters
 
-	additionalParameters += headless ? "" : "-DALWAYS_INTERACTIVE=1 "
-	additionalParameters += isRelease() ? "-DBUILD_IS_RELEASE=ON " : "-DBUILD_IS_RELEASE=OFF "
+	additionalParameters += headless ? "" : " -DALWAYS_INTERACTIVE=1 "
+	additionalParameters += isRelease() ? " -DBUILD_IS_RELEASE=ON " : " -DBUILD_IS_RELEASE=OFF "
 
 	if(configuration == 'StackVM'){
-		additionalParameters += "-DFEATURE_MESSAGE_COUNT=TRUE "
+		additionalParameters += " -DFEATURE_MESSAGE_COUNT=TRUE "
 		platform = "${platformName}-StackVM"
 		buildDirectory = "build-StackVM"
 	}
@@ -131,16 +131,20 @@ def runBuild(platformName, configuration, headless = true){
       recordCygwinVersions(buildDirectory)
       runInCygwin "cd ${buildDirectory} && cmake -DFLAVOUR=${configuration} ${additionalParameters} -DPHARO_DEPENDENCIES_PREFER_DOWNLOAD_BINARIES=TRUE ../repository -DICEBERG_DEFAULT_REMOTE=httpsUrl"
       runInCygwin "cd ${buildDirectory} && VERBOSE=1 make install package"
+      runInCygwin "mkdir -p artifacts-${platformName} && cp -a ${buildDirectory}/build/packages/* artifacts-${platformName}/"
     }else{
       cmakeBuild generator: "Unix Makefiles", cmakeArgs: "-DFLAVOUR=${configuration} ${additionalParameters} -DPHARO_DEPENDENCIES_PREFER_DOWNLOAD_BINARIES=TRUE -DICEBERG_DEFAULT_REMOTE=httpsUrl", sourceDir: "repository", buildDir: "${buildDirectory}", installation: "InSearchPath"
       dir("${buildDirectory}"){
         shell "VERBOSE=1 make install package"
       }
+      shell "mkdir -p artifacts-${platformName} && cp -a ${buildDirectory}/build/packages/* artifacts-${platformName}/"
     }
 
 		stash excludes: '_CPack_Packages', includes: "${buildDirectory}/build/packages/*", name: "packages-${platform}-${configuration}"
         stash includes: "repository/scripts/*", name: "scripts"
 		archiveArtifacts artifacts: "${buildDirectory}/build/packages/*", excludes: '_CPack_Packages'
+		archiveArtifacts artifacts: "artifacts-${platformName}/*", excludes: '_CPack_Packages'
+
 	}
 }
 
@@ -197,6 +201,10 @@ def runUnitTests(platform){
           shell "PHARO_CI_TESTING_ENVIRONMENT=true  ./vm/Contents/MacOS/Pharo --headless --logLevel=4 ./image/VMMaker.image test --junit-xml-output 'VMMakerTests'"
           shell "PHARO_CI_TESTING_ENVIRONMENT=true  ./vm/Contents/MacOS/Pharo --headless --logLevel=4 ./image/VMMaker.image test --junit-xml-output 'Slang-Tests'"
          } 
+
+        shell "zip ./VMMaker-Image.zip ./image/VMMaker.*"
+        archiveArtifacts artifacts: 'VMMaker-Image.zip'
+
         // Stop if tests fail
         // Archive xml reports either case
         try {
@@ -465,6 +473,9 @@ try{
 				timeout(30){
 					runBuild(platform, "StackVM")
 				}
+				timeout(30){
+					runBuild("${platform}-ComposedFormat", "CoInterpreter", true, " -DIMAGE_FORMAT=ComposedFormat ")
+				}
 				timeout(30){
 					// Only build the Stock replacement version in the main branch
 					if(isMainBranch()){

cmake/vmmaker.cmake

@@ -139,7 +139,7 @@ if(GENERATE_SOURCES)
     #Custom command that generates the vm source code from VMMaker into the generated folder
     add_custom_command(
         OUTPUT ${VMSOURCEFILES} ${PLUGIN_GENERATED_FILES}
-        COMMAND ${VMMAKER_VM} --headless ${VMMAKER_IMAGE} --no-default-preferences eval \"PharoVMMaker generate: \#\'${FLAVOUR}\' outputDirectory: \'${GENERATED_SOURCE_DIR}\'\"
+        COMMAND ${VMMAKER_VM} --headless ${VMMAKER_IMAGE} --no-default-preferences eval \"PharoVMMaker generate: \#\'${FLAVOUR}\' outputDirectory: \'${CMAKE_CURRENT_BINARY_DIR_TO_OUT}\' imageFormat: \'${IMAGE_FORMAT}\'\"
         DEPENDS vmmaker ${VMMAKER_IMAGE} ${VMMAKER_VM}
         COMMENT "Generating VM files for flavour: ${FLAVOUR}")
 

extracted/vm/include/common/sq.h

@@ -57,7 +57,6 @@
  * If the attempt fails, answer null.  If the attempt succeeds, answer the
  * start of the region and assign its size through asp.
  */
-extern void *sqAllocateMemorySegmentOfSizeAboveAllocatedSizeInto(sqInt sz, void *minAddr, sqInt *asp);
 extern void sqDeallocateMemorySegmentAtOfSize(void *addr, sqInt sz);
 #endif /* SPURVM */
 /* Platform-dependent memory size adjustment macro. */
@@ -497,7 +496,7 @@ sqInt ioDisableImageWrite(void);
 
 #include "pharovm/imageAccess.h"
 
-size_t readImageFromFileStartingAt(sqImageFile f, squeakFileOffsetType imageOffset);
+sqInt readImageNamed(char* fileName);
 
 /* Clipboard (cut/copy/paste). */
 sqInt clipboardSize(void);

extracted/vm/src/win/sqWin32SpurAlloc.c

@@ -22,6 +22,9 @@
 #define EXCEPTION_WRONG_ACCESS EXCEPTION_EXECUTE_HANDLER
 #endif
 
+void *
+sqAllocateMemorySegmentOfSizeAboveAllocatedSizeInto(sqInt size, void *minAddress, sqInt *allocatedSizePointer);
+
 LONG CALLBACK sqExceptionFilter(LPEXCEPTION_POINTERS exp)
 {
   /* always wrong access - we handle memory differently now */
@@ -86,12 +89,7 @@ sqAllocateMemory(usqInt minHeapSize, usqInt desiredHeapSize, usqInt desiredBaseA
 
 	alloc = sqAllocateMemorySegmentOfSizeAboveAllocatedSizeInto
 				(roundUpToPage(desiredHeapSize), address, &allocBytes);
-	if (!alloc) {
-		exit(errno);
-		sqMessageBox(MB_OK | MB_ICONSTOP, TEXT("VM Error:"),
-					 TEXT("sqAllocateMemory: initial alloc failed!\n"));
-		exit(1);
-	}
+
 	return alloc;
 }
 
@@ -156,6 +154,7 @@ sqAllocateMemorySegmentOfSizeAboveAllocatedSizeInto(sqInt size, void *minAddress
 			continue;
 		}
 		alloc = VirtualAlloc(address, bytes, MEM_COMMIT|MEM_RESERVE, PAGE_READWRITE);
+
 		/* For some reason (large page support?) we can ask for a page-aligned
 		 * address such as 0xNNNNf000 but VirtualAlloc will answer 0xNNNN0000.
 		 * So accept allocs above minAddress rather than allocs above address
@@ -168,9 +167,8 @@ sqAllocateMemorySegmentOfSizeAboveAllocatedSizeInto(sqInt size, void *minAddress
 			return alloc;
 		}
 		if (!alloc) {
-			DWORD lastError = GetLastError();
-			logWarn("Unable to VirtualAlloc committed memory at desired address (%lld bytes requested at %p, above %p), Error: %lu\n",
-						bytes, address, minAddress, lastError);
+			logWarn("Unable to VirtualAlloc committed memory at desired address (%lld bytes requested at %p, above %p)", bytes, address, minAddress);
+			logErrorFromGetLastError("Unable to VirtualAlloc committed memory at desired address");
 			return 0;
 		}
 		/* VirtualAlloc answered a mapping well away from where Spur prefers.

include/pharovm/parameters/parameters.h

@@ -120,6 +120,9 @@ typedef struct VMParameters_
 	//The eden size (This is the space used to allocate new objects).
 	long long edenSize;
 
+	//The minimal Permanent Space Size
+	long long minPermSpaceSize;
+
 	// FIXME: Why passing this is needed when we have the separated vectors?
 	int processArgc;
 	const char** processArgv;

include/pharovm/pharo.h

@@ -80,3 +80,5 @@ void *readAddress(sqInt anExternalAddress);
 
 EXPORT(int) isVMRunOnWorkerThread();
 void setMaxStacksToPrint(sqInt anInteger);
+
+#define allocateMemoryBaseAddress(desiredSize, baseAddress) sqAllocateMemory(desiredSize, desiredSize, baseAddress)

smalltalksrc/Melchor/CCodeGeneratorGlobalStructure.class.st

@@ -13,6 +13,23 @@ Class {
 	#category : #Melchor
 }
 
+{ #category : #'CAST translation' }
+CCodeGeneratorGlobalStructure >> bindBlock: aTBlockNode withArgs: arguments [
+
+	| blockStatements argumentNames replacements |
+	blockStatements := aTBlockNode statements.
+	argumentNames := aTBlockNode arguments.
+
+	self assert: argumentNames size = arguments size.
+
+	replacements := argumentNames
+		                with: arguments
+		                collect: [ :name :value | name -> value ].
+
+	^ blockStatements collect: [ :anStatement | 
+		  anStatement copy bindVariableUsesIn: replacements asDictionary ]
+]
+
 { #category : #'C code generator' }
 CCodeGeneratorGlobalStructure >> buildSortedVariablesCollection [
 	"Build sorted vars, end result will be sorted collection based on static usage, 
@@ -97,20 +114,23 @@ CCodeGeneratorGlobalStructure >> emitCVariablesOn: aStream [
 					ifTrue: [structure]
 					ifFalse: [nonstruct].
 		decl := variableDeclarations at: varString ifAbsent: ['sqInt ' , varString].
-		decl first == $# "support cgen var: #bytecodeSetSelector declareC: '#define bytecodeSetSelector 0' hack"
-			ifTrue:
-				[target nextPutAll: decl; cr]
-			ifFalse:
-				[self isGeneratingPluginCode
+			(decl beginsWith: 'implicit') ifFalse: [
+				decl first == $# "support cgen var: #bytecodeSetSelector declareC: '#define bytecodeSetSelector 0' hack"
 					ifTrue:
-						[varString = 'interpreterProxy'
-							ifTrue: "quite special..."
-								[self preDeclareInterpreterProxyOn: target]
-							ifFalse: [target nextPutAll: 'static ']]
+						[target nextPutAll: decl; cr]
 					ifFalse:
-						[(self vmClass mustBeGlobal: varString) ifFalse:
-							[target nextPutAll: (inStruct ifTrue: ['_iss '] ifFalse: ['static '])]].
-				target nextPutAll: decl; nextPut: $;; cr]].
+						[self isGeneratingPluginCode
+							ifTrue:
+								[varString = 'interpreterProxy'
+									ifTrue: "quite special..."
+										[self preDeclareInterpreterProxyOn: target]
+									ifFalse: [target nextPutAll: 'static ']]
+							ifFalse:
+								[(self vmClass mustBeGlobal: varString) ifFalse:
+									[target nextPutAll: (inStruct ifTrue: ['_iss '] ifFalse: ['static '])]].
+						target nextPutAll: decl; nextPut: $;; cr]
+			]
+		].
 	structure
 		nextPutAll: '#undef _iss'; cr;
 		nextPutAll: '#if SQ_USE_GLOBAL_STRUCT'; cr;
@@ -166,13 +186,126 @@ CCodeGeneratorGlobalStructure >> emitGlobalStructFlagOn: aStream [
 		cr
 ]
 
+{ #category : #'CAST translation' }
+CCodeGeneratorGlobalStructure >> generateCASTSetFieldTo: aTSendNode [ 
+
+	| structType fieldName fieldVale setFieldStatements |
+	
+	self assert: aTSendNode arguments size = 2.
+
+	fieldName := aTSendNode arguments first.
+	fieldVale := aTSendNode arguments second.
+	
+	structType := self structTypeFor: aTSendNode receiver.
+	
+
+	setFieldStatements := structType asClass allSlots collect: [ :slot |
+		| comparison |
+		
+		comparison := TSendNode 
+									receiver: (TSendNode 
+											receiver: (TConstantNode value: slot name asString) 
+											selector: 'strcmp:' 
+											arguments: { fieldName })
+									selector: '='
+									arguments: { TConstantNode value: 0 }.
+
+		TSendNode 
+			receiver: comparison
+			selector: 'ifTrue:' 
+			arguments: { 
+				TStatementListNode 
+					statements: { 
+						TSendNode 
+							receiver: aTSendNode receiver 
+							selector: (slot name, ':') 
+							arguments: { fieldVale } 
+					}
+			}			
+
+	].
+
+	^ CCompoundStatementNode statements: (setFieldStatements collect: [ :e | e asCASTIn: self]).
+
+]
+
+{ #category : #'CAST translation' }
+CCodeGeneratorGlobalStructure >> generateCASTWithFieldsDoSeparatedBy: aTSendNode [
+
+	| structType allRewrittenStatements blockSeparatorStatements fieldBlock allFieldArguments |
+	self assert: aTSendNode arguments size = 2.
+	self assert: aTSendNode arguments first arguments size = 2.
+	self assert: aTSendNode arguments second arguments size = 0.
+
+	fieldBlock := aTSendNode arguments first.
+	blockSeparatorStatements := aTSendNode arguments second statements.
+
+	structType := self structTypeFor: aTSendNode receiver.
+
+	allFieldArguments := structType asClass allSlots collect: [ :slot | 
+		                     { 
+			                     (TConstantNode value: slot name asString).
+			                     (TSendNode
+				                      receiver: aTSendNode receiver
+				                      selector: slot name
+				                      arguments: {  }) } ].
+
+	allRewrittenStatements := OrderedCollection new.
+
+	allFieldArguments
+		do: [ :fieldArgs | 
+			allRewrittenStatements addAll:
+				(self bindBlock: fieldBlock withArgs: fieldArgs) ]
+		separatedBy: [ 
+		allRewrittenStatements addAll: blockSeparatorStatements ].
+
+	^ CCompoundStatementNode statements:
+		  (allRewrittenStatements collect: [ :e | e asCASTIn: self ])
+]
+
+{ #category : #'CAST translation' }
+CCodeGeneratorGlobalStructure >> generateCASTWithStructNameDo: aTSendNode [
+
+	| argumentName structType rewrittenStatements aBlock |
+	self assert: aTSendNode arguments size = 1.
+	self assert: aTSendNode arguments first arguments size = 1.
+
+	structType := self structTypeFor: aTSendNode receiver.
+
+	aBlock := aTSendNode arguments first.
+	argumentName := aTSendNode arguments first arguments first.
+
+	rewrittenStatements := self
+		                       bindBlock: aBlock
+		                       withArgs:
+		                       { (TConstantNode value: structType asString) }.
+
+	^ CCompoundStatementNode statements:
+		  (rewrittenStatements collect: [ :e | e asCASTIn: self ])
+]
+
 { #category : #'C code generator' }
 CCodeGeneratorGlobalStructure >> initialize [
 	super initialize.
 	localStructDef := nil. "ignored ivar - no longer used"
 	structDefDefine := '1'
 ]
 
+{ #category : #initialization }
+CCodeGeneratorGlobalStructure >> initializeCASTTranslationDictionary [
+
+	super initializeCASTTranslationDictionary.
+
+	castTranslationDict at: #withStructNameDo: put: #generateCASTWithStructNameDo:.
+	castTranslationDict at: #withFieldsDo:separatedBy: put: #generateCASTWithFieldsDoSeparatedBy:.
+	castTranslationDict at: #setField:to: put: #generateCASTSetFieldTo:.
+]
+
+{ #category : #public }
+CCodeGeneratorGlobalStructure >> isGlobalStructureBuild [
+	^true
+]
+
 { #category : #utilities }
 CCodeGeneratorGlobalStructure >> localizeGlobalVariables [
 "TPR - remove all the global vars destined for the structure that are only used once - not worth the space,
@@ -215,3 +348,11 @@ CCodeGeneratorGlobalStructure >> structDefDefine: aString [
 '1' - which would mean always do it"
 	structDefDefine := aString
 ]
+
+{ #category : #'CAST translation' }
+CCodeGeneratorGlobalStructure >> structTypeFor: structNode [
+
+	| nodeType |
+	nodeType := self typeFor: structNode in: self currentMethod.
+	^ nodeType trimRight: [ :c | { $* . $ } includes: c ]
+]

smalltalksrc/Melchor/VMBasicConstants.class.st

@@ -33,6 +33,7 @@ Class {
 		'HashMultiplyConstant',
 		'HashMultiplyMask',
 		'IMMUTABILITY',
+		'PRIdSQINT',
 		'PharoVM',
 		'PrimErrBadArgument',
 		'PrimErrBadIndex',
@@ -62,7 +63,8 @@ Class {
 		'STACKVM',
 		'SistaVM',
 		'TempVectReadBarrier',
-		'VMBIGENDIAN'
+		'VMBIGENDIAN',
+		'WIN32'
 	],
 	#category : #Melchor
 }
@@ -118,6 +120,8 @@ VMBasicConstants class >> namesDefinedAtCompileTime [
 		WIN32 _WIN32 _WIN32_WCE
 		WIN64 _WIN64 _WIN64_WCE
 		
+		PRIdSQINT
+		
 		FEATURE_FFI
 		FEATURE_THREADED_FFI
 		FEATURE_MESSAGE_COUNT)