Vm-dev May 2014

vm-dev@lists.squeakfoundation.org

32 participants
151 discussions

CMakeVMMakerSqueak---do you want me to push my mcz/s to source.squeak.org/VMMaker?
by gettimothy 24 May '14

24 May '14

Hi All. Per my email yesterday, I am hosting the CMakeVMMakerSqueak mcz's at http://www.svn.menmachinesmaterials.com/Cog/mcz/ Do you want me to push these live? or should we hold off a bit? thx. tty

2 4

VM Maker: CMakeVMMaker-jeanbaptistearnaud.282.mcz
by commits＠source.squeak.org 24 May '14

24 May '14

Timothy M uploaded a new version of CMakeVMMaker to project VM Maker: http://source.squeak.org/VMMaker/CMakeVMMaker-jeanbaptistearnaud.282.mcz ==================== Summary ==================== Name: CMakeVMMaker-jeanbaptistearnaud.282 Author: jeanbaptistearnaud Time: 30 April 2014, 6:23:07.58 pm UUID: c0d1c771-c7ec-4dab-b5fe-d1d1af83d659 Ancestors: CMakeVMMaker-jeanbaptistearnaud.281 remove the sound plugins =============== Diff against CMakeVMMaker-jeanbaptistearnaud.272 =============== Item was removed: - ----- Method: StackCrossRaspbianConfig>>configureSoundPlugin: (in category 'as yet unclassified') ----- - configureSoundPlugin: maker - "extra rules for SoundPlugin" - - maker addPlatformSources: #( 'sqUnixSound'). - maker addExternalLibraries: #( 'asound2' )! Item was changed: ----- Method: StackCrossRaspbianConfig>>defaultInternalPlugins (in category 'as yet unclassified') ----- defaultInternalPlugins " took from unixbuild/bld/plugins.int" ^ #( ADPCMCodecPlugin AsynchFilePlugin BalloonEnginePlugin "B2DPlugin" BitBltSimulation "BitBltPlugin" BMPReadWriterPlugin CroquetPlugin DeflatePlugin "ZipPlugin" DropPlugin DSAPlugin "DSAPrims" FFTPlugin FileCopyPlugin FilePlugin FloatArrayPlugin FloatMathPlugin JoystickTabletPlugin KlattSynthesizerPlugin "Klatt" LargeIntegersPlugin "LargeIntegers" Matrix2x3Plugin MIDIPlugin MiscPrimitivePlugin Mpeg3Plugin SecurityPlugin SerialPlugin SocketPlugin SoundCodecPlugin "SoundCodecPrims" SoundGenerationPlugin + "SoundPlugin" - SoundPlugin StarSqueakPlugin SurfacePlugin LocalePlugin )! Item was removed: - ----- Method: StackRaspbianConfig>>configureSoundPlugin: (in category 'as yet unclassified') ----- - configureSoundPlugin: maker - "extra rules for SoundPlugin" - - maker addPlatformSources: #( 'sqUnixSound'). - maker addExternalLibraries: #( 'asound2' )!

1 0

VM Maker: CMakeVMMaker-jeanbaptistearnaud.272.mcz
by commits＠source.squeak.org 24 May '14

24 May '14

Timothy M uploaded a new version of CMakeVMMaker to project VM Maker: http://source.squeak.org/VMMaker/CMakeVMMaker-jeanbaptistearnaud.272.mcz ==================== Summary ==================== Name: CMakeVMMaker-jeanbaptistearnaud.272 Author: jeanbaptistearnaud Time: 15 April 2014, 4:33:48.111 pm UUID: ef4f9366-2164-40c2-8df2-e05e5d5e0e9b Ancestors: CMakeVMMaker-EstebanLorenzano.271 change lib asound to asound2 for raspberry pi =============== Diff against CMakeVMMaker-EstebanLorenzano.271 =============== Item was added: + ----- Method: StackCrossRaspbianConfig>>configureSoundPlugin: (in category 'as yet unclassified') ----- + configureSoundPlugin: maker + "extra rules for SoundPlugin" + + maker addPlatformSources: #( 'sqUnixSound'). + maker addExternalLibraries: #( 'asound2' )! Item was added: + ----- Method: StackRaspbianConfig>>configureSoundPlugin: (in category 'as yet unclassified') ----- + configureSoundPlugin: maker + "extra rules for SoundPlugin" + + maker addPlatformSources: #( 'sqUnixSound'). + maker addExternalLibraries: #( 'asound2' )!

1 0

VM Maker: CMakeVMMaker-EstebanLorenzano.271.mcz
by commits＠source.squeak.org 24 May '14

24 May '14

