Vm-dev October 2013

vm-dev@lists.squeakfoundation.org

30 participants
145 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

Issue 131 in cog: Bug in Freetype plugin primitive
by cog＠googlecode.com 03 Nov '13

03 Nov '13

Status: Accepted Owner: siguc...(a)gmail.com Labels: Type-Defect Priority-Medium New issue 131 by siguc...(a)gmail.com: Bug in Freetype plugin primitive http://code.google.com/p/cog/issues/detail?id=131 primitiveLoadOutlineSizesFrom: aFace uses non-existing ivar for reading flags: interpreterProxy storeInteger: FT2OutlineFlagsIndex ofObject: rcvr withValue: (self cCode: 'gs->outline.flags' inSmalltalk: [gs]). (FT2OutlineFlagsIndex is nil) , causing overriding number of contours (null=0=FT2OutlineContoursSizeIndex).. which later causing VM crash when invoking primitiveLoadOutlineArraysFrom: because of attempt to read outside of array range. The fix is to remove the above code. (i wanted to attach file here, but quota exceeded) -- You received this message because this project is configured to send all issue notifications to this address. You may adjust your notification preferences at: https://code.google.com/hosting/settings

4 6

Re: [squeak-dev] FreeType
by David T. Lewis 03 Nov '13

03 Nov '13

On Thu, Oct 31, 2013 at 10:29:29PM +0100, Nicolas Cellier wrote: > So, from an interpreter VM, you load both > - FreeTypePlugin from www.queaksource.com/FreeTypePlugin > - FreeType from www.squeaksource.com/FreeTypePlus > and in the second one, you only need FT2Constants > > You are proposing to separate those constants, like in Balloon3D-Constants? Yes. > > OK, done, it's FreeTypeConstants in the ss3 repo. > Thank you! CC to vm-dev: This will allow source code generation for the FreeType plugin without requiring that the entire FreeType package be present in the image. Dave > > 2013/10/31 David T. Lewis <lewis(a)mail.msen.com> > > > On Wed, Oct 30, 2013 at 10:59:21PM +0100, Nicolas Cellier wrote: > > > I have created a repository for maintaining the trunk 4.5 branch: > > > > > > MCHttpRepository > > > location: 'http://ss3.gemstone.com/ss/FreeTypePlus' > > > user: '' > > > password: '' > > > > > > FreeType requires a plugin. > > > It is pre-compiled and distributed with Pharo VM, so it's the easiest way > > > to test it... > > > > The FT2Plugin is built in to the unix interpreter VM. > > > > Smalltalk listBuiltinModules select: [:e | 'FT2Plugin*' match: e] > > ==> #('FT2Plugin 23 January 2011 (i)') > > > > Eliot, perhaps you can add this to your next Cog build also? > > > > Nicolas, thanks for setting up the SS3 repository. For VM building, we > > load FreeTypePlus into the image in order to get the pool variables > > in FT2Constants. Maybe this can be moved to a package (FreeType-Constants > > or similar) so that a VMMaker user can load just the constants? > > > > Dave > > > > > > >

2 1

VM Maker: VMMaker-dtl.328.mcz
by commits＠source.squeak.org 31 Oct '13

31 Oct '13

David T. Lewis uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker-dtl.328.mcz ==================== Summary ==================== Name: VMMaker-dtl.328 Author: dtl Time: 31 October 2013, 7:48:11.404 pm UUID: 952f8e54-a106-406f-8f0e-3c588fb14748 Ancestors: VMMaker-dtl.327 VMMaker 4.12.8 Mantis 7794: BitBltSimulation primitiveDisplayString fails to advance destX Fix by Nicolas Cellier: BitBlt>>primDisplayString:from:to:map:xTable:kern: regularly fails to increment destX instance variable. The primitiveDisplayString changes destX global variable but then forgets to copy this global destX into BitBlt's inst var destX. As a consequence, BitBlt>>displayString:on:from:to:at:kern: regularly fall in fallback code. =============== Diff against VMMaker-dtl.327 =============== Item was changed: ----- Method: BitBltSimulation>>primitiveDisplayString (in category 'primitives') ----- primitiveDisplayString | kernDelta xTable glyphMap stopIndex startIndex sourceString bbObj maxGlyph ascii glyphIndex sourcePtr left quickBlt | <export: true> <var: #sourcePtr type: 'char *'> interpreterProxy methodArgumentCount = 6 ifFalse:[^interpreterProxy primitiveFail]. kernDelta := interpreterProxy stackIntegerValue: 0. xTable := interpreterProxy stackObjectValue: 1. glyphMap := interpreterProxy stackObjectValue: 2. ((interpreterProxy fetchClassOf: xTable) = interpreterProxy classArray and:[ (interpreterProxy fetchClassOf: glyphMap) = interpreterProxy classArray]) ifFalse:[^interpreterProxy primitiveFail]. (interpreterProxy slotSizeOf: glyphMap) = 256 ifFalse:[^interpreterProxy primitiveFail]. interpreterProxy failed ifTrue:[^nil]. maxGlyph := (interpreterProxy slotSizeOf: xTable) - 2. stopIndex := interpreterProxy stackIntegerValue: 3. startIndex := interpreterProxy stackIntegerValue: 4. sourceString := interpreterProxy stackObjectValue: 5. (interpreterProxy isBytes: sourceString) ifFalse:[^interpreterProxy primitiveFail]. (startIndex > 0 and:[stopIndex > 0 and:[ stopIndex <= (interpreterProxy byteSizeOf: sourceString)]]) ifFalse:[^interpreterProxy primitiveFail]. bbObj := interpreterProxy stackObjectValue: 6. (self loadBitBltFrom: bbObj) ifFalse:[^interpreterProxy primitiveFail]. (combinationRule = 30 or:[combinationRule = 31]) "needs extra source alpha" ifTrue:[^interpreterProxy primitiveFail]. "See if we can go directly into copyLoopPixMap (usually we can)" quickBlt := destBits ~= 0 "no OS surfaces please" and:[sourceBits ~= 0 "and again" and:[noSource = false "needs a source" and:[sourceForm ~= destForm "no blits onto self" and:[(cmFlags ~= 0 or:[sourceMSB ~= destMSB or:[sourceDepth ~= destDepth]]) "no point using slower version" ]]]]. left := destX. sourcePtr := interpreterProxy firstIndexableField: sourceString. startIndex to: stopIndex do:[:charIndex| ascii := interpreterProxy byteAtPointer: sourcePtr + charIndex - 1. glyphIndex := interpreterProxy fetchInteger: ascii ofObject: glyphMap. (glyphIndex < 0 or:[glyphIndex > maxGlyph]) ifTrue:[^interpreterProxy primitiveFail]. sourceX := interpreterProxy fetchInteger: glyphIndex ofObject: xTable. width := (interpreterProxy fetchInteger: glyphIndex+1 ofObject: xTable) - sourceX. interpreterProxy failed ifTrue:[^nil]. self clipRange. "Must clip here" (bbW > 0 and:[bbH > 0]) ifTrue: [ quickBlt ifTrue:[ self destMaskAndPointerInit. self copyLoopPixMap. "both, hDir and vDir are known to be > 0" affectedL := dx. affectedR := dx + bbW. affectedT := dy. affectedB := dy + bbH. ] ifFalse:[self copyBits]]. interpreterProxy failed ifTrue:[^nil]. destX := destX + width + kernDelta. ]. affectedL := left. self showDisplayBits. + "store destX back" + interpreterProxy storeInteger: BBDestXIndex ofObject: bbObj withValue: destX. interpreterProxy pop: 6. "pop args, return rcvr"! Item was changed: ----- Method: VMMaker class>>versionString (in category 'version testing') ----- versionString "VMMaker versionString" + ^'4.12.8'! - ^'4.12.7'!

1 0

[commit][2795] VMMaker 4.12.8
by commits＠squeakvm.org 31 Oct '13

31 Oct '13

