Vm-dev June 2014

vm-dev@lists.squeakfoundation.org

37 participants
268 discussions

ffi-test-main.c fails on FreeBSD
by Gary Dunn 12 Aug '16

12 Aug '16

In conjunction with getting Open Cobalt running on FreeBSD I have been looking into the problems with SqueakFFIPrims on FreeBSD and have reached a point that is beyond my understanding. I am not sure if the fix should come from the VM side or the FreeBSD port maintainer. I needed to get source code back into the ports tree so I did a make in /usr/ports/lang/squeak. I already had the 3.9 tarball, so that just repopulated the source and did the initial build. In the "files" folder I found patch files typical for a FreeBSD port. These patch source files from a generic tarball to work with FreeBSD. The one of interest was patch-platforms__unix__plugins__SqueakFFIPrims__ffi-config which contains ----x-----x----- --- platforms/unix/plugins/SqueakFFIPrims/ffi-config.org Wed Apr 26 20:27:53 2006 +++ platforms/unix/plugins/SqueakFFIPrims/ffi-config Wed Apr 26 20:29:00 2006 @@ -39,6 +39,7 @@ case ${abi} in linux) abi=sysv;; + freebsd*) abi=sysv;; darwin*) abi=darwin;; *) abi=libffi; lib="-lffi";; esac -----x-----x----- I then had the folder work/Squeak-3.9-7/platforms/unix/plugins/SqueakFFIPrims In it is a file 00README which explains how to test FFI. It says to run ffi-test-config but I have no such file. It says to type "make" to build a test suite but the build failed. It says to try with make CPU=any ABI=libffi LIB=-lffi which also failed. I traced the problem to the gcc search paths for includes and libraries -- turns out FreeBSD only searches /usr/include and /usr/lib when the required files are in /usr/local/include and /usr/local/lib. After some fiddling I finally had a "main" to test. It failed: ffi-test-main.c failed at line 361. Here is a bit from that file, ending with line 361: ffiInitialize(); for (ul= 0; ul < 15; ++ul) ffiPushSingleFloat(fa[ul]); GO(FFITypeSingleFloat, many); f= ffiReturnFloatValue(); ffiCleanup(); CHECK(f - ff < FLT_EPSILON); I worked out the CHECK macro but could not find what FLT_EPSILON is. At that point I decided to stop and come to you for help. Where do I go from here? -- Gary Dunn, Honolulu osp(a)aloha.com http://openslate.net/ http://e9erust.blogspot.com/ Sent from Slate001

5 8

Do we have the new primitive?? [WAS] Re: [Pharo-project] IdentitySet but using #hash rather than #identityHash ?
by Mariano Martinez Peck 16 Dec '15

16 Dec '15

> All I can say is that I am impressed by the numbers it is really much >> faster. >> I still don't understand why I send this email with a subject say >> IdentitySet because what I really need is a fast/large IdentityDictionary >> :( Anyway, there's a place where we can use this LargeIdentitySet in Fuel >> I think). >> >> So Levente, you say this is not possible to adapt this for dictionary? >> can >> we contact Eliot to provide such a primitive? >> > > As promised, I uploaded my LargeIdentityDictionary implementation to > http://leves.web.elte.hu/**squeak/**LargeIdentityDictionary.st<http://leves.web.elte.hu/squeak/LargeIdentityDictionary.st>. > The numbers will be a bit worse compared to LargeIdentitySet, because of > the lack of the primitive, but it's still 2-3x faster than other solutions > (IdentityDictionary, PluggableIdentityDictionary, subclassing, etc). I'm > about to propose this primitive with other improvements on the vm-dev list. > > Hi Eliot/Levente. What is the status of this? Do we have already the new primitive? If true, how can we adapt LargeIdentitySet to use such new primitive? Thanks! > > Levente > > >> thanks >> >> On Fri, Dec 16, 2011 at 3:28 PM, Levente Uzonyi <leves(a)elte.hu> wrote: >> >> On Fri, 16 Dec 2011, Henrik Sperre Johansen wrote: >>> >>> On 16.12.2011 03:26, Levente Uzonyi wrote: >>> >>>> >>>> >>>>> How about my numbers? :) >>>>> >>>>> "Preallocate objects, so we won't count gc time." >>>>> n := 1000000. >>>>> objects := Array new: n streamContents: [ :stream | >>>>> n timesRepeat: [ stream nextPut: Object new ] ]. >>>>> >>>>> set := IdentitySet new: n. >>>>> Smalltalk garbageCollect. >>>>> [1 to: n do: [ :i | set add: (objects at: i) ] ] timeToRun. "4949" >>>>> >>>>> set := LargeIdentitySet new. >>>>> Smalltalk garbageCollect. >>>>> [1 to: n do: [ :i | set add: (objects at: i) ] ] timeToRun. "331" >>>>> >>>>> set := (PluggableSet new: n) >>>>> hashBlock: [ :object | object identityHash * 4096 + object class >>>>> identityHash * 64 ]; "Change this to #basicIdentityHash in Pharo" >>>>> equalBlock: [ :a :b | a == b ]; >>>>> yourself. >>>>> Smalltalk garbageCollect. >>>>> [1 to: n do: [ :i | set add: (objects at: i) ] ] timeToRun. "5511" >>>>> >>>>> >>>>> I also have a LargeIdentityDictionary, which is relatively fast, but >>>>> not >>>>> as fast as LargeIdentitySet, because (for some unknown reason) we don't >>>>> have a primitive that could support it. If we had a primitive like >>>>> primitive 132 which would return the index of the element if found or >>>>> 0 if >>>>> not, then we could have a really fast LargeIdentityDictionary. >>>>> >>>>> >>>>> Levente >>>>> >>>>> Hehe yes, if writing a version fully exploiting the limited range, >>>> that's >>>> probably the approach I would go for as well. >>>> (IAssuming it's the version at http://leves.web.elte.hu/** >>>> squeak/LargeIdentitySet.st<htt**p://leves.web.elte.hu/squeak/** >>>> LargeIdentitySet.st<http://leves.web.elte.hu/squeak/LargeIdentitySet.st> >>>> > >>>> ) >>>> >>>> Mariano commented in the version at http://www.squeaksource.com/** >>>> FuelExperiments <http://www.squeaksource.com/**FuelExperiments<http://www.squeaksource.com/FuelExperiments>> >>>> that it's >>>> >>>> slow for them, which I guess is due to not adopting #identityHash calls >>>> to >>>> #basicIdentityHash calls for Pharo: >>>> ((0 to: 4095) collect: [:each | each << 22 \\ 4096 ]) asSet size -> 1 >>>> So it basically uses 1 bucket instead of 4096... Whoops. :) >>>> >>>> Uploaded a new version to the MC repository which is adapted for Pharo, >>>> on the same machine my numbers were taken from, it does the same test >>>> as I >>>> used above in 871 ms. (181 with preallocation). >>>> >>>> >>> Cool. One more thing: in Squeak the method using primitive 132 directly >>> was renamed to #instVarsInclude:, so now #pointsTo: works as expected. If >>> this was also added to Pharo, then the #pointsTo: sends should be changed >>> to #instVarsInclude:, otherwise Array can be reported as included even if >>> it wasn't added. >>> I'll upload my LargeIdentityDictionary implementation to the same place >>> this evening, since it's still 2-3 factor faster than other solutionts >>> and >>> there seem to be demand for it. >>> >>> >>> Levente >>> >>> >>> Cheers, >>>> Henry >>>> >>>> >>>> >>>> >>> >> >> -- >> Mariano >> http://marianopeck.wordpress.**com <http://marianopeck.wordpress.com> >> >> > -- Mariano http://marianopeck.wordpress.com

4 12

Re: [Pharo-dev] Initial versions for OSWindow and Woden
by btc＠openinworld.com 20 Aug '14

20 Aug '14