Timothy M uploaded a new version of CMakeVMMaker to project VM Maker: http://source.squeak.org/VMMaker/CMakeVMMaker-EstebanLorenzano.271.mcz ==================== Summary ==================== Name: CMakeVMMaker-EstebanLorenzano.271 Author: EstebanLorenzano Time: 21 March 2014, 2:23:50.859 pm UUID: d5e25493-d8b7-457c-9dc7-78c2b4f26f07 Ancestors: CMakeVMMaker-EstebanLorenzano.270 empty log message =============== Diff against CMakeVMMaker-EstebanLorenzano.213 =============== Item was changed: SystemOrganization addCategory: #CMakeVMMaker! SystemOrganization addCategory: #'CMakeVMMaker-Android'! + SystemOrganization addCategory: #'CMakeVMMaker-Builder'! SystemOrganization addCategory: #'CMakeVMMaker-FreeBSD'! SystemOrganization addCategory: #'CMakeVMMaker-IOS'! SystemOrganization addCategory: #'CMakeVMMaker-Libs'! SystemOrganization addCategory: #'CMakeVMMaker-MacOS'! SystemOrganization addCategory: #'CMakeVMMaker-Unix'! SystemOrganization addCategory: #'CMakeVMMaker-Windows'! Item was changed: ----- Method: CMIOSFreetype2>>defineGlobalTargets (in category 'generating actions') ----- defineGlobalTargets | var | var := self canonicalName , '_LIB'. vmGen set: var toString: self libraryFileName. " define a library as imported one and make it depend from it's build target " + vmGen puts: + ('add_library("\{{1}\}" STATIC IMPORTED GLOBAL) + set_target_properties("\{{1}\}" PROPERTIES IMPORTED_LOCATION "\{{1}\}") + add_dependencies("\{{1}\}" "{2}") + ' format: { var. self buildTarget } - ('add_library("{1}" STATIC IMPORTED GLOBAL) - set_target_properties("{1}" PROPERTIES IMPORTED_LOCATION "{1}") - add_dependencies("{1}" "{2}") - ' format: { '${',var, '}' . self buildTarget } ). vmGen cmd: 'add_dependencies' params: vmGen moduleName , ' ' , self buildTarget! Item was changed: ----- Method: CMIOSFreetype2>>includeDir (in category 'accessing') ----- includeDir "see setVariables" " `<prefix>/include/freetype2' must be in your current inclusion path " - ^ '"${thirdpartyDir}/freetype2/freetype-2.4.9/include"'! Item was changed: ----- Method: CMPkgConfig>>build (in category 'generating actions') ----- build gen puts: ' add_custom_command(OUTPUT "${pkgConfigBinary}" + COMMAND ./configure --prefix=''${installPrefix}'' CFLAGS=''-std=gnu89 -arch i386'' LDFLAGS=''-arch i386'' - COMMAND ./configure --prefix=''${installPrefix}'' CFLAGS=''-arch i386'' LDFLAGS=''-arch i386'' COMMAND make COMMAND make install WORKING_DIRECTORY "${libSourcesDir}" DEPENDS "${unpackTarget}" COMMENT "Building ${libName}" ) ' ! Item was changed: + ----- Method: CMThirdpartyLibrary>>archiveFileName (in category 'accessing') ----- - ----- Method: CMThirdpartyLibrary>>archiveFileName (in category 'as yet unclassified') ----- archiveFileName ^ self downloadURL asUrl fileName ! Item was changed: ----- Method: CMThirdpartyLibrary>>defaultConfigurationFlags (in category 'settings') ----- defaultConfigurationFlags ^#( + 'CFLAGS=''-arch i386''' - 'CFLAGS=''-arch i386''' 'LDFLAGS=''-arch i386''')! Item was changed: ----- Method: CMakeGenerator>>addExternalLibrary: (in category 'cmake commands') ----- addExternalLibrary: aLibrary - self cmd: 'list' params: 'APPEND LINKLIBS ' , aLibrary . " self cmd: 'target_link_libraries' params: self moduleName , ' ' , aLibrary. " ! Item was changed: ----- Method: CMakeGenerator>>linkDirectories: (in category 'cmake commands') ----- linkDirectories: aString ^ self cmd: 'link_directories' params: aString! Item was changed: CMakeGenerator subclass: #CMakePluginGenerator + instanceVariableNames: 'plugin vmGen internal extraRules doNotGenerate externalDependencies' - instanceVariableNames: 'plugin vmGen internal extraRules doNotGenerate' classVariableNames: '' poolDictionaries: '' category: 'CMakeVMMaker'! !CMakePluginGenerator commentStamp: 'Igor.Stasenko 12/25/2010 04:21' prior: 0! I am using for generating CMakeLists.txt (cmake config files) for specific plugin. The direct use of my instances is not recommended. Use CMakeVMGenerator and appropriate configuration to generate both VM and plugins cmake config files.! Item was changed: + ----- Method: CMakePluginGenerator>>addCrossSources: (in category 'accessing') ----- - ----- Method: CMakePluginGenerator>>addCrossSources: (in category 'as yet unclassified') ----- addCrossSources: sources ^ self addSources: sources prefixed: '${pluginCross}/' ! Item was added: + ----- Method: CMakePluginGenerator>>addExternalDependency: (in category 'accessing') ----- + addExternalDependency: aString + "We need to collect external dependencies to internal plugins because we need to force its + resolve before, and if we just add teh dependency in executable some times is not enough. + check StackIPhoneConfig>>#configureFT2Plugin: as an example" + externalDependencies := externalDependencies copyWith: aString.! Item was changed: + ----- Method: CMakePluginGenerator>>addExternalLibrary: (in category 'cmake commands') ----- - ----- Method: CMakePluginGenerator>>addExternalLibrary: (in category 'as yet unclassified') ----- addExternalLibrary: aLibrary + self isInternal + ifTrue: [ vmGen addExternalLibrary: aLibrary ] + ifFalse: [ super addExternalLibrary: aLibrary ].! - - self isInternal ifTrue: [ - vmGen addExternalLibrary: aLibrary - ] - ifFalse: [ super addExternalLibrary: aLibrary ] - ! Item was changed: + ----- Method: CMakePluginGenerator>>addPlatformSources: (in category 'accessing') ----- - ----- Method: CMakePluginGenerator>>addPlatformSources: (in category 'as yet unclassified') ----- addPlatformSources: sources ^ self addSources: sources prefixed: '${pluginPlatform}/' ! Item was changed: + ----- Method: CMakePluginGenerator>>config (in category 'accessing') ----- - ----- Method: CMakePluginGenerator>>config (in category 'as yet unclassified') ----- config ^ vmGen config! Item was changed: + ----- Method: CMakePluginGenerator>>configurationName (in category 'accessing') ----- - ----- Method: CMakePluginGenerator>>configurationName (in category 'as yet unclassified') ----- configurationName ^ vmGen configurationName! Item was added: + ----- Method: CMakePluginGenerator>>externalDependencies (in category 'accessing') ----- + externalDependencies + ^ externalDependencies! Item was changed: + ----- Method: CMakePluginGenerator>>generate:for:internal:extraRules: (in category 'code generation') ----- - ----- Method: CMakePluginGenerator>>generate:for:internal:extraRules: (in category 'as yet unclassified') ----- generate: aPlugin for: aCMakeVMGenerator internal: aBoolean extraRules: aBlock doNotGenerate := false. internal := aBoolean. plugin := aPlugin. vmGen := aCMakeVMGenerator. extraRules := aBlock. ^ self generate! Item was added: + ----- Method: CMakePluginGenerator>>initialize (in category 'initialization') ----- + initialize + super initialize. + externalDependencies := #().! Item was changed: + ----- Method: CMakePluginGenerator>>saveFile (in category 'accessing') ----- - ----- Method: CMakePluginGenerator>>saveFile (in category 'as yet unclassified') ----- saveFile | reference | reference := ((vmGen config dirFrom: vmGen buildDir) / plugin moduleName) ensureDirectory; yourself. (FileStream forceNewFileNamed: (reference / self outputFileName) fullName) nextPutAll: (self config fixLineEndsOf: output contents); close.! Item was changed: + ----- Method: CMakeVMGenerator>>configurationName (in category 'accessing') ----- - ----- Method: CMakeVMGenerator>>configurationName (in category 'as yet unclassified') ----- configurationName ^ config class name! Item was changed: ----- Method: CMakeVMGenerator>>generate (in category 'code generation') ----- generate | intPlugins extPlugins | output := String new writeStream. config setGlobalOptions: self. self printHeader; project: config executableName. config setGlobalOptionsAfterDetermineSystem: self. config setupDirectories: self. self message: '${CMAKE_MODULE_PATH}'. self set: 'CMAKE_CONFIGURATION_TYPES' to: 'Release'. config preferredIncludes do: [ :each | self includeDirectories: each ]. self includeDirectories: self includeDirs. config standardIncludes do: [:each | self includeDirectories: each ]. self addDefinitions: config compilerFlags. config extraVMSettings: self. self puts: 'add_executable(' , config executableName, ' ', config executableType, ' ' , self sources , ')'. intPlugins := self generatePluginConfigs: config internalPlugins internal: true. extPlugins := self generatePluginConfigs: config externalPlugins internal: false. + - self processThirdpartyLibraries. self processPlugins: intPlugins, extPlugins. config setExtraTargetProperties: self. self cmd: 'target_link_libraries' params: self moduleName , ' ${LINKLIBS}'. config postBuildActions: self. self saveFile. self generateBuildScript.! Item was changed: + ----- Method: CMakeVMGenerator>>generatePlugin:internal:extraRules: (in category 'plugins') ----- - ----- Method: CMakeVMGenerator>>generatePlugin:internal:extraRules: (in category 'as yet unclassified') ----- generatePlugin: aPlugin internal: aBoolean extraRules: aBlock " this method called back from plugin" ^ CMakePluginGenerator new generate: aPlugin for: self internal: aBoolean extraRules: aBlock! Item was changed: + ----- Method: CMakeVMGenerator>>includeDirs (in category 'sources management') ----- - ----- Method: CMakeVMGenerator>>includeDirs (in category 'as yet unclassified') ----- includeDirs ^ '${crossDir}/vm ${srcVMDir} ${targetPlatform}/vm ${buildDir}'.! Item was changed: ----- Method: CMakeVMGenerator>>processPlugins: (in category 'processing plugins') ----- processPlugins: pluginGenerators + | libs libDeps | - | libs | libs := OrderedCollection new. + libDeps := Dictionary new. - pluginGenerators do: [:gen | gen doNotGenerate ifFalse: [ + gen isInternal + ifTrue: [ + libs add: gen plugin moduleName ] + ifFalse: [ + "make main module to depend on external plugin, just to make sure it is built + before main module built" + self + cmd: 'add_dependencies' + params: config executableName, ' ' , gen plugin moduleName ]. + gen externalDependencies + ifNotEmpty: [ :deps | + libDeps + at: gen plugin moduleName + put: (deps fold: [ :a :b | a, ' ', b ]) ]. + self addSubdirectory: gen plugin moduleName ] ]. - gen isInternal ifTrue: [ - libs add: gen plugin moduleName ] - ifFalse: [ - "make main module to depend on external plugin, just to make sure it is built before main module built" - self cmd: 'add_dependencies' params: config executableName, ' ' , gen plugin moduleName - ]. - self addSubdirectory: gen plugin moduleName. - ]. - ]. self cmd: 'target_link_libraries' params: config executableName , ' ' , + (libs inject: '' into: [:res :ea | res, ' ' , ea ]). - (libs inject: '' into: [:res :ea | res, ' ' , ea ]) . + libDeps keysAndValuesDo: [ :moduleName :dependencies | + self + cmd: 'add_dependencies' + params: moduleName, ' ', dependencies ]. + + self generateExportsH: libs.! - self generateExportsH: libs. - ! Item was changed: + ----- Method: CMakeVMGenerator>>saveFile (in category 'accessing') ----- - ----- Method: CMakeVMGenerator>>saveFile (in category 'as yet unclassified') ----- saveFile config write: output contents toFile: (self outputFileName). ! Item was changed: Object subclass: #CPlatformConfig + instanceVariableNames: 'topDir buildDir srcDir platformsDir outputDir internalPlugins externalPlugins pluginsDir externalLibs thirdpartyLibs generateForRelease' - instanceVariableNames: 'topDir buildDir srcDir platformsDir outputDir internalPlugins externalPlugins pluginsDir externalLibs thirdpartyLibs' classVariableNames: '' poolDictionaries: '' category: 'CMakeVMMaker'! !CPlatformConfig commentStamp: 'MarianoMartinezPeck 4/24/2011 15:29' prior: 0! Base class, defining some common properties and behavior for all kinds of VM build configurations. These classes are used to generate the VM sources and the CMMake files. Notice that this configuration classes expect that you have download the "platofroms code" which is in Gitorious: https://gitorious.org/cogvm You can load it executing: git clone git://gitorious.org/cogvm/blessed.git Once that is done it should have created a directory /blessed. In order to get all the directories by default, place this image under /blessed/image To generate a sources/build configuration use one of my subclasses with: <config> generate. - to generate a build configuration <config> generateWithSources - to generate VMMaker sources and then build configuration. Once you do that, go to /blessed/build and execute: cmake . or cmake -G"MSYS Makefiles" if you are in Windows Since some plugins require extra settings (like additional source files etc), there is two ways to add that: - add custom rules on plugin class side: PluginClass>>generateFor: aCMakeVMGenerator internal: aBoolean ^ aCMakeVMGenerator generatePlugin: self internal: aBoolean extraRules: [:maker | ... your rules come here ... ] - define rules by adding #configure<PluginClass>: method in config class (see my 'plugin extra rules' category) The last one is more compact and also avoids inter-package dependency, so you can load and use CMakeVMMaker even if some 3rd-party plugins are not loaded into image. Links of interest: Official Cog Website: http://www.mirandabanda.org/cog Official Cog Blog: http://www.mirandabanda.org/cogblog Cog issue tracker: http://code.google.com/p/cog Cog Wiki: http://code.google.com/p/cog/w/list Cog binaries: http://www.mirandabanda.org/files/Cog/VM Cog binaries in Pharo Hudson server: https://pharo-ic.lille.inria.fr/hudson/view/Cog Cog SVN branch: http://squeakvm.org/svn/squeak/branches/Cog VM mailing list: http://lists.squeakfoundation.org/mailman/listinfo/vm-dev VM-beginners mailing list: http://lists.squeakfoundation.org/mailman/listinfo/vm-beginners Guide step by step about how to build the Cog VM using CMakeVMMaker and Git: http://code.google.com/p/cog/wiki/Guide ! Item was added: + ----- Method: CPlatformConfig>>addThirdpartyLibraries: (in category 'thirdparty libs') ----- + addThirdpartyLibraries: aCollection + aCollection do: [ :each | self addThirdpartyLibrary: each ]! Item was changed: ----- Method: CPlatformConfig>>addThirdpartyLibrary: (in category 'thirdparty libs') ----- addThirdpartyLibrary: libName | libs lib | libs := self thirdpartyLibs. lib := libs detect: [:each | each canonicalName = libName ] ifNone: [ nil ]. lib ifNil: [ + lib := CMThirdpartyLibrary named: libName config: self. + "add dependencies first, so thirpartyLibs collection will be naturally dependency sorted" + lib dependencies do: [:dep | self addThirdpartyLibrary: dep ]. + libs add: lib ]. - lib := (CMThirdpartyLibrary named: libName config: self). - "add dependencies first, so thirpartyLibs collection will be naturally dependency sorted" - lib dependencies do: [:dep | self addThirdpartyLibrary: dep ]. - libs add: lib ]. ^ lib! Item was changed: ----- Method: CPlatformConfig>>buildScript (in category 'build script') ----- buildScript "answer the build script for building everything" ^ + '#!!/usr/bin/env bash - '#!!bash cmake . make '! Item was added: + ----- Method: CPlatformConfig>>commonCompilerFlags (in category 'compiler flags') ----- + commonCompilerFlags + ^ #()! Item was added: + ----- Method: CPlatformConfig>>compilerFlags (in category 'compiler flags') ----- + compilerFlags + | releaseFlags | + + releaseFlags := self isGenerateForRelease + ifTrue: [ self compilerFlagsRelease ] + ifFalse: [ self compilerFlagsDebug ]. + + ^ String streamContents: [ :stream | + ((self commonCompilerFlags, releaseFlags) collect: #trimBoth as: Set) + asStringOn: stream + delimiter: ' ' ]! Item was added: + ----- Method: CPlatformConfig>>compilerFlagsDebug (in category 'compiler flags') ----- + compilerFlagsDebug + ^ #()! Item was added: + ----- Method: CPlatformConfig>>compilerFlagsRelease (in category 'compiler flags') ----- + compilerFlagsRelease + ^ #()! Item was added: + ----- Method: CPlatformConfig>>generateForDebug (in category 'accessing') ----- + generateForDebug + generateForRelease := false! Item was added: + ----- Method: CPlatformConfig>>generateForRelease (in category 'accessing') ----- + generateForRelease + generateForRelease := true! Item was added: + ----- Method: CPlatformConfig>>initialize (in category 'initialize-release') ----- + initialize + super initialize. + generateForRelease := true.! Item was added: + ----- Method: CPlatformConfig>>isGenerateForRelease (in category 'testing') ----- + isGenerateForRelease + ^generateForRelease! Item was changed: MacOSConfig subclass: #CocoaIOSConfig + instanceVariableNames: '' - instanceVariableNames: 'generateForRelease' classVariableNames: '' poolDictionaries: '' category: 'CMakeVMMaker-IOS'! !CocoaIOSConfig commentStamp: 'MarianoMartinezPeck 4/24/2011 15:34' prior: 0! This is an abstract class for all Mac Cocoa configurations. It is intended to share code between different concrete implementations. Fore more information, check the class comments of all the superclasses. ! Item was removed: - ----- Method: CocoaIOSConfig>>compilerFlags (in category 'accessing') ----- - compilerFlags - | releaseFlags | - - releaseFlags := self isGenerateForRelease - ifTrue: [ self compilerFlagsRelease ] - ifFalse: [ self compilerFlagsDebug ]. - - ^String streamContents: [ :stream | - (self commonCompilerFlags, releaseFlags) asSet - do: [ :each | stream nextPutAll: each ] - separatedBy: [ stream space ] ]! Item was changed: ----- Method: CocoaIOSConfig>>compilerFlagsRelease (in category 'accessing') ----- compilerFlagsRelease ^#( "'-fobjc-direct-dispatch'" '-msse3' "'-msse4.1'" "'-msse4.2'" "'-mdynamic-no-pic'" "'-fwritable-strings'" '-Os' + '-fvisibility=default' - '-fvisibility=hidden' '-funroll-loops' "'-fno-asm'" '-fasm-blocks' '-finline-functions' '-mfpmath=sse' '-fomit-frame-pointer' '-march=pentium-m' '-mtune=prescott' '-falign-functions=16' '-fno-gcse' - '-fno-cse-follow-jumps' '-std=gnu99' '-DBUILD_FOR_OSX' "'-DUSE_INLINE_MEMORY_ACCESSORS'" '-DLSB_FIRST' '-DUSE_INLINE_MEMORY_ACCESSORS' '-DHAVE_SYS_TIME_H' '-DHAVE_NANOSLEEP' '-DICC_DEBUG=0' '-DICC_OPTLEVEL="speedHLO"' '-DICC_OPT_IPO_FOR_SINGLE_FILE_COMPILATION=1' '-DICC_OPT_PARALLEL=0' '-DICC_OPT_PREFETCH_INSERTION=1' '-DICC_OPT_PROVIDE_FRAME_PTR=0' '-DICC_OPT_USE_ARCH_IA32="SSE42"')! Item was added: + ----- Method: CocoaIOSConfig>>configureMIDIPlugin: (in category 'plugin extra rules') ----- + configureMIDIPlugin: maker + "extra rules for MIDIPlugin" + + maker addPlatformSources: #( 'sqMacMIDI.m')! Item was changed: ----- Method: CocoaIOSConfig>>frameworks (in category 'accessing') ----- frameworks ^ #( Cocoa Foundation AudioToolbox CoreAudio SystemConfiguration ApplicationServices QuartzCore OpenGL + AGL + QuickTime)! - AGL)! Item was removed: - ----- Method: CocoaIOSConfig>>generateForDebug (in category 'accessing') ----- - generateForDebug - generateForRelease := false! Item was removed: - ----- Method: CocoaIOSConfig>>generateForRelease (in category 'accessing') ----- - generateForRelease - generateForRelease := true! Item was removed: - ----- Method: CocoaIOSConfig>>initialize (in category 'initialization') ----- - initialize - super initialize. - self generateForRelease! Item was removed: - ----- Method: CocoaIOSConfig>>isGenerateForRelease (in category 'testing') ----- - isGenerateForRelease - ^generateForRelease! Item was changed: ----- Method: CocoaIOSConfig>>setExtraTargetProperties: (in category 'settings') ----- setExtraTargetProperties: maker | plist precompiledHeaders | " generated and add Info.plist file " plist := self plistFile. (maker buildDir forceNewFileNamed: 'Info.plist') nextPutAll: plist; close. maker addProperty: 'MACOSX_BUNDLE_INFO_PLIST' value: '${buildDir}/Info.plist'. maker cmd: 'set_source_files_properties' params: '${resources} PROPERTIES MACOSX_PACKAGE_LOCATION Resources'. precompiledHeaders := (self executableName, '_Prefix.pch'). (maker buildDir forceNewFileNamed: precompiledHeaders) nextPutAll: self precompiledHeaders; close. maker addXCodeProperty: 'GCC_PREFIX_HEADER' value: '${buildDir}/', precompiledHeaders. "maker addXCodeProperty: 'GCC_ENABLE_SSE3_EXTENSIONS' value: 'YES'; addXCodeProperty: 'GCC_ENABLE_SSE41_EXTENSIONS' value: 'YES'; addXCodeProperty: 'GCC_ENABLE_SSE42_EXTENSIONS' value: 'YES'; addXCodeProperty: 'GCC_GENERATE_DEBUGGING_SYMBOLS' value: 'NO'; addXCodeProperty: 'GCC_INLINES_ARE_PRIVATE_EXTERN' value: 'YES'; addXCodeProperty: 'GCC_UNROLL_LOOPS' value: 'YES'. " "Extras" maker addXCodeProperty: 'ICC_DEBUG' value: 'NO'; addXCodeProperty: 'ICC_OPTLEVEL' value: 'speedHLO'; addXCodeProperty: 'ICC_OPT_IPO_FOR_SINGLE_FILE_COMPILATION' value: 'YES'; addXCodeProperty: 'ICC_OPT_PARALLEL' value: 'NO'; addXCodeProperty: 'ICC_OPT_PREFETCH_INSERTION' value: 'YES'; addXCodeProperty: 'ICC_OPT_PROVIDE_FRAME_PTR' value: 'NO'; addXCodeProperty: 'ICC_OPT_USE_ARCH_IA32' value: 'SSE41'; + addXCodeProperty: 'PER_ARCH_CFLAGS_i386' value: '-finline-functions -mfpmath=sse -march=pentium-m -mtune=prescott -falign-functions=16 -fno-gcse -DLSB_FIRST'; - addXCodeProperty: 'PER_ARCH_CFLAGS_i386' value: '-finline-functions -mfpmath=sse -march=pentium-m -mtune=prescott -falign-functions=16 -fno-gcse -fno-cse-follow-jumps -DLSB_FIRST'; addXCodeProperty: 'PER_ARCH_CFLAGS_ppc' value: '-fast -mtune=7450 -mcpu=7450 -D_BSD_SOCKLEN_T_=int'! Item was changed: ----- Method: CogFamilyCocoaIOSConfig>>commonCompilerFlags (in category 'settings') ----- commonCompilerFlags + ^super commonCompilerFlags, #( + "CLANG >>" + '-fwrapv' "Non optimization of stackoverflow (to allow number conversions)" + '-Wno-return-type' "to avoid clang to complain about plugins that do not return properly." + '-Qunused-arguments' + "CLANG <<" - ^super commonCompilerFlags, - #( '-funroll-loops' '-fasm-blocks' '-fno-inline-functions' '-mfpmath=sse' '-march=pentium-m' '-mtune=prescott' '-falign-functions=16' '-fno-gcse' - '-fno-cse-follow-jumps' '-std=gnu99' '-fmessage-length=0' '-fpascal-strings' '-DBUILD_FOR_OSX' "'-DUSE_INLINE_MEMORY_ACCESSORS=1' " '-DLSB_FIRST' '-DHAVE_SYS_TIME_H' '-DHAVE_NANOSLEEP' '-DCOGMTVM=0' '-DUSE_GLOBAL_STRUCT=0' '-DBASE_HEADER_SIZE=4' '-DENABLE_FAST_BLT')! Item was changed: ----- Method: CogFamilyCocoaIOSConfig>>defaultExternalPlugins (in category 'plugins') ----- defaultExternalPlugins ^(self versionExternalPlugins), #( UUIDPlugin FloatMathPlugin AsynchFilePlugin - SerialPlugin Mpeg3Plugin CroquetPlugin JoystickTabletPlugin - MIDIPlugin B3DAcceleratorPlugin JPEGReadWriter2Plugin JPEGReaderPlugin RePlugin LocalePlugin ObjectiveCPlugin QuicktimePlugin TestOSAPlugin SqueakSSLPlugin + SerialPlugin + MIDIPlugin - "UnixOSProcessPlugin" )! Item was changed: ----- Method: CogFamilyCocoaIOSConfig>>defaultInternalPlugins (in category 'plugins') ----- defaultInternalPlugins ^ #( ADPCMCodecPlugin BMPReadWriterPlugin BalloonEnginePlugin BitBltSimulation ClipboardExtendedPlugin DSAPlugin DeflatePlugin DropPlugin FFTPlugin FilePlugin FloatArrayPlugin GeniePlugin HostWindowPlugin "JPEGReadWriter2Plugin JPEGReaderPlugin" + KlattSynthesizerPlugin - KlattSynthesizerPlugin LargeIntegersPlugin - "MacMenubarPlugin" "This plugin is not yet ported" Matrix2x3Plugin MiscPrimitivePlugin "RePlugin" SecurityPlugin SocketPlugin SoundCodecPlugin SoundGenerationPlugin SoundPlugin StarSqueakPlugin SurfacePlugin UnixAioPlugin UnixOSProcessPlugin )! Item was changed: ----- Method: CogFamilyCocoaIOSConfig>>setExtraTargetProperties: (in category 'settings') ----- setExtraTargetProperties: maker | plist | maker addFrameworks: self frameworks. " generated and add Info.plist file " plist := self plistFile. (FileStream forceNewFileNamed: (maker buildDir / 'Info.plist') fullName) nextPutAll: plist; close. maker addProperty: 'MACOSX_BUNDLE_INFO_PLIST' value: '${buildDir}/Info.plist'. (FileStream forceNewFileNamed: (maker buildDir / self prefixHeaderFileName) fullName ) nextPutAll: self precompiledHeaders; close. maker addXCodeProperty: 'GCC_PREFIX_HEADER' value: '${buildDir}/', self prefixHeaderFileName. maker + addXCodeProperty: 'PER_ARCH_CFLAGS_i386' value: '-DLSB_FIRST -mfpmath=sse -finline-functions -fno-gcse -mtune=prescott -march=pentium-m -falign-functions=16'. - addXCodeProperty: 'PER_ARCH_CFLAGS_i386' value: '-DLSB_FIRST -mfpmath=sse -finline-functions -fno-cse-follow-jumps -fno-gcse -mtune=prescott -march=pentium-m -falign-functions=16'. "maker addXCodeProperty: 'GCC_VERSION' value: '4.3'." maker cmd: 'set_target_properties' params: self executableName, ' PROPERTIES COMPILE_FLAGS "-include \"', (self buildDir / self prefixHeaderFileName) fullName, '\""'. " maker set: 'CMAKE_C_COMPILER' to: '/usr/bin/gcc-4.2'. maker set: 'CMAKE_CXX_COMPILER' to: '/usr/bin/g++-4.2'. " maker set: 'EXECUTABLE_OUTPUT_PATH' toString: self outputDir fullName. maker set: 'RUNTIME_OUTPUT_DIRECTORY' toString: self outputDir fullName.! Item was changed: ----- Method: CogFamilyUnixConfig>>buildScript (in category 'build script') ----- buildScript "answer the build script for building everything" ^ + '#!!/usr/bin/env bash - '#!!bash if [ !! -e vmVersionInfo.h ]; then + ../scripts/extract-commit-info.sh - ../codegen-scripts/extract-commit-info.sh fi cmake . make '! Item was removed: - ----- Method: CogFamilyUnixConfig>>compilerFlags (in category 'compiler flags') ----- - compilerFlags - ^ self subclassResponsibility! Item was changed: ----- Method: CogFamilyUnixConfig>>configureSoundPlugin: (in category 'plugin extra rules') ----- configureSoundPlugin: maker "extra rules for SoundPlugin" + maker addPlatformSources: #( 'sqUnixSound'). + maker addExternalLibraries: #( 'asound' )! - maker addPlatformSources: #( 'sqUnixSound')! Item was added: + ----- Method: CogFamilyUnixConfig>>externalModulesDir (in category 'accessing') ----- + externalModulesDir + "answer the location in VM bundle, where plugins and rest of dynamic libs will be copied, + " + ^ '${outputDir}'! Item was added: + ----- Method: CogFamilyUnixConfig>>setupDirectories: (in category 'utils') ----- + setupDirectories: gen + super setupDirectories: gen. + gen set: #externalModulesDir toString: self externalModulesDir.! Item was changed: ----- Method: CogFamilyWindowsConfig>>buildScript (in category 'build script') ----- buildScript "answer the build script for building everything" ^ + '#!!/usr/bin/env bash - '#!!bash if [ !! -e vmVersionInfo.h ]; then + ../scripts/extract-commit-info.sh - ../codegen-scripts/extract-commit-info.sh fi cmake -G "MSYS Makefiles" . make '! Item was changed: ----- Method: CogFamilyWindowsConfig>>commonCompilerFlags (in category 'compiler flags') ----- commonCompilerFlags "omit -ggdb2 to prevent generating debug info" "Some flags explanation: STACK_ALIGN_BYTES=16 is needed in mingw and FFI (and I suppose on other modules too). DALLOCA_LIES_SO_USE_GETSP=0 Some compilers return the stack address+4 on alloca function, then FFI module needs to adjust that. It is NOT the case of mingw. For more information see this thread: http://forum.world.st/There-are-something-fishy-with-FFI-plugin-td4584226.h… " + ^ { + '-march=pentium4'. + '-mwindows'. + '-D_MT'. + '-msse2'. + '-mthreads'. + '-mwin32'. + '-mno-rtd'. + '-mms-bitfields'. + '-mno-accumulate-outgoing-args ', self winVer. + '-DWIN32'. + '-DWIN32_FILE_SUPPORT'. + '-DNO_ISNAN'. + '-DNO_SERVICE'. + '-DNO_STD_FILE_SUPPORT'. + '-DLSB_FIRST'. + '-DVM_NAME="', self executableName,'"'. + '-DX86 '. + '-DSTACK_ALIGN_BYTES=16'. + '-DALLOCA_LIES_SO_USE_GETSP=0'. + '-DENABLE_FAST_BLT ' }! - ^ '-march=pentium4 -mwindows -D_MT -msse2 -mthreads -mwin32 -mno-rtd -mms-bitfields -mno-accumulate-outgoing-args ', self winVer , - ' -DWIN32 -DWIN32_FILE_SUPPORT -DNO_ISNAN -DNO_SERVICE -DNO_STD_FILE_SUPPORT ', - '-DLSB_FIRST -DVM_NAME="', self executableName,'" -DX86 ', - '-DSTACK_ALIGN_BYTES=16 -DALLOCA_LIES_SO_USE_GETSP=0 -DENABLE_FAST_BLT '! Item was added: + ----- Method: CogFamilyWindowsConfig>>configureSoundPlugin: (in category 'plugin extra rules') ----- + configureSoundPlugin: maker + "extra rules for SoundPlugin" + + maker addPlatformSources: #( 'sqWin32Sound' )! Item was changed: ----- Method: CogFreeBSDConfig>>compilerFlagsDebug (in category 'as yet unclassified') ----- compilerFlagsDebug + ^ { + '-g3'. + '-O0'. + '-msse2'. + '-DITIMER_HEARTBEAT=1'. + '-DNO_VM_PROFILE=1'. + '-DDEBUGVM=1'. + '-DNOEXECINFO' }! - ^ '-g3 -O0 -msse2 -DITIMER_HEARTBEAT=1 - -DNO_VM_PROFILE=1 -DDEBUGVM=1 -DNOEXECINFO'! Item was changed: ----- Method: CogFreeBSDConfig>>compilerFlagsRelease (in category 'as yet unclassified') ----- compilerFlagsRelease + ^ { + '-g0'. + '-O2'. + '-msse2'. + '-DNDEBUG'. + '-DITIMER_HEARTBEAT=1'. + '-DNO_VM_PROFILE=1'. + '-DDEBUGVM=0'. + '-DNOEXECINFO' } - ^ '-g0 -O2 -msse2 -DNDEBUG -DITIMER_HEARTBEAT=1 - -DNO_VM_PROFILE=1 -DDEBUGVM=0 -DNOEXECINFO' ! Item was added: + Object subclass: #CogMTBuilder + instanceVariableNames: '' + classVariableNames: '' + poolDictionaries: '' + category: 'CMakeVMMaker-Builder'! Item was added: + ----- Method: CogMTBuilder class>>build (in category 'building') ----- + build + " self build " + "build for platform we're currently running on" + | platform | + + platform := Smalltalk os platformName. + + platform = 'Win32' ifTrue: [ ^ self buildWin32 ]. + platform = 'Mac OS' ifTrue: [ ^ self buildMacOSX32 ]. + platform = 'unix' ifTrue: [ ^ self buildUnix32 ].! Item was added: + ----- Method: CogMTBuilder class>>buildMacOSX32 (in category 'building') ----- + buildMacOSX32 + ^ self new buildMacOSX32! Item was added: + ----- Method: CogMTBuilder class>>buildOnJenkins: (in category 'building') ----- + buildOnJenkins: aPlatformName + "entry point for jenkins build jobs. + currently we use following names: + win + mac + linux + + " + + aPlatformName = 'win' ifTrue: [ ^ self buildWin32 ]. + aPlatformName = 'mac' ifTrue: [ ^ self buildMacOSX32 ]. + aPlatformName = 'linux' ifTrue: [ ^ self buildUnix32 ]. + + self error: 'no suitable platform'! Item was added: + ----- Method: CogMTBuilder class>>buildUnix32 (in category 'building') ----- + buildUnix32 + ^ self new buildUnix32! Item was added: + ----- Method: CogMTBuilder class>>buildWin32 (in category 'building') ----- + buildWin32 + ^ self new buildWin32! Item was added: + ----- Method: CogMTBuilder>>buildMacOSX32 (in category 'building') ----- + buildMacOSX32 + + CogMTCocoaIOSConfig new + generateForRelease; + "generateForDebug;" + addExternalPlugins: #( FT2Plugin ); + addInternalPlugins: #( UnixOSProcessPlugin ); + generateSources; generate. + ! Item was added: + ----- Method: CogMTBuilder>>buildUnix32 (in category 'building') ----- + buildUnix32 + + CogMTUnixConfig new + addExternalPlugins: #( FT2Plugin SqueakSSLPlugin ); + addInternalPlugins: #( UnixOSProcessPlugin ); + generateSources; generate. + ! Item was added: + ----- Method: CogMTBuilder>>buildWin32 (in category 'building') ----- + buildWin32 + + CogMTWindowsConfig new + + addExternalPlugins: #( FT2Plugin SqueakSSLPlugin ); + addInternalPlugins: #( Win32OSProcessPlugin ); + + generateSources; generate. + ! Item was added: + ----- Method: CogMTBuilder>>initialize (in category 'initialization') ----- + initialize + + "a stupid temporary hack to workaround initialization problems" + + Cogit allSubclassesDo: [ :each | each initializeWithOptions: (VMMaker new instVarNamed: 'optionsDictionary') ]! Item was changed: ----- Method: CogMTFreeBSDConfig>>commonCompilerFlags (in category 'compiler flags') ----- commonCompilerFlags "Common compiler flags LSB_FIRST=1 means that target platform is little endian. set it to 0 for big-endian platforms " + ^ { + '-DLSB_FIRST=1'. + '-DUSE_GLOBAL_STRUCT=0'. + '-DCOGMTVM=1' }! - ^ ' -DLSB_FIRST=1 -DUSE_GLOBAL_STRUCT=0 -DCOGMTVM=1' - ! Item was changed: ----- Method: CogMTMacOSConfig>>commonCompilerFlags (in category 'compiler flags') ----- commonCompilerFlags "Common compiler flags" + ^ { + '-fmessage-length=0'. + '-Wno-trigraphs'. + '-fpascal-strings'. + '-fasm-blocks'. + '-DCOGMTVM=1'. + '-DUSE_GLOBAL_STRUCT=0'. + '-DTARGET_API_MAC_CARBON'. + '-DHAVE_SYS_TIME_H'. + '-mmacosx-version-min=10.5' }! - ^ ' -fmessage-length=0 -Wno-trigraphs -fpascal-strings -fasm-blocks -DCOGMTVM=1 -DUSE_GLOBAL_STRUCT=0 -DTARGET_API_MAC_CARBON -DHAVE_SYS_TIME_H -mmacosx-version-min=10.5' - ! Item was changed: ----- Method: CogMTUnixConfig>>commonCompilerFlags (in category 'compiler flags') ----- commonCompilerFlags "Common compiler flags LSB_FIRST=1 means that target platform is little endian. set it to 0 for big-endian platforms " + ^ { + '-DLSB_FIRST=1'. + '-DUSE_GLOBAL_STRUCT=0'. + '-DCOGMTVM=1'. + '-m32' }! - ^ ' -DLSB_FIRST=1 -DUSE_GLOBAL_STRUCT=0 -DCOGMTVM=1 -m32' - ! Item was changed: ----- Method: CogMacOSConfig>>commonCompilerFlags (in category 'compiler flags') ----- commonCompilerFlags "Common compiler flags" + ^ { + '-fmessage-length=0'. + '-Wno-trigraphs'. + '-fpascal-strings'. + '-fasm-blocks'. + '-DCOGMTVM=0'. + '-DUSE_GLOBAL_STRUCT=0'. + '-DTARGET_API_MAC_CARBON'. + '-DBUILD_FOR_OSX'. + '-DHAVE_SYS_TIME_H'. + '-mmacosx-version-min=10.5' } + ! - ^ ' -fmessage-length=0 -Wno-trigraphs -fpascal-strings -fasm-blocks -DCOGMTVM=0 -DUSE_GLOBAL_STRUCT=0 -DTARGET_API_MAC_CARBON -DBUILD_FOR_OSX -DHAVE_SYS_TIME_H -mmacosx-version-min=10.5' - - " ^ '-arch i386 -fmessage-length=0 -Wno-trigraphs -fpascal-strings -fasm-blocks -DCOGMTVM=0 -DUSE_GLOBAL_STRUCT=0 -DTARGET_API_MAC_CARBON -DHAVE_SYS_TIME_H -mmacosx-version-min=10.5'"! Item was removed: - ----- Method: CogMacOSConfig>>compilerFlags (in category 'compiler flags') ----- - compilerFlags - "depends on config ..." - ^ self compilerFlagsRelease! Item was changed: ----- Method: CogMacOSConfig>>compilerFlagsDebug (in category 'compiler flags') ----- compilerFlagsDebug + ^ { + '-g3'. + '-O0'. + '-Wmissing-prototypes'. + '-Wmissing-braces'. + '-Wparentheses'. + '-Wunused-function'. + '-Wunused-label'. + '-Wunused-parameter'. + '-Wunused-variable'. + '-Wunused-value'. + '-Wsign-compare'. + '-DDEBUGVM=1'. + '-DEXTERNALPRIMSDEBUG=1'. + '-gdwarf-2' }! - ^ self commonCompilerFlags , ' -g3 -O0 -Wmissing-prototypes -Wmissing-braces -Wparentheses -Wunused-function -Wunused-label -Wunused-parameter -Wunused-variable -Wunused-value -Wsign-compare -DDEBUGVM=1 -DEXTERNALPRIMSDEBUG=1 -gdwarf-2 '! Item was changed: ----- Method: CogMacOSConfig>>compilerFlagsRelease (in category 'compiler flags') ----- compilerFlagsRelease " -mdynamic-no-pic " + ^ { + '-gdwarf-2'. + '-O3'. + '-funroll-loops'. + '-ftree-vectorize'. + '-msse3'. + '-DDEBUGVM=0'. + '-DNDEBUG'. + '-Wunused-value'. + '-Wuninitialized'. + '-falign-functions=16'. + '-fno-gcse'. + '-mtune=prescott'. + '-march=pentium-m'. + '-mfpmath=sse'. + '-finline-functions'. + '-Wall'. + '-DUSE_INLINE_MEMORY_ACCESSORS' }! - ^ self commonCompilerFlags , ' -gdwarf-2 -O3 -funroll-loops -ftree-vectorize -msse3 -DDEBUGVM=0 -DNDEBUG -Wunused-value -Wuninitialized -falign-functions=16 -fno-gcse -mtune=prescott -march=pentium-m -mfpmath=sse -finline-functions -Wall -DUSE_INLINE_MEMORY_ACCESSORS'! Item was changed: ----- Method: CogMacOSDebugConfig>>compilerFlags (in category 'compiler flags') ----- compilerFlags + ^ String streamContents: [ :stream | + self commonCompilerFlags asStringOn: stream delimiter: ' '. + self compilerFlagsDebug asStringOn: stream delimiter: ' ' ]! - - ^ self compilerFlagsDebug! Item was changed: ----- Method: CogOnDebian64Config>>commonCompilerFlags (in category 'accessing') ----- commonCompilerFlags + ^ super commonCompilerFlags , { '-L/usr/lib32' }! - ^ super commonCompilerFlags , ' -L/usr/lib32'! Item was changed: ----- Method: CogUnixConfig>>commonCompilerFlags (in category 'compiler flags') ----- commonCompilerFlags "Common compiler flags LSB_FIRST=1 means that target platform is little endian. set it to 0 for big-endian platforms " + ^ { + '-DLSB_FIRST=1'. + '-DUSE_GLOBAL_STRUCT=0'. + '-DCOGMTVM=0'. + '-m32'. + '-DENABLE_FAST_BLT ' } - ^ ' -DLSB_FIRST=1 -DUSE_GLOBAL_STRUCT=0 -DCOGMTVM=0 -m32 -DENABLE_FAST_BLT ' ! Item was removed: - ----- Method: CogUnixConfig>>compilerFlags (in category 'compiler flags') ----- - compilerFlags - "depends on config ..." - ^ self commonCompilerFlags, ' ' ,self compilerFlagsRelease! Item was changed: ----- Method: CogUnixConfig>>compilerFlagsDebug (in category 'compiler flags') ----- compilerFlagsDebug + ^ { + '-g3'. + '-O0'. + '-msse2'. + '-D_GNU_SOURCE'. + '-DITIMER_HEARTBEAT=1'. + '-DNO_VM_PROFILE=1'. + '-DDEBUGVM=1' }! - ^ '-g3 -O0 -msse2 -D_GNU_SOURCE -DITIMER_HEARTBEAT=1 -DNO_VM_PROFILE=1 -DDEBUGVM=1' - - ! Item was changed: ----- Method: CogUnixConfig>>compilerFlagsRelease (in category 'compiler flags') ----- compilerFlagsRelease " THIS FLAGS ARE CRASHING COMPILER -fschedule-insns2 -fschedule-insns THIS FLAGS ARE CRASHING VM -ftree-pre -fcaller-saves THIS FLAGS ARE WORKING -O1 -fthread-jumps -falign-functions -falign-jumps -falign-loops -falign-labels -fcrossjumping -fcse-follow-jumps -fcse-skip-blocks -fdelete-null-pointer-checks -fdevirtualize -fexpensive-optimizations -fgcse -fgcse-lm -finline-small-functions -findirect-inlining -fipa-sra -foptimize-sibling-calls -fpeephole2 -fregmove -freorder-blocks -frerun-cse-after-loop -freorder-functions -fsched-interblock -fsched-spec -fstrict-aliasing -fstrict-overflow -ftree-switch-conversion -ftree-vrp THIS IS LIKE: -O2 -fno-tree-pre -fno-caller-saves " + ^ { + '-g0'. + '-O2'. + '-fno-tree-pre'. + '-fno-caller-saves'. + '-msse2'. + '-D_GNU_SOURCE'. + '-DNDEBUG'. + '-DITIMER_HEARTBEAT=1'. + '-DNO_VM_PROFILE=1'. + '-DDEBUGVM=0' }! - ^ '-g0 -O2 -fno-tree-pre -fno-caller-saves -msse2 -D_GNU_SOURCE -DNDEBUG -DITIMER_HEARTBEAT=1 -DNO_VM_PROFILE=1 -DDEBUGVM=0'! Item was changed: ----- Method: CogUnixDebugConfig>>compilerFlags (in category 'as yet unclassified') ----- compilerFlags + ^ String streamContents: [ :stream | + self commonCompilerFlags asStringOn: stream delimiter: ' '. + self compilerFlagsDebug asStringOn: stream delimiter: ' ' ]! - - ^ self commonCompilerFlags, ' ' ,self compilerFlagsDebug! Item was removed: - ----- Method: CogWindowsConfig>>compilerFlags (in category 'compiler flags') ----- - compilerFlags - "depends on config ..." - ^ self commonCompilerFlags, ' ' , self compilerFlagsRelease! Item was changed: ----- Method: CogWindowsConfig>>compilerFlagsDebug (in category 'plugins') ----- compilerFlagsDebug "Define NDEBUG for production to exclude asserts " + ^ { + '-g3'. + '-O0'. + '-march=pentium4'. + '-momit-leaf-frame-pointer'. + '-maccumulate-outgoing-args'. + '-funroll-loops'. + '-DDEBUGVM=1' }! - ^ '-g3 -O0 -march=pentium4 -momit-leaf-frame-pointer -maccumulate-outgoing-args -funroll-loops -DDEBUGVM=1'! Item was changed: ----- Method: CogWindowsConfig>>compilerFlagsRelease (in category 'compiler flags') ----- compilerFlagsRelease "Define NDEBUG for production to exclude asserts " + ^ { + '-g0'. + '-O2'. + '-march=pentium4'. + '-momit-leaf-frame-pointer'. + '-maccumulate-outgoing-args'. + '-funroll-loops'. + '-DNDEBUG -DDEBUGVM=0'}! - ^ '-g0 -O2 -march=pentium4 -momit-leaf-frame-pointer -maccumulate-outgoing-args -funroll-loops ', - '-DNDEBUG -DDEBUGVM=0'! Item was changed: ----- Method: CogWindowsConfig>>defaultInternalPlugins (in category 'plugins') ----- defaultInternalPlugins ^ #( ADPCMCodecPlugin AsynchFilePlugin B3DAcceleratorPlugin BalloonEnginePlugin "B2DPlugin" BitBltSimulation "BitBltPlugin" BMPReadWriterPlugin CroquetPlugin DeflatePlugin "ZipPlugin" DropPlugin DSAPlugin "DSAPrims" FFTPlugin FilePlugin FloatArrayPlugin FloatMathPlugin HostWindowPlugin IA32ABIPlugin "IA32ABI" JoystickTabletPlugin JPEGReaderPlugin JPEGReadWriter2Plugin KlattSynthesizerPlugin "Klatt" LargeIntegersPlugin "LargeIntegers" LocalePlugin Matrix2x3Plugin MIDIPlugin MiscPrimitivePlugin Mpeg3Plugin RePlugin SecurityPlugin SerialPlugin SocketPlugin SoundCodecPlugin "SoundCodecPrims" SoundGenerationPlugin + SoundPlugin StarSqueakPlugin SurfacePlugin UUIDPlugin )! Item was changed: ----- Method: CogWindowsDebugConfig>>compilerFlags (in category 'as yet unclassified') ----- compilerFlags + ^ String streamContents: [ :stream | + self commonCompilerFlags asStringOn: stream delimiter: ' '. + self compilerFlagsDebug asStringOn: stream delimiter: ' ' ]! - "depends on config ..." - ^ self commonCompilerFlags, ' ' , self compilerFlagsDebug! Item was changed: ----- Method: MacOSConfig>>buildScript (in category 'build script') ----- buildScript "answer the build script for building everything" ^ + '#!!/usr/bin/env bash - '#!!bash if [ !! -e vmVersionInfo.h ]; then + ../scripts/extract-commit-info.sh - ../codegen-scripts/extract-commit-info.sh fi cmake . make make install '! Item was added: + ----- Method: StackCocoaIOSConfig>>commonCompilerFlags (in category 'settings') ----- + commonCompilerFlags + ^ super commonCompilerFlags! Item was removed: - ----- Method: StackCocoaIOSConfig>>compilerFlagsRelease (in category 'settings') ----- - compilerFlagsRelease - ^#( - '-g0' '-O0' '-DNDEBUG' '-DDEBUGVM=0' - '-fomit-frame-pointer' - '-fdefer-pop -fdelayed-branch -fguess-branch-probability -fcprop-registers -fif-conversion -fif-conversion2 -ftree-ccp -ftree-dce -ftree-dominator-opts -ftree-dse -ftree-ter -ftree-lrs -ftree-sra -ftree-copyrename -ftree-fre -ftree-ch -funit-at-a-time -fmerge-constants' - '-fthread-jumps -fcrossjumping -foptimize-sibling-calls -fcse-follow-jumps -fcse-skip-blocks -fgcse -fgcse-lm -fexpensive-optimizations -frerun-cse-after-loop -fcaller-saves -fpeephole2 -fschedule-insns -fschedule-insns2 -fsched-interblock -fsched-spec -fregmove -fstrict-aliasing -fstrict-overflow -fdelete-null-pointer-checks -freorder-blocks -freorder-functions -falign-functions -falign-jumps -falign-loops -falign-labels -ftree-vrp -ftree-pre' - '-finline-functions -funswitch-loops -fgcse-after-reload')! Item was added: + ----- Method: StackCocoaIOSConfig>>setGlobalOptions: (in category 'settings') ----- + setGlobalOptions: maker + super setGlobalOptions: maker. + maker set: 'CMAKE_C_COMPILER' to: 'clang'. + maker set: 'CMAKE_CXX_COMPILER' to: 'clang++'.! Item was added: + StackUnixConfig subclass: #StackCrossRaspbianConfig + instanceVariableNames: '' + classVariableNames: '' + poolDictionaries: '' + category: 'CMakeVMMaker-Unix'! + + !StackCrossRaspbianConfig commentStamp: '<historical>' prior: 0! + This is a concrete class which generates a StackVM for Raspbian (debian on RaspberryPi). But in cross compilation usage. + + + Usage: + StackCrossRaspbianConfig generateWithSources + + + Fore more information, check the class comments of all the superclasses. + ! Item was added: + ----- Method: StackCrossRaspbianConfig>>addDriver:sources:generator: (in category 'as yet unclassified') ----- + addDriver: name sources: aSources generator: cmakeGen + + | cfg srcs | + + srcs := aSources inject: '' into: [:res :each | res , ' "', each, '"' ]. + cfg := cmakeGen + captureOutputDuring: [ + cmakeGen printHeader; + project: name; + include: '../directories.cmake'; + + message: 'Adding module: ', name; + + addDefinitions: self compilerFlags; + addDefinitions: '-fPIC -DPIC'; + set: #sources to: srcs; + cmd: 'add_library' params: name, ' SHARED ${sources}'; + linkDirectories: '${CMAKE_FIND_ROOT_PATH}/usr/lib/arm-linux-gnueabihf/'; + includeDirectories: '${CMAKE_FIND_ROOT_PATH}/usr/include/'; + includeDirectories: '${crossDir}/plugins/FilePlugin'; + includeDirectories: '${targetPlatform}/plugins/B3DAcceleratorPlugin'; + includeDirectories: '${crossDir}/plugins/B3DAcceleratorPlugin'; + set: 'LIBRARY_OUTPUT_PATH' toString: self outputDir; + cmd: 'set_target_properties' params: name , ' PROPERTIES PREFIX "" SUFFIX "" + LINK_FLAGS "', self linkFlags , '"' + ]. + + + self write: cfg toFile: ((self buildDir / name) assureExistence / cmakeGen outputFileName) fullName. + cmakeGen addSubdirectory: name. + ! Item was added: + ----- Method: StackCrossRaspbianConfig>>addDriver:sources:generator:externalLibs: (in category 'as yet unclassified') ----- + addDriver: name sources: aSources generator: cmakeGen externalLibs: extLibs + + | cfg srcs | + + srcs := aSources inject: '' into: [:res :each | res , ' "', each, '"' ]. + cfg := cmakeGen + captureOutputDuring: [ + cmakeGen printHeader; + project: name; + include: '../directories.cmake'; + + message: 'Adding module: ', name; + + addDefinitions: self compilerFlags; + addDefinitions: '-fPIC -DPIC'; + set: #sources to: srcs; + + cmd: 'add_library' params: name, ' SHARED ${sources}'; + includeDirectories: '${CMAKE_FIND_ROOT_PATH}/usr/include'; + includeDirectories: '${crossDir}/plugins/FilePlugin'; + includeDirectories: '${targetPlatform}/plugins/B3DAcceleratorPlugin'; + includeDirectories: '${crossDir}/plugins/B3DAcceleratorPlugin'; + set: 'LIBRARY_OUTPUT_PATH' toString: self outputDir fullName; + linkDirectories: '${CMAKE_FIND_ROOT_PATH}/usr/lib/arm-linux-gnueabihf/'; + + addExternalLibraries: extLibs; + + cmd: 'target_link_libraries' params: name , ' ${LINKLIBS}'; + cmd: 'set_target_properties' params: name , ' PROPERTIES PREFIX "" SUFFIX "" ' + ]. + + (self buildDir / name) ensureDirectory. + self write: cfg toFile: name , '/', cmakeGen outputFileName. + cmakeGen addSubdirectory: name. + ! Item was added: + ----- Method: StackCrossRaspbianConfig>>commonCompilerFlags (in category 'as yet unclassified') ----- + commonCompilerFlags + + "Common compiler flags + + + LSB_FIRST=1 means that target platform is little endian. + set it to 0 for big-endian platforms + + " + + ^ { + '-DLSB_FIRST=1'. + '-DUSE_GLOBAL_STRUCT=0'. + '-DCOGMTVM=0' } + ! Item was added: + ----- Method: StackCrossRaspbianConfig>>compilerFlagsDebug (in category 'as yet unclassified') ----- + compilerFlagsDebug + + ^ { + '-g3'. + '-O0'. + '-D_GNU_SOURCE'. + '-DITIMER_HEARTBEAT=1'. + '-DNO_VM_PROFILE=1'. + '-DDEBUGVM=1' }! Item was added: + ----- Method: StackCrossRaspbianConfig>>compilerFlagsRelease (in category 'as yet unclassified') ----- + compilerFlagsRelease + " + THIS FLAGS ARE CRASHING COMPILER + -fschedule-insns2 + -fschedule-insns + + THIS FLAGS ARE CRASHING VM + -ftree-pre + -fcaller-saves + + THIS FLAGS ARE WORKING + -O1 -fthread-jumps -falign-functions -falign-jumps -falign-loops -falign-labels -fcrossjumping -fcse-follow-jumps -fcse-skip-blocks -fdelete-null-pointer-checks -fdevirtualize -fexpensive-optimizations -fgcse -fgcse-lm -finline-small-functions -findirect-inlining -fipa-sra -foptimize-sibling-calls -fpeephole2 -fregmove -freorder-blocks -frerun-cse-after-loop -freorder-functions -fsched-interblock -fsched-spec -fstrict-aliasing -fstrict-overflow -ftree-switch-conversion -ftree-vrp + + THIS IS LIKE: -O2 -fno-tree-pre -fno-caller-saves + + " + + ^ { + '-g0'. + '-O2'. + '-fno-tree-pre'. + '-fno-caller-saves'. + '-D_GNU_SOURCE'. + '-DNDEBUG'. + '-DITIMER_HEARTBEAT=1'. + '-DNO_VM_PROFILE=1'. + '-DDEBUGVM=0' }! Item was added: + ----- Method: StackCrossRaspbianConfig>>configH (in category 'as yet unclassified') ----- + configH + " right now its like that " + ^ ' + #ifndef __sq_config_h + #define __sq_config_h + + /* explicit image width */ + + #define HAVE_INTERP_H 1 + + /* package options */ + + #define USE_X11 1 + #define USE_X11_GLX 1 + /* #undef USE_QUARTZ */ + /* #undef USE_QUARTZ_CGL */ + /* #undef USE_RFB */ + + /* libraries */ + + /* #undef HAVE_LIBX11 */ + /* #undef HAVE_LIBXEXT */ + #define HAVE_LIBDL 1 + /* #undef HAVE_DYLD */ + /* #undef HAVE_LIBFFI */ + /* #undef HAVE_ICONV */ + + /* #undef USE_AUDIO_NONE */ + /* #undef USE_AUDIO_SUN */ + /* #undef USE_AUDIO_NAS */ + /* #undef USE_AUDIO_OSS */ + /* #undef USE_AUDIO_MACOSX */ + /* #undef OSS_DEVICE */ + + /* header files */ + + #define HAVE_UNISTD_H 1 + /* #undef NEED_GETHOSTNAME_P */ + + #define HAVE_DIRENT_H 1 + /* #undef HAVE_SYS_NDIR_H */ + /* #undef HAVE_SYS_DIR_H */ + /* #undef HAVE_NDIR_H */ + #define HAVE_DLFCN_H 1 + #define HAVE_ICONV_H 1 + + #define HAVE_SYS_TIME_H 1 + #define TIME_WITH_SYS_TIME 1 + + /* #undef HAVE_SYS_FILIO_H */ + + /* #undef HAVE_SYS_AUDIOIO_H */ + /* #undef HAVE_SUN_AUDIOIO_H */ + + #define HAVE_PTY_H 1 + /* #undef HAVE_UTIL_H */ + /* #undef HAVE_LIBUTIL_H */ + #define HAVE_STROPTS_H 1 + + #define HAVE_GL_GL_H 1 + /* #undef HAVE_OPENGL_GL_H */ + + /* #undef NEED_SUNOS_H */ + + /* system calls/library functions */ + + #define AT_EXIT atexit + + #define HAVE_TZSET 1 + + #define HAVE_OPENPTY 1 + /* #undef HAVE_UNIX98_PTYS */ + + #define HAVE_SNPRINTF 1 + /* #undef HAVE___SNPRINTF */ + + #define HAVE_MMAP 1 + + /* #undef HAVE_DYLD */ + + #define HAVE_LANGINFO_CODESET 1 + + #define HAVE_ALLOCA 1 + #define HAVE_ALLOCA_H 1 + + #define HAVE_UNSETENV 1 + + #define HAVE_NANOSLEEP 1 + + /* widths of primitive types */ + + #define SIZEOF_INT 4 + #define SIZEOF_LONG 4 + #define SIZEOF_LONG_LONG 8 + #define SIZEOF_VOID_P 4 + + /* structures */ + + #define HAVE_TM_GMTOFF 1 + #define HAVE_TIMEZONE 1 + + /* typedefs */ + + /* #undef size_t */ + /* #undef socklen_t */ + + #define ENABLE_FAST_BLT 1 + #define squeakInt64 long long + + /* architecture */ + + #define OS_TYPE "unix" + #define __arm__ 1 + #define __ARM_ARCH_6__ 1 + #define VM_HOST "arm-pc-linux-gnu" + #define VM_HOST_CPU "arm" + /* #undef VM_HOST_VENDOR */ + #define VM_HOST_OS "linux-gnu" + #define VM_BUILD_STRING "Unix built on "__DATE__ " "__TIME__" Compiler: "__VERSION__ + + /* #undef WORDS_BIGENDIAN */ + /* #undef DOUBLE_WORD_ALIGNMENT */ + + /* damage containment */ + + /* #undef DARWIN */ + + #ifdef NEED_SUNOS_H + # include "sunos.h" + #endif + + /* other configured variables */ + + #define SQ_VERSION "3.9a-7024" + #define VM_VERSION "3.9-7" + #define VM_MODULE_PREFIX "" + /* #undef VM_DLSYM_PREFIX */ + #define VM_X11DIR "" + + /* avoid dependencies on glibc2.3 */ + + #define HAVE_FEATURES_H 1 + + #if defined(HAVE_FEATURES_H) + # include "glibc.h" + #endif + + + /* used by UUID plugin: */ + + #define HAVE_UUID_H 1 + + #endif /* __sq_config_h */ + + '! Item was added: + ----- Method: StackCrossRaspbianConfig>>configureB3DAcceleratorPlugin: (in category 'as yet unclassified') ----- + configureB3DAcceleratorPlugin: maker + "extra rules for B3DAcceleratorPlugin" + + super configureB3DAcceleratorPlugin: maker. + maker includeDirectories: '${CMAKE_FIND_ROOT_PATH}/usr/include/'.! Item was added: + ----- Method: StackCrossRaspbianConfig>>configureBitBltSimulation: (in category 'as yet unclassified') ----- + configureBitBltSimulation: maker + "extra rules for BitBltSimulation" + + maker includeDirectories: '${pluginCross}'. + + maker addCrossSources: #( + 'BitBltGeneric.c' + 'BitBltDispatch.c' + ). + ! Item was added: + ----- Method: StackCrossRaspbianConfig>>defaultExternalPlugins (in category 'as yet unclassified') ----- + defaultExternalPlugins + ^ #( + B3DAcceleratorPlugin + JPEGReaderPlugin + JPEGReadWriter2Plugin + RePlugin + InternetConfigPlugin + )! Item was added: + ----- Method: StackCrossRaspbianConfig>>defaultInternalPlugins (in category 'as yet unclassified') ----- + defaultInternalPlugins + " took from unixbuild/bld/plugins.int" + ^ #( + ADPCMCodecPlugin + AsynchFilePlugin + BalloonEnginePlugin "B2DPlugin" + BitBltSimulation "BitBltPlugin" + BMPReadWriterPlugin + CroquetPlugin + DeflatePlugin "ZipPlugin" + DropPlugin + DSAPlugin "DSAPrims" + FFTPlugin + FileCopyPlugin + FilePlugin + FloatArrayPlugin + FloatMathPlugin + JoystickTabletPlugin + KlattSynthesizerPlugin "Klatt" + LargeIntegersPlugin "LargeIntegers" + Matrix2x3Plugin + MIDIPlugin + MiscPrimitivePlugin + Mpeg3Plugin + SecurityPlugin + SerialPlugin + SocketPlugin + SoundCodecPlugin "SoundCodecPrims" + SoundGenerationPlugin + SoundPlugin + StarSqueakPlugin + SurfacePlugin + LocalePlugin + )! Item was added: + ----- Method: StackCrossRaspbianConfig>>executableName (in category 'as yet unclassified') ----- + executableName + ^ 'PharoS'! Item was added: + ----- Method: StackCrossRaspbianConfig>>extraPluginSettings: (in category 'as yet unclassified') ----- + extraPluginSettings: maker + + maker isExternal ifTrue: [ + "copy lib to results dir " + maker set: 'LIBRARY_OUTPUT_PATH' to: '${outputDir}' + ]. + + maker set: #linkFlags toString: '${linkFlags}' + ! Item was added: + ----- Method: StackCrossRaspbianConfig>>linkFlags (in category 'as yet unclassified') ----- + linkFlags + ^ '-lSM -lICE -ldl -lGL -lpthread -lm -lnsl -lX11'! Item was added: + ----- Method: StackCrossRaspbianConfig>>preferredIncludes (in category 'as yet unclassified') ----- + preferredIncludes + ^ #('${CMAKE_FIND_ROOT_PATH}/usr/include/' + '${targetPlatform}/plugins/B3DAcceleratorPlugin') + ! Item was added: + ----- Method: StackCrossRaspbianConfig>>setExtraTargetProperties: (in category 'as yet unclassified') ----- + setExtraTargetProperties: maker + + "maker setTargetProperties: 'LINK_FLAGS ""'." + + maker puts: 'set_source_files_properties( ${srcVMDir}/cogit.c PROPERTIES + COMPILE_FLAGS "-O1 -fno-omit-frame-pointer -momit-leaf-frame-pointer")'. + + + maker + cmd: 'set_source_files_properties' + params: ' ${targetPlatform}/vm/sqUnixHeartbeat.c PROPERTIES + COMPILE_FLAGS "-O1 -fno-omit-frame-pointer"'. + + maker linkDirectories: '${CMAKE_FIND_ROOT_PATH}/usr/lib/arm-linux-gnueabihf/'. + + maker addExternalLibraries: + #( + 'm' "math lib" + 'dl' "dynamic loader" + 'pthread' "posix threads" + ). + + maker set: 'EXECUTABLE_OUTPUT_PATH' toString: self outputDir fullName. + self addVMDrivers: maker.! Item was added: + StackCrossRaspbianConfig subclass: #StackCrossRaspbianFastBltConfig + instanceVariableNames: '' + classVariableNames: '' + poolDictionaries: '' + category: 'CMakeVMMaker-Unix'! + + !StackCrossRaspbianFastBltConfig commentStamp: '<historical>' prior: 0! + This is a concrete class which generates a StackVM for Raspbian (debian on RaspberryPi). But in cross compilation usage. + + + Usage: + StackCrossRaspbianFastBltConfig generateWithSources + + + Fore more information, check the class comments of all the superclasses. + ! Item was added: + ----- Method: StackCrossRaspbianFastBltConfig>>commonCompilerFlags (in category 'as yet unclassified') ----- + commonCompilerFlags + ^ super commonCompilerFlags, { '-DENABLE_FAST_BLT' }.! Item was added: + ----- Method: StackCrossRaspbianFastBltConfig>>compilerFlagsDebug (in category 'as yet unclassified') ----- + compilerFlagsDebug + + ^ { + '-g3'. + '-D_GNU_SOURCE'. + '-DITIMER_HEARTBEAT=1'. + '-DNO_VM_PROFILE=1'. + '-DDEBUGVM=1' }! Item was added: + ----- Method: StackCrossRaspbianFastBltConfig>>compilerFlagsRelease (in category 'as yet unclassified') ----- + compilerFlagsRelease + " + THIS FLAGS ARE CRASHING COMPILER + -fschedule-insns2 + -fschedule-insns + + THIS FLAGS ARE CRASHING VM + -ftree-pre + -fcaller-saves + + THIS FLAGS ARE WORKING + -O1 -fthread-jumps -falign-functions -falign-jumps -falign-loops -falign-labels -fcrossjumping -fcse-follow-jumps -fcse-skip-blocks -fdelete-null-pointer-checks -fdevirtualize -fexpensive-optimizations -fgcse -fgcse-lm -finline-small-functions -findirect-inlining -fipa-sra -foptimize-sibling-calls -fpeephole2 -fregmove -freorder-blocks -frerun-cse-after-loop -freorder-functions -fsched-interblock -fsched-spec -fstrict-aliasing -fstrict-overflow -ftree-switch-conversion -ftree-vrp + + THIS IS LIKE: -O2 -fno-tree-pre -fno-caller-saves + + " + + ^ { + '-g0'. + '-D_GNU_SOURCE'. + '-DNDEBUG'. + '-DITIMER_HEARTBEAT=1'. + '-DNO_VM_PROFILE=1'. + '-DDEBUGVM=0' }! Item was added: + ----- Method: StackCrossRaspbianFastBltConfig>>configH (in category 'as yet unclassified') ----- + configH + " right now its like that " + ^ ' + #ifndef __sq_config_h + #define __sq_config_h + + /* explicit image width */ + + #define HAVE_INTERP_H 1 + + /* package options */ + + #define USE_X11 1 + #define USE_X11_GLX 1 + /* #undef USE_QUARTZ */ + /* #undef USE_QUARTZ_CGL */ + /* #undef USE_RFB */ + + /* libraries */ + + /* #undef HAVE_LIBX11 */ + /* #undef HAVE_LIBXEXT */ + #define HAVE_LIBDL 1 + /* #undef HAVE_DYLD */ + /* #undef HAVE_LIBFFI */ + /* #undef HAVE_ICONV */ + + /* #undef USE_AUDIO_NONE */ + /* #undef USE_AUDIO_SUN */ + /* #undef USE_AUDIO_NAS */ + /* #undef USE_AUDIO_OSS */ + /* #undef USE_AUDIO_MACOSX */ + /* #undef OSS_DEVICE */ + + /* header files */ + + #define HAVE_UNISTD_H 1 + /* #undef NEED_GETHOSTNAME_P */ + + #define HAVE_DIRENT_H 1 + /* #undef HAVE_SYS_NDIR_H */ + /* #undef HAVE_SYS_DIR_H */ + /* #undef HAVE_NDIR_H */ + #define HAVE_DLFCN_H 1 + #define HAVE_ICONV_H 1 + + #define HAVE_SYS_TIME_H 1 + #define TIME_WITH_SYS_TIME 1 + + /* #undef HAVE_SYS_FILIO_H */ + + /* #undef HAVE_SYS_AUDIOIO_H */ + /* #undef HAVE_SUN_AUDIOIO_H */ + + #define HAVE_PTY_H 1 + /* #undef HAVE_UTIL_H */ + /* #undef HAVE_LIBUTIL_H */ + #define HAVE_STROPTS_H 1 + + #define HAVE_GL_GL_H 1 + /* #undef HAVE_OPENGL_GL_H */ + + /* #undef NEED_SUNOS_H */ + + /* system calls/library functions */ + + #define AT_EXIT atexit + + #define HAVE_TZSET 1 + + #define HAVE_OPENPTY 1 + /* #undef HAVE_UNIX98_PTYS */ + + #define HAVE_SNPRINTF 1 + /* #undef HAVE___SNPRINTF */ + + #define HAVE_MMAP 1 + + /* #undef HAVE_DYLD */ + + #define HAVE_LANGINFO_CODESET 1 + + #define HAVE_ALLOCA 1 + #define HAVE_ALLOCA_H 1 + + #define HAVE_UNSETENV 1 + + #define HAVE_NANOSLEEP 1 + + /* widths of primitive types */ + + #define SIZEOF_INT 4 + #define SIZEOF_LONG 4 + #define SIZEOF_LONG_LONG 8 + #define SIZEOF_VOID_P 4 + + /* structures */ + + #define HAVE_TM_GMTOFF 1 + #define HAVE_TIMEZONE 1 + + /* typedefs */ + + /* #undef size_t */ + /* #undef socklen_t */ + + #define ENABLE_FAST_BLT 1 + #define squeakInt64 long long + + /* architecture */ + + #define OS_TYPE "unix" + + #define VM_HOST "i686-pc-linux-gnu" + #define VM_HOST_CPU "i686" + /* #undef VM_HOST_VENDOR */ + #define VM_HOST_OS "linux-gnu" + #define VM_BUILD_STRING "Unix built on "__DATE__ " "__TIME__" Compiler: "__VERSION__ + + /* #undef WORDS_BIGENDIAN */ + /* #undef DOUBLE_WORD_ALIGNMENT */ + + /* damage containment */ + + /* #undef DARWIN */ + + #ifdef NEED_SUNOS_H + # include "sunos.h" + #endif + + /* other configured variables */ + + #define SQ_VERSION "3.9a-7024" + #define VM_VERSION "3.9-7" + #define VM_MODULE_PREFIX "" + /* #undef VM_DLSYM_PREFIX */ + #define VM_X11DIR "" + + /* avoid dependencies on glibc2.3 */ + + #define HAVE_FEATURES_H 1 + + #if defined(HAVE_FEATURES_H) + # include "glibc.h" + #endif + + + /* used by UUID plugin: */ + + #define HAVE_UUID_H 1 + + #endif /* __sq_config_h */ + + '! Item was added: + ----- Method: StackCrossRaspbianFastBltConfig>>configureBitBltSimulation: (in category 'as yet unclassified') ----- + configureBitBltSimulation: maker + "extra rules for BitBltSimulation" + + maker includeDirectories: '${pluginCross}'. + maker set: 'can_use_assembler' to: 'TRUE'. + maker cmd: 'enable_language' params: 'ASM'. + maker set: 'CMAKE_ASM_COMPILE_OBJECT' to: '"asasm -cpu 6 -I ${pluginCross} -o <OBJECT> <SOURCE>"'. + + maker addCrossSources: #( + 'BitBltArm.c' + 'BitBltArmSimd.c' + 'BitBltDispatch.c' + 'BitBltGeneric.c' + 'BitBltArmLinux.c' + 'BitBltArmSimdAlphaBlend.s' + 'BitBltArmSimdBitLogical.s' + 'BitBltArmSimdPixPaint.s' + 'BitBltArmSimdSourceWord.s' + ). + ! Item was changed: ----- Method: StackEvtUnixDebugConfig>>compilerFlags (in category 'compiler flags') ----- compilerFlags + ^ String streamContents: [ :stream | + self commonCompilerFlags asStringOn: stream delimiter: ' '. + self compilerFlagsDebug asStringOn: stream delimiter: ' ' ]! - - ^ self commonCompilerFlags, ' ' ,self compilerFlagsDebug! Item was changed: ----- Method: StackIPhoneConfig>>buildScript (in category 'build script') ----- buildScript "answer the build script for building everything" ^ + '#!!/usr/bin/env bash - '#!!bash + set -e + if [ !! -e vmVersionInfo.h ]; then + ../scripts/extract-commit-info.sh - ../codegen-scripts/extract-commit-info.sh fi + cmake . + make + find ../{1}/{2}.app/Contents -type f -exec mv ''\{\}'' ../{1}/{2}.app \\; + rm -Rf ../{1}/{2}.app/Contents + ' format: { self outputDirName. self executableName }! - cmake -G Xcode . - xcodebuild -sdk {2} -configuration Release -target {1} - - ' format: {self executableName. self sdkTarget}! Item was changed: ----- Method: StackIPhoneConfig>>commonCompilerFlags (in category 'settings') ----- commonCompilerFlags "Common compiler flags" ^{ + '-arch {1}' format: { self architecture }. + "CLANG >>" + '-fwrapv'. "Non optimization of stackoverflow (to allow number conversions)" + '-Wno-return-type'. "to avoid clang to complain about plugins that do not return properly." + '-Qunused-arguments'. + "CLANG <<" + '-isysroot {1}' format: { self sysroot }. - "'-miphoneos-version-min=4.3'. " - '-isysroot /Applications/Xcode.app/Contents/Developer/Platforms/{1}.platform/Developer/SDKs/{1}{2}.sdk' format: { self targetDevice. self sdkVersion}. '-x objective-c'. '-std=gnu99'. '-falign-functions=16'. '-fno-gcse'. - '-fno-cse-follow-jumps'. '-fvisibility=hidden'. '-funroll-loops'. '-finline-functions'. '-mno-thumb'. - '-fwrapv'. '-DSTACKVM=1'. '-DCOGMTVM=0'. '-DUSE_GLOBAL_STRUCT=0'. '-DBASE_HEADER_SIZE=4'. '-DTARGET_OS_IS_IPHONE'. '-DHAVE_UUID_GENERATE'. - "'-DUSE_INLINE_MEMORY_ACCESSORS'. " '-DHAVE_SYS_TIME_H'. '-DLSB_FIRST'. '-DHAVE_NANOSLEEP'. + '-DISQUEAK_IMAGE={1}' format: { self imageName }. - '-DISQUEAK_IMAGE=', self imageName. '-DISQUEAK_SOURCES=PharoV10'. '-DSTACKVM'}! Item was changed: ----- Method: StackIPhoneConfig>>configureFT2Plugin: (in category 'plugin extra rules') ----- configureFT2Plugin: maker "extra rules for Freetype plugin. a custom rule to build freetype library" + | lib | - | lib devRoot sdkRoot | - devRoot := '/Applications/Xcode.app/Contents/Developer/Platforms/{1}.platform/Developer' - format: { self targetDevice}. - sdkRoot := '{1}/SDKs/{2}{3}.sdk' - format: { devRoot. self targetDevice. self sdkVersion}. - "add freetype library into loop" lib := self addThirdpartyLibrary: 'freetype2'. + lib configurationFlags: self ft2PluginConfigurationFlags. - lib configurationFlags: ({ - '--without-zlib'. - '--without-bzip2'. - '--host=arm-apple-darwin'. - '--enable-static=yes'. - '--enable-shared=no'. - 'CC={3}/usr/bin/gcc'. - 'CXX={3}/usr/bin/g++'. - 'CFLAGS=\\"-arch {1} -std=c99 -Wno-trigraphs -O2 -fwrapv -Wreturn-type -Wunused-variable -fmessage-length=0 -miphoneos-version-min=4.0 -I{2}/usr/include/libxml2 -isysroot {2}\\"'. - 'LDFLAGS=\\"-arch {1} -isysroot {2}\\"'} - collect: [ :each | each format: { self architecture. sdkRoot. devRoot} ]). "link plugin with freetype lib" + maker includeDirectories: lib includeDir. maker addExternalLibrary: '${thirdpartyDir}/out/lib/', lib libraryFileName. + maker addExternalDependency: 'freetype2'. + ! - maker includeDirectories: lib includeDir. ! Item was added: + ----- Method: StackIPhoneConfig>>ft2PluginConfigurationFlags (in category 'plugin extra rules') ----- + ft2PluginConfigurationFlags + ^ {'--without-zlib'. + '--without-bzip2'. + '--host=arm-apple-darwin'. + '--enable-static=yes'. + '--enable-shared=no'. + 'CFLAGS=\\"-arch {1} -std=c99 -Wno-trigraphs -O2 -fpascal-strings -fwrapv -Wreturn-type -Wunused-variable -fvisibility=hidden -fmessage-length=0 -miphoneos-version-min={3} -I{2}/usr/include/libxml2 -isysroot {2}\\"'. + 'LDFLAGS=\\"-arch {1} -miphoneos-version-min={3} -isysroot {2}\\"' } + collect: [ :each | + each format: { + self architecture. + self sysroot. + self sdkVersion } ]! Item was changed: ----- Method: StackIPhoneConfig>>sdkVersion (in category 'accessing') ----- sdkVersion + ^'7.0'! - ^'6.1'! Item was changed: ----- Method: StackIPhoneConfig>>setCommonProperties: (in category 'settings') ----- setCommonProperties: maker maker set: 'CMAKE_CROSSCOMPILING' to: 'TRUE'. maker set: 'CMAKE_SYSTEM_NAME' to: 'Darwin'. maker set: 'CMAKE_SYSTEM_PROCESSOR' to: 'arm'. maker set: 'SDKVER' toString: self sdkVersion. + maker + set: 'DEVROOT' + toString: ('/Applications/Xcode.app/Contents/Developer/Platforms/{1}.platform/Developer' + format: { self targetDevice }). + maker + set: 'SDKROOT' + toString: '${DEVROOT}/SDKs/', self targetDevice,'${SDKVER}.sdk'. - maker set: 'DEVROOT' toString: ('/Applications/Xcode.app/Contents/Developer/Platforms/{1}.platform/Developer' - format: { self targetDevice }). - maker set: 'SDKROOT' toString: '${DEVROOT}/SDKs/', self targetDevice,'${SDKVER}.sdk'. maker set: 'CMAKE_OSX_SYSROOT' to: 'iphoneos${SDKVER}'. maker set: 'CMAKE_FIND_ROOT_PATH' to: '"${SDKROOT}" "${DEVROOT}"'. maker set: 'CMAKE_FIND_ROOT_PATH_MODE_PROGRAM' to: 'ONLY'. maker set: 'CMAKE_FIND_ROOT_PATH_MODE_LIBRARY' to: 'ONLY'. maker set: 'CMAKE_FIND_ROOT_PATH_MODE_INCLUDE' to: 'ONLY'. maker set: 'CMAKE_EXE_LINKER_FLAGS' toString: '--sysroot ${SDKROOT} -L${SDKROOT}/usr/lib -L${SDKROOT}/usr/lib/system'. maker set: 'CMAKE_C_FLAGS' toString: '--sysroot ${SDKROOT} -L${SDKROOT}/usr/lib -L${SDKROOT}/usr/lib/system'. maker set: 'CMAKE_CXX_FLAGS' toString: '--sysroot ${SDKROOT} -L${SDKROOT}/usr/lib -L${SDKROOT}/usr/lib/system'. maker addFrameworks: self frameworks.! Item was changed: ----- Method: StackIPhoneConfig>>setExtraTargetProperties: (in category 'settings') ----- setExtraTargetProperties: maker "super setExtraTargetProperties: maker." | precompiledHeaders plist | precompiledHeaders := (self executableName, '_Prefix.pch'). (FileStream forceNewFileNamed: (maker buildDir / precompiledHeaders) fullName) nextPutAll: self precompiledHeaders; close. maker addXCodeProperty: 'GCC_PREFIX_HEADER' value: '${buildDir}/', precompiledHeaders. self setCommonProperties: maker. " generated and add Info.plist file " plist := self plistFile. (FileStream forceNewFileNamed: (maker buildDir / 'Info.plist') fullName) nextPutAll: plist; close. maker addProperty: 'MACOSX_BUNDLE_INFO_PLIST' value: '${buildDir}/Info.plist'. maker cmd: 'set_target_properties' params: self executableName, ' PROPERTIES COMPILE_FLAGS "-include \"', (self buildDir / self prefixHeaderFileName) fullName, '\""'. + maker + set: 'CMAKE_XCODE_ATTRIBUTE_CODE_SIGN_IDENTITY' - maker set: 'CMAKE_XCODE_ATTRIBUTE_CODE_SIGN_IDENTITY' toString: self codeSignIdentity. + maker + set: 'CMAKE_XCODE_ATTRIBUTE_TARGETED_DEVICE_FAMILY' - maker set: 'CMAKE_XCODE_ATTRIBUTE_TARGETED_DEVICE_FAMILY' toString: self targetedDeviceFamilyAsString. + maker + set: 'CMAKE_XCODE_ATTRIBUTE_IPHONEOS_DEPLOYMENT_TARGET' - maker set: 'CMAKE_XCODE_ATTRIBUTE_IPHONEOS_DEPLOYMENT_TARGET' to: self deploymentTargetVersion. + maker + set: 'CMAKE_XCODE_ATTRIBUTE_CONFIGURATION_BUILD_DIR' - maker set: 'CMAKE_XCODE_ATTRIBUTE_CONFIGURATION_BUILD_DIR' toString: '$(BUILD_DIR)/$(CONFIGURATION)'. + maker + set: 'CMAKE_XCODE_ATTRIBUTE_CONFIGURATION_TEMP_DIR' - maker set: 'CMAKE_XCODE_ATTRIBUTE_CONFIGURATION_TEMP_DIR' toString: '$(BUILD_DIR)/$(CONFIGURATION)'. maker set: 'EXECUTABLE_OUTPUT_PATH' toString: self outputDir fullName. + maker puts: 'set_source_files_properties(${srcVMDir}/gcc3x-cointerp.c PROPERTIES COMPILE_FLAGS -O0)'. + + - maker puts: 'set_source_files_properties(${srcVMDir}/gcc3x-cointerp.c PROPERTIES COMPILE_FLAGS -O0)' ! Item was added: + ----- Method: StackIPhoneConfig>>sysroot (in category 'accessing') ----- + sysroot + ^ '/Applications/Xcode.app/Contents/Developer/Platforms/{1}.platform/Developer/SDKs/{1}{2}.sdk' + format: { + self targetDevice. + self sdkVersion }! Item was changed: ----- Method: StackMacOSDebugConfig>>compilerFlags (in category 'compiler flags') ----- compilerFlags + ^ String streamContents: [ :stream | + self commonCompilerFlags asStringOn: stream delimiter: ' '. + self compilerFlagsDebug asStringOn: stream delimiter: ' ' ]! - - ^ self compilerFlagsDebug! Item was added: + StackUnixConfig subclass: #StackRaspbianConfig + instanceVariableNames: '' + classVariableNames: '' + poolDictionaries: '' + category: 'CMakeVMMaker-Unix'! + + !StackRaspbianConfig commentStamp: '<historical>' prior: 0! + This is a concrete class which generates a StackVM for Raspbian (debian on RaspberryPi). + + Usage: + StackRaspbianConfig generateWithSources + + + Fore more information, check the class comments of all the superclasses. + ! Item was added: + ----- Method: StackRaspbianConfig>>addDriver:sources:generator:externalLibs: (in category 'as yet unclassified') ----- + addDriver: name sources: aSources generator: cmakeGen externalLibs: extLibs + + | cfg srcs | + + srcs := aSources inject: '' into: [:res :each | res , ' "', each, '"' ]. + cfg := cmakeGen + captureOutputDuring: [ + cmakeGen printHeader; + project: name; + include: '../directories.cmake'; + + message: 'Adding module: ', name; + + addDefinitions: self compilerFlags; + addDefinitions: '-fPIC -DPIC'; + set: #sources to: srcs; + cmd: 'add_library' params: name, ' SHARED ${sources}'; + includeDirectories: '${crossDir}/plugins/FilePlugin'; + includeDirectories: '${targetPlatform}/plugins/B3DAcceleratorPlugin'; + includeDirectories: '${crossDir}/plugins/B3DAcceleratorPlugin'; + set: 'LIBRARY_OUTPUT_PATH' toString: self outputDir fullName; + addExternalLibraries: extLibs; + cmd: 'target_link_libraries' params: name , ' ${LINKLIBS}'; + cmd: 'set_target_properties' params: name , ' PROPERTIES PREFIX "" SUFFIX "" ' + ]. + + (self buildDir / name) ensureDirectory. + self write: cfg toFile: name , '/', cmakeGen outputFileName. + cmakeGen addSubdirectory: name. + ! Item was added: + ----- Method: StackRaspbianConfig>>commonCompilerFlags (in category 'as yet unclassified') ----- + commonCompilerFlags + + "Common compiler flags + + + LSB_FIRST=1 means that target platform is little endian. + set it to 0 for big-endian platforms + + " + + ^ { + '-DLSB_FIRST=1'. + '-DUSE_GLOBAL_STRUCT=0'. + '-DCOGMTVM=0' } ! Item was added: + ----- Method: StackRaspbianConfig>>compilerFlagsDebug (in category 'as yet unclassified') ----- + compilerFlagsDebug + + ^ { + '-g3'. + '-O0'. + '-D_GNU_SOURCE'. + '-DITIMER_HEARTBEAT=1'. + '-DNO_VM_PROFILE=1'. + '-DDEBUGVM=1' }! Item was added: + ----- Method: StackRaspbianConfig>>compilerFlagsRelease (in category 'as yet unclassified') ----- + compilerFlagsRelease + " + THIS FLAGS ARE CRASHING COMPILER + -fschedule-insns2 + -fschedule-insns + + THIS FLAGS ARE CRASHING VM + -ftree-pre + -fcaller-saves + + THIS FLAGS ARE WORKING + -O1 -fthread-jumps -falign-functions -falign-jumps -falign-loops -falign-labels -fcrossjumping -fcse-follow-jumps -fcse-skip-blocks -fdelete-null-pointer-checks -fdevirtualize -fexpensive-optimizations -fgcse -fgcse-lm -finline-small-functions -findirect-inlining -fipa-sra -foptimize-sibling-calls -fpeephole2 -fregmove -freorder-blocks -frerun-cse-after-loop -freorder-functions -fsched-interblock -fsched-spec -fstrict-aliasing -fstrict-overflow -ftree-switch-conversion -ftree-vrp + + THIS IS LIKE: -O2 -fno-tree-pre -fno-caller-saves + + " + + ^ { + '-g0'. + '-O2'. + '-fno-tree-pre'. + '-fno-caller-saves'. + '-D_GNU_SOURCE'. + '-DNDEBUG'. + '-DITIMER_HEARTBEAT=1'. + '-DNO_VM_PROFILE=1'. + '-DDEBUGVM=0' }! Item was added: + ----- Method: StackRaspbianConfig>>configureBitBltSimulation: (in category 'as yet unclassified') ----- + configureBitBltSimulation: maker + "extra rules for BitBltSimulation" + + maker includeDirectories: '${pluginCross}'. + + maker addCrossSources: #( + 'BitBltGeneric.c' + 'BitBltDispatch.c' + ). + ! Item was added: + ----- Method: StackRaspbianConfig>>defaultExternalPlugins (in category 'as yet unclassified') ----- + defaultExternalPlugins + ^ #( + B3DAcceleratorPlugin + JPEGReaderPlugin + JPEGReadWriter2Plugin + RePlugin + InternetConfigPlugin + )! Item was added: + ----- Method: StackRaspbianConfig>>defaultInternalPlugins (in category 'as yet unclassified') ----- + defaultInternalPlugins + " took from unixbuild/bld/plugins.int" + ^ #( + ADPCMCodecPlugin + AsynchFilePlugin + BalloonEnginePlugin "B2DPlugin" + BitBltSimulation "BitBltPlugin" + BMPReadWriterPlugin + CroquetPlugin + DeflatePlugin "ZipPlugin" + DropPlugin + DSAPlugin "DSAPrims" + FFTPlugin + FileCopyPlugin + FilePlugin + FloatArrayPlugin + FloatMathPlugin + JoystickTabletPlugin + KlattSynthesizerPlugin "Klatt" + LargeIntegersPlugin "LargeIntegers" + Matrix2x3Plugin + MIDIPlugin + MiscPrimitivePlugin + Mpeg3Plugin + SecurityPlugin + SerialPlugin + SocketPlugin + SoundCodecPlugin "SoundCodecPrims" + SoundGenerationPlugin + SoundPlugin + StarSqueakPlugin + SurfacePlugin + LocalePlugin + )! Item was added: + ----- Method: StackRaspbianConfig>>executableName (in category 'as yet unclassified') ----- + executableName + ^ 'PharoS'! Item was added: + ----- Method: StackRaspbianConfig>>extraPluginSettings: (in category 'as yet unclassified') ----- + extraPluginSettings: maker + + maker isExternal ifTrue: [ + "copy lib to results dir " + maker set: 'LIBRARY_OUTPUT_PATH' to: '${outputDir}' + ]. + + maker set: #linkFlags toString: '${linkFlags}' + ! Item was added: + ----- Method: StackRaspbianConfig>>linkFlags (in category 'as yet unclassified') ----- + linkFlags + ^ '-lSM -lICE -ldl -lGL -lpthread -lm -lnsl -lX11'! Item was added: + ----- Method: StackRaspbianConfig>>setExtraTargetProperties: (in category 'as yet unclassified') ----- + setExtraTargetProperties: maker + + "maker setTargetProperties: 'LINK_FLAGS ""'." + + maker puts: 'set_source_files_properties( ${srcVMDir}/cogit.c PROPERTIES + COMPILE_FLAGS "-O1 -fno-omit-frame-pointer -momit-leaf-frame-pointer")'. + + + maker + cmd: 'set_source_files_properties' + params: ' ${targetPlatform}/vm/sqUnixHeartbeat.c PROPERTIES + COMPILE_FLAGS "-O1 -fno-omit-frame-pointer"'. + + + maker addExternalLibraries: + #( + 'm' "math lib" + 'dl' "dynamic loader" + 'pthread' "posix threads" + ). + + maker set: 'EXECUTABLE_OUTPUT_PATH' toString: self outputDir fullName. + self addVMDrivers: maker.! Item was added: + StackRaspbianConfig subclass: #StackRaspbianFastBltConfig + instanceVariableNames: '' + classVariableNames: '' + poolDictionaries: '' + category: 'CMakeVMMaker-Unix'! + + !StackRaspbianFastBltConfig commentStamp: '<historical>' prior: 0! + http://www.cmake.org/Wiki/CMake/Assembler! Item was added: + ----- Method: StackRaspbianFastBltConfig>>commonCompilerFlags (in category 'as yet unclassified') ----- + commonCompilerFlags + ^ super commonCompilerFlags, { '-DENABLE_FAST_BLT' }.! Item was added: + ----- Method: StackRaspbianFastBltConfig>>configureBitBltSimulation: (in category 'as yet unclassified') ----- + configureBitBltSimulation: maker + "extra rules for BitBltSimulation" + + maker includeDirectories: '${pluginCross}'. + + maker set: 'can_use_assembler' to: 'TRUE'. + + maker addCrossSources: #( + 'BitBltArm.c' + 'BitBltArmSimd.c' + 'BitBltDispatch.c' + 'BitBltGeneric.c' + 'BitBltArmLinux.c' + 'BitBltArmSimdAlphaBlend.s' + 'BitBltArmSimdBitLogical.s' + 'BitBltArmSimdPixPaint.s' + 'BitBltArmSimdSourceWord.s' + ). + ! Item was added: + ----- Method: StackSimulatorConfig>>commonCompilerFlags (in category 'accessing') ----- + commonCompilerFlags + ^ super commonCompilerFlags, { + '-mios-simulator-version-min={1}' format: { self sdkVersion } }! Item was added: + ----- Method: StackSimulatorConfig>>ft2PluginConfigurationFlags (in category 'plugin extra rules') ----- + ft2PluginConfigurationFlags + ^ {'--without-zlib'. + '--without-bzip2'. + '--host=i386-apple-darwin'. + '--enable-static=yes'. + '--enable-shared=no'. + 'CFLAGS=\\"-arch {1} -pipe -std=c99 -Wno-trigraphs -O2 -fpascal-strings -fwrapv -Wreturn-type -Wunused-variable -fvisibility=hidden -fmessage-length=0 -mios-simulator-version-min={3} -I{2}/usr/include/libxml2 -isysroot {2}\\"'. + 'LDFLAGS=\\"-arch {1} -mios-simulator-version-min={3} -isysroot {2}\\"' } + collect: [ :each | + each format: { + self architecture. + self sysroot. + self sdkVersion } ]! Item was added: + ----- Method: StackSimulatorConfig>>setCommonProperties: (in category 'settings') ----- + setCommonProperties: maker + maker set: 'CMAKE_CROSSCOMPILING' to: 'TRUE'. + maker set: 'CMAKE_SYSTEM_NAME' to: 'Darwin'. + maker set: 'CMAKE_SYSTEM_PROCESSOR' to: 'i386'. + + maker + set: 'SDKVER' + toString: self sdkVersion. + maker + set: 'DEVROOT' + toString: ('/Applications/Xcode.app/Contents/Developer/Platforms/{1}.platform/Developer' + format: { self targetDevice }). + maker + set: 'SDKROOT' + toString: ('$\{DEVROOT\}/SDKs/{1}$\{SDKVER\}.sdk' format: { self targetDevice }). + + maker set: 'CMAKE_OSX_SYSROOT' to: self sysroot. + + maker set: 'CMAKE_FIND_ROOT_PATH' to: '"${SDKROOT}" "${DEVROOT}"'. + maker set: 'CMAKE_FIND_ROOT_PATH_MODE_PROGRAM' to: 'ONLY'. + maker set: 'CMAKE_FIND_ROOT_PATH_MODE_LIBRARY' to: 'ONLY'. + maker set: 'CMAKE_FIND_ROOT_PATH_MODE_INCLUDE' to: 'ONLY'. + + maker + set: 'CMAKE_EXE_LINKER_FLAGS' + toString: '-mios-simulator-version-min=${SDKVER} --sysroot ${SDKROOT} -L${SDKROOT}/usr/lib -L${SDKROOT}/usr/lib/system'. + maker + set: 'CMAKE_C_FLAGS' + toString: '--sysroot ${SDKROOT} -L${SDKROOT}/usr/lib -L${SDKROOT}/usr/lib/system'. + maker + set: 'CMAKE_CXX_FLAGS' + toString: '--sysroot ${SDKROOT} -L${SDKROOT}/usr/lib -L${SDKROOT}/usr/lib/system'. + + maker addFrameworks: self frameworks.! Item was changed: ----- Method: StackSimulatorConfig>>standardIncludes (in category 'source files') ----- standardIncludes + ^super standardIncludes, { + '/Applications/Xcode.app/Contents/Developer/Platforms/{1}.platform/Developer/SDKs/{1}{2}.sdk/usr/include/' + format: { + self targetDevice. + self sdkVersion} } - ^super standardIncludes, {'/Applications/Xcode.app/Contents/Developer/Platforms/{1}.platform/Developer/SDKs/{1}{2}.sdk/usr/include/' - format: { self targetDevice. self sdkVersion} } ! Item was changed: ----- Method: StackUnixDebugConfig>>compilerFlags (in category 'compiler flags') ----- compilerFlags + ^ String streamContents: [ :stream | + self commonCompilerFlags asStringOn: stream delimiter: ' '. + self compilerFlagsDebug asStringOn: stream delimiter: ' ' ]! - - ^ self commonCompilerFlags, ' ' ,self compilerFlagsDebug! Item was changed: ----- Method: StackUnixDebugFixedVerSIConfig>>compilerFlagsDebug (in category 'as yet unclassified') ----- compilerFlagsDebug + ^ { + '-g3'. + '-O0'. + '-msse2'. + '-save-temps'. + '-D_GNU_SOURCE'. + '-DITIMER_HEARTBEAT=1'. + '-DNO_VM_PROFILE=1'. + '-DCOGMTVM=0'. + '-DDEBUGVM=1' }! - ^ '-g3 -O0 -msse2 -save-temps -D_GNU_SOURCE -DITIMER_HEARTBEAT=1 -DNO_VM_PROFILE=1 -DCOGMTVM=0 -DDEBUGVM=1' - - !

