Vm-dev May 2014

vm-dev@lists.squeakfoundation.org

32 participants
151 discussions

Progress report on CMakeVMMaker for Squeak
by gettimothy 11 May '14

11 May '14

Hi All. My work plan is to get a StackInterpreter running on Linux32 then Cog then the various permutations of Cog (MT, etc) I took a lazy day getting sources generated for SqueakStackVM and will be working on the 'generate' thing tomorrow. Hopefully I have some CMakeLists.text in place tomorrow. SqueakStackVMBuilder>>buildUnix32 SqueakStackUnixConfig new " internalPlugins: CMakePluginsArrayFactory minimalInternalPlugins;" internalPlugins: CMakePluginsArrayFactory unix32DefaultInternalPlugins; externalPlugins: CMakePluginsArrayFactory unix32DefaultExternalPlugins; generateSources; <---------GOT THROUGH HERE TODAY. generate. <---------I AM HERE TOMORROW. Cheers, tty

1 0

CMakeVMMaker source tree cleanup
by gettimothy 11 May '14

11 May '14

Howdy all. I do not see existing functionality in CMakeVMMaker or PharoVMMaker to clean out the generated sources. VMaker deleteEntireGeneratedTree "remove all the files - all of them I say" self sourceDirectory recursiveDelete Exists, but is not referenced from anyware but VMMakerTool. How is the pharo team handling that? Are you exiting Smalltalk and using a git command to revert? thx. tty

1 0

VM Maker: Cog-eem.152.mcz
by commits＠source.squeak.org 11 May '14

11 May '14

Eliot Miranda uploaded a new version of Cog to project VM Maker: http://source.squeak.org/VMMaker/Cog-eem.152.mcz ==================== Summary ==================== Name: Cog-eem.152 Author: eem Time: 11 May 2014, 11:06:26.811 am UUID: cd23f13c-9e56-43d9-8100-635ef254a1b8 Ancestors: Cog-eem.151 Make the update non-interactive if repositories are already available. [ that :-) in the last commit should have been a :-( ] =============== Diff against Cog-eem.151 =============== Item was changed: ----- Method: SpurBootstrapMonticelloPackagePatcher>>download:from: (in category 'repository population') ----- + download: baseConfigurationOrArray "<MCConfiguration|Array>" from: repo + | base | + base := baseConfigurationOrArray isArray + ifTrue: [MCConfiguration fromArray: baseConfigurationOrArray] + ifFalse: [baseConfigurationOrArray]. - download: base from: repo self packagesAndPatches keysAndValuesDo: [:package :patches| | dependency | dependency := base dependencies detect: [:dep| dep package name = package name]. self downloadToSourceDirAllPackageVersionsStartingWith: dependency versionInfo from: repo].! Item was changed: ----- Method: SpurBootstrapMonticelloPackagePatcher>>spur (in category 'repository population') ----- spur + | url | + url := 'http://source.squeak.org/spur'. + ^MCRepositoryGroup default repositories + detect: [:r| r description = url] + ifNone: + [MCHttpRepository fillInTheBlankConfigure: + (MCHttpRepository + creationTemplateLocation: url + user: 'user with write permission' + password: 'password')]! - ^MCHttpRepository fillInTheBlankConfigure: - (MCHttpRepository - creationTemplateLocation: 'http://source.squeak.org/spur' - user: 'user with write permission' - password: 'password')! Item was changed: ----- Method: SpurBootstrapMonticelloPackagePatcher>>trunk (in category 'repository population') ----- trunk + | url | + url := 'http://source.squeak.org/trunk'. + ^MCRepositoryGroup default repositories + detect: [:r| r description = url] + ifNone: [MCHttpRepository + location: url + user: 'squeak' + password: 'squeak']! - ^MCHttpRepository - location: 'http://source.squeak.org/trunk' - user: 'squeak' - password: 'squeak'! Item was changed: ----- Method: SpurBootstrapMonticelloPackagePatcher>>updateSpurRepository (in category 'repository population') ----- updateSpurRepository "self new from: 'trunkpackages' to: 'spurpackages'; updateSpurRepository" + "AndreasSystemProfiler spyOn: [self new from: 'trunkpackages' to: 'spurpackages'; updateSpurRepository]" - | base | - base := MCConfiguration fromArray: self class squeak45baseline. sourceDir assureExistence. + self download: self class squeak45baseline from: self trunk. - self download: base from: self trunk. destDir assureExistence. self patchAsNeeded. + self uploadFrom: (MCDirectoryRepository directory: destDir) to: self spur! - self uploadTo: self spur! Item was added: + ----- Method: SpurBootstrapMonticelloPackagePatcher>>uploadFrom:to: (in category 'repository population') ----- + uploadFrom: localRepo to: uploadRepository + localRepo allVersionsDo: + [:version| + (uploadRepository includesVersionNamed: version info name) ifFalse: + [uploadRepository storeVersion: version]]! Item was removed: - ----- Method: SpurBootstrapMonticelloPackagePatcher>>uploadTo: (in category 'repository population') ----- - uploadTo: uploadRepository - | localRepo | - localRepo := MCDirectoryRepository directory: destDir. - localRepo allVersionsDo: - [:version| - (uploadRepository includesVersionNamed: version info name) ifFalse: - [uploadRepository storeVersion: version]]!

1 0

VM Maker: Cog-eem.151.mcz
by commits＠source.squeak.org 11 May '14

11 May '14

Eliot Miranda uploaded a new version of Cog to project VM Maker: http://source.squeak.org/VMMaker/Cog-eem.151.mcz ==================== Summary ==================== Name: Cog-eem.151 Author: eem Time: 11 May 2014, 10:40:04.198 am UUID: 6c18d184-ed3e-4167-80ba-8b44d09c5dd3 Ancestors: Cog-eem.150 Make the update of the spur repository sort-of incremental. It's still interactive :-) and it's not fast. But it does avoid downloading and/or patching already patched packages. =============== Diff against Cog-eem.150 =============== Item was added: + ----- Method: SpurBootstrapMonticelloPackagePatcher>>patchAsNeeded (in category 'patching') ----- + patchAsNeeded + (sourceDir exists and: [destDir exists]) ifFalse: + [self error: 'one or both of the directories don''t exist']. + self packagesAndPatches keysAndValuesDo: + [:package :patches| + (self filesForPackage: package in: sourceDir) do: + [:packageFile| + (destDir includesKey: packageFile) ifFalse: + [self patchPackage: packageFile with: patches for: package]]]! Item was removed: - ----- Method: SpurBootstrapMonticelloPackagePatcher>>populateSpurRepository (in category 'repository population') ----- - populateSpurRepository - "self new from: 'trunkpackages' to: 'spurpackages'; populateSpurRepository" - | base | - base := MCConfiguration fromArray: self class squeak45baseline. - sourceDir assureExistence. - self download: base from: self trunk. - destDir assureExistence. - self patch. - self uploadTo: self spur! Item was added: + ----- Method: SpurBootstrapMonticelloPackagePatcher>>updateSpurRepository (in category 'repository population') ----- + updateSpurRepository + "self new from: 'trunkpackages' to: 'spurpackages'; updateSpurRepository" + | base | + base := MCConfiguration fromArray: self class squeak45baseline. + sourceDir assureExistence. + self download: base from: self trunk. + destDir assureExistence. + self patchAsNeeded. + self uploadTo: self spur!

1 0

bug on windows ioShowDisplay for bitdepth 16/8/4 (big endian)
by Nicolai Hess 11 May '14

11 May '14