Revision: 2795 Author: lewis Date: 2013-10-31 16:56:21 -0700 (Thu, 31 Oct 2013) Log Message: ----------- VMMaker 4.12.8 Mantis 7794: BitBltSimulation primitiveDisplayString fails to advance destX Fix by Nicolas Cellier: BitBlt>>primDisplayString:from:to:map:xTable:kern: regularly fails to increment destX instance variable. The primitiveDisplayString changes destX global variable but then forgets to copy this global destX into BitBlt's inst var destX. As a consequence, BitBlt>>displayString:on:from:to:at:kern: regularly fall in fallback code. Modified Paths: -------------- trunk/src/ckformat.c trunk/src/plugins/ADPCMCodecPlugin/ADPCMCodecPlugin.c trunk/src/plugins/AioPlugin/AioPlugin.c trunk/src/plugins/AsynchFilePlugin/AsynchFilePlugin.c trunk/src/plugins/B2DPlugin/B2DPlugin.c trunk/src/plugins/B3DAcceleratorPlugin/B3DAcceleratorPlugin.c trunk/src/plugins/BMPReadWriterPlugin/BMPReadWriterPlugin.c trunk/src/plugins/BitBltPlugin/BitBltPlugin.c trunk/src/plugins/CameraPlugin/CameraPlugin.c trunk/src/plugins/ClipboardExtendedPlugin/ClipboardExtendedPlugin.c trunk/src/plugins/CroquetPlugin/CroquetPlugin.c trunk/src/plugins/DBusPlugin/DBusPlugin.c trunk/src/plugins/DSAPrims/DSAPrims.c trunk/src/plugins/DropPlugin/DropPlugin.c trunk/src/plugins/FFTPlugin/FFTPlugin.c trunk/src/plugins/FT2Plugin/FT2Plugin.c trunk/src/plugins/FileCopyPlugin/FileCopyPlugin.c trunk/src/plugins/FilePlugin/FilePlugin.c trunk/src/plugins/FloatArrayPlugin/FloatArrayPlugin.c trunk/src/plugins/FloatMathPlugin/FloatMathPlugin.c trunk/src/plugins/GeniePlugin/GeniePlugin.c trunk/src/plugins/HostWindowPlugin/HostWindowPlugin.c trunk/src/plugins/JPEGReadWriter2Plugin/JPEGReadWriter2Plugin.c trunk/src/plugins/JPEGReaderPlugin/JPEGReaderPlugin.c trunk/src/plugins/JoystickTabletPlugin/JoystickTabletPlugin.c trunk/src/plugins/Klatt/Klatt.c trunk/src/plugins/LargeIntegers/LargeIntegers.c trunk/src/plugins/LocalePlugin/LocalePlugin.c trunk/src/plugins/MIDIPlugin/MIDIPlugin.c trunk/src/plugins/Matrix2x3Plugin/Matrix2x3Plugin.c trunk/src/plugins/MiscPrimitivePlugin/MiscPrimitivePlugin.c trunk/src/plugins/Mpeg3Plugin/Mpeg3Plugin.c trunk/src/plugins/RePlugin/RePlugin.c trunk/src/plugins/RomePlugin/RomePlugin.c trunk/src/plugins/ScratchPlugin/ScratchPlugin.c trunk/src/plugins/SecurityPlugin/SecurityPlugin.c trunk/src/plugins/SerialPlugin/SerialPlugin.c trunk/src/plugins/SocketPlugin/SocketPlugin.c trunk/src/plugins/SoundCodecPrims/SoundCodecPrims.c trunk/src/plugins/SoundGenerationPlugin/SoundGenerationPlugin.c trunk/src/plugins/SoundPlugin/SoundPlugin.c trunk/src/plugins/Squeak3D/Squeak3D.c trunk/src/plugins/SqueakFFIPrims/SqueakFFIPrims.c trunk/src/plugins/SqueakSSL/SqueakSSL.c trunk/src/plugins/StarSqueakPlugin/StarSqueakPlugin.c trunk/src/plugins/UUIDPlugin/UUIDPlugin.c trunk/src/plugins/UnicodePlugin/UnicodePlugin.c trunk/src/plugins/UnixOSProcessPlugin/UnixOSProcessPlugin.c trunk/src/plugins/WeDoPlugin/WeDoPlugin.c trunk/src/plugins/XDisplayControlPlugin/XDisplayControlPlugin.c trunk/src/plugins/ZipPlugin/ZipPlugin.c trunk/src/vm/interp.c trunk/src/vm/interp.h trunk/src/vm/sqNamedPrims.h Modified: trunk/src/ckformat.c =================================================================== --- trunk/src/ckformat.c 2013-10-27 15:40:04 UTC (rev 2794) +++ trunk/src/ckformat.c 2013-10-31 23:56:21 UTC (rev 2795) @@ -5,7 +5,7 @@ /* Usage: ckformat imageFileName */ /* --- DO NOT EDIT THIS FILE --- */ -/* --- Automatically generated from class ImageFormat 2013-10-27T11:14:02.135+01:00--- */ +/* --- Automatically generated from class ImageFormat 2013-10-31T19:50:44.199+01:00--- */ /* --- Source code is in package ImageFormat in the VMMaker repository --- */ /* --- DO NOT EDIT THIS FILE --- */ Modified: trunk/src/plugins/ADPCMCodecPlugin/ADPCMCodecPlugin.c =================================================================== --- trunk/src/plugins/ADPCMCodecPlugin/ADPCMCodecPlugin.c 2013-10-27 15:40:04 UTC (rev 2794) +++ trunk/src/plugins/ADPCMCodecPlugin/ADPCMCodecPlugin.c 2013-10-31 23:56:21 UTC (rev 2795) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.4 with VMMaker 4.12.7 translated as C source on 27 October 2013 11:13:37 am */ +/* Smalltalk from Squeak4.4 with VMMaker 4.12.8 translated as C source on 31 October 2013 7:50:18 pm */ /* Automatically generated by - VMPluginCodeGenerator VMMaker-dtl.327 uuid: ba3104e6-7926-482f-9ef1-cdf59721acb8 + VMPluginCodeGenerator VMMaker-dtl.328 uuid: 952f8e54-a106-406f-8f0e-3c588fb14748 from - ADPCMCodecPlugin VMMaker-dtl.327 uuid: ba3104e6-7926-482f-9ef1-cdf59721acb8 + ADPCMCodecPlugin VMMaker-dtl.328 uuid: 952f8e54-a106-406f-8f0e-3c588fb14748 */ -static char __buildInfo[] = "ADPCMCodecPlugin VMMaker-dtl.327 uuid: ba3104e6-7926-482f-9ef1-cdf59721acb8 " __DATE__ ; +static char __buildInfo[] = "ADPCMCodecPlugin VMMaker-dtl.328 uuid: 952f8e54-a106-406f-8f0e-3c588fb14748 " __DATE__ ; @@ -70,9 +70,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "ADPCMCodecPlugin 27 October 2013 (i)" + "ADPCMCodecPlugin 31 October 2013 (i)" #else - "ADPCMCodecPlugin 27 October 2013 (e)" + "ADPCMCodecPlugin 31 October 2013 (e)" #endif ; Modified: trunk/src/plugins/AioPlugin/AioPlugin.c =================================================================== --- trunk/src/plugins/AioPlugin/AioPlugin.c 2013-10-27 15:40:04 UTC (rev 2794) +++ trunk/src/plugins/AioPlugin/AioPlugin.c 2013-10-31 23:56:21 UTC (rev 2795) @@ -1,6 +1,6 @@ -/* Smalltalk from Squeak4.4 with VMMaker 4.12.7 translated as C source on 27 October 2013 11:14 am */ +/* Smalltalk from Squeak4.4 with VMMaker 4.12.8 translated as C source on 31 October 2013 7:50:42 pm */ /* Automatically generated by - VMPluginCodeGenerator VMMaker-dtl.327 uuid: ba3104e6-7926-482f-9ef1-cdf59721acb8 + VMPluginCodeGenerator VMMaker-dtl.328 uuid: 952f8e54-a106-406f-8f0e-3c588fb14748 from UnixAioPlugin VMConstruction-Plugins-AioPlugin-eem.15 uuid: 0029df1c-3720-4b61-8579-4851417d24a7 */ @@ -88,9 +88,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "AioPlugin 27 October 2013 (i)" + "AioPlugin 31 October 2013 (i)" #else - "AioPlugin 27 October 2013 (e)" + "AioPlugin 31 October 2013 (e)" #endif ; Modified: trunk/src/plugins/AsynchFilePlugin/AsynchFilePlugin.c =================================================================== --- trunk/src/plugins/AsynchFilePlugin/AsynchFilePlugin.c 2013-10-27 15:40:04 UTC (rev 2794) +++ trunk/src/plugins/AsynchFilePlugin/AsynchFilePlugin.c 2013-10-31 23:56:21 UTC (rev 2795) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.4 with VMMaker 4.12.7 translated as C source on 27 October 2013 11:13:38 am */ +/* Smalltalk from Squeak4.4 with VMMaker 4.12.8 translated as C source on 31 October 2013 7:50:18 pm */ /* Automatically generated by - SmartSyntaxPluginCodeGenerator VMMaker-dtl.327 uuid: ba3104e6-7926-482f-9ef1-cdf59721acb8 + SmartSyntaxPluginCodeGenerator VMMaker-dtl.328 uuid: 952f8e54-a106-406f-8f0e-3c588fb14748 from - AsynchFilePlugin VMMaker-dtl.327 uuid: ba3104e6-7926-482f-9ef1-cdf59721acb8 + AsynchFilePlugin VMMaker-dtl.328 uuid: 952f8e54-a106-406f-8f0e-3c588fb14748 */ -static char __buildInfo[] = "AsynchFilePlugin VMMaker-dtl.327 uuid: ba3104e6-7926-482f-9ef1-cdf59721acb8 " __DATE__ ; +static char __buildInfo[] = "AsynchFilePlugin VMMaker-dtl.328 uuid: 952f8e54-a106-406f-8f0e-3c588fb14748 " __DATE__ ; @@ -67,9 +67,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "AsynchFilePlugin 27 October 2013 (i)" + "AsynchFilePlugin 31 October 2013 (i)" #else - "AsynchFilePlugin 27 October 2013 (e)" + "AsynchFilePlugin 31 October 2013 (e)" #endif ; static void * sCOAFfn; Modified: trunk/src/plugins/B2DPlugin/B2DPlugin.c =================================================================== --- trunk/src/plugins/B2DPlugin/B2DPlugin.c 2013-10-27 15:40:04 UTC (rev 2794) +++ trunk/src/plugins/B2DPlugin/B2DPlugin.c 2013-10-31 23:56:21 UTC (rev 2795) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.4 with VMMaker 4.12.7 translated as C source on 27 October 2013 11:13:40 am */ +/* Smalltalk from Squeak4.4 with VMMaker 4.12.8 translated as C source on 31 October 2013 7:50:21 pm */ /* Automatically generated by - VMPluginCodeGenerator VMMaker-dtl.327 uuid: ba3104e6-7926-482f-9ef1-cdf59721acb8 + VMPluginCodeGenerator VMMaker-dtl.328 uuid: 952f8e54-a106-406f-8f0e-3c588fb14748 from - BalloonEnginePlugin VMMaker-dtl.327 uuid: ba3104e6-7926-482f-9ef1-cdf59721acb8 + BalloonEnginePlugin VMMaker-dtl.328 uuid: 952f8e54-a106-406f-8f0e-3c588fb14748 */ -static char __buildInfo[] = "BalloonEnginePlugin VMMaker-dtl.327 uuid: ba3104e6-7926-482f-9ef1-cdf59721acb8 " __DATE__ ; +static char __buildInfo[] = "BalloonEnginePlugin VMMaker-dtl.328 uuid: 952f8e54-a106-406f-8f0e-3c588fb14748 " __DATE__ ; @@ -447,9 +447,9 @@ static void * loadBBFn; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "B2DPlugin 27 October 2013 (i)" + "B2DPlugin 31 October 2013 (i)" #else - "B2DPlugin 27 October 2013 (e)" + "B2DPlugin 31 October 2013 (e)" #endif ; static int* objBuffer; Modified: trunk/src/plugins/B3DAcceleratorPlugin/B3DAcceleratorPlugin.c =================================================================== --- trunk/src/plugins/B3DAcceleratorPlugin/B3DAcceleratorPlugin.c 2013-10-27 15:40:04 UTC (rev 2794) +++ trunk/src/plugins/B3DAcceleratorPlugin/B3DAcceleratorPlugin.c 2013-10-31 23:56:21 UTC (rev 2795) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.4 with VMMaker 4.12.7 translated as C source on 27 October 2013 11:13:51 am */ +/* Smalltalk from Squeak4.4 with VMMaker 4.12.8 translated as C source on 31 October 2013 7:50:32 pm */ /* Automatically generated by - VMPluginCodeGenerator VMMaker-dtl.327 uuid: ba3104e6-7926-482f-9ef1-cdf59721acb8 + VMPluginCodeGenerator VMMaker-dtl.328 uuid: 952f8e54-a106-406f-8f0e-3c588fb14748 from - B3DAcceleratorPlugin VMMaker-dtl.327 uuid: ba3104e6-7926-482f-9ef1-cdf59721acb8 + B3DAcceleratorPlugin VMMaker-dtl.328 uuid: 952f8e54-a106-406f-8f0e-3c588fb14748 */ -static char __buildInfo[] = "B3DAcceleratorPlugin VMMaker-dtl.327 uuid: ba3104e6-7926-482f-9ef1-cdf59721acb8 " __DATE__ ; +static char __buildInfo[] = "B3DAcceleratorPlugin VMMaker-dtl.328 uuid: 952f8e54-a106-406f-8f0e-3c588fb14748 " __DATE__ ; @@ -107,9 +107,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "B3DAcceleratorPlugin 27 October 2013 (i)" + "B3DAcceleratorPlugin 31 October 2013 (i)" #else - "B3DAcceleratorPlugin 27 October 2013 (e)" + "B3DAcceleratorPlugin 31 October 2013 (e)" #endif ; Modified: trunk/src/plugins/BMPReadWriterPlugin/BMPReadWriterPlugin.c =================================================================== --- trunk/src/plugins/BMPReadWriterPlugin/BMPReadWriterPlugin.c 2013-10-27 15:40:04 UTC (rev 2794) +++ trunk/src/plugins/BMPReadWriterPlugin/BMPReadWriterPlugin.c 2013-10-31 23:56:21 UTC (rev 2795) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.4 with VMMaker 4.12.7 translated as C source on 27 October 2013 11:13:38 am */ +/* Smalltalk from Squeak4.4 with VMMaker 4.12.8 translated as C source on 31 October 2013 7:50:18 pm */ /* Automatically generated by - VMPluginCodeGenerator VMMaker-dtl.327 uuid: ba3104e6-7926-482f-9ef1-cdf59721acb8 + VMPluginCodeGenerator VMMaker-dtl.328 uuid: 952f8e54-a106-406f-8f0e-3c588fb14748 from - BMPReadWriterPlugin VMMaker-dtl.327 uuid: ba3104e6-7926-482f-9ef1-cdf59721acb8 + BMPReadWriterPlugin VMMaker-dtl.328 uuid: 952f8e54-a106-406f-8f0e-3c588fb14748 */ -static char __buildInfo[] = "BMPReadWriterPlugin VMMaker-dtl.327 uuid: ba3104e6-7926-482f-9ef1-cdf59721acb8 " __DATE__ ; +static char __buildInfo[] = "BMPReadWriterPlugin VMMaker-dtl.328 uuid: 952f8e54-a106-406f-8f0e-3c588fb14748 " __DATE__ ; @@ -58,9 +58,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "BMPReadWriterPlugin 27 October 2013 (i)" + "BMPReadWriterPlugin 31 October 2013 (i)" #else - "BMPReadWriterPlugin 27 October 2013 (e)" + "BMPReadWriterPlugin 31 October 2013 (e)" #endif ; Modified: trunk/src/plugins/BitBltPlugin/BitBltPlugin.c =================================================================== --- trunk/src/plugins/BitBltPlugin/BitBltPlugin.c 2013-10-27 15:40:04 UTC (rev 2794) +++ trunk/src/plugins/BitBltPlugin/BitBltPlugin.c 2013-10-31 23:56:21 UTC (rev 2795) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.4 with VMMaker 4.12.7 translated as C source on 27 October 2013 11:13:42 am */ +/* Smalltalk from Squeak4.4 with VMMaker 4.12.8 translated as C source on 31 October 2013 7:50:22 pm */ /* Automatically generated by - SmartSyntaxPluginCodeGenerator VMMaker-dtl.327 uuid: ba3104e6-7926-482f-9ef1-cdf59721acb8 + SmartSyntaxPluginCodeGenerator VMMaker-dtl.328 uuid: 952f8e54-a106-406f-8f0e-3c588fb14748 from - BitBltSimulation VMMaker-dtl.327 uuid: ba3104e6-7926-482f-9ef1-cdf59721acb8 + BitBltSimulation VMMaker-dtl.328 uuid: 952f8e54-a106-406f-8f0e-3c588fb14748 */ -static char __buildInfo[] = "BitBltSimulation VMMaker-dtl.327 uuid: ba3104e6-7926-482f-9ef1-cdf59721acb8 " __DATE__ ; +static char __buildInfo[] = "BitBltSimulation VMMaker-dtl.328 uuid: 952f8e54-a106-406f-8f0e-3c588fb14748 " __DATE__ ; @@ -257,9 +257,9 @@ }; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "BitBltPlugin 27 October 2013 (i)" + "BitBltPlugin 31 October 2013 (i)" #else - "BitBltPlugin 27 October 2013 (e)" + "BitBltPlugin 31 October 2013 (e)" #endif ; static sqInt nWords; @@ -3477,6 +3477,7 @@ affectedL = left; /* begin showDisplayBits */ interpreterProxy->showDisplayBitsLeftTopRightBottom(destForm, affectedL, affectedT, affectedR, affectedB); + interpreterProxy->storeIntegerofObjectwithValue(BBDestXIndex, bbObj, destX); interpreterProxy->pop(6); } Modified: trunk/src/plugins/CameraPlugin/CameraPlugin.c =================================================================== --- trunk/src/plugins/CameraPlugin/CameraPlugin.c 2013-10-27 15:40:04 UTC (rev 2794) +++ trunk/src/plugins/CameraPlugin/CameraPlugin.c 2013-10-31 23:56:21 UTC (rev 2795) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.4 with VMMaker 4.12.7 translated as C source on 27 October 2013 11:13:52 am */ +/* Smalltalk from Squeak4.4 with VMMaker 4.12.8 translated as C source on 31 October 2013 7:50:33 pm */ /* Automatically generated by - VMPluginCodeGenerator VMMaker-dtl.327 uuid: ba3104e6-7926-482f-9ef1-cdf59721acb8 + VMPluginCodeGenerator VMMaker-dtl.328 uuid: 952f8e54-a106-406f-8f0e-3c588fb14748 from - CameraPlugin VMMaker-dtl.327 uuid: ba3104e6-7926-482f-9ef1-cdf59721acb8 + CameraPlugin VMMaker-dtl.328 uuid: 952f8e54-a106-406f-8f0e-3c588fb14748 */ -static char __buildInfo[] = "CameraPlugin VMMaker-dtl.327 uuid: ba3104e6-7926-482f-9ef1-cdf59721acb8 " __DATE__ ; +static char __buildInfo[] = "CameraPlugin VMMaker-dtl.328 uuid: 952f8e54-a106-406f-8f0e-3c588fb14748 " __DATE__ ; @@ -64,9 +64,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "CameraPlugin 27 October 2013 (i)" + "CameraPlugin 31 October 2013 (i)" #else - "CameraPlugin 27 October 2013 (e)" + "CameraPlugin 31 October 2013 (e)" #endif ; Modified: trunk/src/plugins/ClipboardExtendedPlugin/ClipboardExtendedPlugin.c =================================================================== --- trunk/src/plugins/ClipboardExtendedPlugin/ClipboardExtendedPlugin.c 2013-10-27 15:40:04 UTC (rev 2794) +++ trunk/src/plugins/ClipboardExtendedPlugin/ClipboardExtendedPlugin.c 2013-10-31 23:56:21 UTC (rev 2795) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.4 with VMMaker 4.12.7 translated as C source on 27 October 2013 11:13:53 am */ +/* Smalltalk from Squeak4.4 with VMMaker 4.12.8 translated as C source on 31 October 2013 7:50:34 pm */ /* Automatically generated by - SmartSyntaxPluginCodeGenerator VMMaker-dtl.327 uuid: ba3104e6-7926-482f-9ef1-cdf59721acb8 + SmartSyntaxPluginCodeGenerator VMMaker-dtl.328 uuid: 952f8e54-a106-406f-8f0e-3c588fb14748 from - ClipboardExtendedPlugin VMMaker-dtl.327 uuid: ba3104e6-7926-482f-9ef1-cdf59721acb8 + ClipboardExtendedPlugin VMMaker-dtl.328 uuid: 952f8e54-a106-406f-8f0e-3c588fb14748 */ -static char __buildInfo[] = "ClipboardExtendedPlugin VMMaker-dtl.327 uuid: ba3104e6-7926-482f-9ef1-cdf59721acb8 " __DATE__ ; +static char __buildInfo[] = "ClipboardExtendedPlugin VMMaker-dtl.328 uuid: 952f8e54-a106-406f-8f0e-3c588fb14748 " __DATE__ ; @@ -61,9 +61,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "ClipboardExtendedPlugin 27 October 2013 (i)" + "ClipboardExtendedPlugin 31 October 2013 (i)" #else - "ClipboardExtendedPlugin 27 October 2013 (e)" + "ClipboardExtendedPlugin 31 October 2013 (e)" #endif ; Modified: trunk/src/plugins/CroquetPlugin/CroquetPlugin.c =================================================================== --- trunk/src/plugins/CroquetPlugin/CroquetPlugin.c 2013-10-27 15:40:04 UTC (rev 2794) +++ trunk/src/plugins/CroquetPlugin/CroquetPlugin.c 2013-10-31 23:56:21 UTC (rev 2795) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.4 with VMMaker 4.12.7 translated as C source on 27 October 2013 11:13:42 am */ +/* Smalltalk from Squeak4.4 with VMMaker 4.12.8 translated as C source on 31 October 2013 7:50:23 pm */ /* Automatically generated by - VMPluginCodeGenerator VMMaker-dtl.327 uuid: ba3104e6-7926-482f-9ef1-cdf59721acb8 + VMPluginCodeGenerator VMMaker-dtl.328 uuid: 952f8e54-a106-406f-8f0e-3c588fb14748 from - CroquetPlugin VMMaker-dtl.327 uuid: ba3104e6-7926-482f-9ef1-cdf59721acb8 + CroquetPlugin VMMaker-dtl.328 uuid: 952f8e54-a106-406f-8f0e-3c588fb14748 */ -static char __buildInfo[] = "CroquetPlugin VMMaker-dtl.327 uuid: ba3104e6-7926-482f-9ef1-cdf59721acb8 " __DATE__ ; +static char __buildInfo[] = "CroquetPlugin VMMaker-dtl.328 uuid: 952f8e54-a106-406f-8f0e-3c588fb14748 " __DATE__ ; @@ -73,9 +73,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "CroquetPlugin 27 October 2013 (i)" + "CroquetPlugin 31 October 2013 (i)" #else - "CroquetPlugin 27 October 2013 (e)" + "CroquetPlugin 31 October 2013 (e)" #endif ; Modified: trunk/src/plugins/DBusPlugin/DBusPlugin.c =================================================================== --- trunk/src/plugins/DBusPlugin/DBusPlugin.c 2013-10-27 15:40:04 UTC (rev 2794) +++ trunk/src/plugins/DBusPlugin/DBusPlugin.c 2013-10-31 23:56:21 UTC (rev 2795) @@ -1,6 +1,6 @@ -/* Smalltalk from Squeak4.4 with VMMaker 4.12.7 translated as C source on 27 October 2013 11:13:53 am */ +/* Smalltalk from Squeak4.4 with VMMaker 4.12.8 translated as C source on 31 October 2013 7:50:34 pm */ /* Automatically generated by - SmartSyntaxPluginCodeGenerator VMMaker-dtl.327 uuid: ba3104e6-7926-482f-9ef1-cdf59721acb8 + SmartSyntaxPluginCodeGenerator VMMaker-dtl.328 uuid: 952f8e54-a106-406f-8f0e-3c588fb14748 from DBusPlugin DBus-Plugin-dtl.35 uuid: 2ae30f08-4793-4acb-876b-c443a5f5e665 */ @@ -143,9 +143,9 @@ static DBusMessageIter messageIter[DBUS_MAXIMUM_TYPE_RECURSION_DEPTH]; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "DBusPlugin 27 October 2013 (i)" + "DBusPlugin 31 October 2013 (i)" #else - "DBusPlugin 27 October 2013 (e)" + "DBusPlugin 31 October 2013 (e)" #endif ; static DBusMessage* writeMessage; Modified: trunk/src/plugins/DSAPrims/DSAPrims.c =================================================================== --- trunk/src/plugins/DSAPrims/DSAPrims.c 2013-10-27 15:40:04 UTC (rev 2794) +++ trunk/src/plugins/DSAPrims/DSAPrims.c 2013-10-31 23:56:21 UTC (rev 2795) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.4 with VMMaker 4.12.7 translated as C source on 27 October 2013 11:13:43 am */ +/* Smalltalk from Squeak4.4 with VMMaker 4.12.8 translated as C source on 31 October 2013 7:50:23 pm */ /* Automatically generated by - VMPluginCodeGenerator VMMaker-dtl.327 uuid: ba3104e6-7926-482f-9ef1-cdf59721acb8 + VMPluginCodeGenerator VMMaker-dtl.328 uuid: 952f8e54-a106-406f-8f0e-3c588fb14748 from - DSAPlugin VMMaker-dtl.327 uuid: ba3104e6-7926-482f-9ef1-cdf59721acb8 + DSAPlugin VMMaker-dtl.328 uuid: 952f8e54-a106-406f-8f0e-3c588fb14748 */ -static char __buildInfo[] = "DSAPlugin VMMaker-dtl.327 uuid: ba3104e6-7926-482f-9ef1-cdf59721acb8 " __DATE__ ; +static char __buildInfo[] = "DSAPlugin VMMaker-dtl.328 uuid: 952f8e54-a106-406f-8f0e-3c588fb14748 " __DATE__ ; @@ -67,9 +67,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "DSAPrims 27 October 2013 (i)" + "DSAPrims 31 October 2013 (i)" #else - "DSAPrims 27 October 2013 (e)" + "DSAPrims 31 October 2013 (e)" #endif ; static sqInt remainderDigitCount; Modified: trunk/src/plugins/DropPlugin/DropPlugin.c =================================================================== --- trunk/src/plugins/DropPlugin/DropPlugin.c 2013-10-27 15:40:04 UTC (rev 2794) +++ trunk/src/plugins/DropPlugin/DropPlugin.c 2013-10-31 23:56:21 UTC (rev 2795) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.4 with VMMaker 4.12.7 translated as C source on 27 October 2013 11:13:43 am */ +/* Smalltalk from Squeak4.4 with VMMaker 4.12.8 translated as C source on 31 October 2013 7:50:23 pm */ /* Automatically generated by - VMPluginCodeGenerator VMMaker-dtl.327 uuid: ba3104e6-7926-482f-9ef1-cdf59721acb8 + VMPluginCodeGenerator VMMaker-dtl.328 uuid: 952f8e54-a106-406f-8f0e-3c588fb14748 from - DropPlugin VMMaker-dtl.327 uuid: ba3104e6-7926-482f-9ef1-cdf59721acb8 + DropPlugin VMMaker-dtl.328 uuid: 952f8e54-a106-406f-8f0e-3c588fb14748 */ -static char __buildInfo[] = "DropPlugin VMMaker-dtl.327 uuid: ba3104e6-7926-482f-9ef1-cdf59721acb8 " __DATE__ ; +static char __buildInfo[] = "DropPlugin VMMaker-dtl.328 uuid: 952f8e54-a106-406f-8f0e-3c588fb14748 " __DATE__ ; @@ -62,9 +62,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "DropPlugin 27 October 2013 (i)" + "DropPlugin 31 October 2013 (i)" #else - "DropPlugin 27 October 2013 (e)" + "DropPlugin 31 October 2013 (e)" #endif ; Modified: trunk/src/plugins/FFTPlugin/FFTPlugin.c =================================================================== --- trunk/src/plugins/FFTPlugin/FFTPlugin.c 2013-10-27 15:40:04 UTC (rev 2794) +++ trunk/src/plugins/FFTPlugin/FFTPlugin.c 2013-10-31 23:56:21 UTC (rev 2795) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.4 with VMMaker 4.12.7 translated as C source on 27 October 2013 11:13:43 am */ +/* Smalltalk from Squeak4.4 with VMMaker 4.12.8 translated as C source on 31 October 2013 7:50:24 pm */ /* Automatically generated by - VMPluginCodeGenerator VMMaker-dtl.327 uuid: ba3104e6-7926-482f-9ef1-cdf59721acb8 + VMPluginCodeGenerator VMMaker-dtl.328 uuid: 952f8e54-a106-406f-8f0e-3c588fb14748 from - FFTPlugin VMMaker-dtl.327 uuid: ba3104e6-7926-482f-9ef1-cdf59721acb8 + FFTPlugin VMMaker-dtl.328 uuid: 952f8e54-a106-406f-8f0e-3c588fb14748 */ -static char __buildInfo[] = "FFTPlugin VMMaker-dtl.327 uuid: ba3104e6-7926-482f-9ef1-cdf59721acb8 " __DATE__ ; +static char __buildInfo[] = "FFTPlugin VMMaker-dtl.328 uuid: 952f8e54-a106-406f-8f0e-3c588fb14748 " __DATE__ ; @@ -68,9 +68,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "FFTPlugin 27 October 2013 (i)" + "FFTPlugin 31 October 2013 (i)" #else - "FFTPlugin 27 October 2013 (e)" + "FFTPlugin 31 October 2013 (e)" #endif ; static sqInt nu; Modified: trunk/src/plugins/FT2Plugin/FT2Plugin.c =================================================================== --- trunk/src/plugins/FT2Plugin/FT2Plugin.c 2013-10-27 15:40:04 UTC (rev 2794) +++ trunk/src/plugins/FT2Plugin/FT2Plugin.c 2013-10-31 23:56:21 UTC (rev 2795) @@ -1,4 +1,4 @@ -/* Smalltalk from Squeak4.4 with VMMaker 4.12.7 translated as C source on 27 October 2013 11:13:43 am */ +/* Smalltalk from Squeak4.4 with VMMaker 4.12.8 translated as C source on 31 October 2013 7:50:24 pm */ /* Automatically generated by FT2PluginCodeGenerator * FreeType-tween.435 uuid: 1866706e-ba6b-a742-b2fb-7854932b7596 from @@ -121,9 +121,9 @@ static FT_Library library; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "FT2Plugin 27 October 2013 (i)" + "FT2Plugin 31 October 2013 (i)" #else - "FT2Plugin 27 October 2013 (e)" + "FT2Plugin 31 October 2013 (e)" #endif ; Modified: trunk/src/plugins/FileCopyPlugin/FileCopyPlugin.c =================================================================== --- trunk/src/plugins/FileCopyPlugin/FileCopyPlugin.c 2013-10-27 15:40:04 UTC (rev 2794) +++ trunk/src/plugins/FileCopyPlugin/FileCopyPlugin.c 2013-10-31 23:56:21 UTC (rev 2795) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.4 with VMMaker 4.12.7 translated as C source on 27 October 2013 11:13:54 am */ +/* Smalltalk from Squeak4.4 with VMMaker 4.12.8 translated as C source on 31 October 2013 7:50:35 pm */ /* Automatically generated by - SmartSyntaxPluginCodeGenerator VMMaker-dtl.327 uuid: ba3104e6-7926-482f-9ef1-cdf59721acb8 + SmartSyntaxPluginCodeGenerator VMMaker-dtl.328 uuid: 952f8e54-a106-406f-8f0e-3c588fb14748 from - FileCopyPlugin VMMaker-dtl.327 uuid: ba3104e6-7926-482f-9ef1-cdf59721acb8 + FileCopyPlugin VMMaker-dtl.328 uuid: 952f8e54-a106-406f-8f0e-3c588fb14748 */ -static char __buildInfo[] = "FileCopyPlugin VMMaker-dtl.327 uuid: ba3104e6-7926-482f-9ef1-cdf59721acb8 " __DATE__ ; +static char __buildInfo[] = "FileCopyPlugin VMMaker-dtl.328 uuid: 952f8e54-a106-406f-8f0e-3c588fb14748 " __DATE__ ; @@ -57,9 +57,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "FileCopyPlugin 27 October 2013 (i)" + "FileCopyPlugin 31 October 2013 (i)" #else - "FileCopyPlugin 27 October 2013 (e)" + "FileCopyPlugin 31 October 2013 (e)" #endif ; Modified: trunk/src/plugins/FilePlugin/FilePlugin.c =================================================================== --- trunk/src/plugins/FilePlugin/FilePlugin.c 2013-10-27 15:40:04 UTC (rev 2794) +++ trunk/src/plugins/FilePlugin/FilePlugin.c 2013-10-31 23:56:21 UTC (rev 2795) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.4 with VMMaker 4.12.7 translated as C source on 27 October 2013 11:13:44 am */ +/* Smalltalk from Squeak4.4 with VMMaker 4.12.8 translated as C source on 31 October 2013 7:50:25 pm */ /* Automatically generated by - VMPluginCodeGenerator VMMaker-dtl.327 uuid: ba3104e6-7926-482f-9ef1-cdf59721acb8 + VMPluginCodeGenerator VMMaker-dtl.328 uuid: 952f8e54-a106-406f-8f0e-3c588fb14748 from - FilePlugin VMMaker-dtl.327 uuid: ba3104e6-7926-482f-9ef1-cdf59721acb8 + FilePlugin VMMaker-dtl.328 uuid: 952f8e54-a106-406f-8f0e-3c588fb14748 */ -static char __buildInfo[] = "FilePlugin VMMaker-dtl.327 uuid: ba3104e6-7926-482f-9ef1-cdf59721acb8 " __DATE__ ; +static char __buildInfo[] = "FilePlugin VMMaker-dtl.328 uuid: 952f8e54-a106-406f-8f0e-3c588fb14748 " __DATE__ ; @@ -100,9 +100,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "FilePlugin 27 October 2013 (i)" + "FilePlugin 31 October 2013 (i)" #else - "FilePlugin 27 October 2013 (e)" + "FilePlugin 31 October 2013 (e)" #endif ; static void * sCCPfn; Modified: trunk/src/plugins/FloatArrayPlugin/FloatArrayPlugin.c =================================================================== --- trunk/src/plugins/FloatArrayPlugin/FloatArrayPlugin.c 2013-10-27 15:40:04 UTC (rev 2794) +++ trunk/src/plugins/FloatArrayPlugin/FloatArrayPlugin.c 2013-10-31 23:56:21 UTC (rev 2795) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.4 with VMMaker 4.12.7 translated as C source on 27 October 2013 11:13:44 am */ +/* Smalltalk from Squeak4.4 with VMMaker 4.12.8 translated as C source on 31 October 2013 7:50:25 pm */ /* Automatically generated by - VMPluginCodeGenerator VMMaker-dtl.327 uuid: ba3104e6-7926-482f-9ef1-cdf59721acb8 + VMPluginCodeGenerator VMMaker-dtl.328 uuid: 952f8e54-a106-406f-8f0e-3c588fb14748 from - FloatArrayPlugin VMMaker-dtl.327 uuid: ba3104e6-7926-482f-9ef1-cdf59721acb8 + FloatArrayPlugin VMMaker-dtl.328 uuid: 952f8e54-a106-406f-8f0e-3c588fb14748 */ -static char __buildInfo[] = "FloatArrayPlugin VMMaker-dtl.327 uuid: ba3104e6-7926-482f-9ef1-cdf59721acb8 " __DATE__ ; +static char __buildInfo[] = "FloatArrayPlugin VMMaker-dtl.328 uuid: 952f8e54-a106-406f-8f0e-3c588fb14748 " __DATE__ ; @@ -72,9 +72,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "FloatArrayPlugin 27 October 2013 (i)" + "FloatArrayPlugin 31 October 2013 (i)" #else - "FloatArrayPlugin 27 October 2013 (e)" + "FloatArrayPlugin 31 October 2013 (e)" #endif ; Modified: trunk/src/plugins/FloatMathPlugin/FloatMathPlugin.c =================================================================== --- trunk/src/plugins/FloatMathPlugin/FloatMathPlugin.c 2013-10-27 15:40:04 UTC (rev 2794) +++ trunk/src/plugins/FloatMathPlugin/FloatMathPlugin.c 2013-10-31 23:56:21 UTC (rev 2795) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.4 with VMMaker 4.12.7 translated as C source on 27 October 2013 11:13:44 am */ +/* Smalltalk from Squeak4.4 with VMMaker 4.12.8 translated as C source on 31 October 2013 7:50:25 pm */ /* Automatically generated by - VMPluginCodeGenerator VMMaker-dtl.327 uuid: ba3104e6-7926-482f-9ef1-cdf59721acb8 + VMPluginCodeGenerator VMMaker-dtl.328 uuid: 952f8e54-a106-406f-8f0e-3c588fb14748 from - FloatMathPlugin VMMaker-dtl.327 uuid: ba3104e6-7926-482f-9ef1-cdf59721acb8 + FloatMathPlugin VMMaker-dtl.328 uuid: 952f8e54-a106-406f-8f0e-3c588fb14748 */ -static char __buildInfo[] = "FloatMathPlugin VMMaker-dtl.327 uuid: ba3104e6-7926-482f-9ef1-cdf59721acb8 " __DATE__ ; +static char __buildInfo[] = "FloatMathPlugin VMMaker-dtl.328 uuid: 952f8e54-a106-406f-8f0e-3c588fb14748 " __DATE__ ; @@ -79,9 +79,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "FloatMathPlugin 27 October 2013 (i)" + "FloatMathPlugin 31 October 2013 (i)" #else - "FloatMathPlugin 27 October 2013 (e)" + "FloatMathPlugin 31 October 2013 (e)" #endif ; Modified: trunk/src/plugins/GeniePlugin/GeniePlugin.c =================================================================== --- trunk/src/plugins/GeniePlugin/GeniePlugin.c 2013-10-27 15:40:04 UTC (rev 2794) +++ trunk/src/plugins/GeniePlugin/GeniePlugin.c 2013-10-31 23:56:21 UTC (rev 2795) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.4 with VMMaker 4.12.7 translated as C source on 27 October 2013 11:13:45 am */ +/* Smalltalk from Squeak4.4 with VMMaker 4.12.8 translated as C source on 31 October 2013 7:50:26 pm */ /* Automatically generated by - SmartSyntaxPluginCodeGenerator VMMaker-dtl.327 uuid: ba3104e6-7926-482f-9ef1-cdf59721acb8 + SmartSyntaxPluginCodeGenerator VMMaker-dtl.328 uuid: 952f8e54-a106-406f-8f0e-3c588fb14748 from - GeniePlugin VMMaker-dtl.327 uuid: ba3104e6-7926-482f-9ef1-cdf59721acb8 + GeniePlugin VMMaker-dtl.328 uuid: 952f8e54-a106-406f-8f0e-3c588fb14748 */ -static char __buildInfo[] = "GeniePlugin VMMaker-dtl.327 uuid: ba3104e6-7926-482f-9ef1-cdf59721acb8 " __DATE__ ; +static char __buildInfo[] = "GeniePlugin VMMaker-dtl.328 uuid: 952f8e54-a106-406f-8f0e-3c588fb14748 " __DATE__ ; @@ -61,9 +61,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "GeniePlugin v2.0 27 October 2013 (i)" + "GeniePlugin v2.0 31 October 2013 (i)" #else - "GeniePlugin v2.0 27 October 2013 (e)" + "GeniePlugin v2.0 31 October 2013 (e)" #endif ; Modified: trunk/src/plugins/HostWindowPlugin/HostWindowPlugin.c =================================================================== --- trunk/src/plugins/HostWindowPlugin/HostWindowPlugin.c 2013-10-27 15:40:04 UTC (rev 2794) +++ trunk/src/plugins/HostWindowPlugin/HostWindowPlugin.c 2013-10-31 23:56:21 UTC (rev 2795) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.4 with VMMaker 4.12.7 translated as C source on 27 October 2013 11:13:56 am */ +/* Smalltalk from Squeak4.4 with VMMaker 4.12.8 translated as C source on 31 October 2013 7:50:37 pm */ /* Automatically generated by - SmartSyntaxPluginCodeGenerator VMMaker-dtl.327 uuid: ba3104e6-7926-482f-9ef1-cdf59721acb8 + SmartSyntaxPluginCodeGenerator VMMaker-dtl.328 uuid: 952f8e54-a106-406f-8f0e-3c588fb14748 from - HostWindowPlugin VMMaker-dtl.327 uuid: ba3104e6-7926-482f-9ef1-cdf59721acb8 + HostWindowPlugin VMMaker-dtl.328 uuid: 952f8e54-a106-406f-8f0e-3c588fb14748 */ -static char __buildInfo[] = "HostWindowPlugin VMMaker-dtl.327 uuid: ba3104e6-7926-482f-9ef1-cdf59721acb8 " __DATE__ ; +static char __buildInfo[] = "HostWindowPlugin VMMaker-dtl.328 uuid: 952f8e54-a106-406f-8f0e-3c588fb14748 " __DATE__ ; @@ -66,9 +66,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "HostWindowPlugin 27 October 2013 (i)" + "HostWindowPlugin 31 October 2013 (i)" #else - "HostWindowPlugin 27 October 2013 (e)" + "HostWindowPlugin 31 October 2013 (e)" #endif ; Modified: trunk/src/plugins/JPEGReadWriter2Plugin/JPEGReadWriter2Plugin.c =================================================================== --- trunk/src/plugins/JPEGReadWriter2Plugin/JPEGReadWriter2Plugin.c 2013-10-27 15:40:04 UTC (rev 2794) +++ trunk/src/plugins/JPEGReadWriter2Plugin/JPEGReadWriter2Plugin.c 2013-10-31 23:56:21 UTC (rev 2795) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.4 with VMMaker 4.12.7 translated as C source on 27 October 2013 11:13:45 am */ +/* Smalltalk from Squeak4.4 with VMMaker 4.12.8 translated as C source on 31 October 2013 7:50:26 pm */ /* Automatically generated by - SmartSyntaxPluginCodeGenerator VMMaker-dtl.327 uuid: ba3104e6-7926-482f-9ef1-cdf59721acb8 + SmartSyntaxPluginCodeGenerator VMMaker-dtl.328 uuid: 952f8e54-a106-406f-8f0e-3c588fb14748 from - JPEGReadWriter2Plugin VMMaker-dtl.327 uuid: ba3104e6-7926-482f-9ef1-cdf59721acb8 + JPEGReadWriter2Plugin VMMaker-dtl.328 uuid: 952f8e54-a106-406f-8f0e-3c588fb14748 */ -static char __buildInfo[] = "JPEGReadWriter2Plugin VMMaker-dtl.327 uuid: ba3104e6-7926-482f-9ef1-cdf59721acb8 " __DATE__ ; +static char __buildInfo[] = "JPEGReadWriter2Plugin VMMaker-dtl.328 uuid: 952f8e54-a106-406f-8f0e-3c588fb14748 " __DATE__ ; @@ -68,9 +68,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "JPEGReadWriter2Plugin 27 October 2013 (i)" + "JPEGReadWriter2Plugin 31 October 2013 (i)" #else - "JPEGReadWriter2Plugin 27 October 2013 (e)" + "JPEGReadWriter2Plugin 31 October 2013 (e)" #endif ; Modified: trunk/src/plugins/JPEGReaderPlugin/JPEGReaderPlugin.c =================================================================== --- trunk/src/plugins/JPEGReaderPlugin/JPEGReaderPlugin.c 2013-10-27 15:40:04 UTC (rev 2794) +++ trunk/src/plugins/JPEGReaderPlugin/JPEGReaderPlugin.c 2013-10-31 23:56:21 UTC (rev 2795) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.4 with VMMaker 4.12.7 translated as C source on 27 October 2013 11:13:45 am */ +/* Smalltalk from Squeak4.4 with VMMaker 4.12.8 translated as C source on 31 October 2013 7:50:26 pm */ /* Automatically generated by - VMPluginCodeGenerator VMMaker-dtl.327 uuid: ba3104e6-7926-482f-9ef1-cdf59721acb8 + VMPluginCodeGenerator VMMaker-dtl.328 uuid: 952f8e54-a106-406f-8f0e-3c588fb14748 from - JPEGReaderPlugin VMMaker-dtl.327 uuid: ba3104e6-7926-482f-9ef1-cdf59721acb8 + JPEGReaderPlugin VMMaker-dtl.328 uuid: 952f8e54-a106-406f-8f0e-3c588fb14748 */ -static char __buildInfo[] = "JPEGReaderPlugin VMMaker-dtl.327 uuid: ba3104e6-7926-482f-9ef1-cdf59721acb8 " __DATE__ ; +static char __buildInfo[] = "JPEGReaderPlugin VMMaker-dtl.328 uuid: 952f8e54-a106-406f-8f0e-3c588fb14748 " __DATE__ ; @@ -136,9 +136,9 @@ static sqInt jsReadLimit; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "JPEGReaderPlugin 27 October 2013 (i)" + "JPEGReaderPlugin 31 October 2013 (i)" #else - "JPEGReaderPlugin 27 October 2013 (e)" + "JPEGReaderPlugin 31 October 2013 (e)" #endif ; static int *residuals; Modified: trunk/src/plugins/JoystickTabletPlugin/JoystickTabletPlugin.c =================================================================== --- trunk/src/plugins/JoystickTabletPlugin/JoystickTabletPlugin.c 2013-10-27 15:40:04 UTC (rev 2794) +++ trunk/src/plugins/JoystickTabletPlugin/JoystickTabletPlugin.c 2013-10-31 23:56:21 UTC (rev 2795) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.4 with VMMaker 4.12.7 translated as C source on 27 October 2013 11:13:46 am */ +/* Smalltalk from Squeak4.4 with VMMaker 4.12.8 translated as C source on 31 October 2013 7:50:27 pm */ /* Automatically generated by - SmartSyntaxPluginCodeGenerator VMMaker-dtl.327 uuid: ba3104e6-7926-482f-9ef1-cdf59721acb8 + SmartSyntaxPluginCodeGenerator VMMaker-dtl.328 uuid: 952f8e54-a106-406f-8f0e-3c588fb14748 from - JoystickTabletPlugin VMMaker-dtl.327 uuid: ba3104e6-7926-482f-9ef1-cdf59721acb8 + JoystickTabletPlugin VMMaker-dtl.328 uuid: 952f8e54-a106-406f-8f0e-3c588fb14748 */ -static char __buildInfo[] = "JoystickTabletPlugin VMMaker-dtl.327 uuid: ba3104e6-7926-482f-9ef1-cdf59721acb8 " __DATE__ ; +static char __buildInfo[] = "JoystickTabletPlugin VMMaker-dtl.328 uuid: 952f8e54-a106-406f-8f0e-3c588fb14748 " __DATE__ ; @@ -62,9 +62,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "JoystickTabletPlugin 27 October 2013 (i)" + "JoystickTabletPlugin 31 October 2013 (i)" #else - "JoystickTabletPlugin 27 October 2013 (e)" + "JoystickTabletPlugin 31 October 2013 (e)" #endif ; Modified: trunk/src/plugins/Klatt/Klatt.c =================================================================== --- trunk/src/plugins/Klatt/Klatt.c 2013-10-27 15:40:04 UTC (rev 2794) +++ trunk/src/plugins/Klatt/Klatt.c 2013-10-31 23:56:21 UTC (rev 2795) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.4 with VMMaker 4.12.7 translated as C source on 27 October 2013 11:13:46 am */ +/* Smalltalk from Squeak4.4 with VMMaker 4.12.8 translated as C source on 31 October 2013 7:50:27 pm */ /* Automatically generated by - VMPluginCodeGenerator VMMaker-dtl.327 uuid: ba3104e6-7926-482f-9ef1-cdf59721acb8 + VMPluginCodeGenerator VMMaker-dtl.328 uuid: 952f8e54-a106-406f-8f0e-3c588fb14748 from - KlattSynthesizerPlugin VMMaker-dtl.327 uuid: ba3104e6-7926-482f-9ef1-cdf59721acb8 + KlattSynthesizerPlugin VMMaker-dtl.328 uuid: 952f8e54-a106-406f-8f0e-3c588fb14748 */ -static char __buildInfo[] = "KlattSynthesizerPlugin VMMaker-dtl.327 uuid: ba3104e6-7926-482f-9ef1-cdf59721acb8 " __DATE__ ; +static char __buildInfo[] = "KlattSynthesizerPlugin VMMaker-dtl.328 uuid: 952f8e54-a106-406f-8f0e-3c588fb14748 " __DATE__ ; @@ -155,9 +155,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "Klatt 27 October 2013 (i)" + "Klatt 31 October 2013 (i)" #else - "Klatt 27 October 2013 (e)" + "Klatt 31 October 2013 (e)" #endif ; static float nlast; Modified: trunk/src/plugins/LargeIntegers/LargeIntegers.c =================================================================== --- trunk/src/plugins/LargeIntegers/LargeIntegers.c 2013-10-27 15:40:04 UTC (rev 2794) +++ trunk/src/plugins/LargeIntegers/LargeIntegers.c 2013-10-31 23:56:21 UTC (rev 2795) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.4 with VMMaker 4.12.7 translated as C source on 27 October 2013 11:13:47 am */ +/* Smalltalk from Squeak4.4 with VMMaker 4.12.8 translated as C source on 31 October 2013 7:50:28 pm */ /* Automatically generated by - SmartSyntaxPluginCodeGenerator VMMaker-dtl.327 uuid: ba3104e6-7926-482f-9ef1-cdf59721acb8 + SmartSyntaxPluginCodeGenerator VMMaker-dtl.328 uuid: 952f8e54-a106-406f-8f0e-3c588fb14748 from - LargeIntegersPlugin VMMaker-dtl.327 uuid: ba3104e6-7926-482f-9ef1-cdf59721acb8 + LargeIntegersPlugin VMMaker-dtl.328 uuid: 952f8e54-a106-406f-8f0e-3c588fb14748 */ -static char __buildInfo[] = "LargeIntegersPlugin VMMaker-dtl.327 uuid: ba3104e6-7926-482f-9ef1-cdf59721acb8 " __DATE__ ; +static char __buildInfo[] = "LargeIntegersPlugin VMMaker-dtl.328 uuid: 952f8e54-a106-406f-8f0e-3c588fb14748 " __DATE__ ; Modified: trunk/src/plugins/LocalePlugin/LocalePlugin.c =================================================================== --- trunk/src/plugins/LocalePlugin/LocalePlugin.c 2013-10-27 15:40:04 UTC (rev 2794) +++ trunk/src/plugins/LocalePlugin/LocalePlugin.c 2013-10-31 23:56:21 UTC (rev 2795) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.4 with VMMaker 4.12.7 translated as C source on 27 October 2013 11:13:47 am */ +/* Smalltalk from Squeak4.4 with VMMaker 4.12.8 translated as C source on 31 October 2013 7:50:28 pm */ /* Automatically generated by - SmartSyntaxPluginCodeGenerator VMMaker-dtl.327 uuid: ba3104e6-7926-482f-9ef1-cdf59721acb8 + SmartSyntaxPluginCodeGenerator VMMaker-dtl.328 uuid: 952f8e54-a106-406f-8f0e-3c588fb14748 from - LocalePlugin VMMaker-dtl.327 uuid: ba3104e6-7926-482f-9ef1-cdf59721acb8 + LocalePlugin VMMaker-dtl.328 uuid: 952f8e54-a106-406f-8f0e-3c588fb14748 */ -static char __buildInfo[] = "LocalePlugin VMMaker-dtl.327 uuid: ba3104e6-7926-482f-9ef1-cdf59721acb8 " __DATE__ ; +static char __buildInfo[] = "LocalePlugin VMMaker-dtl.328 uuid: 952f8e54-a106-406f-8f0e-3c588fb14748 " __DATE__ ; @@ -71,9 +71,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "LocalePlugin 27 October 2013 (i)" + "LocalePlugin 31 October 2013 (i)" #else - "LocalePlugin 27 October 2013 (e)" + "LocalePlugin 31 October 2013 (e)" #endif ; Modified: trunk/src/plugins/MIDIPlugin/MIDIPlugin.c =================================================================== --- trunk/src/plugins/MIDIPlugin/MIDIPlugin.c 2013-10-27 15:40:04 UTC (rev 2794) +++ trunk/src/plugins/MIDIPlugin/MIDIPlugin.c 2013-10-31 23:56:21 UTC (rev 2795) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.4 with VMMaker 4.12.7 translated as C source on 27 October 2013 11:13:58 am */ +/* Smalltalk from Squeak4.4 with VMMaker 4.12.8 translated as C source on 31 October 2013 7:50:39 pm */ /* Automatically generated by - SmartSyntaxPluginCodeGenerator VMMaker-dtl.327 uuid: ba3104e6-7926-482f-9ef1-cdf59721acb8 + SmartSyntaxPluginCodeGenerator VMMaker-dtl.328 uuid: 952f8e54-a106-406f-8f0e-3c588fb14748 from - MIDIPlugin VMMaker-dtl.327 uuid: ba3104e6-7926-482f-9ef1-cdf59721acb8 + MIDIPlugin VMMaker-dtl.328 uuid: 952f8e54-a106-406f-8f0e-3c588fb14748 */ -static char __buildInfo[] = "MIDIPlugin VMMaker-dtl.327 uuid: ba3104e6-7926-482f-9ef1-cdf59721acb8 " __DATE__ ; +static char __buildInfo[] = "MIDIPlugin VMMaker-dtl.328 uuid: 952f8e54-a106-406f-8f0e-3c588fb14748 " __DATE__ ; @@ -70,9 +70,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "MIDIPlugin 27 October 2013 (i)" + "MIDIPlugin 31 October 2013 (i)" #else - "MIDIPlugin 27 October 2013 (e)" + "MIDIPlugin 31 October 2013 (e)" #endif ; Modified: trunk/src/plugins/Matrix2x3Plugin/Matrix2x3Plugin.c =================================================================== --- trunk/src/plugins/Matrix2x3Plugin/Matrix2x3Plugin.c 2013-10-27 15:40:04 UTC (rev 2794) +++ trunk/src/plugins/Matrix2x3Plugin/Matrix2x3Plugin.c 2013-10-31 23:56:21 UTC (rev 2795) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.4 with VMMaker 4.12.7 translated as C source on 27 October 2013 11:13:48 am */ +/* Smalltalk from Squeak4.4 with VMMaker 4.12.8 translated as C source on 31 October 2013 7:50:28 pm */ /* Automatically generated by - VMPluginCodeGenerator VMMaker-dtl.327 uuid: ba3104e6-7926-482f-9ef1-cdf59721acb8 + VMPluginCodeGenerator VMMaker-dtl.328 uuid: 952f8e54-a106-406f-8f0e-3c588fb14748 from - Matrix2x3Plugin VMMaker-dtl.327 uuid: ba3104e6-7926-482f-9ef1-cdf59721acb8 + Matrix2x3Plugin VMMaker-dtl.328 uuid: 952f8e54-a106-406f-8f0e-3c588fb14748 */ -static char __buildInfo[] = "Matrix2x3Plugin VMMaker-dtl.327 uuid: ba3104e6-7926-482f-9ef1-cdf59721acb8 " __DATE__ ; +static char __buildInfo[] = "Matrix2x3Plugin VMMaker-dtl.328 uuid: 952f8e54-a106-406f-8f0e-3c588fb14748 " __DATE__ ; @@ -74,9 +74,9 @@ static double m23ResultY; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "Matrix2x3Plugin 27 October 2013 (i)" + "Matrix2x3Plugin 31 October 2013 (i)" #else - "Matrix2x3Plugin 27 October 2013 (e)" + "Matrix2x3Plugin 31 October 2013 (e)" #endif ; Modified: trunk/src/plugins/MiscPrimitivePlugin/MiscPrimitivePlugin.c =================================================================== --- trunk/src/plugins/MiscPrimitivePlugin/MiscPrimitivePlugin.c 2013-10-27 15:40:04 UTC (rev 2794) +++ trunk/src/plugins/MiscPrimitivePlugin/MiscPrimitivePlugin.c 2013-10-31 23:56:21 UTC (rev 2795) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.4 with VMMaker 4.12.7 translated as C source on 27 October 2013 11:13:48 am */ +/* Smalltalk from Squeak4.4 with VMMaker 4.12.8 translated as C source on 31 October 2013 7:50:29 pm */ /* Automatically generated by - VMPluginCodeGenerator VMMaker-dtl.327 uuid: ba3104e6-7926-482f-9ef1-cdf59721acb8 + VMPluginCodeGenerator VMMaker-dtl.328 uuid: 952f8e54-a106-406f-8f0e-3c588fb14748 from - MiscPrimitivePlugin VMMaker-dtl.327 uuid: ba3104e6-7926-482f-9ef1-cdf59721acb8 + MiscPrimitivePlugin VMMaker-dtl.328 uuid: 952f8e54-a106-406f-8f0e-3c588fb14748 */ -static char __buildInfo[] = "MiscPrimitivePlugin VMMaker-dtl.327 uuid: ba3104e6-7926-482f-9ef1-cdf59721acb8 " __DATE__ ; +static char __buildInfo[] = "MiscPrimitivePlugin VMMaker-dtl.328 uuid: 952f8e54-a106-406f-8f0e-3c588fb14748 " __DATE__ ; @@ -70,9 +70,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "MiscPrimitivePlugin 27 October 2013 (i)" + "MiscPrimitivePlugin 31 October 2013 (i)" #else - "MiscPrimitivePlugin 27 October 2013 (e)" + "MiscPrimitivePlugin 31 October 2013 (e)" #endif ; Modified: trunk/src/plugins/Mpeg3Plugin/Mpeg3Plugin.c =================================================================== --- trunk/src/plugins/Mpeg3Plugin/Mpeg3Plugin.c 2013-10-27 15:40:04 UTC (rev 2794) +++ trunk/src/plugins/Mpeg3Plugin/Mpeg3Plugin.c 2013-10-31 23:56:21 UTC (rev 2795) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.4 with VMMaker 4.12.7 translated as C source on 27 October 2013 11:13:58 am */ +/* Smalltalk from Squeak4.4 with VMMaker 4.12.8 translated as C source on 31 October 2013 7:50:39 pm */ /* Automatically generated by - SmartSyntaxPluginCodeGenerator VMMaker-dtl.327 uuid: ba3104e6-7926-482f-9ef1-cdf59721acb8 + SmartSyntaxPluginCodeGenerator VMMaker-dtl.328 uuid: 952f8e54-a106-406f-8f0e-3c588fb14748 from - Mpeg3Plugin VMMaker-dtl.327 uuid: ba3104e6-7926-482f-9ef1-cdf59721acb8 + Mpeg3Plugin VMMaker-dtl.328 uuid: 952f8e54-a106-406f-8f0e-3c588fb14748 */ -static char __buildInfo[] = "Mpeg3Plugin VMMaker-dtl.327 uuid: ba3104e6-7926-482f-9ef1-cdf59721acb8 " __DATE__ ; +static char __buildInfo[] = "Mpeg3Plugin VMMaker-dtl.328 uuid: 952f8e54-a106-406f-8f0e-3c588fb14748 " __DATE__ ; @@ -101,9 +101,9 @@ static sqInt maximumNumberOfFilesToWatch; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "Mpeg3Plugin 27 October 2013 (i)" + "Mpeg3Plugin 31 October 2013 (i)" #else - "Mpeg3Plugin 27 October 2013 (e)" + "Mpeg3Plugin 31 October 2013 (e)" #endif ; static mpeg3_t *mpegFiles[1024+1]; Modified: trunk/src/plugins/RePlugin/RePlugin.c =================================================================== --- trunk/src/plugins/RePlugin/RePlugin.c 2013-10-27 15:40:04 UTC (rev 2794) +++ trunk/src/plugins/RePlugin/RePlugin.c 2013-10-31 23:56:21 UTC (rev 2795) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.4 with VMMaker 4.12.7 translated as C source on 27 October 2013 11:13:48 am */ +/* Smalltalk from Squeak4.4 with VMMaker 4.12.8 translated as C source on 31 October 2013 7:50:29 pm */ /* Automatically generated by - SmartSyntaxPluginCodeGenerator VMMaker-dtl.327 uuid: ba3104e6-7926-482f-9ef1-cdf59721acb8 + SmartSyntaxPluginCodeGenerator VMMaker-dtl.328 uuid: 952f8e54-a106-406f-8f0e-3c588fb14748 from - RePlugin VMMaker-dtl.327 uuid: ba3104e6-7926-482f-9ef1-cdf59721acb8 + RePlugin VMMaker-dtl.328 uuid: 952f8e54-a106-406f-8f0e-3c588fb14748 */ -static char __buildInfo[] = "RePlugin VMMaker-dtl.327 uuid: ba3104e6-7926-482f-9ef1-cdf59721acb8 " __DATE__ ; +static char __buildInfo[] = "RePlugin VMMaker-dtl.328 uuid: 952f8e54-a106-406f-8f0e-3c588fb14748 " __DATE__ ; @@ -79,9 +79,9 @@ static sqInt matchFlags; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "RePlugin 27 October 2013 (i)" + "RePlugin 31 October 2013 (i)" #else - "RePlugin 27 October 2013 (e)" + "RePlugin 31 October 2013 (e)" #endif ; static int netMemory = 0; Modified: trunk/src/plugins/RomePlugin/RomePlugin.c =================================================================== --- trunk/src/plugins/RomePlugin/RomePlugin.c 2013-10-27 15:40:04 UTC (rev 2794) +++ trunk/src/plugins/RomePlugin/RomePlugin.c 2013-10-31 23:56:21 UTC (rev 2795) @@ -1,6 +1,6 @@ -/* Smalltalk from Squeak4.4 with VMMaker 4.12.7 translated as C source on 27 October 2013 11:13:59 am */ +/* Smalltalk from Squeak4.4 with VMMaker 4.12.8 translated as C source on 31 October 2013 7:50:40 pm */ /* Automatically generated by - SmartSyntaxPluginCodeGenerator VMMaker-dtl.327 uuid: ba3104e6-7926-482f-9ef1-cdf59721acb8 + SmartSyntaxPluginCodeGenerator VMMaker-dtl.328 uuid: 952f8e54-a106-406f-8f0e-3c588fb14748 from RomePlugin Rome-Plugin-yo.39 uuid: 4bc7d831-189d-43ce-8b6d-7e96cf20a234 */ @@ -199,9 +199,9 @@ static sqInt maxSurfaceID; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "RomePlugin yo.39 27 October 2013 (i)" + "RomePlugin yo.39 31 October 2013 (i)" #else - "RomePlugin yo.39 27 October 2013 (e)" + "RomePlugin yo.39 31 October 2013 (e)" #endif ; static fn_ioRegisterSurface registerSurfaceFn; Modified: trunk/src/plugins/ScratchPlugin/ScratchPlugin.c =================================================================== --- trunk/src/plugins/ScratchPlugin/ScratchPlugin.c 2013-10-27 15:40:04 UTC (rev 2794) +++ trunk/src/plugins/ScratchPlugin/ScratchPlugin.c 2013-10-31 23:56:21 UTC (rev 2795) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.4 with VMMaker 4.12.7 translated as C source on 27 October 2013 11:14 am */ +/* Smalltalk from Squeak4.4 with VMMaker 4.12.8 translated as C source on 31 October 2013 7:50:41 pm */ /* Automatically generated by - VMPluginCodeGenerator VMMaker-dtl.327 uuid: ba3104e6-7926-482f-9ef1-cdf59721acb8 + VMPluginCodeGenerator VMMaker-dtl.328 uuid: 952f8e54-a106-406f-8f0e-3c588fb14748 from - ScratchPlugin VMMaker-dtl.327 uuid: ba3104e6-7926-482f-9ef1-cdf59721acb8 + ScratchPlugin VMMaker-dtl.328 uuid: 952f8e54-a106-406f-8f0e-3c588fb14748 */ -static char __buildInfo[] = "ScratchPlugin VMMaker-dtl.327 uuid: ba3104e6-7926-482f-9ef1-cdf59721acb8 " __DATE__ ; +static char __buildInfo[] = "ScratchPlugin VMMaker-dtl.328 uuid: 952f8e54-a106-406f-8f0e-3c588fb14748 " __DATE__ ; @@ -89,9 +89,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "ScratchPlugin 27 October 2013 (i)" + "ScratchPlugin 31 October 2013 (i)" #else - "ScratchPlugin 27 October 2013 (e)" + "ScratchPlugin 31 October 2013 (e)" #endif ; Modified: trunk/src/plugins/SecurityPlugin/SecurityPlugin.c =================================================================== --- trunk/src/plugins/SecurityPlugin/SecurityPlugin.c 2013-10-27 15:40:04 UTC (rev 2794) +++ trunk/src/plugins/SecurityPlugin/SecurityPlugin.c 2013-10-31 23:56:21 UTC (rev 2795) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.4 with VMMaker 4.12.7 translated as C source on 27 October 2013 11:13:49 am */ +/* Smalltalk from Squeak4.4 with VMMaker 4.12.8 translated as C source on 31 October 2013 7:50:29 pm */ /* Automatically generated by - VMPluginCodeGenerator VMMaker-dtl.327 uuid: ba3104e6-7926-482f-9ef1-cdf59721acb8 + VMPluginCodeGenerator VMMaker-dtl.328 uuid: 952f8e54-a106-406f-8f0e-3c588fb14748 from - SecurityPlugin VMMaker-dtl.327 uuid: ba3104e6-7926-482f-9ef1-cdf59721acb8 + SecurityPlugin VMMaker-dtl.328 uuid: 952f8e54-a106-406f-8f0e-3c588fb14748 */ -static char __buildInfo[] = "SecurityPlugin VMMaker-dtl.327 uuid: ba3104e6-7926-482f-9ef1-cdf59721acb8 " __DATE__ ; +static char __buildInfo[] = "SecurityPlugin VMMaker-dtl.328 uuid: 952f8e54-a106-406f-8f0e-3c588fb14748 " __DATE__ ; @@ -80,9 +80,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "SecurityPlugin 27 October 2013 (i)" + "SecurityPlugin 31 October 2013 (i)" #else - "SecurityPlugin 27 October 2013 (e)" + "SecurityPlugin 31 October 2013 (e)" #endif ; Modified: trunk/src/plugins/SerialPlugin/SerialPlugin.c =================================================================== --- trunk/src/plugins/SerialPlugin/SerialPlugin.c 2013-10-27 15:40:04 UTC (rev 2794) +++ trunk/src/plugins/SerialPlugin/SerialPlugin.c 2013-10-31 23:56:21 UTC (rev 2795) @@ -1,10 +1,10 @@ -/* Smalltalk from Squeak4.4 with VMMaker 4.12.7 translated as C source on 27 October 2013 11:13:49 am */ +/* Smalltalk from Squeak4.4 with VMMaker 4.12.8 translated as C source on 31 October 2013 7:50:30 pm */ /* Automatically generated by - SmartSyntaxPluginCodeGenerator VMMaker-dtl.327 uuid: ba3104e6-7926-482f-9ef1-cdf59721acb8 + SmartSyntaxPluginCodeGenerator VMMaker-dtl.328 uuid: 952f8e54-a106-406f-8f0e-3c588fb14748 from - SerialPlugin VMMaker-dtl.327 uuid: ba3104e6-7926-482f-9ef1-cdf59721acb8 + SerialPlugin VMMaker-dtl.328 uuid: 952f8e54-a106-406f-8f0e-3c588fb14748 */ -static char __buildInfo[] = "SerialPlugin VMMaker-dtl.327 uuid: ba3104e6-7926-482f-9ef1-cdf59721acb8 " __DATE__ ; +static char __buildInfo[] = "SerialPlugin VMMaker-dtl.328 uuid: 952f8e54-a106-406f-8f0e-3c588fb14748 " __DATE__ ; @@ -67,9 +67,9 @@ @@ Diff output truncated at 50000 characters. @@