1 0

CMakeVMMakerSqueak ready for initial testing.
by gettimothy 23 May '14

23 May '14

Hi All I have set up my home computer/domain with svn for initial testing of the CMakeVMMakerSqueak stuff. svn co http://www.svn.menmachinesmaterials.com/Cog/Cog/ svn co http://www.svn.menmachinesmaterials.com/Cog/mcz The Cog branch is a co of Eliot's work from today. The mcz's are the code I have ported; upon acceptance I can move them up to squeak's site. cd Cog/image ./buildsqueakcmakeimage.sh -h (will get you usage. The script is a consolidation of Eliot's buildsqueakX.sh scripts) I have put in a README.buildsqueakcmakeimage.sh that may be of help. 1. Cog stuff is as follows (These will require you manually loading the CMakeVMMakerSqueak-tty-x.mcz from monticello for now. it will be automated should you choose to roll this live) ./buildsqueakcmakeimage.sh -c 4.5 (think "cog" for -c) sets up just like Eliot's buildsqueak45image.sh but includes the CMakeVMMaker currently at gemstone and adds a Workspace with some configurations) ./buildsqueakcmakeimage.sh -c 4.6 (same as above, but for 4.6 during my testing, this broke sometimes) Running the script will create a cogVMMaker directory. For now, copy the .mcz files from the svn co ..mcz... you did to the package_cache in cogVMMaker/Squeak-xyz.app/Contents/Resources/package_cache/ While you are in the neigborhood, cd to cogVMMaker/Squeak-xyz.app/Contents/Reources/oscogvm/ and do a ls. You should see some cmake_*build directories there. This is a parallel tree to the standard GNU stuff from which you will be running "source build.sh" to kick off the CMake builds. cd into cogVMMaker/Squeak-xyz.app/ there should be a squeakCogVMMaker.sh to run that will launch your new pre-configured image. launch Monticello and load the latest CMakeVMMakerSqueak-tty There should be a workspace titled CMakeVMMakerSqueak with some configurations scripts. Discussion of the code follows 2. below. 2. The StandardInterpreter stuff I did as a personal thing as I think I would have appreciated it as a newbie. For CMakeVMMakerSqueak, you can ignore it. for those interested. ./buildsqueakcmakeimage.sh -s 4.5 (think "standard" for -s) downloads and configures a Standard Interpreter VMMaker running on Squeak4.5 per the Wiki at http://wiki.squeak.org/squeak/6177 ./buildsqueakcmakeimage.sh -s 4.6 same as above, but on 4.6 (may be broken) ./buildsqueakcmakeimage.sh -b (think "both" for -b_ does 4.5 above plus the cog stuff explained below. once the script runs, change directory to the standardVMMaker/Squeak---.app/ and run the squeakStandardVMMaker.sh to launch the pre-configured image. There should be a workspace with instructions from there Like I say, the goal is to get a newbie up and running quickly. Please suggest changes improvements if you are interested. 3. Discussion of the CMMakeVMMakerSqueak classes. Due to the layout of the Pharo stuff in CMMakeVMMaker, I was not able to create a Squeak-only subclass tree of the configurations. Also, I realized late in the game that there are some false-starts in the pharo design involving the inconsistent use of Traits and Builders. This inconsistency is realized in the Squeak code as well. Regarding the traits, you will see some stupid stuff in SqueakStackUnixConfig (CMakeVMMakerSqueak-Unix category) where including the trait in the subclasses results in super calls to where the code is. Regarding the builders, you will see that if you start with the Unix stuff, a builder exists (and can be) utilized to power the configs. As the coding progressed, it became apparent that the builders are not necessary as the configs can be invoked directly. Ok, that's the yuck, lets get you rolling with this stuff. Running the pre-configred image you will see a CMakeVMMkaerSqueak workspace. Classes that end in Builder are builders and classes that end in Config are Platform Configurations Find your platform (unix, windows, mac, vax, pdp11...) under CMakeVMMakerSqueak-Platform and (usally) the first config is an "abstract" class (things get stupid in unix land due to the traits, but its not too embarassing). Under those top classes are concrete configs. Of note in them are the defaultExternalPlugins and defaultInternalPlugins methods. If you look at them you can see you can specify what you need/want. (it gets more flexible with other methods in subclasses, but its a good starting point) Pick the config you want (SqueakStackUnixDebugConfig in the examples below) and run one of two things: generate or generateWithSources. SqueakStackUnixDebugConfig generate will (very quickly) put the cmake config files in the Contents/Resources/oscogvm/cmake_*build directory corresponding to your platform (look for the buildDirName method on your superclass) you then cd to that directory and invoke the build.sh script and you should compile against the sources from the svn checkout. SqueakStackUnixDebugConfig generateWithSources invoked VMMaker to generate the sources before generating the CMake files as above. Finally, there are Builders that do the above, and frankly , I don't think we need them. For example in CMakeVMMakerSqueak-Builder SqueakStackVMBuilder buildSlackwareUnix64w32LibsNoGL you see the wrapper code that invokes the appropriate Config class. buildSlackwareUnix64w32LibsNoGL SqueakStackUnix64w32CompatLibsSlackwareNoGLConfig new addExternalPlugins: #( SqueakSSLPlugin ); addInternalPlugins: #( UnixOSProcessPlugin ); generateSources; generate. That should get things started. Other classes of interest are the CMakeVMMkaersqueak generators: CMakeVMGeneratorForSqueak and CMakePluginGeneratorForSqueak these are essentially a compatiblility layer for the generators I will leave my computer running tonight (I usually turn it off when I am away from it) My brain is a bit fried, so in-depth questions and discussions may have to wait until tomorrow. cheers. tty