There is still something wrong with byte/word swap in windows ioShowDisplay code attached are two screenshots squeak 4.5 image with cogvm from http://files.pharo.org/vm/cogmt/win/ pharo 30793 image with latest vm from http://files.pharo.org/vm/pharo/win/ showing this bug after setting the Display depth to 16 (Display newDepth:16) sqwin32window.c has three variants for doing the byte_swap/word_swap on bitdepths with big endian to convert to lsb This one is active and causes this error. # if __GNUC__ >= 3 # define BYTE_SWAP(w) __asm__("bswap %0" : "=r" (w) : "r" (w)) # define WORD_SWAP(w) __asm__("roll $16, %0" : "=r" (w) : "r" (w)) This one would work # else # define BYTE_SWAP(w) __asm__("bswap %%eax" : "=eax" (w) : "eax" (w)) # define WORD_SWAP(w) __asm__("roll $16, %%eax" : "=eax" (w) : "eax" (w)) This one, of course, works too # else # define BYTE_SWAP(w) w = (w << 24) | ((w & 0xFF00) << 8) | ((w >> 8) & 0xFF00) | (w >> 24) # define WORD_SWAP(w) w = (( (unsigned)(w) << 16) | ((unsigned) (w) >> 16)) This one is not there but would work (at least with gcc > 4.5 # define BYTE_SWAP_MY(w) __asm__("bswap %0" : "+r" (w)) # define WORD_SWAP_MY(w) __asm__("roll $16, %0" : "+r" (w)) But actually I don't know assembler and/or the gcc inline code syntax, so I don't know what is wrong with the first version :) Nicolai btw, you can not test this bug with the current squeak 4.5 all in on image, as it uses a rather old vm. Third screenshot: using the latest stable pharo-vm, it looks much more wrong, as there was another(?) bug that is fixed already(?) - i don't know :)

4 8

[commit][2921] Fix bug on windows ioShowDisplay for bitdepth 16/8/4 ( big endian)
by commits＠squeakvm.org 11 May '14

11 May '14

Revision: 2921 Author: lewis Date: 2014-05-11 09:05:51 -0700 (Sun, 11 May 2014) Log Message: ----------- Fix bug on windows ioShowDisplay for bitdepth 16/8/4 (big endian) Fix by Nicolai Hess. Added to oscog branch by Eliot Miranda. Merge update from oscog to trunk. Fix and discussion on vm-dev: http://lists.squeakfoundation.org/pipermail/vm-dev/2014-May/015331.html Updated in oscog branch in SVN commit 2919: http://lists.squeakfoundation.org/pipermail/vm-dev/2014-May/015334.html Modified Paths: -------------- trunk/platforms/win32/vm/sqWin32Window.c Modified: trunk/platforms/win32/vm/sqWin32Window.c =================================================================== --- trunk/platforms/win32/vm/sqWin32Window.c 2014-05-10 15:56:23 UTC (rev 2920) +++ trunk/platforms/win32/vm/sqWin32Window.c 2014-05-11 16:05:51 UTC (rev 2921) @@ -1710,14 +1710,14 @@ # define BYTE_SWAP(w) w # define WORD_SWAP(w) w #else /* LSB_FIRST */ -# if defined(__GNUC__) && defined(_X86_) +# if defined(__GNUC__) && (defined(_X86_) || defined(i386) || defined(__i386) || defined(__i386__)) /* GCC generates *optimal* code with a little help */ -# define BYTE_SWAP(w) __asm__("bswap %%eax" : "=eax" (w) : "eax" (w)) -# define WORD_SWAP(w) __asm__("roll $16, %%eax" : "=eax" (w) : "eax" (w)) +# define BYTE_SWAP(w) __asm__("bswap %0" : "+r" (w)) +# define WORD_SWAP(w) __asm__("roll $16, %0" : "+r" (w)) # define SRC_PIX_REG asm("%esi") # define DST_PIX_REG asm("%edi") -# else /* Not GCC?! Well, it's your own fault */ -# define BYTE_SWAP(w) w = (w << 24) | ((w & 0xFF00) << 8) | ((w >> 8) & 0xFF00) | (w >> 24) +# else /* Not GCC?! Well, it's your own fault ;-) */ +# define BYTE_SWAP(w) w = (w<<24) | ((w&0xFF00)<<8) | ((w>>8)&0xFF00) | (w>>24) # define WORD_SWAP(w) w = (( (unsigned)(w) << 16) | ((unsigned) (w) >> 16)) # endif /* __GNUC__ */ #endif /* MSB_FIRST */

1 0

VM Maker: Cog-eem.150.mcz
by commits＠source.squeak.org 11 May '14

11 May '14

Eliot Miranda uploaded a new version of Cog to project VM Maker: http://source.squeak.org/VMMaker/Cog-eem.150.mcz ==================== Summary ==================== Name: Cog-eem.150 Author: eem Time: 10 May 2014, 3:14:47.788 pm UUID: aaaabefb-49ee-415d-8fc7-7079819c7ff3 Ancestors: Cog-eem.149 Implement the upload side and correct the spur template (!!). =============== Diff against Cog-eem.149 =============== Item was changed: ----- Method: SpurBootstrapMonticelloPackagePatcher>>spur (in category 'repository population') ----- spur ^MCHttpRepository fillInTheBlankConfigure: (MCHttpRepository + creationTemplateLocation: 'http://source.squeak.org/spur' - creationTemplateLocation: 'http://source.squeak.org/trunk' user: 'user with write permission' password: 'password')! Item was added: + ----- Method: SpurBootstrapMonticelloPackagePatcher>>uploadTo: (in category 'repository population') ----- + uploadTo: uploadRepository + | localRepo | + localRepo := MCDirectoryRepository directory: destDir. + localRepo allVersionsDo: + [:version| + (uploadRepository includesVersionNamed: version info name) ifFalse: + [uploadRepository storeVersion: version]]!

1 0

VM Maker: Cog-eem.149.mcz
by commits＠source.squeak.org 10 May '14

10 May '14