1 0

VM Maker: VMMaker.oscog-eem.485.mcz
by commits＠source.squeak.org 31 Oct '13

31 Oct '13

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.485.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.485 Author: eem Time: 31 October 2013, 9:58:00.215 am UUID: dcfdd894-4f6c-4efe-bf1d-9ec24984d622 Ancestors: VMMaker.oscog-eem.484 Fix ordering of removal of final return and recording of declarations. i.e. move them from TMethod>>inferReturnTypeIn: to CCodeGenerator>>inferTypesForImplicitlyTypedVariablesAndMethods. Don't do them more than once. Pass in code generator to both to allow logging of errors. Check that recorded declarations are for extant variables. Correct a few methods in which this wasn't true. Refactor the return typer determination into addTypesFor:to:in: so it can recurse. Add support for some arithmetic ops. Add asVoidPointer convenience and use it in several mem:cp:y:/ mem:mo:ve: contexts, as welkl as to replace clumsier cCoerceSimple:'s. Force the type of all entries in the primitive table to be void in StackInterpreter class>>preGenerationHook:. =============== Diff against VMMaker.oscog-eem.484 =============== Item was added: + ----- Method: CCodeGenerator>>generateAsVoidPointer:on:indent: (in category 'C translation') ----- + generateAsVoidPointer: msgNode on: aStream indent: level + "Generate the C code for this message onto the given stream." + + aStream nextPutAll: '((void *)'. + self emitCExpression: msgNode receiver on: aStream. + aStream nextPut: $)! Item was changed: ----- Method: CCodeGenerator>>inferTypesForImplicitlyTypedVariablesAndMethods (in category 'type inference') ----- inferTypesForImplicitlyTypedVariablesAndMethods "Infer the return tupe and the types of untyped variables. As far as variables go, for now we try only to infer variables assigned the result of #longLongAt:, but much more could be done here." "Iterate over all methods, inferring #void return types, until we reach a fixed point." + | firstTime | + firstTime := true. [| changedReturnType | changedReturnType := false. methods do: [:m| + firstTime ifTrue: + [m removeFinalSelfReturnIn: self. "must preceed recordDeclarationsIn: because it may set returnType" + m recordDeclarationsIn: self]. + m inferTypesForImplicitlyTypedVariablesIn: self. + (m inferReturnTypeIn: self) ifTrue: - m inferTypesForImplicitlyTypedVariablesIn: self. - (m inferReturnTypeIn: self) ifTrue: [changedReturnType := true]]. + firstTime := false. changedReturnType] whileTrue. "Type all as-yet-untyped methods as the default" methods do: [:m| m returnType ifNil: [m returnType: (self implicitReturnTypeFor: m selector)]]! Item was changed: ----- Method: CCodeGenerator>>initializeCTranslationDictionary (in category 'C translation') ----- initializeCTranslationDictionary "Initialize the dictionary mapping message names to actions for C code generation." | pairs | translationDict := Dictionary new: 200. pairs := #( #& #generateAnd:on:indent: #| #generateOr:on:indent: #and: #generateSequentialAnd:on:indent: #or: #generateSequentialOr:on:indent: #not #generateNot:on:indent: #+ #generatePlus:on:indent: #- #generateMinus:on:indent: #negated #generateNegated:on:indent: #* #generateTimes:on:indent: #/ #generateDivide:on:indent: #// #generateDivide:on:indent: #\\ #generateModulo:on:indent: #<< #generateShiftLeft:on:indent: #>> #generateShiftRight:on:indent: #min: #generateMin:on:indent: #max: #generateMax:on:indent: #between:and: #generateBetweenAnd:on:indent: #bitAnd: #generateBitAnd:on:indent: #bitOr: #generateBitOr:on:indent: #bitXor: #generateBitXor:on:indent: #bitShift: #generateBitShift:on:indent: #signedBitShift: #generateSignedBitShift:on:indent: #bitInvert32 #generateBitInvert32:on:indent: #bitClear: #generateBitClear:on:indent: #truncateTo: #generateTruncateTo:on:indent: #rounded #generateRounded:on:indent: #< #generateLessThan:on:indent: #<= #generateLessThanOrEqual:on:indent: #= #generateEqual:on:indent: #> #generateGreaterThan:on:indent: #>= #generateGreaterThanOrEqual:on:indent: #~= #generateNotEqual:on:indent: #== #generateEqual:on:indent: #~~ #generateNotEqual:on:indent: #isNil #generateIsNil:on:indent: #notNil #generateNotNil:on:indent: #whileTrue: #generateWhileTrue:on:indent: #whileFalse: #generateWhileFalse:on:indent: #whileTrue #generateDoWhileTrue:on:indent: #whileFalse #generateDoWhileFalse:on:indent: #to:do: #generateToDo:on:indent: #to:by:do: #generateToByDo:on:indent: #repeat #generateRepeat:on:indent: #ifTrue: #generateIfTrue:on:indent: #ifFalse: #generateIfFalse:on:indent: #ifTrue:ifFalse: #generateIfTrueIfFalse:on:indent: #ifFalse:ifTrue: #generateIfFalseIfTrue:on:indent: #ifNotNil: #generateIfNotNil:on:indent: #ifNil: #generateIfNil:on:indent: #ifNotNil:ifNil: #generateIfNotNilIfNil:on:indent: #ifNil:ifNotNil: #generateIfNilIfNotNil:on:indent: #at: #generateAt:on:indent: #at:put: #generateAtPut:on:indent: #basicAt: #generateAt:on:indent: #basicAt:put: #generateAtPut:on:indent: #integerValueOf: #generateIntegerValueOf:on:indent: #integerObjectOf: #generateIntegerObjectOf:on:indent: #isIntegerObject: #generateIsIntegerObject:on:indent: #cCode: #generateInlineCCode:on:indent: #cCode:inSmalltalk: #generateInlineCCode:on:indent: #cPreprocessorDirective: #generateInlineCPreprocessorDirective:on:indent: #cppIf:ifTrue:ifFalse: #generateInlineCppIfElse:on:indent: #cppIf:ifTrue: #generateInlineCppIfElse:on:indent: #cCoerce:to: #generateCCoercion:on:indent: #cCoerceSimple:to: #generateCCoercion:on:indent: #addressOf: #generateAddressOf:on:indent: #signedIntFromLong #generateSignedIntFromLong:on:indent: #signedIntToLong #generateSignedIntToLong:on:indent: #signedIntFromShort #generateSignedIntFromShort:on:indent: #signedIntToShort #generateSignedIntToShort:on:indent: #preIncrement #generatePreIncrement:on:indent: #preDecrement #generatePreDecrement:on:indent: #inline: #generateInlineDirective:on:indent: #asFloat #generateAsFloat:on:indent: #asInteger #generateAsInteger:on:indent: #asUnsignedInteger #generateAsUnsignedInteger:on:indent: #asLong #generateAsLong:on:indent: #asUnsignedLong #generateAsUnsignedLong:on:indent: + #asVoidPointer #generateAsVoidPointer:on:indent: #asSymbol #generateAsSymbol:on:indent: #flag: #generateFlag:on:indent: #anyMask: #generateBitAnd:on:indent: #noMask: #generateNoMask:on:indent: #raisedTo: #generateRaisedTo:on:indent: #touch: #generateTouch:on:indent: #bytesPerWord #generateBytesPerWord:on:indent: #wordSize #generateBytesPerWord:on:indent: #baseHeaderSize #generateBaseHeaderSize:on:indent: #sharedCodeNamed:inCase: #generateSharedCodeDirective:on:indent: #perform: #generatePerform:on:indent: #perform:with: #generatePerform:on:indent: #perform:with:with: #generatePerform:on:indent: #perform:with:with:with: #generatePerform:on:indent: #perform:with:with:with:with: #generatePerform:on:indent: #perform:with:with:with:with:with: #generatePerform:on:indent: #value #generateValue:on:indent: #value: #generateValue:on:indent: #value:value: #generateValue:on:indent: #shouldNotImplement #generateSmalltalkMetaError:on:indent: #shouldBeImplemented #generateSmalltalkMetaError:on:indent: #subclassResponsibility #generateSmalltalkMetaError:on:indent: ). 1 to: pairs size by: 2 do: [:i | translationDict at: (pairs at: i) put: (pairs at: i + 1)]. pairs := #( #ifTrue: #generateIfTrueAsArgument:on:indent: #ifFalse: #generateIfFalseAsArgument:on:indent: #ifTrue:ifFalse: #generateIfTrueIfFalseAsArgument:on:indent: #ifFalse:ifTrue: #generateIfFalseIfTrueAsArgument:on:indent: #ifNotNil: #generateIfNotNilAsArgument:on:indent: #ifNil: #generateIfNilAsArgument:on:indent: #ifNotNil:ifNil: #generateIfNotNilIfNilAsArgument:on:indent: #ifNil:ifNotNil: #generateIfNilIfNotNilAsArgument:on:indent: #cCode: #generateInlineCCodeAsArgument:on:indent: #cCode:inSmalltalk: #generateInlineCCodeAsArgument:on:indent: #cppIf:ifTrue:ifFalse: #generateInlineCppIfElseAsArgument:on:indent: #cppIf:ifTrue: #generateInlineCppIfElseAsArgument:on:indent: #value #generateValueAsArgument:on:indent: #value: #generateValueAsArgument:on:indent: #value:value: #generateValueAsArgument:on:indent: ). asArgumentTranslationDict := Dictionary new: 8. 1 to: pairs size by: 2 do: [:i | asArgumentTranslationDict at: (pairs at: i) put: (pairs at: i + 1)]. ! Item was changed: ----- Method: CCodeGenerator>>returnTypeForSend: (in category 'type inference') ----- returnTypeForSend: aTSendNode "Answer the return type for a send. Absent sends default to #sqInt." | sel | ^(methods at: (sel := aTSendNode selector) ifAbsent: nil) ifNil: [kernelReturnTypes at: sel ifAbsent: + [^sel + caseOf: { + [#asVoidPointer] -> [#'void *']. + [#asUnsignedInteger] -> [#usqInt]. + [#asLong] -> [#long]. + [#asUnsignedLong] -> [#'unsigned long']. + [#signedIntToLong] -> [#usqInt]. "c.f. generateSignedIntToLong:on:indent:" + [#signedIntToShort] -> [#usqInt]. "c.f. generateSignedIntToShort:on:indent:" + [#cCoerce:to:] -> [aTSendNode args last value]. + [#cCoerceSimple:to:] -> [aTSendNode args last value] } + otherwise: [#sqInt]]] - [(#(cCoerce:to: cCoerceSimple:to:) includes: sel) - ifTrue: [aTSendNode args last value] - ifFalse: [#sqInt]]] ifNotNil: [:m| m returnType]! Item was changed: ----- Method: CoInterpreter>>callbackEnter: (in category 'callback support') ----- callbackEnter: callbackID "Re-enter the interpreter for executing a callback" | currentCStackPointer currentCFramePointer savedReenterInterpreter wasInMachineCode calledFromMachineCode | <volatile> <export: true> <var: #currentCStackPointer type: #'void *'> <var: #currentCFramePointer type: #'void *'> <var: #callbackID type: #'sqInt *'> <var: #savedReenterInterpreter type: #'jmp_buf'> "For now, do not allow a callback unless we're in a primitiveResponse" (self asserta: primitiveFunctionPointer ~= 0) ifFalse: [^false]. self assert: primFailCode = 0. "Check if we've exceeded the callback depth" (self asserta: jmpDepth < MaxJumpBuf) ifFalse: [^false]. jmpDepth := jmpDepth + 1. wasInMachineCode := self isMachineCodeFrame: framePointer. calledFromMachineCode := instructionPointer <= objectMemory startOfMemory. "Suspend the currently active process" suspendedCallbacks at: jmpDepth put: self activeProcess. "We need to preserve newMethod explicitly since it is not activated yet and therefore no context has been created for it. If the caller primitive for any reason decides to fail we need to make sure we execute the correct method and not the one 'last used' in the call back" suspendedMethods at: jmpDepth put: newMethod. self flag: 'need to debug this properly. Conceptually it is the right thing to do but it crashes in practice'. false ifTrue: ["Signal external semaphores since a signalSemaphoreWithIndex: request may have been issued immediately prior to this callback before the VM has any chance to do a signalExternalSemaphores in checkForEventsMayContextSwitch:" self signalExternalSemaphores. "If no process is awakened by signalExternalSemaphores then transfer to the highest priority runnable one." (suspendedCallbacks at: jmpDepth) == self activeProcess ifTrue: [self transferTo: self wakeHighestPriority from: CSCallbackLeave]] ifFalse: [self transferTo: self wakeHighestPriority from: CSCallbackLeave]. "Typically, invoking the callback means that some semaphore has been signaled to indicate the callback. Force an interrupt check as soon as possible." self forceInterruptCheck. "Save the previous CStackPointers and interpreter entry jmp_buf." currentCStackPointer := cogit getCStackPointer. currentCFramePointer := cogit getCFramePointer. + self mem: savedReenterInterpreter asVoidPointer - self mem: (self cCoerceSimple: savedReenterInterpreter to: #'void *') cp: reenterInterpreter y: (self sizeof: #'jmp_buf'). cogit assertCStackWellAligned. (self setjmp: (jmpBuf at: jmpDepth)) == 0 ifTrue: "Fill in callbackID" [callbackID at: 0 put: jmpDepth. self enterSmalltalkExecutive. self assert: false "NOTREACHED"]. "Restore the previous CStackPointers and interpreter entry jmp_buf." cogit setCStackPointer: currentCStackPointer. cogit setCFramePointer: currentCFramePointer. self mem: reenterInterpreter cp: (self cCoerceSimple: savedReenterInterpreter to: #'void *') y: (self sizeof: #'jmp_buf'). "Transfer back to the previous process so that caller can push result" self putToSleep: self activeProcess yieldingIf: preemptionYields. self transferTo: (suspendedCallbacks at: jmpDepth) from: CSCallbackLeave. newMethod := suspendedMethods at: jmpDepth. "see comment above" argumentCount := self argumentCountOf: newMethod. self assert: wasInMachineCode = (self isMachineCodeFrame: framePointer). calledFromMachineCode ifTrue: [instructionPointer >= objectMemory startOfMemory ifTrue: [self iframeSavedIP: framePointer put: instructionPointer. instructionPointer := cogit ceReturnToInterpreterPC]] ifFalse: ["Even if the context was flushed to the heap and rebuilt in transferTo:from: above it will remain an interpreted frame because the context's pc would remain a bytecode pc. So the instructionPointer must also be a bytecode pc." self assert: (self isMachineCodeFrame: framePointer) not. self assert: instructionPointer > objectMemory startOfMemory]. self assert: primFailCode = 0. jmpDepth := jmpDepth-1. ^true! Item was removed: - ----- Method: CoInterpreter>>followForwardedFrameContents:stackPointer: (in category 'lazy become') ----- - followForwardedFrameContents: theFP stackPointer: theSP - "follow pointers in the current stack frame up to theSP." - <var: #theFP type: #'char *'> - <var: #theSP type: #'char *'> - theFP + (self frameStackedReceiverOffset: theFP) - to: theFP + FoxCallerSavedIP + BytesPerWord - by: BytesPerWord - do: [:ptr| | oop | - oop := stackPages longAt: ptr. - ((objectMemory isNonImmediate: oop) - and: [objectMemory isForwarded: oop]) ifTrue: - [stackPages longAt: ptr put: (objectMemory followForwarded: oop)]]. - theSP - to: (self frameReceiverOffset: theFP) - by: BytesPerWord - do: [:ptr| | oop | - oop := stackPages longAt: ptr. - ((objectMemory isNonImmediate: oop) - and: [objectMemory isForwarded: oop]) ifTrue: - [stackPages longAt: ptr put: (objectMemory followForwarded: oop)]]. - self assert: (objectMemory isForwarded: (self frameMethod: theFP)) not. - (self frameHasContext: theFP) ifTrue: - [self assert: (objectMemory isForwarded: (self frameContext: theFP)) not]! Item was changed: ----- Method: CoInterpreter>>restoreCStackStateForCallbackContext: (in category 'callback support') ----- restoreCStackStateForCallbackContext: vmCallbackContext <var: #vmCallbackContext type: #'VMCallbackContext *'> cogit setCStackPointer: vmCallbackContext savedCStackPointer; setCFramePointer: vmCallbackContext savedCFramePointer. self mem: reenterInterpreter + cp: vmCallbackContext savedReenterInterpreter asVoidPointer - cp: (self cCoerceSimple: vmCallbackContext savedReenterInterpreter to: #'void *') y: (self sizeof: #'jmp_buf')! Item was changed: ----- Method: CoInterpreter>>saveCStackStateForCallbackContext: (in category 'callback support') ----- saveCStackStateForCallbackContext: vmCallbackContext <var: #vmCallbackContext type: #'VMCallbackContext *'> vmCallbackContext savedCStackPointer: cogit getCStackPointer; savedCFramePointer: cogit getCFramePointer. + self mem: vmCallbackContext savedReenterInterpreter asVoidPointer - self mem: (self cCoerceSimple: vmCallbackContext savedReenterInterpreter to: #'void *') cp: reenterInterpreter y: (self sizeof: #'jmp_buf')! Item was changed: ----- Method: CoInterpreterMT>>primitiveRelinquishProcessor (in category 'I/O primitives') ----- primitiveRelinquishProcessor "Relinquish the processor for up to the given number of microseconds. The exact behavior of this primitive is platform dependent. Override to check for waiting threads." | microSecs threadIndexAndFlags currentCStackPointer currentCFramePointer savedReenterInterpreter | <var: #currentCStackPointer type: #'void *'> <var: #currentCFramePointer type: #'void *'> <var: #savedReenterInterpreter type: #'jmp_buf'> microSecs := self stackTop. (objectMemory isIntegerObject: microSecs) ifFalse: [^self primitiveFail]. self assert: (objectMemory fetchPointer: MyListIndex ofObject: self activeProcess) = objectMemory nilObject. self assert: relinquishing not. "DO NOT allow relinquishing the processor while we are profiling since this may skew the time base for our measures (it may reduce processor speed etc). Instead we go full speed, therefore measuring the precise time we spend in the inner idle loop as a busy loop." nextProfileTick = 0 ifTrue: "Presumably we have nothing to do; this primitive is typically called from the background process. So we should /not/ try and activate any threads in the pool; they will waste cycles finding there is no runnable process, and will cause a VM abort if no runnable process is found. But we /do/ want to allow FFI calls that have completed, or callbacks a chance to get into the VM; they do have something to do. DisownVMForProcessorRelinquish indicates this." [currentCStackPointer := cogit getCStackPointer. currentCFramePointer := cogit getCFramePointer. self cCode: + [self mem: savedReenterInterpreter asVoidPointer - [self mem: (self cCoerceSimple: savedReenterInterpreter to: #'void *') cp: reenterInterpreter y: (self sizeof: #'jmp_buf')]. threadIndexAndFlags := self disownVM: DisownVMForProcessorRelinquish. self assert: relinquishing. self ioRelinquishProcessorForMicroseconds: (objectMemory integerValueOf: microSecs). self assert: relinquishing. self ownVM: threadIndexAndFlags. self assert: relinquishing not. self assert: cogThreadManager currentVMThread state = CTMAssignableOrInVM. self assert: currentCStackPointer = cogit getCStackPointer. self assert: currentCFramePointer = cogit getCFramePointer. self cCode: [self assert: (self mem: (self cCoerceSimple: savedReenterInterpreter to: #'void *') cm: reenterInterpreter p: (self sizeof: #'jmp_buf')) = 0]]. self assert: (objectMemory fetchPointer: MyListIndex ofObject: self activeProcess) = objectMemory nilObject. self pop: 1 "microSecs; leave rcvr on stack"! Item was changed: ----- Method: CoInterpreterMT>>returnToSchedulingLoopAndReleaseVMOrWakeThread:source: (in category 'process primitive support') ----- returnToSchedulingLoopAndReleaseVMOrWakeThread: vmThread source: source | savedReenterInterpreter | <var: #savedReenterInterpreter type: #'jmp_buf'> <var: #vmThread type: #'CogVMThread *'> <inline: false> self cCode: [self flag: 'this is just for debugging. Note the current C stack pointers'. cogThreadManager currentVMThread cStackPointer: cogit getCStackPointer; cFramePointer: cogit getCFramePointer] inSmalltalk: [| range | range := self cStackRangeForThreadIndex: cogThreadManager getVMOwner. self assert: (range includes: cogit getCStackPointer). self assert: (range includes: cogit getCFramePointer)]. "We must use a copy of reenterInterpreter since we're giving up the VM to another vmThread." self cCode: + [self mem: savedReenterInterpreter asVoidPointer - [self mem: (self cCoerceSimple: savedReenterInterpreter to: #'void *') cp: reenterInterpreter y: (self sizeof: #'jmp_buf')] inSmalltalk: [savedReenterInterpreter := reenterInterpreter]. self recordThreadSwitchTo: (vmThread ifNotNil: [vmThread index] ifNil: [0]) source: source. vmThread ifNotNil: [cogThreadManager wakeVMThreadFor: vmThread index] ifNil: [cogThreadManager releaseVM]. "2 implies returning to the threadSchedulingLoop." self siglong: savedReenterInterpreter jmp: ReturnToThreadSchedulingLoop! Item was changed: ----- Method: Cogit>>bytecodePCFor:startBcpc:in: (in category 'method map') ----- bytecodePCFor: mcpc startBcpc: startbcpc in: cogMethod "Answer the zero-relative bytecode pc matching the machine code pc argument in cogMethod, given the start of the bytecodes for cogMethod's block or method object." <api> <var: #cogMethod type: #'CogBlockMethod *'> ^self mapFor: cogMethod bcpc: startbcpc performUntil: #findMcpc:Bcpc:MatchingMcpc: + arg: mcpc asVoidPointer! - arg: (self cCoerceSimple: mcpc to: #'void *')! Item was changed: ----- Method: Cogit>>compileCPIC:Case0:Case1Method:tag:isMNUCase:numArgs: (in category 'in-line cacheing') ----- compileCPIC: cPIC Case0: case0CogMethod Case1Method: case1Method tag: case1Tag isMNUCase: isMNUCase numArgs: numArgs "Compile the code for a two-case PIC for case0CogMethod and case1Method,case1Tag. The tag for case0CogMethod is at the send site and so doesn't need to be generated. case1Method may be any of - a Cog method; jump to its unchecked entry-point - a CompiledMethod; jump to the ceInterpretFromPIC trampoline - nil; call ceMNUFromPIC" <var: #cPIC type: #'CogMethod *'> | operand targetEntry jumpNext | <var: #case0CogMethod type: #'CogMethod *'> <var: #targetEntry type: #'void *'> <var: #jumpNext type: #'AbstractInstruction *'> self assert: case1Method notNil. self compilePICProlog: numArgs. self assert: (objectRepresentation inlineCacheTagIsYoung: case1Tag) not. (isMNUCase not and: [coInterpreter methodHasCogMethod: case1Method]) ifTrue: [operand := 0. + targetEntry := ((coInterpreter cogMethodOf: case1Method) asInteger + cmNoCheckEntryOffset) asVoidPointer] - targetEntry := self cCoerceSimple: (coInterpreter cogMethodOf: case1Method) asInteger + cmNoCheckEntryOffset - to: #'void *'] ifFalse: [self assert: (case1Method isNil or: [(objectMemory isYoung: case1Method) not]). operand := case1Method. targetEntry := case1Method isNil ifTrue: [mnuCall] ifFalse: [interpretCall]]. jumpNext := self compileCPICEntry. self MoveCw: 0 R: SendNumArgsReg. self JumpLong: case0CogMethod asInteger + cmNoCheckEntryOffset. endCPICCase0 := self CmpCw: case1Tag R: TempReg. jumpNext jmpTarget: endCPICCase0. self MoveCw: operand R: SendNumArgsReg. self JumpLongZero: (isMNUCase ifTrue: [mnuCall] ifFalse: [targetEntry]) asInteger. endCPICCase1 := self MoveCw: cPIC asInteger R: ClassReg. self JumpLong: (self cPICMissTrampolineFor: numArgs). ^0 ! Item was changed: ----- Method: Cogit>>mcPCFor:startBcpc:in: (in category 'method map') ----- mcPCFor: bcpc startBcpc: startbcpc in: cogMethod "Answer the absolute machine code pc matching the zero-relative bytecode pc argument in cogMethod, given the start of the bytecodes for cogMethod's block or method object." <api> <var: #cogMethod type: #'CogBlockMethod *'> | absPC | absPC := self mapFor: cogMethod bcpc: startbcpc performUntil: #findMcpc:Bcpc:MatchingBcpc: + arg: bcpc asVoidPointer. - arg: (self cCoerceSimple: bcpc to: #'void *'). ^absPC ~= 0 ifTrue: [absPC asUnsignedInteger - cogMethod asUnsignedInteger] ifFalse: [absPC]! Item was added: + ----- Method: Integer>>asVoidPointer (in category '*VMMaker-interpreter simulator') ----- + asVoidPointer + ^self! Item was changed: ----- Method: InterpreterPrimitives>>primitiveFloatAtPut (in category 'indexing primitives') ----- primitiveFloatAtPut "Provide platform-independent access to 32-bit words comprising a Float. Map index 1 onto the most significant word and index 2 onto the least significant word." | rcvr index oopToStore valueToStore | + <var: #valueToStore type: #usqInt> - <var: #result type: #usqInt> self initPrimCall. oopToStore := self stackTop. valueToStore := self positive32BitValueOf: oopToStore. self successful ifFalse: [^self primitiveFailFor: PrimErrBadArgument]. rcvr := self stackValue: 2. index := self stackValue: 1. index = ConstOne ifTrue: [objectMemory storeLong32: (VMBIGENDIAN ifTrue: [0] ifFalse: [1]) ofObject: rcvr withValue: valueToStore. ^self pop: 3 thenPush: oopToStore]. index = ConstTwo ifTrue: [objectMemory storeLong32: (VMBIGENDIAN ifTrue: [1] ifFalse: [0]) ofObject: rcvr withValue: valueToStore. ^self pop: 3 thenPush: oopToStore]. self primitiveFailFor: ((objectMemory isIntegerObject: index) ifTrue: [PrimErrBadIndex] ifFalse: [PrimErrBadArgument])! Item was changed: ----- Method: ObjectMemory>>checkOopHasOkayClass: (in category 'debug support') ----- checkOopHasOkayClass: obj "Attempt to verify that the given obj has a reasonable behavior. The class must be a valid, non-integer oop and must not be nilObj. It must be a pointers object with three or more fields. Finally, the instance specification field of the behavior must match that of the instance. If OK answer true. If not, print reason and answer false." <api> + <var: #obj type: #usqInt> - <var: #oop type: #usqInt> | objClass formatMask behaviorFormatBits objFormatBits | + <var: #objClass type: #usqInt> - <var: #oopClass type: #usqInt> (self checkOkayOop: obj) ifFalse: [^false]. objClass := self cCoerce: (self fetchClassOfNonImm: obj) to: #usqInt. (self isIntegerObject: objClass) ifTrue: [self print: 'obj '; printHex: obj; print: ' a SmallInteger is not a valid class or behavior'; cr. ^false]. (self okayOop: objClass) ifFalse: [self print: 'obj '; printHex: obj; print: ' class obj is not ok'; cr. ^false]. ((self isPointersNonInt: objClass) and: [(self lengthOf: objClass) >= 3]) ifFalse: [self print: 'obj '; printHex: obj; print: ' a class (behavior) must be a pointers object of size >= 3'; cr. ^false]. formatMask := (self isBytes: obj) ifTrue: [16rC00] "ignore extra bytes size bits" ifFalse: [16rF00]. behaviorFormatBits := (self formatOfClass: objClass) bitAnd: formatMask. objFormatBits := (self baseHeader: obj) bitAnd: formatMask. behaviorFormatBits = objFormatBits ifFalse: [self print: 'obj '; printHex: obj; print: ' and its class (behavior) formats differ'; cr. ^false]. ^true! Item was changed: ----- Method: ObjectMemory>>firstFixedFieldOfMaybeImmediate: (in category 'debug support') ----- firstFixedFieldOfMaybeImmediate: oop "for the message send breakpoint; selectors can be immediates." <inline: false> ^(self isImmediate: oop) + ifTrue: [oop asVoidPointer] - ifTrue: [oop] ifFalse: [self firstFixedField: oop]! Item was changed: ----- Method: SistaStackToRegisterMappingCogit>>bytecodePCFor:startBcpc:in: (in category 'method map') ----- bytecodePCFor: mcpc startBcpc: startbcpc in: cogMethod "Answer the zero-relative bytecode pc matching the machine code pc argument in cogMethod, given the start of the bytecodes for cogMethod's block or method object." <api> <var: #cogMethod type: #'CogBlockMethod *'> ^self mapFor: cogMethod bcpc: startbcpc performUntil: #find:Mcpc:Bcpc:MatchingMcpc: + arg: mcpc asVoidPointer! - arg: (self cCoerceSimple: mcpc to: #'void *')! Item was changed: ----- Method: SistaStackToRegisterMappingCogit>>mcPCFor:startBcpc:in: (in category 'method map') ----- mcPCFor: bcpc startBcpc: startbcpc in: cogMethod "Answer the absolute machine code pc matching the zero-relative bytecode pc argument in cogMethod, given the start of the bytecodes for cogMethod's block or method object." <api> <var: #cogMethod type: #'CogBlockMethod *'> | absPC | absPC := self mapFor: cogMethod bcpc: startbcpc performUntil: #find:Mcpc:Bcpc:MatchingBcpc: + arg: bcpc asVoidPointer. - arg: (self cCoerceSimple: bcpc to: #'void *'). ^absPC ~= 0 ifTrue: [absPC asUnsignedInteger - cogMethod asUnsignedInteger] ifFalse: [absPC]! Item was changed: ----- Method: SistaStackToRegisterMappingCogit>>picDataFor:into: (in category 'method introspection') ----- picDataFor: cogMethod into: arrayObj "Answer the zero-relative bytecode pc matching the machine code pc argument in cogMethod, given the start of the bytecodes for cogMethod's block or method object." <api> <var: #cogMethod type: #'CogMethod *'> | errCode | cogMethod stackCheckOffset = 0 ifTrue: [^0]. picDataIndex := 0. picData := arrayObj. errCode := self mapFor: (self cCoerceSimple: cogMethod to: #'CogBlockMethod *') bcpc: (coInterpreter startPCOfMethod: cogMethod methodObject) performUntil: #picDataFor:Mcpc:Bcpc:Method: + arg: cogMethod asVoidPointer. - arg: (self cCoerceSimple: cogMethod to: #'void *'). errCode ~= 0 ifTrue: [self assert: errCode = PrimErrNoMemory. ^-1]. ^picDataIndex! Item was removed: - ----- Method: SmartSyntaxPluginTMethod>>recordDeclarations (in category 'transforming') ----- - recordDeclarations - "Record C type declarations of the forms - - self returnTypeC: 'float'. - self var: #foo declareC: 'float foo' - self var: #foo as: Class - self var: #foo type: 'float'. - - and remove the declarations from the method body." - - | newStatements | - properties pragmas notEmpty ifTrue: - [properties pragmas do: - [:pragma| - pragma keyword = #var:declareC: ifTrue: - [self declarationAt: pragma arguments first asString put: pragma arguments last]. - pragma keyword = #var:type: ifTrue: - [| varName varType | - varName := pragma arguments first asString. - varType := pragma arguments last. - varType last = $* ifFalse: [varType := varType, ' ']. - self declarationAt: varName put: varType, varName]. - pragma keyword = #var:as: ifTrue: - [| theClass | - theClass := Smalltalk at: pragma arguments last name asSymbol ifAbsent: [nil]. - (theClass isKindOf: Behavior) ifFalse: - [^self error: 'declarator must be a Behavior']. - self declarationAt: pragma arguments first value asString - put: (theClass ccgDeclareCForVar: pragma arguments first asString)]. - pragma keyword = #returnTypeC: ifTrue: - [returnType := pragma arguments last]. - pragma keyword = #doNotGenerate: ifTrue: - [locals removeKey: pragma arguments last]]. - ^self]. - newStatements := OrderedCollection new: parseTree statements size. - parseTree statements do: - [:stmt | | isDeclaration | - isDeclaration := false. - stmt isSend ifTrue: - [stmt selector = #var:declareC: ifTrue: - [isDeclaration := true. - self declarationAt: stmt args first value asString put: stmt args last value]. - stmt selector = #var:type: ifTrue: [ - | varName varType | - isDeclaration := true. - varName := stmt args first value asString. - varType := stmt args last value. - varType last = $* ifFalse: [varType := varType, ' ']. - self declarationAt: varName put: varType, varName. - ]. - stmt selector = #var:as: ifTrue: - [| theClass | - isDeclaration := true. - theClass := Smalltalk at: stmt args last name asSymbol ifAbsent: [nil]. - (theClass isKindOf: Behavior) ifFalse: - [^self error: 'declarator must be a Behavior']. - self declarationAt: stmt args first value asString - put: (theClass ccgDeclareCForVar: stmt args first value asString)]. - stmt selector = #returnTypeC: ifTrue: - [isDeclaration := true. - returnType := stmt args last value]]. - isDeclaration ifFalse: [newStatements add: stmt]]. - parseTree setStatements: newStatements asArray! Item was added: + ----- Method: SmartSyntaxPluginTMethod>>recordDeclarationsIn: (in category 'transforming') ----- + recordDeclarationsIn: aCCodeGen + "Record C type declarations of the forms + <returnTypeC: 'float'> + <var: #foo declareC: 'float foo'> + <var: #foo type:'float'> + <var: #foo as: Class> + or the older, obsolete + self returnTypeC: 'float'. + self var: #foo declareC: 'float foo' + self var: #foo type:'float'. + self var: #foo as: Class + and remove the declarations from the method body." + + | newStatements | + properties pragmas notEmpty ifTrue: + [properties pragmas do: + [:pragma| + pragma keyword = #var:declareC: ifTrue: + [self checkedDeclarationAt: pragma arguments first asString + put: pragma arguments last + in: aCCodeGen]. + pragma keyword = #var:type: ifTrue: + [| varName varType | + varName := pragma arguments first asString. + varType := pragma arguments last. + varType last = $* ifFalse: [varType := varType, ' ']. + self checkedDeclarationAt: varName + put: varType, varName + in: aCCodeGen]. + pragma keyword = #var:as: ifTrue: + [| theClass | + theClass := Smalltalk at: pragma arguments last name asSymbol ifAbsent: [nil]. + (theClass isKindOf: Behavior) ifFalse: + [^self error: 'declarator must be a Behavior']. + self checkedDeclarationAt: pragma arguments first value asString + put: (theClass ccgDeclareCForVar: pragma arguments first asString) + in: aCCodeGen]. + pragma keyword = #returnTypeC: ifTrue: + [self returnType: pragma arguments last]. + pragma keyword = #doNotGenerate: ifTrue: + [locals removeKey: pragma arguments last]]. + ^self]. + newStatements := OrderedCollection new: parseTree statements size. + parseTree statements do: + [:stmt | | isDeclaration | + isDeclaration := false. + stmt isSend ifTrue: + [stmt selector = #var:declareC: ifTrue: + [isDeclaration := true. + self declarationAt: stmt args first value asString put: stmt args last value]. + stmt selector = #var:type: ifTrue: [ + | varName varType | + isDeclaration := true. + varName := stmt args first value asString. + varType := stmt args last value. + varType last = $* ifFalse: [varType := varType, ' ']. + self declarationAt: varName put: varType, varName. + ]. + stmt selector = #var:as: ifTrue: + [| theClass | + isDeclaration := true. + theClass := Smalltalk at: stmt args last name asSymbol ifAbsent: [nil]. + (theClass isKindOf: Behavior) ifFalse: + [^self error: 'declarator must be a Behavior']. + self declarationAt: stmt args first value asString + put: (theClass ccgDeclareCForVar: stmt args first value asString)]. + stmt selector = #returnTypeC: ifTrue: + [isDeclaration := true. + returnType := stmt args last value]]. + isDeclaration ifFalse: [newStatements add: stmt]]. + parseTree setStatements: newStatements asArray! Item was changed: ----- Method: SmartSyntaxPluginTMethod>>setSelector:definingClass:args:locals:block:primitive:properties:comment: (in category 'initializing') ----- setSelector: sel definingClass: class args: argList locals: localList block: aBlockNode primitive: aNumber properties: methodProperties comment: aComment "Initialize this method using the given information." selector := sel. definingClass := class. returnType := #sqInt. "assume return type is sqInt for now" args := argList asOrderedCollection collect: [:arg | arg key]. locals := (localList collect: [:arg | arg key]) asSet. declarations := Dictionary new. primitive := aNumber. properties := methodProperties. comment := aComment. parseTree := aBlockNode asTranslatorNodeIn: self. labels := OrderedCollection new. complete := false. "set to true when all possible inlining has been done" export := self extractExportDirective. static := self extractStaticDirective. canAsmLabel := self extractLabelDirective. self extractSharedCase. isPrimitive := false. "set to true only if you find a primtive direction." suppressingFailureGuards := self extractSuppressFailureGuardDirective. + self recordDeclarationsIn: nil. - self recordDeclarations. self extractPrimitiveDirectives. ! Item was changed: ----- Method: SpurGenerationScavenger>>copyToFutureSpace:bytes: (in category 'scavenger') ----- copyToFutureSpace: survivor bytes: bytesInObject "Copy survivor to futureSpace. Assume it will fit (checked by sender). Answer the new oop of the object (it may have an overflow size field)." <inline: true> | startOfSurvivor newStart | self assert: futureSurvivorStart + bytesInObject <= futureSpace limit. startOfSurvivor := manager startOfObject: survivor. newStart := futureSurvivorStart. futureSurvivorStart := futureSurvivorStart + bytesInObject. + manager mem: newStart asVoidPointer cp: startOfSurvivor asVoidPointer y: bytesInObject. - manager mem: newStart cp: startOfSurvivor y: bytesInObject. ^newStart + (survivor - startOfSurvivor)! Item was changed: ----- Method: SpurGenerationScavenger>>copyToOldSpace: (in category 'scavenger') ----- copyToOldSpace: survivor "Copy survivor to oldSpace. Answer the new oop of the object." <inline: true> | numSlots newOop | statTenures := statTenures + 1. self flag: 'why not just pass header??'. numSlots := manager numSlotsOf: survivor. newOop := manager allocateSlotsInOldSpace: numSlots format: (manager formatOf: survivor) classIndex: (manager classIndexOf: survivor). newOop ifNil: [self error: 'out of memory']. manager + mem: (newOop + manager baseHeaderSize) asVoidPointer + cp: (survivor + manager baseHeaderSize) asVoidPointer - mem: newOop + manager baseHeaderSize - cp: survivor + manager baseHeaderSize y: numSlots * manager wordSize. self remember: newOop. manager setIsRememberedOf: newOop to: true. ^newOop! Item was changed: ----- Method: SpurMemoryManager>>checkOopHasOkayClass: (in category 'debug support') ----- checkOopHasOkayClass: obj "Attempt to verify that the given obj has a reasonable behavior. The class must be a valid, non-integer oop and must not be nilObj. It must be a pointers object with three or more fields. Finally, the instance specification field of the behavior must match that of the instance. If OK answer true. If not, print reason and answer false." <api> + <var: #obj type: #usqInt> - <var: #oop type: #usqInt> | objClass objFormat | + <var: #objClass type: #usqInt> - <var: #oopClass type: #usqInt> (self checkOkayOop: obj) ifFalse: [^false]. objClass := self cCoerce: (self fetchClassOfNonImm: obj) to: #usqInt. (self isImmediate: objClass) ifTrue: [self print: 'obj '; printHex: obj; print: ' an immediate is not a valid class or behavior'; cr. ^false]. (self okayOop: objClass) ifFalse: [self print: 'obj '; printHex: obj; print: ' class obj is not ok'; cr. ^false]. ((self isPointersNonImm: objClass) and: [(self numSlotsOf: objClass) >= 3]) ifFalse: [self print: 'obj '; printHex: obj; print: ' a class (behavior) must be a pointers object of size >= 3'; cr. ^false]. objFormat := (self isBytes: obj) ifTrue: [(self formatOf: obj) bitClear: 7] "ignore extra bytes size bits" ifFalse: [self formatOf: obj]. (self instSpecOfClass: objClass) ~= objFormat ifTrue: [self print: 'obj '; printHex: obj; print: ' and its class (behavior) formats differ'; cr. ^false]. ^true! Item was changed: ----- Method: SpurMemoryManager>>copyAndForward:withBytes:toFreeChunk: (in category 'compaction') ----- copyAndForward: objOop withBytes: bytes toFreeChunk: freeChunk "Copy and forward objOop to freeChunk, the inner operation in exact and best fit compact." <inline: true> | startOfObj freeObj | startOfObj := self startOfObject: objOop. + self mem: freeChunk asVoidPointer cp: startOfObj asVoidPointer y: bytes. - self mem: freeChunk cp: startOfObj y: bytes. freeObj := freeChunk + (objOop - startOfObj). "leave it to followRememberedForwarders to remember..." "(self isRemembered: objOop) ifTrue: [scavenger remember: freeObj]." self forward: objOop to: freeObj! Item was changed: ----- Method: SpurMemoryManager>>firstFixedFieldOfMaybeImmediate: (in category 'debug support') ----- firstFixedFieldOfMaybeImmediate: oop "for the message send breakpoint; selectors can be immediates." <inline: false> ^(self isImmediate: oop) + ifTrue: [oop asVoidPointer] - ifTrue: [oop] ifFalse: [self firstFixedField: oop]! Item was changed: ----- Method: SpurMemoryManager>>moveMisfitsInHighestObjectsBack: (in category 'compaction') ----- moveMisfitsInHighestObjectsBack: savedLimit "After refilling highestObjects move any misfits back to being adjacent with the new objects, reset the space's limit and answer the pointer to the lowest failure to resume the scan." | newMisfitsPosition | savedLimit = highestObjects limit ifTrue: [^highestObjects last]. "simple; we didnt fill all the way; just move misfits down." (highestObjects first = highestObjects start and: [highestObjects last < highestObjects limit]) ifTrue: [newMisfitsPosition := highestObjects limit. + self mem: newMisfitsPosition asVoidPointer + mo: (highestObjects last + self wordSize) asVoidPointer - self mem: newMisfitsPosition - mo: highestObjects last + self wordSize ve: savedLimit - newMisfitsPosition. highestObjects limit: savedLimit. ^newMisfitsPosition]. "tricky to do unless we have last - start's worth of free space. we *don't* want to rotate lots and lots of objects. We could push misfits onto the mark stack, if it is big enough. limit: | misfits hi <-> lo | lowest candidates | highest candidates | : start ^ last" self shouldBeImplemented. ^newMisfitsPosition! Item was changed: ----- Method: SpurMemoryManager>>moveMisfitsToTopOfHighestObjects: (in category 'compaction') ----- moveMisfitsToTopOfHighestObjects: misfits "After a cycle of exact-fit compaction highestObjects may contain some number of mobile objects that fail to fit, and more objects may exist to move. Move existing misfits to top of highestObjects and temporarily shrink highestObjects to refill it without overwriting misfits. Answer the old limit. moveMisfitsInHighestObjectsBack: will undo the change." | oldLimit bytesToMove | oldLimit := highestObjects limit. misfits = (highestObjects last + self wordSize) ifTrue: [highestObjects resetAsEmpty. ^oldLimit]. misfits <= highestObjects last ifTrue: [bytesToMove := highestObjects last + self wordSize - misfits. + self mem: (highestObjects limit - bytesToMove) asVoidPointer + mo: misfits asVoidPointer - self mem: highestObjects limit - bytesToMove - mo: misfits ve: bytesToMove. highestObjects limit: misfits - self wordSize. ^oldLimit]. "misfits wrapped; move in two stages to preserve ordering" bytesToMove := highestObjects last - highestObjects start. + self mem: (misfits - bytesToMove) asVoidPointer + mo: misfits asVoidPointer - self mem: misfits - bytesToMove - mo: misfits ve: oldLimit - misfits. highestObjects limit: misfits - bytesToMove. + self mem: (oldLimit - bytesToMove) asVoidPointer + mo: highestObjects start asVoidPointer - self mem: oldLimit - bytesToMove - mo: highestObjects start ve: bytesToMove. ^oldLimit! Item was changed: ----- Method: SpurSegmentManager>>addSegmentOfSize: (in category 'growing/shrinking memory') ----- addSegmentOfSize: ammount <returnTypeC: #'SpurSegmentInfo *'> <inline: false> | allocatedSize | <var: #newSeg type: #'SpurSegmentInfo *'> + <var: #segAddress type: #'void *'> (manager "sent to the manager so that the simulator can increase memory to simulate a new segment" sqAllocateMemorySegmentOfSize: ammount + Above: ((segments at: 0) segStart + (segments at: 0) segSize) asVoidPointer - Above: (segments at: 0) segStart + (segments at: 0) segSize AllocatedSizeInto: (self cCode: [self addressOf: allocatedSize] inSmalltalk: [[:sz| allocatedSize := sz]])) ifNotNil: [:segAddress| | newSegIndex newSeg | + newSegIndex := self insertSegmentFor: segAddress asUnsignedLong. - newSegIndex := self insertSegmentFor: segAddress. newSeg := self addressOf: (segments at: newSegIndex). newSeg segStart: segAddress; segSize: allocatedSize. self bridgeFrom: (self addressOf: (segments at: newSegIndex - 1)) to: newSeg. self bridgeFrom: newSeg to: (newSegIndex = (numSegments - 1) ifFalse: [self addressOf: (segments at: newSegIndex + 1)]). "and add the new free chunk to the free list; done here instead of in assimilateNewSegment: for the assert" manager addFreeChunkWithBytes: allocatedSize - manager bridgeSize at: newSeg segStart. self assert: (manager addressAfter: (manager objectStartingAt: newSeg segStart)) = (newSeg segStart + newSeg segSize - manager bridgeSize). ^newSeg]. ^nil! Item was changed: ----- Method: SpurSegmentManager>>allocateOrExtendSegmentInfos (in category 'private') ----- allocateOrExtendSegmentInfos "Increase the number of allocated segInfos by 16." | newNumSegs | numSegInfos = 0 ifTrue: [numSegInfos := 16. segments := self cCode: [self c: numSegInfos alloc: (self sizeof: SpurSegmentInfo)] inSmalltalk: [CArrayAccessor on: ((1 to: numSegInfos) collect: [:i| SpurSegmentInfo new])]. ^self]. newNumSegs := numSegInfos + 16. segments := self + cCode: [self re: segments alloc: newNumSegs * (self sizeof: SpurSegmentInfo)] - cCode: [self re: newNumSegs * (self sizeof: SpurSegmentInfo) alloc: segments] inSmalltalk: [CArrayAccessor on: segments object, ((numSegInfos to: newNumSegs) collect: [:i| SpurSegmentInfo new])]. self cCode: [segments = 0 ifTrue: [self error: 'out of memory; cannot allocate more segments']. self me: segments + numSegInfos ms: 0 et: newNumSegs - numSegInfos * (self sizeof: SpurSegmentInfo)]. numSegInfos := newNumSegs! Item was changed: ----- Method: StackInterpreter class>>preGenerationHook: (in category 'translation') ----- + preGenerationHook: aCCodeGen - preGenerationHook: aCCodeGenerator "Perform any last-minute changes to the code generator immediately before it performs code analysis and generation. In this case, make all non-exported methods private." | publicMethodNames | + self primitiveTable do: + [:s| + (s isSymbol and: [s ~~ #primitiveFail]) ifTrue: + [(aCCodeGen methodNamed: s) returnType: #void]]. + publicMethodNames := (self requiredMethodNames: aCCodeGen options) - publicMethodNames := (self requiredMethodNames: aCCodeGenerator options) copyWithoutAll: (self primitiveTable copyWithout: #primitiveFail). + aCCodeGen selectorsAndMethodsDo: - aCCodeGenerator selectorsAndMethodsDo: [:s :m| (m export or: [publicMethodNames includes: s]) ifTrue: [m static: false]]! Item was changed: ----- Method: StackInterpreter>>followForwardedFrameContents:stackPointer: (in category 'lazy become') ----- followForwardedFrameContents: theFP stackPointer: theSP "follow pointers in the current stack frame up to theSP." <var: #theFP type: #'char *'> <var: #theSP type: #'char *'> + <var: #ptr type: #'char *'> theFP + (self frameStackedReceiverOffset: theFP) to: theFP + FoxCallerSavedIP + BytesPerWord by: BytesPerWord do: [:ptr| | oop | oop := stackPages longAt: ptr. ((objectMemory isNonImmediate: oop) and: [objectMemory isForwarded: oop]) ifTrue: [stackPages longAt: ptr put: (objectMemory followForwarded: oop)]]. theSP + to: (self frameReceiverOffset: theFP) - to: theFP + FoxReceiver by: BytesPerWord do: [:ptr| | oop | oop := stackPages longAt: ptr. ((objectMemory isNonImmediate: oop) and: [objectMemory isForwarded: oop]) ifTrue: [stackPages longAt: ptr put: (objectMemory followForwarded: oop)]]. self assert: (objectMemory isForwarded: (self frameMethod: theFP)) not. (self frameHasContext: theFP) ifTrue: [self assert: (objectMemory isForwarded: (self frameContext: theFP)) not]! Item was changed: ----- Method: StackInterpreter>>handleSpecialSelectorSendFaultFor:fp:sp: (in category 'message sending') ----- handleSpecialSelectorSendFaultFor: obj fp: theFP sp: theSP "Handle a special send fault that may be due to a special selector send accessing a forwarded object. Unforward the object on the stack and in inst vars and answer its target." <inline: false> + <var: #theFP type: #'char *'> + <var: #theSP type: #'char *'> - <var: #fp type: #'char *'> - <var: #sp type: #'char *'> self assert: (objectMemory isOopForwarded: obj). self followForwardedFrameContents: theFP stackPointer: theSP. (objectMemory isPointers: (self frameReceiver: theFP)) ifTrue: [objectMemory followForwardedObjectFields: (self frameReceiver: theFP) toDepth: 0]. ^objectMemory followForwarded: obj! Item was changed: ----- Method: StackInterpreter>>printCallStackOf: (in category 'debug printing') ----- printCallStackOf: aContextOrProcessOrFrame <api> | context | <inline: false> - <var: #theFP type: #'char *'> (stackPages couldBeFramePointer: aContextOrProcessOrFrame) ifTrue: [^self printCallStackFP: (self cCoerceSimple: aContextOrProcessOrFrame to: #'char *')]. ((objectMemory isContext: aContextOrProcessOrFrame) not and: [(objectMemory lengthOf: aContextOrProcessOrFrame) > MyListIndex and: [objectMemory isContext: (objectMemory fetchPointer: SuspendedContextIndex ofObject: aContextOrProcessOrFrame)]]) ifTrue: [^self printCallStackOf: (objectMemory fetchPointer: SuspendedContextIndex ofObject: aContextOrProcessOrFrame)]. context := aContextOrProcessOrFrame. [context = objectMemory nilObject] whileFalse: [(self isMarriedOrWidowedContext: context) ifTrue: [(self checkIsStillMarriedContext: context currentFP: framePointer) ifFalse: [self shortPrintContext: context. ^nil]. context := self shortReversePrintFrameAndCallers: (self frameOfMarriedContext: context)] ifFalse: [context := self printContextCallStackOf: context]]! Item was changed: ----- Method: StackInterpreter>>updateStateOfSpouseContextForFrame:WithSP: (in category 'frame access') ----- updateStateOfSpouseContextForFrame: theFP WithSP: theSP "Update the frame's spouse context with the frame's current state except for the sender and instruction pointer, which are used to mark the context as married." | theContext tempIndex pointer | <inline: false> <var: #theFP type: #'char *'> <var: #theSP type: #'char *'> <var: #pointer type: #'char *'> - <var: #argsPointer type: #'char *'> self assert: (self frameHasContext: theFP). theContext := self frameContext: theFP. self assert: (self frameReceiver: theFP) = (objectMemory fetchPointer: ReceiverIndex ofObject: theContext). tempIndex := self frameNumArgs: theFP. "update the arguments. this would appear not to be strictly necessary, but is for two reasons. First, the fact that arguments are read-only is only as convention in the Smalltalk compiler; other languages may choose to modify arguments. Second, the Squeak runUntilErrorOrReturnFrom: nightmare pops the stack top, which may, in certain circumstances, be the last argument, and hence the last argument may not have been stored into the context." pointer := theFP + (self frameStackedReceiverOffsetNumArgs: tempIndex). 1 to: tempIndex do: [:i| pointer := pointer - BytesPerWord. self assert: (objectMemory addressCouldBeOop: (stackPages longAt: pointer)). objectMemory storePointer: ReceiverIndex + i ofObject: theContext withValue: (stackPages longAt: pointer)]. "now update the non-argument stack contents." pointer := theFP + FoxReceiver - BytesPerWord. [pointer >= theSP] whileTrue: [self assert: (objectMemory addressCouldBeOop: (stackPages longAt: pointer)). tempIndex := tempIndex + 1. objectMemory storePointer: ReceiverIndex + tempIndex ofObject: theContext withValue: (stackPages longAt: pointer). pointer := pointer - BytesPerWord]. self assert: ReceiverIndex + tempIndex < (objectMemory lengthOf: theContext). objectMemory storePointerUnchecked: StackPointerIndex ofObject: theContext withValue: (objectMemory integerObjectOf: tempIndex)! Item was changed: ----- Method: StackInterpreterPrimitives>>primitiveVoidReceiver (in category 'system control primitives') ----- primitiveVoidReceiver "Potentially crash the VM by voiding the receiver. A subsequent inst var access in the caller's frame should indirect through a null pointer." <export: true> + stackPages longAtPointer: (self frameReceiverOffset: framePointer) put: 0! - stackPages longAt: (self frameReceiverOffset: framePointer) put: 0! Item was added: + ----- Method: TMethod>>addTypesFor:to:in: (in category 'type inference') ----- + addTypesFor: node to: typeSet in: aCodeGen + | expr | + expr := node. + [expr isAssignment or: [expr isStmtList]] whileTrue: + [expr isAssignment ifTrue: + [expr := expr variable]. + expr isStmtList ifTrue: + [expr := expr statements last]]. + expr isSend ifTrue: + [(#(ifTrue: ifFalse: ifTrue:ifFalse: ifFalse:ifTrue:) includes: expr selector) ifTrue: + [^expr args do: + [:block| + self addTypesFor: block to: typeSet in: aCodeGen]]. + (#(= ~= == ~~ < > <= >= anyMask: noMask:) includes: expr selector) ifTrue: + [^typeSet add: #sqInt]. + (#(+ - * / // \\ mod: quo: bitAnd: bitClear: bitOr: bitXor: bitShift:) includes: expr selector) ifTrue: + [| types | + types := Set new. + self addTypesFor: expr receiver to: types in: aCodeGen. + (types size = 1 and: [types anyOne last = $*]) ifTrue: "pointer arithmetic" + [^typeSet add: types anyOne]. + self addTypesFor: expr args first to: types in: aCodeGen. + types := self harmonizeSignedAndUnsignedTypesIn: types. + types size = 2 ifTrue: + [(types includes: #double) ifTrue: + [^typeSet add: #double]. + (types includes: #float) ifTrue: + [^typeSet add: #float]. + ^self]. "don't know; leave unspecified." + ^types notEmpty ifTrue: + [typeSet add: types anyOne]]. + ^(aCodeGen returnTypeForSend: expr) ifNotNil: + [:type| typeSet add: type]]. + expr isVariable ifTrue: + [(aCodeGen typeOfVariable: expr name) + ifNotNil: [:type| typeSet add: type] + ifNil: [typeSet add: (expr name = 'self' + ifTrue: [#void] + ifFalse: [#sqInt])]]. + expr isConstant ifTrue: + [| val | + val := expr value. + val isInteger ifTrue: + [typeSet add: ((val >= 0 ifTrue: [val] ifFalse: [-1 - val]) highBit <= 32 + ifTrue: [#sqInt] + ifFalse: [#sqLong])]. + (#(nil true false) includes: val) ifTrue: + [typeSet add: #sqInt]. + val isFloat ifTrue: + [typeSet add: #float]]! Item was added: + ----- Method: TMethod>>checkedDeclarationAt:put:in: (in category 'accessing') ----- + checkedDeclarationAt: aVariableName put: aDeclaration in: aCCodeGen + ((args includes: aVariableName) or: [locals includes: aVariableName]) ifFalse: + [| msg | + msg := definingClass name, '>>', selector, ' contains declaration for non-existent variable ', aVariableName. + aCCodeGen + ifNotNil: [aCCodeGen logger show: msg; cr] + ifNil: [self error: msg]]. + ^self declarationAt: aVariableName "<String>" put: aDeclaration! Item was changed: ----- Method: TMethod>>inferReturnTypeFromReturnsIn: (in category 'type inference') ----- inferReturnTypeFromReturnsIn: aCodeGen "Attempt to infer the return type of the receiver from returns in the parse tree." + returnType ifNil: "the initial default" - returnType isNil ifTrue:"the initial default" [aCodeGen pushScope: declarations while: [| hasReturn returnTypes | hasReturn := false. returnTypes := Set new. parseTree nodesDo: [:node| node isReturn ifTrue: + [hasReturn := true. + self addTypesFor: node expression to: returnTypes in: aCodeGen]]. - [| expr | - hasReturn := true. - expr := node expression. - expr isAssignment ifTrue: - [expr := expr variable]. - expr isSend ifTrue: - [(aCodeGen returnTypeForSend: expr) ifNotNil: - [:type| returnTypes add: type]]. - expr isVariable ifTrue: - [(aCodeGen typeOfVariable: expr name) - ifNotNil: [:type| returnTypes add: type] - ifNil: [returnTypes add: (expr name = 'self' - ifTrue: [#void] - ifFalse: [#sqInt])]]. - expr isConstant ifTrue: - [| val | - val := expr value. - val isInteger ifTrue: - [returnTypes add: ((val >= 0 ifTrue: [val] ifFalse: [-1 - val]) highBit <= 32 - ifTrue: [#sqInt] - ifFalse: [#sqLong])]. - (val == true or: [val == false]) ifTrue: - [returnTypes add: #sqInt]. - val isFloat ifTrue: - [returnTypes add: #float]]]]. returnTypes remove: #implicit ifAbsent: []. returnTypes := self harmonizeSignedAndUnsignedTypesIn: returnTypes. hasReturn ifTrue: [returnTypes size > 1 ifTrue: [aCodeGen logger nextPutAll: 'conflicting return types', (String streamContents: [:s| returnTypes do: [:t| s space; nextPutAll: t]]), ' in ', selector; cr; flush]. returnTypes size = 1 ifTrue: [self returnType: returnTypes anyOne]] ifFalse: [self returnType: (aCodeGen implicitReturnTypeFor: selector)]]]! Item was changed: ----- Method: TMethod>>inferReturnTypeIn: (in category 'type inference') ----- inferReturnTypeIn: aCodeGen "Attempt to infer the return type of the receiver and answer if it changed." | existingReturnType | existingReturnType := returnType. - self removeFinalSelfReturnIn: aCodeGen. "must preceed recordDeclarations because this may set returnType" - self recordDeclarations. self inferReturnTypeFromReturnsIn: aCodeGen. "If the return type is now void, replace any and all ^expr with expr. ^self" (existingReturnType ~= returnType and: [returnType = #void]) ifTrue: [self transformVoidReturns]. ^existingReturnType ~= returnType! Item was removed: - ----- Method: TMethod>>recordDeclarations (in category 'transformations') ----- - recordDeclarations - "Record C type declarations of the forms - - self returnTypeC: 'float'. - self var: #foo declareC: 'float foo' - self var: #foo type:'float'. - - and remove the declarations from the method body." - - | newStatements | - properties pragmas notEmpty ifTrue: - [properties pragmas do: - [:pragma| - pragma keyword = #var:declareC: ifTrue: - [self declarationAt: pragma arguments first asString put: pragma arguments last]. - pragma keyword = #var:type: ifTrue: - [| varName varType | - varName := pragma arguments first asString. - varType := pragma arguments last. - varType last = $* ifFalse: [varType := varType, ' ']. - self declarationAt: varName put: varType, varName]. - pragma keyword = #returnTypeC: ifTrue: - [self returnType: pragma arguments last]. - pragma keyword = #doNotGenerate: ifTrue: - [locals remove: pragma arguments last]]. - ^self]. - newStatements := OrderedCollection new: parseTree statements size. - parseTree statements do: [ :stmt | - | isDeclaration | - isDeclaration := false. - stmt isSend ifTrue: [ - stmt selector = #var:declareC: ifTrue: [ - isDeclaration := true. - self declarationAt: stmt args first value asString put: stmt args last value. - ]. - stmt selector = #var:type: ifTrue: [ - | varName varType | - isDeclaration := true. - varName := stmt args first value asString. - varType := stmt args last value. - varType last = $* ifFalse: [varType := varType, ' ']. - self declarationAt: varName put: varType, varName. - ]. - stmt selector = #returnTypeC: ifTrue: [ - isDeclaration := true. - returnType := stmt args last value. - ]. - ]. - isDeclaration ifFalse: [ - newStatements add: stmt. - ]. - ]. - parseTree setStatements: newStatements asArray.! Item was added: + ----- Method: TMethod>>recordDeclarationsIn: (in category 'transformations') ----- + recordDeclarationsIn: aCCodeGen + "Record C type declarations of the forms + <returnTypeC: 'float'> + <var: #foo declareC: 'float foo'> + <var: #foo type:'float'> + or the older, obsolete + self returnTypeC: 'float'. + self var: #foo declareC: 'float foo' + self var: #foo type:'float'. + and remove the declarations from the method body." + + | newStatements | + properties pragmas notEmpty ifTrue: + [properties pragmas do: + [:pragma| + pragma keyword = #var:declareC: ifTrue: + [self checkedDeclarationAt: pragma arguments first asString + put: pragma arguments last + in: aCCodeGen]. + pragma keyword = #var:type: ifTrue: + [| varName varType | + varName := pragma arguments first asString. + varType := pragma arguments last. + varType last = $* ifFalse: [varType := varType, ' ']. + self checkedDeclarationAt: varName + put: varType, varName + in: aCCodeGen]. + pragma keyword = #returnTypeC: ifTrue: + [self returnType: pragma arguments last]. + pragma keyword = #doNotGenerate: ifTrue: + [locals remove: pragma arguments last]]. + ^self]. + newStatements := OrderedCollection new: parseTree statements size. + parseTree statements do: [ :stmt | + | isDeclaration | + isDeclaration := false. + stmt isSend ifTrue: [ + stmt selector = #var:declareC: ifTrue: [ + isDeclaration := true. + self declarationAt: stmt args first value asString put: stmt args last value. + ]. + stmt selector = #var:type: ifTrue: [ + | varName varType | + isDeclaration := true. + varName := stmt args first value asString. + varType := stmt args last value. + varType last = $* ifFalse: [varType := varType, ' ']. + self declarationAt: varName put: varType, varName. + ]. + stmt selector = #returnTypeC: ifTrue: [ + isDeclaration := true. + returnType := stmt args last value. + ]. + ]. + isDeclaration ifFalse: [ + newStatements add: stmt. + ]. + ]. + parseTree setStatements: newStatements asArray.!

1 0

VM Maker: VMMaker.oscog-eem.484.mcz
by commits＠source.squeak.org 31 Oct '13

31 Oct '13

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.484.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.484 Author: eem Time: 31 October 2013, 12:52:30.541 am UUID: 3e476e6f-ab05-4256-b992-f12a827f20ed Ancestors: VMMaker.oscog-eem.483 Deal with the issue of typing variables that get assigned the result of longLongAt: by adding rudimentary type inference, determining the types of implicitly-typed local variables from assignments in the parse tree. This in turn forces adding type inference of return types since types propagate from sends through assignments to variables. The code is orchestrated by CCodeGenerator>> inferTypesForImplicitlyTypedVariablesAndMethods. The removeFinalSelfReturn & recordDeclarations processing is postponed to the type inference phase. Add kernelReturnTypes to CCodeGenerator to hold the return types of longAt: et al. Add implicitReturnTypeFor: implementations for the Spur classes. Deal with the issue of optional use of interpreter proxy protocol, as in FilePlugin>>primitiveDirectoryDelimitor's use of characterObjectOf:, by adding an option: scheme that can evaluate e.g. atLeastVMProxyMajor:minor:. This is used to ifdef assignments to the local function pointers in a plugin. See e.g. InterpreterProxy>>characterObjectOf:. Dispatch to the objectMemoryClass to simulate some of the new protocol. Abstract out the option: pragma processing into CCodeGenerator>>shouldIncludeMethodFor:selector:. Use it to correctly filter the export api. Add a vmMaker inst var to CCodeGenerator to avoid the silly use of exceptions to get hold of the current VMMaker, at least in the code generator. Still need to refactor additionalSelectorTables & requiredMethodNames to take the CCodeGenerator as an argument. Change all createCodeGenerator implementations to set the VMMaker. Mostly drop, but in some cases add, returnTypeC: pragmas now that return types are inferred in most circumstances (still don't infer through ifTrue:ifFalse: or through arithmetic, i.e. infer only through direct return. Change some ^nil occurrences to ^self occurrences to avoid multiple return types. Fix slip in mapObjectReferencesInMachineCode: and provide a stub mapObjectReferencesInMachineCodeForScavenge. Fix super expansions to eliminate bogus self; statements being introduced from the implicit ^self at the end of a method. Refactor the stack page tracing management, abstracting out into initStackPageGC and using this in the scavenger. =============== Diff against VMMaker.oscog-eem.483 =============== Item was changed: Object subclass: #CCodeGenerator + instanceVariableNames: 'vmClass structClasses translationDict asArgumentTranslationDict inlineList constants variables variableDeclarations scopeStack methods macros apiMethods kernelReturnTypes currentMethod headerFiles globalVariableUsage useSymbolicConstants generateDeadCode requiredSelectors logger suppressAsmLabels asmLabelCounts pools selectorTranslations optionsDictionary breakSrcInlineSelector breakDestInlineSelector vmMaker' - instanceVariableNames: 'vmClass structClasses translationDict asArgumentTranslationDict inlineList constants variables variableDeclarations scopeStack methods macros apiMethods currentMethod headerFiles globalVariableUsage useSymbolicConstants generateDeadCode requiredSelectors logger suppressAsmLabels asmLabelCounts pools selectorTranslations optionsDictionary breakSrcInlineSelector breakDestInlineSelector' classVariableNames: 'UseRightShiftForDivide' poolDictionaries: 'VMBasicConstants' category: 'VMMaker-Translation to C'! !CCodeGenerator commentStamp: 'tpr 5/2/2003 14:30' prior: 0! This class oversees the translation of a subset of Smalltalk to C, allowing the comforts of Smalltalk during development and the efficiency and portability of C for the resulting interpreter. See VMMaker for more useful info! Item was changed: ----- Method: CCodeGenerator>>addMethodFor:selector: (in category 'utilities') ----- addMethodFor: aClass selector: selector "Add the given method to the code base and answer its translation or nil if it shouldn't be translated." | method tmethod | selector == #initialize ifTrue: [^nil]. method := aClass compiledMethodAt: selector. (method pragmaAt: #doNotGenerate) ifNotNil: [^nil]. + (self shouldIncludeMethodFor: aClass selector: selector) ifFalse: + [^nil]. - "process optional methods by interpreting the argument to the option: pragma as either - a Cogit class name or a class variable name or a variable name in VMBasicConstants." - (method pragmaAt: #option:) ifNotNil: - [:pragma| | key | - key := pragma argumentAt: 1. - VMClass getVMMaker ifNotNil: - [:vmMaker| - ((Cogit withAllSubclasses anySatisfy: [:c| c name = key]) - and: [vmMaker cogitClassName ~= key]) ifTrue: - [^nil]. - (vmMaker options at: key ifAbsent: []) ifNotNil: - [:option| option == false ifTrue: [^nil]]]. - (aClass bindingOf: key) ifNotNil: - [:binding| - binding value == false ifTrue: [^nil]]. - (VMBasicConstants bindingOf: key) ifNotNil: - [:binding| - binding value == false ifTrue: [^nil]]]. tmethod := self addMethod: (self compileToTMethodSelector: selector in: aClass). "If the method has a macro then add the macro. But keep the method for analysis purposes (e.g. its variable accesses)." (method pragmaAt: #cmacro:) ifNotNil: [:pragma| self addMacro: (pragma argumentAt: 1) for: selector. tmethod inline: false]. (method propertyValueAt: #cmacro:) ifNotNil: [:macro| self addMacro: macro for: selector. tmethod inline: false]. ^tmethod! Item was added: + ----- Method: CCodeGenerator>>computeKernelReturnTypes (in category 'public') ----- + computeKernelReturnTypes + ^Dictionary newFromPairs: + #(oopAt: #sqInt oopAt:put: #sqInt + oopAtPointer: #sqInt oopAtPointer:put: #sqInt + byteAt: #sqInt byteAt:put: #sqInt + byteAtPointer: #sqInt byteAtPointer:put: #sqInt + shortAt: #sqInt shortAt:put: #sqInt + shortAtPointer: #sqInt shortAtPointer:put: #sqInt + intAt: #sqInt intAt:put: #sqInt + intAtPointer: #sqInt intAtPointer:put: #sqInt + longAt: #sqInt longAt:put: #sqInt + longAtPointer: #sqInt longAtPointer:put: #sqInt + + longLongAt: #sqLong longLongAt:put: #sqLong + longLongAtPointer: #sqLong longLongAtPointer:put: #sqLong + + fetchFloatAt:into: #float storeFloatAt:from: #float + fetchFloatAtPointer:into: #float storeFloatAtPointer:from: #float + fetchSingleFloatAt:into: #float storeSingleFloatAt:from: #float + fetchSingleFloatAtPointer:into: #float storeSingleFloatAtPointer:from: #float + + pointerForOop: #'char *' oopForPointer: #sqInt)! Item was changed: ----- Method: CCodeGenerator>>emitCAPIExportHeaderOn: (in category 'C code generator') ----- emitCAPIExportHeaderOn: aStream "Store prototype declarations for all non-inlined methods on the given stream." | api methodList | api := (vmClass translationClass exportAPISelectors: self options). + methodList := api + select: - methodList := api select: [:s| (methods includesKey: s) or: [(vmClass whichClassIncludesSelector: s) notNil]] - thenCollect: [:s| + (methods includesKey: s) + or: [(vmClass whichClassIncludesSelector: s) + ifNil: [false] + ifNotNil: [:c|self shouldIncludeMethodFor: c selector: s]]] + thenCollect: + [:s| methods at: s ifAbsent: [self compileToTMethodSelector: s in: (vmClass whichClassIncludesSelector: s)]]. methodList := self sortMethods: methodList. methodList do: [:m| m static ifTrue: [logger ensureCr; show: m selector, ' excluded from export API because it is static'; cr]]. self emitCFunctionPrototypes: methodList on: aStream. self emitGlobalCVariablesOn: aStream. self emitCMacros: methodList on: aStream! Item was added: + ----- Method: CCodeGenerator>>implicitReturnTypeFor: (in category 'type inference') ----- + implicitReturnTypeFor: aSelector + "Answer the default return type for mthods of the defining class of + aSelector. Default to #sqInt if there is no method, or if the method's + defining class doesn't understand implicitReturnTypeFor:." + | m | + m := methods at: aSelector ifAbsent: [^#sqInt]. + ^[m definingClass implicitReturnTypeFor: aSelector] + on: MessageNotUnderstood + do: [:ex| + ex message selector ~~ #implicitReturnTypeFor: ifTrue: + [ex pass]. + #sqInt]! Item was added: + ----- Method: CCodeGenerator>>inferTypesForImplicitlyTypedVariablesAndMethods (in category 'type inference') ----- + inferTypesForImplicitlyTypedVariablesAndMethods + "Infer the return tupe and the types of untyped variables. + As far as variables go, for now we try only to infer variables + assigned the result of #longLongAt:, but much more could be + done here." + + "Iterate over all methods, inferring #void return types, until we reach a fixed point." + [| changedReturnType | + changedReturnType := false. + methods do: + [:m| + m inferTypesForImplicitlyTypedVariablesIn: self. + (m inferReturnTypeIn: self) ifTrue: + [changedReturnType := true]]. + changedReturnType] whileTrue. + + "Type all as-yet-untyped methods as the default" + methods do: + [:m| + m returnType ifNil: + [m returnType: (self implicitReturnTypeFor: m selector)]]! Item was changed: ----- Method: CCodeGenerator>>initialize (in category 'public') ----- initialize translationDict := Dictionary new. inlineList := Array new. constants := Dictionary new: 100. variables := Set new: 100. variableDeclarations := Dictionary new: 100. methods := Dictionary new: 500. + kernelReturnTypes := self computeKernelReturnTypes. macros := Dictionary new. self initializeCTranslationDictionary. headerFiles := OrderedCollection new. globalVariableUsage := Dictionary new. useSymbolicConstants := true. generateDeadCode := true. scopeStack := OrderedCollection new. logger := (ProvideAnswerNotification new tag: #logger; signal) ifNil: [Transcript]. pools := IdentitySet new. selectorTranslations := IdentityDictionary new. suppressAsmLabels := false! Item was changed: ----- Method: CCodeGenerator>>isKernelSelector: (in category 'utilities') ----- isKernelSelector: sel "Answer true if the given selector is one of the kernel selectors that are implemented as macros." ^(#(error: oopAt: oopAt:put: oopAtPointer: oopAtPointer:put: byteAt: byteAt:put: byteAtPointer: byteAtPointer:put: shortAt: shortAt:put: shortAtPointer: shortAtPointer:put: intAt: intAt:put: intAtPointer: intAtPointer:put: longAt: longAt:put: longAtPointer: longAtPointer:put: + longLongAt: longLongAt:put: longLongAtPointer: longLongAtPointer:put: fetchFloatAt:into: storeFloatAt:from: fetchFloatAtPointer:into: storeFloatAtPointer:from: fetchSingleFloatAt:into: storeSingleFloatAt:from: fetchSingleFloatAtPointer:into: storeSingleFloatAtPointer:from: pointerForOop: oopForPointer: cCoerce:to: cCoerceSimple:to:) includes: sel)! Item was added: + ----- Method: CCodeGenerator>>returnTypeForSend: (in category 'type inference') ----- + returnTypeForSend: aTSendNode + "Answer the return type for a send. Absent sends default to #sqInt." + | sel | + ^(methods at: (sel := aTSendNode selector) ifAbsent: nil) + ifNil: [kernelReturnTypes + at: sel + ifAbsent: + [(#(cCoerce:to: cCoerceSimple:to:) includes: sel) + ifTrue: [aTSendNode args last value] + ifFalse: [#sqInt]]] + ifNotNil: [:m| m returnType]! Item was added: + ----- Method: CCodeGenerator>>shouldIncludeMethodFor:selector: (in category 'utilities') ----- + shouldIncludeMethodFor: aClass selector: selector + "process optional methods by interpreting the argument to the option: pragma as either + a Cogit class name or a class variable name or a variable name in VMBasicConstants." + (aClass >> selector pragmaAt: #option:) ifNotNil: + [:pragma| | key | + key := pragma argumentAt: 1. + vmMaker ifNotNil: + [((Cogit withAllSubclasses anySatisfy: [:c| c name = key]) + and: [vmMaker cogitClassName ~= key]) ifTrue: + [^false]. + (vmMaker options at: key ifAbsent: []) ifNotNil: + [:option| option == false ifTrue: [^false]]]. + (aClass bindingOf: key) ifNotNil: + [:binding| + binding value == false ifTrue: [^false]]. + (VMBasicConstants bindingOf: key) ifNotNil: + [:binding| + binding value == false ifTrue: [^false]]]. + ^true! Item was changed: ----- Method: CCodeGenerator>>structClassesForTranslationClasses: (in category 'utilities') ----- structClassesForTranslationClasses: classes "Answer in superclass order (any superclass precedes any subclass) the ancilliaryClasses that are struct classes for all the given classes." + | theStructClasses | + theStructClasses := OrderedCollection new. - | structClasses | - structClasses := OrderedCollection new. classes do: [:aTranslationClass| ([aTranslationClass ancilliaryClasses: self options] on: MessageNotUnderstood do: [:ex| ex message selector == #ancilliaryClasses: ifTrue: [#()] ifFalse: [ex pass]]) do: [:class| (class isStructClass and: [(vmClass isNil or: [vmClass isAcceptableAncilliaryClass: class]) + and: [(theStructClasses includes: class) not]]) ifTrue: + [theStructClasses addLast: class]]]. + ^ChangeSet superclassOrder: theStructClasses! - and: [(structClasses includes: class) not]]) ifTrue: - [structClasses addLast: class]]]. - ^ChangeSet superclassOrder: structClasses! Item was added: + ----- Method: CCodeGenerator>>vmMaker (in category 'accessing') ----- + vmMaker + ^vmMaker! Item was added: + ----- Method: CCodeGenerator>>vmMaker: (in category 'accessing') ----- + vmMaker: aVMMaker + vmMaker := aVMMaker! Item was changed: ----- Method: CoInterpreter>>cogMethodOf: (in category 'compiled methods') ----- cogMethodOf: aMethodOop <api> - <returnTypeC: #'CogMethod *'> | methodHeader | methodHeader := self rawHeaderOf: aMethodOop. self assert: ((objectMemory isNonImmediate: methodHeader) and: [methodHeader asUnsignedInteger < objectMemory startOfMemory]). ^self cCoerceSimple: methodHeader to: #'CogMethod *'! Item was changed: ----- Method: CoInterpreter>>mframeCogMethod: (in category 'frame access') ----- mframeCogMethod: theFP "Answer the Cog method for a machine code frame. This may be either a full CogMethod or merely a CogBlockMethod rump header." <var: #theFP type: #'char *'> - <returnTypeC: #'CogBlockMethod *'> ^self cCoerceSimple: (self mframeMethod: theFP) to: #'CogBlockMethod *'! Item was changed: ----- Method: CoInterpreter>>mframeNumArgs: (in category 'frame access') ----- mframeNumArgs: theFP + <returnTypeC: #sqInt> ^(self mframeCogMethod: theFP) cmNumArgs! Item was changed: ----- Method: CogAbstractInstruction>>getJmpTarget (in category 'accessing') ----- getJmpTarget "Get the target of a jump instruction. Jumps have the target in the first operand." - <returnTypeC: #'AbstractInstruction *'> ^cogit cCoerceSimple: (operands at: 0) to: #'AbstractInstruction *'! Item was changed: ----- Method: CogAbstractInstruction>>jumpTargetAddress (in category 'generate machine code') ----- jumpTargetAddress - <returnTypeC: #'AbstractInstruction *'> <inline: true> "Since it's an extraction from other methods." | jumpTarget | <var: #jumpTarget type: #'AbstractInstruction *'> jumpTarget := cogit cCoerceSimple: (operands at: 0) to: #'AbstractInstruction *'. cogit assertSaneJumpTarget: jumpTarget. (self isAnInstruction: jumpTarget) ifTrue: [jumpTarget := cogit cCoerceSimple: jumpTarget address to: #'AbstractInstruction *']. self assert: jumpTarget ~= 0. ^jumpTarget! Item was changed: ----- Method: CogAbstractInstruction>>longJumpTargetAddress (in category 'generate machine code') ----- longJumpTargetAddress - <returnTypeC: #'AbstractInstruction *'> <inline: true> "Since it's an extraction from other methods." "This needs to be digfferent from jumpTargetAddress because long jumps can be to absolute addresses and hence we can't assert that the jump target is sane." | jumpTarget | <var: #jumpTarget type: #'AbstractInstruction *'> jumpTarget := cogit cCoerceSimple: (operands at: 0) to: #'AbstractInstruction *'. (self isAnInstruction: jumpTarget) ifTrue: [jumpTarget := cogit cCoerceSimple: jumpTarget address to: #'AbstractInstruction *']. self assert: jumpTarget ~= 0. ^jumpTarget! Item was changed: ----- Method: CogBlockMethod>>cmHomeMethod (in category 'accessing') ----- cmHomeMethod - <returnTypeC: #'CogMethod *'> ^self cCoerceSimple: self asUnsignedInteger - self homeOffset to: #'CogMethod *'! Item was changed: ----- Method: CogIA32Compiler>>genDivR:R:Quo:Rem: (in category 'abstract instructions') ----- genDivR: abstractRegDivisor R: abstractRegDividend Quo: abstractRegQuotient Rem: abstractRegRemainder | rDividend rDivisor rQuotient rRemainder saveRestoreEAX saveRestoreEDX saveRestoreExchanged | self assert: abstractRegDividend ~= abstractRegDivisor. self assert: abstractRegQuotient ~= abstractRegRemainder. rDividend := self concreteRegister: abstractRegDividend. rDivisor := self concreteRegister: abstractRegDivisor. rQuotient := self concreteRegister: abstractRegQuotient. rRemainder := self concreteRegister: abstractRegRemainder. "IDIV r does a signed divide of EDX:EAX by r, EAX := Quotient, EDX := Remainder. Since we must sign extend the dividend into EDX we must substitute another register if EDX is an input" (rDividend = EDX or: [rDivisor = EDX]) ifTrue: [| rUnused | "Slang, sigh..." rUnused := EAX. [rUnused <= EDI] whileTrue: [(rUnused ~= ESP and: [rUnused ~= EBP and: [rUnused ~= EDX and: [rUnused ~= rDividend and: [rUnused ~= rDivisor and: [rUnused ~= rQuotient and: [rUnused ~= rRemainder]]]]]]) ifTrue: [cogit PushR: rUnused. cogit MoveR: EDX R: rUnused. rDividend = EDX ifTrue: [self genDivR: rDivisor R: rUnused Quo: rQuotient Rem: rRemainder] ifFalse: [self genDivR: rUnused R: rDividend Quo: rQuotient Rem: rRemainder]. cogit PopR: rUnused. + ^self]. - ^nil]. rUnused := rUnused + 1]. self error: 'couldn''t find unused register in genDivR:R:Quo:Rem:']. "If either output does not include EAX or EDX we must save and restore EAX and/or EDX." (saveRestoreEAX := rQuotient ~= EAX and: [rRemainder ~= EAX]) ifTrue: [cogit PushR: EAX]. (saveRestoreEDX := rQuotient ~= EDX and: [rRemainder ~= EDX]) ifTrue: [cogit PushR: EDX]. saveRestoreExchanged := -1. rDividend ~= EAX ifTrue: [rDivisor = EAX ifTrue: [((rDividend ~= rQuotient and: [rDividend ~= rRemainder]) and: [rDividend ~= EDX or: [saveRestoreEDX not]]) ifTrue: [cogit PushR: (saveRestoreExchanged := rDividend)]. cogit gen: XCHGRR operand: rDivisor operand: rDividend] ifFalse: [cogit MoveR: rDividend R: EAX]]. "CDQ sign-extends EAX into EDX as required for IDIV" cogit gen: CDQ. cogit gen: IDIVR operand: (rDivisor = EAX ifTrue: [rDividend] ifFalse: [rDivisor]). "Must not overwrite result while juggling" (rQuotient = EDX and: [rRemainder = EAX]) ifTrue: [cogit gen: XCHGRR operand: rQuotient operand: rRemainder] ifFalse: [rQuotient = EDX ifTrue: [rRemainder ~= EDX ifTrue: [cogit MoveR: EDX R: rRemainder]. rQuotient ~= EAX ifTrue: [cogit MoveR: EAX R: rQuotient]] ifFalse: [rQuotient ~= EAX ifTrue: [cogit MoveR: EAX R: rQuotient]. rRemainder ~= EDX ifTrue: [cogit MoveR: EDX R: rRemainder]]]. saveRestoreExchanged >= 0 ifTrue: [cogit PopR: saveRestoreExchanged]. saveRestoreEDX ifTrue: [cogit PopR: EDX]. saveRestoreEAX ifTrue: [cogit PopR: EAX]! Item was changed: ----- Method: CogIA32Compiler>>generateLowLevelTryLock: (in category 'multi-threading') ----- generateLowLevelTryLock: vmOwnerLockAddress "Generate a function that attempts to lock the vmOwnerLock and answers true if it succeeded." vmOwnerLockAddress = 0 ifTrue: [cogit MoveCq: 1 R: EAX; RetN: 0. + ^self]. - ^nil]. cogit MoveCq: 1 R: EAX; gen: MFENCE; "make the XCHG globally consistent" gen: XCHGAwR operand: vmOwnerLockAddress operand: EAX; gen: SFENCE; "make the store globally visible" SubCq: 1 R: EAX; "Since we only ever set the lock to 1 or 0, subtracting 1 sets EAX to 0 if the lock was already locked and non-zero if it wasn't." RetN: 0! Item was changed: ----- Method: CogMethodZone>>methodAfter: (in category 'accessing') ----- methodAfter: cogMethod - <returnTypeC: #'CogMethod *'> <var: #cogMethod type: #'CogMethod *'> ^coInterpreter cCoerceSimple: (self roundUpLength: cogMethod asInteger + cogMethod blockSize) to: #'CogMethod *'! Item was added: + ----- Method: Cogit class>>isAcceptableAncilliaryClass: (in category 'translation') ----- + isAcceptableAncilliaryClass: aClass + ^aClass ~~ CogSSBytecodeFixup! Item was changed: ----- Method: Cogit>>mapObjectReferencesInMachineCode: (in category 'jit - api') ----- mapObjectReferencesInMachineCode: gcMode <api> "Update all references to objects in machine code." gcMode caseOf: { + [GCModeScavenge] -> [self mapObjectReferencesInMachineCodeForScavenge]. + [GCModeIncr] -> [self mapObjectReferencesInMachineCodeForIncrementalGC]. - [GCModeScavenge] -> [self mapObjectReferencesInMachineCodeForIncrementalGC]. - [GCModeIncr] -> [self mapObjectReferencesInMachineCodeForScavenge]. [GCModeFull] -> [self mapObjectReferencesInMachineCodeForFullGC]. [GCModeBecome] -> [self mapObjectReferencesInMachineCodeForBecome] }. (self asserta: methodZone freeStart <= methodZone youngReferrers) ifFalse: [self error: 'youngReferrers list overflowed']! Item was added: + ----- Method: Cogit>>mapObjectReferencesInMachineCodeForScavenge (in category 'garbage collection') ----- + mapObjectReferencesInMachineCodeForScavenge + self shouldBeImplemented! Item was changed: ----- Method: Cogit>>unlinkSendsOf:isMNUSelector: (in category 'jit - api') ----- unlinkSendsOf: selector isMNUSelector: isMNUSelector <api> "Unlink all sends in cog methods." | cogMethod | <var: #cogMethod type: #'CogMethod *'> methodZoneBase isNil ifTrue: [^self]. cogMethod := self cCoerceSimple: methodZoneBase to: #'CogMethod *'. "First check if any method actually has the selector; if not there can't be any linked send to it." [cogMethod < methodZone limitZony and: [cogMethod selector ~= selector]] whileTrue: [cogMethod := methodZone methodAfter: cogMethod]. cogMethod >= methodZone limitZony ifTrue: + [^self]. - [^nil]. codeModified := false. cogMethod := self cCoerceSimple: methodZoneBase to: #'CogMethod *'. [cogMethod < methodZone limitZony] whileTrue: [cogMethod cmType = CMMethod ifTrue: [self mapFor: cogMethod performUntil: #unlinkIfLinkedSend:pc:of: arg: selector] ifFalse: [(cogMethod cmType ~= CMFree and: [(isMNUSelector and: [cogMethod cpicHasMNUCase]) or: [cogMethod selector = selector]]) ifTrue: [methodZone freeMethod: cogMethod]]. cogMethod := methodZone methodAfter: cogMethod]. codeModified ifTrue: "After possibly updating inline caches we need to flush the icache." [processor flushICacheFrom: methodZoneBase to: methodZone limitZony asInteger]! Item was changed: ----- Method: CrossPlatformVMMaker>>createCodeGenerator (in category 'initialize') ----- createCodeGenerator "Set up a CCodeGenerator for this VMMaker - A cross platform tree leaves it up to the makefiles to decide whether to use the global struct or not." + ^CCodeGeneratorGlobalStructure new + vmMaker: self; - ^CCodeGeneratorGlobalStructure new initialize; structDefDefine: 'USE_GLOBAL_STRUCT'; logger: logger; options: optionsDictionary; yourself! Item was changed: ----- Method: InterpreterPlugin class>>translateInDirectory:doInlining: (in category 'translation') ----- translateInDirectory: directory doInlining: inlineFlag "This is the default method for writing out sources for a plugin. Several classes need special handling, so look at all implementors of this message" | cg fname fstat | fname := self moduleName, '.c'. "don't translate if the file is newer than my timeStamp" fstat := directory entryAt: fname ifAbsent:[nil]. fstat ifNotNil: [((self pluginClassesUpTo: self) allSatisfy: [:aPluginClass| aPluginClass timeStamp < fstat modificationTime]) ifTrue: [^nil]]. self initialize. cg := self buildCodeGeneratorUpTo: self. + cg inferTypesForImplicitlyTypedVariablesAndMethods. cg storeCodeOnFile: (directory fullNameFor: fname) doInlining: inlineFlag. ^cg exportedPrimitiveNames asArray! Item was added: + ----- Method: InterpreterProxy>>characterObjectOf: (in category 'object access') ----- + characterObjectOf: characterCode + <option: #(atLeastVMProxyMajor:minor: 1 13)> + ^StackInterpreter objectMemoryClass characterObjectOf: characterCode! Item was added: + ----- Method: InterpreterProxy>>characterValueOf: (in category 'object access') ----- + characterValueOf: aCharacter + <option: #(atLeastVMProxyMajor:minor: 1 13)> + ^aCharacter asInteger! Item was added: + ----- Method: InterpreterProxy>>isCharacterObject: (in category 'testing') ----- + isCharacterObject: oop + <option: #(atLeastVMProxyMajor:minor: 1 13)> + ^oop isCharacter! Item was added: + ----- Method: InterpreterProxy>>isCharacterValue: (in category 'testing') ----- + isCharacterValue: anInteger + <option: #(atLeastVMProxyMajor:minor: 1 13)> + ^(self isIntegerValue: anInteger) and: [anInteger >= 0]! Item was added: + ----- Method: InterpreterProxy>>isImmediate: (in category 'testing') ----- + isImmediate: anObject + <option: #(atLeastVMProxyMajor:minor: 1 13)> + ^StackInterpreter objectMemoryClass isImmediate: anObject! Item was added: + ----- Method: InterpreterProxy>>isPinned: (in category 'testing') ----- + isPinned: anObject + <option: #(atLeastVMProxyMajor:minor: 1 13)> + ^self shouldBeImplemented! Item was added: + ----- Method: InterpreterProxy>>pinObject: (in category 'object access') ----- + pinObject: anObject + <option: #(atLeastVMProxyMajor:minor: 1 13)> + ^self shouldBeImplemented! Item was changed: ----- Method: InterpreterProxy>>primitiveFail (in category 'other') ----- primitiveFail + <returnTypeC: #sqInt> "Set general (unspecified) primitive failure." self primitiveFailFor: 1! Item was changed: ----- Method: MacOSPowerPCOS9VMMaker>>createCodeGenerator (in category 'initialize') ----- createCodeGenerator "Set up a CCodeGenerator for this VMMaker - Mac OS uses the global struct and local def of the structure. The global struct/loca def regime appears to be about 10% faster than the default regime for Smalltalk-intensive macro benchmarks for both the Intel and gcc 4.0 compiler on x86. eem 12/10/2008 14:34 2.16 GHz Intel Core Duo MacBook Pro Mac OS X 10.4.11" + ^CCodeGeneratorGlobalStructure new + vmMaker: self; - ^CCodeGeneratorGlobalStructure new initialize; structDefDefine: '1'; "structDefDefine: 'defined(PPC) || defined(_POWER) || defined(__powerpc__) || defined(__ppc__)';" logger: logger; yourself! Item was changed: ----- Method: NewspeakCogMethodSurrogate32 class>>alignedByteSize (in category 'accessing') ----- alignedByteSize + ^24 + self baseHeaderSize! - ^28! Item was changed: ----- Method: NewspeakCogMethodSurrogate32>>nextMethod (in category 'accessing') ----- nextMethod | v | + ^(v := memory unsignedLongAt: address + 21 + baseHeaderSize) ~= 0 ifTrue: - ^(v := memory unsignedLongAt: address + 25) ~= 0 ifTrue: [cogit cCoerceSimple: v to: #'CogMethod *']! Item was changed: ----- Method: NewspeakCogMethodSurrogate32>>nextMethod: (in category 'accessing') ----- nextMethod: aValue ^memory + unsignedLongAt: address + baseHeaderSize + 21 - unsignedLongAt: address + 25 put: ((aValue ifNotNil: [aValue asUnsignedInteger] ifNil: [0]))! Item was changed: ----- Method: NewspeakCogMethodSurrogate64 class>>alignedByteSize (in category 'accessing') ----- alignedByteSize + ^40 + self baseHeaderSize! - ^48! Item was changed: ----- Method: NewspeakCogMethodSurrogate64>>nextMethod (in category 'accessing') ----- nextMethod | v | + ^(v := memory unsignedLongLongAt: address + 33 + baseHeaderSize) ~= 0 ifTrue: - ^(v := memory unsignedLongLongAt: address + 41) ~= 0 ifTrue: [cogit cCoerceSimple: v to: #'CogMethod *']! Item was changed: ----- Method: NewspeakCogMethodSurrogate64>>nextMethod: (in category 'accessing') ----- nextMethod: aValue ^memory + unsignedLongLongAt: address + baseHeaderSize + 33 - unsignedLongLongAt: address + 41 put: ((aValue ifNotNil: [aValue asUnsignedInteger] ifNil: [0]))! Item was added: + ----- Method: ObjectMemory class>>characterObjectOf: (in category 'simulation only') ----- + characterObjectOf: characterCode + ^(characterCode between: 0 and: 255) ifTrue: + [characterCode asCharacter]! Item was added: + ----- Method: ObjectMemory class>>isImmediate: (in category 'simulation only') ----- + isImmediate: anObject + ^anObject class == SmallInteger! Item was changed: ----- Method: ObjectMemory>>integerObjectOf: (in category 'interpreter access') ----- integerObjectOf: value "Convert the integer value, assumed to be in SmallInteger range, into a tagged SmallInteger object. In C, use a shift and an add to set the tag bit. In Smalltalk we have to work harder because the simulator works with strictly positive bit patterns." + <returnTypeC: #sqInt> - ^self cCode: [(value << 1) + 1] inSmalltalk: [value >= 0 ifTrue: [(value << 1) + 1] ifFalse: [((16r80000000 + value) << 1) + 1]]! Item was changed: ----- Method: RiscOSVMMaker>>createCodeGenerator (in category 'initialize') ----- createCodeGenerator "set up a CCodeGenerator for this VMMaker - RiscOS uses the global struct and no local def of the structure because of the global register trickery" + ^CCodeGeneratorGlobalStructure new + vmMaker: self; - ^CCodeGeneratorGlobalStructure new initialize; logger: logger; yourself! Item was changed: ----- Method: SmartSyntaxPluginTMethod>>extractPrimitiveDirectives (in category 'specifying primitives') ----- extractPrimitiveDirectives "Save selector in fullSelector and args in fullArgs. Scan top-level statements for a directive of the form: self primitive: <string> or self primitive: <string> parameters: <list of class names> or self primitive: <string> parameters: <list of class names> receiver: <class name> or an assignment of that expression to a local, and manipulate the state and parse tree accordingly." parseTree setStatements: (Array streamContents: [:sStream | parseTree statements do: [:stmt | (self primitiveDirectiveWasHandled: stmt on: sStream) ifFalse: [sStream nextPut: stmt]]]). isPrimitive ifTrue: [export := true. parseTree setStatements: self namedPrimitiveProlog, parseTree statements. self fixUpReturns. self replaceSizeMessages. ^true] + ifFalse: [self removeFinalSelfReturnIn: nil]. - ifFalse: [self removeFinalSelfReturn]. ^false! Item was added: + ----- Method: Spur32BitMMLECoSimulator>>runLeakCheckerForFullGC: (in category 'debug support') ----- + runLeakCheckerForFullGC: fullGCFlag + (fullGCFlag + ifTrue: [self leakCheckFullGC] + ifFalse: [self leakCheckNewSpaceGC]) ifTrue: + [coInterpreter transcript nextPutAll: 'leak-checking...'; flush]! Item was added: + ----- Method: Spur32BitMMLESimulator>>runLeakCheckerForFullGC: (in category 'debug support') ----- + runLeakCheckerForFullGC: fullGCFlag + (fullGCFlag + ifTrue: [self leakCheckFullGC] + ifFalse: [self leakCheckNewSpaceGC]) ifTrue: + [coInterpreter transcript nextPutAll: 'leak-checking...'; flush]! Item was added: + ----- Method: Spur32BitMemoryManager class>>isImmediate: (in category 'simulation only') ----- + isImmediate: anObject + ^anObject class == SmallInteger + or: [anObject class == Character]! Item was changed: ----- Method: Spur32BitMemoryManager>>integerObjectOf: (in category 'immediates') ----- integerObjectOf: value "Convert the integer value, assumed to be in SmallInteger range, into a tagged SmallInteger object. In C, use a shift and an add to set the tag bit. In Smalltalk we have to work harder because the simulator works with strictly positive bit patterns." + <returnTypeC: #sqInt> - ^self cCode: [value << 1 + 1] inSmalltalk: [value >= 0 ifTrue: [value << 1 + 1] ifFalse: [16r80000000 + value << 1 + 1]]! Item was added: + ----- Method: Spur64BitMemoryManager class>>isImmediate: (in category 'simulation only') ----- + isImmediate: anObject + self flag: 'The float range is close but probably wrong. Revisit when immediate floats are implemented'. + ^anObject class == SmallInteger + or: [anObject class == Character + or: [anObject class == Float and: [anObject exponent between: -128 and: 127]]]! Item was changed: ----- Method: Spur64BitMemoryManager>>integerObjectOf: (in category 'immediates') ----- integerObjectOf: value "Convert the integer value, assumed to be in SmallInteger range, into a tagged SmallInteger object. In C, use a shift and an add to set the tag bit. In Smalltalk we have to work harder because the simulator works with strictly positive bit patterns." + <returnTypeC: #sqInt> - ^self cCode: [value << self numTagBits + 1] inSmalltalk: [value << self numTagBits + (value >= 0 ifTrue: [1] ifFalse: [16r8000000000000001])]! Item was added: + ----- Method: SpurGenerationScavenger class>>implicitReturnTypeFor: (in category 'translation') ----- + implicitReturnTypeFor: aSelector + "Answer the return type for methods that don't have an explicit return." + ^#void! Item was changed: ----- Method: SpurGenerationScavenger>>fireEphemeronsOnEphemeronList (in category 'weakness and ephemerality') ----- fireEphemeronsOnEphemeronList "There are ephemerons to be fired in the remembered set. Fire them and scavenge their keys. Be careful since copyAndForward: can remember ephemerons (ephemerons pointing to ephemerons)." - <returnTypeC: #void> | ephemeron ephemeronCorpse | ephemeronList ifNil: [^self]. ephemeronCorpse := self firstCorpse: ephemeronList. "Reset the list head so that new ephemerons will get added to a new list, not concatenated on the one we are scanning." ephemeronList := nil. [ephemeronCorpse notNil] whileTrue: [self assert: (manager isForwarded: ephemeronCorpse). ephemeron := manager followForwarded: ephemeronCorpse. self assert: (self isScavengeSurvivor: (manager keyOfEphemeron: ephemeron)) not. coInterpreter fireEphemeron: ephemeron. self copyAndForward: (manager keyOfEphemeron: ephemeron). self cCoerceSimple: (self scavengeReferentsOf: ephemeron) to: #void. ephemeronCorpse := self nextCorpseOrNil: ephemeronCorpse]! Item was changed: ----- Method: SpurGenerationScavenger>>scavengeLoop (in category 'scavenger') ----- scavengeLoop "This is the inner loop of the main routine, scavenge. It first scavenges the new objects immediately reachable from old ones. Then it scavenges those that are transitively reachable. If this results in a promotion, the promotee gets remembered, and it first scavenges objects adjacent to the promotee, then scavenges the ones reachable from the promoted. This loop continues until no more reachable objects are left. At that point, pastSurvivorSpace is exchanged with futureSurvivorSpace. Notice that each pointer in a live object is inspected once and only once. The previousRememberedSetSize and previousFutureSurvivorSpaceLimit variables ensure that no object is scanned twice, as well as detecting closure. If this were not true, some pointers might get forwarded twice. An extension of the algorithm presented in David's original paper is to handle weak arrays and ephemerons. Weak arrays should not have their weak referents scavenged unless there are strong references to them. Ephemerons should fire if their key is not reachable other than from ephemerons and weak arrays. Handle this by maintaining a list for weak arrays and a list for ephemerons, which allow scavenging these objects once all other objects in new space have been scavenged, hence allowing the scavenger to detect which referents in new space of weak arrays are dead and of ephemeron keys are only live due to ephemerons. Read the class comment for a more in-depth description of the algorithm." <inline: false> - <returnTypeC: #void> | previousFutureSurvivorStart firstTime | self assert: futureSurvivorStart = futureSpace start. "future space should be empty at the start" weakList := ephemeronList := nil. numRememberedEphemerons := 0. firstTime := true. previousRememberedSetSize := 0. previousFutureSurvivorStart := futureSurvivorStart. + coInterpreter initStackPageGC. + [self scavengeRememberedSetStartingAt: previousRememberedSetSize. previousRememberedSetSize := rememberedSetSize. firstTime ifTrue: [coInterpreter mapInterpreterOops. manager mapExtraRoots. firstTime := false]. "if nothing more copied and forwarded (or remembered by mapInterpreterOops) to scavenge, and no ephemerons to process, scavenge is done." (previousRememberedSetSize = rememberedSetSize and: [previousFutureSurvivorStart = futureSurvivorStart and: [numRememberedEphemerons = 0 and: [ephemeronList isNil]]]) ifTrue: [^self]. self scavengeFutureSurvivorSpaceStartingAt: previousFutureSurvivorStart. previousFutureSurvivorStart := futureSurvivorStart. "no more roots created to scavenge..." previousRememberedSetSize = rememberedSetSize ifTrue: [(numRememberedEphemerons = 0 and: [ephemeronList isNil]) ifTrue: [^self]. "no ephemerons to process, scavenge is done." "all reachable objects in this cycle have been promoted to futureSpace. ephemerons can now be processed." self processEphemerons]] repeat! Item was added: + ----- Method: SpurMemoryManager class>>characterObjectOf: (in category 'simulation only') ----- + characterObjectOf: characterCode + ^characterCode asCharacter! Item was added: + ----- Method: SpurMemoryManager class>>implicitReturnTypeFor: (in category 'translation') ----- + implicitReturnTypeFor: aSelector + "Answer the return type for methods that don't have an explicit return." + ^#void! Item was added: + ----- Method: SpurMemoryManager class>>isImmediate: (in category 'simulation only') ----- + isImmediate: anObject + self subclassResponsibility! Item was changed: ----- Method: SpurMemoryManager>>addFreeSubTree: (in category 'free space') ----- addFreeSubTree: freeTree "Add a freeChunk sub tree back into the large free chunk tree. This is for allocateOldSpaceChunkOf[Exactly]Bytes:." - <returnTypeC: #void> | slotsInArg treeNode slotsInNode subNode | slotsInArg := self numSlotsOfAny: freeTree. self assert: slotsInArg / (self allocationUnit / self wordSize) >= self numFreeLists. treeNode := freeLists at: 0. self assert: treeNode ~= 0. [slotsInNode := self numSlotsOfAny: treeNode. self assert: slotsInArg ~= slotsInNode. slotsInNode > slotsInArg ifTrue: [subNode := self fetchPointer: self freeChunkSmallerIndex ofFreeChunk: treeNode. subNode = 0 ifTrue: [self storePointer: self freeChunkSmallerIndex ofFreeChunk: treeNode withValue: freeTree. self storePointer: self freeChunkParentIndex ofFreeChunk: freeTree withValue: treeNode. ^self]] ifFalse: [subNode := self fetchPointer: self freeChunkLargerIndex ofFreeChunk: treeNode. subNode = 0 ifTrue: [self storePointer: self freeChunkLargerIndex ofFreeChunk: treeNode withValue: freeTree. self storePointer: self freeChunkParentIndex ofFreeChunk: freeTree withValue: treeNode. ^self]]. treeNode := subNode] repeat! Item was changed: ----- Method: SpurMemoryManager>>bestFitCompact (in category 'compaction') ----- bestFitCompact "Compact all of memory using best-fit, assuming free space is sorted and that the highest objects are recorded in highestObjects." - <returnTypeC: #void> <inline: false> | freePriorToExactFit | self checkFreeSpace. freePriorToExactFit := totalFreeOldSpace. self exactFitCompact. self checkFreeSpace. highestObjects isEmpty ifTrue: [^self]. "either no high objects, or no misfits." statCompactPassCount := statCompactPassCount + 1. highestObjects reverseDo: [:o| | b | self assert: ((self isForwarded: o) or: [self isPinned: o]) not. b := self bytesInObject: o. (self allocateOldSpaceChunkOfBytes: b suchThat: [:f| f < o]) ifNotNil: [:f| self copyAndForward: o withBytes: b toFreeChunk: f]]. self checkFreeSpace. self flag: 'this should perhaps be a loop, recharging highestObjects as per exactFitCompact, but for now we assume the number of misfits not in highestObjects is very small'. self allOldSpaceObjectsFrom: firstFreeChunk do: [:o| | b | ((self isForwarded: o) or: [self isPinned: o]) ifFalse: [b := self bytesInObject: o. (self allocateOldSpaceChunkOfBytes: b suchThat: [:f| f < o]) ifNotNil: [:f| self copyAndForward: o withBytes: b toFreeChunk: f]]]. self checkFreeSpace. self touch: freePriorToExactFit! Item was changed: ----- Method: SpurMemoryManager>>checkOkayOop: (in category 'debug support') ----- checkOkayOop: oop "Verify that the given oop is legitimate. Check address, header, and size but not class. Answer true if OK. Otherwise print reason and answer false." <api> <var: #oop type: #usqInt> | classIndex fmt unusedBits unusedBitsInYoungObjects | + <var: #unusedBits type: #usqLong> "address and size checks" (self isImmediate: oop) ifTrue: [^true]. (self addressCouldBeObjWhileScavenging: oop) ifFalse: [self print: 'oop '; printHex: oop; print: ' is not a valid address'. ^false]. (self addressAfter: oop) <= freeOldSpaceStart ifFalse: [self print: 'oop '; printHex: oop; print: ' size would make it extend beyond the end of memory'. ^false]. "header type checks" (classIndex := self classIndexOf: oop) >= self firstClassIndexPun ifFalse: [self print: 'oop '; printHex: oop; print: ' is a free chunk, or bridge, not an object'. ^false]. ((self rawNumSlotsOf: oop) = self numSlotsMask and: [(self rawNumSlotsOf: oop) - self baseHeaderSize ~= self numSlotsMask]) ifTrue: [self print: 'oop '; printHex: oop; print: ' header has overflow header word, but overflow word does not have a saturated numSlots field'. ^false]. "format check" fmt := self formatOf: oop. (fmt = 6) | (fmt = 8) ifTrue: [self print: 'oop '; printHex: oop; print: ' has an unknown format type'. ^false]. (fmt = self forwardedFormat) ~= (classIndex = self isForwardedObjectClassIndexPun) ifTrue: [self print: 'oop '; printHex: oop; print: ' has mismached format/classIndex fields; only one of them is the isForwarded value'. ^false]. "specific header bit checks" unusedBits := (1 << self classIndexFieldWidth) | (1 << (self identityHashFieldWidth + 32)). ((self longLongAt: oop) bitAnd: unusedBits) ~= 0 ifTrue: [self print: 'oop '; printHex: oop; print: ' has some unused header bits set; should be zero'. ^false]. unusedBitsInYoungObjects := self newSpaceRefCountMask. ((self longAt: oop) bitAnd: unusedBitsInYoungObjects) ~= 0 ifTrue: [self print: 'oop '; printHex: oop; print: ' has some header bits unused in young objects set; should be zero'. ^false]. ^true! Item was changed: ----- Method: SpurMemoryManager>>countNumClassPagesPreSwizzle: (in category 'class table') ----- countNumClassPagesPreSwizzle: bytesToShift "Compute the used size of the class table before swizzling. Needed to initialize the classTableBitmap which is populated during adjustAllOopsBy:" - <returnTypeC: #void> | firstObj classTableRoot nilObjPreSwizzle | firstObj := self objectStartingAt: newSpaceLimit. "a.k.a. nilObj" "first five objects are nilObj, falseObj, trueObj, freeListsObj, classTableRootObj" classTableRoot := self objectAfter: (self objectAfter: (self objectAfter: (self objectAfter: firstObj limit: freeOldSpaceStart) limit: freeOldSpaceStart) limit: freeOldSpaceStart) limit: freeOldSpaceStart. nilObjPreSwizzle := newSpaceLimit - bytesToShift. numClassTablePages := self numSlotsOf: classTableRoot. self assert: numClassTablePages = (self classTableRootSlots + self hiddenRootSlots). 2 to: numClassTablePages - 1 do: [:i| (self fetchPointer: i ofObject: classTableRoot) = nilObjPreSwizzle ifTrue: [numClassTablePages := i. ^self]] ! Item was changed: ----- Method: SpurMemoryManager>>doBecome:and:copyHash: (in category 'become implementation') ----- doBecome: obj1 and: obj2 copyHash: copyHashFlag "Inner dispatch for two-way become" - <returnTypeC: #void> | o1ClassIndex o2ClassIndex | copyHashFlag ifFalse: ["in-lined clasIndex := (self isInClassTable: obj) ifTrue: [self rawHashBitsOf: obj] ifFalse: [0] for speed." o1ClassIndex := self rawHashBitsOf: obj1. (o1ClassIndex ~= 0 and: [(self classAtIndex: o1ClassIndex) ~= obj1]) ifTrue: [o1ClassIndex := 0]. o2ClassIndex := self rawHashBitsOf: obj2. (o2ClassIndex ~= 0 and: [(self classAtIndex: o2ClassIndex) ~= obj2]) ifTrue: [o2ClassIndex := 0]]. (self numSlotsOf: obj1) = (self numSlotsOf: obj2) ifTrue: [self inPlaceBecome: obj1 and: obj2 copyHashFlag: copyHashFlag] ifFalse: [self outOfPlaceBecome: obj1 and: obj2 copyHashFlag: copyHashFlag]. "if copyHashFlag then nothing changes, since hashes were also swapped." copyHashFlag ifTrue: [^self]. "if copyHash is false then the classTable entries must be updated." o1ClassIndex ~= 0 ifTrue: [o2ClassIndex ~= 0 ifTrue: "both were in the table; just swap entries" [| tmp | tmp := self classAtIndex: o1ClassIndex. self classAtIndex: o1ClassIndex put: obj2. self classAtIndex: o2ClassIndex put: tmp] ifFalse: "o2 wasn't in the table; put it there" [| newObj2 | newObj2 := self followForwarded: obj2. self assert: (self rawHashBitsOf: newObj2) = 0. self setHashBitsOf: newObj2 to: o1ClassIndex. self classAtIndex: o1ClassIndex put: newObj2]] ifFalse: [o2ClassIndex ~= 0 ifTrue: [| newObj1 | newObj1 := self followForwarded: obj1. self assert: (self rawHashBitsOf: newObj1) = 0. self setHashBitsOf: newObj1 to: o2ClassIndex. self classAtIndex: o2ClassIndex put: newObj1]]! Item was changed: ----- Method: SpurMemoryManager>>exactFitCompact (in category 'compaction') ----- exactFitCompact "Compact all of memory above firstFreeChunk using exact-fit, assuming free space is sorted and that the highest objects are recorded in highestObjects. Note that we don't actually move; we merely copy and forward. Eliminating forwarders will be done in a final pass. Leave the objects that don't fit exactly, and hence aren't moved, in highestObjects." - <returnTypeC: #void> <inline: false> | misfits first | <var: #misfits type: #usqInt> + totalFreeOldSpace = 0 ifTrue: [^self]. - totalFreeOldSpace = 0 ifTrue: [^0]. misfits := highestObjects last + self wordSize. [statCompactPassCount := statCompactPassCount + 1. highestObjects from: misfits - self wordSize reverseDo: [:o| | b | o < firstFreeChunk ifTrue: [misfits = (highestObjects last + self wordSize) ifTrue: [highestObjects resetAsEmpty] ifFalse: [highestObjects first: misfits]. ^self]. ((self isForwarded: o) or: [self isPinned: o]) ifFalse: [b := self bytesInObject: o. (self allocateOldSpaceChunkOfExactlyBytes: b suchThat: [:f| f < o]) ifNil: [misfits := misfits - self wordSize. misfits < highestObjects start ifTrue: [misfits := highestObjects limit]. self longAt: misfits put: o] ifNotNil: [:f| self copyAndForward: o withBytes: b toFreeChunk: f]]]. "now highestObjects contains only misfits, if any, from misfits to last. set first to first failure and refill buffer. next cycle will add more misfits. give up on exact-fit when half of the highest objects fail to fit." first := self longAt: highestObjects first. first > firstFreeChunk ifTrue: [| highestObjBytes failureBytes savedLimit | highestObjBytes := highestObjects limit - highestObjects start. failureBytes := highestObjects last >= misfits ifTrue: [highestObjects last - misfits] ifFalse: [highestObjBytes - (misfits - highestObjects last)]. failureBytes >= (highestObjBytes // 2) ifTrue: [highestObjects first: misfits. ^self]. savedLimit := self moveMisfitsToTopOfHighestObjects: misfits. self fillHighestObjectsWithMovableObjectsFrom: firstFreeChunk upTo: first. misfits := self moveMisfitsInHighestObjectsBack: savedLimit]] repeat! Item was changed: ----- Method: SpurMemoryManager>>fillHighestObjectsWithMovableObjectsFrom:upTo: (in category 'compaction') ----- fillHighestObjectsWithMovableObjectsFrom: startObj upTo: limitObj "Refill highestObjects with movable objects up to, but not including limitObj. c.f. the loop in freeUnmarkedObjectsNilUnmarkedWeaklingSlotsAndSortAndCoalesceFreeSpace." | lastHighest highestObjectsWraps | lastHighest := highestObjects last. highestObjectsWraps := 0. self allOldSpaceObjectsFrom: startObj do: [:o| o >= limitObj ifTrue: [highestObjects last: lastHighest. + ^self]. - ^nil]. ((self isForwarded: o) or: [self isPinned: o]) ifFalse: [false "conceptually...: " ifTrue: [highestObjects addLast: o] ifFalse: "but we inline so we can use the local lastHighest" [(lastHighest := lastHighest + self wordSize) >= highestObjects limit ifTrue: [highestObjectsWraps := highestObjectsWraps + 1]. self longAt: lastHighest put: o]]]. highestObjects last: lastHighest! Item was changed: ----- Method: SpurMemoryManager>>inPlaceBecome:and:copyHashFlag: (in category 'become implementation') ----- inPlaceBecome: obj1 and: obj2 copyHashFlag: copyHashFlag "Do become in place by swapping object contents." | headerTemp temp1 temp2 o1HasYoung o2HasYoung | - <var: 'headerTemp' type: #usqLong> self assert: (self numSlotsOf: obj1) = (self numSlotsOf: obj2). "swap headers, but swapping headers swaps remembered bits; these need to be unswapped." temp1 := self isRemembered: obj1. temp2 := self isRemembered: obj2. headerTemp := self longLongAt: obj1. self longLongAt: obj1 put: (self longLongAt: obj2). self longLongAt: obj2 put: headerTemp. self setIsRememberedOf: obj1 to: temp1. self setIsRememberedOf: obj2 to: temp2. "swapping headers swaps hash; if !!copyHashFlag undo hash copy" copyHashFlag ifFalse: [temp1 := self rawHashBitsOf: obj1. self setHashBitsOf: obj1 to: (self rawHashBitsOf: obj2). self setHashBitsOf: obj2 to: temp1]. o1HasYoung := o2HasYoung := false. 0 to: (self numSlotsOf: obj1) - 1 do: [:i| temp1 := self fetchPointer: i ofObject: obj1. temp2 := self fetchPointer: i ofObject: obj2. self storePointerUnchecked: i ofObject: obj1 withValue: temp2. self storePointerUnchecked: i ofObject: obj2 withValue: temp1. ((self isNonImmediate: temp2) and: [self isYoung: temp2]) ifTrue: [o1HasYoung := true]. ((self isNonImmediate: temp1) and: [self isYoung: temp1]) ifTrue: [o2HasYoung := true]]. (self isYoung: obj1) ifFalse: [o1HasYoung ifTrue: [self possibleRootStoreInto: obj1]]. (self isYoung: obj2) ifFalse: [o2HasYoung ifTrue: [self possibleRootStoreInto: obj2]]! Item was changed: ----- Method: SpurMemoryManager>>markAndFireEphemerons (in category 'gc - global') ----- markAndFireEphemerons - <returnTypeC: #void> "After the initial scan-mark is complete ephemerons can be processed." [coInterpreter markAndTraceUntracedReachableStackPages. self noUnscannedEphemerons ifTrue: [^self]. self markInactiveEphemerons ifFalse: [self fireAllUnscannedEphemerons]. self markAllUnscannedEphemerons] repeat! Item was changed: ----- Method: SpurMemoryManager>>markAndTrace: (in category 'gc - global') ----- markAndTrace: objOop "Mark the argument, and all objects reachable from it, and any remaining objects on the mark stack. Follow forwarding pointers in the scan." - <returnTypeC: #void> | objToScan index field | self assert: (self isNonImmediate: objOop). "if markAndTrace: is to follow and eliminate forwarding pointers in its scan it cannot be handed an r-value which is forwarded." self assert: (self isForwarded: objOop) not. (self isMarked: objOop) ifTrue: [^self]. "self setIsMarkedOf: objOop to: false" "for debugging" self setIsMarkedOf: objOop to: true. "Now scan the object, and any remaining objects on the mark stack." objToScan := objOop. "To avoid overflowing the mark stack when we encounter large objects, we push the obj, then its numStrongSlots, and then index the object from the stack." [| numStrongSlots | ((self isImmediate: objToScan) or: [numStrongSlots := self numStrongSlotsOf: objToScan ephemeronInactiveIf: #inactiveOrFailedToDeferScan:. numStrongSlots > self traceImmediatelySlotLimit]) ifTrue: "scanning a large object. scan until hitting an unmarked object, then switch to it, if any." [(self isImmediate: objToScan) ifTrue: [index := self integerValueOf: objToScan. objToScan := self topOfObjStack: markStack] ifFalse: [index := numStrongSlots]. [index > 0] whileTrue: [index := index - 1. field := self fetchPointer: index ofObject: objToScan. (self isOopForwarded: field) ifTrue: [field := self followForwarded: field. self storePointerUnchecked: index ofObject: objToScan withValue: field]. ((self isImmediate: field) or: [self isMarked: field]) ifFalse: [self setIsMarkedOf: field to: true. (self topOfObjStack: markStack) ~= objToScan ifTrue: [self push: objToScan onObjStack: markStack]. self push: (self integerObjectOf: index) onObjStack: markStack. objToScan := field. index := -1]]. index >= 0 ifTrue: "if loop terminated without finding an unmarked referent, switch to top of stack." [objToScan := self popObjStack: markStack. objToScan = objOop ifTrue: [objToScan := self popObjStack: markStack]]] ifFalse: "scanning a small object. scan, marking, pushing unmarked referents, then switch to the top of the stack." [index := numStrongSlots. [index > 0] whileTrue: [index := index - 1. field := self fetchPointer: index ofObject: objToScan. (self isOopForwarded: field) ifTrue: [field := self followForwarded: field. self storePointerUnchecked: index ofObject: objToScan withValue: field]. ((self isImmediate: field) or: [self isMarked: field]) ifFalse: [self setIsMarkedOf: field to: true. self push: field onObjStack: markStack. numStrongSlots := self numStrongSlotsOf: field ephemeronInactiveIf: #inactiveOrFailedToDeferScan:. numStrongSlots > self traceImmediatelySlotLimit ifTrue: [self push: (self integerObjectOf: numStrongSlots) onObjStack: markStack]]]. objToScan := self popObjStack: markStack]. objToScan notNil] whileTrue! Item was changed: ----- Method: SpurMemoryManager>>markAndTraceObjStack:andContents: (in category 'obj stacks') ----- markAndTraceObjStack: stackOrNil andContents: markAndTraceContents "An obj stack is a stack of objects stored in a hidden root slot, such as the markStack or the ephemeronQueue. It is a linked list of segments, with the hot end at the head of the list. It is a word object. The stack pointer is in ObjStackTopx and 0 means empty." - <returnTypeC: #void> <inline: false> | index field | stackOrNil = nilObj ifTrue: [^self]. self assert: (self numSlotsOfAny: stackOrNil) = ObjStackPageSlots. field := self fetchPointer: ObjStackNextx ofObject: stackOrNil. field ~= 0 ifTrue: [self markAndTraceObjStack: field andContents: markAndTraceContents]. field := stackOrNil. [field := self fetchPointer: ObjStackFreex ofObject: stackOrNil. field ~= 0] whileTrue: [self setIsMarkedOf: field to: true]. markAndTraceContents ifFalse: [^self]. "There are four fixed slots in an obj stack, and a Topx of 0 indicates empty, so if there were 6 slots in an oop stack, full would be 2, and the last 0-rel index is 5." index := (self fetchPointer: ObjStackTopx ofObject: stackOrNil) + ObjStackNextx. [index >= ObjStackFixedSlots] whileTrue: [field := self fetchPointer: index ofObject: stackOrNil. (self isImmediate: field) ifFalse: [self markAndTrace: field]. index := index - 1]! Item was changed: ----- Method: SpurMemoryManager>>okayOop: (in category 'debug support') ----- okayOop: signedOop "Verify that the given oop is legitimate. Check address, header, and size but not class." | oop classIndex fmt unusedBits unusedBitsInYoungObjects | <var: #oop type: #usqInt> + <var: #unusedBits type: #usqLong> oop := self cCoerce: signedOop to: #usqInt. "address and size checks" (self isImmediate: oop) ifTrue: [^true]. (self addressCouldBeObjWhileScavenging: oop) ifFalse: [self error: 'oop is not a valid address'. ^false]. (self addressAfter: oop) <= freeOldSpaceStart ifFalse: [self error: 'oop size would make it extend beyond the end of memory'. ^false]. "header type checks" (classIndex := self classIndexOf: oop) >= self firstClassIndexPun ifFalse: [self error: 'oop is a free chunk, or bridge, not an object'. ^false]. ((self rawNumSlotsOf: oop) = self numSlotsMask and: [(self rawNumSlotsOf: oop) - self baseHeaderSize ~= self numSlotsMask]) ifTrue: [self error: 'oop header has overflow header word, but overflow word does not have a saturated numSlots field'. ^false]. "format check" fmt := self formatOf: oop. (fmt = 6) | (fmt = 8) ifTrue: [self error: 'oop has an unknown format type'. ^false]. (fmt = self forwardedFormat) ~= (classIndex = self isForwardedObjectClassIndexPun) ifTrue: [self error: 'oop has mismached format/classIndex fields; only one of them is the isForwarded value'. ^false]. "specific header bit checks" unusedBits := (1 << self classIndexFieldWidth) | (1 << (self identityHashFieldWidth + 32)). ((self longLongAt: oop) bitAnd: unusedBits) ~= 0 ifTrue: [self error: 'some unused header bits are set; should be zero'. ^false]. unusedBitsInYoungObjects := (1 << self greyBitShift) | (1 << self pinnedBitShift) | (1 << self rememberedBitShift). ((self longAt: oop) bitAnd: unusedBitsInYoungObjects) ~= 0 ifTrue: [self error: 'some header bits unused in young objects are set; should be zero'. ^false]. ^true ! Item was changed: ----- Method: SpurMemoryManager>>postBecomeOrCompactScanClassTable: (in category 'become implementation') ----- postBecomeOrCompactScanClassTable: effectsFlags "Scan the class table post-become (iff a pointer object or compiled method was becommed), or post-compact. Note that one-way become can cause duplications in the class table. When can these be eliminated? We use the classTableBitmap to mark classTable entries (not the classes themselves, since marking a class doesn't help in knowing if its index is used). On image load, and during incrememtal scan-mark and full GC, classIndices are marked. We can somehow avoid following classes from the classTable until after this mark phase." - self assert: self validClassTableRootPages. (effectsFlags anyMask: BecamePointerObjectFlag+BecameCompiledMethodFlag) ifFalse: [^self]. 0 to: numClassTablePages - 1 do: [:i| | page | page := self fetchPointer: i ofObject: hiddenRootsObj. 0 to: (self numSlotsOf: page) - 1 do: [:j| | classOrNil | classOrNil := self fetchPointer: j ofObject: page. classOrNil ~= nilObj ifTrue: [(self isForwarded: classOrNil) ifTrue: [classOrNil := self followForwarded: classOrNil. self storePointer: j ofObject: page withValue: classOrNil]. self scanClassPostBecome: classOrNil effects: effectsFlags]]]! Item was added: + ----- Method: SpurSegmentManager class>>implicitReturnTypeFor: (in category 'translation') ----- + implicitReturnTypeFor: aSelector + "Answer the return type for methods that don't have an explicit return." + ^#void! Item was changed: ----- Method: SpurSegmentManager>>allocateOrExtendSegmentInfos (in category 'private') ----- allocateOrExtendSegmentInfos "Increase the number of allocated segInfos by 16." - <returnTypeC: #void> | newNumSegs | numSegInfos = 0 ifTrue: [numSegInfos := 16. segments := self cCode: [self c: numSegInfos alloc: (self sizeof: SpurSegmentInfo)] inSmalltalk: [CArrayAccessor on: ((1 to: numSegInfos) collect: [:i| SpurSegmentInfo new])]. ^self]. newNumSegs := numSegInfos + 16. segments := self cCode: [self re: newNumSegs * (self sizeof: SpurSegmentInfo) alloc: segments] inSmalltalk: [CArrayAccessor on: segments object, ((numSegInfos to: newNumSegs) collect: [:i| SpurSegmentInfo new])]. self cCode: [segments = 0 ifTrue: [self error: 'out of memory; cannot allocate more segments']. self me: segments + numSegInfos ms: 0 et: newNumSegs - numSegInfos * (self sizeof: SpurSegmentInfo)]. numSegInfos := newNumSegs! Item was changed: ----- Method: SpurSegmentManager>>collapseSegmentsPostSwizzle (in category 'snapshot') ----- collapseSegmentsPostSwizzle "The image has been loaded, old segments reconstructed, and the heap swizzled into a single contiguous segment. Collapse the segments into one." <inline: false> | bridge | canSwizzle := false. firstSegmentSize ifNil: "true when used by SpurBootstrap to transform an image" + [^self]. - [^nil]. numSegments := 1. (segments at: 0) segStart: manager newSpaceLimit; segSize: manager endOfMemory - manager newSpaceLimit. "finally plant a bridge at the end of the coalesced segment and cut back the manager's notion of the end of memory to immediately before the bridge." bridge := manager endOfMemory - manager bridgeSize. self assert: bridge = ((segments at: 0) segStart + (segments at: 0) segSize - manager bridgeSize). manager initSegmentBridgeWithBytes: manager bridgeSize at: bridge; setEndOfMemory: bridge! Item was changed: ----- Method: StackInterpreter>>addNewMethodToCache: (in category 'method lookup cache') ----- addNewMethodToCache: classObj "Add the given entry to the method cache. The policy is as follows: Look for an empty entry anywhere in the reprobe chain. If found, install the new entry there. If not found, then install the new entry at the first probe position and delete the entries in the rest of the reprobe chain. This has two useful purposes: If there is active contention over the first slot, the second or third will likely be free for reentry after ejection. Also, flushing is good when reprobe chains are getting full." | probe hash primitiveIndex | <inline: false> hash := messageSelector bitXor: (objectMemory classTagForClass: classObj). "drop low-order zeros from addresses (if classObj not classTag)" (objectMemory isOopCompiledMethod: newMethod) ifTrue: [primitiveIndex := self primitiveIndexOf: newMethod. primitiveFunctionPointer := self functionPointerFor: primitiveIndex inClass: classObj] ifFalse: [primitiveFunctionPointer := #primitiveInvokeObjectAsMethod]. 0 to: CacheProbeMax-1 do: [:p | probe := (hash >> p) bitAnd: MethodCacheMask. (methodCache at: probe + MethodCacheSelector) = 0 ifTrue: ["Found an empty entry -- use it" methodCache at: probe + MethodCacheSelector put: messageSelector. methodCache at: probe + MethodCacheClass put: (objectMemory classTagForClass: classObj). methodCache at: probe + MethodCacheMethod put: newMethod. methodCache at: probe + MethodCachePrimFunction put: (self cCoerce: primitiveFunctionPointer to: #long). lastMethodCacheProbeWrite := probe. "this for primitiveExternalMethod" + ^self]]. - ^ nil]]. "OK, we failed to find an entry -- install at the first slot..." probe := hash bitAnd: MethodCacheMask. "first probe" methodCache at: probe + MethodCacheSelector put: messageSelector. methodCache at: probe + MethodCacheClass put: (objectMemory classTagForClass: classObj). methodCache at: probe + MethodCacheMethod put: newMethod. methodCache at: probe + MethodCachePrimFunction put: (self cCoerce: primitiveFunctionPointer to: #long). lastMethodCacheProbeWrite := probe. "this for primitiveExternalMethod" "...and zap the following entries" 1 to: CacheProbeMax-1 do: [:p | probe := (hash >> p) bitAnd: MethodCacheMask. methodCache at: probe + MethodCacheSelector put: 0]! Item was changed: ----- Method: StackInterpreter>>doubleExtendedDoAnythingBytecode (in category 'send bytecodes') ----- doubleExtendedDoAnythingBytecode "Replaces the Blue Book double-extended send [132], in which the first byte was wasted on 8 bits of argument count. Here we use 3 bits for the operation sub-type (opType), and the remaining 5 bits for argument count where needed. The last byte give access to 256 instVars or literals. See also secondExtendedSendBytecode" | byte2 byte3 opType top lit | byte2 := self fetchByte. byte3 := self fetchByte. opType := byte2 >> 5. opType = 0 ifTrue: [messageSelector := self literal: byte3. argumentCount := byte2 bitAnd: 31. ^self normalSend]. opType = 1 ifTrue: [messageSelector := self literal: byte3. argumentCount := byte2 bitAnd: 31. ^self superclassSend]. self fetchNextBytecode. opType = 2 ifTrue: [^self pushMaybeContextReceiverVariable: byte3]. opType = 3 ifTrue: [^self pushLiteralConstant: byte3]. opType = 4 ifTrue: [^self pushLiteralVariable: byte3]. top := self internalStackTop. opType = 7 ifTrue: [lit := self literal: byte3. + objectMemory storePointer: ValueIndex ofObject: lit withValue: top. + ^self]. - ^objectMemory storePointer: ValueIndex ofObject: lit withValue: top]. "opType = 5 is store; opType = 6 = storePop" opType = 6 ifTrue: [self internalPop: 1]. ^self storeMaybeContextReceiverVariable: byte3 withValue: top! Item was added: + ----- Method: StackInterpreter>>initStackPageGC (in category 'object memory support') ----- + initStackPageGC + "GC of pages. Throwing away all stack pages on full GC is simple but dangerous + because it causes us to allocate lots of contexts immediately before a GC. + Reclaiming pages whose top context is not referenced is poor because it would + take N incrementalGCs to reclaim N unused pages. Only the page whose top + context is not referred to by the bottom context of any other page would be + reclaimed. Not until the next GC would the page whose top contect is the + previously reclaimed page's base frame's bottom context be reclaimed. + + Better is to not mark stack pages until their contexts are encountered. We can + eagerly trace the active page and the page reachable from its bottom context + if any, and so on. Other pages can be marked when we encounter a married + context." + <var: #thePage type: #'StackPage *'> + <inline: true> + "Need to write back the frame pointers unless all pages are free (as in snapshot)" + stackPage ~= 0 ifTrue: + [self externalWriteBackHeadFramePointers]. + + 0 to: numStackPages - 1 do: + [:i| | thePage | + thePage := stackPages stackPageAt: i. + thePage trace: 0]! Item was changed: ----- Method: StackInterpreter>>integerArg: (in category 'plugin primitive support') ----- integerArg: index "Like #stackIntegerValue: but access method arguments left-to-right" | oop | oop := self methodArg: index. + oop = 0 ifTrue:[^0]. "methodArg: failed" - oop = 0 ifTrue:[^0.0]. "methodArg: failed" ^self checkedIntegerValueOf: oop! Item was changed: ----- Method: StackInterpreter>>longPrintOop: (in category 'debug printing') ----- longPrintOop: oop <api> | fmt lastIndex startIP bytecodesPerLine column | ((objectMemory isImmediate: oop) or: [(objectMemory addressCouldBeObj: oop) not or: [(oop bitAnd: objectMemory allocationUnit - 1) ~= 0 or: [(objectMemory isFreeObject: oop) or: [objectMemory isForwarded: oop]]]]) ifTrue: + [self printOop: oop. + ^self]. - [^self printOop: oop]. self printHex: oop. (objectMemory fetchClassOfNonImm: oop) ifNil: [self print: ' has a nil class!!!!'] ifNotNil: [:class| self print: ': a(n) '; printNameOfClass: class count: 5; print: ' ('; printHex: class; print: ')']. fmt := objectMemory formatOf: oop. self print: ' format '; printHexnp: fmt. fmt > objectMemory lastPointerFormat ifTrue: [self print: ' nbytes '; printNum: (objectMemory byteLengthOf: oop)] ifFalse: [(objectMemory isIndexableFormat: fmt) ifTrue: [| len | len := objectMemory lengthOf: oop. self print: ' size '; printNum: len - (objectMemory fixedFieldsOf: oop format: fmt length: len)]]. objectMemory printHeaderTypeOf: oop. self print: ' hash '; printHexnp: (objectMemory rawHashBitsOf: oop). self cr. (fmt between: objectMemory firstLongFormat and: objectMemory firstCompiledMethodFormat - 1) ifTrue: [^self]. "this is nonsense. apologies." startIP := (objectMemory lastPointerOf: oop) + BytesPerOop - objectMemory baseHeaderSize / BytesPerOop. lastIndex := 256 min: startIP. lastIndex > 0 ifTrue: [1 to: lastIndex do: [:i| | fieldOop | fieldOop := objectMemory fetchPointer: i - 1 ofObject: oop. self space; printNum: i - 1; space; printHex: fieldOop; space. (i = 1 and: [objectMemory isCompiledMethod: oop]) ifTrue: [self printMethodHeaderOop: fieldOop] ifFalse: [self cCode: [self printOopShort: fieldOop] inSmalltalk: [self print: (self shortPrint: fieldOop)]]. self cr]]. (objectMemory isCompiledMethod: oop) ifFalse: [startIP > 64 ifTrue: [self print: '...'; cr]] ifTrue: [startIP := startIP * BytesPerWord + 1. lastIndex := objectMemory lengthOf: oop. lastIndex - startIP > 100 ifTrue: [lastIndex := startIP + 100]. bytecodesPerLine := 8. column := 1. startIP to: lastIndex do: [:index| | byte | column = 1 ifTrue: [self cCode: 'printf("0x%08x: ", oop+BaseHeaderSize+index-1)' inSmalltalk: [self print: (oop+BaseHeaderSize+index-1) hex; print: ': ']]. byte := objectMemory fetchByte: index - 1 ofObject: oop. self cCode: 'printf(" %02x/%-3d", byte,byte)' inSmalltalk: [self space; print: (byte radix: 16); printChar: $/; printNum: byte]. column := column + 1. column > bytecodesPerLine ifTrue: [column := 1. self cr]]. column = 1 ifFalse: [self cr]]! Item was changed: ----- Method: StackInterpreter>>markAndTraceStackPages: (in category 'object memory support') ----- markAndTraceStackPages: fullGCFlag "GC of pages. Throwing away all stack pages on full GC is simple but dangerous because it causes us to allocate lots of contexts immediately before a GC. Reclaiming pages whose top context is not referenced is poor because it would take N incrementalGCs to reclaim N unused pages. Only the page whose top context is not referred to by the bottom context of any other page would be reclaimed. Not until the next GC would the page whose top contect is the previously reclaimed page's base frame's bottom context be reclaimed. Better is to not mark stack pages until their contexts are encountered. We can eagerly trace the active page and the page reachable from its bottom context if any, and so on. Other pages can be marked when we encounter a married context." | thePage context | <var: #thePage type: #'StackPage *'> <inline: false> + self initStackPageGC. - "Need to write back the frame pointers unless all pages are free (as in snapshot)" - stackPage ~= 0 ifTrue: - [self externalWriteBackHeadFramePointers]. - 0 to: numStackPages - 1 do: - [:i| - thePage := stackPages stackPageAt: i. - thePage trace: 0]. - "On an incremental GC simply consider all non-free stack pages to be roots." fullGCFlag ifFalse: [0 to: numStackPages - 1 do: [:i| thePage := stackPages stackPageAt: i. (stackPages isFree: thePage) ifFalse: [thePage trace: 2. self markAndTraceStackPage: thePage]]. ^nil]. "On a full GC only eagerly trace pages referenced from the active page." stackPage = 0 ifTrue: [^nil]. thePage := stackPage. [thePage trace: 2. self markAndTraceStackPage: thePage. context := self frameCallerContext: thePage baseFP. ((objectMemory isContext: context) and: [(self isMarriedOrWidowedContext: context) and: [self isStillMarriedContext: context]]) ifTrue: [thePage := stackPages stackPageFor: (self frameOfMarriedContext: context). self assert: (stackPages isFree: thePage) not]. thePage trace = 0] whileTrue! Item was changed: ----- Method: StackInterpreter>>objectArg: (in category 'plugin primitive support') ----- objectArg: index "Like #stackObjectValue: but access method arguments left-to-right" | oop | oop := self methodArg: index. + oop = 0 ifTrue:[^0]. "methodArg: failed" - oop = 0 ifTrue:[^0.0]. "methodArg: failed" (objectMemory isIntegerObject: oop) ifTrue: [self primitiveFail. ^ nil]. ^oop! Item was changed: ----- Method: StackInterpreter>>printNameOfClass:count: (in category 'debug printing') ----- printNameOfClass: classOop count: cnt "Details: The count argument is used to avoid a possible infinite recursion if classOop is a corrupted object." <inline: false> | numSlots | classNameIndex ifNil: [self print: '??nil cnidx??'. ^self]. + (classOop isNil or: [classOop = 0 or: [cnt <= 0]]) ifTrue: + [self print: 'bad class'. + ^self]. - (classOop isNil or: [classOop = 0 or: [cnt <= 0]]) ifTrue: [^self print: 'bad class']. numSlots := objectMemory numSlotsOf: classOop. (numSlots = metaclassNumSlots and: [metaclassNumSlots > thisClassIndex]) ifTrue: [self printNameOfClass: (objectMemory fetchPointer: thisClassIndex ofObject: classOop) count: cnt - 1. self print: ' class'] ifFalse: [numSlots <= classNameIndex ifTrue: [self print: 'bad class'] ifFalse: [self printStringOf: (objectMemory fetchPointer: classNameIndex ofObject: classOop)]]! Item was changed: ----- Method: StackToRegisterMappingCogit class>>ancilliaryClasses: (in category 'translation') ----- ancilliaryClasses: options + ^(super ancilliaryClasses: options), - ^((super ancilliaryClasses: options) copyWithout: CogBytecodeFixup), { CogSSBytecodeFixup. CogSimStackEntry. CogSSOptStatus }! Item was added: + ----- Method: StackToRegisterMappingCogit class>>isAcceptableAncilliaryClass: (in category 'translation') ----- + isAcceptableAncilliaryClass: aClass + ^true! Item was added: + ----- Method: StackToRegisterMappingCogit class>>shouldGenerateTypedefFor: (in category 'translation') ----- + shouldGenerateTypedefFor: aStructClass + "Hack to work-around mutliple definitions. Sometimes a type has been defined in an include." + ^aStructClass ~~ CogBytecodeFixup "overridden by CogSSBytecodeFixup" + and: [super shouldGenerateTypedefFor: aStructClass]! Item was changed: ----- Method: StackToRegisterMappingCogit>>compileFrameBuild (in category 'compile abstract instructions') ----- compileFrameBuild "Build a frame for a CogMethod activation. See CoInterpreter class>>initializeFrameIndices. Override to push the register receiver and register arguments, if any." needsFrame ifFalse: [self initSimStackForFramelessMethod: initialPC. + ^0]. - ^self]. self genPushRegisterArgs. super compileFrameBuild. self initSimStackForFramefulMethod: initialPC! Item was changed: ----- Method: TMethod>>elideAnyFinalReturn (in category 'transformations') ----- elideAnyFinalReturn "For super expansions we need to eliminate any final return to prevent premature exit. Anything meaningful in the returned expression must be retained." + | stmtList expr | - | stmtList lastStmt | stmtList := parseTree statements asOrderedCollection. + stmtList last isReturn ifTrue: + [expr := stmtList last expression. + (expr isVariable and: [expr name = 'self']) + ifTrue: [stmtList := stmtList allButLast] + ifFalse: [stmtList at: stmtList size put: expr]. - (lastStmt := stmtList last) isReturn ifTrue: - [stmtList at: stmtList size put: lastStmt expression. parseTree setStatements: stmtList]! Item was added: + ----- Method: TMethod>>harmonizeSignedAndUnsignedTypesIn: (in category 'type inference') ----- + harmonizeSignedAndUnsignedTypesIn: aSetOfTypes + "Eliminate signed/unsigned conflicts in aSetOfTypes" + | sqs usqs | + sqs := aSetOfTypes select: [:t| t beginsWith: 'sq']. + usqs := aSetOfTypes select: [:t| t beginsWith: 'usq']. + ^(sqs size + usqs size = aSetOfTypes size + and: [sqs notEmpty + and: [sqs allSatisfy: [:t| usqs includes: 'u', t]]]) + ifTrue: [sqs] + ifFalse: [aSetOfTypes]! Item was added: + ----- Method: TMethod>>inferReturnTypeFromReturnsIn: (in category 'type inference') ----- + inferReturnTypeFromReturnsIn: aCodeGen + "Attempt to infer the return type of the receiver from returns in the parse tree." + + returnType isNil ifTrue:"the initial default" + [aCodeGen + pushScope: declarations + while: + [| hasReturn returnTypes | + hasReturn := false. + returnTypes := Set new. + parseTree nodesDo: + [:node| + node isReturn ifTrue: + [| expr | + hasReturn := true. + expr := node expression. + expr isAssignment ifTrue: + [expr := expr variable]. + expr isSend ifTrue: + [(aCodeGen returnTypeForSend: expr) ifNotNil: + [:type| returnTypes add: type]]. + expr isVariable ifTrue: + [(aCodeGen typeOfVariable: expr name) + ifNotNil: [:type| returnTypes add: type] + ifNil: [returnTypes add: (expr name = 'self' + ifTrue: [#void] + ifFalse: [#sqInt])]]. + expr isConstant ifTrue: + [| val | + val := expr value. + val isInteger ifTrue: + [returnTypes add: ((val >= 0 ifTrue: [val] ifFalse: [-1 - val]) highBit <= 32 + ifTrue: [#sqInt] + ifFalse: [#sqLong])]. + (val == true or: [val == false]) ifTrue: + [returnTypes add: #sqInt]. + val isFloat ifTrue: + [returnTypes add: #float]]]]. + returnTypes remove: #implicit ifAbsent: []. + returnTypes := self harmonizeSignedAndUnsignedTypesIn: returnTypes. + hasReturn + ifTrue: + [returnTypes size > 1 ifTrue: + [aCodeGen logger nextPutAll: 'conflicting return types', (String streamContents: [:s| returnTypes do: [:t| s space; nextPutAll: t]]), ' in ', selector; cr; flush]. + returnTypes size = 1 ifTrue: + [self returnType: returnTypes anyOne]] + ifFalse: + [self returnType: (aCodeGen implicitReturnTypeFor: selector)]]]! Item was added: + ----- Method: TMethod>>inferReturnTypeIn: (in category 'type inference') ----- + inferReturnTypeIn: aCodeGen + "Attempt to infer the return type of the receiver and answer if it changed." + + | existingReturnType | + existingReturnType := returnType. + self removeFinalSelfReturnIn: aCodeGen. "must preceed recordDeclarations because this may set returnType" + self recordDeclarations. + self inferReturnTypeFromReturnsIn: aCodeGen. + + "If the return type is now void, replace any and all ^expr with expr. ^self" + (existingReturnType ~= returnType and: [returnType = #void]) ifTrue: + [self transformVoidReturns]. + + ^existingReturnType ~= returnType! Item was added: + ----- Method: TMethod>>inferTypesForImplicitlyTypedVariablesIn: (in category 'type inference') ----- + inferTypesForImplicitlyTypedVariablesIn: aCodeGen + parseTree nodesDo: + [:node| | var m | + (node isAssignment + and: [(locals includes: (var := node variable name)) + and: [(declarations includesKey: var) not + and: [node expression isSend + and: [(m := aCodeGen methodNamed: node expression selector) notNil]]]]) ifTrue: + [(#(sqInt void nil) includes: m returnType) ifFalse: + ["the $: is to map things like unsigned field : 3 to usqInt" + declarations + at: var + put: ((m returnType includes: $:) ifTrue: [#usqInt] ifFalse: [m returnType]), ' ', var]]]! Item was changed: ----- Method: TMethod>>isFunctional (in category 'inlining') ----- isFunctional "Answer true if the receiver is a functional method. That is, if it consists of a single return statement of an expression that contains no other returns. Answer false for methods with return types other than the simple integer types to work around bugs in the inliner." (parseTree statements size = 1 and: [parseTree statements last isReturn]) ifFalse: [ ^false ]. parseTree statements last expression nodesDo: [ :n | n isReturn ifTrue: [ ^false ]]. + ^#(sqInt usqInt sqLong usqLong #'sqInt *') includes: returnType! - ^#(sqInt usqInt sqLong usqLong) includes: returnType! Item was changed: ----- Method: TMethod>>recordDeclarations (in category 'transformations') ----- recordDeclarations "Record C type declarations of the forms self returnTypeC: 'float'. self var: #foo declareC: 'float foo' self var: #foo type:'float'. and remove the declarations from the method body." | newStatements | properties pragmas notEmpty ifTrue: [properties pragmas do: [:pragma| pragma keyword = #var:declareC: ifTrue: [self declarationAt: pragma arguments first asString put: pragma arguments last]. pragma keyword = #var:type: ifTrue: [| varName varType | varName := pragma arguments first asString. varType := pragma arguments last. varType last = $* ifFalse: [varType := varType, ' ']. self declarationAt: varName put: varType, varName]. pragma keyword = #returnTypeC: ifTrue: + [self returnType: pragma arguments last]. - [returnType := pragma arguments last]. pragma keyword = #doNotGenerate: ifTrue: [locals remove: pragma arguments last]]. ^self]. newStatements := OrderedCollection new: parseTree statements size. parseTree statements do: [ :stmt | | isDeclaration | isDeclaration := false. stmt isSend ifTrue: [ stmt selector = #var:declareC: ifTrue: [ isDeclaration := true. self declarationAt: stmt args first value asString put: stmt args last value. ]. stmt selector = #var:type: ifTrue: [ | varName varType | isDeclaration := true. varName := stmt args first value asString. varType := stmt args last value. varType last = $* ifFalse: [varType := varType, ' ']. self declarationAt: varName put: varType, varName. ]. stmt selector = #returnTypeC: ifTrue: [ isDeclaration := true. returnType := stmt args last value. ]. ]. isDeclaration ifFalse: [ newStatements add: stmt. ]. ]. parseTree setStatements: newStatements asArray.! Item was removed: - ----- Method: TMethod>>removeFinalSelfReturn (in category 'transformations') ----- - removeFinalSelfReturn - "The Smalltalk parser automatically adds the statement '^self' to the end of methods - without explicit returns. This method removes such statements, since in most VMMaker - classes (except struct classes) the generated code has no notion of 'self' anyway. - If the statement is removed and no return type has yet been specified asnd the class - specifies a default return type (e.g. #void) for methods that don't return, then set the - return type accordingly." - - | lastStmt | - ((lastStmt := parseTree statements last) isReturn - and: [lastStmt expression isVariable - and: ['self' = lastStmt expression name]]) ifTrue: - [| tokens | - tokens := Scanner new scanTokens: (definingClass sourceCodeAt: selector ifAbsent: ['']). - (tokens size < 2 - or: [(tokens last: 2) ~= #(#'^' 'self')]) ifTrue: - [parseTree setStatements: parseTree statements allButLast. - returnType = #sqInt ifTrue: - [([definingClass implicitReturnTypeFor: selector] - on: MessageNotUnderstood - do: [:ex| nil]) ifNotNil: - [:defaultReturnType| - returnType := defaultReturnType]]]]! Item was added: + ----- Method: TMethod>>removeFinalSelfReturnIn: (in category 'transformations') ----- + removeFinalSelfReturnIn: aCodeGenOrNil + "The Smalltalk parser automatically adds the statement '^self' to the end of methods + without explicit returns. This method removes such statements, since in most VMMaker + classes (except struct classes) the generated code has no notion of 'self' anyway. + If the statement is removed and no return type has yet been specified and the class + specifies a default return type (e.g. #void) for methods that don't return, then set the + return type accordingly." + + | lastStmt | + parseTree statements isEmpty ifTrue: [^self]. + ((lastStmt := parseTree statements last) isReturn + and: [lastStmt expression isVariable + and: ['self' = lastStmt expression name]]) ifTrue: + [| tokens | + tokens := Scanner new scanTokens: (definingClass sourceCodeAt: selector ifAbsent: ['']). + (tokens size < 2 + or: [(tokens last: 2) ~= #(#'^' 'self')]) ifTrue: + [parseTree setStatements: parseTree statements allButLast. + (returnType isNil + and: [aCodeGenOrNil notNil + and: [parseTree noneSatisfy: [:node| node isReturn and: [node expression isVariable not or: [node expression name ~= 'self']]]]]) ifTrue: + [self returnType: (aCodeGenOrNil implicitReturnTypeFor: selector)]]]! Item was changed: ----- Method: TMethod>>setSelector:definingClass:args:locals:block:primitive:properties:comment: (in category 'initialization') ----- setSelector: sel definingClass: class args: argList locals: localList block: aBlockNode primitive: aNumber properties: methodProperties comment: aComment "Initialize this method using the given information." selector := sel. definingClass := class. - returnType := #sqInt. "assume return type is long for now" args := argList asOrderedCollection collect: [:arg | arg key]. locals := (localList collect: [:arg | arg key]) asSet. declarations := Dictionary new. self addTypeForSelf. primitive := aNumber. properties := methodProperties. comment := aComment. parseTree := aBlockNode. "hack; allows nodes to find their parent, etc" parseTree := aBlockNode asTranslatorNodeIn: self. labels := OrderedCollection new. complete := false. "set to true when all possible inlining has been done" export := self extractExportDirective. static := self extractStaticDirective. canAsmLabel := self extractLabelDirective. self extractSharedCase. - self removeFinalSelfReturn. "must preceed recordDeclarations because this may set returnType" - self recordDeclarations. globalStructureBuildMethodHasFoo := false! Item was added: + ----- Method: TMethod>>transformVoidReturns (in category 'type inference') ----- + transformVoidReturns + "Once the return type has been found or inferred to be #void, + any occurrences of ^expr must be replaced with expr. ^self." + self assert: returnType == #void. + parseTree nodesWithParentsDo: + [:node :parent| + (node isReturn + and: [node expression isVariable not + or: [node expression name ~= 'self']]) ifTrue: + [parent + replaceChild: node + with: (TStmtListNode new + setArguments: #() + statements: {node expression. + TReturnNode new + setExpression: (TVariableNode new setName: 'self') + yourself})]]! Item was added: + ----- Method: TParseNode>>allSatisfy: (in category 'enumerating') ----- + allSatisfy: aBlock + self nodesDo: [:n| (aBlock value: n) ifFalse: [^false]]. + ^true! Item was added: + ----- Method: TParseNode>>allSatisfy:unless: (in category 'enumerating') ----- + allSatisfy: aBlock unless: cautionaryBlock + self + nodesDo: [:n| (aBlock value: n) ifFalse: [^false]] + unless: cautionaryBlock. + ^true! Item was added: + ----- Method: TStmtListNode>>replaceChild:with: (in category 'transformations') ----- + replaceChild: aNode with: bNode + statements := Array streamContents: + [:s| + statements do: + [:node| + node == aNode + ifTrue: + [bNode isStmtList + ifTrue: [s nextPutAll: bNode statements] + ifFalse: [s nextPut: bNode]] + ifFalse: [s nextPut: node]]]! Item was changed: ----- Method: UnixVMMaker>>createCodeGenerator (in category 'initialisation') ----- createCodeGenerator + ^CCodeGeneratorGlobalStructure new + vmMaker: self; - ^CCodeGeneratorGlobalStructure new initialize; logger: logger; yourself! Item was changed: ----- Method: VMMaker>>createCodeGenerator (in category 'initialize') ----- createCodeGenerator "set up a CCodeGenerator for this VMMaker" + ^CCodeGenerator new + vmMaker: self; - ^CCodeGenerator new initialize logger: logger; options: optionsDictionary; yourself! Item was changed: ----- Method: VMMaker>>createCogitCodeGenerator (in category 'initialize') ----- createCogitCodeGenerator + ^CCodeGenerator new + vmMaker: self; - ^CCodeGenerator new initialize logger: logger; options: optionsDictionary; yourself! Item was changed: ----- Method: VMMaker>>generateCogitFile (in category 'generate sources') ----- generateCogitFile "Translate the Smalltalk description of the virtual machine into C. If 'self doInlining' is true, small method bodies are inlined to reduce procedure call overhead. On the PPC, this results in a factor of three speedup with only 30% increase in code size. Subclasses can use specialised versions of CCodeGenerator and interpreterClass." | cg cogitClass | self interpreterClass needsCogit ifFalse: [^nil]. cg := [self buildCodeGeneratorForCogit] on: Notification do: [:ex| ex tag == #getVMMaker ifTrue: [ex resume: self] ifFalse: [(ex respondsTo: #rearmHandlerDuring:) ifTrue: [ex rearmHandlerDuring: [ex pass]] ifFalse: [ex pass]]]. self needsToRegenerateCogitFile ifFalse: [^nil]. cogitClass := self cogitClass. cg removeUnneededBuiltins. cg vmClass preGenerationHook: cg. + + cg inferTypesForImplicitlyTypedVariablesAndMethods. + cg storeCodeOnFile: (self sourceFilePathFor: cogitClass sourceFileName) doInlining: cogitClass doInlining. cg vmClass additionalHeadersDo: [:headerName :headerContents| | filePath | filePath := self coreVMDirectory fullNameFor: headerName. (cg needToGenerateHeader: headerName file: filePath contents: headerContents) ifTrue: [cg storeHeaderOnFile: filePath contents: headerContents]]. cogitClass apiExportHeaderName ifNotNil: [cg storeAPIExportHeader: cogitClass apiExportHeaderName OnFile: (self sourceFilePathFor: cogitClass apiExportHeaderName)]! Item was changed: ----- Method: VMMaker>>generateInterpreterFile (in category 'generate sources') ----- generateInterpreterFile "Translate the Smalltalk description of the virtual machine into C. If 'self doInlining' is true, small method bodies are inlined to reduce procedure call overhead. On the PPC, this results in a factor of three speedup with only 30% increase in code size. Subclasses can use specialised versions of CCodeGenerator and interpreterClass." | cg vmHeaderContents | cg := [self buildCodeGeneratorForInterpreter] on: Notification do: [:ex| ex tag == #getVMMaker ifTrue: [ex resume: self] ifFalse: [(ex respondsTo: #rearmHandlerDuring:) ifTrue: [ex rearmHandlerDuring: [ex pass]] ifFalse: [ex pass]]]. self needsToRegenerateInterpreterFile ifFalse: [^nil]. cg removeUnneededBuiltins. self interpreterClass preGenerationHook: cg. + cg inferTypesForImplicitlyTypedVariablesAndMethods. + vmHeaderContents := cg vmHeaderContentsWithBytesPerWord: self wordSize. (cg needToGenerateHeader: self interpreterHeaderName file: self interpreterHeaderPath contents: vmHeaderContents) ifTrue: [cg storeHeaderOnFile: self interpreterHeaderPath contents: vmHeaderContents]. cg storeCodeOnFile: (self sourceFilePathFor: self interpreterClass sourceFileName) doInlining: self doInlining. self interpreterClass additionalHeadersDo: [:headerName :headerContents| | filePath | filePath := self coreVMDirectory fullNameFor: headerName. (cg needToGenerateHeader: headerName file: filePath contents: headerContents) ifTrue: [cg storeHeaderOnFile: filePath contents: headerContents]]. self interpreterClass apiExportHeaderName ifNotNil: [cg storeAPIExportHeader: self interpreterClass apiExportHeaderName OnFile: (self sourceFilePathFor: self interpreterClass apiExportHeaderName)]. self gnuifyInterpreterFile! Item was added: + ----- Method: VMPluginCodeGenerator>>atLeastVMProxyMajor:minor: (in category 'C translation') ----- + atLeastVMProxyMajor: major minor: minor + ^String streamContents: + [:s| + s nextPutAll: 'VM_PROXY_MAJOR > '; print: major; + nextPutAll: ' || (VM_PROXY_MAJOR == '; print: major; + nextPutAll: ' && VM_PROXY_MINOR >= '; print: minor; + nextPutAll: ')']! Item was added: + ----- Method: VMPluginCodeGenerator>>compileToTMethodSelector:in: (in category 'utilities') ----- + compileToTMethodSelector: selector in: aClass + "Compile a method to a TMethod" + + | m | + m := (Compiler new + parse: (aClass sourceCodeAt: selector) + in: aClass + notifying: nil) + asTranslationMethodOfClass: self translationMethodClass. + m inferReturnTypeIn: self. + m returnType ifNil: + [m returnType: (self implicitReturnTypeFor: selector)]. + ^m! Item was added: + ----- Method: VMPluginCodeGenerator>>emitIfdefForPluginFunctionOption:on: (in category 'C translation') ----- + emitIfdefForPluginFunctionOption: anArray on: aStream + aStream nextPutAll: '#if '; nextPutAll: (self perform: anArray first withArguments: anArray allButFirst)! Item was changed: ----- Method: VMPluginCodeGenerator>>generateInterpreterProxyFunctionDeference:on:indent: (in category 'C translation') ----- generateInterpreterProxyFunctionDeference: aNode on: aStream indent: anInteger | pluginsToClone | (pluginsToClone := self pluginFunctionsToClone) isEmpty ifTrue: [^self]. aStream cr; nextPutAll: '#if !!defined(SQUEAK_BUILTIN_PLUGIN)'. pluginsToClone do: [:s| | cs | cs := self cFunctionNameFor: s. + self withOptionalVerbiageFor: s + on: aStream + do: [aStream crtab: anInteger; nextPutAll: cs; nextPutAll: ' = interpreterProxy->'; nextPutAll: cs; nextPut: $;] + ifOptionalDo: [aStream crtab: anInteger; nextPutAll: cs; nextPutAll: ' = 0;']]. - aStream crtab: anInteger; nextPutAll: cs; nextPutAll: ' = interpreterProxy->'; nextPutAll: cs; nextPut: $;]. aStream cr; nextPutAll: '#endif /* !!defined(SQUEAK_BUILTIN_PLUGIN) */'.! Item was changed: ----- Method: VMPluginCodeGenerator>>preDeclareInterpreterProxyOn: (in category 'C code generator') ----- preDeclareInterpreterProxyOn: aStream "Put the necessary #defines needed before interpreterProxy. Basically internal plugins use the VM's interpreterProxy variable and external plugins use their own. Override to keep local copies of all functions in external prims, and link directly in internal plugins." "| pcc | pcc := self new. (InterpreterProxy selectors reject: [:s| #(initialize private) includes: (InterpreterProxy whichCategoryIncludesSelector: s)]) do: [:s| pcc noteUsedPluginFunction: s]. pcc preDeclareInterpreterProxyOn: Transcript. Transcript flush" | pluginsToClone | (pluginsToClone := self pluginFunctionsToClone) isEmpty ifTrue: [^super preDeclareInterpreterProxyOn: aStream]. aStream cr; nextPutAll: '#if !!defined(SQUEAK_BUILTIN_PLUGIN)'; cr. pluginsToClone do: [:selector| | functionName | functionName := self cFunctionNameFor: selector. aStream nextPutAll: ((String streamContents: [:s| (self compileToTMethodSelector: selector in: InterpreterProxy) emitCFunctionPrototype: s generator: self]) copyReplaceAll: functionName with: '(*', functionName, ')'). aStream nextPut: $;; cr]. + aStream nextPutAll: '#else /* !!defined(SQUEAK_BUILTIN_PLUGIN) */'. - aStream nextPutAll: '#else /* !!defined(SQUEAK_BUILTIN_PLUGIN) */'; cr. pluginsToClone do: + [:selector| | m | + m := self compileToTMethodSelector: selector in: InterpreterProxy. + self withOptionalVerbiageFor: selector + on: aStream + do: [aStream cr; nextPutAll: 'extern '. + m static: false; emitCFunctionPrototype: aStream generator: self. + aStream nextPut: $;] + ifOptionalDo: + [aStream cr; nextPutAll: '# define '. + (TSendNode new + setSelector: selector + receiver: (TVariableNode new setName: 'interpreterProxy') + arguments: (m args collect: [:a| TVariableNode new setName: a])) + emitCCodeAsArgumentOn: aStream + level: 0 + generator: self. + aStream nextPutAll: ' 0']]. - [:selector| - aStream nextPutAll: 'extern '. - (self compileToTMethodSelector: selector in: InterpreterProxy) - static: false; - emitCFunctionPrototype: aStream generator: self. - aStream nextPut: $;; cr]. aStream cr; nextPutAll: 'extern'. aStream cr; nextPutAll: '#endif'; cr! Item was added: + ----- Method: VMPluginCodeGenerator>>withOptionalVerbiageFor:on:do:ifOptionalDo: (in category 'C translation') ----- + withOptionalVerbiageFor: selector on: aStream do: mainBlock ifOptionalDo: optionalBlock + (InterpreterProxy >> selector pragmaAt: #option:) + ifNil: + [mainBlock value] + ifNotNil: + [:pragma| + aStream cr. + self emitIfdefForPluginFunctionOption: pragma arguments first on: aStream. + mainBlock value. + aStream cr; nextPutAll: '#else'. + optionalBlock value. + aStream cr; nextPutAll: '#endif']! Item was changed: ----- Method: Win32VMMaker>>createCodeGenerator (in category 'initialize') ----- createCodeGenerator "Set up a CCodeGenerator for this VMMaker - On Windows we use the gcc 2.95.x compiler which does better without the global struct." + ^CCodeGeneratorGlobalStructure new + vmMaker: self; - ^CCodeGeneratorGlobalStructure new initialize; structDefDefine: '0'; "structDefDefine: 'defined(PPC) || defined(_POWER) || defined(__powerpc__) || defined(__ppc__)';" logger: logger; yourself!

1 0

VM Maker: VMMaker.oscog-eem.483.mcz
by commits＠source.squeak.org 30 Oct '13

30 Oct '13

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.483.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.483 Author: eem Time: 29 October 2013, 6:57:29.448 pm UUID: 2b2db56c-c062-41fe-81fa-f872365cde4f Ancestors: VMMaker.oscog-eem.482 Fix bug in eliminateAndFreeForwarders that forgot to free the last run of forwarded objects in the final sweep. =============== Diff against VMMaker.oscog-eem.482 =============== Item was changed: ----- Method: SpurMemoryManager>>eliminateAndFreeForwarders (in category 'gc - global') ----- eliminateAndFreeForwarders "As the final phase of global garbage collect, sweep the heap to follow forwarders, then free forwarders" | lowestForwarded firstForwarded lastForwarded | self assert: (self isForwarded: nilObj) not. self assert: (self isForwarded: falseObj) not. self assert: (self isForwarded: trueObj) not. self assert: (self isForwarded: hiddenRootsObj) not. (self isForwarded: specialObjectsOop) ifTrue: [specialObjectsOop := self followForwarded: specialObjectsOop]. scavenger followRememberedForwardersAndForgetFreeObjects. self doScavenge: TenureByAge. lowestForwarded := 0. "sweep, following forwarders in all live objects, and finding the first forwarder." self allOldSpaceObjectsDo: [:o| (self isForwarded: o) ifTrue: [lowestForwarded = 0 ifTrue: [lowestForwarded := o]] ifFalse: [0 to: (self numPointerSlotsOf: o) - 1 do: [:i| | f | f := self fetchPointer: i ofObject: o. (self isOopForwarded: f) ifTrue: [f := self followForwarded: f. self assert: ((self isImmediate: f) or: [self isYoung: f]) not. self storePointerUnchecked: i ofObject: o withValue: f]]]]. firstForwarded := lastForwarded := 0. "sweep from lowest forwarder, coalescing runs of forwarders." self allOldSpaceObjectsFrom: lowestForwarded do: [:o| (self isForwarded: o) ifTrue: [firstForwarded = 0 ifTrue: [firstForwarded := o]. lastForwarded := o] ifFalse: [firstForwarded ~= 0 ifTrue: [| start bytes | + start := self startOfObject: firstForwarded. + bytes := (self addressAfter: lastForwarded) - start. + self addFreeChunkWithBytes: bytes at: start]. + firstForwarded := 0]]. + firstForwarded ~= 0 ifTrue: + [| start bytes | + start := self startOfObject: firstForwarded. + bytes := (self addressAfter: lastForwarded) - start. + self addFreeChunkWithBytes: bytes at: start].! - start := self startOfObject: firstForwarded. - bytes := (self addressAfter: lastForwarded) - start. - self addFreeChunkWithBytes: bytes at: start]. - firstForwarded := 0]]!