1 2

VM Maker: VMMaker.oscog-eem.732.mcz
by commits＠source.squeak.org 22 May '14

22 May '14

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.732.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.732 Author: eem Time: 22 May 2014, 2:00:24.946 pm UUID: 8390b0f2-ae2c-4fc6-9abf-41d6cefda0fd Ancestors: VMMaker.oscog-eem.731 Spur: Fix traversal in sortedFreeListPairwiseReverseDo: when there is only one element in the sorted free list. Weak containers and ephemerons in new space must be processed after all strongly reachable objects have been scavenged. So when the scavenger reaches a weak container or ephemeron it copies it to future space, leaving behind a forwarding pointer in the corpse, but it does not yet scavenge its contents. The corpse is used to construct the list of scavenged weak/ephemeral objects. The corpse's forwarding pointer is already taken to point to the survivor. Instead, the list is constructed by having a list head variable, and linking the list through a value stored in some of the corpse's unused header fields (format & identityHash). 0 marks the end of the list. Of course this doesn't work if an object is the first object in newSpace as this offset will be computed to be zero, improperly teminating the list! Fix this by adding one to the corpse offset and substracting 1 when decoding. Implement a simple policy to deal with the fact that typically heap growth happens during tenuring, not after a failed allocation. If, after scavenging, the heap has grown by some factor of its size at the previous global GC, do a global GC. Default the factor to 0.333333. Provide VM parameter access to this value: 55 ratio of growth and image size at or above which a GC will be performed post scavenge Add a printFreeChunks debugging utility that sweeps through memory instead of traversing the free lists. Fix the shadowed variable warnings in primitiveIsPinned & primitivePin. Format the shadowing warning a little more carefully. Simulator: Move the halt on Spur global GC into globalGarbageCollect and nuke the subclass methods. =============== Diff against VMMaker.oscog-eem.731 =============== Item was changed: ----- Method: CCodeGenerator>>prepareMethods (in category 'utilities') ----- prepareMethods | globals | globals := Set new: 200. globals addAll: variables. methods do: [:m | m locals, m args do: [:var | (globals includes: var) ifTrue: [self error: 'Local variable ''', var, ''' may mask global when inlining ', m selector]. ((methods at: var ifAbsent: [nil]) ifNil: [false] ifNotNil: [:m1| m1 isStructAccessor not]) ifTrue: [logger ensureCr; nextPutAll: 'Local variable name ''', var, ''' in '; nextPutAll: m selector; + nextPutAll: ' may mask method when inlining'; + cr]]. - nextPutAll: ' may mask method when inlining']]. m bindClassVariablesIn: constants. m prepareMethodIn: self]! Item was changed: ----- Method: InterpreterPrimitives>>primitiveIsPinned (in category 'memory space primitives') ----- primitiveIsPinned "Answer if the receiver is pinned, i.e. immobile." + | obj | + obj := self stackTop. + ((objectMemory isImmediate: obj) + or: [objectMemory isForwarded: obj]) ifTrue: - | receiver | - receiver := self stackTop. - ((objectMemory isImmediate: receiver) - or: [objectMemory isForwarded: receiver]) ifTrue: [^self primitiveFailFor: PrimErrBadReceiver]. self pop: argumentCount - 1. self stackTopPut: (objectMemory hasSpurMemoryManagerAPI + ifTrue: [objectMemory booleanObjectOf: (objectMemory isPinned: obj)] - ifTrue: [objectMemory booleanObjectOf: (objectMemory isPinned: receiver)] ifFalse: [objectMemory falseObject])! Item was changed: ----- Method: InterpreterPrimitives>>primitivePin (in category 'memory space primitives') ----- primitivePin "Pin or unpin the receiver, i.e. make it immobile or mobile. Answer whether the object was already pinned. N.B. pinning does *not* prevent an object from being garbage collected." + | obj boolean wasPinned failure | - | receiver boolean wasPinned failure | objectMemory hasSpurMemoryManagerAPI ifFalse: [^self primitiveFailFor: PrimErrUnsupported]. + obj := self stackValue: 1. + ((objectMemory isImmediate: obj) + or: [(objectMemory isForwarded: obj) + or: [(objectMemory isContext: obj) + and: [self isStillMarriedContext: obj]]]) ifTrue: - receiver := self stackValue: 1. - ((objectMemory isImmediate: receiver) - or: [(objectMemory isForwarded: receiver) - or: [(objectMemory isContext: receiver) - and: [self isStillMarriedContext: receiver]]]) ifTrue: [^self primitiveFailFor: PrimErrBadReceiver]. boolean := self stackTop. (boolean = objectMemory falseObject or: [boolean = objectMemory trueObject]) ifFalse: [^self primitiveFailFor: PrimErrBadArgument]. + (objectMemory isPinned: obj) - (objectMemory isPinned: receiver) ifTrue: [wasPinned := objectMemory trueObject. + objectMemory setIsPinnedOf: obj to: false] - objectMemory setIsPinnedOf: receiver to: false] ifFalse: [wasPinned := objectMemory falseObject. + failure := objectMemory pinObject: obj. - failure := objectMemory pinObject: receiver. failure ~= 0 ifTrue: [^self primitiveFailFor: failure]]. self pop: argumentCount - 1 thenPush: wasPinned! Item was removed: - ----- Method: Spur32BitMMLECoSimulator>>globalGarbageCollect (in category 'gc - global') ----- - globalGarbageCollect - self halt: 'GC number ', statFullGCs printString. - ^super globalGarbageCollect! Item was removed: - ----- Method: Spur32BitMMLESimulator>>globalGarbageCollect (in category 'gc - global') ----- - globalGarbageCollect - self halt: 'GC number ', statFullGCs printString. - ^super globalGarbageCollect! Item was changed: ----- Method: SpurGenerationScavenger>>corpseForCorpseOffset: (in category 'weakness and ephemerality') ----- corpseForCorpseOffset: corpseOffset "Use the identityHash and format fields to construct a 27 bit offset through non-future newSpace and use this to implement lists for weak array and + ephemeron processing. 27 bits of 8 byte allocationUnits units is 2 ^ 30 + bytes, or 1Gb, big enough for newSpace for a good few years yet." + ^corpseOffset - 1 << manager shiftForAllocationUnit + manager newSpaceStart! - ephemeron processing. 27 bits of 8 byte allocationUnits units is 2 ^ 30 bytes - or 1Gb, big enough for newSpace for a good few years yet." - ^corpseOffset << manager shiftForAllocationUnit + manager newSpaceStart! Item was changed: ----- Method: SpurGenerationScavenger>>corpseOffsetOf: (in category 'weakness and ephemerality') ----- corpseOffsetOf: corpse "Answer the offset of the corpse in newSpace as a multiple of allocationUnits. Use the identityHash and format fields to construct a 27 bit offset through non-future newSpace and use this to implement lists for weak array and ephemeron processing. 27 bits of 8 byte allocationUnits units is 2 ^ 30 + bytes or 1Gb, big enough for newSpace for a good few years yet. Add + one to ensure that a corpse offset is always non-zero, even when it is + that of the first object in newSpace." + ^corpse - manager newSpaceStart >> manager shiftForAllocationUnit + 1! - bytes or 1Gb, big enough for newSpace for a good few years yet." - ^corpse - manager newSpaceStart >> manager shiftForAllocationUnit.! Item was changed: CogClass subclass: #SpurMemoryManager (excessive size, no diff calculated) Item was changed: ----- Method: SpurMemoryManager class>>declareCVarsIn: (in category 'translation') ----- declareCVarsIn: aCCodeGenerator self declareCAsOop: #( memory freeStart scavengeThreshold newSpaceStart newSpaceLimit pastSpaceStart lowSpaceThreshold freeOldSpaceStart oldSpaceStart endOfMemory sortedFreeChunks) in: aCCodeGenerator. self declareCAsUSqLong: (self allInstVarNames select: [:ivn| ivn endsWith: 'Usecs']) in: aCCodeGenerator. aCCodeGenerator var: #freeListsMask type: #usqInt; var: #freeLists type: #'sqInt *'; var: #classTableBitmap type: #'unsigned char *'; var: #objStackInvalidBecause type: #'char *'; var: #highestObjects type: #SpurCircularBuffer; + var: #unscannedEphemerons type: #SpurContiguousObjStack; + var: #heapGrowthToSizeGCRatio type: #float; + var: #heapSizeAtPreviousGC type: #usqInt. - var: #unscannedEphemerons type: #SpurContiguousObjStack. aCCodeGenerator var: #remapBuffer declareC: 'sqInt remapBuffer[RemapBufferSize + 1 /* ', (RemapBufferSize + 1) printString, ' */]'. aCCodeGenerator var: #extraRoots declareC: 'sqInt *extraRoots[ExtraRootsSize + 1 /* ', (ExtraRootsSize + 1) printString, ' */]'! Item was added: + ----- Method: SpurMemoryManager>>getHeapGrowthToSizeGCRatio (in category 'accessing') ----- + getHeapGrowthToSizeGCRatio + <returnTypeC: #float> + ^heapGrowthToSizeGCRatio! Item was changed: ----- Method: SpurMemoryManager>>globalGarbageCollect (in category 'gc - global') ----- globalGarbageCollect + self cCode: [] inSmalltalk: [self halt: 'GC number ', statFullGCs printString]. + self assert: self validObjStacks. self assert: (self isEmptyObjStack: markStack). self assert: (self isEmptyObjStack: weaklingStack). self markObjects. self expungeDuplicateAndUnmarkedClasses: true. self nilUnmarkedWeaklingSlots. self freeUnmarkedObjectsAndSortAndCoalesceFreeSpaceForPigCompact. "Mid-way the leak check must be more lenient. Unmarked classes will have been expunged from the table, but unmarked instances will not yet have been reclaimed." self runLeakCheckerForFullGC: true excludeUnmarkedNewSpaceObjs: true classIndicesShouldBeValid: true. self compact. + self setHeapSizeAtPreviousGC. self assert: self validObjStacks. self assert: (self isEmptyObjStack: markStack). self assert: (self isEmptyObjStack: weaklingStack). self assert: self allObjectsUnmarked. self runLeakCheckerForFullGC: true! Item was changed: ----- Method: SpurMemoryManager>>initializeObjectMemory: (in category 'initialization') ----- initializeObjectMemory: bytesToShift "Initialize object memory variables at startup time. Assume endOfMemory is initially set (by the image-reading code) to the end of the last object in the image. Initialization redefines endOfMemory to be the end of the object allocation area based on the total available memory, but reserving some space for forwarding blocks." "Assume: image reader initializes the following variables: memory memoryLimit specialObjectsOop lastHash " <inline: false> | freeListObj | "Catch mis-initializations leading to bad translations to C" self assert: BaseHeaderSize = self baseHeaderSize. self bootstrapping ifFalse: [self initSegmentBridgeWithBytes: self bridgeSize at: endOfMemory - self bridgeSize]. segmentManager adjustSegmentSwizzlesBy: bytesToShift. "image may be at a different address; adjust oops for new location" self adjustAllOopsBy: bytesToShift. specialObjectsOop := segmentManager swizzleObj: specialObjectsOop. "heavily used special objects" nilObj := self splObj: NilObject. falseObj := self splObj: FalseObject. trueObj := self splObj: TrueObject. "In Cog we insist that nil, true & false are next to each other (Cogit generates tighter conditional branch code as a result). In addition, Spur places the free lists and class table root page immediately following them." self assert: nilObj = oldSpaceStart. self assert: falseObj = (self objectAfter: nilObj). self assert: trueObj = (self objectAfter: falseObj). freeListObj := self objectAfter: trueObj. self reInitializeClassTablePostLoad: (self objectAfter: freeListObj). markStack := self swizzleObjStackAt: MarkStackRootIndex. weaklingStack := self swizzleObjStackAt: WeaklingStackRootIndex. ephemeronQueue := self swizzleObjStackAt: EphemeronQueueRootIndex. self assert: self validObjStacks. self assert: (self isEmptyObjStack: markStack). self assert: (self isEmptyObjStack: weaklingStack). self initializeFreeSpacePostLoad: freeListObj. segmentManager collapseSegmentsPostSwizzle. self computeFreeSpacePostSwizzle. self bootstrapping ifFalse: [self initializeNewSpaceVariables]. self initializeOldSpaceFirstFree: freeOldSpaceStart. "initializes endOfMemory, freeStart" segmentManager checkSegments. "These defaults should depend on machine size; e.g. too small on a powerful laptop, too big on a Pi." growHeadroom := 16*1024*1024. "headroom when growing" + shrinkThreshold := 32*1024*1024. "free space before shrinking" + self setHeapSizeAtPreviousGC. + heapGrowthToSizeGCRatio := 0.333333. "By default GC after scavenge if heap has grown by a third since the last GC"! - shrinkThreshold := 32*1024*1024. "free space before shrinking"! Item was added: + ----- Method: SpurMemoryManager>>printFreeChunks (in category 'debug support') ----- + printFreeChunks + "This version goes through memory, printing all free chunks. + Other versions go through the free lists. This one will show + all free chunks even if the free lists are corrupt." + <api> + | seenNewFreeChunk | + seenNewFreeChunk := false. + self allNewSpaceEntitiesDo: + [:o| + (self isFreeObject: o) ifTrue: + [seenNewFreeChunk ifFalse: + [coInterpreter print: 'NewSpace CONTAINS FREE OBJECT(S)!!!!'; cr. + seenNewFreeChunk := true]. + self printFreeChunk: o]]. + self allOldSpaceEntitiesDo: + [:o| + (self isFreeObject: o) ifTrue: + [self printFreeChunk: o]]! Item was added: + ----- Method: SpurMemoryManager>>setHeapGrowthToSizeGCRatio: (in category 'accessing') ----- + setHeapGrowthToSizeGCRatio: aDouble + <var: #aDouble type: #double> + heapGrowthToSizeGCRatio := aDouble! Item was added: + ----- Method: SpurMemoryManager>>setHeapSizeAtPreviousGC (in category 'gc - global') ----- + setHeapSizeAtPreviousGC + heapSizeAtPreviousGC := endOfMemory - nilObj - totalFreeOldSpace! Item was changed: ----- Method: SpurMemoryManager>>sortedFreeListPairwiseReverseDo: (in category 'compaction') ----- sortedFreeListPairwiseReverseDo: aBinaryBlock "Evaluate aBinaryBlock with adjacent entries in the free list, from high address to low address. The second argument is in fact the start of the next free chunk, not the free chunk itself. Use endOfMemory - bridgeSize as the second argument in the first evaluation." | free nextFree prevFree prevPrevFree | <inline: true> free := lastFreeChunk. prevPrevFree := prevFree := 0. [free ~= 0] whileTrue: [nextFree := self nextInSortedFreeListLink: free given: prevFree. self assert: (free = 0 or: [self isFreeObject: free]). self assert: (prevFree = 0 or: [prevFree > free]). aBinaryBlock value: free value: (prevFree = 0 ifTrue: [endOfMemory - self bridgeSize] ifFalse: [self startOfObject: prevFree]). self assert: (prevFree = 0 or: [self isFreeObject: prevFree]). self assert: (prevPrevFree = 0 or: [self isFreeObject: prevPrevFree]). (self isFreeObject: free) ifFalse: [free := self nextInSortedFreeListLink: prevFree given: prevPrevFree]. (nextFree = 0 or: [self isFreeObject: nextFree]) ifTrue: [prevPrevFree := prevFree. prevFree := free. + free := prevFree = firstFreeChunk ifTrue: [0] ifFalse: [nextFree]] - free := nextFree] ifFalse: [free := lastFreeChunk. prevPrevFree := prevFree := 0. [free > nextFree] whileTrue: [nextFree := self nextInSortedFreeListLink: free given: prevFree. self assert: (self isFreeObject: nextFree). prevPrevFree := prevFree. prevFree := free. free := nextFree]]]! Item was changed: ----- Method: SpurMemoryManager>>sufficientSpaceAfterGC: (in category 'gc - scavenging') ----- sufficientSpaceAfterGC: numBytes "This is ObjectMemory's funky entry-point into its incremental GC, which is a stop-the-world a young generation reclaimer. In Spur we run the scavenger. Answer if space is not low." + | heapSizePostGC | self assert: numBytes = 0. self scavengingGCTenuringIf: TenureByAge. + heapSizePostGC := endOfMemory - nilObj - totalFreeOldSpace. + (heapSizePostGC - heapSizeAtPreviousGC) asFloat / heapSizeAtPreviousGC >= heapGrowthToSizeGCRatio ifTrue: + [self fullGC]. [totalFreeOldSpace < growHeadroom and: [(self growOldSpaceByAtLeast: 0) notNil]] whileTrue: [totalFreeOldSpace >= growHeadroom ifTrue: [^true]]. lowSpaceThreshold > totalFreeOldSpace ifTrue: "space is low" [lowSpaceThreshold := 0. "avoid signalling low space twice" ^false]. ^true! Item was changed: ----- Method: StackInterpreterPrimitives>>primitiveVMParameter (in category 'system control primitives') ----- (excessive size, no diff calculated)