Eliot Miranda uploaded a new version of Cog to project VM Maker: http://source.squeak.org/VMMaker/Cog-eem.149.mcz ==================== Summary ==================== Name: Cog-eem.149 Author: eem Time: 10 May 2014, 2:55:17.317 pm UUID: 9adb4975-1eb3-4453-bb58-dc25ee214224 Ancestors: Cog-eem.148 Implement the download and patch thirds of the triple to download trunk Collections, Kernel & System packages, patch, and upload to spur. =============== Diff against Cog-eem.148 =============== Item was added: + ----- Method: SpurBootstrapMonticelloPackagePatcher class>>squeak45baseline (in category 'baselines') ----- + squeak45baseline + "The base Squeak-4.5-13680 package set." + ^#( name 'base-Squeak45-eem' + repository ('http://source.squeak.org/squeak45') + dependency ('Squeak-Version' 'Squeak-Version-ar.4662' '6bfece28-65a4-b147-9462-417b2e86acd0') + dependency ('311Deprecated' '311Deprecated-nice.2' '6df45c33-740a-fc4f-b3d0-45412ad7d284') + dependency ('39Deprecated' '39Deprecated-ar.19' '8da20c38-7d28-3241-9f29-da261d6f9bfe') + dependency ('45Deprecated' '45Deprecated-fbs.24' '4033c169-94c6-7741-9aee-5a7570a7ec7a') + dependency ('Balloon' 'Balloon-nice.24' '97e2ed51-707d-4da1-ab4f-35add3deee5e') + dependency ('Network' 'Network-nice.150' 'c844e5ea-c919-44fc-905e-69487b035947') + dependency ('Compression' 'Compression-fbs.40' '82b0d6e4-0239-1241-968c-461a785fb6a7') + dependency ('Graphics' 'Graphics-nice.289' 'e809bcbf-53e1-420b-846a-9e86e0dd1f06') + dependency ('Multilingual' 'Multilingual-fbs.194' '07f4a7b5-7169-3345-85fc-5a8ba04e5323') + dependency ('CollectionsTests' 'CollectionsTests-dtl.214' 'cf157d3a-2d71-46f3-86ce-450ee24e8d27') + dependency ('PackageInfo-Base' 'PackageInfo-Base-nice.68' 'b6669527-9a35-4783-a64f-8f2af97e330b') + dependency ('Compiler' 'Compiler-nice.279' '94b1b5f8-f71b-4425-b035-461d3dc94e3f') + dependency ('Environments' 'Environments-ul.46' 'cfd9e7f7-6a4b-400e-b9c7-9c6239da4752') + dependency ('Kernel' 'Kernel-dtl.836' '410e695f-7f23-43e4-9dc2-d292b9954f0d') + dependency ('MonticelloConfigurations' 'MonticelloConfigurations-fbs.123' 'b9735d10-7cf4-a746-8a64-b50fa9cf273f') + dependency ('Tools' 'Tools-cmm.519' 'dae6bdb9-8b54-491a-a2a4-0b114f02e10d') + dependency ('MorphicExtras' 'MorphicExtras-tpr.147' 'e76a71a5-6be9-4420-b71a-2c92d900c476') + dependency ('Files' 'Files-dtl.130' '8ee82071-69f7-446d-8ed7-77eafc838f03') + dependency ('System' 'System-dtl.666' '098b856a-ecc5-498a-bceb-ef3457d3511e') + dependency ('Collections' 'Collections-ul.564' '4b9a37ef-df86-40a0-a0dd-8e8b2c04d4ed') + dependency ('Monticello' 'Monticello-cmm.586' 'a4dbd656-e50a-47ba-8661-44f8c87bb3e0') + dependency ('EToys' 'EToys-cmm.117' 'c3e71dbe-17af-4b71-ad9c-c0bb2a2bc193') + dependency ('Exceptions' 'Exceptions-cmm.49' '6cede9fe-b13d-481a-b8de-bb004ece1145') + dependency ('FlexibleVocabularies' 'FlexibleVocabularies-bf.13' '55c72a72-619e-4a81-831f-303600bbd792') + dependency ('GraphicsTests' 'GraphicsTests-fbs.38' '081189cc-a44f-fa4e-965e-25438280ea93') + dependency ('Installer-Core' 'Installer-Core-cmm.392' '7cb5c040-6f68-479d-bc9e-0b264b172443') + dependency ('KernelTests' 'KernelTests-nice.259' '0f7301b0-612c-49d8-936f-775995b35e0f') + dependency ('GetText' 'GetText-nice.34' '4d432f8e-55be-428a-9138-63dd1738035e') + dependency ('Sound' 'Sound-nice.38' 'b626daf0-be23-4fb8-b2d5-04b9cd370539') + dependency ('ToolBuilder-Tests' 'ToolBuilder-Tests-cmm.1' 'e77685b9-ca09-40c0-b84e-6caee75f4075') + dependency ('Morphic' 'Morphic-cmm.720' 'e5e81c18-990b-4e35-b325-adb032b8418d') + dependency ('MorphicTests' 'MorphicTests-nice.24' 'e33a9ad3-2f39-4c19-a3a7-dc87f18177fc') + dependency ('MorphicExtrasTests' 'MorphicExtrasTests-fbs.3' '1c039763-bc92-834c-943e-d96d8820cbd7') + dependency ('MultilingualTests' 'MultilingualTests-fbs.18' '07e26018-8455-3349-9b44-9ecb4aaeefb2') + dependency ('Nebraska' 'Nebraska-nice.36' 'cc80dca4-ed72-4c39-952c-3b37886100de') + dependency ('NetworkTests' 'NetworkTests-fbs.37' '97699685-5826-fe47-af98-356971abf2fb') + dependency ('PreferenceBrowser' 'PreferenceBrowser-fbs.49' '72d30dfa-0ff5-4347-9823-eb77ae236f8f') + dependency ('Protocols' 'Protocols-nice.46' '15b63671-d541-4c1d-9ff5-72da4fc5bfe9') + dependency ('SMBase' 'SMBase-nice.132' 'a70c8bd2-3eee-4e21-b9c6-113f6b194527') + dependency ('SMLoader' 'SMLoader-fbs.79' '9f7d983e-d958-4115-94aa-21302f89ad8b') + dependency ('ST80' 'ST80-cmm.172' '47b2f84a-6951-480b-88f2-b2726dba08bd') + dependency ('ST80Tests' 'ST80Tests-nice.2' '7ee5426b-73f1-48ac-8ec4-3943dc452cb6') + dependency ('ST80Tools' 'ST80Tools-fbs.1' '108ec7bc-d1f5-dd4b-9511-e7a653a71e9f') + dependency ('SUnit' 'SUnit-fbs.99' 'a5be81dd-6e9f-8d41-a091-3c6c27a28abe') + dependency ('SUnitGUI' 'SUnitGUI-fbs.59' '0bfcf308-0d02-a749-9930-6229492cca48') + dependency ('ScriptLoader' 'ScriptLoader-cmm.338' 'adb79117-0915-40a5-a5ee-c766e4b50d42') + dependency ('Services-Base' 'Services-Base-topa.51' '94328e86-1643-4090-8f18-bc4467119161') + dependency ('SmallLand-ColorTheme' 'SmallLand-ColorTheme-fbs.6' 'a78b81e3-3b11-c24e-9c84-3bb5319e0858') + dependency ('SystemChangeNotification-Tests' 'SystemChangeNotification-Tests-nice.23' '3eed6d26-4aef-4095-a604-d9f914240281') + dependency ('Tests' 'Tests-cmm.290' 'f3fccfae-6baf-4093-ba62-e15ef110a687') + dependency ('ToolBuilder-Kernel' 'ToolBuilder-Kernel-nice.60' '86949a07-725b-4a27-a7cd-a827c74f48be') + dependency ('ToolBuilder-MVC' 'ToolBuilder-MVC-fbs.34' 'aded987d-5cd5-6f41-9635-1d38da947ddf') + dependency ('ToolBuilder-Morphic' 'ToolBuilder-Morphic-fbs.91' 'abaa076b-af43-af42-8c98-7a71482c6a30') + dependency ('ToolBuilder-SUnit' 'ToolBuilder-SUnit-fbs.19' '3e30756c-2af8-0741-836f-0d42a9d5af32') + dependency ('ToolsTests' 'ToolsTests-cmm.68' '98c1608a-6cb3-4a03-a28a-dd101e6c876b') + dependency ('MonticelloForTraits' 'MonticelloForTraits-fbs.1' '160be615-5ab7-4148-a7cb-60dd629ab085') + dependency ('Traits' 'Traits-topa.302' '58712f55-3f3f-467e-ac0e-e118c9737c53') + dependency ('TraitsTests' 'TraitsTests-fbs.13' '0429146f-6767-4a4f-8fce-37571625920a') + dependency ('TrueType' 'TrueType-nice.28' '42a74f04-e193-455b-a2c1-14ec51724234') + dependency ('Universes' 'Universes-nice.46' '805eb73f-391b-4e3f-aef9-64add79e4e8c') + dependency ('VersionNumber' 'VersionNumber-cmm.4' '68fb1f05-d3e2-4c9b-9234-20a9bed166dc') + dependency ('XML-Parser' 'XML-Parser-fbs.36' 'a2d9791a-c341-564b-9b57-a0fe9f42b66f') + dependency ('ReleaseBuilder' 'ReleaseBuilder-cmm.114' 'ea773780-69e1-48dd-a16c-e167acb9de04') + dependency ('ShoutCore' 'ShoutCore-cwp.40' '81b3e230-2e8a-42c5-9521-e54338fadb6f') + dependency ('VersionNumberTests' 'VersionNumberTests-fbs.4' '953a944c-9648-dd4b-898e-9e10e0507b91') + dependency ('HelpSystem-Core' 'HelpSystem-Core-ul.56' '6d8a0d54-5f60-da45-8c3c-d42ea8abd999') + dependency ('HelpSystem-Tests' 'HelpSystem-Tests-fbs.15' '8927a848-29a0-f54c-8c79-efb8070c4702') + dependency ('Help-Squeak-Project' 'Help-Squeak-Project-kfr.10' 'b86eb622-cc53-634d-aa65-aed2c86263f9') + dependency ('Help-Squeak-TerseGuide' 'Help-Squeak-TerseGuide-dtl.2' '8b18cab9-7183-4c5e-8cac-f79c4400da43') + dependency ('SystemReporter' 'SystemReporter-ul.21' '34c5c48c-e7cc-4dfe-8133-6dec3bc63ff7') + dependency ('BalloonTests' 'BalloonTests-egp.2' 'a8206c39-12ee-4222-a29a-caa537e037c4') + dependency ('CommandLine' 'CommandLine-fbs.2' '414e59b8-4f4a-814d-9dac-b7b9886e92a0') + dependency ('UpdateStream' 'UpdateStream-nice.4' '5fcdedce-88aa-469a-bf8b-32820f051c4f') + )! Item was added: + ----- Method: SpurBootstrapMonticelloPackagePatcher>>directoryFrom: (in category 'initialization') ----- + directoryFrom: dirName + ^FileDirectory on: (dirName first = $/ + ifTrue: [dirName] + ifFalse: [(FileDirectory default directoryNamed: dirName) fullName])! Item was added: + ----- Method: SpurBootstrapMonticelloPackagePatcher>>download:from: (in category 'repository population') ----- + download: base from: repo + self packagesAndPatches keysAndValuesDo: + [:package :patches| | dependency | + dependency := base dependencies detect: [:dep| dep package name = package name]. + self downloadToSourceDirAllPackageVersionsStartingWith: dependency versionInfo + from: repo].! Item was added: + ----- Method: SpurBootstrapMonticelloPackagePatcher>>downloadToSourceDirAllPackageVersionsStartingWith:from: (in category 'repository population') ----- + downloadToSourceDirAllPackageVersionsStartingWith: aMCVersionInfo from: repo + | localRepo priorName | + priorName := MCVersionName on: (aMCVersionInfo versionName + copyReplaceAll: aMCVersionInfo versionNumber asString + with: (aMCVersionInfo versionNumber - 1) asString). + localRepo := MCDirectoryRepository directory: sourceDir. + (repo possiblyNewerVersionsOfAnyOf: {priorName asMCVersionName}) do: + [:newerVersion | + (localRepo includesVersionNamed: newerVersion) ifFalse: + [localRepo storeVersion: (repo versionNamed: newerVersion)]]! Item was changed: ----- Method: SpurBootstrapMonticelloPackagePatcher>>from:to: (in category 'initialization') ----- from: sourceDirName to: destDirName + sourceDir := self directoryFrom: sourceDirName. + destDir := self directoryFrom: destDirName! - sourceDir := FileDirectory on: sourceDirName. - destDir := FileDirectory on: destDirName! Item was added: + ----- Method: SpurBootstrapMonticelloPackagePatcher>>populateSpurRepository (in category 'repository population') ----- + populateSpurRepository + "self new from: 'trunkpackages' to: 'spurpackages'; populateSpurRepository" + | base | + base := MCConfiguration fromArray: self class squeak45baseline. + sourceDir assureExistence. + self download: base from: self trunk. + destDir assureExistence. + self patch. + self uploadTo: self spur! Item was added: + ----- Method: SpurBootstrapMonticelloPackagePatcher>>spur (in category 'repository population') ----- + spur + ^MCHttpRepository fillInTheBlankConfigure: + (MCHttpRepository + creationTemplateLocation: 'http://source.squeak.org/trunk' + user: 'user with write permission' + password: 'password')! Item was added: + ----- Method: SpurBootstrapMonticelloPackagePatcher>>trunk (in category 'repository population') ----- + trunk + ^MCHttpRepository + location: 'http://source.squeak.org/trunk' + user: 'squeak' + password: 'squeak'!