Hi Ronie, This is really exciting (and I've cross-posted to vm-dev). I guess this will help multi-monitor displays to have a window on each monitor? Ronie Salgado wrote: > Hello There, > > I have been working in OSWindow, which is a cross platform API for > dealing with native operating system windows. This API requires using > a custom VM and the library SDL2. > > With this API, even the main Pharo window is handled almost completely > in image side using NativeBoost. > > The only support required from the VM is a small periodical check in > the heartbeat about the presence of events. This no more than 10 lines > of code. Is there much you needed to change/delete from the existing VM window initialization. Since the VM is shared with other Smalltalk platforms, how compatible would this be to maintain in parallel with the existing VM windows initialization? cheers -ben > > This is currently working very well in my Linux machine, so I need to > start testing this stuff. > > For Windows, soon I will be building the custom VM. My last built was > very dirty and I want to do something more clean. > > For Mac OS X, I don't have one for testing. But Alex is going allow me > to borrow one for some time. So be patience. > > As for Woden, it is a new 3D graphics engine that I started making. > This one requires currently support of OSWindow and also shows some > cool stuffs. > > As for prebuilt versions of the VM with OSWindow support along with > preloaded images for both, OSWindow and Woden. And screenshots. > > Well, I am putting them here: http://ronie.cl/OSWindow/ > > Greetings, > Ronie

4 3

Re: [Vm-dev] About 32bits LargeInt plugin [was how the h**l do I generate a signed shift?]
by Nicolas Cellier 02 Jul '14

02 Jul '14

2014-07-01 0:40 GMT+02:00 Eliot Miranda <eliot.miranda(a)gmail.com>: > > Hi Nicolas, > > > Hi Eliot, >> look how I did it in the 32bits LargInt variant: >> > > if the 32-bit large int version passes all the tests why hasn't it > replaced the byte one? > > > Yes, 32bits large int pass all tests. I use such modified VM exclusively. All the code is maintained at http://smalltalkhub.com/#!/~nice/NiceVMExperiments for classical VM and Cog. I have not tested anything on Spur yet, but do not expect major problem. It works well as is, but I'd like some improvments: - Prevent byte-wise copy to be used in BigEndian processor - Provide accelerated primitives for byteAt: byteAt:put: operations (I don't remember how I implemented them currently, it's too long ago)

2 2

how the h**l do I generate a signed shift?
by Eliot Miranda 01 Jul '14

01 Jul '14

Hi All, I recently eliminated the optimization in Slang that replaces a division by a power of two with a shift, because the code cast the argument to signed, and hence broke unsigned division. That's what used to be controlled by the UseRightShiftForDivide class var of CCodeGenerator. Yesterday I found out that that optimization is the only thing that's keeping the LargeIntegers plugin afloat. To whit: LargeIntegersPlugin>>cDigitSub: pByteSmall len: smallLen with: pByteLarge len: largeLen into: pByteRes | z limit | <var: #pByteSmall type: 'unsigned char * '> <var: #pByteLarge type: 'unsigned char * '> <var: #pByteRes type: 'unsigned char * '> z := 0. "Loop invariant is -1<=z<=1" limit := smallLen - 1. 0 to: limit do: [:i | z := z + (pByteLarge at: i) - (pByteSmall at: i). pByteRes at: i put: z - (z // 256 * 256). "sign-tolerant form of (z bitAnd: 255)" z := z // 256]. limit := largeLen - 1. smallLen to: limit do: [:i | z := z + (pByteLarge at: i) . pByteRes at: i put: z - (z // 256 * 256). "sign-tolerant form of (z bitAnd: 255)" z := z // 256]. The "z := z // 256"'s at the end of the loops were being generated as z = ((sqInt) z) >> 8; which is essential for the signed arithmetic implicit in "z := z + (pByteLarge at: i) - (pByteSmall at: i)" to work. So what's the right thing to do? In C -1 // 256 = 0, but in Smalltalk -1 // 256 = -1 (// rounds towards - infinity), whereas (-1 quo: 256) = 0 (quo: rounds towards 0). I could modify the code generator to generate Smalltalk semantics for //, but its not pretty (one has to check signedness, check if there's a remainder, etc). What I'd like is to have a signed bitShift:. Wait you say, bitShift: is signed. Ah, but the code generator generates unsigned shifts for all bitShift:'s !!!!. So some ideas: 1. change bitShift: to obey the type of the receiver (Slang allows one to type variables, defaulting to a singed long). This is my preference, but it risks breaking a good handful of negative bitShift: uses in plugins (which is where I'm worried about regressions). 2. change bitShift: to obey explicit casts, generating a signed shift for foo asInteger bitShift: expr (self cCoerceSimple: #foo to: #sqInt) bitShift: expr Seriously?!?! this stinks. 3. write z := self cCode: [z >>= 8] inSmalltalk: [z // 256] Seriously?!?! this stinks too. Anything else that makes any sense? -- best, Eliot

4 10

Re: [squeak-dev] Intent to upgrade box4 VM from VMr.2776 to VM.r2987
by Eliot Miranda 30 Jun '14

30 Jun '14

On Sun, Jun 29, 2014 at 7:14 PM, Chris Muller <asqueaker(a)gmail.com> wrote: > I was operating under the assumption that CC was referring to a Spur VM. > I mistakenly assumed the higher number automatically meant Spur, but > you've made me realize it's just a new Cog VM, not Spur. Yes, Cog has been > quite stable for some time and you know the details and the risks. We know > your ethic and we trust you. > except that you're right :-(. I've found that my recent changes to eliminate implementation of division with shift when the divisor is a power of two breaks the LargeIntegers plugin because division is the only way that Slang supports signed bitShift: (which is a bug). Phhh... So I'll be taking 3021 down PDQ. 3018 should be OK. > > Having said that, I would still understand and support any box-admin who > wanted some testing first. If something is already _proven_ working in > production, not crashing, and we're not really having any immediate > production impetus to upgrade it, then this almost amounts to "testing in > production". No benefit, but a small chance for a problem. There's plenty > of time and opportunity to shake them out in test environments first. > > > On Sun, Jun 29, 2014 at 8:11 PM, Eliot Miranda <eliot.miranda(a)gmail.com> > wrote: > >> >> >> >> On Sun, Jun 29, 2014 at 9:20 AM, Chris Muller <asqueaker(a)gmail.com> >> wrote: >> >>> Didn't Levente ask us to use stable VM's for production services? >>> >> >> Given that 3018 has nothing radically new but contains bug fixes IMO it >> is stable. Even the SPur VM is more stable than the one that preceeds it. >> What extra testing has 2776 had to make it more or less stable than 2987 >> or 3021? 2987 and subsequent all run the standard test suite with >> equivalent results. I don't make arbitrary changes to the Cog VMs (Spur is >> obviously evolving much faster, but again is getting more, not less >> stable). You need to specify a criterion by which a VM is judged stable, >> not merely go by age, which is, at least on average, inversely correlated >> with stability, older VMs containing more bugs, if you want to argue >> against using newer VMs. I don't put newer VMs out for amusement. I put >> them out because they're better (faster, fix bugs, etc). >> >> >>> >>> >>> On Fri, Jun 27, 2014 at 4:01 PM, Eliot Miranda <eliot.miranda(a)gmail.com> >>> wrote: >>> >>>> Hi Chris, >>>> >>>> >>>> On Fri, Jun 27, 2014 at 1:14 PM, Chris Cunnington <brasspen(a)gmail.com> >>>> wrote: >>>> >>>>> I intend to upgrade the VM on box4 VM.r2776 (Aug. 2013) to VM.r2987 >>>>> (June 2014). The intention here is to refine the install/removal process. I >>>>> just did this on my Debian Wheezy box, so it seems pretty straightforward. >>>>> >>>> >>>> 3018 is the latest and greatest. Please use it. >>>> >>>> >>>>> Installing: >>>>> >>>>> - get a Cog binary from mirandabanda.org >>>>> - use Ken's cogdeb.zip to make a deb >>>>> - install with dpkg (i.e. dpkg -i cogvm_2776-1_i386.deb) >>>>> - execute "man squeak" to see if it's loaded >>>>> >>>>> Removing: >>>>> >>>>> - check the package name with dpkg-query -l >>>>> - see it's actually called "coglinux" as opposed to cogvm or squeak >>>>> - dpkg -r coglinux >>>>> >>>>> >>>>> So, as I said, I just did this on my server and is seemed to work OK. >>>>> I plan to upgrade the VM from last year's model (2776) to this year's >>>>> (2987). If there's anything people with more LInux experience could add to >>>>> this process, I'd be happy to hear it. >>>>> >>>>> Chris >>>>> >>>> >>>> >>>> >>>> -- >>>> best, >>>> Eliot >>>> >>>> >>>> >>>> >>> >>> >>> >>> >> >> >> -- >> best, >> Eliot >> >> >> >> > -- best, Eliot

2 1

VM Maker: CMakeVMMakerSqueak-tty.79.mcz
by commits＠source.squeak.org 30 Jun '14

30 Jun '14

Timothy M uploaded a new version of CMakeVMMakerSqueak to project VM Maker: http://source.squeak.org/VMMaker/CMakeVMMakerSqueak-tty.79.mcz ==================== Summary ==================== Name: CMakeVMMakerSqueak-tty.79 Author: tty Time: 30 June 2014, 12:18:13.897 pm UUID: 91b61388-2334-421f-8e23-80fe842d17cd Ancestors: CMakeVMMakerSqueak-tty.78 remove mvm matching method naming as it confuses things in CMake land. =============== Diff against CMakeVMMakerSqueak-tty.78 =============== Item was changed: ----- Method: CMakeVMGeneratorForSqueak>>generate (in category 'code generation') ----- generate - "overriding CMakeVMGenerator to provide additional method calls" | 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 ]. - config preferredIncludes do: [ :each | self includeDirectories: each ]. self includeDirectories: self includeDirs. + config standardIncludes + do: [:each | self includeDirectories: each ]. - config standardIncludes do: [:each | self includeDirectories: each ]. + self addDefinitions: config compilerFlags. - "tty. - we replace the catchAll compilerFlags with methods that reflect the 'mvm' file used in the gnu-build system - i.e. oscogvm/build.linux32x86/squeak.cog.v3/build/mvm - My intent is to make setup of a new configuration easier for somebody coming from GNU-land" - " self addDefinitions: config compilerFlags. - - config configureFlags do:[:each | self configureFlags: each]. - config cC do:[:each | self cC: each]. - config cXX do:[:each | self cXX: each]. - config lDFlags do:[:each | self lDFlags: each]. - config libs do:[:each | self libs: each]. - " - self flag:'tty'. "This should be replaced with judicious use of above" - self addDefinitions: config cFlags. - self flag:'tty'. "end this should be replaced" - 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.! - self generateBuildScript. - - ! Item was removed: - ----- Method: CMakeVMMakerSqueakCommonConfigTest>>testCoreSources (in category 'as yet unclassified') ----- - testCoreSources - #(#SqueakMacintoshConfig #SqueakUnixConfig #SqueakWindowsConfig) - do:[:each | - (Smalltalk at:each) - allSubclassesDo:[:configuration | | o | - configuration isAbstractBaseClass not - ifTrue:[ o:= configuration new. - o excludeFromBuild not - ifTrue:[self assert:(o coreSources isArray)]]]] - - - - - - - - ! Item was changed: ----- Method: CMakeVMMakerSqueakDeveloperHelp class>>pages (in category 'pages') ----- pages + ^#(overview prerequisites terms igorStasenkoDesign buildersAndConfigs plugins pthreads)! - ^#(overview prerequisites terms igorStasenkoDesign buildersAndConfigs plugins )! Item was added: + ----- Method: CMakeVMMakerSqueakDeveloperHelp class>>pthreads (in category 'pages') ----- + pthreads + ^HelpTopic + title:'PThreads' + contents:' + + http://www.mirandabanda.org/files/Cog/VM/VM.r3006/README.3006 + + N.B. For Squeak/Pharo/Croquet please use the archives whose names begin with + Cog or cog. The archives whose names begin with nsvm or Newspeak are + for Newspeak and are missing plugins required by Squeak/Pharo/Croquet. + VMs with "mt" or "MT" in the name are multi-threaded VMs which support + non-blocking FFI calls. The archives containing "Spur" or "spur" are + VMs using the new Spur object representation and garbage collector and + should be used with Spur-format Squeak/Pharo/Croquet or Newspeak images. + + There are two variants of the Linux VMs; those ending in "ht" have a + heartbeat thread, while those that don''t, use an interval timer for the + heartbeat (the Windows and Mac VMs have a threaded heartbeat). The + threaded heartbeat is better (for example, signals from the interval timer + interfere with system calls, etc), but to use it one must have a kernel + later than 2.6.12 and configure linux to allow the VM to use multiple + thread priorities. To do so, create a file called VM.conf where VM is + the name of the vm executable ("squeak" for the Squeak vm, "nsvm" for + the Newspeak vm) in /etc/security/limits.d/ with contents: + * hard rtprio 2 + * soft rtprio 2 + + e.g. + sudo cat >/etc/security/limits.d/squeak.conf <<END + * hard rtprio 2 + * soft rtprio 2 + END + sudo cp /etc/security/limits.d/squeak.conf /etc/security/limits.d/nsvm.conf + Then log out and log back in for the limits to take effect. + + + On Slackware linux 14.0 + bash$ man limits + + From the man page, the O (oh) option is: O: max real time priority + + create a file /etc/limits file and add an entry + + tty O100 + + where tty is the login name, and the O option is set to 100. + + Logout and re-login. + + + '! Item was changed: ----- Method: CMakeVMMakerSqueakRedirectMethodsTest>>testCompilerFlags (in category 'as yet unclassified') ----- testCompilerFlags #(#SqueakMacintoshConfig #SqueakUnixConfig #SqueakWindowsConfig ) do:[:each | (Smalltalk at:each) allSubclassesDo:[:configuration | | o buildTypes| o:= configuration new. (o excludeFromBuild not) & (configuration isAbstractBaseClass not) ifTrue:[ buildTypes:=o availableBuildTypes copyWithoutAll:#(#buildNone). buildTypes do:[:buildType | o configureForBuildType: buildType. + self assert:(o compilerFlags isKindOf: Collection). - self assert:(o compilerFlags isString). self assert:(o compilerFlags size > 0)]]]]. ! Item was added: + ----- Method: CMakeVMMakerSqueakRedirectMethodsTest>>testCoreSources (in category 'as yet unclassified') ----- + testCoreSources + #(#SqueakMacintoshConfig #SqueakUnixConfig #SqueakWindowsConfig ) + do:[:each | + (Smalltalk at:each) + allSubclassesDo:[:configuration | | o buildTypes| + o:= configuration new. + (o excludeFromBuild not) & (configuration isAbstractBaseClass not) + ifTrue:[ + buildTypes:=o availableBuildTypes copyWithoutAll:#(#buildNone). + buildTypes do:[:buildType | + o configureForBuildType: buildType. + self assert:(o coreSources isKindOf:Collection). + self assert:(o coreSources size > 0)]]]]. + + + + + + + + ! Item was removed: - ----- Method: CMakeVMMakerSqueakUnixConfigTest>>testCC (in category 'as yet unclassified') ----- - testCC - #( #SqueakUnixConfig) - do:[:each | - (Smalltalk at:each) - allSubclassesDo:[:configuration | | o buildTypes| - o:= configuration new. - (o excludeFromBuild not) & (configuration isAbstractBaseClass not) - ifTrue:[ - buildTypes:=o availableBuildTypes copyWithoutAll:#(#buildNone). - buildTypes do:[:buildType | - o configureForBuildType: buildType. - self assert:(o cC isArray)]]]]. - - - - - ! Item was removed: - ----- Method: CMakeVMMakerSqueakUnixConfigTest>>testCXX (in category 'as yet unclassified') ----- - testCXX - #( #SqueakUnixConfig) - do:[:each | - (Smalltalk at:each) - allSubclassesDo:[:configuration | | o buildTypes| - o:= configuration new. - (o excludeFromBuild not) & (configuration isAbstractBaseClass not) - ifTrue:[ - buildTypes:=o availableBuildTypes copyWithoutAll:#(#buildNone). - buildTypes do:[:buildType | - o configureForBuildType: buildType. - self assert:(o cXX isArray)]]]]. - - - - - ! Item was added: + ----- Method: CMakeVMMakerSqueakUnixConfigTest>>testCompilerFlags (in category 'as yet unclassified') ----- + testCompilerFlags + #( #SqueakUnixConfig) + do:[:each | + (Smalltalk at:each) + allSubclassesDo:[:configuration | | o buildTypes| + o:= configuration new. + (o excludeFromBuild not) & (configuration isAbstractBaseClass not) + ifTrue:[ + buildTypes:=o availableBuildTypes copyWithoutAll:#(#buildNone). + buildTypes do:[:buildType | + o configureForBuildType: buildType. + self assert:(o compilerFlags isKindOf: Collection)]]]]. + + + + + ! Item was removed: - ----- Method: CMakeVMMakerSqueakUnixConfigTest>>testLibs (in category 'as yet unclassified') ----- - testLibs - #( #SqueakUnixConfig) - do:[:each | - (Smalltalk at:each) - allSubclassesDo:[:configuration | | o buildTypes| - o:= configuration new. - (o excludeFromBuild not) & (configuration isAbstractBaseClass not) - ifTrue:[ - buildTypes:=o availableBuildTypes copyWithoutAll:#(#buildNone). - buildTypes do:[:buildType | - o configureForBuildType: buildType. - self assert:(o libs isArray)]]]]. - - - - - ! Item was removed: - ----- Method: CPlatformConfigForSqueak>>cC (in category 'cmake buildType redirects') ----- - cC - "Route this message send to the message appropriate for my buildType " - |d | - d:= SqueakCMakeVMMakerAbstractBuilder default buildTypeAndDirectoryInfo copy. - d - at: #build put: [self cCBuild]; - at: #buildAssert put: [self cCBuildAssert]; - at: #buildAssertITimerHeartbeat put: [self cCBuildAssertITimerHeartbeat]; - at:#buildDebug put: [self cCBuildDebug]; - at: #buildDebugITimerHeartbeat put: [self cCBuildDebugITimerHeartbeat ]; - at: #buildITimerHeartbeat put: [self cCBuildITimerHeartbeat]; - at: #buildMultiThreaded put: [self cCBuildMultiThreaded]; - at: #buildMultiThreadedAssert put: [self cCBuildMultiThreadedAssert]; - at: #buildMultiThreadedDebug put: [self cCBuildMultiThreadedDebug ]; - at: #buildNone put:[self cCNoBuildType]. - ^(d at: buildType) value! Item was removed: - ----- Method: CPlatformConfigForSqueak>>cCBuild (in category 'cmake buildType redirects') ----- - cCBuild - "example: - ^{ '-m32'}" - self subclassResponsibility! Item was removed: - ----- Method: CPlatformConfigForSqueak>>cCBuildAssert (in category 'cmake buildType redirects') ----- - cCBuildAssert - "examples: - ^{ '-m32'} - ^self ccBuild" - - self subclassResponsibility! Item was removed: - ----- Method: CPlatformConfigForSqueak>>cCBuildAssertITimerHeartbeat (in category 'cmake buildType redirects') ----- - cCBuildAssertITimerHeartbeat - "examples: - ^{ '-m32'} - ^self ccBuild" - - self subclassResponsibility! Item was removed: - ----- Method: CPlatformConfigForSqueak>>cCBuildDebug (in category 'cmake buildType redirects') ----- - cCBuildDebug - "examples: - ^{ '-m32'} - ^self ccBuild" - - self subclassResponsibility! Item was removed: - ----- Method: CPlatformConfigForSqueak>>cCBuildDebugITimerHeartbeat (in category 'cmake buildType redirects') ----- - cCBuildDebugITimerHeartbeat - "examples - ^{ '-m32'} - ^self ccBuild" - - self subclassResponsibility! Item was removed: - ----- Method: CPlatformConfigForSqueak>>cCBuildITimerHeartbeat (in category 'cmake buildType redirects') ----- - cCBuildITimerHeartbeat - "examples - ^{ '-m32'} - ^self ccBuild" - - self subclassResponsibility! Item was removed: - ----- Method: CPlatformConfigForSqueak>>cCBuildMultiThreaded (in category 'cmake buildType redirects') ----- - cCBuildMultiThreaded - "examples - ^{ '-m32'} - ^self ccBuild" - self subclassResponsibility! Item was removed: - ----- Method: CPlatformConfigForSqueak>>cCBuildMultiThreadedAssert (in category 'cmake buildType redirects') ----- - cCBuildMultiThreadedAssert - "examples - ^{ '-m32'} - ^self ccBuild" - self subclassResponsibility! Item was removed: - ----- Method: CPlatformConfigForSqueak>>cCBuildMultiThreadedDebug (in category 'cmake buildType redirects') ----- - cCBuildMultiThreadedDebug - "examples - ^{ '-m32'} - ^self ccBuild" - self subclassResponsibility! Item was removed: - ----- Method: CPlatformConfigForSqueak>>cCNoBuildType (in category 'cmake buildType redirects') ----- - cCNoBuildType - "SHOULD NOT GET HERE" - self shouldNotImplement. - ! Item was removed: - ----- Method: CPlatformConfigForSqueak>>cFlags (in category 'cmake buildType redirects') ----- - cFlags - "Route this message send to the message appropriate for my buildType " - |d | - self flag:'tty'. "this should be replaced by cC cXX lDFlags libs " - d:= SqueakCMakeVMMakerAbstractBuilder default buildTypeAndDirectoryInfo copy. - d - at: #build put: [self cFlagsBuild]; - at: #buildAssert put: [self cFlagsBuildAssert]; - at: #buildAssertITimerHeartbeat put: [self cFlagsBuildAssertITimerHeartbeat]; - at:#buildDebug put: [self cFlagsBuildDebug]; - at: #buildDebugITimerHeartbeat put: [self cFlagsBuildDebugITimerHeartbeat ]; - at: #buildITimerHeartbeat put: [self cFlagsBuildITimerHeartbeat]; - at: #buildMultiThreaded put: [self cFlagsBuildMultiThreaded]; - at: #buildMultiThreadedAssert put: [self cFlagsBuildMultiThreadedAssert]; - at: #buildMultiThreadedDebug put: [self cFlagsBuildMultiThreadedDebug ]; - at: #buildNone put:[self cFlagsNoBuildType]. - ^(d at: buildType) value! Item was removed: - ----- Method: CPlatformConfigForSqueak>>cFlagsBuild (in category 'cmake buildType redirects') ----- - cFlagsBuild - "This will be going away in place of cC, cXX, lDFlags, libs methods - currently, it answers a string like this: - ^'-msse2 -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -DCOGMTVM=0' - " - self subclassResponsibility! Item was removed: - ----- Method: CPlatformConfigForSqueak>>cFlagsBuildAssert (in category 'cmake buildType redirects') ----- - cFlagsBuildAssert - "This will be going away in place of cC, cXX, lDFlags, libs methods - ^self cFlagsBuild - " - - self subclassResponsibility! Item was removed: - ----- Method: CPlatformConfigForSqueak>>cFlagsBuildAssertITimerHeartbeat (in category 'cmake buildType redirects') ----- - cFlagsBuildAssertITimerHeartbeat - "This will be going away in place of cC, cXX, lDFlags, libs methods - ^self cFlagsBuild - " - - self subclassResponsibility! Item was removed: - ----- Method: CPlatformConfigForSqueak>>cFlagsBuildDebug (in category 'cmake buildType redirects') ----- - cFlagsBuildDebug - "This will be going away in place of cC, cXX, lDFlags, libs methods - ^self cFlagsBuild - " - - self subclassResponsibility! Item was removed: - ----- Method: CPlatformConfigForSqueak>>cFlagsBuildDebugITimerHeartbeat (in category 'cmake buildType redirects') ----- - cFlagsBuildDebugITimerHeartbeat - "This will be going away in place of cC, cXX, lDFlags, libs methods - ^self cFlagsBuild - " - - self subclassResponsibility! Item was removed: - ----- Method: CPlatformConfigForSqueak>>cFlagsBuildITimerHeartbeat (in category 'cmake buildType redirects') ----- - cFlagsBuildITimerHeartbeat - "This will be going away in place of cC, cXX, lDFlags, libs methods - ^self cFlagsBuild - " - - self subclassResponsibility! Item was removed: - ----- Method: CPlatformConfigForSqueak>>cFlagsBuildMultiThreaded (in category 'cmake buildType redirects') ----- - cFlagsBuildMultiThreaded - "This will be going away in place of cC, cXX, lDFlags, libs methods - ^self cFlagsBuild - " - - self subclassResponsibility! Item was removed: - ----- Method: CPlatformConfigForSqueak>>cFlagsBuildMultiThreadedAssert (in category 'cmake buildType redirects') ----- - cFlagsBuildMultiThreadedAssert - "This will be going away in place of cC, cXX, lDFlags, libs methods - ^self cFlagsBuild - " - - self subclassResponsibility! Item was removed: - ----- Method: CPlatformConfigForSqueak>>cFlagsBuildMultiThreadedDebug (in category 'cmake buildType redirects') ----- - cFlagsBuildMultiThreadedDebug - "This will be going away in place of cC, cXX, lDFlags, libs methods - ^self cFlagsBuild - " - - self subclassResponsibility! Item was removed: - ----- Method: CPlatformConfigForSqueak>>cFlagsNoBuildType (in category 'cmake buildType redirects') ----- - cFlagsNoBuildType - "SHOULD NOT GET HERE" - self shouldNotImplement. - ! Item was removed: - ----- Method: CPlatformConfigForSqueak>>cXX (in category 'cmake buildType redirects') ----- - cXX - "Route this message send to the message appropriate for my buildType " - |d | - d:= SqueakCMakeVMMakerAbstractBuilder default buildTypeAndDirectoryInfo copy. - d - at: #build put: [self cXXBuild]; - at: #buildAssert put: [self cXXBuildAssert]; - at: #buildAssertITimerHeartbeat put: [self cXXBuildAssertITimerHeartbeat]; - at:#buildDebug put: [self cXXBuildDebug]; - at: #buildDebugITimerHeartbeat put: [self cXXBuildDebugITimerHeartbeat ]; - at: #buildITimerHeartbeat put: [self cXXBuildITimerHeartbeat]; - at: #buildMultiThreaded put: [self cXXBuildMultiThreaded]; - at: #buildMultiThreadedAssert put: [self cXXBuildMultiThreadedAssert]; - at: #buildMultiThreadedDebug put: [self cXXBuildMultiThreadedDebug ]; - at: #buildNone put:[self cXXNoBuildType]. - ^(d at: buildType) value - - ! Item was removed: - ----- Method: CPlatformConfigForSqueak>>cXXBuild (in category 'cmake buildType redirects') ----- - cXXBuild - "example: - ^{ 'g++ -m32'}" - self subclassResponsibility! Item was removed: - ----- Method: CPlatformConfigForSqueak>>cXXBuildAssert (in category 'cmake buildType redirects') ----- - cXXBuildAssert - self subclassResponsibility! Item was removed: - ----- Method: CPlatformConfigForSqueak>>cXXBuildAssertITimerHeartbeat (in category 'cmake buildType redirects') ----- - cXXBuildAssertITimerHeartbeat - self subclassResponsibility! Item was removed: - ----- Method: CPlatformConfigForSqueak>>cXXBuildDebug (in category 'cmake buildType redirects') ----- - cXXBuildDebug - self subclassResponsibility! Item was removed: - ----- Method: CPlatformConfigForSqueak>>cXXBuildDebugITimerHeartbeat (in category 'cmake buildType redirects') ----- - cXXBuildDebugITimerHeartbeat - self subclassResponsibility! Item was removed: - ----- Method: CPlatformConfigForSqueak>>cXXBuildITimerHeartbeat (in category 'cmake buildType redirects') ----- - cXXBuildITimerHeartbeat - self subclassResponsibility! Item was removed: - ----- Method: CPlatformConfigForSqueak>>cXXBuildMultiThreaded (in category 'cmake buildType redirects') ----- - cXXBuildMultiThreaded - self subclassResponsibility! Item was removed: - ----- Method: CPlatformConfigForSqueak>>cXXBuildMultiThreadedAssert (in category 'cmake buildType redirects') ----- - cXXBuildMultiThreadedAssert - self subclassResponsibility! Item was removed: - ----- Method: CPlatformConfigForSqueak>>cXXBuildMultiThreadedDebug (in category 'cmake buildType redirects') ----- - cXXBuildMultiThreadedDebug - self subclassResponsibility! Item was removed: - ----- Method: CPlatformConfigForSqueak>>cXXNoBuildType (in category 'cmake buildType redirects') ----- - cXXNoBuildType - "SHOULD NOT GET HERE" - self shouldNotImplement. - ! Item was added: + ----- Method: CPlatformConfigForSqueak>>comilerFlagsBuildAssertITimerHeartbeat (in category 'cmake buildType redirects') ----- + comilerFlagsBuildAssertITimerHeartbeat + "This will be going away in place of cC, cXX, lDFlags, libs methods + ^self cFlagsBuild + " + + self subclassResponsibility! Item was changed: ----- Method: CPlatformConfigForSqueak>>compilerFlags (in category 'cmake buildType redirects') ----- compilerFlags + |d flags| - "compilerFlags routes to cFlagsXYZ in Squeak implementation. - This represents the CFLAGS line in the GNU system's mvm file that reads like CFLAGS=''$OPT -msse2 -D_GNU_SOURCE..'' " - |d | - self flag:'tty'. "figure out what from cC, cXX, lDFlags, libs to pipe into here once system is functioning" d:= SqueakCMakeVMMakerAbstractBuilder default buildTypeAndDirectoryInfo copy. d + at: #build put: [self compilerFlagsBuild]; + at: #buildAssert put: [self compilerFlagsBuildAssert]; + at: #buildAssertITimerHeartbeat put: [self compilerFlagsBuildAssertITimerHeartbeat]; + at:#buildDebug put: [self compilerFlagsBuildDebug]; + at: #buildDebugITimerHeartbeat put: [self compilerFlagsBuildDebugITimerHeartbeat ]; + at: #buildITimerHeartbeat put: [self compilerFlagsBuildITimerHeartbeat]; + at: #buildMultiThreaded put: [self compilerFlagsBuildMultiThreaded]; + at: #buildMultiThreadedAssert put: [self compilerFlagsBuildMultiThreadedAssert]; + at: #buildMultiThreadedDebug put: [self compilerFlagsBuildMultiThreadedDebug ]; + at: #buildNone put:[self compilerFlagsNoBuildType]. + flags := String + streamContents: [:stream | ((d at: buildType) value collect: #withBlanksTrimmed as: Set) + asStringOn: stream + delimiter: ' ']. + ^flags. - at: #build put: [self cFlagsBuild]; - at: #buildAssert put: [self cFlagsBuildAssert]; - at: #buildAssertITimerHeartbeat put: [self cFlagsBuildAssertITimerHeartbeat]; - at:#buildDebug put: [self cFlagsBuildDebug]; - at: #buildDebugITimerHeartbeat put: [self cFlagsBuildDebugITimerHeartbeat ]; - at: #buildITimerHeartbeat put: [self cFlagsBuildITimerHeartbeat]; - at: #buildMultiThreaded put: [self cFlagsBuildMultiThreaded]; - at: #buildMultiThreadedAssert put: [self cFlagsBuildMultiThreadedAssert]; - at: #buildMultiThreadedDebug put: [self cFlagsBuildMultiThreadedDebug ]; - at: #buildNone put:[self cFlagsNoBuildType]. - ^(d at: buildType) value ! Item was added: + ----- Method: CPlatformConfigForSqueak>>compilerFlagsBuild (in category 'cmake buildType redirects') ----- + compilerFlagsBuild + "" + self subclassResponsibility! Item was added: + ----- Method: CPlatformConfigForSqueak>>compilerFlagsBuildAssert (in category 'cmake buildType redirects') ----- + compilerFlagsBuildAssert + "^self comilerFlagsBuild + " + + self subclassResponsibility! Item was added: + ----- Method: CPlatformConfigForSqueak>>compilerFlagsBuildDebug (in category 'cmake buildType redirects') ----- + compilerFlagsBuildDebug + "^self compilerFlagsBuild" + + self subclassResponsibility! Item was added: + ----- Method: CPlatformConfigForSqueak>>compilerFlagsBuildDebugITimerHeartbeat (in category 'cmake buildType redirects') ----- + compilerFlagsBuildDebugITimerHeartbeat + " ^self compilerFlagsBuild" + + self subclassResponsibility! Item was added: + ----- Method: CPlatformConfigForSqueak>>compilerFlagsBuildITimerHeartbeat (in category 'cmake buildType redirects') ----- + compilerFlagsBuildITimerHeartbeat + "^self comilerFlagsBuild + " + + self subclassResponsibility! Item was added: + ----- Method: CPlatformConfigForSqueak>>compilerFlagsBuildMultiThreaded (in category 'cmake buildType redirects') ----- + compilerFlagsBuildMultiThreaded + "^self comilerFlagsBuild + " + + self subclassResponsibility! Item was added: + ----- Method: CPlatformConfigForSqueak>>compilerFlagsBuildMultiThreadedAssert (in category 'cmake buildType redirects') ----- + compilerFlagsBuildMultiThreadedAssert + "^self comilerFlagsBuild + " + + self subclassResponsibility! Item was added: + ----- Method: CPlatformConfigForSqueak>>compilerFlagsBuildMultiThreadedDebug (in category 'cmake buildType redirects') ----- + compilerFlagsBuildMultiThreadedDebug + "^self comilerFlagsBuild + " + + self subclassResponsibility! Item was changed: + ----- Method: CPlatformConfigForSqueak>>coreSources (in category 'cmake buildType redirects') ----- - ----- Method: CPlatformConfigForSqueak>>coreSources (in category 'source files') ----- coreSources + "Route this message send to the message appropriate for my buildType " + |d | + d:= SqueakCMakeVMMakerAbstractBuilder default buildTypeAndDirectoryInfo copy. + d + at: #build put: [self coreSourcesBuild]; + at: #buildAssert put: [self coreSourcesBuildAssert]; + at: #buildAssertITimerHeartbeat put: [self coreSourcesBuildAssertITimerHeartbeat]; + at:#buildDebug put: [self coreSourcesBuildDebug]; + at: #buildDebugITimerHeartbeat put: [self coreSourcesBuildDebugITimerHeartbeat ]; + at: #buildITimerHeartbeat put: [self coreSourcesBuildITimerHeartbeat]; + at: #buildMultiThreaded put: [self coreSourcesBuildMultiThreaded]; + at: #buildMultiThreadedAssert put: [self coreSourcesBuildMultiThreadedAssert]; + at: #buildMultiThreadedDebug put: [self coreSourcesBuildMultiThreadedDebug ]; + at: #buildNone put:[self coreSourcesNoBuildType]. + ^(d at: buildType) value! - " - SystemNavigation default browseMethodsWhoseNamesContain: 'coreSources' - ^ #( - 'cogit.c' - 'gcc3x-cointerp.c' - ) - " - self subclassResponsibility - ! Item was added: + ----- Method: CPlatformConfigForSqueak>>coreSourcesBuild (in category 'cmake buildType redirects') ----- + coreSourcesBuild + self subclassResponsibility! Item was added: + ----- Method: CPlatformConfigForSqueak>>coreSourcesBuildAssert (in category 'cmake buildType redirects') ----- + coreSourcesBuildAssert + self subclassResponsibility! Item was added: + ----- Method: CPlatformConfigForSqueak>>coreSourcesBuildAssertITimerHeartbeat (in category 'cmake buildType redirects') ----- + coreSourcesBuildAssertITimerHeartbeat + self subclassResponsibility! Item was added: + ----- Method: CPlatformConfigForSqueak>>coreSourcesBuildDebug (in category 'cmake buildType redirects') ----- + coreSourcesBuildDebug + self subclassResponsibility! Item was added: + ----- Method: CPlatformConfigForSqueak>>coreSourcesBuildDebugITimerHeartbeat (in category 'cmake buildType redirects') ----- + coreSourcesBuildDebugITimerHeartbeat + self subclassResponsibility! Item was added: + ----- Method: CPlatformConfigForSqueak>>coreSourcesBuildITimerHeartbeat (in category 'cmake buildType redirects') ----- + coreSourcesBuildITimerHeartbeat + self subclassResponsibility! Item was added: + ----- Method: CPlatformConfigForSqueak>>coreSourcesBuildMultiThreaded (in category 'cmake buildType redirects') ----- + coreSourcesBuildMultiThreaded + self subclassResponsibility! Item was added: + ----- Method: CPlatformConfigForSqueak>>coreSourcesBuildMultiThreadedAssert (in category 'cmake buildType redirects') ----- + coreSourcesBuildMultiThreadedAssert + self subclassResponsibility! Item was added: + ----- Method: CPlatformConfigForSqueak>>coreSourcesBuildMultiThreadedDebug (in category 'cmake buildType redirects') ----- + coreSourcesBuildMultiThreadedDebug + self subclassResponsibility! Item was added: + ----- Method: CPlatformConfigForSqueak>>coreSourcesNoBuildType (in category 'cmake buildType redirects') ----- + coreSourcesNoBuildType + "SHOULD NOT GET HERE" + self shouldNotImplement. + ! Item was removed: - ----- Method: CPlatformConfigForSqueak>>libs (in category 'gnu build system mvm file') ----- - libs - "Route this message send to the message appropriate for my buildType " - |d | - d:= SqueakCMakeVMMakerAbstractBuilder default buildTypeAndDirectoryInfo copy. - d - at: #build put: [self libsBuild]; - at: #buildAssert put: [self libsBuildAssert]; - at: #buildAssertITimerHeartbeat put: [self libsBuildAssertITimerHeartbeat]; - at:#buildDebug put: [self libsBuildDebug]; - at: #buildDebugITimerHeartbeat put: [self libsBuildDebugITimerHeartbeat ]; - at: #buildITimerHeartbeat put: [self libsBuildITimerHeartbeat]; - at: #buildMultiThreaded put: [self libsBuildMultiThreaded]; - at: #buildMultiThreadedAssert put: [self libsBuildMultiThreadedAssert]; - at: #buildMultiThreadedDebug put: [self libsBuildMultiThreadedDebug ]; - at: #buildNone put:[self libsNoBuildType]. - ^(d at: buildType) value! Item was removed: - ----- Method: CPlatformConfigForSqueak>>libsBuild (in category 'cmake buildType redirects') ----- - libsBuild - "Answer array of flags like the LIBS=''-lpthread -luuid'' line in the GNU system's mvm file - cat Cog/build.linux32x86/squeak.cog.v3/build/mvm - - SystemNavigation default browseMethodsWhoseNamesContain: 'libsBuild' - - ^ { - '-lpthread' - . '-luuid' - } - " - self subclassResponsibility! Item was removed: - ----- Method: CPlatformConfigForSqueak>>libsBuildAssert (in category 'cmake buildType redirects') ----- - libsBuildAssert - "Answer array of flags like the LIBS=''-lpthread -luuid'' line in the GNU system's mvm file - cat Cog/build.linux32x86/squeak.cog.v3/build/mvm - - SystemNavigation default browseMethodsWhoseNamesContain: 'libsBuild' - - ^ { - '-lpthread' - . '-luuid' - } - - ^self libsBuild - " - self subclassResponsibility! Item was removed: - ----- Method: CPlatformConfigForSqueak>>libsBuildAssertITimerHeartbeat (in category 'cmake buildType redirects') ----- - libsBuildAssertITimerHeartbeat - "Answer array of flags like the LIBS=''-lpthread -luuid'' line in the GNU system's mvm file - cat Cog/build.linux32x86/squeak.cog.v3/build/mvm - - SystemNavigation default browseMethodsWhoseNamesContain: 'libsBuild' - - ^ { - '-lpthread' - . '-luuid' - } - - ^self libsBuild - " - - self subclassResponsibility! Item was removed: - ----- Method: CPlatformConfigForSqueak>>libsBuildDebug (in category 'cmake buildType redirects') ----- - libsBuildDebug - "Answer array of flags like the LIBS=''-lpthread -luuid'' line in the GNU system's mvm file - cat Cog/build.linux32x86/squeak.cog.v3/build/mvm - - SystemNavigation default browseMethodsWhoseNamesContain: 'libsBuild' - - ^ { - '-lpthread' - . '-luuid' - } - - ^self libsBuild - " - - self subclassResponsibility! Item was removed: - ----- Method: CPlatformConfigForSqueak>>libsBuildDebugITimerHeartbeat (in category 'cmake buildType redirects') ----- - libsBuildDebugITimerHeartbeat - "Answer array of flags like the LIBS=''-lpthread -luuid'' line in the GNU system's mvm file - cat Cog/build.linux32x86/squeak.cog.v3/build/mvm - - SystemNavigation default browseMethodsWhoseNamesContain: 'libsBuild' - - ^ { - '-lpthread' - . '-luuid' - } - - ^self libsBuild - " - - self subclassResponsibility! Item was removed: - ----- Method: CPlatformConfigForSqueak>>libsBuildITimerHeartbeat (in category 'cmake buildType redirects') ----- - libsBuildITimerHeartbeat - "Answer array of flags like the LIBS=''-lpthread -luuid'' line in the GNU system's mvm file - cat Cog/build.linux32x86/squeak.cog.v3/build/mvm - - SystemNavigation default browseMethodsWhoseNamesContain: 'libsBuild' - - ^ { - '-lpthread' - . '-luuid' - } - - ^self libsBuild - " - - self subclassResponsibility! Item was removed: - ----- Method: CPlatformConfigForSqueak>>libsBuildMultiThreaded (in category 'cmake buildType redirects') ----- - libsBuildMultiThreaded - "Answer array of flags like the LIBS=''-lpthread -luuid'' line in the GNU system's mvm file - cat Cog/build.linux32x86/squeak.cog.v3/build/mvm - - SystemNavigation default browseMethodsWhoseNamesContain: 'libsBuild' - - ^ { - '-lpthread' - . '-luuid' - } - - ^self libsBuild - " - - self subclassResponsibility! Item was removed: - ----- Method: CPlatformConfigForSqueak>>libsBuildMultiThreadedAssert (in category 'cmake buildType redirects') ----- - libsBuildMultiThreadedAssert - "Answer array of flags like the LIBS=''-lpthread -luuid'' line in the GNU system's mvm file - cat Cog/build.linux32x86/squeak.cog.v3/build/mvm - - SystemNavigation default browseMethodsWhoseNamesContain: 'libsBuild' - - ^ { - '-lpthread' - . '-luuid' - } - - ^self libsBuild - " - - self subclassResponsibility! Item was removed: - ----- Method: CPlatformConfigForSqueak>>libsBuildMultiThreadedDebug (in category 'cmake buildType redirects') ----- - libsBuildMultiThreadedDebug - "Answer array of flags like the LIBS=''-lpthread -luuid'' line in the GNU system's mvm file - cat Cog/build.linux32x86/squeak.cog.v3/build/mvm - - SystemNavigation default browseMethodsWhoseNamesContain: 'libsBuild' - - ^ { - '-lpthread' - . '-luuid' - } - - ^self libsBuild - " - - self subclassResponsibility! Item was removed: - ----- Method: CPlatformConfigForSqueak>>libsNoBuildType (in category 'cmake buildType redirects') ----- - libsNoBuildType - "SHOULD NOT GET HERE" - self shouldNotImplement. - - ! Item was changed: ----- Method: CPlatformConfigForSqueak>>linkFlags (in category 'cmake buildType redirects') ----- linkFlags + " '-lSM -lICE -ldl -lGL -lpthread -lm -lnsl -lX11' -L/usr/lib32 etc..." - "Depracated Re-route this to the new libs method" |d | - self flag:'tty'. "Get rid of this method as 'libs' is the better method name for what we are doing" - self deprecated: ' use ''libs'' method instead'. d:= SqueakCMakeVMMakerAbstractBuilder default buildTypeAndDirectoryInfo copy. d + at: #build put: [self linkFlagsBuild]; + at: #buildAssert put: [self linkFlagsBuildAssert]; + at: #buildAssertITimerHeartbeat put: [self linkFlagsBuildAssertITimerHeartbeat]; + at:#buildDebug put: [self linkFlagsBuildDebug]; + at: #buildDebugITimerHeartbeat put: [self linkFlagsBuildDebugITimerHeartbeat ]; + at: #buildITimerHeartbeat put: [self linkFlagsBuildITimerHeartbeat]; + at: #buildMultiThreaded put: [self linkFlagsBuildMultiThreaded ]; + at: #buildMultiThreadedAssert put: [self linkFlagsBuildMultiThreadedAssert]; + at: #buildMultiThreadedDebug put: [self linkFlagsBuildMultiThreadedDebug ]; + at: #buildNone put:[self linkFlagsNoBuildType]. - at: #build put: [self libsBuild]; - at: #buildAssert put: [self libsBuildAssert]; - at: #buildAssertITimerHeartbeat put: [self libsBuildAssertITimerHeartbeat]; - at:#buildDebug put: [self libsBuildDebug]; - at: #buildDebugITimerHeartbeat put: [self libsBuildDebugITimerHeartbeat ]; - at: #buildITimerHeartbeat put: [self libsBuildITimerHeartbeat]; - at: #buildMultiThreaded put: [self libsBuildMultiThreaded ]; - at: #buildMultiThreadedAssert put: [self libsBuildMultiThreadedAssert]; - at: #buildMultiThreadedDebug put: [self libsBuildMultiThreadedDebug ]; - at: #buildNone put:[self libsNoBuildType]. ^(d at: buildType) value ! Item was added: + ----- Method: CPlatformConfigForSqueak>>linkFlagsBuild (in category 'cmake buildType redirects') ----- + linkFlagsBuild + "SystemNavigation default browseMethodsWhoseNamesContain: 'linkFlagsBuild' + + ^ { + '-lpthread' + . '-luuid' + } + " + self subclassResponsibility! Item was added: + ----- Method: CPlatformConfigForSqueak>>linkFlagsBuildAssert (in category 'cmake buildType redirects') ----- + linkFlagsBuildAssert + "SystemNavigation default browseMethodsWhoseNamesContain: 'linkFlagsBuildAssert' + + ^ { + '-lpthread' + . '-luuid' + } + " + self subclassResponsibility! Item was added: + ----- Method: CPlatformConfigForSqueak>>linkFlagsBuildAssertITimerHeartbeat (in category 'cmake buildType redirects') ----- + linkFlagsBuildAssertITimerHeartbeat + "SystemNavigation default browseMethodsWhoseNamesContain: 'linkFlagsBuildAssertITimerHeartbeat' + + ^ { + '-lpthread' + . '-luuid' + } + " + self subclassResponsibility! Item was added: + ----- Method: CPlatformConfigForSqueak>>linkFlagsBuildDebug (in category 'cmake buildType redirects') ----- + linkFlagsBuildDebug + "SystemNavigation default browseMethodsWhoseNamesContain: 'linkFlagsBuildDebug' + + ^ { + '-lpthread' + . '-luuid' + } + " + self subclassResponsibility! Item was added: + ----- Method: CPlatformConfigForSqueak>>linkFlagsBuildDebugITimerHeartbeat (in category 'cmake buildType redirects') ----- + linkFlagsBuildDebugITimerHeartbeat + "SystemNavigation default browseMethodsWhoseNamesContain: 'linkFlagsBuildDebugITimerHeartbeat' + + ^ { + '-lpthread' + . '-luuid' + } + " + self subclassResponsibility! Item was added: + ----- Method: CPlatformConfigForSqueak>>linkFlagsBuildITimerHeartbeat (in category 'cmake buildType redirects') ----- + linkFlagsBuildITimerHeartbeat + "SystemNavigation default browseMethodsWhoseNamesContain: 'linkFlagsBuildITimerHeartbeat' + + ^ { + '-lpthread' + . '-luuid' + } + " + self subclassResponsibility! Item was added: + ----- Method: CPlatformConfigForSqueak>>linkFlagsBuildMultiThreaded (in category 'cmake buildType redirects') ----- + linkFlagsBuildMultiThreaded + "SystemNavigation default browseMethodsWhoseNamesContain: 'linkFlagsBuildMultiThreaded' + + ^ { + '-lpthread' + . '-luuid' + } + " + self subclassResponsibility! Item was added: + ----- Method: CPlatformConfigForSqueak>>linkFlagsBuildMultiThreadedAssert (in category 'cmake buildType redirects') ----- + linkFlagsBuildMultiThreadedAssert + "SystemNavigation default browseMethodsWhoseNamesContain: 'linkFlagsBuildMultiThreadedAssert' + + ^ { + '-lpthread' + . '-luuid' + } + " + self subclassResponsibility! Item was added: + ----- Method: CPlatformConfigForSqueak>>linkFlagsBuildMultiThreadedDebug (in category 'cmake buildType redirects') ----- + linkFlagsBuildMultiThreadedDebug + "SystemNavigation default browseMethodsWhoseNamesContain: 'linkFlagsBuildMultiThreadedDebug' + + ^ { + '-lpthread' + . '-luuid' + } + " + self subclassResponsibility! Item was added: + ----- Method: CPlatformConfigForSqueak>>linkFlagsNoBuildType (in category 'cmake buildType redirects') ----- + linkFlagsNoBuildType + "SHOULD NOT GET HERE" + self shouldNotImplement. + ! Item was removed: - ----- Method: Linux32ARMv6StackV3CrossRaspbianConfig>>linkFlags (in category 'accessing') ----- - linkFlags - ^ '-lSM -lICE -ldl -lGL -lpthread -lm -lnsl -lX11'! Item was removed: - ----- Method: Linux32ARMv6StackV3RaspbianConfig>>linkFlags (in category 'accessing') ----- - linkFlags - ^ '-lSM -lICE -ldl -lGL -lpthread -lm -lnsl -lX11'! Item was removed: - ----- Method: Linux32x86Config>>cCBuild (in category 'cmake buildType redirects') ----- - cCBuild - ^{ 'gcc -m32'}! Item was removed: - ----- Method: Linux32x86Config>>cCBuildAssert (in category 'cmake buildType redirects') ----- - cCBuildAssert - ^self cCBuild! Item was removed: - ----- Method: Linux32x86Config>>cCBuildAssertITimerHeartbeat (in category 'cmake buildType redirects') ----- - cCBuildAssertITimerHeartbeat - ^self cCBuild! Item was removed: - ----- Method: Linux32x86Config>>cCBuildDebug (in category 'cmake buildType redirects') ----- - cCBuildDebug - ^self cCBuild! Item was removed: - ----- Method: Linux32x86Config>>cCBuildDebugITimerHeartbeat (in category 'cmake buildType redirects') ----- - cCBuildDebugITimerHeartbeat - ^self cCBuild! Item was removed: - ----- Method: Linux32x86Config>>cCBuildITimerHeartbeat (in category 'cmake buildType redirects') ----- - cCBuildITimerHeartbeat - ^self cCBuild! Item was removed: - ----- Method: Linux32x86Config>>cCBuildMultiThreaded (in category 'cmake buildType redirects') ----- - cCBuildMultiThreaded - ^self cCBuild! Item was removed: - ----- Method: Linux32x86Config>>cCBuildMultiThreadedAssert (in category 'cmake buildType redirects') ----- - cCBuildMultiThreadedAssert - ^self cCBuild! Item was removed: - ----- Method: Linux32x86Config>>cCBuildMultiThreadedDebug (in category 'cmake buildType redirects') ----- - cCBuildMultiThreadedDebug - ^self cCBuild! Item was removed: - ----- Method: Linux32x86Config>>cXXBuild (in category 'cmake buildType redirects') ----- - cXXBuild - ^{ 'g++ -m32'}! Item was removed: - ----- Method: Linux32x86Config>>cXXBuildAssert (in category 'cmake buildType redirects') ----- - cXXBuildAssert - ^self cXXBuild! Item was removed: - ----- Method: Linux32x86Config>>cXXBuildAssertITimerHeartbeat (in category 'cmake buildType redirects') ----- - cXXBuildAssertITimerHeartbeat - ^self cXXBuild! Item was removed: - ----- Method: Linux32x86Config>>cXXBuildDebug (in category 'cmake buildType redirects') ----- - cXXBuildDebug - ^self cXXBuild! Item was removed: - ----- Method: Linux32x86Config>>cXXBuildDebugITimerHeartbeat (in category 'cmake buildType redirects') ----- - cXXBuildDebugITimerHeartbeat - ^self cXXBuild! Item was removed: - ----- Method: Linux32x86Config>>cXXBuildITimerHeartbeat (in category 'cmake buildType redirects') ----- - cXXBuildITimerHeartbeat - ^self cXXBuild! Item was removed: - ----- Method: Linux32x86Config>>cXXBuildMultiThreaded (in category 'cmake buildType redirects') ----- - cXXBuildMultiThreaded - ^self cXXBuild! Item was removed: - ----- Method: Linux32x86Config>>cXXBuildMultiThreadedAssert (in category 'cmake buildType redirects') ----- - cXXBuildMultiThreadedAssert - ^self cXXBuild! Item was removed: - ----- Method: Linux32x86Config>>cXXBuildMultiThreadedDebug (in category 'cmake buildType redirects') ----- - cXXBuildMultiThreadedDebug - ^self cXXBuild! Item was changed: ----- Method: Linux32x86Config>>commonCompilerFlags (in category 'compiler flags') ----- commonCompilerFlags + ^{ } - "avoid premature optimization. push this decision down lower if it is needed at all" - ^{ '-DLSB_FIRST=1'. - '-DUSE_GLOBAL_STRUCT=0'. - '-DCOGMTVM=1'. - '-m32'} ! Item was removed: - ----- Method: Linux32x86Config>>coreSources (in category 'sources') ----- - coreSources - "files to include from src/vm dir" - ^ #( - 'cogit.c' - 'gcc3x-cointerp.c' - )! Item was added: + ----- Method: Linux32x86Config>>coreSourcesBuild (in category 'cmake buildType redirects') ----- + coreSourcesBuild + "files to include from src/vm dir" + ^ #( + 'cogit.c' + 'cointerp.c' + )! Item was added: + ----- Method: Linux32x86Config>>coreSourcesBuildAssert (in category 'cmake buildType redirects') ----- + coreSourcesBuildAssert + ^self coreSourcesBuild ! Item was added: + ----- Method: Linux32x86Config>>coreSourcesBuildAssertITimerHeartbeat (in category 'cmake buildType redirects') ----- + coreSourcesBuildAssertITimerHeartbeat + ^self coreSourcesBuild ! Item was added: + ----- Method: Linux32x86Config>>coreSourcesBuildDebug (in category 'cmake buildType redirects') ----- + coreSourcesBuildDebug + ^self coreSourcesBuild ! Item was added: + ----- Method: Linux32x86Config>>coreSourcesBuildDebugITimerHeartbeat (in category 'cmake buildType redirects') ----- + coreSourcesBuildDebugITimerHeartbeat + ^self coreSourcesBuild ! Item was added: + ----- Method: Linux32x86Config>>coreSourcesBuildITimerHeartbeat (in category 'cmake buildType redirects') ----- + coreSourcesBuildITimerHeartbeat + ^self coreSourcesBuild ! Item was added: + ----- Method: Linux32x86Config>>coreSourcesBuildMultiThreaded (in category 'cmake buildType redirects') ----- + coreSourcesBuildMultiThreaded + "files to include from src/vm dir" + ^ #( + 'cogit.c' + 'cointerpmt.c' + )! Item was added: + ----- Method: Linux32x86Config>>coreSourcesBuildMultiThreadedAssert (in category 'cmake buildType redirects') ----- + coreSourcesBuildMultiThreadedAssert + ^self coreSourcesBuildMultiThreaded ! Item was added: + ----- Method: Linux32x86Config>>coreSourcesBuildMultiThreadedDebug (in category 'cmake buildType redirects') ----- + coreSourcesBuildMultiThreadedDebug + ^self coreSourcesBuildMultiThreaded ! Item was changed: ----- Method: Linux32x86Config>>lDFlagsBuild (in category 'cmake buildType redirects') ----- lDFlagsBuild "Answer array of flags like the LDFLAGS=-Wl,-z,now line in the GNU system's mvm file cat Cog/build.linux32x86/squeak.cog.v3/build/mvm" ^ { '-Wl' . '-z' . 'now' + } ! Item was removed: - ----- Method: Linux32x86Config>>libsBuild (in category 'cmake buildType redirects') ----- - libsBuild - "Answer array of flags like the LIBS=''-lpthread -luuid'' line in the GNU system's mvm file - cat Cog/build.linux32x86/squeak.cog.v3/build/mvm SystemNavigation default browseMethodsWhoseNamesContain: 'libsBuild'" - ^ { - '-lpthread' - . '-luuid' - }! Item was removed: - ----- Method: Linux32x86Config>>libsBuildAssert (in category 'cmake buildType redirects') ----- - libsBuildAssert - ^self libsBuild! Item was removed: - ----- Method: Linux32x86Config>>libsBuildAssertITimerHeartbeat (in category 'cmake buildType redirects') ----- - libsBuildAssertITimerHeartbeat - ^self libsBuild! Item was removed: - ----- Method: Linux32x86Config>>libsBuildDebug (in category 'cmake buildType redirects') ----- - libsBuildDebug - ^self libsBuild! Item was removed: - ----- Method: Linux32x86Config>>libsBuildDebugITimerHeartbeat (in category 'cmake buildType redirects') ----- - libsBuildDebugITimerHeartbeat - ^self libsBuild! Item was removed: - ----- Method: Linux32x86Config>>libsBuildITimerHeartbeat (in category 'cmake buildType redirects') ----- - libsBuildITimerHeartbeat - ^self libsBuild! Item was removed: - ----- Method: Linux32x86Config>>libsBuildMultiThreaded (in category 'cmake buildType redirects') ----- - libsBuildMultiThreaded - ^self libsBuild! Item was removed: - ----- Method: Linux32x86Config>>libsBuildMultiThreadedAssert (in category 'cmake buildType redirects') ----- - libsBuildMultiThreadedAssert - ^self libsBuild! Item was removed: - ----- Method: Linux32x86Config>>libsBuildMultiThreadedDebug (in category 'cmake buildType redirects') ----- - libsBuildMultiThreadedDebug - ^self libsBuild! Item was added: + ----- Method: Linux32x86Config>>linkFlagsBuild (in category 'cmake buildType redirects') ----- + linkFlagsBuild + "Answer array of flags like the LIBS=''-lpthread -luuid'' line in the GNU system's mvm file + cat Cog/build.linux32x86/squeak.cog.v3/build/mvm SystemNavigation default browseMethodsWhoseNamesContain: 'libsBuild'" + ^ { + '-lpthread' + . '-luuid' + }! Item was added: + ----- Method: Linux32x86Config>>linkFlagsBuildAssert (in category 'cmake buildType redirects') ----- + linkFlagsBuildAssert + ^self linkFlagsBuild! Item was added: + ----- Method: Linux32x86Config>>linkFlagsBuildAssertITimerHeartbeat (in category 'cmake buildType redirects') ----- + linkFlagsBuildAssertITimerHeartbeat + ^self linkFlagsBuild! Item was added: + ----- Method: Linux32x86Config>>linkFlagsBuildDebug (in category 'cmake buildType redirects') ----- + linkFlagsBuildDebug + ^self linkFlagsBuild! Item was added: + ----- Method: Linux32x86Config>>linkFlagsBuildDebugITimerHeartbeat (in category 'cmake buildType redirects') ----- + linkFlagsBuildDebugITimerHeartbeat + ^self linkFlagsBuild! Item was added: + ----- Method: Linux32x86Config>>linkFlagsBuildITimerHeartbeat (in category 'cmake buildType redirects') ----- + linkFlagsBuildITimerHeartbeat + ^self linkFlagsBuild! Item was added: + ----- Method: Linux32x86Config>>linkFlagsBuildMultiThreaded (in category 'cmake buildType redirects') ----- + linkFlagsBuildMultiThreaded + ^self linkFlagsBuild! Item was added: + ----- Method: Linux32x86Config>>linkFlagsBuildMultiThreadedAssert (in category 'cmake buildType redirects') ----- + linkFlagsBuildMultiThreadedAssert + ^self linkFlagsBuild! Item was added: + ----- Method: Linux32x86Config>>linkFlagsBuildMultiThreadedDebug (in category 'cmake buildType redirects') ----- + linkFlagsBuildMultiThreadedDebug + ^self linkFlagsBuild! Item was changed: ----- Method: Linux32x86Config>>setExtraTargetPropertiesBuild: (in category 'utils') ----- setExtraTargetPropertiesBuild: aMaker self flag:'tty'. "I am nervous about this method up here in this class, but pharo has it in CogUnixConfig, so using as is for now" aMaker setTargetProperties: 'LINK_FLAGS "-m32"'. aMaker puts: 'set_source_files_properties( ${srcVMDir}/cogit.c PROPERTIES COMPILE_FLAGS "-O1 -fno-omit-frame-pointer -momit-leaf-frame-pointer -mno-rtd -mno-accumulate-outgoing-args")'. aMaker cmd: 'set_source_files_properties' params: ' ${targetPlatform}/vm/sqUnixHeartbeat.c PROPERTIES COMPILE_FLAGS "-O1 -fno-omit-frame-pointer -mno-rtd -mno-accumulate-outgoing-args"'. + aMaker + cmd:'set_target_properties' + params: '${_name} PROPERTIES LINK_FLAGS "-undefined gl"'. + + - aMaker addExternalLibraries: #( 'uuid' "" 'ssl' "" 'crypto' "" + 'm' + 'dl' + 'pthread' - 'm' "math lib" - 'dl' "dynamic loader" - 'pthread' "posix threads" ). + aMaker set: 'EXECUTABLE_OUTPUT_PATH' toString: self outputDir fullName. self addVMDrivers: aMaker.! Item was removed: - ----- Method: Linux32x86SqueakCogV3Config>>cFlagsBuild (in category 'cmake buildType redirects') ----- - cFlagsBuild - "Some gcc versions (3.4*) create a broken VM using -O2, so try -O1 if you have problems" - ^'-g -O2 -m32 -msse2 -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -DNDEBUG -DLSB_FIRST=1 - -DUSE_GLOBAL_STRUCT=0 -DDEBUGVM=0 - -DCOGMTVM=0'! Item was removed: - ----- Method: Linux32x86SqueakCogV3Config>>cFlagsBuildAssert (in category 'cmake buildType redirects') ----- - cFlagsBuildAssert - ^'-g3 -O1 -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer -DDEBUGVM=0 -msse2 -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -DCOGMTVM=0'! Item was removed: - ----- Method: Linux32x86SqueakCogV3Config>>cFlagsBuildAssertITimerHeartbeat (in category 'cmake buildType redirects') ----- - cFlagsBuildAssertITimerHeartbeat - ^'-g3 -O1 -m32 -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer -msse2 - -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -DCOGMTVM=0 -DITIMER_HEARTBEAT=1 -DLSB_FIRST=1 -DUSE_GLOBAL_STRUCT=0 -DDEBUGVM=0 '! Item was removed: - ----- Method: Linux32x86SqueakCogV3Config>>cFlagsBuildDebug (in category 'cmake buildType redirects') ----- - cFlagsBuildDebug - ^'-g3 -O0 -msse2 -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -DCOGMTVM=1'! Item was removed: - ----- Method: Linux32x86SqueakCogV3Config>>cFlagsBuildDebugITimerHeartbeat (in category 'cmake buildType redirects') ----- - cFlagsBuildDebugITimerHeartbeat - ^'-g3 -O0 -DDEBUGVM=1 -msse2 -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -DCOGMTVM=0 -DITIMER_HEARTBEAT=1 '! Item was removed: - ----- Method: Linux32x86SqueakCogV3Config>>cFlagsBuildITimerHeartbeat (in category 'cmake buildType redirects') ----- - cFlagsBuildITimerHeartbeat - "Some gcc versions (3.4*) create a broken VM using -O2, so try -O1 if you have problems" - ^'-g -O2 -DNDEBUG -DDEBUGVM=0 -msse2 -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -DCOGMTVM=0 -DITIMER_HEARTBEAT=1 '! Item was removed: - ----- Method: Linux32x86SqueakCogV3Config>>cFlagsBuildMultiThreaded (in category 'cmake buildType redirects') ----- - cFlagsBuildMultiThreaded - "Some gcc versions (3.4*) create a broken VM using -O2, so try -O1 if you have problems" - ^'-g -O2 -DNDEBUG -DDEBUGVM=0 -msse2 -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -DCOGMTVM=1'! Item was removed: - ----- Method: Linux32x86SqueakCogV3Config>>cFlagsBuildMultiThreadedAssert (in category 'cmake buildType redirects') ----- - cFlagsBuildMultiThreadedAssert - ^'-g3 -O1 -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer -DDEBUGVM=0 -msse2 -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -DCOGMTVM=1'! Item was removed: - ----- Method: Linux32x86SqueakCogV3Config>>cFlagsBuildMultiThreadedDebug (in category 'cmake buildType redirects') ----- - cFlagsBuildMultiThreadedDebug - ^'-g3 -O0 -DDEBUGVM=1 -msse2 -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -DCOGMTVM=1'! Item was changed: ----- Method: Linux32x86SqueakCogV3Config>>compilerFlagsBuild (in category 'cmake buildType redirects') ----- compilerFlagsBuild + "Some gcc versions (3.4*) create a broken VM using -O2, so try -O1 if you have problems" + ^{ + '-g0' + .'-O2' + .'-m32' + .'-msse2' + .'-D_GNU_SOURCE' + .'-D_FILE_OFFSET_BITS=64' + .'-DNDEBUG' + .'-DLSB_FIRST=1' + .'-DUSE_GLOBAL_STRUCT=0' + .'-DDEBUGVM=0' + .'-DCOGMTVM=0' + .'-fno-tree-pre ' + .'-fno-caller-saves'} + + + ! - ^{}! Item was changed: ----- Method: Linux32x86SqueakCogV3Config>>compilerFlagsBuildAssert (in category 'cmake buildType redirects') ----- compilerFlagsBuildAssert + ^ self compilerFlagsBuild - ^self compilerFlagsBuild ! Item was changed: ----- Method: Linux32x86SqueakCogV3Config>>compilerFlagsBuildAssertITimerHeartbeat (in category 'cmake buildType redirects') ----- compilerFlagsBuildAssertITimerHeartbeat + ^ self compilerFlagsBuild! - ^self compilerFlagsBuild - ! Item was changed: ----- Method: Linux32x86SqueakCogV3Config>>compilerFlagsBuildDebug (in category 'cmake buildType redirects') ----- compilerFlagsBuildDebug + ^ self compilerFlagsBuild! - ^self compilerFlagsBuild - ! Item was changed: ----- Method: Linux32x86SqueakCogV3NoGLConfig>>configHBuild (in category 'as yet unclassified') ----- configHBuild " right now its like that " + ^'/* config.h. Generated by configure. */ - ^ '/* config.h. Generated by configure. */ /* config.h.in -- template for config.h -*- C -*- * * Copyright (C) 1996-2007 by Ian Piumarta and other authors/contributors * listed elsewhere in this file. * All rights reserved. * * This file is part of Unix Squeak. * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal * in the Software without restriction, including without limitation the rights * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell * copies of the Software, and to permit persons to whom the Software is * furnished to do so, subject to the following conditions: * * The above copyright notice and this permission notice shall be included in * all copies or substantial portions of the Software. * * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ /* Author: Ian.Piumarta(a)squeakland.org * * Last edited: 2006-04-23 12:34:41 by piumarta on emilia.local */ #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 0 /* #undef USE_QUARTZ */ /* #undef USE_QUARTZ_CGL */ /* #undef USE_RFB */ /* libraries */ /* #undef HAVE_LIBX11 */ #define HAVE_LIBXEXT 1 #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 /* #undef HAVE_GL_GL_H */ /* #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 squeakInt64 long long /* architecture */ #define OS_TYPE "unix" #define VM_HOST "x86_64-linux-gnu" #define VM_HOST_CPU "x86_64" /* #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 "4.2-0" #define VM_VERSION "4.0-3020" #define VM_MODULE_PREFIX "" /* #undef VM_DLSYM_PREFIX */ #define VM_X11DIR "/usr/lib" /* avoid dependencies on glibc2.3 */ #define HAVE_FEATURES_H 1 #if defined(HAVE_FEATURES_H) # include "glibc.h" #endif #endif /* __sq_config_h */ + '! - - - '! Item was removed: - ----- Method: Linux32x86SqueakCogV3NoGLConfig>>libsBuild (in category 'as yet unclassified') ----- - libsBuild - ^ '-lSM -lICE -ldl -lpthread -lm -lnsl -lX11'! Item was added: + ----- Method: Linux32x86SqueakCogV3NoGLConfig>>linkFlagsBuild (in category 'as yet unclassified') ----- + linkFlagsBuild + ^ {'-lSM' + . '-lICE ' + . '-ldl' + . '-lpthread' + . '-lm' + . '-lnsl' + . '-lX11' + . '-luuid'}! Item was removed: - ----- Method: Linux64Config>>coreSources (in category 'source files') ----- - coreSources - "files to include from src/vm dir" - ^ #( - 'cogit.c' - 'gcc3x-cointerp.c' - )! Item was added: + ----- Method: Linux64Config>>coreSourcesBuild (in category 'cmake buildType redirects') ----- + coreSourcesBuild + "files to include from src/vm dir" + ^ #( + 'cogit.c' + 'gcc3x-cointerp.c' + )! Item was added: + ----- Method: Linux64Config>>coreSourcesBuildAssert (in category 'cmake buildType redirects') ----- + coreSourcesBuildAssert + ^self coreSourcesBuild ! Item was added: + ----- Method: Linux64Config>>coreSourcesBuildAssertITimerHeartbeat (in category 'cmake buildType redirects') ----- + coreSourcesBuildAssertITimerHeartbeat + ^self coreSourcesBuild ! Item was added: + ----- Method: Linux64Config>>coreSourcesBuildDebug (in category 'cmake buildType redirects') ----- + coreSourcesBuildDebug + ^self coreSourcesBuild ! Item was added: + ----- Method: Linux64Config>>coreSourcesBuildDebugITimerHeartbeat (in category 'cmake buildType redirects') ----- + coreSourcesBuildDebugITimerHeartbeat + ^self coreSourcesBuild ! Item was added: + ----- Method: Linux64Config>>coreSourcesBuildITimerHeartbeat (in category 'cmake buildType redirects') ----- + coreSourcesBuildITimerHeartbeat + ^self coreSourcesBuild ! Item was added: + ----- Method: Linux64Config>>coreSourcesBuildMultiThreaded (in category 'cmake buildType redirects') ----- + coreSourcesBuildMultiThreaded + "files to include from src/vm dir" + ^ #( + 'cogit.c' + 'cointerpmt.c' + )! Item was added: + ----- Method: Linux64Config>>coreSourcesBuildMultiThreadedAssert (in category 'cmake buildType redirects') ----- + coreSourcesBuildMultiThreadedAssert + ^self coreSourcesBuildMultiThreaded ! Item was added: + ----- Method: Linux64Config>>coreSourcesBuildMultiThreadedDebug (in category 'cmake buildType redirects') ----- + coreSourcesBuildMultiThreadedDebug + ^self coreSourcesBuildMultiThreaded ! Item was removed: - ----- Method: Linux64x86w32BitConfig>>coreSources (in category 'sources') ----- - coreSources - "files to include from src/vm dir" - ^ #( - 'cogit.c' - 'gcc3x-cointerp.c' - )! Item was added: + ----- Method: Linux64x86w32BitConfig>>coreSourcesBuild (in category 'cmake buildType redirects') ----- + coreSourcesBuild + "files to include from src/vm dir" + ^ #( + 'cogit.c' + 'gcc3x-cointerp.c' + )! Item was added: + ----- Method: Linux64x86w32BitConfig>>coreSourcesBuildAssert (in category 'cmake buildType redirects') ----- + coreSourcesBuildAssert + ^self coreSourcesBuild ! Item was added: + ----- Method: Linux64x86w32BitConfig>>coreSourcesBuildAssertITimerHeartbeat (in category 'cmake buildType redirects') ----- + coreSourcesBuildAssertITimerHeartbeat + ^self coreSourcesBuild ! Item was added: + ----- Method: Linux64x86w32BitConfig>>coreSourcesBuildDebug (in category 'cmake buildType redirects') ----- + coreSourcesBuildDebug + ^self coreSourcesBuild ! Item was added: + ----- Method: Linux64x86w32BitConfig>>coreSourcesBuildDebugITimerHeartbeat (in category 'cmake buildType redirects') ----- + coreSourcesBuildDebugITimerHeartbeat + ^self coreSourcesBuild ! Item was added: + ----- Method: Linux64x86w32BitConfig>>coreSourcesBuildITimerHeartbeat (in category 'cmake buildType redirects') ----- + coreSourcesBuildITimerHeartbeat + ^self coreSourcesBuild ! Item was added: + ----- Method: Linux64x86w32BitConfig>>coreSourcesBuildMultiThreaded (in category 'cmake buildType redirects') ----- + coreSourcesBuildMultiThreaded + "files to include from src/vm dir" + ^ #( + 'cogit.c' + 'cointerpmt.c' + )! Item was added: + ----- Method: Linux64x86w32BitConfig>>coreSourcesBuildMultiThreadedAssert (in category 'cmake buildType redirects') ----- + coreSourcesBuildMultiThreadedAssert + ^self coreSourcesBuildMultiThreaded ! Item was added: + ----- Method: Linux64x86w32BitConfig>>coreSourcesBuildMultiThreadedDebug (in category 'cmake buildType redirects') ----- + coreSourcesBuildMultiThreadedDebug + ^self coreSourcesBuildMultiThreaded ! Item was added: + ----- Method: SqueakBSDConfig>>coreSourcesBuild (in category 'cmake buildType redirects') ----- + coreSourcesBuild + "files to include from src/vm dir" + ^ #( + 'cogit.c' + 'cointerp.c' + )! Item was added: + ----- Method: SqueakBSDConfig>>coreSourcesBuildAssert (in category 'cmake buildType redirects') ----- + coreSourcesBuildAssert + ^self coreSourcesBuild ! Item was added: + ----- Method: SqueakBSDConfig>>coreSourcesBuildAssertITimerHeartbeat (in category 'cmake buildType redirects') ----- + coreSourcesBuildAssertITimerHeartbeat + ^self coreSourcesBuild ! Item was added: + ----- Method: SqueakBSDConfig>>coreSourcesBuildDebug (in category 'cmake buildType redirects') ----- + coreSourcesBuildDebug + ^self coreSourcesBuild ! Item was added: + ----- Method: SqueakBSDConfig>>coreSourcesBuildDebugITimerHeartbeat (in category 'cmake buildType redirects') ----- + coreSourcesBuildDebugITimerHeartbeat + ^self coreSourcesBuild ! Item was added: + ----- Method: SqueakBSDConfig>>coreSourcesBuildITimerHeartbeat (in category 'cmake buildType redirects') ----- + coreSourcesBuildITimerHeartbeat + ^self coreSourcesBuild ! Item was added: + ----- Method: SqueakBSDConfig>>coreSourcesBuildMultiThreaded (in category 'cmake buildType redirects') ----- + coreSourcesBuildMultiThreaded + "files to include from src/vm dir" + ^ #( + 'cogit.c' + 'cointerpmt.c' + )! Item was added: + ----- Method: SqueakBSDConfig>>coreSourcesBuildMultiThreadedAssert (in category 'cmake buildType redirects') ----- + coreSourcesBuildMultiThreadedAssert + ^self coreSourcesBuildMultiThreaded ! Item was added: + ----- Method: SqueakBSDConfig>>coreSourcesBuildMultiThreadedDebug (in category 'cmake buildType redirects') ----- + coreSourcesBuildMultiThreadedDebug + ^self coreSourcesBuildMultiThreaded ! Item was changed: ----- Method: SqueakMacintoshConfig>>configureForBuildType: (in category 'cmake configuration') ----- configureForBuildType: aSymbol "Set my internal state appropriate for my build type". self flag:'tty'. self configureNoBuildType. "reset all internal flags" buildType:= aSymbol. "error checking was handled previously" self preferredIncludes; standardIncludes; + - " - Cog/build.macos32x86/squeak.cog.v3/mvm makes no reference (that I can see) of these variables. - cC; - cXX; - lDFlags; - libs; - " internalPlugins; externalPlugins. ! Item was removed: - ----- Method: SqueakSunOS32x86Config>>coreSources (in category 'source files') ----- - coreSources - self flag:'tty'. "Is this correct for this platform?" - ^ #( - 'cogit.c' - 'gcc3x-cointerp.c' - )! Item was added: + ----- Method: SqueakSunOS32x86Config>>coreSourcesBuild (in category 'cmake buildType redirects') ----- + coreSourcesBuild + self flag:'tty'. "Is this correct for this platform?" + ^ #( + 'cogit.c' + 'gcc3x-cointerp.c' + )! Item was added: + ----- Method: SqueakSunOS32x86Config>>coreSourcesBuildAssert (in category 'cmake buildType redirects') ----- + coreSourcesBuildAssert + ^self coreSourcesBuild + ! Item was added: + ----- Method: SqueakSunOS32x86Config>>coreSourcesBuildAssertITimerHeartbeat (in category 'cmake buildType redirects') ----- + coreSourcesBuildAssertITimerHeartbeat + ^self coreSourcesBuild + ! Item was added: + ----- Method: SqueakSunOS32x86Config>>coreSourcesBuildDebug (in category 'cmake buildType redirects') ----- + coreSourcesBuildDebug + ^self coreSourcesBuild + ! Item was added: + ----- Method: SqueakSunOS32x86Config>>coreSourcesBuildDebugITimerHeartbeat (in category 'cmake buildType redirects') ----- + coreSourcesBuildDebugITimerHeartbeat + ^self coreSourcesBuild + ! Item was added: + ----- Method: SqueakSunOS32x86Config>>coreSourcesBuildITimerHeartbeat (in category 'cmake buildType redirects') ----- + coreSourcesBuildITimerHeartbeat + ^self coreSourcesBuild + ! Item was added: + ----- Method: SqueakSunOS32x86Config>>coreSourcesBuildMultiThreaded (in category 'cmake buildType redirects') ----- + coreSourcesBuildMultiThreaded + ^self coreSourcesBuild + ! Item was added: + ----- Method: SqueakSunOS32x86Config>>coreSourcesBuildMultiThreadedAssert (in category 'cmake buildType redirects') ----- + coreSourcesBuildMultiThreadedAssert + ^self coreSourcesBuild + ! Item was added: + ----- Method: SqueakSunOS32x86Config>>coreSourcesBuildMultiThreadedDebug (in category 'cmake buildType redirects') ----- + coreSourcesBuildMultiThreadedDebug + ^self coreSourcesBuild + ! Item was changed: ----- Method: SqueakUnixConfig>>configH (in category 'cmake buildType redirects') ----- configH "Route this message send to the message appropriate for my buildType " |d | self flag:'tty'. "this should be replaced by cC cXX lDFlags libs " d:= SqueakCMakeVMMakerAbstractBuilder default buildTypeAndDirectoryInfo copy. d at: #build put: [self configHBuild]; at: #buildAssert put: [self configHBuildAssert]; at: #buildAssertITimerHeartbeat put: [self configHBuildAssertITimerHeartbeat]; + at:#buildDebug put: [self configHBuildDebug]; - at:#buildDebug put: [self cFlagsBuildDebug]; at: #buildDebugITimerHeartbeat put: [self configHBuildDebugITimerHeartbeat ]; at: #buildITimerHeartbeat put: [self configHBuildITimerHeartbeat]; at: #buildMultiThreaded put: [self configHBuildMultiThreaded]; at: #buildMultiThreadedAssert put: [self configHBuildMultiThreadedAssert]; at: #buildMultiThreadedDebug put: [self configHBuildMultiThreadedDebug ]; at: #buildNone put:[self configHNoBuildType]. ^(d at: buildType) value "ONLY USED ON UNIX CONFIGS included here for completeness and consistency CogUnixConfig browse. Use configH to tell your plugins where to find its libraries etc. The version of this is platform dependent. You may also need to edit your oscogvm/platforms/YOUR PLATFORM/plugins/ThePLuginDirectory/acinclude.m4 file so that it conforms to your system. tty needed a custom version of this in Linux32x86SqueakCogV3NoGLConfig in order to build the UUIDPlugin. Go to oscogvm/platforms/YOUR PLATFORM/plugins/ThePLuginDirectory and look at the acinclude.m4 file you may need to edit that . NOTE: CPlatformConfig contains a useable version of this that you can modify. I reproduce it here, but with double quotes changed to two single quotes so that the commenting will hold. I provide a <---N.B quotes need changing at each place they have been modified. Again. it is easier to copy the one in CPlatformConfig." ! Item was changed: ----- Method: SqueakUnixConfig>>configureForBuildType: (in category 'cmake configuration') ----- configureForBuildType: aSymbol "Set my internal state appropriate for my build type". self configureNoBuildType. "reset all internal flags" buildType:= aSymbol. "error checking was handled previously" self preferredIncludes; standardIncludes; configureFlags; " configure --without-npsqueak --with-src=stacksrc --with-plugins=src/plugins --disable-cogi --without-vm-display-fbdev --x-libraries=/usr/lib --without-gl " + compilerFlags; + linkFlags; " LIBS=''-lpthread -luuid''" - cC; " CC=''gcc -m32 -v''" - cXX; "CXX=''g++ -m32'" - lDFlags; " LDFLAGS=-Wl,-z,now" - libs; " LIBS=''-lpthread -luuid''" internalPlugins; externalPlugins. ! Item was removed: - ----- Method: SqueakWin32x86Config>>coreSources (in category 'source files') ----- - coreSources - "files to include from src/vm dir" - - ^ #( - 'cogit.c' - 'gcc3x-cointerp.c' - )! Item was added: + ----- Method: SqueakWin32x86Config>>coreSourcesBuild (in category 'source files') ----- + coreSourcesBuild + "files to include from src/vm dir" + + ^ #( + 'cogit.c' + 'gcc3x-cointerp.c' + )! Item was added: + ----- Method: SqueakWin32x86Config>>coreSourcesBuildAssert (in category 'source files') ----- + coreSourcesBuildAssert + ^self coreSourcesBuild + ! Item was added: + ----- Method: SqueakWin32x86Config>>coreSourcesBuildAssertITimerHeartbeat (in category 'source files') ----- + coreSourcesBuildAssertITimerHeartbeat + ^self coreSourcesBuild + ! Item was added: + ----- Method: SqueakWin32x86Config>>coreSourcesBuildDebug (in category 'source files') ----- + coreSourcesBuildDebug + ^self coreSourcesBuild + ! Item was added: + ----- Method: SqueakWin32x86Config>>coreSourcesBuildDebugITimerHeartbeat (in category 'source files') ----- + coreSourcesBuildDebugITimerHeartbeat + ^self coreSourcesBuild + ! Item was added: + ----- Method: SqueakWin32x86Config>>coreSourcesBuildITimerHeartbeat (in category 'source files') ----- + coreSourcesBuildITimerHeartbeat + ^self coreSourcesBuild + ! Item was added: + ----- Method: SqueakWin32x86Config>>coreSourcesBuildMultiThreaded (in category 'source files') ----- + coreSourcesBuildMultiThreaded + ^self coreSourcesBuild + ! Item was added: + ----- Method: SqueakWin32x86Config>>coreSourcesBuildMultiThreadedAssert (in category 'source files') ----- + coreSourcesBuildMultiThreadedAssert + ^self coreSourcesBuild + ! Item was added: + ----- Method: SqueakWin32x86Config>>coreSourcesBuildMultiThreadedDebug (in category 'source files') ----- + coreSourcesBuildMultiThreadedDebug + ^self coreSourcesBuild + ! Item was changed: ----- Method: SqueakWindowsConfig>>configureForBuildType: (in category 'cmake configuration') ----- configureForBuildType: aSymbol "Set my internal state appropriate for my build type". self configureNoBuildType. "reset all internal flags" buildType:= aSymbol. "error checking was handled previously" self preferredIncludes; standardIncludes; " configureFlags; configure --without-npsqueak --with-src=stacksrc --with-plugins=src/plugins --disable-cogi --without-vm-display-fbdev --x-libraries=/usr/lib --without-gl " + compilerFlags; + linkFlags; " LIBS=''-lpthread -luuid''" - cC; " CC=''gcc -m32 -v''" - cXX; "CXX=''g++ -m32'" - lDFlags; " LDFLAGS=-Wl,-z,now" - libs; " LIBS=''-lpthread -luuid''" internalPlugins; externalPlugins. !

1 0

Re: [Vm-dev] VM Maker: Fix VMMaker.oscog-eem.787.mcz
by Eliot Miranda 30 Jun '14

30 Jun '14

Hi David, can you please delete this for me? ANother example of inadvertently nudging the mouse and changing keyboard focus. Got to update my image to pull in Karl's fix pronto :-) On Sat, Jun 28, 2014 at 7:20 PM, <commits(a)source.squeak.org> wrote: > > Eliot Miranda uploaded a new version of VMMaker to project VM Maker: > http://source.squeak.org/VMMaker/Fix VMMaker.oscog-eem.787.mcz > > ==================== Summary ==================== > > Name: Fix VMMaker.oscog-eem.787 > Author: eem > Time: 28 June 2014, 7:19:54.984 pm > UUID: a9fe951c-7914-49b0-a008-20c39417cae0 > Ancestors: VMMaker.oscog-eem.786 > > Fix return types for positive[64/32]BitValueOf: in InterpreterProxy > (& hence in sqVirtualMachine.[ch] soon). > > Use positiveMachineIntegerValueOf: to decode arg in > primitiveNewWithArg and ensure positiveMachineIntegerValueOf: > is inlined there-in. > > =============== Diff against VMMaker.oscog-eem.786 =============== > > Item was changed: > ----- Method: InterpreterPrimitives>>positiveMachineIntegerValueOf: (in > category 'primitive support') ----- > positiveMachineIntegerValueOf: oop > "Answer a value of an integer in address range, i.e up to the size > of a machine word. > The object may be either a positive SmallInteger or a > LargePositiveInteger of size <= word size." > <returnTypeC: #'unsigned long'> > + <inline: true> "only two callers & one is primitiveNewWithArg" > | value bs ok | > (objectMemory isIntegerObject: oop) ifTrue: > [value := objectMemory integerValueOf: oop. > value < 0 ifTrue: [^self primitiveFail]. > ^value]. > > ok := objectMemory > isClassOfNonImm: oop > equalTo: (objectMemory splObj: > ClassLargePositiveInteger) > compactClassIndex: > ClassLargePositiveIntegerCompactIndex. > (ok and: [(bs := objectMemory lengthOf: oop) <= (self sizeof: > #'unsigned long')]) ifFalse: > [^self primitiveFail]. > > ((self sizeof: #'unsigned long') = 8 > and: [bs > 4]) ifTrue: > [^ (objectMemory fetchByte: 0 ofObject: oop) > + ((objectMemory fetchByte: 1 ofObject: oop) << 8) > + ((objectMemory fetchByte: 2 ofObject: oop) << 16) > + ((objectMemory fetchByte: 3 ofObject: oop) << 24) > + ((objectMemory fetchByte: 4 ofObject: oop) << 32) > + ((objectMemory fetchByte: 5 ofObject: oop) << 40) > + ((objectMemory fetchByte: 6 ofObject: oop) << 48) > + ((objectMemory fetchByte: 7 ofObject: oop) << 56)]. > > ^ (objectMemory fetchByte: 0 ofObject: oop) > + ((objectMemory fetchByte: 1 ofObject: oop) << 8) > + ((objectMemory fetchByte: 2 ofObject: oop) << 16) > + ((objectMemory fetchByte: 3 ofObject: oop) << 24)! > > Item was changed: > ----- Method: InterpreterPrimitives>>primitiveNewWithArg (in category > 'object access primitives') ----- > primitiveNewWithArg > "Allocate a new indexable instance. Fail if the allocation would > leave less than lowSpaceThreshold bytes free. May cause a GC." > | size spaceOkay | > + size := self positiveMachineIntegerValueOf: self stackTop. > - size := self positive32BitValueOf: self stackTop. > self cppIf: NewspeakVM > ifTrue: "For the mirror prims check that the class obj is > actually a valid class." > [(argumentCount < 2 > or: [self addressCouldBeClassObj: (self > stackValue: 1)]) ifFalse: > [self primitiveFailFor: > PrimErrBadArgument]]. > + self successful "positiveMachineIntegerValueOf: succeeds only for > non-negative integers." > - self successful "positive32BitValueOf: succeds only for > non-negative integers < 2^32" > ifTrue: > [objectMemory hasSpurMemoryManagerAPI > ifTrue: > [(objectMemory instantiateClass: > (self stackValue: 1) indexableSize: size) > ifNotNil: [:obj| self pop: > argumentCount + 1 thenPush: obj] > ifNil: [self > primitiveFailFor: PrimErrNoMemory]] > ifFalse: > [spaceOkay := objectMemory > sufficientSpaceToInstantiate: (self stackValue: 1) indexableSize: size. > spaceOkay > ifTrue: > [self > pop: > argumentCount + 1 > thenPush: > (objectMemory instantiateClass: (self stackValue: 1) indexableSize: size)] > ifFalse: > [self > primitiveFailFor: PrimErrNoMemory]]] > ifFalse: > [self primitiveFailFor: PrimErrBadArgument]! > > Item was changed: > ----- Method: InterpreterProxy>>positive32BitValueOf: (in category > 'converting') ----- > positive32BitValueOf: oop > + <returnTypeC: #usqInt> > oop isInteger ifFalse:[self error:'Not an integer object']. > oop < 0 > ifTrue:[self primitiveFail. ^0] > ifFalse:[^oop]! > > Item was changed: > ----- Method: InterpreterProxy>>positive64BitValueOf: (in category > 'converting') ----- > positive64BitValueOf: oop > + <returnTypeC: #usqLong> > - <returnTypeC: #sqLong> > oop isInteger ifFalse:[self error:'Not an integer object']. > oop < 0 > ifTrue:[self primitiveFail. ^0] > ifFalse:[^oop]! > > -- best, Eliot

3 4

New Cog VMs available
by Eliot Miranda 29 Jun '14

29 Jun '14

...in http://www.mirandabanda.org/files/Cog/VM/VM.r3021/. In particular, these fix VM crashes when running the AllocationTest in Spur. CogVM source as per VMMaker.oscog-eem.787/r3021 Fix mixup of old & young spaces in primitiveVMParameter, and comment some new parameters. Fix return types for positive[64/32]BitValueOf:. positive32BitValueOf: must answer a usqInt, positive64BitValueOf: must answer a usqLong. Use positiveMachineIntegerValueOf: to decode arg in primitiveNewWithArg and ensure positiveMachineIntegerValueOf: is inlined there-in. win32: Set the IMAGE_FILE_LARGE_ADDRESS_AWARE flag in the image header of the Windows executables to allow e.g. Spur to allocate more than 2Gb. Spur: Fix sign and overflow issues in instantiating larger objects and determining the size of large instances. Fix some freeChunk accesses that used fetchPointer:ofObject:. Cog ARM: Fix prim return for compileInterpreterPrimitive: on RISCs. On return from interpreter prim, ret pc is in instructionPointer and must return to whence it came, which is the stack on CISC and the LinkReg on RISC. Hence restoring the receiver reg requires different offsets in the two cases. Rework the rotatable quick constant logic a little and clean up users. Fix concretizeMoveRXbrR to do byte not word loads. Fix concretizeConditionalJumpLong: to actually be conditional. Oops. Correct mistaken callersaved reg stuff for ARM Fix concretizedRetN to not over-bump the SP The method abort trampolines shouldn't pop anything, especially now we have the pushLinkreg: arg to manage the LinkReg more easily. Slang: Rip out the UseRightShiftForDivide optimization. It gets unsigned division wrong, and C compilers can and will optimize this correctly themselves. -- best, Eliot

3 2

VM Maker: VMMaker.oscog-eem.789.mcz
by commits＠source.squeak.org 29 Jun '14

29 Jun '14

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.789.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.789 Author: eem Time: 28 June 2014, 11:34:29.837 pm UUID: 3a58fbfc-b349-47bd-9bd6-17b66722be2b Ancestors: VMMaker.oscog-eem.788 Fix slip in StackInterpreter>>actuallyFollowNecessaryForwardingInMethod:literalCount: that corrups the methodClassAssociation. =============== Diff against VMMaker.oscog-eem.788 =============== Item was changed: ----- Method: CoInterpreter>>actuallyFollowNecessaryForwardingInMethod: (in category 'lazy become') ----- actuallyFollowNecessaryForwardingInMethod: methodObj "To avoid any chance of a forwarded object during super sends we follow the methodClassAssociation. The forwarded object send fault only copes with normal sends to instances." | cogMethod header litCount | <var: #cogMethod type: #'CogMethod *'> header := self rawHeaderOf: methodObj. (self isCogMethodReference: header) ifTrue: [cogMethod := self cCoerceSimple: header to: #'CogMethod *'. "If the method class is not used we can avoid the forwarding + check for both the cogMethod and the bytecoded method." - check for both the cogMehod and the bytecoded method." cogMethod cmUsesMethodClass ifFalse: [^self]. cogit followForwardedLiteralsIn: cogMethod. header := cogMethod methodHeader]. litCount := self literalCountOfHeader: header. "Slang super expansion limitation" super actuallyFollowNecessaryForwardingInMethod: methodObj literalCount: litCount! Item was changed: ----- Method: StackInterpreter>>actuallyFollowNecessaryForwardingInMethod:literalCount: (in category 'lazy become') ----- actuallyFollowNecessaryForwardingInMethod: methodObj literalCount: litCount "To avoid any chance of a forwarded object during super sends we follow the methodClassAssociation. The forwarded object send fault only copes with normal sends to instances. Inline methodClassAssociation access for speed." | assoc classObj | <option: #SpurObjectMemory> <inline: true> assoc := self literal: litCount - 1 ofMethod: methodObj. (objectMemory isForwarded: assoc) ifTrue: [assoc := objectMemory followForwarded: assoc. objectMemory storePointer: litCount + LiteralStart - 1 ofObject: methodObj withValue: assoc]. (objectMemory numSlotsOf: assoc) >= (ValueIndex + 1) ifTrue: [classObj := objectMemory fetchPointer: ValueIndex ofObject: assoc. (objectMemory isForwarded: classObj) ifTrue: + [classObj := objectMemory followForwarded: classObj. - [classObj := objectMemory followForwarded: assoc. objectMemory storePointer: ValueIndex ofObject: assoc withValue: classObj]]!

1 0

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 June 2014