1 0

[commit][2929] add empty but important clause to ioHighResClock to allow ARM to compile these files .
by commits＠squeakvm.org 22 May '14

22 May '14

Revision: 2929 Author: rowledge Date: 2014-05-21 21:14:03 -0700 (Wed, 21 May 2014) Log Message: ----------- add empty but important clause to ioHighResClock to allow ARM to compile these files. Still need a meaningful implementation Modified Paths: -------------- branches/Cog/platforms/unix/vm/sqUnixHeartbeat.c branches/Cog/platforms/unix/vm/sqUnixITimerTickerHeartbeat.c Modified: branches/Cog/platforms/unix/vm/sqUnixHeartbeat.c =================================================================== --- branches/Cog/platforms/unix/vm/sqUnixHeartbeat.c 2014-05-21 19:18:13 UTC (rev 2928) +++ branches/Cog/platforms/unix/vm/sqUnixHeartbeat.c 2014-05-22 04:14:03 UTC (rev 2929) @@ -162,6 +162,8 @@ || defined(i486) || defined(__i486) || defined (__i486__) \ || defined(intel) || defined(x86) || defined(i86pc) ) __asm__ __volatile__ ("rdtsc" : "=A"(value)); +#elif defined(__arm__) && defined(__ARM_ARCH_6__) + /* tpr - do nothing for now; needs input from eliot to decide further */ #else # error "no high res clock defined" #endif Modified: branches/Cog/platforms/unix/vm/sqUnixITimerTickerHeartbeat.c =================================================================== --- branches/Cog/platforms/unix/vm/sqUnixITimerTickerHeartbeat.c 2014-05-21 19:18:13 UTC (rev 2928) +++ branches/Cog/platforms/unix/vm/sqUnixITimerTickerHeartbeat.c 2014-05-22 04:14:03 UTC (rev 2929) @@ -157,6 +157,8 @@ || defined(i486) || defined(__i486) || defined (__i486__) \ || defined(intel) || defined(x86) || defined(i86pc) ) __asm__ __volatile__ ("rdtsc" : "=A"(value)); +#elif defined(__arm__) && defined(__ARM_ARCH_6__) + /* tpr - do nothing for now; needs input from eliot to decide further */ #else # error "no high res clock defined" #endif

1 0

VM Maker: VMMaker.oscog-eem.731.mcz
by commits＠source.squeak.org 22 May '14