1 0

preferred methodology for handling Pharo'isms on Squeak?
by gettimothy 10 May '14

10 May '14

Hi All. Is there a preferred methodology for handling Pharo-isms on Squeak? I know Seaside has Grease which does some of that, but I don't thing we want Grease for CMakeVMMaker (or do we). Specifically, the Pharo team has abstracted out some stuff in SmalltalkImage (vm, platform..) that does not exist in Squeak. If there is an existing mechanism for bridging this gap, I will use it. In the meantime, I will be DTSTTCW. cordially, tty

4 7

[commit][2920] CogVM source as per VMMaker.oscog-eem.715
by commits＠squeakvm.org 10 May '14

10 May '14

Revision: 2920 Author: eliot Date: 2014-05-10 08:56:23 -0700 (Sat, 10 May 2014) Log Message: ----------- CogVM source as per VMMaker.oscog-eem.715 Get rid of the stupid validate macro hack. Fix the regression introduced by VMMaker.oscog-eem.709. When "adding" a method marked <doNotImplement> make sure that any inherited version of the method is removed. The old code also removed methods that weren't inherited. Modified Paths: -------------- branches/Cog/nscogsrc/vm/cointerp.c branches/Cog/nscogsrc/vm/cointerp.h branches/Cog/nscogsrc/vm/gcc3x-cointerp.c branches/Cog/nscogsrc/vm/interp.h branches/Cog/nscogsrc/vm/vmCallback.h branches/Cog/sistasrc/vm/cointerp.c branches/Cog/sistasrc/vm/cointerp.h branches/Cog/sistasrc/vm/gcc3x-cointerp.c branches/Cog/sistasrc/vm/interp.h branches/Cog/sistasrc/vm/vmCallback.h branches/Cog/src/vm/cointerp.c branches/Cog/src/vm/cointerp.h branches/Cog/src/vm/cointerpmt.c branches/Cog/src/vm/cointerpmt.h branches/Cog/src/vm/gcc3x-cointerp.c branches/Cog/src/vm/gcc3x-cointerpmt.c branches/Cog/src/vm/interp.h branches/Cog/src/vm/vmCallback.h branches/Cog/stacksrc/vm/gcc3x-interp.c branches/Cog/stacksrc/vm/interp.c branches/Cog/stacksrc/vm/interp.h branches/Cog/stacksrc/vm/vmCallback.h Property Changed: ---------------- branches/Cog/platforms/Cross/vm/sqSCCSVersion.h Modified: branches/Cog/nscogsrc/vm/cointerp.c =================================================================== --- branches/Cog/nscogsrc/vm/cointerp.c 2014-05-10 15:08:04 UTC (rev 2919) +++ branches/Cog/nscogsrc/vm/cointerp.c 2014-05-10 15:56:23 UTC (rev 2920) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.712 uuid: 2f12e8dd-7da6-4358-9eb4-ba4782b7206d + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.715 uuid: 113af7b7-74d5-4593-b954-b54dd3ee4850 from - CoInterpreter VMMaker.oscog-eem.712 uuid: 2f12e8dd-7da6-4358-9eb4-ba4782b7206d + CoInterpreter VMMaker.oscog-eem.715 uuid: 113af7b7-74d5-4593-b954-b54dd3ee4850 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.712 uuid: 2f12e8dd-7da6-4358-9eb4-ba4782b7206d " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.715 uuid: 113af7b7-74d5-4593-b954-b54dd3ee4850 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -1157,7 +1157,7 @@ static void rewriteMethodCacheEntryForExternalPrimitiveToFunction(void (*localPrimAddress)(void)); static sqInt roomToPushNArgs(sqInt n); static void runLeakCheckerForFullGC(sqInt fullGCFlag); -static sqInt safeObjectAfter(sqInt oop); +static usqInt safeObjectAfter(sqInt oop); static sqInt safePrintStringOf(sqInt oop); usqInt scavengeThresholdAddress(void); EXPORT(sqInt) sendInvokeCallbackContext(VMCallbackContext *vmCallbackContext); @@ -2045,7 +2045,7 @@ /* 574 */ (void (*)(void))0, /* 575 */ (void (*)(void))0, 0 }; -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.712"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.715"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; @@ -24003,17 +24003,15 @@ sqInt header1; sqInt header2; sqInt header3; - sqInt header4; usqInt lastWord; sqInt newFreeChunk; sqInt newOop; - sqInt next; + usqInt next; sqInt oop; sqInt realHeader; sqInt sz; sqInt sz1; sqInt sz2; - sqInt sz3; sqInt target; usqInt w; @@ -24024,21 +24022,7 @@ /* begin objectAfterWhileForwarding: */ header2 = longAt(oop); if ((header2 & MarkBit) == 0) { - /* begin objectAfter: */ - if (!(asserta(oopisLessThan(oop, GIV(freeStart))))) { - error("no objects after the end of memory"); - } - if (((longAt(oop)) & TypeMask) == HeaderTypeFree) { - sz2 = (longAt(oop)) & AllButTypeMask; - } - else { - /* begin sizeBitsOf: */ - header3 = longAt(oop); - sz2 = ((header3 & TypeMask) == HeaderTypeSizeAndClass - ? (longAt(oop - (BytesPerWord * 2))) & LongSizeMask - : header3 & SizeMask); - } - next = (oop + sz2) + (headerTypeBytes[(longAt(oop + sz2)) & TypeMask]); + next = ((sqInt) (objectAfter(oop))); goto l1; } fwdBlock1 = (header2 & AllButMarkBitAndTypeMask) << 1; @@ -24053,7 +24037,7 @@ else { sz1 = realHeader & SizeMask; } - next = (oop + sz1) + (headerTypeBytes[(longAt(oop + sz1)) & TypeMask]); + next = ((sqInt) ((oop + sz1) + (headerTypeBytes[(longAt(oop + sz1)) & TypeMask]))); l1: /* end objectAfterWhileForwarding: */; if (!(((longAt(oop)) & TypeMask) == HeaderTypeFree)) { @@ -24107,18 +24091,18 @@ } /* begin safeObjectAfter: */ if (((longAt(newFreeChunk)) & TypeMask) == HeaderTypeFree) { - sz3 = (longAt(newFreeChunk)) & AllButTypeMask; + sz2 = (longAt(newFreeChunk)) & AllButTypeMask; } else { /* begin sizeBitsOf: */ - header4 = longAt(newFreeChunk); - sz3 = ((header4 & TypeMask) == HeaderTypeSizeAndClass + header3 = longAt(newFreeChunk); + sz2 = ((header3 & TypeMask) == HeaderTypeSizeAndClass ? (longAt(newFreeChunk - (BytesPerWord * 2))) & LongSizeMask - : header4 & SizeMask); + : header3 & SizeMask); } - next = ((newFreeChunk + sz3) >= GIV(freeStart) + next = ((newFreeChunk + sz2) >= GIV(freeStart) ? GIV(freeStart) - : (newFreeChunk + sz3) + (headerTypeBytes[(longAt(newFreeChunk + sz3)) & TypeMask])); + : (newFreeChunk + sz2) + (headerTypeBytes[(longAt(newFreeChunk + sz2)) & TypeMask])); assert((next == GIV(freeStart)) || (next == (oopFromChunk(GIV(compEnd))))); if (next == GIV(freeStart)) { @@ -50589,7 +50573,8 @@ assert(checkInterpreterIntegrity()); assert(checkStackIntegrity()); assert(checkCodeIntegrity(fullGCFlag)); - validate(); + /* begin validate */ + null; } } @@ -50598,7 +50583,7 @@ given object or free chunk in memory. Return freeStart when enumeration is complete. This is for assertion checking only. */ -static sqInt +static usqInt safeObjectAfter(sqInt oop) { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt header; Modified: branches/Cog/nscogsrc/vm/cointerp.h =================================================================== --- branches/Cog/nscogsrc/vm/cointerp.h 2014-05-10 15:08:04 UTC (rev 2919) +++ branches/Cog/nscogsrc/vm/cointerp.h 2014-05-10 15:56:23 UTC (rev 2920) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.712 uuid: 2f12e8dd-7da6-4358-9eb4-ba4782b7206d + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.715 uuid: 113af7b7-74d5-4593-b954-b54dd3ee4850 */ Modified: branches/Cog/nscogsrc/vm/gcc3x-cointerp.c =================================================================== --- branches/Cog/nscogsrc/vm/gcc3x-cointerp.c 2014-05-10 15:08:04 UTC (rev 2919) +++ branches/Cog/nscogsrc/vm/gcc3x-cointerp.c 2014-05-10 15:56:23 UTC (rev 2920) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.712 uuid: 2f12e8dd-7da6-4358-9eb4-ba4782b7206d + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.715 uuid: 113af7b7-74d5-4593-b954-b54dd3ee4850 from - CoInterpreter VMMaker.oscog-eem.712 uuid: 2f12e8dd-7da6-4358-9eb4-ba4782b7206d + CoInterpreter VMMaker.oscog-eem.715 uuid: 113af7b7-74d5-4593-b954-b54dd3ee4850 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.712 uuid: 2f12e8dd-7da6-4358-9eb4-ba4782b7206d " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.715 uuid: 113af7b7-74d5-4593-b954-b54dd3ee4850 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -1160,7 +1160,7 @@ static void rewriteMethodCacheEntryForExternalPrimitiveToFunction(void (*localPrimAddress)(void)); static sqInt roomToPushNArgs(sqInt n); static void runLeakCheckerForFullGC(sqInt fullGCFlag); -static sqInt safeObjectAfter(sqInt oop); +static usqInt safeObjectAfter(sqInt oop); static sqInt safePrintStringOf(sqInt oop); usqInt scavengeThresholdAddress(void); EXPORT(sqInt) sendInvokeCallbackContext(VMCallbackContext *vmCallbackContext); @@ -2048,7 +2048,7 @@ /* 574 */ (void (*)(void))0, /* 575 */ (void (*)(void))0, 0 }; -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.712"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.715"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; @@ -24012,17 +24012,15 @@ sqInt header1; sqInt header2; sqInt header3; - sqInt header4; usqInt lastWord; sqInt newFreeChunk; sqInt newOop; - sqInt next; + usqInt next; sqInt oop; sqInt realHeader; sqInt sz; sqInt sz1; sqInt sz2; - sqInt sz3; sqInt target; usqInt w; @@ -24033,21 +24031,7 @@ /* begin objectAfterWhileForwarding: */ header2 = longAt(oop); if ((header2 & MarkBit) == 0) { - /* begin objectAfter: */ - if (!(asserta(oopisLessThan(oop, GIV(freeStart))))) { - error("no objects after the end of memory"); - } - if (((longAt(oop)) & TypeMask) == HeaderTypeFree) { - sz2 = (longAt(oop)) & AllButTypeMask; - } - else { - /* begin sizeBitsOf: */ - header3 = longAt(oop); - sz2 = ((header3 & TypeMask) == HeaderTypeSizeAndClass - ? (longAt(oop - (BytesPerWord * 2))) & LongSizeMask - : header3 & SizeMask); - } - next = (oop + sz2) + (headerTypeBytes[(longAt(oop + sz2)) & TypeMask]); + next = ((sqInt) (objectAfter(oop))); goto l1; } fwdBlock1 = (header2 & AllButMarkBitAndTypeMask) << 1; @@ -24062,7 +24046,7 @@ else { sz1 = realHeader & SizeMask; } - next = (oop + sz1) + (headerTypeBytes[(longAt(oop + sz1)) & TypeMask]); + next = ((sqInt) ((oop + sz1) + (headerTypeBytes[(longAt(oop + sz1)) & TypeMask]))); l1: /* end objectAfterWhileForwarding: */; if (!(((longAt(oop)) & TypeMask) == HeaderTypeFree)) { @@ -24116,18 +24100,18 @@ } /* begin safeObjectAfter: */ if (((longAt(newFreeChunk)) & TypeMask) == HeaderTypeFree) { - sz3 = (longAt(newFreeChunk)) & AllButTypeMask; + sz2 = (longAt(newFreeChunk)) & AllButTypeMask; } else { /* begin sizeBitsOf: */ - header4 = longAt(newFreeChunk); - sz3 = ((header4 & TypeMask) == HeaderTypeSizeAndClass + header3 = longAt(newFreeChunk); + sz2 = ((header3 & TypeMask) == HeaderTypeSizeAndClass ? (longAt(newFreeChunk - (BytesPerWord * 2))) & LongSizeMask - : header4 & SizeMask); + : header3 & SizeMask); } - next = ((newFreeChunk + sz3) >= GIV(freeStart) + next = ((newFreeChunk + sz2) >= GIV(freeStart) ? GIV(freeStart) - : (newFreeChunk + sz3) + (headerTypeBytes[(longAt(newFreeChunk + sz3)) & TypeMask])); + : (newFreeChunk + sz2) + (headerTypeBytes[(longAt(newFreeChunk + sz2)) & TypeMask])); assert((next == GIV(freeStart)) || (next == (oopFromChunk(GIV(compEnd))))); if (next == GIV(freeStart)) { @@ -50598,7 +50582,8 @@ assert(checkInterpreterIntegrity()); assert(checkStackIntegrity()); assert(checkCodeIntegrity(fullGCFlag)); - validate(); + /* begin validate */ + null; } } @@ -50607,7 +50592,7 @@ given object or free chunk in memory. Return freeStart when enumeration is complete. This is for assertion checking only. */ -static sqInt +static usqInt safeObjectAfter(sqInt oop) { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt header; Modified: branches/Cog/nscogsrc/vm/interp.h =================================================================== --- branches/Cog/nscogsrc/vm/interp.h 2014-05-10 15:08:04 UTC (rev 2919) +++ branches/Cog/nscogsrc/vm/interp.h 2014-05-10 15:56:23 UTC (rev 2920) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.712 uuid: 2f12e8dd-7da6-4358-9eb4-ba4782b7206d + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.715 uuid: 113af7b7-74d5-4593-b954-b54dd3ee4850 */ #define VM_PROXY_MAJOR 1 Modified: branches/Cog/nscogsrc/vm/vmCallback.h =================================================================== --- branches/Cog/nscogsrc/vm/vmCallback.h 2014-05-10 15:08:04 UTC (rev 2919) +++ branches/Cog/nscogsrc/vm/vmCallback.h 2014-05-10 15:56:23 UTC (rev 2920) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.712 uuid: 2f12e8dd-7da6-4358-9eb4-ba4782b7206d + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.715 uuid: 113af7b7-74d5-4593-b954-b54dd3ee4850 */ #define VM_CALLBACK_INC 1 Property changes on: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h ___________________________________________________________________ Modified: checkindate - Sat May 10 08:05:46 PDT 2014 + Sat May 10 08:54:19 PDT 2014 Modified: branches/Cog/sistasrc/vm/cointerp.c =================================================================== --- branches/Cog/sistasrc/vm/cointerp.c 2014-05-10 15:08:04 UTC (rev 2919) +++ branches/Cog/sistasrc/vm/cointerp.c 2014-05-10 15:56:23 UTC (rev 2920) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.712 uuid: 2f12e8dd-7da6-4358-9eb4-ba4782b7206d + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.715 uuid: 113af7b7-74d5-4593-b954-b54dd3ee4850 from - CoInterpreter VMMaker.oscog-eem.712 uuid: 2f12e8dd-7da6-4358-9eb4-ba4782b7206d + CoInterpreter VMMaker.oscog-eem.715 uuid: 113af7b7-74d5-4593-b954-b54dd3ee4850 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.712 uuid: 2f12e8dd-7da6-4358-9eb4-ba4782b7206d " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.715 uuid: 113af7b7-74d5-4593-b954-b54dd3ee4850 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2039,7 +2039,7 @@ /* 574 */ (void (*)(void))0, /* 575 */ (void (*)(void))0, 0 }; -const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.712]"; +const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.715]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; @@ -46052,7 +46052,8 @@ assert(checkInterpreterIntegrity()); assert(checkStackIntegrity()); assert(checkCodeIntegrity(fullGCFlag)); - validate(); + /* begin validate */ + null; } } Modified: branches/Cog/sistasrc/vm/cointerp.h =================================================================== --- branches/Cog/sistasrc/vm/cointerp.h 2014-05-10 15:08:04 UTC (rev 2919) +++ branches/Cog/sistasrc/vm/cointerp.h 2014-05-10 15:56:23 UTC (rev 2920) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.712 uuid: 2f12e8dd-7da6-4358-9eb4-ba4782b7206d + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.715 uuid: 113af7b7-74d5-4593-b954-b54dd3ee4850 */ Modified: branches/Cog/sistasrc/vm/gcc3x-cointerp.c =================================================================== --- branches/Cog/sistasrc/vm/gcc3x-cointerp.c 2014-05-10 15:08:04 UTC (rev 2919) +++ branches/Cog/sistasrc/vm/gcc3x-cointerp.c 2014-05-10 15:56:23 UTC (rev 2920) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.712 uuid: 2f12e8dd-7da6-4358-9eb4-ba4782b7206d + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.715 uuid: 113af7b7-74d5-4593-b954-b54dd3ee4850 from - CoInterpreter VMMaker.oscog-eem.712 uuid: 2f12e8dd-7da6-4358-9eb4-ba4782b7206d + CoInterpreter VMMaker.oscog-eem.715 uuid: 113af7b7-74d5-4593-b954-b54dd3ee4850 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.712 uuid: 2f12e8dd-7da6-4358-9eb4-ba4782b7206d " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.715 uuid: 113af7b7-74d5-4593-b954-b54dd3ee4850 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2042,7 +2042,7 @@ /* 574 */ (void (*)(void))0, /* 575 */ (void (*)(void))0, 0 }; -const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.712]"; +const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.715]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; @@ -46061,7 +46061,8 @@ assert(checkInterpreterIntegrity()); assert(checkStackIntegrity()); assert(checkCodeIntegrity(fullGCFlag)); - validate(); + /* begin validate */ + null; } } Modified: branches/Cog/sistasrc/vm/interp.h =================================================================== --- branches/Cog/sistasrc/vm/interp.h 2014-05-10 15:08:04 UTC (rev 2919) +++ branches/Cog/sistasrc/vm/interp.h 2014-05-10 15:56:23 UTC (rev 2920) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.712 uuid: 2f12e8dd-7da6-4358-9eb4-ba4782b7206d + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.715 uuid: 113af7b7-74d5-4593-b954-b54dd3ee4850 */ #define VM_PROXY_MAJOR 1 Modified: branches/Cog/sistasrc/vm/vmCallback.h =================================================================== --- branches/Cog/sistasrc/vm/vmCallback.h 2014-05-10 15:08:04 UTC (rev 2919) +++ branches/Cog/sistasrc/vm/vmCallback.h 2014-05-10 15:56:23 UTC (rev 2920) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.712 uuid: 2f12e8dd-7da6-4358-9eb4-ba4782b7206d + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.715 uuid: 113af7b7-74d5-4593-b954-b54dd3ee4850 */ #define VM_CALLBACK_INC 1 Modified: branches/Cog/src/vm/cointerp.c =================================================================== --- branches/Cog/src/vm/cointerp.c 2014-05-10 15:08:04 UTC (rev 2919) +++ branches/Cog/src/vm/cointerp.c 2014-05-10 15:56:23 UTC (rev 2920) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.712 uuid: 2f12e8dd-7da6-4358-9eb4-ba4782b7206d + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.715 uuid: 113af7b7-74d5-4593-b954-b54dd3ee4850 from - CoInterpreter VMMaker.oscog-eem.712 uuid: 2f12e8dd-7da6-4358-9eb4-ba4782b7206d + CoInterpreter VMMaker.oscog-eem.715 uuid: 113af7b7-74d5-4593-b954-b54dd3ee4850 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.712 uuid: 2f12e8dd-7da6-4358-9eb4-ba4782b7206d " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.715 uuid: 113af7b7-74d5-4593-b954-b54dd3ee4850 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2035,7 +2035,7 @@ /* 574 */ (void (*)(void))0, /* 575 */ (void (*)(void))0, 0 }; -const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.712]"; +const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.715]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; @@ -45881,7 +45881,8 @@ assert(checkInterpreterIntegrity()); assert(checkStackIntegrity()); assert(checkCodeIntegrity(fullGCFlag)); - validate(); + /* begin validate */ + null; } } Modified: branches/Cog/src/vm/cointerp.h =================================================================== --- branches/Cog/src/vm/cointerp.h 2014-05-10 15:08:04 UTC (rev 2919) +++ branches/Cog/src/vm/cointerp.h 2014-05-10 15:56:23 UTC (rev 2920) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.712 uuid: 2f12e8dd-7da6-4358-9eb4-ba4782b7206d + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.715 uuid: 113af7b7-74d5-4593-b954-b54dd3ee4850 */ Modified: branches/Cog/src/vm/cointerpmt.c =================================================================== --- branches/Cog/src/vm/cointerpmt.c 2014-05-10 15:08:04 UTC (rev 2919) +++ branches/Cog/src/vm/cointerpmt.c 2014-05-10 15:56:23 UTC (rev 2920) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.712 uuid: 2f12e8dd-7da6-4358-9eb4-ba4782b7206d + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.715 uuid: 113af7b7-74d5-4593-b954-b54dd3ee4850 from - CoInterpreterMT VMMaker.oscog-eem.712 uuid: 2f12e8dd-7da6-4358-9eb4-ba4782b7206d + CoInterpreterMT VMMaker.oscog-eem.715 uuid: 113af7b7-74d5-4593-b954-b54dd3ee4850 */ -static char __buildInfo[] = "CoInterpreterMT VMMaker.oscog-eem.712 uuid: 2f12e8dd-7da6-4358-9eb4-ba4782b7206d " __DATE__ ; +static char __buildInfo[] = "CoInterpreterMT VMMaker.oscog-eem.715 uuid: 113af7b7-74d5-4593-b954-b54dd3ee4850 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2132,7 +2132,7 @@ /* 574 */ (void (*)(void))0, /* 575 */ (void (*)(void))0, 0 }; -const char *interpreterVersion = "Croquet Closure Cog MT VM [CoInterpreterMT VMMaker.oscog-eem.712]"; +const char *interpreterVersion = "Croquet Closure Cog MT VM [CoInterpreterMT VMMaker.oscog-eem.715]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; sqInt willNotThreadWarnCount; @@ -26420,7 +26420,7 @@ GIV(instructionPointer) = ceReturnToInterpreterPC(); } GIV(newMethod) = (vmThread->newMethodOrNull); - GIV(argumentCount) = argumentCount(vmThread); + GIV(argumentCount) = (vmThread->argumentCount); memcpy(reenterInterpreter, (vmThread->reenterInterpreter), sizeof(jmp_buf)); (vmThread->newMethodOrNull = null); @@ -27023,7 +27023,7 @@ assert((ownerIndexOfProcess(activeProc)) == ((preemptedThread->index))); } (preemptedThread->newMethodOrNull = GIV(newMethod)); - argumentCount(preemptedThread, GIV(argumentCount)); + (preemptedThread->argumentCount = GIV(argumentCount)); (preemptedThread->inMachineCode = (((usqInt)GIV(instructionPointer))) <= (startOfMemory())); memcpy((preemptedThread->reenterInterpreter), reenterInterpreter, sizeof(jmp_buf)); } @@ -47304,7 +47304,8 @@ assert(checkInterpreterIntegrity()); assert(checkStackIntegrity()); assert(checkCodeIntegrity(fullGCFlag)); - validate(); + /* begin validate */ + null; } } Modified: branches/Cog/src/vm/cointerpmt.h =================================================================== --- branches/Cog/src/vm/cointerpmt.h 2014-05-10 15:08:04 UTC (rev 2919) +++ branches/Cog/src/vm/cointerpmt.h 2014-05-10 15:56:23 UTC (rev 2920) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.712 uuid: 2f12e8dd-7da6-4358-9eb4-ba4782b7206d + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.715 uuid: 113af7b7-74d5-4593-b954-b54dd3ee4850 */ Modified: branches/Cog/src/vm/gcc3x-cointerp.c =================================================================== --- branches/Cog/src/vm/gcc3x-cointerp.c 2014-05-10 15:08:04 UTC (rev 2919) +++ branches/Cog/src/vm/gcc3x-cointerp.c 2014-05-10 15:56:23 UTC (rev 2920) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.712 uuid: 2f12e8dd-7da6-4358-9eb4-ba4782b7206d + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.715 uuid: 113af7b7-74d5-4593-b954-b54dd3ee4850 from - CoInterpreter VMMaker.oscog-eem.712 uuid: 2f12e8dd-7da6-4358-9eb4-ba4782b7206d + CoInterpreter VMMaker.oscog-eem.715 uuid: 113af7b7-74d5-4593-b954-b54dd3ee4850 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.712 uuid: 2f12e8dd-7da6-4358-9eb4-ba4782b7206d " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.715 uuid: 113af7b7-74d5-4593-b954-b54dd3ee4850 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2038,7 +2038,7 @@ /* 574 */ (void (*)(void))0, /* 575 */ (void (*)(void))0, 0 }; -const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.712]"; +const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.715]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; @@ -45890,7 +45890,8 @@ assert(checkInterpreterIntegrity()); assert(checkStackIntegrity()); assert(checkCodeIntegrity(fullGCFlag)); - validate(); + /* begin validate */ + null; } } Modified: branches/Cog/src/vm/gcc3x-cointerpmt.c =================================================================== --- branches/Cog/src/vm/gcc3x-cointerpmt.c 2014-05-10 15:08:04 UTC (rev 2919) +++ branches/Cog/src/vm/gcc3x-cointerpmt.c 2014-05-10 15:56:23 UTC (rev 2920) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.712 uuid: 2f12e8dd-7da6-4358-9eb4-ba4782b7206d + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.715 uuid: 113af7b7-74d5-4593-b954-b54dd3ee4850 from - CoInterpreterMT VMMaker.oscog-eem.712 uuid: 2f12e8dd-7da6-4358-9eb4-ba4782b7206d + CoInterpreterMT VMMaker.oscog-eem.715 uuid: 113af7b7-74d5-4593-b954-b54dd3ee4850 */ -static char __buildInfo[] = "CoInterpreterMT VMMaker.oscog-eem.712 uuid: 2f12e8dd-7da6-4358-9eb4-ba4782b7206d " __DATE__ ; +static char __buildInfo[] = "CoInterpreterMT VMMaker.oscog-eem.715 uuid: 113af7b7-74d5-4593-b954-b54dd3ee4850 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2135,7 +2135,7 @@ /* 574 */ (void (*)(void))0, /* 575 */ (void (*)(void))0, 0 }; -const char *interpreterVersion = "Croquet Closure Cog MT VM [CoInterpreterMT VMMaker.oscog-eem.712]"; +const char *interpreterVersion = "Croquet Closure Cog MT VM [CoInterpreterMT VMMaker.oscog-eem.715]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; sqInt willNotThreadWarnCount; @@ -26429,7 +26429,7 @@ GIV(instructionPointer) = ceReturnToInterpreterPC(); } GIV(newMethod) = (vmThread->newMethodOrNull); - GIV(argumentCount) = argumentCount(vmThread); + GIV(argumentCount) = (vmThread->argumentCount); memcpy(reenterInterpreter, (vmThread->reenterInterpreter), sizeof(jmp_buf)); (vmThread->newMethodOrNull = null); @@ -27032,7 +27032,7 @@ assert((ownerIndexOfProcess(activeProc)) == ((preemptedThread->index))); } (preemptedThread->newMethodOrNull = GIV(newMethod)); - argumentCount(preemptedThread, GIV(argumentCount)); + (preemptedThread->argumentCount = GIV(argumentCount)); (preemptedThread->inMachineCode = (((usqInt)GIV(instructionPointer))) <= (startOfMemory())); memcpy((preemptedThread->reenterInterpreter), reenterInterpreter, sizeof(jmp_buf)); } @@ -47313,7 +47313,8 @@ assert(checkInterpreterIntegrity()); assert(checkStackIntegrity()); assert(checkCodeIntegrity(fullGCFlag)); - validate(); + /* begin validate */ + null; } } Modified: branches/Cog/src/vm/interp.h =================================================================== --- branches/Cog/src/vm/interp.h 2014-05-10 15:08:04 UTC (rev 2919) +++ branches/Cog/src/vm/interp.h 2014-05-10 15:56:23 UTC (rev 2920) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.712 uuid: 2f12e8dd-7da6-4358-9eb4-ba4782b7206d + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.715 uuid: 113af7b7-74d5-4593-b954-b54dd3ee4850 */ #define VM_PROXY_MAJOR 1 Modified: branches/Cog/src/vm/vmCallback.h =================================================================== --- branches/Cog/src/vm/vmCallback.h 2014-05-10 15:08:04 UTC (rev 2919) +++ branches/Cog/src/vm/vmCallback.h 2014-05-10 15:56:23 UTC (rev 2920) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.712 uuid: 2f12e8dd-7da6-4358-9eb4-ba4782b7206d + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.715 uuid: 113af7b7-74d5-4593-b954-b54dd3ee4850 */ #define VM_CALLBACK_INC 1 Modified: branches/Cog/stacksrc/vm/gcc3x-interp.c =================================================================== --- branches/Cog/stacksrc/vm/gcc3x-interp.c 2014-05-10 15:08:04 UTC (rev 2919) +++ branches/Cog/stacksrc/vm/gcc3x-interp.c 2014-05-10 15:56:23 UTC (rev 2920) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.712 uuid: 2f12e8dd-7da6-4358-9eb4-ba4782b7206d + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.715 uuid: 113af7b7-74d5-4593-b954-b54dd3ee4850 from - StackInterpreter VMMaker.oscog-eem.712 uuid: 2f12e8dd-7da6-4358-9eb4-ba4782b7206d + StackInterpreter VMMaker.oscog-eem.715 uuid: 113af7b7-74d5-4593-b954-b54dd3ee4850 */ -static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.712 uuid: 2f12e8dd-7da6-4358-9eb4-ba4782b7206d " __DATE__ ; +static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.715 uuid: 113af7b7-74d5-4593-b954-b54dd3ee4850 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -1824,7 +1824,7 @@ 0 }; char * breakSelector; sqInt breakSelectorLength = -1; -const char *interpreterVersion = "Croquet Closure Stack VM [StackInterpreter VMMaker.oscog-eem.712]"; +const char *interpreterVersion = "Croquet Closure Stack VM [StackInterpreter VMMaker.oscog-eem.715]"; volatile int sendTrace; sqInt suppressHeartbeatFlag; @@ -39557,7 +39557,8 @@ assert(checkInterpreterIntegrity()); assert(checkStackIntegrity()); assert(checkCodeIntegrity(fullGCFlag)); - validate(); + /* begin validate */ + null; } } Modified: branches/Cog/stacksrc/vm/interp.c =================================================================== --- branches/Cog/stacksrc/vm/interp.c 2014-05-10 15:08:04 UTC (rev 2919) +++ branches/Cog/stacksrc/vm/interp.c 2014-05-10 15:56:23 UTC (rev 2920) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.712 uuid: 2f12e8dd-7da6-4358-9eb4-ba4782b7206d + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.715 uuid: 113af7b7-74d5-4593-b954-b54dd3ee4850 from - StackInterpreter VMMaker.oscog-eem.712 uuid: 2f12e8dd-7da6-4358-9eb4-ba4782b7206d + StackInterpreter VMMaker.oscog-eem.715 uuid: 113af7b7-74d5-4593-b954-b54dd3ee4850 */ -static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.712 uuid: 2f12e8dd-7da6-4358-9eb4-ba4782b7206d " __DATE__ ; +static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.715 uuid: 113af7b7-74d5-4593-b954-b54dd3ee4850 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -1821,7 +1821,7 @@ 0 }; char * breakSelector; sqInt breakSelectorLength = -1; -const char *interpreterVersion = "Croquet Closure Stack VM [StackInterpreter VMMaker.oscog-eem.712]"; +const char *interpreterVersion = "Croquet Closure Stack VM [StackInterpreter VMMaker.oscog-eem.715]"; volatile int sendTrace; sqInt suppressHeartbeatFlag; @@ -39548,7 +39548,8 @@ assert(checkInterpreterIntegrity()); assert(checkStackIntegrity()); assert(checkCodeIntegrity(fullGCFlag)); - validate(); + /* begin validate */ + null; } } Modified: branches/Cog/stacksrc/vm/interp.h =================================================================== --- branches/Cog/stacksrc/vm/interp.h 2014-05-10 15:08:04 UTC (rev 2919) +++ branches/Cog/stacksrc/vm/interp.h 2014-05-10 15:56:23 UTC (rev 2920) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.712 uuid: 2f12e8dd-7da6-4358-9eb4-ba4782b7206d + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.715 uuid: 113af7b7-74d5-4593-b954-b54dd3ee4850 */ #define VM_PROXY_MAJOR 1 Modified: branches/Cog/stacksrc/vm/vmCallback.h =================================================================== --- branches/Cog/stacksrc/vm/vmCallback.h 2014-05-10 15:08:04 UTC (rev 2919) +++ branches/Cog/stacksrc/vm/vmCallback.h 2014-05-10 15:56:23 UTC (rev 2920) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.712 uuid: 2f12e8dd-7da6-4358-9eb4-ba4782b7206d + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.715 uuid: 113af7b7-74d5-4593-b954-b54dd3ee4850 */ #define VM_CALLBACK_INC 1

1 0

← Newer
1
...
7
8
9
10
11
12
13
...
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