1 0

VM Maker: VMMaker.oscog-eem.482.mcz
by commits＠source.squeak.org 30 Oct '13

30 Oct '13

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.482.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.482 Author: eem Time: 29 October 2013, 6:42:28.087 pm UUID: cb608c2f-ceb9-41c7-8785-5b451860535c Ancestors: VMMaker.oscog-eem.481 Integrate the mark phase of SpurMemMgr's global GC with the stack page tracing scheme. Refactor markAndTraceAndMaybeFreeStackPages: into markAndTraceUntracedReachableStackPages & freeUntracedStackPages to enable this. Add purging the remembered table and a final scavenge to eliminateAndFreeForwarders. Refactor the core scavenge invocation into doScavenge: to enable this. Fix StackInterpreter>>checkStackIntegrity which was tracing the instruction pointer. Change printing of leaks in checkStackIntegrity to include the FP. Add transcript output to the simulators to show global GC progress. Fix off-by-one bug in findSelectorOfMethod:. Fix printActivationNameFor:receiver:isBlock:firstTemporary: for anonymous methods (doits). =============== Diff against VMMaker.oscog-eem.481 =============== Item was changed: ----- Method: CoInterpreter>>checkStackIntegrity (in category 'object memory support') ----- checkStackIntegrity "Perform an integrity/leak check using the heapMap. Assume clearLeakMapAndMapAccesibleObjects has set a bit at each object's header. Scan all objects accessible from the stack checking that every pointer points to a header. Answer if no dangling pointers were detected." | ok | <inline: false> <var: #thePage type: #'StackPage *'> <var: #theSP type: #'char *'> <var: #theFP type: #'char *'> <var: #callerFP type: #'char *'> <var: #frameRcvrOffset type: #'char *'> <var: #cogMethod type: #'CogMethod *'> ok := true. 0 to: numStackPages - 1 do: [:i| | thePage theSP theFP frameRcvrOffset callerFP oop | thePage := stackPages stackPageAt: i. (stackPages isFree: thePage) ifFalse: [thePage = stackPage ifTrue: [theSP := stackPointer. theFP := framePointer] ifFalse: [theSP := thePage headSP. theFP := thePage headFP]. "Skip the instruction pointer on top of stack of inactive pages." thePage = stackPage ifFalse: [theSP := theSP + BytesPerWord]. [frameRcvrOffset := self frameReceiverOffset: theFP. [theSP <= frameRcvrOffset] whileTrue: [oop := stackPages longAt: theSP. ((objectMemory isNonImmediate: oop) and: [(self heapMapAtWord: (self pointerForOop: oop)) = 0]) ifTrue: + [self printFrameThing: 'object leak in frame temp' andFrame: theFP at: theSP. - [self printFrameThing: 'object leak in frame temp' at: theSP; cr. ok := false]. theSP := theSP + BytesPerWord]. (self frameHasContext: theFP) ifTrue: [oop := self frameContext: theFP. ((objectMemory isImmediate: oop) or: [(self heapMapAtWord: (self pointerForOop: oop)) = 0]) ifTrue: + [self printFrameThing: 'object leak in frame ctxt' andFrame: theFP at: theFP + FoxThisContext. - [self printFrameThing: 'object leak in frame ctxt' at: theFP + FoxThisContext; cr. ok := false]. (oop = objectMemory nilObject or: [objectMemory isContext: oop]) ifFalse: + [self printFrameThing: 'frame ctxt should be context' andFrame: theFP at: theFP + FoxThisContext. - [self printFrameThing: 'frame ctxt should be context' at: theFP + FoxThisContext; cr. ok := false]]. (self isMachineCodeFrame: theFP) ifTrue: [| cogMethod | cogMethod := self mframeHomeMethod: theFP. (self heapMapAtWord: (self pointerForOop: cogMethod)) = 0 ifTrue: + [self printFrameThing: 'object leak in mframe mthd' andFrame: theFP at: theFP + FoxMethod. - [self printFrameThing: 'object leak in mframe mthd' at: theFP + FoxMethod; cr. ok := false]] ifFalse: [oop := self iframeMethod: theFP. ((objectMemory isImmediate: oop) or: [(self heapMapAtWord: (self pointerForOop: oop)) = 0]) ifTrue: + [self printFrameThing: 'object leak in iframe mthd' andFrame: theFP at: theFP + FoxMethod. - [self printFrameThing: 'object leak in iframe mthd' at: theFP + FoxMethod; cr. ok := false]]. (callerFP := self frameCallerFP: theFP) ~= 0] whileTrue: [theSP := theFP + FoxCallerSavedIP + BytesPerWord. theFP := callerFP]. theSP := theFP + FoxCallerSavedIP + BytesPerWord. [theSP <= thePage baseAddress] whileTrue: [oop := stackPages longAt: theSP. ((objectMemory isNonImmediate: oop) and: [(self heapMapAtWord: (self pointerForOop: oop)) = 0]) ifTrue: + [self printFrameThing: 'object leak in frame arg' andFrame: theFP at: theSP. - [self printFrameThing: 'object leak in frame arg' at: theSP; cr. ok := false]. theSP := theSP + BytesPerWord]]]. ^ok! Item was added: + ----- Method: CogVMSimulator>>printFrameThing:andFrame:at: (in category 'debug printing') ----- + printFrameThing: name andFrame: theFP at: address + <var: #theFP type: #'char *'> + | it | + <inline: false> + <var: #name type: #'char *'> + <var: #address type: #'char *'> + it := stackPages longAt: address. + self printHex: address; + printChar: $:. + 1 to: 12 - (self strlen: name) do: [:i| self printChar: $ ]. + self print: name; + print: ': '; + printHex: it. + it ~= 0 ifTrue: + [self printChar: $=; printNum: it. + (it between: objectMemory startOfMemory and: objectMemory endOfMemory) ifFalse: + [(cogit lookupAddress: it) ifNotNil: + [:label| self space; printChar: $(; print: label; printChar: $)]]]. + self print: ' frame: '; printHex: theFP; cr! Item was added: + ----- Method: Spur32BitMMLECoSimulator>>eliminateAndFreeForwarders (in category 'gc - global') ----- + eliminateAndFreeForwarders + coInterpreter transcript nextPutAll: 'eliminating forwarders...'; flush. + ^super eliminateAndFreeForwarders! Item was added: + ----- Method: Spur32BitMMLECoSimulator>>freeUnmarkedObjectsNilUnmarkedWeaklingSlotsAndSortAndCoalesceFreeSpace (in category 'gc - global') ----- + freeUnmarkedObjectsNilUnmarkedWeaklingSlotsAndSortAndCoalesceFreeSpace + coInterpreter transcript nextPutAll: 'sweeping...'; flush. + ^super freeUnmarkedObjectsNilUnmarkedWeaklingSlotsAndSortAndCoalesceFreeSpace! Item was added: + ----- Method: Spur32BitMMLECoSimulator>>globalGarbageCollect (in category 'gc - global') ----- + globalGarbageCollect + self halt. + ^super globalGarbageCollect! Item was added: + ----- Method: Spur32BitMMLECoSimulator>>markObjects (in category 'gc - global') ----- + markObjects + coInterpreter transcript nextPutAll: 'marking...'; flush. + ^super markObjects! Item was added: + ----- Method: Spur32BitMMLESimulator>>bestFitCompact (in category 'compaction') ----- + bestFitCompact + coInterpreter transcript nextPutAll: 'compacting...'; flush. + ^super bestFitCompact! Item was added: + ----- Method: Spur32BitMMLESimulator>>eliminateAndFreeForwarders (in category 'gc - global') ----- + eliminateAndFreeForwarders + coInterpreter transcript nextPutAll: 'eliminating forwarders...'; flush. + ^super eliminateAndFreeForwarders! Item was added: + ----- Method: Spur32BitMMLESimulator>>freeUnmarkedObjectsNilUnmarkedWeaklingSlotsAndSortAndCoalesceFreeSpace (in category 'gc - global') ----- + freeUnmarkedObjectsNilUnmarkedWeaklingSlotsAndSortAndCoalesceFreeSpace + coInterpreter transcript nextPutAll: 'sweeping...'; flush. + ^super freeUnmarkedObjectsNilUnmarkedWeaklingSlotsAndSortAndCoalesceFreeSpace! Item was added: + ----- Method: Spur32BitMMLESimulator>>markObjects (in category 'gc - global') ----- + markObjects + coInterpreter transcript nextPutAll: 'marking...'; flush. + ^super markObjects! Item was added: + ----- Method: SpurGenerationScavenger>>followRememberedForwardersAndForgetFreeObjects (in category 'gc - global') ----- + followRememberedForwardersAndForgetFreeObjects + "Scan the remembered set. Follow any forwarded objects, + and remove free objects. This is for global scan-mark GC." + | index obj | + index := 0. + [index < rememberedSetSize] whileTrue: + [obj := rememberedSet at: index. + (manager isFreeObject: obj) "free; remove by overwriting with last element" + ifTrue: + [rememberedSetSize := rememberedSetSize - 1. + rememberedSet at: index put: (rememberedSet at: rememberedSetSize)] + ifFalse: + [(manager isForwarded: obj) ifTrue: + [obj := manager followForwarded: obj. + manager setIsRememberedOf: obj to: true. + rememberedSet at: index put: obj]. + index := index + 1]]! Item was changed: ----- Method: SpurMemoryManager>>copyAndForward:withBytes:toFreeChunk: (in category 'compaction') ----- copyAndForward: objOop withBytes: bytes toFreeChunk: freeChunk "Copy and forward objOop to freeChunk, the inner operation in exact and best fit compact." <inline: true> | startOfObj freeObj | startOfObj := self startOfObject: objOop. self mem: freeChunk cp: startOfObj y: bytes. freeObj := freeChunk + (objOop - startOfObj). + "leave it to followRememberedForwarders to remember..." + "(self isRemembered: objOop) ifTrue: + [scavenger remember: freeObj]." - "wait until the next scavenge to unremember o" - (self isRemembered: objOop) ifTrue: - [scavenger remember: freeObj]. self forward: objOop to: freeObj! Item was added: + ----- Method: SpurMemoryManager>>doScavenge: (in category 'gc - scavenging') ----- + doScavenge: tenuringCriterion + "The inner shell for scavenge, abstrascted out so globalGarbageCollect can use it." + + scavengeInProgress := true. + pastSpaceStart := scavenger scavenge: tenuringCriterion. + self assert: (self + oop: pastSpaceStart + isGreaterThanOrEqualTo: scavenger pastSpace start + andLessThanOrEqualTo: scavenger pastSpace limit). + freeStart := scavenger eden start. + self initSpaceForAllocationCheck: (self addressOf: scavenger eden). + scavengeInProgress := false! Item was changed: ----- Method: SpurMemoryManager>>eliminateAndFreeForwarders (in category 'gc - global') ----- eliminateAndFreeForwarders "As the final phase of global garbage collect, sweep the heap to follow forwarders, then free forwarders" | lowestForwarded firstForwarded lastForwarded | self assert: (self isForwarded: nilObj) not. self assert: (self isForwarded: falseObj) not. self assert: (self isForwarded: trueObj) not. self assert: (self isForwarded: hiddenRootsObj) not. (self isForwarded: specialObjectsOop) ifTrue: [specialObjectsOop := self followForwarded: specialObjectsOop]. + scavenger followRememberedForwardersAndForgetFreeObjects. + self doScavenge: TenureByAge. lowestForwarded := 0. + "sweep, following forwarders in all live objects, and finding the first forwarder." self allOldSpaceObjectsDo: [:o| (self isForwarded: o) ifTrue: [lowestForwarded = 0 ifTrue: [lowestForwarded := o]] ifFalse: [0 to: (self numPointerSlotsOf: o) - 1 do: [:i| | f | f := self fetchPointer: i ofObject: o. (self isOopForwarded: f) ifTrue: [f := self followForwarded: f. self assert: ((self isImmediate: f) or: [self isYoung: f]) not. self storePointerUnchecked: i ofObject: o withValue: f]]]]. firstForwarded := lastForwarded := 0. + "sweep from lowest forwarder, coalescing runs of forwarders." self allOldSpaceObjectsFrom: lowestForwarded do: [:o| (self isForwarded: o) ifTrue: [firstForwarded = 0 ifTrue: [firstForwarded := o]. lastForwarded := o] ifFalse: [firstForwarded ~= 0 ifTrue: [| start bytes | start := self startOfObject: firstForwarded. bytes := (self addressAfter: lastForwarded) - start. self addFreeChunkWithBytes: bytes at: start]. firstForwarded := 0]]! Item was changed: ----- Method: SpurMemoryManager>>markAccessibleObjects (in category 'gc - global') ----- markAccessibleObjects self assert: self validClassTableRootPages. self assert: segmentManager allBridgesMarked. marking := true. self cCode: [] "for debugging markAndTrace: set (MarkStackRecord := OrderedCollection new)" inSmalltalk: [MarkStackRecord ifNotNil: [MarkStackRecord resetTo: 1]]. self markAndTraceObjStack: self markStack andContents: false. self assert: self validClassTableRootPages. self markAndTraceObjStack: self ephemeronQueue andContents: true. self assert: self validClassTableRootPages. + coInterpreter markAndTraceInterpreterOops: true. self markAndTrace: self freeListsObj. self markAndTrace: hiddenRootsObj. self markAndTrace: self specialObjectsOop. - coInterpreter markAndTraceInterpreterOops: true. self markAndFireEphemerons. marking := false! Item was changed: ----- Method: SpurMemoryManager>>markAndFireEphemerons (in category 'gc - global') ----- markAndFireEphemerons <returnTypeC: #void> "After the initial scan-mark is complete ephemerons can be processed." + [coInterpreter markAndTraceUntracedReachableStackPages. + self noUnscannedEphemerons ifTrue: - [self noUnscannedEphemerons ifTrue: [^self]. self markInactiveEphemerons ifFalse: [self fireAllUnscannedEphemerons]. self markAllUnscannedEphemerons] repeat! Item was changed: ----- Method: SpurMemoryManager>>numStrongSlotsOf:ephemeronInactiveIf: (in category 'object access') ----- numStrongSlotsOf: objOop ephemeronInactiveIf: criterion "Answer the number of strong pointer fields in the given object. Works with CompiledMethods, as well as ordinary objects." <api> <var: 'criterion' declareC: 'int (*criterion)(sqInt key)'> <inline: true> <asmLabel: false> | fmt numSlots contextSize numLiterals | fmt := self formatOf: objOop. fmt <= self lastPointerFormat ifTrue: [numSlots := self numSlotsOf: objOop. fmt <= self arrayFormat ifTrue: [^numSlots]. fmt = self indexablePointersFormat ifTrue: [(self isContextNonImm: objOop) ifTrue: + [coInterpreter setTraceFlagOnContextsFramesPageIfNeeded: objOop. + "contexts end at the stack pointer" + contextSize := coInterpreter fetchStackPointerOf: objOop. + ^CtxtTempFrameStart + contextSize]. - ["contexts end at the stack pointer" - contextSize := coInterpreter fetchStackPointerOf: objOop. - ^CtxtTempFrameStart + contextSize]. ^numSlots]. fmt = self weakArrayFormat ifTrue: [^self fixedFieldsOfClass: (self fetchClassOfNonImm: objOop)]. self assert: fmt = self ephemeronFormat. ^(criterion isNil or: [self perform: criterion with: (self keyOfEphemeron: objOop)]) ifTrue: [numSlots] ifFalse: [0]]. fmt = self forwardedFormat ifTrue: [^1]. fmt < self firstCompiledMethodFormat ifTrue: [^0]. "no pointers" "CompiledMethod: contains both pointers and bytes" numLiterals := coInterpreter literalCountOf: objOop. ^numLiterals + LiteralStart! Item was changed: ----- Method: SpurMemoryManager>>scavengingGCTenuringIf: (in category 'gc - scavenging') ----- scavengingGCTenuringIf: tenuringCriterion "Run the scavenger." self assert: remapBufferCount = 0. self assert: (segmentManager numSegments = 0 "true in the spur image bootstrap" or: [scavenger eden limit - freeStart > coInterpreter interpreterAllocationReserveBytes]). self checkFreeSpace. "coInterpreter printCallStackFP: coInterpreter framePointer" self runLeakCheckerForFullGC: false. coInterpreter preGCAction: GCModeScavenge; "would prefer this to be in mapInterpreterOops, but compatibility with ObjectMemory dictates it goes here." flushMethodCacheFrom: startOfMemory to: newSpaceLimit. needGCFlag := false. gcStartUsecs := coInterpreter ioUTCMicrosecondsNow. + self doScavenge: tenuringCriterion. - scavengeInProgress := true. - pastSpaceStart := scavenger scavenge: tenuringCriterion. - self assert: (self - oop: pastSpaceStart - isGreaterThanOrEqualTo: scavenger pastSpace start - andLessThanOrEqualTo: scavenger pastSpace limit). - freeStart := scavenger eden start. - self initSpaceForAllocationCheck: (self addressOf: scavenger eden). - scavengeInProgress := false. statScavenges := statScavenges + 1. statGCEndUsecs := coInterpreter ioUTCMicrosecondsNow. statSGCDeltaUsecs := statGCEndUsecs - gcStartUsecs. statScavengeGCUsecs := statScavengeGCUsecs + statSGCDeltaUsecs. statRootTableCount := scavenger rememberedSetSize. coInterpreter postGCAction: GCModeScavenge. self runLeakCheckerForFullGC: false. self checkFreeSpace! Item was changed: ----- Method: StackInterpreter>>checkStackIntegrity (in category 'object memory support') ----- checkStackIntegrity "Perform an integrity/leak check using the heapMap. Assume clearLeakMapAndMapAccesibleObjects has set a bit at each object's header. Scan all objects accessible from the stack checking that every pointer points to a header. Answer if no dangling pointers were detected." | ok | <inline: false> <var: #thePage type: #'StackPage *'> <var: #theSP type: #'char *'> <var: #theFP type: #'char *'> <var: #callerFP type: #'char *'> ok := true. 0 to: numStackPages - 1 do: [:i| | thePage theSP theFP callerFP oop | thePage := stackPages stackPageAt: i. (stackPages isFree: thePage) ifFalse: [thePage = stackPage ifTrue: [theSP := stackPointer. theFP := framePointer] ifFalse: [theSP := thePage headSP. theFP := thePage headFP]. "Skip the instruction pointer on top of stack of inactive pages." thePage = stackPage ifFalse: [theSP := theSP + BytesPerWord]. [[theSP <= (theFP + FoxReceiver)] whileTrue: [oop := stackPages longAt: theSP. ((objectMemory isNonImmediate: oop) and: [(self heapMapAtWord: (self pointerForOop: oop)) = 0]) ifTrue: + [self printFrameThing: 'object leak in frame temp' andFrame: theFP at: theSP. - [self printFrameThing: 'object leak in frame temp' at: theSP; cr. ok := false]. theSP := theSP + BytesPerWord]. (self frameHasContext: theFP) ifTrue: [oop := self frameContext: theFP. ((objectMemory isImmediate: oop) or: [(self heapMapAtWord: (self pointerForOop: oop)) = 0]) ifTrue: + [self printFrameThing: 'object leak in frame ctxt' andFrame: theFP at: theFP + FoxThisContext. - [self printFrameThing: 'object leak in frame ctxt' at: theFP + FoxThisContext; cr. ok := false]. (objectMemory isContext: oop) ifFalse: + [self printFrameThing: 'frame ctxt should be context' andFrame: theFP at: theFP + FoxThisContext. - [self printFrameThing: 'frame ctxt should be context' at: theFP + FoxThisContext; cr. ok := false]]. oop := self frameMethod: theFP. ((objectMemory isImmediate: oop) or: [(self heapMapAtWord: (self pointerForOop: oop)) = 0]) ifTrue: + [self printFrameThing: 'object leak in frame mthd' andFrame: theFP at: theFP + FoxMethod. - [self printFrameThing: 'object leak in frame mthd' at: theFP + FoxMethod; cr. ok := false]. (callerFP := self frameCallerFP: theFP) ~= 0] whileTrue: [theSP := theFP + FoxCallerSavedIP + BytesPerWord. theFP := callerFP]. + theSP := theFP + FoxCallerSavedIP + BytesPerWord. - theSP := theFP + FoxCallerContext "a.k.a. FoxCallerSavedIP". [theSP <= thePage baseAddress] whileTrue: [oop := stackPages longAt: theSP. ((objectMemory isNonImmediate: oop) and: [(self heapMapAtWord: (self pointerForOop: oop)) = 0]) ifTrue: + [self printFrameThing: 'object leak in frame arg' andFrame: theFP at: theSP. - [self printFrameThing: 'object leak in frame arg' at: theSP; cr. ok := false]. theSP := theSP + BytesPerWord]]]. ^ok! Item was changed: ----- Method: StackInterpreter>>findSelectorOfMethod: (in category 'debug support') ----- findSelectorOfMethod: methArg | meth classObj classDict classDictSize methodArray i | (objectMemory addressCouldBeObj: methArg) ifFalse: [^objectMemory nilObject]. (objectMemory isForwarded: methArg) ifTrue: [meth := objectMemory followForwarded: methArg] ifFalse: [meth := methArg]. (objectMemory isOopCompiledMethod: meth) ifFalse: [^objectMemory nilObject]. classObj := self methodClassOf: meth. (self addressCouldBeClassObj: classObj) ifTrue: [classDict := objectMemory fetchPointer: MethodDictionaryIndex ofObject: classObj. classDictSize := objectMemory fetchWordLengthOf: classDict. methodArray := objectMemory fetchPointer: MethodArrayIndex ofObject: classDict. i := 0. + [i < (classDictSize - SelectorStart)] whileTrue: - [i <= (classDictSize - SelectorStart)] whileTrue: [meth = (objectMemory fetchPointer: i ofObject: methodArray) ifTrue: [^(objectMemory fetchPointer: i + SelectorStart ofObject: classDict)]. i := i + 1]]. ^objectMemory nilObject! Item was added: + ----- Method: StackInterpreter>>freeUntracedStackPages (in category 'object memory support') ----- + freeUntracedStackPages + "Free any untraced stack pages." + <var: #thePage type: #'StackPage *'> + <inline: false> + + 0 to: numStackPages - 1 do: + [:i| | thePage | + thePage := stackPages stackPageAt: i. + ((stackPages isFree: thePage) not + and: [thePage trace = 0]) ifTrue: + [self assert: (self noMarkedContextsOnPage: thePage). + stackPages freeStackPage: thePage]. + self assert: (thePage trace: -1) ~= 0] "Invalidate the trace state for assertion checks"! Item was changed: ----- Method: StackInterpreter>>markAndTraceAndMaybeFreeStackPages: (in category 'object memory support') ----- markAndTraceAndMaybeFreeStackPages: fullGCFlag "Read markAndTraceStackPages:'s comment. Finish tracing to-be-traced pages. Then free any untraced pages." - | thePage foundToBeTracedPage | <var: #thePage type: #'StackPage *'> <inline: false> fullGCFlag ifFalse: [0 to: numStackPages - 1 do: + [:i| | thePage | - [:i| thePage := stackPages stackPageAt: i. self assert: (thePage trace: -1) ~= 0]. "Invalidate the trace state for assertion checks" ^nil]. - [foundToBeTracedPage := false. - 0 to: numStackPages - 1 do: - [:i| - thePage := stackPages stackPageAt: i. - ((stackPages isFree: thePage) not - and: [thePage trace = 1]) ifTrue: - [foundToBeTracedPage := true. - thePage trace: 2. - self markAndTraceStackPage: thePage]]. - foundToBeTracedPage] whileTrue. + self markAndTraceUntracedReachableStackPages. + self freeUntracedStackPages! - 0 to: numStackPages - 1 do: - [:i| - thePage := stackPages stackPageAt: i. - ((stackPages isFree: thePage) not - and: [thePage trace = 0]) ifTrue: - [self assert: (self noMarkedContextsOnPage: thePage). - stackPages freeStackPage: thePage]. - self assert: (thePage trace: -1) ~= 0] "Invalidate the trace state for assertion checks"! Item was added: + ----- Method: StackInterpreter>>markAndTraceUntracedReachableStackPages (in category 'object memory support') ----- + markAndTraceUntracedReachableStackPages + "Trace any untraced pages" + | thePage foundToBeTracedPage | + <var: #thePage type: #'StackPage *'> + <inline: false> + + [foundToBeTracedPage := false. + 0 to: numStackPages - 1 do: + [:i| + thePage := stackPages stackPageAt: i. + ((stackPages isFree: thePage) not + and: [thePage trace = 1]) ifTrue: + [foundToBeTracedPage := true. + thePage trace: 2. + self markAndTraceStackPage: thePage]]. + foundToBeTracedPage] whileTrue! Item was changed: ----- Method: StackInterpreter>>printActivationNameFor:receiver:isBlock:firstTemporary: (in category 'debug printing') ----- printActivationNameFor: aMethod receiver: anObject isBlock: isBlock firstTemporary: maybeMessage | methClass methodSel classObj | <inline: false> isBlock ifTrue: [self print: '[] in ']. methClass := self findClassOfMethod: aMethod forReceiver: anObject. methodSel := self findSelectorOfMethod: aMethod. ((objectMemory addressCouldBeOop: anObject) and: [(objectMemory isOopForwarded: anObject) not and: [self addressCouldBeClassObj: (classObj := objectMemory fetchClassOf: anObject)]]) ifTrue: + [(classObj = methClass or: [methClass isNil "i.e. doits"]) + ifTrue: [self printNameOfClass: classObj count: 5] - [classObj = methClass - ifTrue: [self printNameOfClass: methClass count: 5] ifFalse: [self printNameOfClass: classObj count: 5. self print: '('. self printNameOfClass: methClass count: 5. self print: ')']] ifFalse: [self cCode: '' inSmalltalk: [self halt]. self print: 'INVALID RECEIVER']. self print: '>'. (objectMemory addressCouldBeOop: methodSel) ifTrue: [methodSel = objectMemory nilObject ifTrue: [self print: '?'] ifFalse: [self printStringOf: methodSel]] ifFalse: [self print: 'INVALID SELECTOR']. (methodSel = (objectMemory splObj: SelectorDoesNotUnderstand) and: [(objectMemory addressCouldBeObj: maybeMessage) + and: [(objectMemory fetchClassOfNonImm: maybeMessage) = (objectMemory splObj: ClassMessage)]]) ifTrue: - and: [(objectMemory fetchClassOf: maybeMessage) = (objectMemory splObj: ClassMessage)]]) ifTrue: ["print arg message selector" methodSel := objectMemory fetchPointer: MessageSelectorIndex ofObject: maybeMessage. self print: ' '. self printStringOf: methodSel]! Item was added: + ----- Method: StackInterpreter>>printFrameThing:andFrame:at: (in category 'debug printing') ----- + printFrameThing: name andFrame: theFP at: address + <var: #theFP type: #'char *'> + | it len | + <inline: false> + <var: #name type: #'char *'> + <var: #address type: #'char *'> + it := stackPages longAt: address. + self printHexPtr: address; + printChar: $:. + len := self strlen: name. + 1 to: 12 - len do: [:i| self space]. + self print: name; + print: ': '; + printHex: it. + it ~= 0 ifTrue: + [self printChar: $=. + it = objectMemory nilObject + ifTrue: [self print: 'nil'] + ifFalse: + [self printNum: it]]. + self print: ' frame: '; printHex: theFP; cr! Item was added: + ----- Method: StackInterpreterSimulator>>printFrameThing:andFrame:at: (in category 'debug printing') ----- + printFrameThing: name andFrame: theFP at: address + <var: #theFP type: #'char *'> + | it | + <inline: false> + <var: #name type: #'char *'> + <var: #address type: #'char *'> + it := stackPages longAt: address. + self printHex: address; + printChar: $/; + printNum: (stackPages memIndexFor: address); + printChar: $:. + 1 to: 12 - (self strlen: name) do: [:i| self printChar: $ ]. + self print: name; + print: ': '; + printHex: it. + it ~= 0 ifTrue: + [self printChar: $=; printNum: it]. + self print: ' frame: '; printHex: theFP; cr!

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 October 2013