22 May '14

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.731.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.731 Author: eem Time: 21 May 2014, 3:44:59.389 pm UUID: e19b7342-8c8a-4ad8-8acd-64a6c1a7544d Ancestors: VMMaker.oscog-eem.730 Spur: Implement primitives to get (primitiveIsPinned) and (un)set (primitivePin) per-object pinning. =============== Diff against VMMaker.oscog-eem.730 =============== Item was added: + ----- Method: InterpreterPrimitives>>primitiveIsPinned (in category 'memory space primitives') ----- + primitiveIsPinned + "Answer if the receiver is pinned, i.e. immobile." + | receiver | + receiver := self stackTop. + ((objectMemory isImmediate: receiver) + or: [objectMemory isForwarded: receiver]) ifTrue: + [^self primitiveFailFor: PrimErrBadReceiver]. + self pop: argumentCount - 1. + self stackTopPut: + (objectMemory hasSpurMemoryManagerAPI + ifTrue: [objectMemory booleanObjectOf: (objectMemory isPinned: receiver)] + ifFalse: [objectMemory falseObject])! Item was added: + ----- Method: InterpreterPrimitives>>primitivePin (in category 'memory space primitives') ----- + primitivePin + "Pin or unpin the receiver, i.e. make it immobile or mobile. Answer whether the object was + already pinned. N.B. pinning does *not* prevent an object from being garbage collected." + | receiver boolean wasPinned failure | + objectMemory hasSpurMemoryManagerAPI ifFalse: + [^self primitiveFailFor: PrimErrUnsupported]. + + receiver := self stackValue: 1. + ((objectMemory isImmediate: receiver) + or: [(objectMemory isForwarded: receiver) + or: [(objectMemory isContext: receiver) + and: [self isStillMarriedContext: receiver]]]) ifTrue: + [^self primitiveFailFor: PrimErrBadReceiver]. + boolean := self stackTop. + (boolean = objectMemory falseObject + or: [boolean = objectMemory trueObject]) ifFalse: + [^self primitiveFailFor: PrimErrBadArgument]. + + (objectMemory isPinned: receiver) + ifTrue: + [wasPinned := objectMemory trueObject. + objectMemory setIsPinnedOf: receiver to: false] + ifFalse: + [wasPinned := objectMemory falseObject. + failure := objectMemory pinObject: receiver. + failure ~= 0 ifTrue: + [^self primitiveFailFor: failure]]. + + self pop: argumentCount - 1 thenPush: wasPinned! Item was added: + ----- Method: Spur32BitMemoryManager>>allocateSlotsForPinningInOldSpace:bytes:format:classIndex: (in category 'allocation') ----- + allocateSlotsForPinningInOldSpace: numSlots bytes: totalBytes format: formatField classIndex: classIndex + "Answer the oop of a chunk of space in oldSpace with numSlots slots. Try and + allocate in a segment that already includes pinned objects. The header of the + result will have been filled-in but not the contents." + <inline: false> + | chunk | + chunk := self allocateOldSpaceChunkOfBytes: totalBytes + suchThat: [:f| (segmentManager segmentContainingObj: f) containsPinned]. + chunk ifNil: + [chunk := self allocateOldSpaceChunkOfBytes: totalBytes. + chunk ifNotNil: + [(segmentManager segmentContainingObj: chunk) containsPinned: true]]. + self checkFreeSpace. + chunk ifNil: + [^nil]. + numSlots >= self numSlotsMask ifTrue: "for header parsing we put a saturated slot count in the prepended overflow size word" + [self flag: #endianness. + self longAt: chunk put: numSlots. + self longAt: chunk + 4 put: self numSlotsMask << self numSlotsHalfShift. + self long64At: chunk + self baseHeaderSize + put: (self headerForSlots: self numSlotsMask format: formatField classIndex: classIndex). + ^chunk + self baseHeaderSize]. + self long64At: chunk put: (self headerForSlots: numSlots format: formatField classIndex: classIndex). + ^chunk! Item was added: + ----- Method: Spur64BitMemoryManager>>allocateSlotsForPinningInOldSpace:bytes:format:classIndex: (in category 'allocation') ----- + allocateSlotsForPinningInOldSpace: numSlots bytes: totalBytes format: formatField classIndex: classIndex + "Answer the oop of a chunk of space in oldSpace with numSlots slots. Try and + allocate in a segment that already includes pinned objects. The header of the + result will have been filled-in but not the contents." + <inline: false> + | chunk | + chunk := self allocateOldSpaceChunkOfBytes: totalBytes + suchThat: [:f| (segmentManager segmentContainingObj: f) containsPinned]. + chunk ifNil: + [chunk := self allocateOldSpaceChunkOfBytes: totalBytes]. + self checkFreeSpace. + chunk ifNil: + [^nil]. + numSlots >= self numSlotsMask ifTrue: "for header parsing we put a saturated slot count in the prepended overflow size word" + [self longAt: chunk + put: numSlots + (self numSlotsMask << self numSlotsFullShift). + self longAt: chunk + self baseHeaderSize + put: (self headerForSlots: self numSlotsMask format: formatField classIndex: classIndex). + ^chunk + self baseHeaderSize]. + self longAt: chunk + put: (self headerForSlots: numSlots format: formatField classIndex: classIndex). + ^chunk! Item was added: + ----- Method: SpurMemoryManager>>allocateOldSpaceChunkOfBytes:suchThat: (in category 'free space') ----- + allocateOldSpaceChunkOfBytes: chunkBytes suchThat: acceptanceBlock + "Answer a chunk of oldSpace from the free lists that satisfies acceptanceBlock, + if available, otherwise answer nil. Break up a larger chunk if one of the exact + size cannot be found. N.B. the chunk is simply a pointer, it has no valid header. + The caller *must* fill in the header correctly." + | initialIndex node next prev index child childBytes acceptedChunk acceptedNode | + <inline: true> "must inline for acceptanceBlock" + self assert: (lastSubdividedFreeChunk := 0) = 0. + "for debugging:" "totalFreeOldSpace := self totalFreeListBytes" + totalFreeOldSpace := totalFreeOldSpace - chunkBytes. "be optimistic (& don't wait for the write)" + initialIndex := chunkBytes / self allocationUnit. + (initialIndex < self numFreeLists and: [1 << initialIndex <= freeListsMask]) ifTrue: + [(freeListsMask anyMask: 1 << initialIndex) ifTrue: + [(node := freeLists at: initialIndex) = 0 + ifTrue: [freeListsMask := freeListsMask - (1 << initialIndex)] + ifFalse: + [prev := 0. + [node ~= 0] whileTrue: + [self assert: node = (self startOfObject: node). + self assert: (self isValidFreeObject: node). + next := self fetchPointer: self freeChunkNextIndex ofFreeChunk: node. + (acceptanceBlock value: node) ifTrue: + [prev = 0 + ifTrue: [freeLists at: initialIndex put: next] + ifFalse: [self storePointer: self freeChunkNextIndex ofFreeChunk: prev withValue: next]. + ^node]. + prev := node. + node := next]]]. + "first search for free chunks of a multiple of chunkBytes in size" + index := initialIndex. + [(index := index + initialIndex) < self numFreeLists + and: [1 << index <= freeListsMask]] whileTrue: + [(freeListsMask anyMask: 1 << index) ifTrue: + [(node := freeLists at: index) = 0 + ifTrue: [freeListsMask := freeListsMask - (1 << index)] + ifFalse: + [prev := 0. + [node ~= 0] whileTrue: + [self assert: node = (self startOfObject: node). + self assert: (self isValidFreeObject: node). + next := self fetchPointer: self freeChunkNextIndex ofFreeChunk: node. + (acceptanceBlock value: node) ifTrue: + [prev = 0 + ifTrue: [freeLists at: index put: next] + ifFalse: [self storePointer: self freeChunkNextIndex ofFreeChunk: prev withValue: next]. + self freeChunkWithBytes: index * self allocationUnit - chunkBytes + at: (self startOfObject: node) + chunkBytes. + ^node]. + prev := node. + node := next]]]]. + "now get desperate and use the first that'll fit. + Note that because the minimum free size is 16 bytes (2 * allocationUnit), to + leave room for the forwarding pointer/next free link, we can only break chunks + that are at least 16 bytes larger, hence start at initialIndex + 2." + index := initialIndex + 1. + [(index := index + 1) < self numFreeLists + and: [1 << index <= freeListsMask]] whileTrue: + [(freeListsMask anyMask: 1 << index) ifTrue: + [(node := freeLists at: index) = 0 + ifTrue: [freeListsMask := freeListsMask - (1 << index)] + ifFalse: + [prev := 0. + [node ~= 0] whileTrue: + [self assert: node = (self startOfObject: node). + self assert: (self isValidFreeObject: node). + next := self fetchPointer: self freeChunkNextIndex ofFreeChunk: node. + (acceptanceBlock value: node) ifTrue: + [prev = 0 + ifTrue: [freeLists at: index put: next] + ifFalse: [self storePointer: self freeChunkNextIndex ofFreeChunk: prev withValue: next]. + self freeChunkWithBytes: index * self allocationUnit - chunkBytes + at: (self startOfObject: node) + chunkBytes. + ^node]. + prev := node. + node := next]]]]]. + + "Large chunk, or no space on small free lists. Search the large chunk list. + Large chunk list organized as a tree, each node of which is a list of chunks + of the same size. Beneath the node are smaller and larger blocks. + When the search ends parent should hold the smallest chunk at least as + large as chunkBytes, or 0 if none. acceptedChunk and acceptedNode save + us from having to back-up when the acceptanceBlock filters-out all nodes + of the right size, but there are nodes of the wrong size it does accept." + child := freeLists at: 0. + node := acceptedChunk := acceptedNode := 0. + [child ~= 0] whileTrue: + [self assert: (self isValidFreeObject: child). + childBytes := self bytesInObject: child. + childBytes = chunkBytes ifTrue: "size match; try to remove from list at node." + [node := child. + [prev := node. + node := self fetchPointer: self freeChunkNextIndex ofFreeChunk: node. + node ~= 0] whileTrue: + [(acceptanceBlock value: node) ifTrue: + [self assert: (self isValidFreeObject: node). + self storePointer: self freeChunkNextIndex + ofFreeChunk: prev + withValue: (self fetchPointer: self freeChunkNextIndex ofFreeChunk: node). + ^self startOfObject: node]]. + (acceptanceBlock value: child) ifTrue: + [next := self fetchPointer: self freeChunkNextIndex ofFreeChunk: child. + next = 0 + ifTrue: "no list; remove the interior node" + [self unlinkSolitaryFreeTreeNode: child] + ifFalse: "list; replace node with it" + [self inFreeTreeReplace: child with: next]. + ^self startOfObject: child]]. + child ~= 0 ifTrue: + ["Note that because the minimum free size is 16 bytes (2 * allocationUnit), to + leave room for the forwarding pointer/next free link, we can only break chunks + that are at least 16 bytes larger, hence reject chunks < 2 * allocationUnit larger." + childBytes <= (chunkBytes + self allocationUnit) + ifTrue: "node too small; walk down the larger size of the tree" + [child := self fetchPointer: self freeChunkLargerIndex ofFreeChunk: child] + ifFalse: + [self flag: 'we can do better here; preferentially choosing the lowest node. That would be a form of best-fit since we are trying to compact down'. + node := child. + child := self fetchPointer: self freeChunkSmallerIndex ofFreeChunk: node. + acceptedNode = 0 ifTrue: + [acceptedChunk := node. + "first search the list." + [acceptedChunk := self fetchPointer: self freeChunkNextIndex + ofFreeChunk: acceptedChunk. + (acceptedChunk ~= 0 and: [acceptanceBlock value: acceptedChunk]) ifTrue: + [acceptedNode := node]. + acceptedChunk ~= 0 and: [acceptedNode = 0]] whileTrue. + "nothing on the list; will the node do? This prefers + acceptable nodes higher up the tree over acceptable + list elements further down, but we haven't got all day..." + (acceptedNode = 0 + and: [acceptanceBlock value: node]) ifTrue: + [acceptedNode := node. + child := 0 "break out of loop now we have an acceptedNode"]]]]]. + + acceptedNode ~= 0 ifTrue: + [acceptedChunk ~= 0 ifTrue: + [self assert: (self bytesInObject: acceptedChunk) >= (chunkBytes + self allocationUnit). + [next := self fetchPointer: self freeChunkNextIndex ofFreeChunk: acceptedNode. + next ~= acceptedChunk] whileTrue: + [acceptedNode := next]. + self storePointer: self freeChunkNextIndex + ofFreeChunk: acceptedNode + withValue: (self fetchPointer: self freeChunkNextIndex ofFreeChunk: acceptedChunk). + self freeChunkWithBytes: (self bytesInObject: acceptedChunk) - chunkBytes + at: (self startOfObject: acceptedChunk) + chunkBytes. + ^self startOfObject: acceptedChunk]. + next := self fetchPointer: self freeChunkNextIndex ofFreeChunk: acceptedNode. + next = 0 + ifTrue: "no list; remove the interior node" + [self unlinkSolitaryFreeTreeNode: acceptedNode] + ifFalse: "list; replace node with it" + [self inFreeTreeReplace: acceptedNode with: next]. + self assert: (self bytesInObject: acceptedNode) >= (chunkBytes + self allocationUnit). + self freeChunkWithBytes: (self bytesInObject: acceptedNode) - chunkBytes + at: (self startOfObject: acceptedNode) + chunkBytes. + ^self startOfObject: acceptedNode]. + + totalFreeOldSpace := totalFreeOldSpace + chunkBytes. "optimism was unfounded" + ^nil! Item was added: + ----- Method: SpurMemoryManager>>cloneInOldSpaceForPinning: (in category 'allocation') ----- + cloneInOldSpaceForPinning: objOop + | numSlots newObj | + numSlots := self numSlotsOf: objOop. + + newObj := self allocateSlotsForPinningInOldSpace: numSlots + bytes: (self objectBytesForSlots: numSlots) + format: (self formatOf: objOop) + classIndex: (self classIndexOf: objOop). + (self isPointersNonImm: objOop) + ifTrue: + [| hasYoung | + hasYoung := false. + 0 to: numSlots - 1 do: + [:i| | oop | + oop := self fetchPointer: i ofObject: objOop. + ((self isNonImmediate: oop) + and: [self isForwarded: oop]) ifTrue: + [oop := self followForwarded: oop]. + ((self isNonImmediate: oop) + and: [self isYoungObject: oop]) ifTrue: + [hasYoung := true]. + self storePointerUnchecked: i + ofObject: newObj + withValue: oop]. + (hasYoung + and: [(self isYoungObject: newObj) not]) ifTrue: + [scavenger remember: newObj. + self setIsRememberedOf: newObj to: true]] + ifFalse: + [0 to: numSlots - 1 do: + [:i| + self storePointerUnchecked: i + ofObject: newObj + withValue: (self fetchPointer: i ofObject: objOop)]]. + ^newObj! Item was changed: ----- Method: SpurMemoryManager>>pinObject: (in category 'primitive support') ----- pinObject: objOop + | oldClone seg | + <var: #seg type: #'SpurSegmentInfo *'> + self assert: (self isNonImmediate: objOop). + self flag: 'policy decision here. if already old, do we clone in a segment containing pinned objects or merely pin?'. + "We choose to clone to keep pinned objects together to reduce fragmentation, + assuming that pinning is rare and that fragmentation is a bad thing." + (self isOldObject: objOop) ifTrue: + [seg := segmentManager segmentContainingObj: objOop. + seg containsPinned ifTrue: + [self setIsPinnedOf: objOop to: true. + ^0]. + segmentManager someSegmentContainsPinned ifFalse: + [self setIsPinnedOf: objOop to: true. + seg containsPinned: true. + ^0]]. + oldClone := self cloneInOldSpaceForPinning: objOop. + oldClone = 0 ifTrue: + [^PrimErrNoMemory]. + self setIsPinnedOf: oldClone to: true. + self forward: objOop to: oldClone. + ^0! - "Pin objOop in memory. If objOop is in oldSpace merely set its isPinned - bit. If objOop is in newSpace then created a pinned copy in oldSpace - and forward objOop to the pinned copy. Answer the (possibly changed) - oop of the pinned object." - <api> - self shouldBeImplemented! Item was added: + ----- Method: SpurSegmentManager>>someSegmentContainsPinned (in category 'pinning') ----- + someSegmentContainsPinned + 0 to: numSegments - 1 do: + [:i| (segments at: i) containsPinned ifTrue: [^true]]. + ^false! Item was changed: ----- Method: StackInterpreter class>>initializePrimitiveTable (in category 'initialization') ----- (excessive size, no diff calculated)

1 0

heads up on AndroidPlugin for SqueakStackEvtAndroidConfig
by gettimothy 22 May '14

22 May '14

Hi All, Pharo has a StackEvtAndroidConfig that requires an AndroidPlugin that is not part of the Cog svn download. Generating the config will not complete on Squeak. I am going to leave the class in place. cheers, tty

4 5

[commit][2928] CogVM source as per VMMaker.oscog-eem.730
by commits＠squeakvm.org 21 May '14

21 May '14

Revision: 2928 Author: eliot Date: 2014-05-21 12:18:13 -0700 (Wed, 21 May 2014) Log Message: ----------- CogVM source as per VMMaker.oscog-eem.730 Spur: Implement memory shrinkage. Check free space around SpurSegmentManager prepareForSnapshot & postSnapshot. Modified Paths: -------------- branches/Cog/nsspursrc/vm/cointerp.c branches/Cog/nsspursrc/vm/cointerp.h branches/Cog/nsspursrc/vm/gcc3x-cointerp.c branches/Cog/nsspursrc/vm/interp.h branches/Cog/nsspursrc/vm/vmCallback.h branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c branches/Cog/nsspurstacksrc/vm/interp.c branches/Cog/nsspurstacksrc/vm/interp.h branches/Cog/nsspurstacksrc/vm/vmCallback.h branches/Cog/platforms/Cross/vm/sq.h branches/Cog/platforms/Mac OS/vm/sqMacMemory.c branches/Cog/platforms/unix/vm/sqUnixMemory.c branches/Cog/platforms/win32/vm/sqWin32Alloc.c branches/Cog/spursistasrc/vm/cointerp.c branches/Cog/spursistasrc/vm/cointerp.h branches/Cog/spursistasrc/vm/gcc3x-cointerp.c branches/Cog/spursistasrc/vm/interp.h branches/Cog/spursistasrc/vm/vmCallback.h branches/Cog/spursrc/vm/cointerp.c branches/Cog/spursrc/vm/cointerp.h branches/Cog/spursrc/vm/gcc3x-cointerp.c branches/Cog/spursrc/vm/interp.h branches/Cog/spursrc/vm/vmCallback.h branches/Cog/spurstacksrc/vm/gcc3x-interp.c branches/Cog/spurstacksrc/vm/interp.c branches/Cog/spurstacksrc/vm/interp.h branches/Cog/spurstacksrc/vm/vmCallback.h Property Changed: ---------------- branches/Cog/platforms/Cross/vm/sqSCCSVersion.h Modified: branches/Cog/nsspursrc/vm/cointerp.c =================================================================== --- branches/Cog/nsspursrc/vm/cointerp.c 2014-05-20 22:55:52 UTC (rev 2927) +++ branches/Cog/nsspursrc/vm/cointerp.c 2014-05-21 19:18:13 UTC (rev 2928) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.727 uuid: c4880b9d-5eff-44bc-8908-a6e831764659 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.730 uuid: 721dc8e5-985a-41a1-8e5d-09d9095df7d8 from - CoInterpreter VMMaker.oscog-eem.727 uuid: c4880b9d-5eff-44bc-8908-a6e831764659 + CoInterpreter VMMaker.oscog-eem.730 uuid: 721dc8e5-985a-41a1-8e5d-09d9095df7d8 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.727 uuid: c4880b9d-5eff-44bc-8908-a6e831764659 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.730 uuid: 721dc8e5-985a-41a1-8e5d-09d9095df7d8 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -753,6 +753,7 @@ static sqInt isContextNonImm(sqInt oop) NoDbgRegParms; static sqInt isContext(sqInt oop) NoDbgRegParms; static sqInt isEmptyObjStack(sqInt objStack) NoDbgRegParms; +static sqInt isEmptySegment(SpurSegmentInfo *seg) NoDbgRegParms; static sqInt isEnumerableObjectNoAssert(sqInt objOop) NoDbgRegParms; static sqInt isEnumerableObject(sqInt objOop) NoDbgRegParms; static sqInt isEphemeron(sqInt objOop) NoDbgRegParms; @@ -1454,15 +1455,15 @@ _iss sqInt hiddenRootsObj; _iss usqInt endOfMemory; _iss sqInt trueObj; +_iss SpurSegmentInfo * segments; _iss sqInt remapBufferCount; _iss sqInt needGCFlag; _iss sqInt falseObj; -_iss SpurSegmentInfo * segments; _iss sqInt traceLogIndex; _iss sqInt bytesPerPage; _iss sqInt totalFreeOldSpace; +_iss sqInt numSegments; _iss usqInt pastSpaceStart; -_iss sqInt numSegments; _iss char * stackLimit; _iss usqInt scavengeThreshold; _iss sqInt * freeLists; @@ -1492,18 +1493,18 @@ _iss SpurNewSpaceSpace eden; _iss sqInt profileSemaphore; _iss sqInt ephemeronList; +_iss usqInt freeOldSpaceStart; _iss sqInt profileProcess; _iss sqInt tenureThreshold; _iss sqInt extraRootCount; _iss sqInt invalidObjStackPage; _iss sqInt previousRememberedSetSize; _iss unsigned char * classTableBitmap; -_iss usqInt freeOldSpaceStart; +_iss sqInt growHeadroom; _iss sqInt longRunningPrimitiveCheckMethod; _iss sqInt profileMethod; _iss sqInt classTableIndex; _iss sqInt ephemeronQueue; -_iss sqInt growHeadroom; _iss sqInt lastMethodCacheProbeWrite; _iss sqInt lkupClass; _iss sqInt backwardJumpCount; @@ -2219,7 +2220,7 @@ /* 574 */ (void (*)(void))0, /* 575 */ (void (*)(void))0, 0 }; -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.727"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.730"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; @@ -31130,7 +31131,24 @@ && (0 == (longAt((objStack + (BaseHeaderSize)) + (ObjStackNextx << 2)))); } +static sqInt +isEmptySegment(SpurSegmentInfo *seg) +{ + sqInt address; + sqInt firstObj; + usqInt numSlots; + /* begin objectStartingAt: */ + address = (seg->segStart); + numSlots = byteAt(address + 7); + firstObj = (numSlots == 0xFF + ? address + (BaseHeaderSize) + : address); + return (((longAt(firstObj)) & 0x3FFFFF) == 0) + && ((addressAfter(firstObj)) == ((((seg->segSize)) + ((seg->segStart))) - (2 * (BaseHeaderSize)))); +} + + /* Answer if objOop should be included in an allObjects...Do: enumeration. This is for assert-checking only. */ @@ -37838,7 +37856,17 @@ static void postGCAction(sqInt gcModeArg) { DECL_MAYBE_SQ_GLOBAL_STRUCT + sqInt best; + usqInt currentEnd; + sqInt delta1; + SpurSegmentInfo *emptySeg; sqInt freeSizeNow; + sqInt i; + sqInt i1; + sqInt i2; + sqInt j; + SpurSegmentInfo *seg; + sqInt shrinkage; assert(gcModeArg == GIV(gcMode)); if ((gcModeArg == GCModeFull) @@ -37853,9 +37881,59 @@ /* Attempt to shrink memory after successfully reclaiming lots of memory */ /* begin shrinkObjectMemory: */ - print("shrinkObjectMemory: shouldBeImplemented"); - /* begin cr */ - printf("\n"); + shrinkage = freeSizeNow - GIV(growHeadroom); + while (1) { + /* begin findEmptySegNearestInSizeTo: */ + best = null; + delta1 = shrinkage; + for (i = 0; i < GIV(numSegments); i += 1) { + seg = (&(GIV(segments)[i])); + if (isEmptySegment(seg)) { + if (best == null) { + best = seg; + } + else { + if ((shrinkage >= (((seg->segSize)) * 0.75)) + && ((abs(((seg->segSize)) - shrinkage)) < delta1)) { + best = seg; + delta1 = abs(((seg->segSize)) - shrinkage); + } + } + } + } + emptySeg = ((sqInt) best); + if (!(emptySeg != null)) break; + shrinkage -= (emptySeg->segSize); + detachFreeObject(objectStartingAt((emptySeg->segStart))); + /* begin removeSegment: */ + /* begin indexOfSegment: */ + for (i1 = 0; i1 < GIV(numSegments); i1 += 1) { + if (((emptySeg->segStart)) == (((GIV(segments)[i1]).segStart))) { + i2 = i1; + goto l1; + } + } + error("segment not found"); + l1: /* end indexOfSegment: */; + assert(i2 > 0); + sqDeallocateMemorySegmentAtOfSize((emptySeg->segStart), (emptySeg->segSize)); + for (j = i2; j < GIV(numSegments); j += 1) { + GIV(segments)[j] = (GIV(segments)[j + 1]); + } + null; + GIV(numSegments) -= 1; + bridgeFromto((&(GIV(segments)[i2 - 1])), (i2 <= (GIV(numSegments) - 1) + ? (&(GIV(segments)[i2])) + : 0)); + /* begin setLastSegment: */ + currentEnd = (((((&(GIV(segments)[GIV(numSegments) - 1])))->segSize)) + ((((&(GIV(segments)[GIV(numSegments) - 1])))->segStart))) - (2 * (BaseHeaderSize)); + if (currentEnd <= GIV(endOfMemory)) { + GIV(endOfMemory) = currentEnd; + if (GIV(freeOldSpaceStart) > currentEnd) { + GIV(freeOldSpaceStart) = currentEnd; + } + } + } } } signalSemaphoreWithIndex(GIV(gcSemaphoreIndex)); @@ -37909,6 +37987,9 @@ GIV(totalFreeOldSpace) += bytes; } } + /* begin checkFreeSpace */ + assert(bitsSetInFreeSpaceMaskForAllFreeLists()); + assert(GIV(totalFreeOldSpace) == (totalFreeListBytes())); } @@ -62861,6 +62942,9 @@ assert(GIV(freeStart) == (((eden()).start))); fullGC(); prepareForSnapshot(); + /* begin checkFreeSpace */ + assert(bitsSetInFreeSpaceMaskForAllFreeLists()); + assert(GIV(totalFreeOldSpace) == (totalFreeListBytes())); activeContext = GIV(tempOop); GIV(tempOop) = 0; if (!GIV(primFailCode)) { Modified: branches/Cog/nsspursrc/vm/cointerp.h =================================================================== --- branches/Cog/nsspursrc/vm/cointerp.h 2014-05-20 22:55:52 UTC (rev 2927) +++ branches/Cog/nsspursrc/vm/cointerp.h 2014-05-21 19:18:13 UTC (rev 2928) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.727 uuid: c4880b9d-5eff-44bc-8908-a6e831764659 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.730 uuid: 721dc8e5-985a-41a1-8e5d-09d9095df7d8 */ Modified: branches/Cog/nsspursrc/vm/gcc3x-cointerp.c =================================================================== --- branches/Cog/nsspursrc/vm/gcc3x-cointerp.c 2014-05-20 22:55:52 UTC (rev 2927) +++ branches/Cog/nsspursrc/vm/gcc3x-cointerp.c 2014-05-21 19:18:13 UTC (rev 2928) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.727 uuid: c4880b9d-5eff-44bc-8908-a6e831764659 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.730 uuid: 721dc8e5-985a-41a1-8e5d-09d9095df7d8 from - CoInterpreter VMMaker.oscog-eem.727 uuid: c4880b9d-5eff-44bc-8908-a6e831764659 + CoInterpreter VMMaker.oscog-eem.730 uuid: 721dc8e5-985a-41a1-8e5d-09d9095df7d8 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.727 uuid: c4880b9d-5eff-44bc-8908-a6e831764659 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.730 uuid: 721dc8e5-985a-41a1-8e5d-09d9095df7d8 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -756,6 +756,7 @@ static sqInt isContextNonImm(sqInt oop) NoDbgRegParms; static sqInt isContext(sqInt oop) NoDbgRegParms; static sqInt isEmptyObjStack(sqInt objStack) NoDbgRegParms; +static sqInt isEmptySegment(SpurSegmentInfo *seg) NoDbgRegParms; static sqInt isEnumerableObjectNoAssert(sqInt objOop) NoDbgRegParms; static sqInt isEnumerableObject(sqInt objOop) NoDbgRegParms; static sqInt isEphemeron(sqInt objOop) NoDbgRegParms; @@ -1457,15 +1458,15 @@ _iss sqInt hiddenRootsObj; _iss usqInt endOfMemory; _iss sqInt trueObj; +_iss SpurSegmentInfo * segments; _iss sqInt remapBufferCount; _iss sqInt needGCFlag; _iss sqInt falseObj; -_iss SpurSegmentInfo * segments; _iss sqInt traceLogIndex; _iss sqInt bytesPerPage; _iss sqInt totalFreeOldSpace; +_iss sqInt numSegments; _iss usqInt pastSpaceStart; -_iss sqInt numSegments; _iss char * stackLimit; _iss usqInt scavengeThreshold; _iss sqInt * freeLists; @@ -1495,18 +1496,18 @@ _iss SpurNewSpaceSpace eden; _iss sqInt profileSemaphore; _iss sqInt ephemeronList; +_iss usqInt freeOldSpaceStart; _iss sqInt profileProcess; _iss sqInt tenureThreshold; _iss sqInt extraRootCount; _iss sqInt invalidObjStackPage; _iss sqInt previousRememberedSetSize; _iss unsigned char * classTableBitmap; -_iss usqInt freeOldSpaceStart; +_iss sqInt growHeadroom; _iss sqInt longRunningPrimitiveCheckMethod; _iss sqInt profileMethod; _iss sqInt classTableIndex; _iss sqInt ephemeronQueue; -_iss sqInt growHeadroom; _iss sqInt lastMethodCacheProbeWrite; _iss sqInt lkupClass; _iss sqInt backwardJumpCount; @@ -2222,7 +2223,7 @@ /* 574 */ (void (*)(void))0, /* 575 */ (void (*)(void))0, 0 }; -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.727"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.730"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; @@ -31139,7 +31140,24 @@ && (0 == (longAt((objStack + (BaseHeaderSize)) + (ObjStackNextx << 2)))); } +static sqInt +isEmptySegment(SpurSegmentInfo *seg) +{ + sqInt address; + sqInt firstObj; + usqInt numSlots; + /* begin objectStartingAt: */ + address = (seg->segStart); + numSlots = byteAt(address + 7); + firstObj = (numSlots == 0xFF + ? address + (BaseHeaderSize) + : address); + return (((longAt(firstObj)) & 0x3FFFFF) == 0) + && ((addressAfter(firstObj)) == ((((seg->segSize)) + ((seg->segStart))) - (2 * (BaseHeaderSize)))); +} + + /* Answer if objOop should be included in an allObjects...Do: enumeration. This is for assert-checking only. */ @@ -37847,7 +37865,17 @@ static void postGCAction(sqInt gcModeArg) { DECL_MAYBE_SQ_GLOBAL_STRUCT + sqInt best; + usqInt currentEnd; + sqInt delta1; + SpurSegmentInfo *emptySeg; sqInt freeSizeNow; + sqInt i; + sqInt i1; + sqInt i2; + sqInt j; + SpurSegmentInfo *seg; + sqInt shrinkage; assert(gcModeArg == GIV(gcMode)); if ((gcModeArg == GCModeFull) @@ -37862,9 +37890,59 @@ /* Attempt to shrink memory after successfully reclaiming lots of memory */ /* begin shrinkObjectMemory: */ - print("shrinkObjectMemory: shouldBeImplemented"); - /* begin cr */ - printf("\n"); + shrinkage = freeSizeNow - GIV(growHeadroom); + while (1) { + /* begin findEmptySegNearestInSizeTo: */ + best = null; + delta1 = shrinkage; + for (i = 0; i < GIV(numSegments); i += 1) { + seg = (&(GIV(segments)[i])); + if (isEmptySegment(seg)) { + if (best == null) { + best = seg; + } + else { + if ((shrinkage >= (((seg->segSize)) * 0.75)) + && ((abs(((seg->segSize)) - shrinkage)) < delta1)) { + best = seg; + delta1 = abs(((seg->segSize)) - shrinkage); + } + } + } + } + emptySeg = ((sqInt) best); + if (!(emptySeg != null)) break; + shrinkage -= (emptySeg->segSize); + detachFreeObject(objectStartingAt((emptySeg->segStart))); + /* begin removeSegment: */ + /* begin indexOfSegment: */ + for (i1 = 0; i1 < GIV(numSegments); i1 += 1) { + if (((emptySeg->segStart)) == (((GIV(segments)[i1]).segStart))) { + i2 = i1; + goto l1; + } + } + error("segment not found"); + l1: /* end indexOfSegment: */; + assert(i2 > 0); + sqDeallocateMemorySegmentAtOfSize((emptySeg->segStart), (emptySeg->segSize)); + for (j = i2; j < GIV(numSegments); j += 1) { + GIV(segments)[j] = (GIV(segments)[j + 1]); + } + null; + GIV(numSegments) -= 1; + bridgeFromto((&(GIV(segments)[i2 - 1])), (i2 <= (GIV(numSegments) - 1) + ? (&(GIV(segments)[i2])) + : 0)); + /* begin setLastSegment: */ + currentEnd = (((((&(GIV(segments)[GIV(numSegments) - 1])))->segSize)) + ((((&(GIV(segments)[GIV(numSegments) - 1])))->segStart))) - (2 * (BaseHeaderSize)); + if (currentEnd <= GIV(endOfMemory)) { + GIV(endOfMemory) = currentEnd; + if (GIV(freeOldSpaceStart) > currentEnd) { + GIV(freeOldSpaceStart) = currentEnd; + } + } + } } } signalSemaphoreWithIndex(GIV(gcSemaphoreIndex)); @@ -37918,6 +37996,9 @@ GIV(totalFreeOldSpace) += bytes; } } + /* begin checkFreeSpace */ + assert(bitsSetInFreeSpaceMaskForAllFreeLists()); + assert(GIV(totalFreeOldSpace) == (totalFreeListBytes())); } @@ -62870,6 +62951,9 @@ assert(GIV(freeStart) == (((eden()).start))); fullGC(); prepareForSnapshot(); + /* begin checkFreeSpace */ + assert(bitsSetInFreeSpaceMaskForAllFreeLists()); + assert(GIV(totalFreeOldSpace) == (totalFreeListBytes())); activeContext = GIV(tempOop); GIV(tempOop) = 0; if (!GIV(primFailCode)) { Modified: branches/Cog/nsspursrc/vm/interp.h =================================================================== --- branches/Cog/nsspursrc/vm/interp.h 2014-05-20 22:55:52 UTC (rev 2927) +++ branches/Cog/nsspursrc/vm/interp.h 2014-05-21 19:18:13 UTC (rev 2928) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.727 uuid: c4880b9d-5eff-44bc-8908-a6e831764659 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.730 uuid: 721dc8e5-985a-41a1-8e5d-09d9095df7d8 */ #define VM_PROXY_MAJOR 1 Modified: branches/Cog/nsspursrc/vm/vmCallback.h =================================================================== --- branches/Cog/nsspursrc/vm/vmCallback.h 2014-05-20 22:55:52 UTC (rev 2927) +++ branches/Cog/nsspursrc/vm/vmCallback.h 2014-05-21 19:18:13 UTC (rev 2928) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.727 uuid: c4880b9d-5eff-44bc-8908-a6e831764659 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.730 uuid: 721dc8e5-985a-41a1-8e5d-09d9095df7d8 */ #define VM_CALLBACK_INC 1 Modified: branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c =================================================================== --- branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c 2014-05-20 22:55:52 UTC (rev 2927) +++ branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c 2014-05-21 19:18:13 UTC (rev 2928) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.727 uuid: c4880b9d-5eff-44bc-8908-a6e831764659 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.730 uuid: 721dc8e5-985a-41a1-8e5d-09d9095df7d8 from - StackInterpreter VMMaker.oscog-eem.727 uuid: c4880b9d-5eff-44bc-8908-a6e831764659 + StackInterpreter VMMaker.oscog-eem.730 uuid: 721dc8e5-985a-41a1-8e5d-09d9095df7d8 */ -static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.727 uuid: c4880b9d-5eff-44bc-8908-a6e831764659 " __DATE__ ; +static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.730 uuid: 721dc8e5-985a-41a1-8e5d-09d9095df7d8 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -631,6 +631,7 @@ static sqInt isContextNonImm(sqInt oop) NoDbgRegParms; static sqInt isContext(sqInt oop) NoDbgRegParms; static sqInt isEmptyObjStack(sqInt objStack) NoDbgRegParms; +static sqInt isEmptySegment(SpurSegmentInfo *seg) NoDbgRegParms; static sqInt isEnumerableObjectNoAssert(sqInt objOop) NoDbgRegParms; static sqInt isEnumerableObject(sqInt objOop) NoDbgRegParms; static sqInt isEphemeron(sqInt objOop) NoDbgRegParms; @@ -1263,16 +1264,16 @@ _iss usqInt instructionPointer; _iss sqInt hiddenRootsObj; _iss usqInt endOfMemory; +_iss SpurSegmentInfo * segments; _iss sqInt trueObj; _iss sqInt remapBufferCount; _iss sqInt needGCFlag; _iss sqInt falseObj; -_iss SpurSegmentInfo * segments; +_iss sqInt numSegments; _iss StackPage * pages; _iss sqInt totalFreeOldSpace; _iss usqInt pastSpaceStart; _iss char * stackMemory; -_iss sqInt numSegments; _iss char * stackLimit; _iss sqInt bytesPerPage; _iss usqInt scavengeThreshold; @@ -1295,11 +1296,13 @@ _iss sqInt numClassTablePages; _iss sqInt numStackPages; _iss sqInt tempOop; +_iss usqInt freeOldSpaceStart; _iss sqInt futureSurvivorStart; _iss sqLong nextProfileTick; _iss char * objStackInvalidBecause; _iss SpurNewSpaceSpace eden; _iss sqInt ephemeronList; +_iss sqInt growHeadroom; _iss sqInt numPages; _iss sqInt profileProcess; _iss sqInt tenureThreshold; @@ -1307,8 +1310,6 @@ _iss sqInt invalidObjStackPage; _iss sqInt previousRememberedSetSize; _iss unsigned char * classTableBitmap; -_iss usqInt freeOldSpaceStart; -_iss sqInt growHeadroom; _iss sqInt longRunningPrimitiveCheckMethod; _iss sqInt longRunningPrimitiveCheckSemaphore; _iss sqInt profileMethod; @@ -2009,7 +2010,7 @@ 0 }; char * breakSelector; sqInt breakSelectorLength = -1; -const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreter_VMMaker.oscog-eem.727"; +const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreter_VMMaker.oscog-eem.730"; volatile int sendTrace; sqInt suppressHeartbeatFlag; @@ -24611,9 +24612,19 @@ usqLong fullGC(void) { DECL_MAYBE_SQ_GLOBAL_STRUCT + sqInt best; + usqInt currentEnd; + sqInt delta1; + SpurSegmentInfo *emptySeg; sqInt freeSizeNow; sqInt i; sqInt i1; + sqInt i11; + sqInt i2; + sqInt i3; + sqInt j; + SpurSegmentInfo *seg; + sqInt shrinkage; GIV(needGCFlag) = 0; GIV(gcStartUsecs) = ioUTCMicrosecondsNow(); @@ -24674,9 +24685,59 @@ /* Attempt to shrink memory after successfully reclaiming lots of memory */ /* begin shrinkObjectMemory: */ - print("shrinkObjectMemory: shouldBeImplemented"); - /* begin cr */ - printf("\n"); + shrinkage = freeSizeNow - GIV(growHeadroom); + while (1) { + /* begin findEmptySegNearestInSizeTo: */ + best = null; + delta1 = shrinkage; + for (i3 = 0; i3 < GIV(numSegments); i3 += 1) { + seg = (&(GIV(segments)[i3])); + if (isEmptySegment(seg)) { + if (best == null) { + best = seg; + } + else { + if ((shrinkage >= (((seg->segSize)) * 0.75)) + && ((abs(((seg->segSize)) - shrinkage)) < delta1)) { + best = seg; + delta1 = abs(((seg->segSize)) - shrinkage); + } + } + } + } + emptySeg = ((sqInt) best); + if (!(emptySeg != null)) break; + shrinkage -= (emptySeg->segSize); + detachFreeObject(objectStartingAt((emptySeg->segStart))); + /* begin removeSegment: */ + /* begin indexOfSegment: */ + for (i11 = 0; i11 < GIV(numSegments); i11 += 1) { + if (((emptySeg->segStart)) == (((GIV(segments)[i11]).segStart))) { + i2 = i11; + goto l1; + } + } + error("segment not found"); + l1: /* end indexOfSegment: */; + assert(i2 > 0); + sqDeallocateMemorySegmentAtOfSize((emptySeg->segStart), (emptySeg->segSize)); + for (j = i2; j < GIV(numSegments); j += 1) { + GIV(segments)[j] = (GIV(segments)[j + 1]); + } + null; + GIV(numSegments) -= 1; + bridgeFromto((&(GIV(segments)[i2 - 1])), (i2 <= (GIV(numSegments) - 1) + ? (&(GIV(segments)[i2])) + : 0)); + /* begin setLastSegment: */ + currentEnd = (((((&(GIV(segments)[GIV(numSegments) - 1])))->segSize)) + ((((&(GIV(segments)[GIV(numSegments) - 1])))->segStart))) - (2 * (BaseHeaderSize)); + if (currentEnd <= GIV(endOfMemory)) { + GIV(endOfMemory) = currentEnd; + if (GIV(freeOldSpaceStart) > currentEnd) { + GIV(freeOldSpaceStart) = currentEnd; + } + } + } } signalSemaphoreWithIndex(GIV(gcSemaphoreIndex)); @@ -26552,7 +26613,24 @@ && (0 == (longAt((objStack + (BaseHeaderSize)) + (ObjStackNextx << 2)))); } +static sqInt +isEmptySegment(SpurSegmentInfo *seg) +{ + sqInt address; + sqInt firstObj; + usqInt numSlots; + /* begin objectStartingAt: */ + address = (seg->segStart); + numSlots = byteAt(address + 7); + firstObj = (numSlots == 0xFF + ? address + (BaseHeaderSize) + : address); + return (((longAt(firstObj)) & 0x3FFFFF) == 0) + && ((addressAfter(firstObj)) == ((((seg->segSize)) + ((seg->segStart))) - (2 * (BaseHeaderSize)))); +} + + /* Answer if objOop should be included in an allObjects...Do: enumeration. This is for assert-checking only. */ @@ -32345,6 +32423,9 @@ GIV(totalFreeOldSpace) += bytes; } } + /* begin checkFreeSpace */ + assert(bitsSetInFreeSpaceMaskForAllFreeLists()); + assert(GIV(totalFreeOldSpace) == (totalFreeListBytes())); } @@ -54303,12 +54384,22 @@ static void scavengingGCTenuringIf(sqInt tenuringCriterion) { DECL_MAYBE_SQ_GLOBAL_STRUCT + sqInt best; + usqInt currentEnd; + sqInt delta1; + SpurSegmentInfo *emptySeg; sqInt freeSizeNow; sqInt i; sqInt i1; sqInt i11; + sqInt i12; sqInt i2; + sqInt i21; + sqInt i3; + sqInt j; sqInt probe; + SpurSegmentInfo *seg; + sqInt shrinkage; usqLong statSGCDeltaUsecs = 0; assert(GIV(remapBufferCount) == 0); @@ -55855,6 +55946,9 @@ assert(GIV(freeStart) == (((eden()).start))); fullGC(); prepareForSnapshot(); + /* begin checkFreeSpace */ + assert(bitsSetInFreeSpaceMaskForAllFreeLists()); + assert(GIV(totalFreeOldSpace) == (totalFreeListBytes())); activeContext = GIV(tempOop); GIV(tempOop) = 0; if (!GIV(primFailCode)) { Modified: branches/Cog/nsspurstacksrc/vm/interp.c =================================================================== --- branches/Cog/nsspurstacksrc/vm/interp.c 2014-05-20 22:55:52 UTC (rev 2927) +++ branches/Cog/nsspurstacksrc/vm/interp.c 2014-05-21 19:18:13 UTC (rev 2928) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.727 uuid: c4880b9d-5eff-44bc-8908-a6e831764659 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.730 uuid: 721dc8e5-985a-41a1-8e5d-09d9095df7d8 from - StackInterpreter VMMaker.oscog-eem.727 uuid: c4880b9d-5eff-44bc-8908-a6e831764659 + StackInterpreter VMMaker.oscog-eem.730 uuid: 721dc8e5-985a-41a1-8e5d-09d9095df7d8 */ -static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.727 uuid: c4880b9d-5eff-44bc-8908-a6e831764659 " __DATE__ ; +static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.730 uuid: 721dc8e5-985a-41a1-8e5d-09d9095df7d8 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -628,6 +628,7 @@ static sqInt isContextNonImm(sqInt oop) NoDbgRegParms; static sqInt isContext(sqInt oop) NoDbgRegParms; static sqInt isEmptyObjStack(sqInt objStack) NoDbgRegParms; +static sqInt isEmptySegment(SpurSegmentInfo *seg) NoDbgRegParms; static sqInt isEnumerableObjectNoAssert(sqInt objOop) NoDbgRegParms; static sqInt isEnumerableObject(sqInt objOop) NoDbgRegParms; static sqInt isEphemeron(sqInt objOop) NoDbgRegParms; @@ -1260,16 +1261,16 @@ _iss usqInt instructionPointer; _iss sqInt hiddenRootsObj; _iss usqInt endOfMemory; +_iss SpurSegmentInfo * segments; _iss sqInt trueObj; _iss sqInt remapBufferCount; _iss sqInt needGCFlag; _iss sqInt falseObj; -_iss SpurSegmentInfo * segments; +_iss sqInt numSegments; _iss StackPage * pages; _iss sqInt totalFreeOldSpace; _iss usqInt pastSpaceStart; _iss char * stackMemory; -_iss sqInt numSegments; _iss char * stackLimit; _iss sqInt bytesPerPage; _iss usqInt scavengeThreshold; @@ -1292,11 +1293,13 @@ _iss sqInt numClassTablePages; _iss sqInt numStackPages; _iss sqInt tempOop; +_iss usqInt freeOldSpaceStart; _iss sqInt futureSurvivorStart; _iss sqLong nextProfileTick; _iss char * objStackInvalidBecause; _iss SpurNewSpaceSpace eden; _iss sqInt ephemeronList; +_iss sqInt growHeadroom; _iss sqInt numPages; _iss sqInt profileProcess; _iss sqInt tenureThreshold; @@ -1304,8 +1307,6 @@ _iss sqInt invalidObjStackPage; _iss sqInt previousRememberedSetSize; _iss unsigned char * classTableBitmap; -_iss usqInt freeOldSpaceStart; -_iss sqInt growHeadroom; _iss sqInt longRunningPrimitiveCheckMethod; _iss sqInt longRunningPrimitiveCheckSemaphore; _iss sqInt profileMethod; @@ -2006,7 +2007,7 @@ 0 }; char * breakSelector; sqInt breakSelectorLength = -1; -const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreter_VMMaker.oscog-eem.727"; +const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreter_VMMaker.oscog-eem.730"; volatile int sendTrace; sqInt suppressHeartbeatFlag; @@ -24602,9 +24603,19 @@ usqLong fullGC(void) { DECL_MAYBE_SQ_GLOBAL_STRUCT + sqInt best; + usqInt currentEnd; + sqInt delta1; + SpurSegmentInfo *emptySeg; sqInt freeSizeNow; sqInt i; sqInt i1; + sqInt i11; + sqInt i2; + sqInt i3; + sqInt j; + SpurSegmentInfo *seg; + sqInt shrinkage; GIV(needGCFlag) = 0; GIV(gcStartUsecs) = ioUTCMicrosecondsNow(); @@ -24665,9 +24676,59 @@ /* Attempt to shrink memory after successfully reclaiming lots of memory */ /* begin shrinkObjectMemory: */ - print("shrinkObjectMemory: shouldBeImplemented"); - /* begin cr */ - printf("\n"); + shrinkage = freeSizeNow - GIV(growHeadroom); + while (1) { + /* begin findEmptySegNearestInSizeTo: */ + best = null; + delta1 = shrinkage; + for (i3 = 0; i3 < GIV(numSegments); i3 += 1) { + seg = (&(GIV(segments)[i3])); + if (isEmptySegment(seg)) { + if (best == null) { + best = seg; + } + else { + if ((shrinkage >= (((seg->segSize)) * 0.75)) + && ((abs(((seg->segSize)) - shrinkage)) < delta1)) { + best = seg; + delta1 = abs(((seg->segSize)) - shrinkage); + } + } + } + } + emptySeg = ((sqInt) best); + if (!(emptySeg != null)) break; + shrinkage -= (emptySeg->segSize); + detachFreeObject(objectStartingAt((emptySeg->segStart))); + /* begin removeSegment: */ + /* begin indexOfSegment: */ + for (i11 = 0; i11 < GIV(numSegments); i11 += 1) { + if (((emptySeg->segStart)) == (((GIV(segments)[i11]).segStart))) { + i2 = i11; + goto l1; + } + } + error("segment not found"); + l1: /* end indexOfSegment: */; + assert(i2 > 0); + sqDeallocateMemorySegmentAtOfSize((emptySeg->segStart), (emptySeg->segSize)); + for (j = i2; j < GIV(numSegments); j += 1) { + GIV(segments)[j] = (GIV(segments)[j + 1]); + } + null; + GIV(numSegments) -= 1; + bridgeFromto((&(GIV(segments)[i2 - 1])), (i2 <= (GIV(numSegments) - 1) + ? (&(GIV(segments)[i2])) + : 0)); + /* begin setLastSegment: */ + currentEnd = (((((&(GIV(segments)[GIV(numSegments) - 1])))->segSize)) + ((((&(GIV(segments)[GIV(numSegments) - 1])))->segStart))) - (2 * (BaseHeaderSize)); + if (currentEnd <= GIV(endOfMemory)) { + GIV(endOfMemory) = currentEnd; + if (GIV(freeOldSpaceStart) > currentEnd) { + GIV(freeOldSpaceStart) = currentEnd; + } + } + } } signalSemaphoreWithIndex(GIV(gcSemaphoreIndex)); @@ -26543,7 +26604,24 @@ && (0 == (longAt((objStack + (BaseHeaderSize)) + (ObjStackNextx << 2)))); } +static sqInt +isEmptySegment(SpurSegmentInfo *seg) +{ + sqInt address; + sqInt firstObj; + usqInt numSlots; + /* begin objectStartingAt: */ + address = (seg->segStart); + numSlots = byteAt(address + 7); + firstObj = (numSlots == 0xFF + ? address + (BaseHeaderSize) + : address); + return (((longAt(firstObj)) & 0x3FFFFF) == 0) + && ((addressAfter(firstObj)) == ((((seg->segSize)) + ((seg->segStart))) - (2 * (BaseHeaderSize)))); +} + + /* Answer if objOop should be included in an allObjects...Do: enumeration. This is for assert-checking only. */ @@ -32336,6 +32414,9 @@ GIV(totalFreeOldSpace) += bytes; } } + /* begin checkFreeSpace */ + assert(bitsSetInFreeSpaceMaskForAllFreeLists()); + assert(GIV(totalFreeOldSpace) == (totalFreeListBytes())); } @@ -54294,12 +54375,22 @@ static void scavengingGCTenuringIf(sqInt tenuringCriterion) { DECL_MAYBE_SQ_GLOBAL_STRUCT + sqInt best; + usqInt currentEnd; + sqInt delta1; + SpurSegmentInfo *emptySeg; sqInt freeSizeNow; sqInt i; sqInt i1; sqInt i11; + sqInt i12; sqInt i2; + sqInt i21; + sqInt i3; + sqInt j; sqInt probe; + SpurSegmentInfo *seg; + sqInt shrinkage; usqLong statSGCDeltaUsecs = 0; assert(GIV(remapBufferCount) == 0); @@ -55846,6 +55937,9 @@ assert(GIV(freeStart) == (((eden()).start))); fullGC(); prepareForSnapshot(); + /* begin checkFreeSpace */ + assert(bitsSetInFreeSpaceMaskForAllFreeLists()); + assert(GIV(totalFreeOldSpace) == (totalFreeListBytes())); activeContext = GIV(tempOop); GIV(tempOop) = 0; if (!GIV(primFailCode)) { Modified: branches/Cog/nsspurstacksrc/vm/interp.h =================================================================== --- branches/Cog/nsspurstacksrc/vm/interp.h 2014-05-20 22:55:52 UTC (rev 2927) +++ branches/Cog/nsspurstacksrc/vm/interp.h 2014-05-21 19:18:13 UTC (rev 2928) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.727 uuid: c4880b9d-5eff-44bc-8908-a6e831764659 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.730 uuid: 721dc8e5-985a-41a1-8e5d-09d9095df7d8 */ #define VM_PROXY_MAJOR 1 Modified: branches/Cog/nsspurstacksrc/vm/vmCallback.h =================================================================== --- branches/Cog/nsspurstacksrc/vm/vmCallback.h 2014-05-20 22:55:52 UTC (rev 2927) +++ branches/Cog/nsspurstacksrc/vm/vmCallback.h 2014-05-21 19:18:13 UTC (rev 2928) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.727 uuid: c4880b9d-5eff-44bc-8908-a6e831764659 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.730 uuid: 721dc8e5-985a-41a1-8e5d-09d9095df7d8 */ #define VM_CALLBACK_INC 1 Modified: branches/Cog/platforms/Cross/vm/sq.h =================================================================== --- branches/Cog/platforms/Cross/vm/sq.h 2014-05-20 22:55:52 UTC (rev 2927) +++ branches/Cog/platforms/Cross/vm/sq.h 2014-05-21 19:18:13 UTC (rev 2928) @@ -83,6 +83,7 @@ * 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. */ Property changes on: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h ___________________________________________________________________ Modified: checkindate - Tue May 20 15:55:19 PDT 2014 + Wed May 21 12:17:41 PDT 2014 Modified: branches/Cog/platforms/Mac OS/vm/sqMacMemory.c =================================================================== --- branches/Cog/platforms/Mac OS/vm/sqMacMemory.c 2014-05-20 22:55:52 UTC (rev 2927) +++ branches/Cog/platforms/Mac OS/vm/sqMacMemory.c 2014-05-21 19:18:13 UTC (rev 2928) @@ -175,9 +175,20 @@ } if (alloc >= minAddress) return alloc; - munmap(alloc, bytes); + if (munmap(alloc, bytes) != 0) + perror("sqAllocateMemorySegment... munmap"); minAddress = (void *)((char *)minAddress + bytes); } return 0; } + +/* Deallocate a region of memory previously allocated by + * sqAllocateMemorySegmentOfSizeAboveAllocatedSizeInto. Cannot fail. + */ +void +sqDeallocateMemorySegmentAtOfSize(void *addr, sqInt sz) +{ + if (munmap(addr, sz) != 0) + perror("sqDeallocateMemorySegment... munmap"); +} #endif /* SPURVM */ Modified: branches/Cog/platforms/unix/vm/sqUnixMemory.c =================================================================== --- branches/Cog/platforms/unix/vm/sqUnixMemory.c 2014-05-20 22:55:52 UTC (rev 2927) +++ branches/Cog/platforms/unix/vm/sqUnixMemory.c 2014-05-21 19:18:13 UTC (rev 2928) @@ -358,11 +358,22 @@ } if (alloc >= minAddress) return alloc; - munmap(alloc, bytes); + if (munmap(alloc, bytes) != 0) + perror("sqAllocateMemorySegment... munmap"); minAddress = (void *)((char *)minAddress + bytes); } return 0; } + +/* Deallocate a region of memory previously allocated by + * sqAllocateMemorySegmentOfSizeAboveAllocatedSizeInto. Cannot fail. + */ +void +sqDeallocateMemorySegmentAtOfSize(void *addr, sqInt sz) +{ + if (munmap(addr, sz) != 0) + perror("sqDeallocateMemorySegment... munmap"); +} #endif /* SPURVM */ Modified: branches/Cog/platforms/win32/vm/sqWin32Alloc.c =================================================================== --- branches/Cog/platforms/win32/vm/sqWin32Alloc.c 2014-05-20 22:55:52 UTC (rev 2927) +++ branches/Cog/platforms/win32/vm/sqWin32Alloc.c 2014-05-21 19:18:13 UTC (rev 2928) @@ -246,4 +246,16 @@ bytes, minAddress); return NULL; } + +/* Deallocate a region of memory previously allocated by + * sqAllocateMemorySegmentOfSizeAboveAllocatedSizeInto. Cannot fail. + */ +void +sqDeallocateMemorySegmentAtOfSize(void *addr, sqInt sz) +{ + if (!VirtualFree(addr, sz, MEM_RELEASE)) + sqMessageBox(MB_OK | MB_ICONSTOP, TEXT("VM Warning:"), + "Unable to VirtualFree committed memory (%d bytes requested)", + sz); +} #endif /* SPURVM */ Modified: branches/Cog/spursistasrc/vm/cointerp.c =================================================================== --- branches/Cog/spursistasrc/vm/cointerp.c 2014-05-20 22:55:52 UTC (rev 2927) +++ branches/Cog/spursistasrc/vm/cointerp.c 2014-05-21 19:18:13 UTC (rev 2928) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.727 uuid: c4880b9d-5eff-44bc-8908-a6e831764659 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.730 uuid: 721dc8e5-985a-41a1-8e5d-09d9095df7d8 from - CoInterpreter VMMaker.oscog-eem.727 uuid: c4880b9d-5eff-44bc-8908-a6e831764659 + CoInterpreter VMMaker.oscog-eem.730 uuid: 721dc8e5-985a-41a1-8e5d-09d9095df7d8 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.727 uuid: c4880b9d-5eff-44bc-8908-a6e831764659 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.730 uuid: 721dc8e5-985a-41a1-8e5d-09d9095df7d8 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -747,6 +747,7 @@ static sqInt isContextNonImm(sqInt oop) NoDbgRegParms; static sqInt isContext(sqInt oop) NoDbgRegParms; static sqInt isEmptyObjStack(sqInt objStack) NoDbgRegParms; +static sqInt isEmptySegment(SpurSegmentInfo *seg) NoDbgRegParms; static sqInt isEnumerableObjectNoAssert(sqInt objOop) NoDbgRegParms; static sqInt isEnumerableObject(sqInt objOop) NoDbgRegParms; static sqInt isEphemeron(sqInt objOop) NoDbgRegParms; @@ -1318,7 +1319,7 @@ static void setSignalLowSpaceFlagAndSaveProcess(void); static void setTraceFlagOnContextsFramesPageIfNeeded(sqInt aContext) NoDbgRegParms; sqInt shiftForWord(void); -static usqInt shortentoIndexableSize(sqInt objOop, sqInt indexableSize) NoDbgRegParms; +static sqInt shortentoIndexableSize(sqInt objOop, sqInt indexableSize) NoDbgRegParms; static sqInt shortPrintContext(sqInt aContext) NoDbgRegParms; static sqInt shortPrintFrameAndCallers(char *theFP) NoDbgRegParms; EXPORT(void) shortPrintFramesInPage(StackPage *thePage); @@ -1448,16 +1449,16 @@ _iss char * stackBasePlus1; _iss sqInt hiddenRootsObj; _iss usqInt endOfMemory; +_iss SpurSegmentInfo * segments; _iss sqInt remapBufferCount; _iss sqInt trueObj; -_iss SpurSegmentInfo * segments; _iss sqInt falseObj; _iss sqInt needGCFlag; _iss sqInt traceLogIndex; _iss sqInt bytesPerPage; _iss sqInt totalFreeOldSpace; +_iss sqInt numSegments; _iss usqInt pastSpaceStart; -_iss sqInt numSegments; _iss char * stackLimit; _iss sqInt * freeLists; _iss usqInt scavengeThreshold; @@ -1487,18 +1488,18 @@ _iss SpurNewSpaceSpace eden; _iss sqInt profileSemaphore; _iss sqInt ephemeronList; +_iss usqInt freeOldSpaceStart; _iss sqInt profileProcess; _iss sqInt tenureThreshold; _iss sqInt extraRootCount; _iss sqInt invalidObjStackPage; _iss sqInt previousRememberedSetSize; _iss unsigned char * classTableBitmap; -_iss usqInt freeOldSpaceStart; +_iss sqInt growHeadroom; _iss sqInt longRunningPrimitiveCheckMethod; _iss sqInt profileMethod; _iss sqInt classTableIndex; _iss sqInt ephemeronQueue; -_iss sqInt growHeadroom; _iss sqInt lastMethodCacheProbeWrite; _iss sqInt lkupClass; _iss sqInt metaclassNumSlots; @@ -2214,7 +2215,7 @@ /* 574 */ (void (*)(void))0, /* 575 */ (void (*)(void))0, 0 }; -const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.727]"; +const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.730]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; @@ -26023,7 +26024,24 @@ && (0 == (longAt((objStack + (BaseHeaderSize)) + (ObjStackNextx << 2)))); } +static sqInt +isEmptySegment(SpurSegmentInfo *seg) +{ + sqInt address; + sqInt firstObj; + usqInt numSlots; + /* begin objectStartingAt: */ + address = (seg->segStart); + numSlots = byteAt(address + 7); + firstObj = (numSlots == 0xFF + ? address + (BaseHeaderSize) + : address); + return (((longAt(firstObj)) & 0x3FFFFF) == 0) + && ((addressAfter(firstObj)) == ((((seg->segSize)) + ((seg->segStart))) - (2 * (BaseHeaderSize)))); +} + + /* Answer if objOop should be included in an allObjects...Do: enumeration. This is for assert-checking only. */ @@ -32666,7 +32684,17 @@ static void postGCAction(sqInt gcModeArg) { DECL_MAYBE_SQ_GLOBAL_STRUCT + sqInt best; + usqInt currentEnd; + sqInt delta1; + SpurSegmentInfo *emptySeg; sqInt freeSizeNow; + sqInt i; + sqInt i1; + sqInt i2; + sqInt j; + SpurSegmentInfo *seg; + sqInt shrinkage; assert(gcModeArg == GIV(gcMode)); if ((gcModeArg == GCModeFull) @@ -32681,9 +32709,59 @@ /* Attempt to shrink memory after successfully reclaiming lots of memory */ /* begin shrinkObjectMemory: */ - print("shrinkObjectMemory: shouldBeImplemented"); - /* begin cr */ - printf("\n"); + shrinkage = freeSizeNow - GIV(growHeadroom); + while (1) { + /* begin findEmptySegNearestInSizeTo: */ + best = null; + delta1 = shrinkage; + for (i = 0; i < GIV(numSegments); i += 1) { + seg = (&(GIV(segments)[i])); + if (isEmptySegment(seg)) { + if (best == null) { + best = seg; + } + else { + if ((shrinkage >= (((seg->segSize)) * 0.75)) + && ((abs(((seg->segSize)) - shrinkage)) < delta1)) { + best = seg; + delta1 = abs(((seg->segSize)) - shrinkage); + } + } + } + } + emptySeg = ((sqInt) best); + if (!(emptySeg != null)) break; + shrinkage -= (emptySeg->segSize); + detachFreeObject(objectStartingAt((emptySeg->segStart))); + /* begin removeSegment: */ + /* begin indexOfSegment: */ + for (i1 = 0; i1 < GIV(numSegments); i1 += 1) { + if (((emptySeg->segStart)) == (((GIV(segments)[i1]).segStart))) { + i2 = i1; + goto l1; + } + } + error("segment not found"); + l1: /* end indexOfSegment: */; + assert(i2 > 0); + sqDeallocateMemorySegmentAtOfSize((emptySeg->segStart), (emptySeg->segSize)); + for (j = i2; j < GIV(numSegments); j += 1) { + GIV(segments)[j] = (GIV(segments)[j + 1]); + } + null; + GIV(numSegments) -= 1; + bridgeFromto((&(GIV(segments)[i2 - 1])), (i2 <= (GIV(numSegments) - 1) + ? (&(GIV(segments)[i2])) + : 0)); + /* begin setLastSegment: */ + currentEnd = (((((&(GIV(segments)[GIV(numSegments) - 1])))->segSize)) + ((((&(GIV(segments)[GIV(numSegments) - 1])))->segStart))) - (2 * (BaseHeaderSize)); + if (currentEnd <= GIV(endOfMemory)) { + GIV(endOfMemory) = currentEnd; + if (GIV(freeOldSpaceStart) > currentEnd) { + GIV(freeOldSpaceStart) = currentEnd; + } + } + } } } signalSemaphoreWithIndex(GIV(gcSemaphoreIndex)); @@ -32737,6 +32815,9 @@ GIV(totalFreeOldSpace) += bytes; } } + /* begin checkFreeSpace */ + assert(bitsSetInFreeSpaceMaskForAllFreeLists()); + assert(GIV(totalFreeOldSpace) == (totalFreeListBytes())); } @@ -56593,7 +56674,7 @@ zero if no change was possible. */ -static usqInt +static sqInt shortentoIndexableSize(sqInt objOop, sqInt indexableSize) { usqInt bytesAfter; @@ -57637,6 +57718,9 @@ assert(GIV(freeStart) == (((eden()).start))); fullGC(); prepareForSnapshot(); + /* begin checkFreeSpace */ + assert(bitsSetInFreeSpaceMaskForAllFreeLists()); + assert(GIV(totalFreeOldSpace) == (totalFreeListBytes())); activeContext = GIV(tempOop); GIV(tempOop) = 0; if (!GIV(primFailCode)) { Modified: branches/Cog/spursistasrc/vm/cointerp.h =================================================================== --- branches/Cog/spursistasrc/vm/cointerp.h 2014-05-20 22:55:52 UTC (rev 2927) +++ branches/Cog/spursistasrc/vm/cointerp.h 2014-05-21 19:18:13 UTC (rev 2928) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.727 uuid: c4880b9d-5eff-44bc-8908-a6e831764659 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.730 uuid: 721dc8e5-985a-41a1-8e5d-09d9095df7d8 */ Modified: branches/Cog/spursistasrc/vm/gcc3x-cointerp.c =================================================================== --- branches/Cog/spursistasrc/vm/gcc3x-cointerp.c 2014-05-20 22:55:52 UTC (rev 2927) +++ branches/Cog/spursistasrc/vm/gcc3x-cointerp.c 2014-05-21 19:18:13 UTC (rev 2928) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.727 uuid: c4880b9d-5eff-44bc-8908-a6e831764659 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.730 uuid: 721dc8e5-985a-41a1-8e5d-09d9095df7d8 from - CoInterpreter VMMaker.oscog-eem.727 uuid: c4880b9d-5eff-44bc-8908-a6e831764659 + CoInterpreter VMMaker.oscog-eem.730 uuid: 721dc8e5-985a-41a1-8e5d-09d9095df7d8 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.727 uuid: c4880b9d-5eff-44bc-8908-a6e831764659 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.730 uuid: 721dc8e5-985a-41a1-8e5d-09d9095df7d8 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -750,6 +750,7 @@ static sqInt isContextNonImm(sqInt oop) NoDbgRegParms; static sqInt isContext(sqInt oop) NoDbgRegParms; static sqInt isEmptyObjStack(sqInt objStack) NoDbgRegParms; +static sqInt isEmptySegment(SpurSegmentInfo *seg) NoDbgRegParms; static sqInt isEnumerableObjectNoAssert(sqInt objOop) NoDbgRegParms; static sqInt isEnumerableObject(sqInt objOop) NoDbgRegParms; static sqInt isEphemeron(sqInt objOop) NoDbgRegParms; @@ -1321,7 +1322,7 @@ static void setSignalLowSpaceFlagAndSaveProcess(void); static void setTraceFlagOnContextsFramesPageIfNeeded(sqInt aContext) NoDbgRegParms; sqInt shiftForWord(void); -static usqInt shortentoIndexableSize(sqInt objOop, sqInt indexableSize) NoDbgRegParms; +static sqInt shortentoIndexableSize(sqInt objOop, sqInt indexableSize) NoDbgRegParms; static sqInt shortPrintContext(sqInt aContext) NoDbgRegParms; static sqInt shortPrintFrameAndCallers(char *theFP) NoDbgRegParms; EXPORT(void) shortPrintFramesInPage(StackPage *thePage); @@ -1451,16 +1452,16 @@ _iss char * stackBasePlus1; _iss sqInt hiddenRootsObj; _iss usqInt endOfMemory; +_iss SpurSegmentInfo * segments; _iss sqInt remapBufferCount; _iss sqInt trueObj; -_iss SpurSegmentInfo * segments; _iss sqInt falseObj; _iss sqInt needGCFlag; _iss sqInt traceLogIndex; _iss sqInt bytesPerPage; _iss sqInt totalFreeOldSpace; +_iss sqInt numSegments; _iss usqInt pastSpaceStart; -_iss sqInt numSegments; _iss char * stackLimit; _iss sqInt * freeLists; _iss usqInt scavengeThreshold; @@ -1490,18 +1491,18 @@ _iss SpurNewSpaceSpace eden; _iss sqInt profileSemaphore; _iss sqInt ephemeronList; +_iss usqInt freeOldSpaceStart; _iss sqInt profileProcess; _iss sqInt tenureThreshold; _iss sqInt extraRootCount; _iss sqInt invalidObjStackPage; _iss sqInt previousRememberedSetSize; _iss unsigned char * classTableBitmap; -_iss usqInt freeOldSpaceStart; +_iss sqInt growHeadroom; _iss sqInt longRunningPrimitiveCheckMethod; _iss sqInt profileMethod; _iss sqInt classTableIndex; _iss sqInt ephemeronQueue; -_iss sqInt growHeadroom; _iss sqInt lastMethodCacheProbeWrite; _iss sqInt lkupClass; _iss sqInt metaclassNumSlots; @@ -2217,7 +2218,7 @@ /* 574 */ (void (*)(void))0, /* 575 */ (void (*)(void))0, 0 }; -const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.727]"; +const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.730]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; @@ -26032,7 +26033,24 @@ && (0 == (longAt((objStack + (BaseHeaderSize)) + (ObjStackNextx << 2)))); } +static sqInt +isEmptySegment(SpurSegmentInfo *seg) +{ + sqInt address; + sqInt firstObj; + usqInt numSlots; + /* begin objectStartingAt: */ + address = (seg->segStart); + numSlots = byteAt(address + 7); + firstObj = (numSlots == 0xFF + ? address + (BaseHeaderSize) + : address); + return (((longAt(firstObj)) & 0x3FFFFF) == 0) + && ((addressAfter(firstObj)) == ((((seg->segSize)) + ((seg->segStart))) - (2 * (BaseHeaderSize)))); +} + + /* Answer if objOop should be included in an allObjects...Do: enumeration. This is for assert-checking only. */ @@ -32675,7 +32693,17 @@ static void postGCAction(sqInt gcModeArg) { DECL_MAYBE_SQ_GLOBAL_STRUCT + sqInt best; + usqInt currentEnd; + sqInt delta1; + SpurSegmentInfo *emptySeg; sqInt freeSizeNow; + sqInt i; + sqInt i1; + sqInt i2; + sqInt j; + SpurSegmentInfo *seg; + sqInt shrinkage; assert(gcModeArg == GIV(gcMode)); if ((gcModeArg == GCModeFull) @@ -32690,9 +32718,59 @@ /* Attempt to shrink memory after successfully reclaiming lots of memory */ /* begin shrinkObjectMemory: */ - print("shrinkObjectMemory: shouldBeImplemented"); - /* begin cr */ - printf("\n"); + shrinkage = freeSizeNow - GIV(growHeadroom); + while (1) { + /* begin findEmptySegNearestInSizeTo: */ + best = null; + delta1 = shrinkage; + for (i = 0; i < GIV(numSegments); i += 1) { + seg = (&(GIV(segments)[i])); + if (isEmptySegment(seg)) { + if (best == null) { + best = seg; + } + else { + if ((shrinkage >= (((seg->segSize)) * 0.75)) + && ((abs(((seg->segSize)) - shrinkage)) < delta1)) { + best = seg; + delta1 = abs(((seg->segSize)) - shrinkage); + } + } + } + } + emptySeg = ((sqInt) best); + if (!(emptySeg != null)) break; + shrinkage -= (emptySeg->segSize); + detachFreeObject(objectStartingAt((emptySeg->segStart))); + /* begin removeSegment: */ + /* begin indexOfSegment: */ + for (i1 = 0; i1 < GIV(numSegments); i1 += 1) { + if (((emptySeg->segStart)) == (((GIV(segments)[i1]).segStart))) { + i2 = i1; + goto l1; + } + } + error("segment not found"); + l1: /* end indexOfSegment: */; + assert(i2 > 0); + sqDeallocateMemorySegmentAtOfSize((emptySeg->segStart), (emptySeg->segSize)); + for (j = i2; j < GIV(numSegments); j += 1) { + GIV(segments)[j] = (GIV(segments)[j + 1]); + } + null; + GIV(numSegments) -= 1; + bridgeFromto((&(GIV(segments)[i2 - 1])), (i2 <= (GIV(numSegments) - 1) + ? (&(GIV(segments)[i2])) + : 0)); + /* begin setLastSegment: */ + currentEnd = (((((&(GIV(segments)[GIV(numSegments) - 1])))->segSize)) + ((((&(GIV(segments)[GIV(numSegments) - 1])))->segStart))) - (2 * (BaseHeaderSize)); + if (currentEnd <= GIV(endOfMemory)) { + GIV(endOfMemory) = currentEnd; + if (GIV(freeOldSpaceStart) > currentEnd) { + GIV(freeOldSpaceStart) = currentEnd; + } + } + } } } signalSemaphoreWithIndex(GIV(gcSemaphoreIndex)); @@ -32746,6 +32824,9 @@ GIV(totalFreeOldSpace) += bytes; } } + /* begin checkFreeSpace */ + assert(bitsSetInFreeSpaceMaskForAllFreeLists()); + assert(GIV(totalFreeOldSpace) == (totalFreeListBytes())); } @@ -56602,7 +56683,7 @@ zero if no change was possible. */ -static usqInt +static sqInt shortentoIndexableSize(sqInt objOop, sqInt indexableSize) { usqInt bytesAfter; @@ -57646,6 +57727,9 @@ assert(GIV(freeStart) == (((eden()).start))); fullGC(); prepareForSnapshot(); + /* begin checkFreeSpace */ + assert(bitsSetInFreeSpaceMaskForAllFreeLists()); + assert(GIV(totalFreeOldSpace) == (totalFreeListBytes())); activeContext = GIV(tempOop); GIV(tempOop) = 0; if (!GIV(primFailCode)) { Modified: branches/Cog/spursistasrc/vm/interp.h =================================================================== --- branches/Cog/spursistasrc/vm/interp.h 2014-05-20 22:55:52 UTC (rev 2927) +++ branches/Cog/spursistasrc/vm/interp.h 2014-05-21 19:18:13 UTC (rev 2928) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.727 uuid: c4880b9d-5eff-44bc-8908-a6e831764659 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.730 uuid: 721dc8e5-985a-41a1-8e5d-09d9095df7d8 */ #define VM_PROXY_MAJOR 1 Modified: branches/Cog/spursistasrc/vm/vmCallback.h =================================================================== --- branches/Cog/spursistasrc/vm/vmCallback.h 2014-05-20 22:55:52 UTC (rev 2927) +++ branches/Cog/spursistasrc/vm/vmCallback.h 2014-05-21 19:18:13 UTC (rev 2928) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.727 uuid: c4880b9d-5eff-44bc-8908-a6e831764659 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.730 uuid: 721dc8e5-985a-41a1-8e5d-09d9095df7d8 */ #define VM_CALLBACK_INC 1 Modified: branches/Cog/spursrc/vm/cointerp.c =================================================================== --- branches/Cog/spursrc/vm/cointerp.c 2014-05-20 22:55:52 UTC (rev 2927) +++ branches/Cog/spursrc/vm/cointerp.c 2014-05-21 19:18:13 UTC (rev 2928) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.727 uuid: c4880b9d-5eff-44bc-8908-a6e831764659 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.730 uuid: 721dc8e5-985a-41a1-8e5d-09d9095df7d8 from - CoInterpreter VMMaker.oscog-eem.727 uuid: c4880b9d-5eff-44bc-8908-a6e831764659 + CoInterpreter VMMaker.oscog-eem.730 uuid: 721dc8e5-985a-41a1-8e5d-09d9095df7d8 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.727 uuid: c4880b9d-5eff-44bc-8908-a6e831764659 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.730 uuid: 721dc8e5-985a-41a1-8e5d-09d9095df7d8 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -745,6 +745,7 @@ static sqInt isContextNonImm(sqInt oop) NoDbgRegParms; static sqInt isContext(sqInt oop) NoDbgRegParms; static sqInt isEmptyObjStack(sqInt objStack) NoDbgRegParms; +static sqInt isEmptySegment(SpurSegmentInfo *seg) NoDbgRegParms; static sqInt isEnumerableObjectNoAssert(sqInt objOop) NoDbgRegParms; @@ Diff output truncated at 50000 characters. @@

1 0

← Newer
1
2
3
4
5
6
7
8
...
16
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

Vm-dev May 2014