Vm-dev May 2012

vm-dev@lists.squeakfoundation.org

37 participants
74 discussions

[Vm-dev] OSProcessPlugin: VMConstruction-Plugins-OSProcessPlugin.oscog-eem.35.mcz
by squeak-dev-noreply＠lists.squeakfoundation.org 04 May '12

04 May '12

Eliot Miranda uploaded a new version of VMConstruction-Plugins-OSProcessPlugin to project OSProcessPlugin: http://www.squeaksource.com/OSProcessPlugin/VMConstruction-Plugins-OSProces… ==================== Summary ==================== Name: VMConstruction-Plugins-OSProcessPlugin.oscog-eem.35 Author: eem Time: 4 May 2012, 8:54:58 am UUID: 15acec73-e0e7-4cc0-a521-1c4204a4b5b7 Ancestors: VMConstruction-Plugins-OSProcessPlugin.oscog-eem.34 Merge changes from VMConstruction-Plugins-OSProcessPlugin-dtl.35

1 0

[Vm-dev] OSProcessPlugin: VMConstruction-Plugins-OSProcessPlugin-dtl.35.mcz
by squeak-dev-noreply＠lists.squeakfoundation.org 04 May '12

04 May '12

Dave Lewis uploaded a new version of VMConstruction-Plugins-OSProcessPlugin to project OSProcessPlugin: http://www.squeaksource.com/OSProcessPlugin/VMConstruction-Plugins-OSProces… ==================== Summary ==================== Name: VMConstruction-Plugins-OSProcessPlugin-dtl.35 Author: dtl Time: 3 May 2012, 10:37:36 am UUID: 1b11f141-e2ad-407c-8f7c-65a83faad075 Ancestors: VMConstruction-Plugins-OSProcessPlugin-dtl.34 OSProcessPlugin 4.4.11 Fix bug in UnixOSProcessPlugin>>primitiveChdir, was answering errno on success and nil on failure, should be the reverse. Bug has been present since at least 2006. Thanks Damien Cassou for finding the bug.

3 2

A simple getenv primitive
by Damien Cassou 03 May '12

03 May '12

Hi, I can't find any getenv primitive that would allow me to access environment an variable value from its name. This could be really helpful to get the HOME directory for example. Does one such primitive exist? If not, why? It looks trivial to implement for linux, and it is potentially also easy on Windows and Mac OS. I'm willing to try if necessary. Thank you -- Damien Cassou http://damiencassou.seasidehosting.st "Lambdas are relegated to relative obscurity until Java makes them popular by not having them." James Iry

2 2

Re: [Pharo-project] problem with tempNamed: in Pharo 2.0
by Eliot Miranda 03 May '12

03 May '12

On Tue, May 1, 2012 at 9:13 AM, Mariano Martinez Peck <marianopeck(a)gmail.com > wrote: > > > On Tue, May 1, 2012 at 6:09 PM, Mariano Martinez Peck < > marianopeck(a)gmail.com> wrote: > >> Hi guys. I noticed stef did this issue: >> http://code.google.com/p/pharo/issues/detail?id=5642 >> However, now I have the following test that fails in Pharo 2.0 but works >> fine in 1.4: >> >> | string context | >> string := 'test'. >> context := [self class. string asUppercase] asContext. >> self assert: (context tempNamed: 'string') = 'test' >> >> the current implementation of #tempNamed: is: >> >> tempNamed: aName >> "Returns the value of the temporaries, aName." >> "Implementation notes: temporary initialization in blocks simply uses >> pushNil to allocate and initialize each temp. So if one inspects [|a|a:=2] >> and sends it self method symbolic you get: >> >> 13 <8F 00 00 05> closureNumCopied: 0 numArgs: 0 bytes 17 to 21 >> 17 <73> pushConstant: nil >> 18 <77> pushConstant: 2 >> 19 <81 40> storeIntoTemp: 0 >> 21 <7D> blockReturn >> 22 <7C> returnTop >> >> And when we check self asContext pc we get 17, which is *before* the >> nil is pushed. Therefore we should pay attention when querying a temporary >> if the temporary allocation was executed." >> >> | index | >> index := (self tempNames indexOf: aName). >> ^ index >= stackp >> > > > Maybe the solution is to use #> rather than #>= ? > right. But tempNames is fundamentally broken for closures. It does not answer temps in indirection vectors. That is the whole point of schematicTempNamesString; it gives the topology of temps in a method. e.g. (where => means printIt returns...) (Collection>>#inject:into:) methodNode schematicTempNamesString => 'thisValue binaryBlock (nextValue)[each binaryBlock (nextValue)]' This says that a) at method level there are three temps, thisValue, binaryBlock and an indirection vector, and in the indirection vector is one temp named nextValue. b) in the block in inject:into: there are three temps, each (the argument), binaryBlock and an indirection vector, and in that indirection vector is a temp named nextValue. This is all orchestrated by DebuggerMethodMap, so that aContext method debuggerMap tempNamesForContext: aContext answers a list of the flattened temp names in a context (flattening out indirection vectors) and for the above would answer either #('thisValue' 'binaryBlock' 'nextValue') or #('each' 'binaryBlock' 'nextValue'), and | map | map := aContext method debuggerMap. map namedTempAt: ((map tempNamesForContext: aContext) indexOf: aTempName) in: aContext gets the temp from the unflattened temps in a context. This is how the debugger accesses temp names. So you need to throw away the broken tempName: implementation and use DebuggerMethodMap or some parse over schematicTempNamesString, because *with closures temps are not simply at contiguous offsets on the stack*. Make sense? Now, one good way to understand this is through examples. inject:into: is the canonical simple example I've used for years. But we can find more complex examples that may help. So this query looks for all methods that contain a bytecode to create an indirection vector with 2 or more elements: SystemNavigation new browseAllSelect: [:m| | is | is := InstructionStream on: m. is scanFor: [:b| b = 138 and: [is followingByte between: 2 and: 127]]] and the simplest example in a trunk 4.3 image I find is: Bag>>sum "Faster than the superclass implementation when you hold many instances of the same value (which you probably do, otherwise you wouldn't be using a Bag)." | sum first | first := true. contents keysAndValuesDo: [ :value :count | first ifTrue: [ sum := value * count. first := false ] ifFalse: [ sum := sum + (value * count) ] ]. first ifTrue: [ self errorEmptyCollection ]. ^sum which needs a two-element indirection vector because the block [ :value :count |...] assigns to both sum and first. Hence (Bag>>#sum) methodNode schematicTempNamesString => '(sum first)[value count (sum first)]' So in an activation of Bag>>sum the value of first is (sumContext tempAt: 1) at: 2 (cuz tempAt: 1 is the indirection vector represented as (sum first) in schematic temps, and first is the second element. But in an activation of the block in Bag>>sum the value of first is (sumBlockContext tempAt: 3) at: 2. I can keep repeating myself until I'm blue in the face, but y'all have to put in the effort to understand this simple scheme. Temps that are modified after they are closed-over end up in indirection vectors. > > >> ifTrue: [ nil] >> ifFalse: [self tempAt: (self tempNames indexOf: aName)] >> >> >> and previously it was: >> >> tempNamed: aName >> ^self tempAt: (self tempNames indexOf: aName) >> >> >> ideas? >> >> >> -- >> Mariano >> http://marianopeck.wordpress.com >> >> > > > -- > Mariano > http://marianopeck.wordpress.com > > -- best, Eliot

2 7

[commit] r2552 - CogVM source as per VMMakerr.oscog-eem.159
by commits＠squeakvm.org 03 May '12

03 May '12

Author: eliot Date: 2012-05-02 16:13:02 -0700 (Wed, 02 May 2012) New Revision: 2552 Removed: branches/Cog/platforms/Mac OS/plugins/Mpeg3Plugin/sqMacFileBits.c branches/Cog/platforms/Mac OS/plugins/Mpeg3Plugin/sqMacFileBits.h Modified: branches/Cog/macbuild/Mpeg3Plugin/Mpeg3Plugin.xcodeproj/project.pbxproj branches/Cog/nscogsrc/plugins/JPEGReadWriter2Plugin/JPEGReadWriter2Plugin.c branches/Cog/nscogsrc/plugins/JPEGReaderPlugin/JPEGReaderPlugin.c branches/Cog/nscogsrc/plugins/Matrix2x3Plugin/Matrix2x3Plugin.c branches/Cog/nscogsrc/vm/cogit.c branches/Cog/nscogsrc/vm/cogit.h branches/Cog/nscogsrc/vm/cogmethod.h branches/Cog/nscogsrc/vm/cointerp.c branches/Cog/nscogsrc/vm/cointerp.h branches/Cog/nscogsrc/vm/gcc3x-cointerp.c branches/Cog/nscogsrc/vm/interp.h branches/Cog/nscogsrc/vm/vmCallback.h branches/Cog/platforms/Cross/vm/sqSCCSVersion.h branches/Cog/platforms/Mac OS/vm/sqMacEncoding.c branches/Cog/platforms/Mac OS/vm/sqMacMain.c branches/Cog/platforms/Mac OS/vm/sqMacUIEventsUniversal.c branches/Cog/platforms/unix/plugins/SocketPlugin/sqUnixSocket.c branches/Cog/platforms/unix/vm/sqUnixMain.c branches/Cog/src/plugins/ADPCMCodecPlugin/ADPCMCodecPlugin.c branches/Cog/src/plugins/JPEGReadWriter2Plugin/JPEGReadWriter2Plugin.c branches/Cog/src/plugins/JPEGReaderPlugin/JPEGReaderPlugin.c branches/Cog/src/plugins/Klatt/Klatt.c branches/Cog/src/plugins/Matrix2x3Plugin/Matrix2x3Plugin.c branches/Cog/src/plugins/Mpeg3Plugin/Mpeg3Plugin.c branches/Cog/src/plugins/SoundGenerationPlugin/SoundGenerationPlugin.c branches/Cog/src/plugins/SqueakFFIPrims/SqueakFFIPrims.c branches/Cog/src/vm/cogit.c branches/Cog/src/vm/cogit.h branches/Cog/src/vm/cogmethod.h branches/Cog/src/vm/cointerp.c branches/Cog/src/vm/cointerp.h branches/Cog/src/vm/cointerpmt.c branches/Cog/src/vm/cointerpmt.h branches/Cog/src/vm/gcc3x-cointerp.c branches/Cog/src/vm/gcc3x-cointerpmt.c branches/Cog/src/vm/interp.h branches/Cog/src/vm/vmCallback.h branches/Cog/stackbuild/macbuild/Mpeg3Plugin/Mpeg3Plugin.xcodeproj/project.pbxproj branches/Cog/stacksrc/vm/gcc3x-interp.c branches/Cog/stacksrc/vm/interp.c branches/Cog/stacksrc/vm/interp.h branches/Cog/stacksrc/vm/vmCallback.h Log: CogVM source as per VMMakerr.oscog-eem.159 Plugins: Fix ThreadedFFIPlugin's preambleCCode for Pharo's mingw config. Merge fix for JPEGReadWriter2Plugin (http://bugs.squeak.org/view.php?id=7691) Merge with VMMaker version s of plugins JPEGReaderPlugin, KlattSynthesizerPlugin Matrix2x3Plugin Mpeg3Plugin (and hence lose some support files) Fix limitation in platforms/unix/plugins/SocketPlugin/sqUnixSocket.c which could cause NetNameResolver localHostAddress to answer 0 (if host has a set hostname not being honoured by local DNS servers). Fix falls back to localhost. Fix shift-enclose on Mac by translating to shifted unicode via UCKeyTranslate. Allow unix & mac plats to write crash.log to current directory if compiled with CRASH_DUMP_IN_CWD. (still need to fix Win). Modified: branches/Cog/macbuild/Mpeg3Plugin/Mpeg3Plugin.xcodeproj/project.pbxproj =================================================================== --- branches/Cog/macbuild/Mpeg3Plugin/Mpeg3Plugin.xcodeproj/project.pbxproj 2012-04-24 17:25:08 UTC (rev 2551) +++ branches/Cog/macbuild/Mpeg3Plugin/Mpeg3Plugin.xcodeproj/project.pbxproj 2012-05-02 23:13:02 UTC (rev 2552) @@ -37,7 +37,6 @@ A2181C3810814EC700B8FC7A /* seek.c in Sources */ = {isa = PBXBuildFile; fileRef = A2181C0810814EC700B8FC7A /* seek.c */; }; A2181C3910814EC700B8FC7A /* slice.c in Sources */ = {isa = PBXBuildFile; fileRef = A2181C0910814EC700B8FC7A /* slice.c */; }; A2181C3A10814EC700B8FC7A /* vlc.c in Sources */ = {isa = PBXBuildFile; fileRef = A2181C0B10814EC700B8FC7A /* vlc.c */; }; - A2181C421081506400B8FC7A /* sqMacFileBits.c in Sources */ = {isa = PBXBuildFile; fileRef = A2181C401081506400B8FC7A /* sqMacFileBits.c */; }; A2181C46108150C800B8FC7A /* Mpeg3Plugin.c in Sources */ = {isa = PBXBuildFile; fileRef = A2181C45108150C800B8FC7A /* Mpeg3Plugin.c */; }; /* End PBXBuildFile section */ @@ -102,8 +101,6 @@ A2181C0A10814EC700B8FC7A /* slice.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = slice.h; sourceTree = "<group>"; }; A2181C0B10814EC700B8FC7A /* vlc.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = vlc.c; sourceTree = "<group>"; }; A2181C0C10814EC700B8FC7A /* vlc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = vlc.h; sourceTree = "<group>"; }; - A2181C401081506400B8FC7A /* sqMacFileBits.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = sqMacFileBits.c; path = "../../platforms/Mac OS/plugins/Mpeg3Plugin/sqMacFileBits.c"; sourceTree = SOURCE_ROOT; }; - A2181C411081506400B8FC7A /* sqMacFileBits.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = sqMacFileBits.h; path = "../../platforms/Mac OS/plugins/Mpeg3Plugin/sqMacFileBits.h"; sourceTree = SOURCE_ROOT; }; A2181C45108150C800B8FC7A /* Mpeg3Plugin.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = Mpeg3Plugin.c; path = ../../src/plugins/Mpeg3Plugin/Mpeg3Plugin.c; sourceTree = SOURCE_ROOT; }; A2181C491081511C00B8FC7A /* Mpeg3Plugin.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Mpeg3Plugin.h; path = ../../platforms/Cross/plugins/Mpeg3Plugin/Mpeg3Plugin.h; sourceTree = SOURCE_ROOT; }; /* End PBXFileReference section */ @@ -135,8 +132,6 @@ children = ( A2181C491081511C00B8FC7A /* Mpeg3Plugin.h */, A2181C45108150C800B8FC7A /* Mpeg3Plugin.c */, - A2181C401081506400B8FC7A /* sqMacFileBits.c */, - A2181C411081506400B8FC7A /* sqMacFileBits.h */, A2181BC610814EC700B8FC7A /* libmpeg */, A2181BC510814EA000B8FC7A /* config.h */, A2181BC410814E7000B8FC7A /* interp.h */, @@ -331,7 +326,6 @@ A2181C3810814EC700B8FC7A /* seek.c in Sources */, A2181C3910814EC700B8FC7A /* slice.c in Sources */, A2181C3A10814EC700B8FC7A /* vlc.c in Sources */, - A2181C421081506400B8FC7A /* sqMacFileBits.c in Sources */, A2181C46108150C800B8FC7A /* Mpeg3Plugin.c in Sources */, ); runOnlyForDeploymentPostprocessing = 0; Modified: branches/Cog/nscogsrc/plugins/JPEGReadWriter2Plugin/JPEGReadWriter2Plugin.c =================================================================== --- branches/Cog/nscogsrc/plugins/JPEGReadWriter2Plugin/JPEGReadWriter2Plugin.c 2012-04-24 17:25:08 UTC (rev 2551) +++ branches/Cog/nscogsrc/plugins/JPEGReadWriter2Plugin/JPEGReadWriter2Plugin.c 2012-05-02 23:13:02 UTC (rev 2552) @@ -1,9 +1,9 @@ /* Automatically generated by - SmartSyntaxPluginCodeGenerator VMMaker.oscog-eem.105 uuid: 79234f80-ee6a-404c-9e5c-2134e3b76463 + SmartSyntaxPluginCodeGenerator VMMaker.oscog-eem.159 uuid: cbf7f95a-6fe2-4578-898e-47afb8524be4 from - JPEGReadWriter2Plugin VMMaker.oscog-eem.105 uuid: 79234f80-ee6a-404c-9e5c-2134e3b76463 + JPEGReadWriter2Plugin VMMaker.oscog-eem.159 uuid: cbf7f95a-6fe2-4578-898e-47afb8524be4 */ -static char __buildInfo[] = "JPEGReadWriter2Plugin VMMaker.oscog-eem.105 uuid: 79234f80-ee6a-404c-9e5c-2134e3b76463 " __DATE__ ; +static char __buildInfo[] = "JPEGReadWriter2Plugin VMMaker.oscog-eem.159 uuid: cbf7f95a-6fe2-4578-898e-47afb8524be4 " __DATE__ ; @@ -38,6 +38,8 @@ /*** Constants ***/ +#define BytesPerWord 4 +#define MULTIPLEBYTECODESETS 0 /*** Function Prototypes ***/ @@ -68,9 +70,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "JPEGReadWriter2Plugin VMMaker.oscog-eem.105 (i)" + "JPEGReadWriter2Plugin VMMaker.oscog-eem.159 (i)" #else - "JPEGReadWriter2Plugin VMMaker.oscog-eem.105 (e)" + "JPEGReadWriter2Plugin VMMaker.oscog-eem.159 (e)" #endif ; @@ -291,7 +293,7 @@ sqInt dmv2; sqInt form; unsigned * formBits; - sqInt formBitsAsInt; + sqInt formBitsOops; sqInt formBitsSize; sqInt formDepth; sqInt formHeight; @@ -384,8 +386,7 @@ di; dmi; dmo; - formBits = ((unsigned *) (interpreterProxy->fetchPointerofObject(0, form))); - formBitsAsInt = interpreterProxy->fetchPointerofObject(0, form); + formBitsOops = interpreterProxy->fetchPointerofObject(0, form); /* Various parameter checks */ @@ -401,12 +402,13 @@ formHeight = ((j_decompress_ptr)aJPEGDecompressStruct)->image_height; pixPerWord = 32 / formDepth; formPitch = ((formWidth + (pixPerWord - 1)) / pixPerWord) * 4; - formBitsSize = interpreterProxy->byteSizeOf(formBitsAsInt); - interpreterProxy->success((interpreterProxy->isWordsOrBytes(formBitsAsInt)) + formBitsSize = interpreterProxy->byteSizeOf(formBitsOops); + interpreterProxy->success((interpreterProxy->isWordsOrBytes(formBitsOops)) && (formBitsSize == (formPitch * formHeight))); if (interpreterProxy->failed()) { return null; } + formBits = interpreterProxy->firstIndexableField(formBitsOops); sourceSize = interpreterProxy->stSizeOf(interpreterProxy->stackValue(3)); if (sourceSize == 0) { @@ -456,7 +458,7 @@ switch (formDepth) { case 32: - for(i = 0, j = 1; i < rowStride; i +=(pcinfo->out_color_components), j++) { + for(i = 0, j = 0; i < rowStride; i +=(pcinfo->out_color_components), j++) { formPix = (255 << 24) | (buffer[0][i+rOff] << 16) | (buffer[0][i+gOff] << 8) | buffer[0][i+bOff]; if (formPix == 0) formPix = 1; formBits [ ((pcinfo->output_scanline - 1) * (pcinfo->image_width)) + j ] = formPix; @@ -464,7 +466,7 @@ break; case 16: - for(i = 0, j = 1; i < rowStride; i +=(pcinfo->out_color_components*2), j++) { + for(i = 0, j = 0; i < rowStride; i +=(pcinfo->out_color_components*2), j++) { r1 = buffer[0][i+rOff]; r2 = buffer[0][i+rOff2]; g1 = buffer[0][i+gOff]; @@ -530,7 +532,7 @@ unsigned int destinationSize; sqInt form; unsigned * formBits; - sqInt formBitsAsInt; + sqInt formBitsOops; sqInt formBitsSize; sqInt formDepth; sqInt formHeight; @@ -584,8 +586,7 @@ j; formPix; destinationSize; - formBits = ((unsigned *) (interpreterProxy->fetchPointerofObject(0, form))); - formBitsAsInt = interpreterProxy->fetchPointerofObject(0, form); + formBitsOops = interpreterProxy->fetchPointerofObject(0, form); formWidth = interpreterProxy->fetchIntegerofObject(1, form); formHeight = interpreterProxy->fetchIntegerofObject(2, form); @@ -601,12 +602,13 @@ ; pixPerWord = 32 / formDepth; formPitch = ((formWidth + (pixPerWord - 1)) / pixPerWord) * 4; - formBitsSize = interpreterProxy->byteSizeOf(formBitsAsInt); - interpreterProxy->success((interpreterProxy->isWordsOrBytes(formBitsAsInt)) + formBitsSize = interpreterProxy->byteSizeOf(formBitsOops); + interpreterProxy->success((interpreterProxy->isWordsOrBytes(formBitsOops)) && (formBitsSize == (formPitch * formHeight))); if (interpreterProxy->failed()) { return null; } + formBits = interpreterProxy->firstIndexableField(formBitsOops); destinationSize = interpreterProxy->stSizeOf(interpreterProxy->stackValue(4)); pcinfo = (j_compress_ptr)aJPEGCompressStruct; @@ -641,7 +643,7 @@ while (pcinfo->next_scanline < pcinfo->image_height) { switch (formDepth) { case 32: - for(i = 0, j = 1; i < rowStride; i +=3, j++) { + for(i = 0, j = 0; i < rowStride; i +=3, j++) { formPix = formBits [ ((pcinfo->next_scanline) * formWidth) + j ]; buffer[0][i] = (formPix >> 16) & 255; buffer[0][i+1] = (formPix >> 8) & 255; @@ -649,7 +651,7 @@ } break; case 16: - for(i = 0, j = 1; i < rowStride; i +=6, j++) { + for(i = 0, j = 0; i < rowStride; i +=6, j++) { formPix = formBits [ ((pcinfo->next_scanline) * formWidth) / 2 + j ]; buffer[0][i] = (formPix >> 23) & 248; buffer[0][i+1] = (formPix >> 18) & 248; Modified: branches/Cog/nscogsrc/plugins/JPEGReaderPlugin/JPEGReaderPlugin.c =================================================================== --- branches/Cog/nscogsrc/plugins/JPEGReaderPlugin/JPEGReaderPlugin.c 2012-04-24 17:25:08 UTC (rev 2551) +++ branches/Cog/nscogsrc/plugins/JPEGReaderPlugin/JPEGReaderPlugin.c 2012-05-02 23:13:02 UTC (rev 2552) @@ -1,9 +1,9 @@ /* Automatically generated by - VMPluginCodeGenerator VMMaker.oscog-eem.105 uuid: 79234f80-ee6a-404c-9e5c-2134e3b76463 + VMPluginCodeGenerator VMMaker.oscog-eem.159 uuid: cbf7f95a-6fe2-4578-898e-47afb8524be4 from - JPEGReaderPlugin VMMaker.oscog-eem.105 uuid: 79234f80-ee6a-404c-9e5c-2134e3b76463 + JPEGReaderPlugin VMMaker.oscog-eem.159 uuid: cbf7f95a-6fe2-4578-898e-47afb8524be4 */ -static char __buildInfo[] = "JPEGReaderPlugin VMMaker.oscog-eem.105 uuid: 79234f80-ee6a-404c-9e5c-2134e3b76463 " __DATE__ ; +static char __buildInfo[] = "JPEGReaderPlugin VMMaker.oscog-eem.159 uuid: cbf7f95a-6fe2-4578-898e-47afb8524be4 " __DATE__ ; @@ -39,6 +39,7 @@ /*** Constants ***/ #define BlockWidthIndex 5 #define BlueIndex 2 +#define BytesPerWord 4 #define ConstBits 13 #define CurrentXIndex 0 #define CurrentYIndex 1 @@ -68,6 +69,7 @@ #define MCUBlockIndex 4 #define MCUWidthIndex 8 #define MinComponentSize 11 +#define MULTIPLEBYTECODESETS 0 #define Pass1Bits 2 #define Pass1Div 0x800 #define Pass2Div 0x40000 @@ -145,9 +147,9 @@ static sqInt jsReadLimit; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "JPEGReaderPlugin VMMaker.oscog-eem.105 (i)" + "JPEGReaderPlugin VMMaker.oscog-eem.159 (i)" #else - "JPEGReaderPlugin VMMaker.oscog-eem.105 (e)" + "JPEGReaderPlugin VMMaker.oscog-eem.159 (e)" #endif ; static int *residuals; @@ -171,7 +173,7 @@ sqInt i; sqInt max; - if ((oop & 1)) { + if (interpreterProxy->isIntegerObject(oop)) { return 0; } if (!(interpreterProxy->isPointers(oop))) { @@ -181,7 +183,7 @@ return 0; } arrayOop = interpreterProxy->fetchPointerofObject(MCUBlockIndex, oop); - if ((arrayOop & 1)) { + if (interpreterProxy->isIntegerObject(arrayOop)) { return 0; } if (!(interpreterProxy->isPointers(arrayOop))) { @@ -193,7 +195,7 @@ } for (i = 0; i <= (max - 1); i += 1) { blockOop = interpreterProxy->fetchPointerofObject(i, arrayOop); - if ((blockOop & 1)) { + if (interpreterProxy->isIntegerObject(blockOop)) { return 0; } if (!(interpreterProxy->isWords(blockOop))) { @@ -210,7 +212,7 @@ static sqInt colorComponentfrom(int *aColorComponent, sqInt oop) { - if ((oop & 1)) { + if (interpreterProxy->isIntegerObject(oop)) { return 0; } if (!(interpreterProxy->isPointers(oop))) { @@ -802,7 +804,7 @@ return 0; } oop = interpreterProxy->fetchPointerofObject(0, streamOop); - if ((oop & 1)) { + if (interpreterProxy->isIntegerObject(oop)) { return 0; } if (!(interpreterProxy->isBytes(oop))) { Modified: branches/Cog/nscogsrc/plugins/Matrix2x3Plugin/Matrix2x3Plugin.c =================================================================== --- branches/Cog/nscogsrc/plugins/Matrix2x3Plugin/Matrix2x3Plugin.c 2012-04-24 17:25:08 UTC (rev 2551) +++ branches/Cog/nscogsrc/plugins/Matrix2x3Plugin/Matrix2x3Plugin.c 2012-05-02 23:13:02 UTC (rev 2552) @@ -1,9 +1,9 @@ /* Automatically generated by - VMPluginCodeGenerator VMMaker.oscog-eem.105 uuid: 79234f80-ee6a-404c-9e5c-2134e3b76463 + VMPluginCodeGenerator VMMaker.oscog-eem.159 uuid: cbf7f95a-6fe2-4578-898e-47afb8524be4 from - Matrix2x3Plugin VMMaker.oscog-eem.105 uuid: 79234f80-ee6a-404c-9e5c-2134e3b76463 + Matrix2x3Plugin VMMaker.oscog-eem.159 uuid: cbf7f95a-6fe2-4578-898e-47afb8524be4 */ -static char __buildInfo[] = "Matrix2x3Plugin VMMaker.oscog-eem.105 uuid: 79234f80-ee6a-404c-9e5c-2134e3b76463 " __DATE__ ; +static char __buildInfo[] = "Matrix2x3Plugin VMMaker.oscog-eem.159 uuid: cbf7f95a-6fe2-4578-898e-47afb8524be4 " __DATE__ ; @@ -37,6 +37,8 @@ /*** Constants ***/ +#define BytesPerWord 4 +#define MULTIPLEBYTECODESETS 0 /*** Function Prototypes ***/ @@ -74,9 +76,9 @@ static double m23ResultY; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "Matrix2x3Plugin VMMaker.oscog-eem.105 (i)" + "Matrix2x3Plugin VMMaker.oscog-eem.159 (i)" #else - "Matrix2x3Plugin VMMaker.oscog-eem.105 (e)" + "Matrix2x3Plugin VMMaker.oscog-eem.159 (e)" #endif ; @@ -142,25 +144,25 @@ return interpreterProxy->primitiveFail(); } oop = interpreterProxy->fetchPointerofObject(0, point); - isInt = (oop & 1); + isInt = interpreterProxy->isIntegerObject(oop); if (!(isInt || (interpreterProxy->isFloatObject(oop)))) { return interpreterProxy->primitiveFail(); } if (isInt) { - m23ArgX = (oop >> 1); + m23ArgX = interpreterProxy->integerValueOf(oop); } else { m23ArgX = interpreterProxy->floatValueOf(oop); } oop = interpreterProxy->fetchPointerofObject(1, point); - isInt = (oop & 1); + isInt = interpreterProxy->isIntegerObject(oop); if (!(isInt || (interpreterProxy->isFloatObject(oop)))) { return interpreterProxy->primitiveFail(); } if (isInt) { - m23ArgY = (oop >> 1); + m23ArgY = interpreterProxy->integerValueOf(oop); } else { m23ArgY = interpreterProxy->floatValueOf(oop); Modified: branches/Cog/nscogsrc/vm/cogit.c =================================================================== --- branches/Cog/nscogsrc/vm/cogit.c 2012-04-24 17:25:08 UTC (rev 2551) +++ branches/Cog/nscogsrc/vm/cogit.c 2012-05-02 23:13:02 UTC (rev 2552) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.157 uuid: 9a11acbe-4a62-43ce-81de-934f351598cc + CCodeGenerator VMMaker.oscog-eem.159 uuid: cbf7f95a-6fe2-4578-898e-47afb8524be4 from - StackToRegisterMappingCogit VMMaker.oscog-eem.157 uuid: 9a11acbe-4a62-43ce-81de-934f351598cc + StackToRegisterMappingCogit VMMaker.oscog-eem.159 uuid: cbf7f95a-6fe2-4578-898e-47afb8524be4 */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.157 uuid: 9a11acbe-4a62-43ce-81de-934f351598cc " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.159 uuid: cbf7f95a-6fe2-4578-898e-47afb8524be4 " __DATE__ ; char *__cogitBuildInfo = __buildInfo; Modified: branches/Cog/nscogsrc/vm/cogit.h =================================================================== --- branches/Cog/nscogsrc/vm/cogit.h 2012-04-24 17:25:08 UTC (rev 2551) +++ branches/Cog/nscogsrc/vm/cogit.h 2012-05-02 23:13:02 UTC (rev 2552) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.157 uuid: 9a11acbe-4a62-43ce-81de-934f351598cc + CCodeGenerator VMMaker.oscog-eem.159 uuid: cbf7f95a-6fe2-4578-898e-47afb8524be4 */ Modified: branches/Cog/nscogsrc/vm/cogmethod.h =================================================================== --- branches/Cog/nscogsrc/vm/cogmethod.h 2012-04-24 17:25:08 UTC (rev 2551) +++ branches/Cog/nscogsrc/vm/cogmethod.h 2012-05-02 23:13:02 UTC (rev 2552) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.157 uuid: 9a11acbe-4a62-43ce-81de-934f351598cc + CCodeGenerator VMMaker.oscog-eem.159 uuid: cbf7f95a-6fe2-4578-898e-47afb8524be4 */ typedef struct { Modified: branches/Cog/nscogsrc/vm/cointerp.c =================================================================== --- branches/Cog/nscogsrc/vm/cointerp.c 2012-04-24 17:25:08 UTC (rev 2551) +++ branches/Cog/nscogsrc/vm/cointerp.c 2012-05-02 23:13:02 UTC (rev 2552) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.157 uuid: 9a11acbe-4a62-43ce-81de-934f351598cc + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.159 uuid: cbf7f95a-6fe2-4578-898e-47afb8524be4 from - CoInterpreter VMMaker.oscog-eem.157 uuid: 9a11acbe-4a62-43ce-81de-934f351598cc + CoInterpreter VMMaker.oscog-eem.159 uuid: cbf7f95a-6fe2-4578-898e-47afb8524be4 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.157 uuid: 9a11acbe-4a62-43ce-81de-934f351598cc " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.159 uuid: cbf7f95a-6fe2-4578-898e-47afb8524be4 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -1916,7 +1916,7 @@ /* 575 */ (void (*)(void))0, 0 }; static void (*externalPrimitiveTable[MaxExternalPrimitiveTableSize + 1 /* 4097 */])(void); -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.157"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.159"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; @@ -4305,7 +4305,7 @@ assert(isOopCompiledMethod(GIV(method))); # if MULTIPLEBYTECODESETS - bytecodeSetSelector = ((((headerOf(GIV(method))) >> 1)) < 0 + bytecodeSetSelector = (methodUsesAlternateBytecodeSet(GIV(method)) ? 256 : 0); @@ -4526,7 +4526,7 @@ assert(isOopCompiledMethod(GIV(method))); # if MULTIPLEBYTECODESETS - bytecodeSetSelector = ((((headerOf(GIV(method))) >> 1)) < 0 + bytecodeSetSelector = (methodUsesAlternateBytecodeSet(GIV(method)) ? 256 : 0); @@ -4572,7 +4572,7 @@ assert(isOopCompiledMethod(GIV(method))); # if MULTIPLEBYTECODESETS - bytecodeSetSelector = ((((headerOf(GIV(method))) >> 1)) < 0 + bytecodeSetSelector = (methodUsesAlternateBytecodeSet(GIV(method)) ? 256 : 0); @@ -5241,7 +5241,7 @@ assert(isOopCompiledMethod(GIV(method))); # if MULTIPLEBYTECODESETS - bytecodeSetSelector = ((((headerOf(GIV(method))) >> 1)) < 0 + bytecodeSetSelector = (methodUsesAlternateBytecodeSet(GIV(method)) ? 256 : 0); @@ -8923,7 +8923,7 @@ assert(isOopCompiledMethod(GIV(method))); # if MULTIPLEBYTECODESETS - bytecodeSetSelector = ((((headerOf(GIV(method))) >> 1)) < 0 + bytecodeSetSelector = (methodUsesAlternateBytecodeSet(GIV(method)) ? 256 : 0); @@ -9508,6 +9508,7 @@ attemptToSwitchToMachineCode(sqInt bcpc) { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt aCompiledMethodHeader; + sqInt aMethodOop; sqInt closure; CogMethod *cogMethod; CogBlockMethod *cogMethod1; @@ -9529,7 +9530,8 @@ } if (methodHasCogMethod(GIV(method))) { /* begin cogMethodOf: */ - methodHeader = longAt((GIV(method) + BaseHeaderSize) + (HeaderIndex << ShiftForWord)); + aMethodOop = GIV(method); + methodHeader = longAt((aMethodOop + BaseHeaderSize) + (HeaderIndex << ShiftForWord)); assert((isNonIntegerObject(methodHeader)) && ((((usqInt)methodHeader)) < (startOfMemory()))); cogMethod = ((CogMethod *) methodHeader); @@ -10267,7 +10269,7 @@ assert(isOopCompiledMethod(GIV(method))); # if MULTIPLEBYTECODESETS - bytecodeSetSelector = ((((headerOf(GIV(method))) >> 1)) < 0 + bytecodeSetSelector = (methodUsesAlternateBytecodeSet(GIV(method)) ? 256 : 0); @@ -10977,7 +10979,7 @@ assert(isOopCompiledMethod(GIV(method))); # if MULTIPLEBYTECODESETS - bytecodeSetSelector = ((((headerOf(GIV(method))) >> 1)) < 0 + bytecodeSetSelector = (methodUsesAlternateBytecodeSet(GIV(method)) ? 256 : 0); @@ -15096,7 +15098,7 @@ assert(isOopCompiledMethod(GIV(method))); # if MULTIPLEBYTECODESETS - bytecodeSetSelector = ((((headerOf(GIV(method))) >> 1)) < 0 + bytecodeSetSelector = (methodUsesAlternateBytecodeSet(GIV(method)) ? 256 : 0); @@ -22605,7 +22607,7 @@ assert(isOopCompiledMethod(GIV(method))); # if MULTIPLEBYTECODESETS - bytecodeSetSelector = ((((headerOf(GIV(method))) >> 1)) < 0 + bytecodeSetSelector = (methodUsesAlternateBytecodeSet(GIV(method)) ? 256 : 0); @@ -22877,7 +22879,17 @@ sqInt methodUsesAlternateBytecodeSet(sqInt aMethodObj) { - return (((headerOf(aMethodObj)) >> 1)) < 0; + sqInt methodHeader; + sqInt methodHeader1; + + /* begin headerIndicatesAlternateBytecodeSet: */ + /* begin headerOf: */ + methodHeader1 = longAt((aMethodObj + BaseHeaderSize) + (HeaderIndex << ShiftForWord)); + methodHeader = (isCogMethodReference(methodHeader1) + ? (assert(((((CogMethod *) methodHeader1)->objectHeader)) == (nullHeaderForMachineCodeMethod())), + (((CogMethod *) methodHeader1)->methodHeader)) + : methodHeader1); + return ((methodHeader >> 1)) < 0; } @@ -26163,7 +26175,7 @@ assert(isOopCompiledMethod(GIV(method))); # if MULTIPLEBYTECODESETS - bytecodeSetSelector = ((((headerOf(GIV(method))) >> 1)) < 0 + bytecodeSetSelector = (methodUsesAlternateBytecodeSet(GIV(method)) ? 256 : 0); @@ -26413,7 +26425,7 @@ assert(isOopCompiledMethod(GIV(method))); # if MULTIPLEBYTECODESETS - bytecodeSetSelector = ((((headerOf(GIV(method))) >> 1)) < 0 + bytecodeSetSelector = (methodUsesAlternateBytecodeSet(GIV(method)) ? 256 : 0); @@ -26697,7 +26709,7 @@ assert(isOopCompiledMethod(GIV(method))); # if MULTIPLEBYTECODESETS - bytecodeSetSelector = ((((headerOf(GIV(method))) >> 1)) < 0 + bytecodeSetSelector = (methodUsesAlternateBytecodeSet(GIV(method)) ? 256 : 0); @@ -41616,7 +41628,7 @@ assert(isOopCompiledMethod(GIV(method))); # if MULTIPLEBYTECODESETS - bytecodeSetSelector = ((((headerOf(GIV(method))) >> 1)) < 0 + bytecodeSetSelector = (methodUsesAlternateBytecodeSet(GIV(method)) ? 256 : 0); @@ -41668,7 +41680,7 @@ assert(isOopCompiledMethod(GIV(method))); # if MULTIPLEBYTECODESETS - bytecodeSetSelector = ((((headerOf(GIV(method))) >> 1)) < 0 + bytecodeSetSelector = (methodUsesAlternateBytecodeSet(GIV(method)) ? 256 : 0); @@ -42101,7 +42113,7 @@ assert(isOopCompiledMethod(GIV(method))); # if MULTIPLEBYTECODESETS - bytecodeSetSelector = ((((headerOf(GIV(method))) >> 1)) < 0 + bytecodeSetSelector = (methodUsesAlternateBytecodeSet(GIV(method)) ? 256 : 0); @@ -42334,7 +42346,7 @@ assert(isOopCompiledMethod(GIV(method))); # if MULTIPLEBYTECODESETS - bytecodeSetSelector = ((((headerOf(GIV(method))) >> 1)) < 0 + bytecodeSetSelector = (methodUsesAlternateBytecodeSet(GIV(method)) ? 256 : 0); @@ -45230,7 +45242,7 @@ assert(isOopCompiledMethod(GIV(method))); # if MULTIPLEBYTECODESETS - bytecodeSetSelector = ((((headerOf(GIV(method))) >> 1)) < 0 + bytecodeSetSelector = (methodUsesAlternateBytecodeSet(GIV(method)) ? 256 : 0); Modified: branches/Cog/nscogsrc/vm/cointerp.h =================================================================== --- branches/Cog/nscogsrc/vm/cointerp.h 2012-04-24 17:25:08 UTC (rev 2551) +++ branches/Cog/nscogsrc/vm/cointerp.h 2012-05-02 23:13:02 UTC (rev 2552) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.157 uuid: 9a11acbe-4a62-43ce-81de-934f351598cc + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.159 uuid: cbf7f95a-6fe2-4578-898e-47afb8524be4 */ Modified: branches/Cog/nscogsrc/vm/gcc3x-cointerp.c =================================================================== --- branches/Cog/nscogsrc/vm/gcc3x-cointerp.c 2012-04-24 17:25:08 UTC (rev 2551) +++ branches/Cog/nscogsrc/vm/gcc3x-cointerp.c 2012-05-02 23:13:02 UTC (rev 2552) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.157 uuid: 9a11acbe-4a62-43ce-81de-934f351598cc + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.159 uuid: cbf7f95a-6fe2-4578-898e-47afb8524be4 from - CoInterpreter VMMaker.oscog-eem.157 uuid: 9a11acbe-4a62-43ce-81de-934f351598cc + CoInterpreter VMMaker.oscog-eem.159 uuid: cbf7f95a-6fe2-4578-898e-47afb8524be4 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.157 uuid: 9a11acbe-4a62-43ce-81de-934f351598cc " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.159 uuid: cbf7f95a-6fe2-4578-898e-47afb8524be4 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -1919,7 +1919,7 @@ /* 575 */ (void (*)(void))0, 0 }; static void (*externalPrimitiveTable[MaxExternalPrimitiveTableSize + 1 /* 4097 */])(void); -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.157"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.159"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; @@ -4309,7 +4309,7 @@ assert(isOopCompiledMethod(GIV(method))); # if MULTIPLEBYTECODESETS - bytecodeSetSelector = ((((headerOf(GIV(method))) >> 1)) < 0 + bytecodeSetSelector = (methodUsesAlternateBytecodeSet(GIV(method)) ? 256 : 0); @@ -4530,7 +4530,7 @@ assert(isOopCompiledMethod(GIV(method))); # if MULTIPLEBYTECODESETS - bytecodeSetSelector = ((((headerOf(GIV(method))) >> 1)) < 0 + bytecodeSetSelector = (methodUsesAlternateBytecodeSet(GIV(method)) ? 256 : 0); @@ -4576,7 +4576,7 @@ assert(isOopCompiledMethod(GIV(method))); # if MULTIPLEBYTECODESETS - bytecodeSetSelector = ((((headerOf(GIV(method))) >> 1)) < 0 + bytecodeSetSelector = (methodUsesAlternateBytecodeSet(GIV(method)) ? 256 : 0); @@ -5245,7 +5245,7 @@ assert(isOopCompiledMethod(GIV(method))); # if MULTIPLEBYTECODESETS - bytecodeSetSelector = ((((headerOf(GIV(method))) >> 1)) < 0 + bytecodeSetSelector = (methodUsesAlternateBytecodeSet(GIV(method)) ? 256 : 0); @@ -8927,7 +8927,7 @@ assert(isOopCompiledMethod(GIV(method))); # if MULTIPLEBYTECODESETS - bytecodeSetSelector = ((((headerOf(GIV(method))) >> 1)) < 0 + bytecodeSetSelector = (methodUsesAlternateBytecodeSet(GIV(method)) ? 256 : 0); @@ -9512,6 +9512,7 @@ attemptToSwitchToMachineCode(sqInt bcpc) { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt aCompiledMethodHeader; + sqInt aMethodOop; sqInt closure; CogMethod *cogMethod; CogBlockMethod *cogMethod1; @@ -9533,7 +9534,8 @@ } if (methodHasCogMethod(GIV(method))) { /* begin cogMethodOf: */ - methodHeader = longAt((GIV(method) + BaseHeaderSize) + (HeaderIndex << ShiftForWord)); + aMethodOop = GIV(method); + methodHeader = longAt((aMethodOop + BaseHeaderSize) + (HeaderIndex << ShiftForWord)); assert((isNonIntegerObject(methodHeader)) && ((((usqInt)methodHeader)) < (startOfMemory()))); cogMethod = ((CogMethod *) methodHeader); @@ -10271,7 +10273,7 @@ assert(isOopCompiledMethod(GIV(method))); # if MULTIPLEBYTECODESETS - bytecodeSetSelector = ((((headerOf(GIV(method))) >> 1)) < 0 + bytecodeSetSelector = (methodUsesAlternateBytecodeSet(GIV(method)) ? 256 : 0); @@ -10981,7 +10983,7 @@ assert(isOopCompiledMethod(GIV(method))); # if MULTIPLEBYTECODESETS - bytecodeSetSelector = ((((headerOf(GIV(method))) >> 1)) < 0 + bytecodeSetSelector = (methodUsesAlternateBytecodeSet(GIV(method)) ? 256 : 0); @@ -15100,7 +15102,7 @@ assert(isOopCompiledMethod(GIV(method))); # if MULTIPLEBYTECODESETS - bytecodeSetSelector = ((((headerOf(GIV(method))) >> 1)) < 0 + bytecodeSetSelector = (methodUsesAlternateBytecodeSet(GIV(method)) ? 256 : 0); @@ -22609,7 +22611,7 @@ assert(isOopCompiledMethod(GIV(method))); # if MULTIPLEBYTECODESETS - bytecodeSetSelector = ((((headerOf(GIV(method))) >> 1)) < 0 + bytecodeSetSelector = (methodUsesAlternateBytecodeSet(GIV(method)) ? 256 : 0); @@ -22881,7 +22883,17 @@ sqInt methodUsesAlternateBytecodeSet(sqInt aMethodObj) { - return (((headerOf(aMethodObj)) >> 1)) < 0; + sqInt methodHeader; + sqInt methodHeader1; + + /* begin headerIndicatesAlternateBytecodeSet: */ + /* begin headerOf: */ + methodHeader1 = longAt((aMethodObj + BaseHeaderSize) + (HeaderIndex << ShiftForWord)); + methodHeader = (isCogMethodReference(methodHeader1) + ? (assert(((((CogMethod *) methodHeader1)->objectHeader)) == (nullHeaderForMachineCodeMethod())), + (((CogMethod *) methodHeader1)->methodHeader)) + : methodHeader1); + return ((methodHeader >> 1)) < 0; } @@ -26167,7 +26179,7 @@ assert(isOopCompiledMethod(GIV(method))); # if MULTIPLEBYTECODESETS - bytecodeSetSelector = ((((headerOf(GIV(method))) >> 1)) < 0 + bytecodeSetSelector = (methodUsesAlternateBytecodeSet(GIV(method)) ? 256 : 0); @@ -26417,7 +26429,7 @@ assert(isOopCompiledMethod(GIV(method))); # if MULTIPLEBYTECODESETS - bytecodeSetSelector = ((((headerOf(GIV(method))) >> 1)) < 0 + bytecodeSetSelector = (methodUsesAlternateBytecodeSet(GIV(method)) ? 256 : 0); @@ -26701,7 +26713,7 @@ assert(isOopCompiledMethod(GIV(method))); # if MULTIPLEBYTECODESETS - bytecodeSetSelector = ((((headerOf(GIV(method))) >> 1)) < 0 + bytecodeSetSelector = (methodUsesAlternateBytecodeSet(GIV(method)) ? 256 : 0); @@ -41620,7 +41632,7 @@ assert(isOopCompiledMethod(GIV(method))); # if MULTIPLEBYTECODESETS - bytecodeSetSelector = ((((headerOf(GIV(method))) >> 1)) < 0 + bytecodeSetSelector = (methodUsesAlternateBytecodeSet(GIV(method)) ? 256 : 0); @@ -41672,7 +41684,7 @@ assert(isOopCompiledMethod(GIV(method))); # if MULTIPLEBYTECODESETS - bytecodeSetSelector = ((((headerOf(GIV(method))) >> 1)) < 0 + bytecodeSetSelector = (methodUsesAlternateBytecodeSet(GIV(method)) ? 256 : 0); @@ -42105,7 +42117,7 @@ assert(isOopCompiledMethod(GIV(method))); # if MULTIPLEBYTECODESETS - bytecodeSetSelector = ((((headerOf(GIV(method))) >> 1)) < 0 + bytecodeSetSelector = (methodUsesAlternateBytecodeSet(GIV(method)) ? 256 : 0); @@ -42338,7 +42350,7 @@ assert(isOopCompiledMethod(GIV(method))); # if MULTIPLEBYTECODESETS - bytecodeSetSelector = ((((headerOf(GIV(method))) >> 1)) < 0 + bytecodeSetSelector = (methodUsesAlternateBytecodeSet(GIV(method)) ? 256 : 0); @@ -45234,7 +45246,7 @@ assert(isOopCompiledMethod(GIV(method))); # if MULTIPLEBYTECODESETS - bytecodeSetSelector = ((((headerOf(GIV(method))) >> 1)) < 0 + bytecodeSetSelector = (methodUsesAlternateBytecodeSet(GIV(method)) ? 256 : 0); Modified: branches/Cog/nscogsrc/vm/interp.h =================================================================== --- branches/Cog/nscogsrc/vm/interp.h 2012-04-24 17:25:08 UTC (rev 2551) +++ branches/Cog/nscogsrc/vm/interp.h 2012-05-02 23:13:02 UTC (rev 2552) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.157 uuid: 9a11acbe-4a62-43ce-81de-934f351598cc + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.159 uuid: cbf7f95a-6fe2-4578-898e-47afb8524be4 */ #define VM_PROXY_MAJOR 1 Modified: branches/Cog/nscogsrc/vm/vmCallback.h =================================================================== --- branches/Cog/nscogsrc/vm/vmCallback.h 2012-04-24 17:25:08 UTC (rev 2551) +++ branches/Cog/nscogsrc/vm/vmCallback.h 2012-05-02 23:13:02 UTC (rev 2552) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.157 uuid: 9a11acbe-4a62-43ce-81de-934f351598cc + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.159 uuid: cbf7f95a-6fe2-4578-898e-47afb8524be4 */ #define VM_CALLBACK_INC 1 Property changes on: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h ___________________________________________________________________ Modified: checkindate - Tue Apr 17 23:13:00 PDT 2012 + Wed May 2 16:06:54 PDT 2012 Deleted: branches/Cog/platforms/Mac OS/plugins/Mpeg3Plugin/sqMacFileBits.c =================================================================== --- branches/Cog/platforms/Mac OS/plugins/Mpeg3Plugin/sqMacFileBits.c 2012-04-24 17:25:08 UTC (rev 2551) +++ branches/Cog/platforms/Mac OS/plugins/Mpeg3Plugin/sqMacFileBits.c 2012-05-02 23:13:02 UTC (rev 2552) @@ -1,11 +0,0 @@ -/* - * sqMacFileBits.c - * mpeglibAudioVideo - * - * Created by John M McIntosh on 15/02/06. - * Copyright 2006 __MyCompanyName__. All rights reserved. - * - */ - -#include "sqMacFileBits.h" - Deleted: branches/Cog/platforms/Mac OS/plugins/Mpeg3Plugin/sqMacFileBits.h =================================================================== --- branches/Cog/platforms/Mac OS/plugins/Mpeg3Plugin/sqMacFileBits.h 2012-04-24 17:25:08 UTC (rev 2551) +++ branches/Cog/platforms/Mac OS/plugins/Mpeg3Plugin/sqMacFileBits.h 2012-05-02 23:13:02 UTC (rev 2552) @@ -1,15 +0,0 @@ -/* - * macFileNameBits.c - * FT2Plugin support - * - * Created by John M McIntosh on 21/11/05. - * Feb 15th, 2006, use sqFilenameFromString - * - */ -#include "sqVirtualMachine.h" - -extern struct VirtualMachine * interpreterProxy; - -void sqFilenameFromStringOpen(char *buffer,long fileIndex, long fileLength, int flag) { - interpreterProxy->ioFilenamefromStringofLengthresolveAliases(buffer,fileIndex, fileLength, flag); -} Modified: branches/Cog/platforms/Mac OS/vm/sqMacEncoding.c =================================================================== --- branches/Cog/platforms/Mac OS/vm/sqMacEncoding.c 2012-04-24 17:25:08 UTC (rev 2551) +++ branches/Cog/platforms/Mac OS/vm/sqMacEncoding.c 2012-05-02 23:13:02 UTC (rev 2552) @@ -10,8 +10,8 @@ #include "sq.h" #include "sqMacEncoding.h" -#include "sqMacUIConstants.h" -#include "sqMacFileLogic.h" +#include "sqMacUIConstants.h" +#include "sqMacFileLogic.h" CFStringEncoding gCurrentVMEncoding=kCFStringEncodingMacRoman; @@ -28,8 +28,8 @@ CFStringGetCString (vmPathString, target, VMPATH_SIZE, encoding); } -void SetVMPathFromCFString(CFMutableStringRef strRef) { - if (vmPathString != NULL) +void SetVMPathFromCFString(CFMutableStringRef strRef) { + if (vmPathString != NULL) CFRelease(vmPathString); vmPathString = strRef; CFRetain(vmPathString); @@ -37,7 +37,7 @@ Boolean VMPathIsEmpty() { char path[VMPATH_SIZE + 1]; - if (vmPathString == NULL) + if (vmPathString == NULL) return true; getVMPathWithEncoding(path,gCurrentVMEncoding); return (*path == 0x00); @@ -51,13 +51,13 @@ getImageNameWithEncoding(imageName,gCurrentVMEncoding); return imageName; } - + void SetImageNameViaCFString(CFStringRef string) { char *ignore; - // normalization because we get here from looking for file name in resource folder directly at startup time. + // normalization because we get here from looking for file name in resource folder directly at startup time. // HFS+ imposes Unicode2.1 decomposed UTF-8 encoding on all path elements CFMutableStringRef mutableStr= CFStringCreateMutableCopy(NULL, 0, string); - if (gCurrentVMEncoding == kCFStringEncodingUTF8) + if (gCurrentVMEncoding == kCFStringEncodingUTF8) CFStringNormalize(mutableStr, kCFStringNormalizationFormKC); // pre-combined CFRetain(mutableStr); if (imageNameString != NULL) @@ -68,7 +68,7 @@ void SetImageNameViaString(char *string,UInt32 encoding) { CFStringRef path; - + if (imageNameString != NULL) CFRelease(imageNameString); path = CFStringCreateWithCString(NULL, string, encoding); @@ -78,7 +78,7 @@ Boolean ImageNameIsEmpty() { - if (imageNameString == NULL) + if (imageNameString == NULL) return true; return getImageName() == 0x00; } @@ -112,15 +112,15 @@ if (strcmp("iso-8859-1",string) == 0) gCurrentVMEncoding = kCFStringEncodingISOLatin1; } - + char *getEncodingType(UInt32 aType) { - if (aType == kCFStringEncodingMacRoman) + if (aType == kCFStringEncodingMacRoman) return (char *)&"macintosh"; - if (aType == kCFStringEncodingUTF8) + if (aType == kCFStringEncodingUTF8) return (char *)&"UTF-8"; - if (aType == kCFStringEncodingShiftJIS) + if (aType == kCFStringEncodingShiftJIS) return (char *)&"ShiftJIS"; - if (aType == kCFStringEncodingISOLatin1) + if (aType == kCFStringEncodingISOLatin1) return (char *)&"Latin1"; return (char *)&"macintosh"; } Modified: branches/Cog/platforms/Mac OS/vm/sqMacMain.c =================================================================== --- branches/Cog/platforms/Mac OS/vm/sqMacMain.c 2012-04-24 17:25:08 UTC (rev 2551) +++ branches/Cog/platforms/Mac OS/vm/sqMacMain.c 2012-05-02 23:13:02 UTC (rev 2552) @@ -252,15 +252,14 @@ } #pragma auto_inline on -/* construct /dir/for/image/crash.dmp if a / in imageName else crash.dmp */ +static char vmLogDirA[PATH_MAX+1]; + static void getCrashDumpFilenameInto(char *buf) { - char *slash; - - strcpy(buf,imageName); - slash = strrchr(buf,'/'); - strcpy(slash ? slash + 1 : buf, "crash.dmp"); + strcpy(buf,vmLogDirA); + vmLogDirA[0] && strcat(buf, "/"); + strcat(buf, "crash.dmp"); } static void @@ -439,6 +438,18 @@ } } + /* Set the directory into which to write the crash.dmp file. */ + /* By default this is the image file's directory (strange but true). */ +#if CRASH_DUMP_IN_CWD + getcwd(vmLogDirA,PATH_MAX); +#else + strcpy(vmLogDirA,getImageName()); + if (strrchr(vmLogDirA,'/')) + *strrchr(vmLogDirA,'/') = 0; + else + getcwd(vmLogDirA,PATH_MAX); +#endif + /* read the image file and allocate memory for Squeak heap */ f = sqImageFileOpen(getImageName(), "rb"); if (gSqueakHeadless && f == NULL) @@ -527,9 +538,18 @@ /* Andreas' stubs */ char* ioGetLogDirectory(void) { return ""; }; -sqInt ioSetLogDirectoryOfSize(void* lblIndex, sqInt sz){ return 1; } +sqInt +ioSetLogDirectoryOfSize(void *lblIndex, sqInt sz) +{ + if (sz >= PATH_MAX) + return 0; + strncpy(vmLogDirA, lblIndex, sz); + vmLogDirA[sz] = 0; + return 1; +} + char * GetAttributeString(int id) { /* This is a hook for getting various status strings back from the OS. In particular, it allows Squeak to be passed arguments Modified: branches/Cog/platforms/Mac OS/vm/sqMacUIEventsUniversal.c =================================================================== --- branches/Cog/platforms/Mac OS/vm/sqMacUIEventsUniversal.c 2012-04-24 17:25:08 UTC (rev 2551) +++ branches/Cog/platforms/Mac OS/vm/sqMacUIEventsUniversal.c 2012-05-02 23:13:02 UTC (rev 2552) @@ -60,10 +60,9 @@ enum { KeyMapSize= 32 }; -typedef struct -{ +typedef struct { int keyCode; - int keyChar; + long keyChar; int keyRepeated; } KeyMapping; @@ -79,8 +78,8 @@ void signalAnyInterestedParties(void); static sqKeyboardEvent *enterKeystroke (long type, long cc, long pc, UniChar utf32Char, long m); -static int addToKeyMap(int keyCode, int keyChar); -static int findInKeyMap(int keyCode); +static int addToKeyMap(int keyCode, UniChar keyChar); +static UniChar findInKeyMap(int keyCode); static int removeFromKeyMap(int keyCode); static int indexInKeyMap(int keyCode); static int findRepeatInKeyMap(int keyCode); @@ -221,13 +220,11 @@ sqInputEvent * nextEventPut(void) { - sqInputEvent *evt; - evt = eventBuffer + eventBufferPut; + sqInputEvent *evt = eventBuffer + eventBufferPut; eventBufferPut = (eventBufferPut + 1) % MAX_EVENT_BUFFER; - if (eventBufferGet == eventBufferPut) { + if (eventBufferGet == eventBufferPut) /* buffer overflow; drop the last event */ eventBufferGet = (eventBufferGet + 1) % MAX_EVENT_BUFFER; - } return evt; } @@ -789,13 +786,64 @@ return result; } + +static TISInputSourceRef currentKeyboard = (TISInputSourceRef)-1; +static UCKeyboardLayout *currentKeyboardLayout; + +static UCKeyboardLayout * +getKeyboardLayout() +{ + TISInputSourceRef kbdNow = TISCopyCurrentKeyboardInputSource(); + + if (currentKeyboard != kbdNow) { + KeyboardLayoutRef keyLayout; + SInt32 keyLayoutKind; + CFDataRef uchr = (CFDataRef)TISGetInputSourceProperty + (kbdNow, + kTISPropertyUnicodeKeyLayoutData); + currentKeyboard = kbdNow; + currentKeyboardLayout = (const UCKeyboardLayout*)CFDataGetBytePtr(uchr); + KLGetCurrentKeyboardLayout(&keyLayout); + KLGetKeyboardLayoutProperty(keyLayout, kKLKind, (const void **)&keyLayoutKind); + //printf("\nKbd: %ld kind: %ld kKLKCHRKind %ld", + // kbdNow, keyLayoutKind, kKLKCHRKind); fflush(stdout); + } + return currentKeyboardLayout; +} + +static UniChar +shiftedUnicodeForEvent(EventRef event, UInt32 keyCode) +{ +#define MaxStringLength 4 + UInt32 deadKeyState = 0; + UInt32 keyboardType; + UniCharCount actualStringLength = 0; + UniChar unicodeString[MaxStringLength]; + OSStatus result; + + GetEventParameter(event, kEventParamKeyboardType, typeUInt32, NULL, + sizeof(keyboardType), NULL, &keyboardType); + result = UCKeyTranslate(getKeyboardLayout(), + keyCode, kUCKeyActionDown, + /* Only interested in the shift state, and + * UCKeyTranslate uses old-style Carbon modifiers. */ + ModifierStateCarbon(event) & 8 + ? 1 << (shiftKeyBit - 8) + : 0, + keyboardType, 0, + &deadKeyState, + MaxStringLength, + &actualStringLength, unicodeString); + return result == noErr ? unicodeString[0] : 0; +} +#undef MaxStringLength + static pascal OSStatus MyWindowEventKBHandler(EventHandlerCallRef myHandler, EventRef event, void* userData) { #pragma unused(myHandler,userData) UInt32 whatHappened,keyCode,keyChar; - SInt32 key; OSStatus result = eventNotHandledErr; /* report failure by default */ if (!windowActive) @@ -808,28 +856,32 @@ GetEventParameter (event, kEventParamKeyCode, typeUInt32,NULL, sizeof(typeUInt32), NULL, &keyCode); /* See UCKeyTranslate in https://developer.apple.com/library/mac/#documentation/Carbon/reference/Uni… * for how to convert an event to one or more Unicode characters. e.g. - * http://www.cocoabuilder.com/archive/cocoa/184332-key-number-to-unicode-stri… + * http://inquisitivecocoa.com/2009/04/05/key-code-translator/ */ switch (whatHappened) { - case kEventRawKeyDown: - //fprintf(stdout,"\nrawkey down %i",ioMSecs()); fflush(stdout); + case kEventRawKeyDown: { + //printf("\nrawkey down %i ",ioMSecs()); fflush(stdout); + //This will work, but this appears unused. */ + //addToKeyMap(keyCode, shiftedUnicodeForEvent(event,keyCode)); addToKeyMap(keyCode, 0); result = eventNotHandledErr; break; + } case kEventRawKeyRepeat: //fprintf(stdout,"\nrawkey repeat %i",ioMSecs()); fflush(stdout); setRepeatInKeyMap(keyCode); result = eventNotHandledErr; break; - case kEventRawKeyUp: + case kEventRawKeyUp: { + UniChar key; //fprintf(stdout,"\nrawkey up %i",ioMSecs()); fflush(stdout); - key = findInKeyMap(keyCode); - if (key != -1) { - enterKeystroke ( EventTypeKeyboard,keyCode, EventKeyUp, 0, ModifierStateCarbon(event)); - } + if ((key = findInKeyMap(keyCode)) != -1) + enterKeystroke(EventTypeKeyboard, keyCode, EventKeyUp, + key, ModifierStateCarbon(event)); removeFromKeyMap(keyCode); result = eventNotHandledErr; break; + } case kEventRawKeyModifiersChanged: /* ok in this case we fake a mouse event to deal with the modifiers changing */ if(inputSemaphoreIndex) @@ -1151,10 +1203,14 @@ modifiedUniChar = *uniCharBufPtr; buttonState = modifierBits =ModifierStateCarbon(actualEvent); //Capture option states if (((modifierBits >> 3) & 0x9) == 0x9) { /* command and shift */ - if ((modifiedUniChar >= 97) && (modifiedUniChar <= 122)) { - /* convert ascii code of command-shift-letter to upper case */ - modifiedUniChar = modifiedUniChar - 32; - } + if ((modifiedUniChar >= 97) && (modifiedUniChar <= 122)) { + /* convert ascii code of command-shift-letter to upper case */ + modifiedUniChar = modifiedUniChar - 32; + } + else { /* map potential punctuation character to shifted key. */ + if (!(modifiedUniChar = shiftedUnicodeForEvent(actualEvent,macKeyCode))) + modifiedUniChar = *uniCharBufPtr; /* undo on error */ + } } modifierBits = modifierBits >> 3; @@ -1515,8 +1571,7 @@ static sqKeyboardEvent * enterKeystroke(long type, long cc, long pc, UniChar utf32Code, long m) { - sqKeyboardEvent *evt; - evt = (sqKeyboardEvent*) nextEventPut(); + sqKeyboardEvent *evt = (sqKeyboardEvent*)nextEventPut(); /* first the basics */ //fprintf(stdout,"\nKeyStroke time %i Type %i Value %i",ioMSecs(),pc,cc); fflush(stdout); @@ -1529,7 +1584,7 @@ evt->modifiers = m; evt->windowIndex = windowActive; evt->utf32Code = 0; - if(pc == EventKeyChar) { + if (pc == EventKeyChar) { evt->utf32Code = utf32Code; if (!inputSemaphoreIndex) { int keystate; @@ -1555,9 +1610,9 @@ static int -addToKeyMap(int keyCode, int keyChar) +addToKeyMap(int keyCode, UniChar keyChar) { - // fprintf(stdout, "\nAddToKeyMap T %i code %i char %i i %i",ioMSecs(),keyCode,keyChar,keyMapSize); fflush(stdout); + //fprintf(stdout, "\nAddToKeyMap T %i code %i char %i(%x,%c) i %i",ioMSecs(),keyCode,keyChar,keyChar,keyChar,keyMapSize); fflush(stdout); if (keyMapSize > KeyMapSize) { fprintf(stderr, "keymap overflow\n"); return -1; } keyMap[keyMapSize++]= (KeyMapping){ keyCode, keyChar, 0}; return keyChar; @@ -1573,7 +1628,7 @@ return -1; } -static int +static UniChar findInKeyMap(int keyCode) { int idx= indexInKeyMap(keyCode); Modified: branches/Cog/platforms/unix/plugins/SocketPlugin/sqUnixSocket.c =================================================================== --- branches/Cog/platforms/unix/plugins/SocketPlugin/sqUnixSocket.c 2012-04-24 17:25:08 UTC (rev 2551) +++ branches/Cog/platforms/unix/plugins/SocketPlugin/sqUnixSocket.c 2012-05-02 23:13:02 UTC (rev 2552) @@ -1302,7 +1302,7 @@ /* this is JUST PLAIN WRONG (I mean the design in the image rather than the implementation here, which is probably correct w.r.t. the broken design) */ - if (optionValueSize > sizeof(buf) - 1) + if (optionValueSize > (int)sizeof(buf) - 1) goto barf; memset((void *)buf, 0, sizeof(buf)); @@ -1371,7 +1371,6 @@ void sqSocketBindToPort(SocketPtr s, int addr, int port) { - int result; struct sockaddr_in inaddr; privateSocketStruct *pss= PSP(s); @@ -1393,10 +1392,8 @@ void sqSocketSetReusable(SocketPtr s) { - char optionValue[256]; size_t bufSize; unsigned char buf[4]; - int err; if (!socketValid(s)) return; @@ -1406,7 +1403,6 @@ { PSP(s)->sockError= errno; interpreterProxy->success(false); - return; } } @@ -1446,7 +1442,12 @@ sqInt sqResolverAddrLookupResultSize(void) { return strlen(lastName); } sqInt sqResolverError(void) { return lastError; } -sqInt sqResolverLocalAddress(void) { return nameToAddr(localHostName); } +sqInt sqResolverLocalAddress(void) +{ sqInt localaddr = nameToAddr(localHostName); + if (!localaddr) + localaddr = nameToAddr("localhost"); + return localaddr; +} sqInt sqResolverNameLookupResult(void) { return lastAddr; } void sqResolverAddrLookupResult(char *nameForAddress, sqInt nameSize) Modified: branches/Cog/platforms/unix/vm/sqUnixMain.c =================================================================== --- branches/Cog/platforms/unix/vm/sqUnixMain.c 2012-04-24 17:25:08 UTC (rev 2551) +++ branches/Cog/platforms/unix/vm/sqUnixMain.c 2012-05-02 23:13:02 UTC (rev 2552) @@ -85,6 +85,8 @@ char imageName[MAXPATHLEN+1]; /* full path to image */ static char vmName[MAXPATHLEN+1]; /* full path to vm */ char vmPath[MAXPATHLEN+1]; /* full path to image directory */ +static char vmLogDirA[PATH_MAX+1]; /* where to write crash.dmp */ + char *exeName; /* short vm name, e.g. "squeak" */ int argCnt= 0; /* global copies for access from plugins */ @@ -330,20 +332,31 @@ } } -static void recordFullPathForImageName(const char *localImageName) +static void +recordFullPathForImageName(const char *localImageName) { - struct stat s; - /* get canonical path to image */ - if ((stat(localImageName, &s) == -1) || (realpath(localImageName, imageName) == 0)) - pathCopyAbs(imageName, localImageName, sizeof(imageName)); + struct stat s; + /* get canonical path to image */ + if ((stat(localImageName, &s) == -1) + || (realpath(localImageName, imageName) == 0)) + pathCopyAbs(imageName, localImageName, sizeof(imageName)); + + /* Set the directory into which to write the crash.dmp file. */ + /* By default this is the image file's directory (strange but true). */ +#if CRASH_DUMP_IN_CWD + getcwd(vmLogDirA,PATH_MAX); +#else + strcpy(vmLogDirA,imageName); + if (strrchr(vmLogDirA,'/')) + *strrchr(vmLogDirA,'/') = 0; + else + getcwd(vmLogDirA,PATH_MAX); +#endif } /* vm access */ -sqInt imageNameSize(void) -{ - return strlen(imageName); -} +sqInt imageNameSize(void) { return strlen(imageName); } sqInt imageNameGetLength(sqInt sqImageNameIndex, sqInt length) { @@ -379,20 +392,13 @@ } -char *getImageName(void) -{ - return imageName; -} +char *getImageName(void) { return imageName; } /*** VM Home Directory Path ***/ +sqInt vmPathSize(void) { return strlen(vmPath); } -sqInt vmPathSize(void) -{ - return strlen(vmPath); -} - sqInt vmPathGetLength(sqInt sqVMPathIndex, sqInt length) { char *stVMPath= pointerForOop(sqVMPathIndex); @@ -850,15 +856,12 @@ } #pragma auto_inline on -/* construct /dir/for/image/crash.dmp if a / in imageName else crash.dmp */ static void getCrashDumpFilenameInto(char *buf) { - char *slash; - - strcpy(buf,imageName); - slash = strrchr(buf,'/'); - strcpy(slash ? slash + 1 : buf, "crash.dmp"); + strcpy(buf,vmLogDirA); + vmLogDirA[0] && strcat(buf, "/"); + strcat(buf, "crash.dmp"); } static void Modified: branches/Cog/src/plugins/ADPCMCodecPlugin/ADPCMCodecPlugin.c =================================================================== --- branches/Cog/src/plugins/ADPCMCodecPlugin/ADPCMCodecPlugin.c 2012-04-24 17:25:08 UTC (rev 2551) +++ branches/Cog/src/plugins/ADPCMCodecPlugin/ADPCMCodecPlugin.c 2012-05-02 23:13:02 UTC (rev 2552) @@ -1,9 +1,9 @@ /* Automatically generated by - VMPluginCodeGenerator VMMaker.oscog-eem.144 uuid: bafb8042-095a-42f3-9058-ee7bd133da50 + VMPluginCodeGenerator VMMaker.oscog-eem.159 uuid: cbf7f95a-6fe2-4578-898e-47afb8524be4 from - ADPCMCodecPlugin VMMaker.oscog-eem.144 uuid: bafb8042-095a-42f3-9058-ee7bd133da50 + ADPCMCodecPlugin VMMaker.oscog-eem.159 uuid: cbf7f95a-6fe2-4578-898e-47afb8524be4 */ -static char __buildInfo[] = "ADPCMCodecPlugin VMMaker.oscog-eem.144 uuid: bafb8042-095a-42f3-9058-ee7bd133da50 " __DATE__ ; +static char __buildInfo[] = "ADPCMCodecPlugin VMMaker.oscog-eem.159 uuid: cbf7f95a-6fe2-4578-898e-47afb8524be4 " __DATE__ ; @@ -59,6 +59,7 @@ /*** Constants ***/ #define BytesPerWord 4 +#define MULTIPLEBYTECODESETS 0 /*** Variables ***/ @@ -69,9 +70,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "ADPCMCodecPlugin VMMaker.oscog-eem.144 (i)" + "ADPCMCodecPlugin VMMaker.oscog-eem.159 (i)" #else - "ADPCMCodecPlugin VMMaker.oscog-eem.144 (e)" + "ADPCMCodecPlugin VMMaker.oscog-eem.159 (e)" #endif ; Modified: branches/Cog/src/plugins/JPEGReadWriter2Plugin/JPEGReadWriter2Plugin.c =================================================================== --- branches/Cog/src/plugins/JPEGReadWriter2Plugin/JPEGReadWriter2Plugin.c 2012-04-24 17:25:08 UTC (rev 2551) +++ branches/Cog/src/plugins/JPEGReadWriter2Plugin/JPEGReadWriter2Plugin.c 2012-05-02 23:13:02 UTC (rev 2552) @@ -1,9 +1,9 @@ /* Automatically generated by - SmartSyntaxPluginCodeGenerator VMMaker-oscog.40 uuid: 637db40c-33c6-4263-816e-1b8cc19e3c99 + SmartSyntaxPluginCodeGenerator VMMaker.oscog-eem.159 uuid: cbf7f95a-6fe2-4578-898e-47afb8524be4 from - JPEGReadWriter2Plugin VMMaker-oscog.40 uuid: 637db40c-33c6-4263-816e-1b8cc19e3c99 + JPEGReadWriter2Plugin VMMaker.oscog-eem.159 uuid: cbf7f95a-6fe2-4578-898e-47afb8524be4 */ -static char __buildInfo[] = "JPEGReadWriter2Plugin VMMaker-oscog.40 uuid: 637db40c-33c6-4263-816e-1b8cc19e3c99 " __DATE__ ; +static char __buildInfo[] = "JPEGReadWriter2Plugin VMMaker.oscog-eem.159 uuid: cbf7f95a-6fe2-4578-898e-47afb8524be4 " __DATE__ ; @@ -38,6 +38,8 @@ /*** Constants ***/ +#define BytesPerWord 4 +#define MULTIPLEBYTECODESETS 0 /*** Function Prototypes ***/ @@ -68,9 +70,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "JPEGReadWriter2Plugin VMMaker-oscog.40 (i)" + "JPEGReadWriter2Plugin VMMaker.oscog-eem.159 (i)" #else - "JPEGReadWriter2Plugin VMMaker-oscog.40 (e)" + "JPEGReadWriter2Plugin VMMaker.oscog-eem.159 (e)" #endif ; @@ -291,7 +293,7 @@ sqInt dmv2; sqInt form; unsigned * formBits; - sqInt formBitsAsInt; + sqInt formBitsOops; sqInt formBitsSize; sqInt formDepth; sqInt formHeight; @@ -384,8 +386,7 @@ di; dmi; dmo; - formBits = ((unsigned *) (interpreterProxy->fetchPointerofObject(0, form))); - formBitsAsInt = interpreterProxy->fetchPointerofObject(0, form); + formBitsOops = interpreterProxy->fetchPointerofObject(0, form); /* Various parameter checks */ @@ -401,12 +402,13 @@ formHeight = ((j_decompress_ptr)aJPEGDecompressStruct)->image_height; pixPerWord = 32 / formDepth; formPitch = ((formWidth + (pixPerWord - 1)) / pixPerWord) * 4; - formBitsSize = interpreterProxy->byteSizeOf(formBitsAsInt); - interpreterProxy->success((interpreterProxy->isWordsOrBytes(formBitsAsInt)) + formBitsSize = interpreterProxy->byteSizeOf(formBitsOops); + interpreterProxy->success((interpreterProxy->isWordsOrBytes(formBitsOops)) && (formBitsSize == (formPitch * formHeight))); if (interpreterProxy->failed()) { return null; } + formBits = interpreterProxy->firstIndexableField(formBitsOops); sourceSize = interpreterProxy->stSizeOf(interpreterProxy->stackValue(3)); if (sourceSize == 0) { @@ -456,7 +458,7 @@ switch (formDepth) { case 32: - for(i = 0, j = 1; i < rowStride; i +=(pcinfo->out_color_components), j++) { + for(i = 0, j = 0; i < rowStride; i +=(pcinfo->out_color_components), j++) { formPix = (255 << 24) | (buffer[0][i+rOff] << 16) | (buffer[0][i+gOff] << 8) | buffer[0][i+bOff]; if (formPix == 0) formPix = 1; formBits [ ((pcinfo->output_scanline - 1) * (pcinfo->image_width)) + j ] = formPix; @@ -464,7 +466,7 @@ break; case 16: - for(i = 0, j = 1; i < rowStride; i +=(pcinfo->out_color_components*2), j++) { + for(i = 0, j = 0; i < rowStride; i +=(pcinfo->out_color_components*2), j++) { r1 = buffer[0][i+rOff]; r2 = buffer[0][i+rOff2]; g1 = buffer[0][i+gOff]; @@ -530,7 +532,7 @@ unsigned int destinationSize; sqInt form; unsigned * formBits; - sqInt formBitsAsInt; + sqInt formBitsOops; sqInt formBitsSize; sqInt formDepth; sqInt formHeight; @@ -584,8 +586,7 @@ j; formPix; destinationSize; - formBits = ((unsigned *) (interpreterProxy->fetchPointerofObject(0, form))); - formBitsAsInt = interpreterProxy->fetchPointerofObject(0, form); + formBitsOops = interpreterProxy->fetchPointerofObject(0, form); formWidth = interpreterProxy->fetchIntegerofObject(1, form); formHeight = interpreterProxy->fetchIntegerofObject(2, form); @@ -601,12 +602,13 @@ ; pixPerWord = 32 / formDepth; formPitch = ((formWidth + (pixPerWord - 1)) / pixPerWord) * 4; - formBitsSize = interpreterProxy->byteSizeOf(formBitsAsInt); - interpreterProxy->success((interpreterProxy->isWordsOrBytes(formBitsAsInt)) + formBitsSize = interpreterProxy->byteSizeOf(formBitsOops); + interpreterProxy->success((interpreterProxy->isWordsOrBytes(formBitsOops)) && (formBitsSize == (formPitch * formHeight))); if (interpreterProxy->failed()) { return null; } + formBits = interpreterProxy->firstIndexableField(formBitsOops); destinationSize = interpreterProxy->stSizeOf(interpreterProxy->stackValue(4)); pcinfo = (j_compress_ptr)aJPEGCompressStruct; @@ -641,7 +643,7 @@ while (pcinfo->next_scanline < pcinfo->image_height) { switch (formDepth) { case 32: - for(i = 0, j = 1; i < rowStride; i +=3, j++) { + for(i = 0, j = 0; i < rowStride; i +=3, j++) { formPix = formBits [ ((pcinfo->next_scanline) * formWidth) + j ]; buffer[0][i] = (formPix >> 16) & 255; buffer[0][i+1] = (formPix >> 8) & 255; @@ -649,7 +651,7 @@ } break; case 16: - for(i = 0, j = 1; i < rowStride; i +=6, j++) { + for(i = 0, j = 0; i < rowStride; i +=6, j++) { formPix = formBits [ ((pcinfo->next_scanline) * formWidth) / 2 + j ]; buffer[0][i] = (formPix >> 23) & 248; buffer[0][i+1] = (formPix >> 18) & 248; Modified: branches/Cog/src/plugins/JPEGReaderPlugin/JPEGReaderPlugin.c =================================================================== --- branches/Cog/src/plugins/JPEGReaderPlugin/JPEGReaderPlugin.c 2012-04-24 17:25:08 UTC (rev 2551) +++ branches/Cog/src/plugins/JPEGReaderPlugin/JPEGReaderPlugin.c 2012-05-02 23:13:02 UTC (rev 2552) @@ -1,9 +1,9 @@ /* Automatically generated by - VMPluginCodeGenerator VMMaker-oscog.40 uuid: 637db40c-33c6-4263-816e-1b8cc19e3c99 + VMPluginCodeGenerator VMMaker.oscog-eem.159 uuid: cbf7f95a-6fe2-4578-898e-47afb8524be4 from - JPEGReaderPlugin VMMaker-oscog.40 uuid: 637db40c-33c6-4263-816e-1b8cc19e3c99 + JPEGReaderPlugin VMMaker.oscog-eem.159 uuid: cbf7f95a-6fe2-4578-898e-47afb8524be4 */ -static char __buildInfo[] = "JPEGReaderPlugin VMMaker-oscog.40 uuid: 637db40c-33c6-4263-816e-1b8cc19e3c99 " __DATE__ ; +static char __buildInfo[] = "JPEGReaderPlugin VMMaker.oscog-eem.159 uuid: cbf7f95a-6fe2-4578-898e-47afb8524be4 " __DATE__ ; @@ -39,6 +39,7 @@ /*** Constants ***/ #define BlockWidthIndex 5 #define BlueIndex 2 +#define BytesPerWord 4 #define ConstBits 13 #define CurrentXIndex 0 #define CurrentYIndex 1 @@ -68,6 +69,7 @@ #define MCUBlockIndex 4 #define MCUWidthIndex 8 #define MinComponentSize 11 +#define MULTIPLEBYTECODESETS 0 #define Pass1Bits 2 #define Pass1Div 0x800 #define Pass2Div 0x40000 @@ -145,9 +147,9 @@ static sqInt jsReadLimit; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "JPEGReaderPlugin VMMaker-oscog.40 (i)" + "JPEGReaderPlugin VMMaker.oscog-eem.159 (i)" #else - "JPEGReaderPlugin VMMaker-oscog.40 (e)" + "JPEGReaderPlugin VMMaker.oscog-eem.159 (e)" #endif ; static int *residuals; @@ -171,7 +173,7 @@ sqInt i; sqInt max; - if ((oop & 1)) { + if (interpreterProxy->isIntegerObject(oop)) { return 0; } if (!(interpreterProxy->isPointers(oop))) { @@ -181,7 +183,7 @@ return 0; } arrayOop = interpreterProxy->fetchPointerofObject(MCUBlockIndex, oop); - if ((arrayOop & 1)) { + if (interpreterProxy->isIntegerObject(arrayOop)) { return 0; } if (!(interpreterProxy->isPointers(arrayOop))) { @@ -193,7 +195,7 @@ } for (i = 0; i <= (max - 1); i += 1) { blockOop = interpreterProxy->fetchPointerofObject(i, arrayOop); - if ((blockOop & 1)) { + if (interpreterProxy->isIntegerObject(blockOop)) { return 0; } if (!(interpreterProxy->isWords(blockOop))) { @@ -210,7 +212,7 @@ static sqInt colorComponentfrom(int *aColorComponent, sqInt oop) { - if ((oop & 1)) { + if (interpreterProxy->isIntegerObject(oop)) { return 0; } if (!(interpreterProxy->isPointers(oop))) { @@ -247,7 +249,7 @@ yComponent[CurrentYIndex] = 0; for (i = 0; i <= (jpegBitsSize - 1); i += 1) { /* begin nextSampleY */ - dx = curX = yComponent[CurrentXIndex]; + dx = (curX = yComponent[CurrentXIndex]); dy = yComponent[CurrentYIndex]; sx = yComponent[HScaleIndex]; sy = yComponent[VScaleIndex]; @@ -320,7 +322,7 @@ crComponent[CurrentYIndex] = 0; for (i = 0; i <= (jpegBitsSize - 1); i += 1) { /* begin nextSampleY */ - dx = curX = yComponent[CurrentXIndex]; + dx = (curX = yComponent[CurrentXIndex]); dy = yComponent[CurrentYIndex]; sx = yComponent[HScaleIndex]; sy = yComponent[VScaleIndex]; @@ -342,7 +344,7 @@ } y = sample; /* begin nextSampleCb */ - dx1 = curX1 = cbComponent[CurrentXIndex]; + dx1 = (curX1 = cbComponent[CurrentXIndex]); dy1 = cbComponent[CurrentYIndex]; sx1 = cbComponent[HScaleIndex]; sy1 = cbComponent[VScaleIndex]; @@ -365,7 +367,7 @@ cb = sample1; cb -= SampleOffset; /* begin nextSampleCr */ - dx2 = curX2 = crComponent[CurrentXIndex]; + dx2 = (curX2 = crComponent[CurrentXIndex]); dy2 = crComponent[CurrentYIndex]; sx2 = crComponent[HScaleIndex]; sy2 = crComponent[VScaleIndex]; @@ -802,7 +804,7 @@ return 0; } oop = interpreterProxy->fetchPointerofObject(0, streamOop); - if ((oop & 1)) { + if (interpreterProxy->isIntegerObject(oop)) { return 0; } if (!(interpreterProxy->isBytes(oop))) { @@ -846,7 +848,7 @@ sqInt sx; sqInt sy; - dx = curX = cbComponent[CurrentXIndex]; + dx = (curX = cbComponent[CurrentXIndex]); dy = cbComponent[CurrentYIndex]; sx = cbComponent[HScaleIndex]; sy = cbComponent[VScaleIndex]; @@ -881,7 +883,7 @@ sqInt sx; sqInt sy; - dx = curX = crComponent[CurrentXIndex]; + dx = (curX = crComponent[CurrentXIndex]); dy = crComponent[CurrentYIndex]; sx = crComponent[HScaleIndex]; sy = crComponent[VScaleIndex]; @@ -916,7 +918,7 @@ sqInt sx; sqInt sy; - dx = curX = aComponent[CurrentXIndex]; + dx = (curX = aComponent[CurrentXIndex]); dy = aComponent[CurrentYIndex]; sx = aComponent[HScaleIndex]; sy = aComponent[VScaleIndex]; @@ -951,7 +953,7 @@ sqInt sx; sqInt sy; - dx = curX = yComponent[CurrentXIndex]; + dx = (curX = yComponent[CurrentXIndex]); dy = yComponent[CurrentYIndex]; sx = yComponent[HScaleIndex]; sy = yComponent[VScaleIndex]; @@ -1033,7 +1035,7 @@ yComponent[CurrentYIndex] = 0; for (i = 0; i <= (jpegBitsSize - 1); i += 1) { /* begin nextSampleY */ - dx = curX = yComponent[CurrentXIndex]; + dx = (curX = yComponent[CurrentXIndex]); dy = yComponent[CurrentYIndex]; sx = yComponent[HScaleIndex]; sy = yComponent[VScaleIndex]; @@ -1157,7 +1159,7 @@ crComponent[CurrentYIndex] = 0; for (i = 0; i <= (jpegBitsSize - 1); i += 1) { /* begin nextSampleY */ - dx = curX = yComponent[CurrentXIndex]; + dx = (curX = yComponent[CurrentXIndex]); dy = yComponent[CurrentYIndex]; sx = yComponent[HScaleIndex]; sy = yComponent[VScaleIndex]; @@ -1179,7 +1181,7 @@ } y = sample; /* begin nextSampleCb */ - dx1 = curX1 = cbComponent[CurrentXIndex]; + dx1 = (curX1 = cbComponent[CurrentXIndex]); dy1 = cbComponent[CurrentYIndex]; sx1 = cbComponent[HScaleIndex]; sy1 = cbComponent[VScaleIndex]; @@ -1202,7 +1204,7 @@ cb = sample1; cb -= SampleOffset; /* begin nextSampleCr */ - dx2 = curX2 = crComponent[CurrentXIndex]; + dx2 = (curX2 = crComponent[CurrentXIndex]); dy2 = crComponent[CurrentYIndex]; sx2 = crComponent[HScaleIndex]; sy2 = crComponent[VScaleIndex]; Modified: branches/Cog/src/plugins/Klatt/Klatt.c =================================================================== --- branches/Cog/src/plugins/Klatt/Klatt.c 2012-04-24 17:25:08 UTC (rev 2551) +++ branches/Cog/src/plugins/Klatt/Klatt.c 2012-05-02 23:13:02 UTC (rev 2552) @@ -1,9 +1,9 @@ /* Automatically generated by - VMPluginCodeGenerator VMMaker-oscog.40 uuid: 637db40c-33c6-4263-816e-1b8cc19e3c99 + VMPluginCodeGenerator VMMaker.oscog-eem.159 uuid: cbf7f95a-6fe2-4578-898e-47afb8524be4 from - KlattSynthesizerPlugin VMMaker-oscog.40 uuid: 637db40c-33c6-4263-816e-1b8cc19e3c99 + KlattSynthesizerPlugin VMMaker.oscog-eem.159 uuid: cbf7f95a-6fe2-4578-898e-47afb8524be4 */ -static char __buildInfo[] = "KlattSynthesizerPlugin VMMaker-oscog.40 uuid: 637db40c-33c6-4263-816e-1b8cc19e3c99 " __DATE__ ; +static char __buildInfo[] = "KlattSynthesizerPlugin VMMaker.oscog-eem.159 uuid: cbf7f95a-6fe2-4578-898e-47afb8524be4 " __DATE__ ; @@ -65,6 +65,7 @@ #define Btp 31 #define Btz 33 #define Bypass 39 +#define BytesPerWord 4 #define Diplophonia 4 #define Epsilon 0.0001 #define F0 0 @@ -82,6 +83,7 @@ #define Ftz 32 #define Gain 51 #define Jitter 2 +#define MULTIPLEBYTECODESETS 0 #define PI 3.141592653589793 #define R1c 12 #define R1vp 3 @@ -177,9 +179,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "Klatt VMMaker-oscog.40 (i)" + "Klatt VMMaker.oscog-eem.159 (i)" #else - "Klatt VMMaker-oscog.40 (e)" + "Klatt VMMaker.oscog-eem.159 (e)" #endif ; static float nlast; @@ -1198,7 +1200,7 @@ aKlattFrame = ((float *) (interpreterProxy->firstIndexableField(oop))); l1: /* end checkedFloatPtrOf: */; /* begin checkedShortPtrOf: */ - oop1 = bufferOop = interpreterProxy->stackValue(1); + oop1 = (bufferOop = interpreterProxy->stackValue(1)); interpreterProxy->success(interpreterProxy->isWords(oop1)); if (interpreterProxy->failed()) { buffer = 0; @@ -1362,7 +1364,7 @@ turbulence = (linearFromdB(frame[Turbulence])) * 0.1; } else { - voicing = parVoicing = turbulence = 0.0; + voicing = (parVoicing = (turbulence = 0.0)); } friction = (linearFromdB(frame[Friction])) * 0.25; aspiration = (linearFromdB(frame[Aspiration])) * 0.05; @@ -2538,7 +2540,7 @@ turbulence = (linearFromdB(frame[Turbulence])) * 0.1; } else { - voicing = parVoicing = turbulence = 0.0; + voicing = (parVoicing = (turbulence = 0.0)); } friction = (linearFromdB(frame[Friction])) * 0.25; aspiration = (linearFromdB(frame[Aspiration])) * 0.05; Modified: branches/Cog/src/plugins/Matrix2x3Plugin/Matrix2x3Plugin.c =================================================================== --- branches/Cog/src/plugins/Matrix2x3Plugin/Matrix2x3Plugin.c 2012-04-24 17:25:08 UTC (rev 2551) +++ branches/Cog/src/plugins/Matrix2x3Plugin/Matrix2x3Plugin.c 2012-05-02 23:13:02 UTC (rev 2552) @@ -1,9 +1,9 @@ /* Automatically generated by - VMPluginCodeGenerator VMMaker-oscog.40 uuid: 637db40c-33c6-4263-816e-1b8cc19e3c99 + VMPluginCodeGenerator VMMaker.oscog-eem.159 uuid: cbf7f95a-6fe2-4578-898e-47afb8524be4 from - Matrix2x3Plugin VMMaker-oscog.40 uuid: 637db40c-33c6-4263-816e-1b8cc19e3c99 + Matrix2x3Plugin VMMaker.oscog-eem.159 uuid: cbf7f95a-6fe2-4578-898e-47afb8524be4 */ -static char __buildInfo[] = "Matrix2x3Plugin VMMaker-oscog.40 uuid: 637db40c-33c6-4263-816e-1b8cc19e3c99 " __DATE__ ; +static char __buildInfo[] = "Matrix2x3Plugin VMMaker.oscog-eem.159 uuid: cbf7f95a-6fe2-4578-898e-47afb8524be4 " __DATE__ ; @@ -37,6 +37,8 @@ /*** Constants ***/ +#define BytesPerWord 4 +#define MULTIPLEBYTECODESETS 0 /*** Function Prototypes ***/ @@ -74,9 +76,9 @@ static double m23ResultY; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "Matrix2x3Plugin VMMaker-oscog.40 (i)" + "Matrix2x3Plugin VMMaker.oscog-eem.159 (i)" #else - "Matrix2x3Plugin VMMaker-oscog.40 (e)" + "Matrix2x3Plugin VMMaker.oscog-eem.159 (e)" #endif ; @@ -142,25 +144,25 @@ return interpreterProxy->primitiveFail(); } oop = interpreterProxy->fetchPointerofObject(0, point); - isInt = (oop & 1); + isInt = interpreterProxy->isIntegerObject(oop); if (!(isInt || (interpreterProxy->isFloatObject(oop)))) { return interpreterProxy->primitiveFail(); } if (isInt) { - m23ArgX = (oop >> 1); + m23ArgX = interpreterProxy->integerValueOf(oop); } else { m23ArgX = interpreterProxy->floatValueOf(oop); } oop = interpreterProxy->fetchPointerofObject(1, point); - isInt = (oop & 1); + isInt = interpreterProxy->isIntegerObject(oop); if (!(isInt || (interpreterProxy->isFloatObject(oop)))) { return interpreterProxy->primitiveFail(); } if (isInt) { - m23ArgY = (oop >> 1); + m23ArgY = interpreterProxy->integerValueOf(oop); } else { m23ArgY = interpreterProxy->floatValueOf(oop); @@ -262,7 +264,7 @@ ; /* begin loadArgumentMatrix: */ - matrix = result = interpreterProxy->stackObjectValue(0); + matrix = (result = interpreterProxy->stackObjectValue(0)); if (interpreterProxy->failed()) { m3 = null; goto l1; @@ -417,11 +419,11 @@ originX = m23ArgX; originY = m23ArgY; matrix2x3InvertPoint(matrix); - minX = maxX = m23ResultX; + minX = (maxX = m23ResultX); /* Load bottom-right point */ - minY = maxY = m23ResultY; + minY = (maxY = m23ResultY); loadArgumentPoint(interpreterProxy->fetchPointerofObject(1, srcOop)); if (interpreterProxy->failed()) { return null; @@ -612,11 +614,11 @@ /* begin matrix2x3TransformPoint: */ m23ResultX = ((m23ArgX * (matrix[0])) + (m23ArgY * (matrix[1]))) + (matrix[2]); m23ResultY = ((m23ArgX * (matrix[3])) + (m23ArgY * (matrix[4]))) + (matrix[5]); - minX = maxX = m23ResultX; + minX = (maxX = m23ResultX); /* Load bottom-right point */ - minY = maxY = m23ResultY; + minY = (maxY = m23ResultY); loadArgumentPoint(interpreterProxy->fetchPointerofObject(1, srcOop)); if (interpreterProxy->failed()) { return null; Modified: branches/Cog/src/plugins/Mpeg3Plugin/Mpeg3Plugin.c =================================================================== --- branches/Cog/src/plugins/Mpeg3Plugin/Mpeg3Plugin.c 2012-04-24 17:25:08 UTC (rev 2551) +++ branches/Cog/src/plugins/Mpeg3Plugin/Mpeg3Plugin.c 2012-05-02 23:13:02 UTC (rev 2552) @@ -1,9 +1,9 @@ /* Automatically generated by - SmartSyntaxPluginCodeGenerator VMMaker.oscog-eem.144 uuid: bafb8042-095a-42f3-9058-ee7bd133da50 + SmartSyntaxPluginCodeGenerator VMMaker.oscog-eem.159 uuid: cbf7f95a-6fe2-4578-898e-47afb8524be4 from - Mpeg3Plugin VMMaker.oscog-eem.144 uuid: bafb8042-095a-42f3-9058-ee7bd133da50 + Mpeg3Plugin VMMaker.oscog-eem.159 uuid: cbf7f95a-6fe2-4578-898e-47afb8524be4 */ -static char __buildInfo[] = "Mpeg3Plugin VMMaker.oscog-eem.144 uuid: bafb8042-095a-42f3-9058-ee7bd133da50 " __DATE__ ; +static char __buildInfo[] = "Mpeg3Plugin VMMaker.oscog-eem.159 uuid: cbf7f95a-6fe2-4578-898e-47afb8524be4 " __DATE__ ; @@ -39,6 +39,7 @@ /*** Constants ***/ #define BytesPerWord 4 +#define MULTIPLEBYTECODESETS 0 /*** Function Prototypes ***/ @@ -98,9 +99,9 @@ static sqInt maximumNumberOfFilesToWatch; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "Mpeg3Plugin VMMaker.oscog-eem.144 (i)" + "Mpeg3Plugin VMMaker.oscog-eem.159 (i)" #else - "Mpeg3Plugin VMMaker.oscog-eem.144 (e)" + "Mpeg3Plugin VMMaker.oscog-eem.159 (e)" #endif ; static mpeg3_t *mpegFiles[1024+1]; @@ -319,7 +320,7 @@ return null; } sz = interpreterProxy->byteSizeOf(((sqInt)(long)(path) - 4)); - sqFilenameFromStringOpen(storage, path, sz); + interpreterProxy->ioFilenamefromStringofLengthresolveAliases(storage, path, sz, 1); result = mpeg3_check_sig(storage); _return_value = (result? interpreterProxy->trueObject(): interpreterProxy->falseObject()); if (interpreterProxy->failed()) { @@ -458,7 +459,7 @@ primitiveMPEG3EndOfVideo(void) { sqInt aNumber; - mpeg3_t *file; + mpeg3_t * file; sqInt fileHandle; sqInt result; sqInt _return_value; @@ -773,7 +774,7 @@ return null; } sz = interpreterProxy->byteSizeOf(((sqInt)(long)(path) - 4)); - sqFilenameFromStringOpen(storage, path, sz); + interpreterProxy->ioFilenamefromStringofLengthresolveAliases(storage, path, sz, 1); mpeg3Oop = interpreterProxy->instantiateClassindexableSize(interpreterProxy->classByteArray(), 4); index = ((mpeg3_t **) (interpreterProxy->firstIndexableField(mpeg3Oop))); *index = mpeg3_open(storage,0); makeFileEntry(*index); @@ -913,18 +914,6 @@ return null; } - -/* int mpeg3_read_frame(mpeg3_t *file, - unsigned char **output_rows, - int in_x, - int in_y, - int in_w, - int in_h, - int out_w, - int out_h, - int color_model, - int stream) */ - EXPORT(sqInt) primitiveMPEG3ReadFrame(void) { @@ -996,18 +985,6 @@ return null; } - -/* int mpeg3_read_frame(mpeg3_t *file, - unsigned char **output_rows, - int in_x, - int in_y, - int in_w, - int in_h, - int out_w, - int out_h, - int color_model, - int stream) */ - EXPORT(sqInt) primitiveMPEG3ReadFrameBufferOffset(void) { Modified: branches/Cog/src/plugins/SoundGenerationPlugin/SoundGenerationPlugin.c =================================================================== --- branches/Cog/src/plugins/SoundGenerationPlugin/SoundGenerationPlugin.c 2012-04-24 17:25:08 UTC (rev 2551) +++ branches/Cog/src/plugins/SoundGenerationPlugin/SoundGenerationPlugin.c 2012-05-02 23:13:02 UTC (rev 2552) @@ -1,9 +1,9 @@ /* Automatically generated by - VMPluginCodeGenerator VMMaker.oscog-eem.145 uuid: 7f3d6fd8-ce44-45ac-82f8-d0ed70d6f188 + VMPluginCodeGenerator VMMaker.oscog-eem.159 uuid: cbf7f95a-6fe2-4578-898e-47afb8524be4 from - SoundGenerationPlugin VMMaker.oscog-eem.145 uuid: 7f3d6fd8-ce44-45ac-82f8-d0ed70d6f188 + SoundGenerationPlugin VMMaker.oscog-eem.159 uuid: cbf7f95a-6fe2-4578-898e-47afb8524be4 */ -static char __buildInfo[] = "SoundGenerationPlugin VMMaker.oscog-eem.145 uuid: 7f3d6fd8-ce44-45ac-82f8-d0ed70d6f188 " __DATE__ ; +static char __buildInfo[] = "SoundGenerationPlugin VMMaker.oscog-eem.159 uuid: cbf7f95a-6fe2-4578-898e-47afb8524be4 " __DATE__ ; @@ -63,6 +63,7 @@ #define IncrementFractionBits 16 #define LoopIndexFractionMask 0x1FF #define LoopIndexScaleFactor 0x200 +#define MULTIPLEBYTECODESETS 0 #define ScaledIndexOverflow 0x20000000 #define ScaleFactor 0x8000 @@ -75,9 +76,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "SoundGenerationPlugin VMMaker.oscog-eem.145 (i)" + "SoundGenerationPlugin VMMaker.oscog-eem.159 (i)" #else - "SoundGenerationPlugin VMMaker.oscog-eem.145 (e)" + "SoundGenerationPlugin VMMaker.oscog-eem.159 (e)" #endif ; Modified: branches/Cog/src/plugins/SqueakFFIPrims/SqueakFFIPrims.c =================================================================== --- branches/Cog/src/plugins/SqueakFFIPrims/SqueakFFIPrims.c 2012-04-24 17:25:08 UTC (rev 2551) +++ branches/Cog/src/plugins/SqueakFFIPrims/SqueakFFIPrims.c 2012-05-02 23:13:02 UTC (rev 2552) @@ -1,9 +1,9 @@ /* Automatically generated by - VMPluginCodeGenerator VMMaker.oscog-eem.142 uuid: 5b4312fa-5b57-4639-b12d-a45e13e5bbdc + VMPluginCodeGenerator VMMaker.oscog-eem.159 uuid: cbf7f95a-6fe2-4578-898e-47afb8524be4 from - ThreadedIA32FFIPlugin VMMaker.oscog-eem.142 uuid: 5b4312fa-5b57-4639-b12d-a45e13e5bbdc + ThreadedIA32FFIPlugin VMMaker.oscog-eem.159 uuid: cbf7f95a-6fe2-4578-898e-47afb8524be4 */ -static char __buildInfo[] = "ThreadedIA32FFIPlugin VMMaker.oscog-eem.142 uuid: 5b4312fa-5b57-4639-b12d-a45e13e5bbdc " __DATE__ ; +static char __buildInfo[] = "ThreadedIA32FFIPlugin VMMaker.oscog-eem.159 uuid: cbf7f95a-6fe2-4578-898e-47afb8524be4 " __DATE__ ; @@ -88,6 +88,9 @@ # else # define PLATFORM_API_USES_CALLEE_POPS_CONVENTION 0 # endif +#endif /* defined(_X86_) || defined(i386) || defined(__i386) || defined(__i386__) */ + +#if !defined(ALLOCA_LIES_SO_USE_GETSP) # if defined(__MINGW32__) && (__GNUC__ >= 3) /* * cygwin -mno-cygwin (MinGW) gcc 3.4.x's alloca is a library routine that answers @@ -95,13 +98,11 @@ * Grab the actual stack pointer to correct. */ # define ALLOCA_LIES_SO_USE_GETSP 1 +# else +# define ALLOCA_LIES_SO_USE_GETSP 0 # endif -#endif /* defined(_X86_) || defined(i386) || defined(__i386) || defined(__i386__) */ +#endif /* !defined(ALLOCA_LIES_SO_USE_GETSP) */ -#if !defined(ALLOCA_LIES_SO_USE_GETSP) -# define ALLOCA_LIES_SO_USE_GETSP 0 -#endif - /* The dispatchOn:in:with:with: generates an unwanted call on error. Just squash it. */ #define error(foo) 0 @@ -178,6 +179,7 @@ #define FFITypeUnsignedByte 2 #define FFITypeVoid 0 #define MaxNumArgs 15 +#define MULTIPLEBYTECODESETS 0 #define PrimErrBadArgument 3 #define PrimErrBadMethod 12 #define PrimErrBadNumArgs 5 @@ -276,9 +278,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "SqueakFFIPrims VMMaker.oscog-eem.142 (i)" + "SqueakFFIPrims VMMaker.oscog-eem.159 (i)" #else - "SqueakFFIPrims VMMaker.oscog-eem.142 (e)" + "SqueakFFIPrims VMMaker.oscog-eem.159 (e)" #endif ; Modified: branches/Cog/src/vm/cogit.c =================================================================== --- branches/Cog/src/vm/cogit.c 2012-04-24 17:25:08 UTC (rev 2551) +++ branches/Cog/src/vm/cogit.c 2012-05-02 23:13:02 UTC (rev 2552) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.157 uuid: 9a11acbe-4a62-43ce-81de-934f351598cc + CCodeGenerator VMMaker.oscog-eem.159 uuid: cbf7f95a-6fe2-4578-898e-47afb8524be4 from - StackToRegisterMappingCogit VMMaker.oscog-eem.157 uuid: 9a11acbe-4a62-43ce-81de-934f351598cc + StackToRegisterMappingCogit VMMaker.oscog-eem.159 uuid: cbf7f95a-6fe2-4578-898e-47afb8524be4 */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.157 uuid: 9a11acbe-4a62-43ce-81de-934f351598cc " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.159 uuid: cbf7f95a-6fe2-4578-898e-47afb8524be4 " __DATE__ ; char *__cogitBuildInfo = __buildInfo; Modified: branches/Cog/src/vm/cogit.h =================================================================== --- branches/Cog/src/vm/cogit.h 2012-04-24 17:25:08 UTC (rev 2551) +++ branches/Cog/src/vm/cogit.h 2012-05-02 23:13:02 UTC (rev 2552) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.157 uuid: 9a11acbe-4a62-43ce-81de-934f351598cc + CCodeGenerator VMMaker.oscog-eem.159 uuid: cbf7f95a-6fe2-4578-898e-47afb8524be4 */ Modified: branches/Cog/src/vm/cogmethod.h =================================================================== --- branches/Cog/src/vm/cogmethod.h 2012-04-24 17:25:08 UTC (rev 2551) +++ branches/Cog/src/vm/cogmethod.h 2012-05-02 23:13:02 UTC (rev 2552) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.157 uuid: 9a11acbe-4a62-43ce-81de-934f351598cc + CCodeGenerator VMMaker.oscog-eem.159 uuid: cbf7f95a-6fe2-4578-898e-47afb8524be4 */ typedef struct { Modified: branches/Cog/src/vm/cointerp.c =================================================================== --- branches/Cog/src/vm/cointerp.c 2012-04-24 17:25:08 UTC (rev 2551) +++ branches/Cog/src/vm/cointerp.c 2012-05-02 23:13:02 UTC (rev 2552) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.157 uuid: 9a11acbe-4a62-43ce-81de-934f351598cc + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.159 uuid: cbf7f95a-6fe2-4578-898e-47afb8524be4 from - CoInterpreter VMMaker.oscog-eem.157 uuid: 9a11acbe-4a62-43ce-81de-934f351598cc + CoInterpreter VMMaker.oscog-eem.159 uuid: cbf7f95a-6fe2-4578-898e-47afb8524be4 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.157 uuid: 9a11acbe-4a62-43ce-81de-934f351598cc " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.159 uuid: cbf7f95a-6fe2-4578-898e-47afb8524be4 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -1906,7 +1906,7 @@ /* 575 */ (void (*)(void))0, 0 }; static void (*externalPrimitiveTable[MaxExternalPrimitiveTableSize + 1 /* 4097 */])(void); -const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.157]"; +const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.159]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; @@ -4295,7 +4295,7 @@ assert(isOopCompiledMethod(GIV(method))); # if MULTIPLEBYTECODESETS - bytecodeSetSelector = ((((headerOf(GIV(method))) >> 1)) < 0 + bytecodeSetSelector = (methodUsesAlternateBytecodeSet(GIV(method)) ? 256 : 0); @@ -4516,7 +4516,7 @@ assert(isOopCompiledMethod(GIV(method))); # if MULTIPLEBYTECODESETS - bytecodeSetSelector = ((((headerOf(GIV(method))) >> 1)) < 0 + bytecodeSetSelector = (methodUsesAlternateBytecodeSet(GIV(method)) ? 256 : 0); @@ -4562,7 +4562,7 @@ assert(isOopCompiledMethod(GIV(method))); # if MULTIPLEBYTECODESETS - bytecodeSetSelector = ((((headerOf(GIV(method))) >> 1)) < 0 + bytecodeSetSelector = (methodUsesAlternateBytecodeSet(GIV(method)) ? 256 : 0); @@ -5015,7 +5015,7 @@ assert(isOopCompiledMethod(GIV(method))); # if MULTIPLEBYTECODESETS - bytecodeSetSelector = ((((headerOf(GIV(method))) >> 1)) < 0 + bytecodeSetSelector = (methodUsesAlternateBytecodeSet(GIV(method)) ? 256 : 0); @@ -8682,7 +8682,7 @@ assert(isOopCompiledMethod(GIV(method))); # if MULTIPLEBYTECODESETS - bytecodeSetSelector = ((((headerOf(GIV(method))) >> 1)) < 0 + bytecodeSetSelector = (methodUsesAlternateBytecodeSet(GIV(method)) ? 256 : 0); @@ -9267,6 +9267,7 @@ attemptToSwitchToMachineCode(sqInt bcpc) { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt aCompiledMethodHeader; + sqInt aMethodOop; sqInt closure; CogMethod *cogMethod; CogBlockMethod *cogMethod1; @@ -9288,7 +9289,8 @@ } if (methodHasCogMethod(GIV(method))) { /* begin cogMethodOf: */ - methodHeader = longAt((GIV(method) + BaseHeaderSize) + (HeaderIndex << ShiftForWord)); + aMethodOop = GIV(method); + methodHeader = longAt((aMethodOop + BaseHeaderSize) + (HeaderIndex << ShiftForWord)); assert((isNonIntegerObject(methodHeader)) && ((((usqInt)methodHeader)) < (startOfMemory()))); cogMethod = ((CogMethod *) methodHeader); @@ -10026,7 +10028,7 @@ assert(isOopCompiledMethod(GIV(method))); # if MULTIPLEBYTECODESETS - bytecodeSetSelector = ((((headerOf(GIV(method))) >> 1)) < 0 + bytecodeSetSelector = (methodUsesAlternateBytecodeSet(GIV(method)) ? 256 : 0); @@ -10597,7 +10599,7 @@ assert(isOopCompiledMethod(GIV(method))); # if MULTIPLEBYTECODESETS - bytecodeSetSelector = ((((headerOf(GIV(method))) >> 1)) < 0 + bytecodeSetSelector = (methodUsesAlternateBytecodeSet(GIV(method)) ? 256 : 0); @@ -14716,7 +14718,7 @@ assert(isOopCompiledMethod(GIV(method))); # if MULTIPLEBYTECODESETS - bytecodeSetSelector = ((((headerOf(GIV(method))) >> 1)) < 0 + bytecodeSetSelector = (methodUsesAlternateBytecodeSet(GIV(method)) ? 256 : 0); @@ -21929,7 +21931,7 @@ assert(isOopCompiledMethod(GIV(method))); # if MULTIPLEBYTECODESETS - bytecodeSetSelector = ((((headerOf(GIV(method))) >> 1)) < 0 + bytecodeSetSelector = (methodUsesAlternateBytecodeSet(GIV(method)) ? 256 : 0); @@ -22201,7 +22203,17 @@ sqInt methodUsesAlternateBytecodeSet(sqInt aMethodObj) { - return (((headerOf(aMethodObj)) >> 1)) < 0; + sqInt methodHeader; + sqInt methodHeader1; + + /* begin headerIndicatesAlternateBytecodeSet: */ + /* begin headerOf: */ + methodHeader1 = longAt((aMethodObj + BaseHeaderSize) + (HeaderIndex << ShiftForWord)); + methodHeader = (isCogMethodReference(methodHeader1) + ? (assert(((((CogMethod *) methodHeader1)->objectHeader)) == (nullHeaderForMachineCodeMethod())), + (((CogMethod *) methodHeader1)->methodHeader)) + : methodHeader1); + return ((methodHeader >> 1)) < 0; } @@ -25474,7 +25486,7 @@ assert(isOopCompiledMethod(GIV(method))); # if MULTIPLEBYTECODESETS - bytecodeSetSelector = ((((headerOf(GIV(method))) >> 1)) < 0 + bytecodeSetSelector = (methodUsesAlternateBytecodeSet(GIV(method)) ? 256 : 0); @@ -25724,7 +25736,7 @@ assert(isOopCompiledMethod(GIV(method))); # if MULTIPLEBYTECODESETS - bytecodeSetSelector = ((((headerOf(GIV(method))) >> 1)) < 0 + bytecodeSetSelector = (methodUsesAlternateBytecodeSet(GIV(method)) ? 256 : 0); @@ -26008,7 +26020,7 @@ assert(isOopCompiledMethod(GIV(method))); # if MULTIPLEBYTECODESETS - bytecodeSetSelector = ((((headerOf(GIV(method))) >> 1)) < 0 + bytecodeSetSelector = (methodUsesAlternateBytecodeSet(GIV(method)) ? 256 : 0); @@ -40927,7 +40939,7 @@ assert(isOopCompiledMethod(GIV(method))); # if MULTIPLEBYTECODESETS - bytecodeSetSelector = ((((headerOf(GIV(method))) >> 1)) < 0 + bytecodeSetSelector = (methodUsesAlternateBytecodeSet(GIV(method)) ? 256 : 0); @@ -40979,7 +40991,7 @@ assert(isOopCompiledMethod(GIV(method))); # if MULTIPLEBYTECODESETS - bytecodeSetSelector = ((((headerOf(GIV(method))) >> 1)) < 0 + bytecodeSetSelector = (methodUsesAlternateBytecodeSet(GIV(method)) ? 256 : 0); @@ -41412,7 +41424,7 @@ assert(isOopCompiledMethod(GIV(method))); # if MULTIPLEBYTECODESETS - bytecodeSetSelector = ((((headerOf(GIV(method))) >> 1)) < 0 + bytecodeSetSelector = (methodUsesAlternateBytecodeSet(GIV(method)) ? 256 : 0); @@ -41645,7 +41657,7 @@ assert(isOopCompiledMethod(GIV(method))); # if MULTIPLEBYTECODESETS - bytecodeSetSelector = ((((headerOf(GIV(method))) >> 1)) < 0 + bytecodeSetSelector = (methodUsesAlternateBytecodeSet(GIV(method)) ? 256 : 0); @@ -44541,7 +44553,7 @@ assert(isOopCompiledMethod(GIV(method))); # if MULTIPLEBYTECODESETS - bytecodeSetSelector = ((((headerOf(GIV(method))) >> 1)) < 0 + bytecodeSetSelector = (methodUsesAlternateBytecodeSet(GIV(method)) ? 256 : 0); Modified: branches/Cog/src/vm/cointerp.h =================================================================== --- branches/Cog/src/vm/cointerp.h 2012-04-24 17:25:08 UTC (rev 2551) +++ branches/Cog/src/vm/cointerp.h 2012-05-02 23:13:02 UTC (rev 2552) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.157 uuid: 9a11acbe-4a62-43ce-81de-934f351598cc + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.159 uuid: cbf7f95a-6fe2-4578-898e-47afb8524be4 */ Modified: branches/Cog/src/vm/cointerpmt.c =================================================================== --- branches/Cog/src/vm/cointerpmt.c 2012-04-24 17:25:08 UTC (rev 2551) +++ branches/Cog/src/vm/cointerpmt.c 2012-05-02 23:13:02 UTC (rev 2552) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.157 uuid: 9a11acbe-4a62-43ce-81de-934f351598cc + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.159 uuid: cbf7f95a-6fe2-4578-898e-47afb8524be4 from - CoInterpreterMT VMMaker.oscog-eem.157 uuid: 9a11acbe-4a62-43ce-81de-934f351598cc + CoInterpreterMT VMMaker.oscog-eem.159 uuid: cbf7f95a-6fe2-4578-898e-47afb8524be4 */ -static char __buildInfo[] = "CoInterpreterMT VMMaker.oscog-eem.157 uuid: 9a11acbe-4a62-43ce-81de-934f351598cc " __DATE__ ; +static char __buildInfo[] = "CoInterpreterMT VMMaker.oscog-eem.159 uuid: cbf7f95a-6fe2-4578-898e-47afb8524be4 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2005,7 +2005,7 @@ /* 575 */ (void (*)(void))0, 0 }; static void (*externalPrimitiveTable[MaxExternalPrimitiveTableSize + 1 /* 4097 */])(void); -const char *interpreterVersion = "Croquet Closure Cog MT VM [CoInterpreterMT VMMaker.oscog-eem.157]"; +const char *interpreterVersion = "Croquet Closure Cog MT VM [CoInterpreterMT VMMaker.oscog-eem.159]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; sqInt willNotThreadWarnCount; @@ -4396,7 +4396,7 @@ assert(isOopCompiledMethod(GIV(method))); # if MULTIPLEBYTECODESETS - bytecodeSetSelector = ((((headerOf(GIV(method))) >> 1)) < 0 + bytecodeSetSelector = (methodUsesAlternateBytecodeSet(GIV(method)) ? 256 : 0); @@ -4617,7 +4617,7 @@ assert(isOopCompiledMethod(GIV(method))); # if MULTIPLEBYTECODESETS - bytecodeSetSelector = ((((headerOf(GIV(method))) >> 1)) < 0 + bytecodeSetSelector = (methodUsesAlternateBytecodeSet(GIV(method)) ? 256 : 0); @@ -4663,7 +4663,7 @@ assert(isOopCompiledMethod(GIV(method))); # if MULTIPLEBYTECODESETS - bytecodeSetSelector = ((((headerOf(GIV(method))) >> 1)) < 0 + bytecodeSetSelector = (methodUsesAlternateBytecodeSet(GIV(method)) ? 256 : 0); @@ -5116,7 +5116,7 @@ assert(isOopCompiledMethod(GIV(method))); # if MULTIPLEBYTECODESETS - bytecodeSetSelector = ((((headerOf(GIV(method))) >> 1)) < 0 + bytecodeSetSelector = (methodUsesAlternateBytecodeSet(GIV(method)) ? 256 : 0); @@ -8783,7 +8783,7 @@ assert(isOopCompiledMethod(GIV(method))); # if MULTIPLEBYTECODESETS - bytecodeSetSelector = ((((headerOf(GIV(method))) >> 1)) < 0 + bytecodeSetSelector = (methodUsesAlternateBytecodeSet(GIV(method)) ? 256 : 0); @@ -9368,6 +9368,7 @@ attemptToSwitchToMachineCode(sqInt bcpc) { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt aCompiledMethodHeader; + sqInt aMethodOop; sqInt closure; CogMethod *cogMethod; CogBlockMethod *cogMethod1; @@ -9389,7 +9390,8 @@ } if (methodHasCogMethod(GIV(method))) { /* begin cogMethodOf: */ - methodHeader = longAt((GIV(method) + BaseHeaderSize) + (HeaderIndex << ShiftForWord)); + aMethodOop = GIV(method); + methodHeader = longAt((aMethodOop + BaseHeaderSize) + (HeaderIndex << ShiftForWord)); assert((isNonIntegerObject(methodHeader)) && ((((usqInt)methodHeader)) < (startOfMemory()))); cogMethod = ((CogMethod *) methodHeader); @@ -10186,7 +10188,7 @@ assert(isOopCompiledMethod(GIV(method))); # if MULTIPLEBYTECODESETS - bytecodeSetSelector = ((((headerOf(GIV(method))) >> 1)) < 0 + bytecodeSetSelector = (methodUsesAlternateBytecodeSet(GIV(method)) ? 256 : 0); @@ -10934,7 +10936,7 @@ assert(isOopCompiledMethod(GIV(method))); # if MULTIPLEBYTECODESETS - bytecodeSetSelector = ((((headerOf(GIV(method))) >> 1)) < 0 + bytecodeSetSelector = (methodUsesAlternateBytecodeSet(GIV(method)) ? 256 : 0); @@ -15265,7 +15267,7 @@ assert(isOopCompiledMethod(GIV(method))); # if MULTIPLEBYTECODESETS - bytecodeSetSelector = ((((headerOf(GIV(method))) >> 1)) < 0 + bytecodeSetSelector = (methodUsesAlternateBytecodeSet(GIV(method)) ? 256 : 0); @@ -15982,7 +15984,7 @@ assert(isOopCompiledMethod(GIV(method))); # if MULTIPLEBYTECODESETS - bytecodeSetSelector = ((((headerOf(GIV(method))) >> 1)) < 0 + bytecodeSetSelector = (methodUsesAlternateBytecodeSet(GIV(method)) ? 256 : 0); @@ -22689,7 +22691,7 @@ assert(isOopCompiledMethod(GIV(method))); # if MULTIPLEBYTECODESETS - bytecodeSetSelector = ((((headerOf(GIV(method))) >> 1)) < 0 + bytecodeSetSelector = (methodUsesAlternateBytecodeSet(GIV(method)) ? 256 : 0); @@ -22961,7 +22963,17 @@ sqInt methodUsesAlternateBytecodeSet(sqInt aMethodObj) { - return (((headerOf(aMethodObj)) >> 1)) < 0; + sqInt methodHeader; + sqInt methodHeader1; + + /* begin headerIndicatesAlternateBytecodeSet: */ + /* begin headerOf: */ + methodHeader1 = longAt((aMethodObj + BaseHeaderSize) + (HeaderIndex << ShiftForWord)); + methodHeader = (isCogMethodReference(methodHeader1) + ? (assert(((((CogMethod *) methodHeader1)->objectHeader)) == (nullHeaderForMachineCodeMethod())), + (((CogMethod *) methodHeader1)->methodHeader)) + : methodHeader1); + return ((methodHeader >> 1)) < 0; } @@ -26682,7 +26694,7 @@ assert(isOopCompiledMethod(GIV(method))); # if MULTIPLEBYTECODESETS - bytecodeSetSelector = ((((headerOf(GIV(method))) >> 1)) < 0 + bytecodeSetSelector = (methodUsesAlternateBytecodeSet(GIV(method)) ? 256 : 0); @@ -26932,7 +26944,7 @@ assert(isOopCompiledMethod(GIV(method))); # if MULTIPLEBYTECODESETS - bytecodeSetSelector = ((((headerOf(GIV(method))) >> 1)) < 0 + bytecodeSetSelector = (methodUsesAlternateBytecodeSet(GIV(method)) ? 256 : 0); @@ -27216,7 +27228,7 @@ assert(isOopCompiledMethod(GIV(method))); # if MULTIPLEBYTECODESETS - bytecodeSetSelector = ((((headerOf(GIV(method))) >> 1)) < 0 + bytecodeSetSelector = (methodUsesAlternateBytecodeSet(GIV(method)) ? 256 : 0); @@ -42299,7 +42311,7 @@ assert(isOopCompiledMethod(GIV(method))); # if MULTIPLEBYTECODESETS - bytecodeSetSelector = ((((headerOf(GIV(method))) >> 1)) < 0 + bytecodeSetSelector = (methodUsesAlternateBytecodeSet(GIV(method)) ? 256 : 0); @@ -42393,7 +42405,7 @@ assert(isOopCompiledMethod(GIV(method))); # if MULTIPLEBYTECODESETS - bytecodeSetSelector = ((((headerOf(GIV(method))) >> 1)) < 0 + bytecodeSetSelector = (methodUsesAlternateBytecodeSet(GIV(method)) ? 256 : 0); @@ -42831,7 +42843,7 @@ assert(isOopCompiledMethod(GIV(method))); # if MULTIPLEBYTECODESETS - bytecodeSetSelector = ((((headerOf(GIV(method))) >> 1)) < 0 + bytecodeSetSelector = (methodUsesAlternateBytecodeSet(GIV(method)) ? 256 : 0); @@ -43064,7 +43076,7 @@ assert(isOopCompiledMethod(GIV(method))); # if MULTIPLEBYTECODESETS - bytecodeSetSelector = ((((headerOf(GIV(method))) >> 1)) < 0 + bytecodeSetSelector = (methodUsesAlternateBytecodeSet(GIV(method)) ? 256 : 0); Modified: branches/Cog/src/vm/cointerpmt.h =================================================================== --- branches/Cog/src/vm/cointerpmt.h 2012-04-24 17:25:08 UTC (rev 2551) +++ branches/Cog/src/vm/cointerpmt.h 2012-05-02 23:13:02 UTC (rev 2552) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.157 uuid: 9a11acbe-4a62-43ce-81de-934f351598cc + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.159 uuid: cbf7f95a-6fe2-4578-898e-47afb8524be4 */ Modified: branches/Cog/src/vm/gcc3x-cointerp.c =================================================================== --- branches/Cog/src/vm/gcc3x-cointerp.c 2012-04-24 17:25:08 UTC (rev 2551) +++ branches/Cog/src/vm/gcc3x-cointerp.c 2012-05-02 23:13:02 UTC (rev 2552) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.157 uuid: 9a11acbe-4a62-43ce-81de-934f351598cc + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.159 uuid: cbf7f95a-6fe2-4578-898e-47afb8524be4 from - CoInterpreter VMMaker.oscog-eem.157 uuid: 9a11acbe-4a62-43ce-81de-934f351598cc + CoInterpreter VMMaker.oscog-eem.159 uuid: cbf7f95a-6fe2-4578-898e-47afb8524be4 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.157 uuid: 9a11acbe-4a62-43ce-81de-934f351598cc " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.159 uuid: cbf7f95a-6fe2-4578-898e-47afb8524be4 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -1909,7 +1909,7 @@ /* 575 */ (void (*)(void))0, 0 }; static void (*externalPrimitiveTable[MaxExternalPrimitiveTableSize + 1 /* 4097 */])(void); -const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.157]"; +const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.159]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; @@ -4299,7 +4299,7 @@ assert(isOopCompiledMethod(GIV(method))); # if MULTIPLEBYTECODESETS - bytecodeSetSelector = ((((headerOf(GIV(method))) >> 1)) < 0 + bytecodeSetSelector = (methodUsesAlternateBytecodeSet(GIV(method)) ? 256 : 0); @@ -4520,7 +4520,7 @@ assert(isOopCompiledMethod(GIV(method))); # if MULTIPLEBYTECODESETS - bytecodeSetSelector = ((((headerOf(GIV(method))) >> 1)) < 0 + bytecodeSetSelector = (methodUsesAlternateBytecodeSet(GIV(method)) ? 256 : 0); @@ -4566,7 +4566,7 @@ assert(isOopCompiledMethod(GIV(method))); # if MULTIPLEBYTECODESETS - bytecodeSetSelector = ((((headerOf(GIV(method))) >> 1)) < 0 + bytecodeSetSelector = (methodUsesAlternateBytecodeSet(GIV(method)) ? 256 : 0); @@ -5019,7 +5019,7 @@ assert(isOopCompiledMethod(GIV(method))); # if MULTIPLEBYTECODESETS - bytecodeSetSelector = ((((headerOf(GIV(method))) >> 1)) < 0 + bytecodeSetSelector = (methodUsesAlternateBytecodeSet(GIV(method)) ? 256 : 0); @@ -8686,7 +8686,7 @@ assert(isOopCompiledMethod(GIV(method))); # if MULTIPLEBYTECODESETS - bytecodeSetSelector = ((((headerOf(GIV(method))) >> 1)) < 0 + bytecodeSetSelector = (methodUsesAlternateBytecodeSet(GIV(method)) ? 256 : 0); @@ -9271,6 +9271,7 @@ attemptToSwitchToMachineCode(sqInt bcpc) { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt aCompiledMethodHeader; + sqInt aMethodOop; sqInt closure; CogMethod *cogMethod; CogBlockMethod *cogMethod1; @@ -9292,7 +9293,8 @@ } if (methodHasCogMethod(GIV(method))) { /* begin cogMethodOf: */ - methodHeader = longAt((GIV(method) + BaseHeaderSize) + (HeaderIndex << ShiftForWord)); + aMethodOop = GIV(method); + methodHeader = longAt((aMethodOop + BaseHeaderSize) + (HeaderIndex << ShiftForWord)); assert((isNonIntegerObject(methodHeader)) && ((((usqInt)methodHeader)) < (startOfMemory()))); cogMethod = ((CogMethod *) methodHeader); @@ -10030,7 +10032,7 @@ assert(isOopCompiledMethod(GIV(method))); # if MULTIPLEBYTECODESETS - bytecodeSetSelector = ((((headerOf(GIV(method))) >> 1)) < 0 + bytecodeSetSelector = (methodUsesAlternateBytecodeSet(GIV(method)) ? 256 : 0); @@ -10601,7 +10603,7 @@ assert(isOopCompiledMethod(GIV(method))); # if MULTIPLEBYTECODESETS - bytecodeSetSelector = ((((headerOf(GIV(method))) >> 1)) < 0 + bytecodeSetSelector = (methodUsesAlternateBytecodeSet(GIV(method)) ? 256 : 0); @@ -14720,7 +14722,7 @@ assert(isOopCompiledMethod(GIV(method))); # if MULTIPLEBYTECODESETS - bytecodeSetSelector = ((((headerOf(GIV(method))) >> 1)) < 0 + bytecodeSetSelector = (methodUsesAlternateBytecodeSet(GIV(method)) ? 256 : 0); @@ -21933,7 +21935,7 @@ assert(isOopCompiledMethod(GIV(method))); # if MULTIPLEBYTECODESETS - bytecodeSetSelector = ((((headerOf(GIV(method))) >> 1)) < 0 + bytecodeSetSelector = (methodUsesAlternateBytecodeSet(GIV(method)) ? 256 : 0); @@ -22205,7 +22207,17 @@ sqInt methodUsesAlternateBytecodeSet(sqInt aMethodObj) { - return (((headerOf(aMethodObj)) >> 1)) < 0; + sqInt methodHeader; + sqInt methodHeader1; + + /* begin headerIndicatesAlternateBytecodeSet: */ + /* begin headerOf: */ + methodHeader1 = longAt((aMethodObj + BaseHeaderSize) + (HeaderIndex << ShiftForWord)); + methodHeader = (isCogMethodReference(methodHeader1) + ? (assert(((((CogMethod *) methodHeader1)->objectHeader)) == (nullHeaderForMachineCodeMethod())), + (((CogMethod *) methodHeader1)->methodHeader)) + : methodHeader1); + return ((methodHeader >> 1)) < 0; } @@ -25478,7 +25490,7 @@ assert(isOopCompiledMethod(GIV(method))); # if MULTIPLEBYTECODESETS - bytecodeSetSelector = ((((headerOf(GIV(method))) >> 1)) < 0 + bytecodeSetSelector = (methodUsesAlternateBytecodeSet(GIV(method)) ? 256 : 0); @@ -25728,7 +25740,7 @@ assert(isOopCompiledMethod(GIV(method))); # if MULTIPLEBYTECODESETS - bytecodeSetSelector = ((((headerOf(GIV(method))) >> 1)) < 0 + bytecodeSetSelector = (methodUsesAlternateBytecodeSet(GIV(method)) ? 256 : 0); @@ -26012,7 +26024,7 @@ assert(isOopCompiledMethod(GIV(method))); # if MULTIPLEBYTECODESETS - bytecodeSetSelector = ((((headerOf(GIV(method))) >> 1)) < 0 + bytecodeSetSelector = (methodUsesAlternateBytecodeSet(GIV(method)) ? 256 : 0); @@ -40931,7 +40943,7 @@ assert(isOopCompiledMethod(GIV(method))); # if MULTIPLEBYTECODESETS - bytecodeSetSelector = ((((headerOf(GIV(method))) >> 1)) < 0 + bytecodeSetSelector = (methodUsesAlternateBytecodeSet(GIV(method)) ? 256 : 0); @@ -40983,7 +40995,7 @@ assert(isOopCompiledMethod(GIV(method))); # if MULTIPLEBYTECODESETS - bytecodeSetSelector = ((((headerOf(GIV(method))) >> 1)) < 0 + bytecodeSetSelector = (methodUsesAlternateBytecodeSet(GIV(method)) ? 256 : 0); @@ -41416,7 +41428,7 @@ assert(isOopCompiledMethod(GIV(method))); # if MULTIPLEBYTECODESETS - bytecodeSetSelector = ((((headerOf(GIV(method))) >> 1)) < 0 + bytecodeSetSelector = (methodUsesAlternateBytecodeSet(GIV(method)) ? 256 : 0); @@ -41649,7 +41661,7 @@ assert(isOopCompiledMethod(GIV(method))); # if MULTIPLEBYTECODESETS - bytecodeSetSelector = ((((headerOf(GIV(method))) >> 1)) < 0 + bytecodeSetSelector = (methodUsesAlternateBytecodeSet(GIV(method)) ? 256 : 0); @@ -44545,7 +44557,7 @@ assert(isOopCompiledMethod(GIV(method))); # if MULTIPLEBYTECODESETS - bytecodeSetSelector = ((((headerOf(GIV(method))) >> 1)) < 0 + bytecodeSetSelector = (methodUsesAlternateBytecodeSet(GIV(method)) ? 256 : 0); Modified: branches/Cog/src/vm/gcc3x-cointerpmt.c =================================================================== --- branches/Cog/src/vm/gcc3x-cointerpmt.c 2012-04-24 17:25:08 UTC (rev 2551) +++ branches/Cog/src/vm/gcc3x-cointerpmt.c 2012-05-02 23:13:02 UTC (rev 2552) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.157 uuid: 9a11acbe-4a62-43ce-81de-934f351598cc + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.159 uuid: cbf7f95a-6fe2-4578-898e-47afb8524be4 from - CoInterpreterMT VMMaker.oscog-eem.157 uuid: 9a11acbe-4a62-43ce-81de-934f351598cc + CoInterpreterMT VMMaker.oscog-eem.159 uuid: cbf7f95a-6fe2-4578-898e-47afb8524be4 */ -static char __buildInfo[] = "CoInterpreterMT VMMaker.oscog-eem.157 uuid: 9a11acbe-4a62-43ce-81de-934f351598cc " __DATE__ ; +static char __buildInfo[] = "CoInterpreterMT VMMaker.oscog-eem.159 uuid: cbf7f95a-6fe2-4578-898e-47afb8524be4 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2008,7 +2008,7 @@ /* 575 */ (void (*)(void))0, 0 }; static void (*externalPrimitiveTable[MaxExternalPrimitiveTableSize + 1 /* 4097 */])(void); -const char *interpreterVersion = "Croquet Closure Cog MT VM [CoInterpreterMT VMMaker.oscog-eem.157]"; +const char *interpreterVersion = "Croquet Closure Cog MT VM [CoInterpreterMT VMMaker.oscog-eem.159]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; sqInt willNotThreadWarnCount; @@ -4400,7 +4400,7 @@ assert(isOopCompiledMethod(GIV(method))); # if MULTIPLEBYTECODESETS - bytecodeSetSelector = ((((headerOf(GIV(method))) >> 1)) < 0 + bytecodeSetSelector = (methodUsesAlternateBytecodeSet(GIV(method)) ? 256 : 0); @@ -4621,7 +4621,7 @@ assert(isOopCompiledMethod(GIV(method))); # if MULTIPLEBYTECODESETS - bytecodeSetSelector = ((((headerOf(GIV(method))) >> 1)) < 0 + bytecodeSetSelector = (methodUsesAlternateBytecodeSet(GIV(method)) ? 256 : 0); @@ -4667,7 +4667,7 @@ assert(isOopCompiledMethod(GIV(method))); # if MULTIPLEBYTECODESETS - bytecodeSetSelector = ((((headerOf(GIV(method))) >> 1)) < 0 + bytecodeSetSelector = (methodUsesAlternateBytecodeSet(GIV(method)) ? 256 : 0); @@ -5120,7 +5120,7 @@ assert(isOopCompiledMethod(GIV(method))); # if MULTIPLEBYTECODESETS - bytecodeSetSelector = ((((headerOf(GIV(method))) >> 1)) < 0 + bytecodeSetSelector = (methodUsesAlternateBytecodeSet(GIV(method)) ? 256 : 0); @@ -8787,7 +8787,7 @@ assert(isOopCompiledMethod(GIV(method))); # if MULTIPLEBYTECODESETS - bytecodeSetSelector = ((((headerOf(GIV(method))) >> 1)) < 0 + bytecodeSetSelector = (methodUsesAlternateBytecodeSet(GIV(method)) ? 256 : 0); @@ -9372,6 +9372,7 @@ attemptToSwitchToMachineCode(sqInt bcpc) { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt aCompiledMethodHeader; + sqInt aMethodOop; sqInt closure; CogMethod *cogMethod; CogBlockMethod *cogMethod1; @@ -9393,7 +9394,8 @@ } if (methodHasCogMethod(GIV(method))) { /* begin cogMethodOf: */ - methodHeader = longAt((GIV(method) + BaseHeaderSize) + (HeaderIndex << ShiftForWord)); + aMethodOop = GIV(method); + methodHeader = longAt((aMethodOop + BaseHeaderSize) + (HeaderIndex << ShiftForWord)); assert((isNonIntegerObject(methodHeader)) && ((((usqInt)methodHeader)) < (startOfMemory()))); cogMethod = ((CogMethod *) methodHeader); @@ -10190,7 +10192,7 @@ assert(isOopCompiledMethod(GIV(method))); # if MULTIPLEBYTECODESETS - bytecodeSetSelector = ((((headerOf(GIV(method))) >> 1)) < 0 + bytecodeSetSelector = (methodUsesAlternateBytecodeSet(GIV(method)) ? 256 : 0); @@ -10938,7 +10940,7 @@ assert(isOopCompiledMethod(GIV(method))); # if MULTIPLEBYTECODESETS - bytecodeSetSelector = ((((headerOf(GIV(method))) >> 1)) < 0 + bytecodeSetSelector = (methodUsesAlternateBytecodeSet(GIV(method)) ? 256 : 0); @@ -15269,7 +15271,7 @@ assert(isOopCompiledMethod(GIV(method))); # if MULTIPLEBYTECODESETS - bytecodeSetSelector = ((((headerOf(GIV(method))) >> 1)) < 0 + bytecodeSetSelector = (methodUsesAlternateBytecodeSet(GIV(method)) ? 256 : 0); @@ -15986,7 +15988,7 @@ assert(isOopCompiledMethod(GIV(method))); # if MULTIPLEBYTECODESETS - bytecodeSetSelector = ((((headerOf(GIV(method))) >> 1)) < 0 + bytecodeSetSelector = (methodUsesAlternateBytecodeSet(GIV(method)) ? 256 : 0); @@ -22693,7 +22695,7 @@ assert(isOopCompiledMethod(GIV(method))); # if MULTIPLEBYTECODESETS - bytecodeSetSelector = ((((headerOf(GIV(method))) >> 1)) < 0 + bytecodeSetSelector = (methodUsesAlternateBytecodeSet(GIV(method)) ? 256 : 0); @@ -22965,7 +22967,17 @@ sqInt methodUsesAlternateBytecodeSet(sqInt aMethodObj) { - return (((headerOf(aMethodObj)) >> 1)) < 0; + sqInt methodHeader; + sqInt methodHeader1; + + /* begin headerIndicatesAlternateBytecodeSet: */ + /* begin headerOf: */ + methodHeader1 = longAt((aMethodObj + BaseHeaderSize) + (HeaderIndex << ShiftForWord)); + methodHeader = (isCogMethodReference(methodHeader1) + ? (assert(((((CogMethod *) methodHeader1)->objectHeader)) == (nullHeaderForMachineCodeMethod())), + (((CogMethod *) methodHeader1)->methodHeader)) + : methodHeader1); + return ((methodHeader >> 1)) < 0; } @@ -26686,7 +26698,7 @@ assert(isOopCompiledMethod(GIV(method))); # if MULTIPLEBYTECODESETS - bytecodeSetSelector = ((((headerOf(GIV(method))) >> 1)) < 0 + bytecodeSetSelector = (methodUsesAlternateBytecodeSet(GIV(method)) ? 256 : 0); @@ -26936,7 +26948,7 @@ assert(isOopCompiledMethod(GIV(method))); # if MULTIPLEBYTECODESETS - bytecodeSetSelector = ((((headerOf(GIV(method))) >> 1)) < 0 + bytecodeSetSelector = (methodUsesAlternateBytecodeSet(GIV(method)) ? 256 : 0); @@ -27220,7 +27232,7 @@ assert(isOopCompiledMethod(GIV(method))); # if MULTIPLEBYTECODESETS - bytecodeSetSelector = ((((headerOf(GIV(method))) >> 1)) < 0 + bytecodeSetSelector = (methodUsesAlternateBytecodeSet(GIV(method)) ? 256 : 0); @@ -42303,7 +42315,7 @@ assert(isOopCompiledMethod(GIV(method))); # if MULTIPLEBYTECODESETS - bytecodeSetSelector = ((((headerOf(GIV(method))) >> 1)) < 0 + bytecodeSetSelector = (methodUsesAlternateBytecodeSet(GIV(method)) ? 256 : 0); @@ -42397,7 +42409,7 @@ assert(isOopCompiledMethod(GIV(method))); # if MULTIPLEBYTECODESETS - bytecodeSetSelector = ((((headerOf(GIV(method))) >> 1)) < 0 + bytecodeSetSelector = (methodUsesAlternateBytecodeSet(GIV(method)) ? 256 : 0); @@ -42835,7 +42847,7 @@ assert(isOopCompiledMethod(GIV(method))); # if MULTIPLEBYTECODESETS - bytecodeSetSelector = ((((headerOf(GIV(method))) >> 1)) < 0 + bytecodeSetSelector = (methodUsesAlternateBytecodeSet(GIV(method)) ? 256 : 0); @@ -43068,7 +43080,7 @@ assert(isOopCompiledMethod(GIV(method))); # if MULTIPLEBYTECODESETS - bytecodeSetSelector = ((((headerOf(GIV(method))) >> 1)) < 0 + bytecodeSetSelector = (methodUsesAlternateBytecodeSet(GIV(method)) ? 256 : 0); Modified: branches/Cog/src/vm/interp.h =================================================================== --- branches/Cog/src/vm/interp.h 2012-04-24 17:25:08 UTC (rev 2551) +++ branches/Cog/src/vm/interp.h 2012-05-02 23:13:02 UTC (rev 2552) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.157 uuid: 9a11acbe-4a62-43ce-81de-934f351598cc + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.159 uuid: cbf7f95a-6fe2-4578-898e-47afb8524be4 */ #define VM_PROXY_MAJOR 1 Modified: branches/Cog/src/vm/vmCallback.h =================================================================== --- branches/Cog/src/vm/vmCallback.h 2012-04-24 17:25:08 UTC (rev 2551) +++ branches/Cog/src/vm/vmCallback.h 2012-05-02 23:13:02 UTC (rev 2552) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.157 uuid: 9a11acbe-4a62-43ce-81de-934f351598cc + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.159 uuid: cbf7f95a-6fe2-4578-898e-47afb8524be4 */ #define VM_CALLBACK_INC 1 Modified: branches/Cog/stackbuild/macbuild/Mpeg3Plugin/Mpeg3Plugin.xcodeproj/project.pbxproj =================================================================== --- branches/Cog/stackbuild/macbuild/Mpeg3Plugin/Mpeg3Plugin.xcodeproj/project.pbxproj 2012-04-24 17:25:08 UTC (rev 2551) +++ branches/Cog/stackbuild/macbuild/Mpeg3Plugin/Mpeg3Plugin.xcodeproj/project.pbxproj 2012-05-02 23:13:02 UTC (rev 2552) @@ -37,7 +37,6 @@ A2181C3810814EC700B8FC7A /* seek.c in Sources */ = {isa = PBXBuildFile; fileRef = A2181C0810814EC700B8FC7A /* seek.c */; }; A2181C3910814EC700B8FC7A /* slice.c in Sources */ = {isa = PBXBuildFile; fileRef = A2181C0910814EC700B8FC7A /* slice.c */; }; A2181C3A10814EC700B8FC7A /* vlc.c in Sources */ = {isa = PBXBuildFile; fileRef = A2181C0B10814EC700B8FC7A /* vlc.c */; }; - A2181C421081506400B8FC7A /* sqMacFileBits.c in Sources */ = {isa = PBXBuildFile; fileRef = A2181C401081506400B8FC7A /* sqMacFileBits.c */; }; A2181C46108150C800B8FC7A /* Mpeg3Plugin.c in Sources */ = {isa = PBXBuildFile; fileRef = A2181C45108150C800B8FC7A /* Mpeg3Plugin.c */; }; /* End PBXBuildFile section */ @@ -102,8 +101,6 @@ A2181C0A10814EC700B8FC7A /* slice.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = slice.h; sourceTree = "<group>"; }; A2181C0B10814EC700B8FC7A /* vlc.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = vlc.c; sourceTree = "<group>"; }; A2181C0C10814EC700B8FC7A /* vlc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = vlc.h; sourceTree = "<group>"; }; - A2181C401081506400B8FC7A /* sqMacFileBits.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = sqMacFileBits.c; path = "../../../platforms/Mac OS/plugins/Mpeg3Plugin/sqMacFileBits.c"; sourceTree = SOURCE_ROOT; }; - A2181C411081506400B8FC7A /* sqMacFileBits.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = sqMacFileBits.h; path = "../../../platforms/Mac OS/plugins/Mpeg3Plugin/sqMacFileBits.h"; sourceTree = SOURCE_ROOT; }; A2181C45108150C800B8FC7A /* Mpeg3Plugin.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = Mpeg3Plugin.c; path = ../../../src/plugins/Mpeg3Plugin/Mpeg3Plugin.c; sourceTree = SOURCE_ROOT; }; A2181C491081511C00B8FC7A /* Mpeg3Plugin.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Mpeg3Plugin.h; path = ../../../platforms/Cross/plugins/Mpeg3Plugin/Mpeg3Plugin.h; sourceTree = SOURCE_ROOT; }; /* End PBXFileReference section */ @@ -135,8 +132,6 @@ children = ( A2181C491081511C00B8FC7A /* Mpeg3Plugin.h */, A2181C45108150C800B8FC7A /* Mpeg3Plugin.c */, - A2181C401081506400B8FC7A /* sqMacFileBits.c */, - A2181C411081506400B8FC7A /* sqMacFileBits.h */, A2181BC610814EC700B8FC7A /* libmpeg */, A2181BC510814EA000B8FC7A /* config.h */, A2181BC410814E7000B8FC7A /* interp.h */, @@ -331,7 +326,6 @@ A2181C3810814EC700B8FC7A /* seek.c in Sources */, A2181C3910814EC700B8FC7A /* slice.c in Sources */, A2181C3A10814EC700B8FC7A /* vlc.c in Sources */, - A2181C421081506400B8FC7A /* sqMacFileBits.c in Sources */, A2181C46108150C800B8FC7A /* Mpeg3Plugin.c in Sources */, ); runOnlyForDeploymentPostprocessing = 0; Modified: branches/Cog/stacksrc/vm/gcc3x-interp.c =================================================================== --- branches/Cog/stacksrc/vm/gcc3x-interp.c 2012-04-24 17:25:08 UTC (rev 2551) +++ branches/Cog/stacksrc/vm/gcc3x-interp.c 2012-05-02 23:13:02 UTC (rev 2552) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.152 uuid: d39d62b0-45ca-4621-8f67-e3981bbe1875 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.159 uuid: cbf7f95a-6fe2-4578-898e-47afb8524be4 from - StackInterpreter VMMaker.oscog-eem.152 uuid: d39d62b0-45ca-4621-8f67-e3981bbe1875 + StackInterpreter VMMaker.oscog-eem.159 uuid: cbf7f95a-6fe2-4578-898e-47afb8524be4 */ -static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.152 uuid: d39d62b0-45ca-4621-8f67-e3981bbe1875 " __DATE__ ; +static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.159 uuid: cbf7f95a-6fe2-4578-898e-47afb8524be4 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -188,6 +188,7 @@ #define ImmutabilityBit 0x20000000 #define InstanceSpecificationIndex 2 #define InstructionPointerIndex 1 +#define KeyIndex 0 #define LargeContextBit 0x40000 #define LargeContextBytes 252 #define LargeContextSize 252 @@ -519,6 +520,7 @@ static sqInt loadImageSegmentFromoutPointers(sqInt segmentWordArray, sqInt outPointerArray); void loadInitialContext(void); void longPrintOop(sqInt oop); +void longPrintReferencesTo(sqInt anOop); static sqInt lookupInMethodCacheSelclass(sqInt selector, sqInt class); static sqInt lookupMethodInClass(sqInt class); static sqInt lookupMethodInDictionary(sqInt dictionary); @@ -537,6 +539,7 @@ static sqInt markStackPageMostRecentlyUsed(StackPage *page); static sqInt markStackPageNextMostRecentlyUsed(StackPage *page); static sqInt marriedContextpointsTostackDeltaForCurrentFrame(sqInt spouseContext, sqInt anOop, sqInt stackDeltaForCurrentFrame); +static void marryContextInNewStackPageAndInitializeInterpreterRegisters(sqInt aContext); static sqInt marryFrameSP(char *theFP, char *theSP); sqInt maybeSplObj(sqInt index); sqInt methodArgumentCount(void); @@ -564,6 +567,7 @@ sqInt oopFromChunk(sqInt chunk); static sqInt oopHasAcceptableClass(sqInt signedOop); static sqInt oopHasOkayClass(sqInt signedOop); +static sqInt oopisGreaterThanOrEqualTo(sqInt anOop, sqInt otherOop); static sqInt oopisGreaterThanandLessThan(sqInt anOop, sqInt baseOop, sqInt limitOop); static sqInt oopisLessThan(sqInt anOop, sqInt otherOop); static sqInt pageIndexFor(void *pointer); @@ -971,16 +975,16 @@ _iss usqInt youngStart; _iss sqInt messageSelector; _iss usqInt newMethod; +_iss usqInt endOfMemory; _iss usqInt instructionPointer; -_iss usqInt endOfMemory; _iss sqInt rootTableCount; _iss sqInt remapBufferCount; _iss sqInt trueObj; _iss sqInt falseObj; _iss StackPage * pages; -_iss char * stackLimit; _iss sqInt lkupClass; _iss usqInt reserveStart; +_iss char * stackLimit; _iss char * stackMemory; _iss sqInt bytesPerPage; _iss usqInt memoryLimit; @@ -1010,12 +1014,12 @@ _iss sqInt statGrowMemory; _iss sqInt statMarkCount; _iss sqInt classNameIndex; +_iss sqInt coInterpreter; _iss sqInt lastMethodCacheProbeWrite; _iss sqInt lowSpaceThreshold; _iss sqInt profileSemaphore; _iss usqLong statGCEndUsecs; _iss sqInt statSweepCount; -_iss sqInt coInterpreter; _iss usqInt compEnd; _iss sqInt metaclassSizeBytes; _iss sqInt pendingFinalizationSignals; @@ -1326,7 +1330,7 @@ /* 212 */ primitiveContextSize, /* 213 */ primitiveContextXray, /* 214 */ primitiveVoidVMState, - /* 215 */ (void (*)(void))0, + /* 215 */ primitiveFlushCacheByMethod, /* 216 */ (void (*)(void))0, /* 217 */ (void (*)(void))0, /* 218 */ primitiveDoNamedPrimitiveWithArgs, @@ -1690,7 +1694,7 @@ 0 }; char * breakSelector; sqInt breakSelectorLength = -1; -const char *interpreterVersion = "Croquet Closure Stack VM [StackInterpreter VMMaker.oscog-eem.152]"; +const char *interpreterVersion = "Croquet Closure Stack VM [StackInterpreter VMMaker.oscog-eem.159]"; volatile int sendTrace; sqInt suppressHeartbeatFlag; @@ -7161,8 +7165,11 @@ goto l92; } else { - result = (((byteAt((rcvr + BaseHeaderSize) + (((index >> 1)) - 1))) << 1) | 1); - goto l92; + if ((fmt < 12) + || (((index >> 1)) >= (((((((usqInt) (longAt((rcvr + BaseHeaderSize) + (HeaderIndex << ShiftForWord)))) >> 10) & 255) + LiteralStart) * BytesPerWord) + 1))) { + result = (((byteAt((rcvr + BaseHeaderSize) + (((index >> 1)) - 1))) << 1) | 1); + goto l92; + } } } /* begin primitiveFailFor: */ @@ -7240,25 +7247,25 @@ goto l94; } if (fmt >= 16) { - - /* Note fmt >= 16 is an artificial flag for strings */ - - valToPut = asciiOfCharacter(value); - if (!(!GIV(primFailCode))) { + if (!(isinstanceOfcompactClassIndex(value, longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassCharacter << ShiftForWord)), 0))) { + GIV(primFailCode) = PrimErrBadArgument; goto l94; } + valToPut = longAt((value + BaseHeaderSize) + (CharacterValueIndex << ShiftForWord)); } else { + if ((fmt >= 12) + && (((index >> 1)) < (((((((usqInt) (longAt((rcvr + BaseHeaderSize) + (HeaderIndex << ShiftForWord)))) >> 10) & 255) + LiteralStart) * BytesPerWord) + 1))) { + GIV(primFailCode) = PrimErrBadIndex; + goto l94; + } valToPut = value; } if ((valToPut & 1)) { valToPut = (valToPut >> 1); if (!((valToPut >= 0) && (valToPut <= 255))) { - /* begin primitiveFail */ - if (!GIV(primFailCode)) { - GIV(primFailCode) = 1; - } + GIV(primFailCode) = PrimErrBadArgument; goto l94; } byteAtput((rcvr + BaseHeaderSize) + (((index >> 1)) - 1), valToPut); @@ -9990,25 +9997,25 @@ goto l1; } if (fmt >= 16) { - - /* Note fmt >= 16 is an artificial flag for strings */ - - valToPut = asciiOfCharacter(value); - if (!(!GIV(primFailCode))) { + if (!(isinstanceOfcompactClassIndex(value, longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassCharacter << ShiftForWord)), 0))) { + GIV(primFailCode) = PrimErrBadArgument; goto l1; } + valToPut = longAt((value + BaseHeaderSize) + (CharacterValueIndex << ShiftForWord)); } else { + if ((fmt >= 12) + && (index < (((((((usqInt) (longAt((rcvr + BaseHeaderSize) + (HeaderIndex << ShiftForWord)))) >> 10) & 255) + LiteralStart) * BytesPerWord) + 1))) { + GIV(primFailCode) = PrimErrBadIndex; + goto l1; + } valToPut = value; } if ((valToPut & 1)) { valToPut = (valToPut >> 1); if (!((valToPut >= 0) && (valToPut <= 255))) { - /* begin primitiveFail */ - if (!GIV(primFailCode)) { - GIV(primFailCode) = 1; - } + GIV(primFailCode) = PrimErrBadArgument; goto l1; } byteAtput((rcvr + BaseHeaderSize) + (index - 1), valToPut); @@ -10126,8 +10133,11 @@ goto l1; } else { - result = (((byteAt((rcvr + BaseHeaderSize) + (index - 1))) << 1) | 1); - goto l1; + if ((fmt < 12) + || (index >= (((((((usqInt) (longAt((rcvr + BaseHeaderSize) + (HeaderIndex << ShiftForWord)))) >> 10) & 255) + LiteralStart) * BytesPerWord) + 1))) { + result = (((byteAt((rcvr + BaseHeaderSize) + (index - 1))) << 1) | 1); + goto l1; + } } } /* begin primitiveFailFor: */ @@ -11531,7 +11541,6 @@ char *theSP1; sqInt valuePointer; - assert(theFP != GIV(framePointer)); assert((GIV(stackPage) == 0) || (GIV(stackPage) == (mostRecentlyUsedPage()))); /* begin stackPageFor: */ @@ -14410,13 +14419,9 @@ { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt activeContext; sqInt activeProc; - sqInt aMethodObj; - StackPage *newPage; sqInt stackPageBytes; sqInt stackPagesBytes; - char *theFP; void *theStackMemory; - sqInt top; stackPageBytes = stackPageByteSize(); stackPagesBytes = computeStackZoneSize(); @@ -14430,36 +14435,7 @@ } activeProc = longAt(((longAt(((longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (SchedulerAssociation << ShiftForWord))) + BaseHeaderSize) + (ValueIndex << ShiftForWord))) + BaseHeaderSize) + (ActiveProcessIndex << ShiftForWord)); activeContext = longAt((activeProc + BaseHeaderSize) + (SuspendedContextIndex << ShiftForWord)); - /* begin marryContextInNewStackPageAndInitializeInterpreterRegisters: */ - VM_LABEL(0marryContextInNewStackPageAndInitializeInterpreterRegisters); - assert(GIV(stackPage) == 0); - newPage = makeBaseFrameFor(activeContext); - /* begin setStackPageAndLimit: */ - GIV(stackPage) = newPage; - if (GIV(stackLimit) != (((char *) (((usqInt) -1))))) { - GIV(stackLimit) = (GIV(stackPage)->stackLimit); - } - markStackPageMostRecentlyUsed(newPage); - GIV(framePointer) = (GIV(stackPage)->headFP); - GIV(stackPointer) = (GIV(stackPage)->headSP); - /* begin setMethod: */ - /* begin iframeMethod: */ - theFP = (GIV(stackPage)->headFP); - aMethodObj = longAt(theFP + FoxMethod); - GIV(method) = aMethodObj; - assert(isOopCompiledMethod(GIV(method))); - -# if MULTIPLEBYTECODESETS - bytecodeSetSelector = ((((longAt((GIV(method) + BaseHeaderSize) + (HeaderIndex << ShiftForWord))) >> 1)) < 0 - ? 256 - : 0); - -# endif /* MULTIPLEBYTECODESETS */ - - /* begin popStack */ - top = longAt(GIV(stackPointer)); - GIV(stackPointer) += BytesPerWord; - GIV(instructionPointer) = ((sqInt) top); + marryContextInNewStackPageAndInitializeInterpreterRegisters(activeContext); ioInitHeartbeat(); interpret(); return null; @@ -15152,7 +15128,8 @@ StackPage *thePage; sqInt value; - assert(isContext(aOnceMarriedContext)); + assert((isContext(aOnceMarriedContext)) + && (isMarriedOrWidowedContext(aOnceMarriedContext))); /* begin frameOfMarriedContext: */ value = longAt((aOnceMarriedContext + BaseHeaderSize) + (SenderIndex << ShiftForWord)); /* begin withoutSmallIntegerTags: */ @@ -15913,10 +15890,6 @@ { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt activeContext; sqInt activeProc; - sqInt aMethodObj; - StackPage *newPage; - char *theFP; - sqInt top; if ((checkForLeaks & 1) != 0) { clearLeakMapAndMapAccessibleObjects(); @@ -15924,36 +15897,7 @@ } activeProc = longAt(((longAt(((longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (SchedulerAssociation << ShiftForWord))) + BaseHeaderSize) + (ValueIndex << ShiftForWord))) + BaseHeaderSize) + (ActiveProcessIndex << ShiftForWord)); activeContext = longAt((activeProc + BaseHeaderSize) + (SuspendedContextIndex << ShiftForWord)); - /* begin marryContextInNewStackPageAndInitializeInterpreterRegisters: */ - VM_LABEL(1marryContextInNewStackPageAndInitializeInterpreterRegisters); - assert(GIV(stackPage) == 0); - newPage = makeBaseFrameFor(activeContext); - /* begin setStackPageAndLimit: */ - GIV(stackPage) = newPage; - if (GIV(stackLimit) != (((char *) (((usqInt) -1))))) { - GIV(stackLimit) = (GIV(stackPage)->stackLimit); - } - markStackPageMostRecentlyUsed(newPage); - GIV(framePointer) = (GIV(stackPage)->headFP); - GIV(stackPointer) = (GIV(stackPage)->headSP); - /* begin setMethod: */ - /* begin iframeMethod: */ - theFP = (GIV(stackPage)->headFP); - aMethodObj = longAt(theFP + FoxMethod); - GIV(method) = aMethodObj; - assert(isOopCompiledMethod(GIV(method))); - -# if MULTIPLEBYTECODESETS - bytecodeSetSelector = ((((longAt((GIV(method) + BaseHeaderSize) + (HeaderIndex << ShiftForWord))) >> 1)) < 0 - ? 256 - : 0); - -# endif /* MULTIPLEBYTECODESETS */ - - /* begin popStack */ - top = longAt(GIV(stackPointer)); - GIV(stackPointer) += BytesPerWord; - GIV(instructionPointer) = ((sqInt) top); + marryContextInNewStackPageAndInitializeInterpreterRegisters(activeContext); } void @@ -16057,6 +16001,134 @@ } +/* Scan the heap long printing the oops of any and all objects that refer to + anOop + */ + +void +longPrintReferencesTo(sqInt anOop) +{ DECL_MAYBE_SQ_GLOBAL_STRUCT + sqInt header; + sqInt header1; + sqInt header2; + sqInt i; + sqInt obj; + sqInt obj1; + sqInt oop; + sqInt prntObj; + sqInt sz; + sqInt sz1; + sqInt sz2; + + prntObj = 0; + /* begin firstAccessibleObject */ + obj1 = memory + (headerTypeBytes[(longAt(memory)) & TypeMask]); + while ((((usqInt) obj1)) < (((usqInt) GIV(freeStart)))) { + if (!(((longAt(obj1)) & TypeMask) == HeaderTypeFree)) { + oop = obj1; + goto l2; + } + /* begin objectAfter: */ + if (DoAssertionChecks) { + if ((((usqInt) obj1)) >= (((usqInt) GIV(endOfMemory)))) { + error("no objects after the end of memory"); + } + } + if (((longAt(obj1)) & TypeMask) == HeaderTypeFree) { + sz = (longAt(obj1)) & AllButTypeMask; + } + else { + /* begin sizeBitsOf: */ + header = longAt(obj1); + sz = ((header & TypeMask) == HeaderTypeSizeAndClass + ? (longAt(obj1 - (BytesPerWord * 2))) & LongSizeMask + : header & SizeMask); + } + obj1 = (obj1 + sz) + (headerTypeBytes[(longAt(obj1 + sz)) & TypeMask]); + } + error("heap is empty"); + oop = null; +l2: /* end firstAccessibleObject */; + while (!(oop == null)) { + if ((((oop & 1) == 0) + && (((((usqInt) (longAt(oop))) >> 8) & 15) <= 4)) + || (((((usqInt) (longAt(oop))) >> 8) & 15) >= 12)) { + if (((((usqInt) (longAt(oop))) >> 8) & 15) >= 12) { + i = ((((usqInt) (longAt((oop + BaseHeaderSize) + (HeaderIndex << ShiftForWord)))) >> 10) & 255) - 1; + } + else { + if (((oop & 1) == 0) + && (((((usqInt) (longAt(oop))) >> 12) & 31) == ClassMethodContextCompactIndex)) { + i = (CtxtTempFrameStart + (fetchStackPointerOf(oop))) - 1; + } + else { + i = (lengthOf(oop)) - 1; + } + } + while (i >= 0) { + if (anOop == (longAt((oop + BaseHeaderSize) + (i << ShiftForWord)))) { + printHex(oop); + print(" @ "); + printNum(i); + /* begin cr */ + printf("\n"); + prntObj = 1; + i = 0; + } + i -= 1; + } + if (prntObj) { + prntObj = 0; + longPrintOop(oop); + } + } + /* begin accessibleObjectAfter: */ + /* begin objectAfter: */ + if (DoAssertionChecks) { + if ((((usqInt) oop)) >= (((usqInt) GIV(endOfMemory)))) { + error("no objects after the end of memory"); + } + } + if (((longAt(oop)) & TypeMask) == HeaderTypeFree) { + sz2 = (longAt(oop)) & AllButTypeMask; + } + else { + /* begin sizeBitsOf: */ + header2 = longAt(oop); + sz2 = ((header2 & TypeMask) == HeaderTypeSizeAndClass + ? (longAt(oop - (BytesPerWord * 2))) & LongSizeMask + : header2 & SizeMask); + } + obj = (oop + sz2) + (headerTypeBytes[(longAt(oop + sz2)) & TypeMask]); + while ((((usqInt) obj)) < (((usqInt) GIV(freeStart)))) { + if (!(((longAt(obj)) & TypeMask) == HeaderTypeFree)) { + oop = obj; + goto l1; + } + /* begin objectAfter: */ + if (DoAssertionChecks) { + if ((((usqInt) obj)) >= (((usqInt) GIV(endOfMemory)))) { + error("no objects after the end of memory"); + } + } + if (((longAt(obj)) & TypeMask) == HeaderTypeFree) { + sz1 = (longAt(obj)) & AllButTypeMask; + } + else { + /* begin sizeBitsOf: */ + header1 = longAt(obj); + sz1 = ((header1 & TypeMask) == HeaderTypeSizeAndClass + ? (longAt(obj - (BytesPerWord * 2))) & LongSizeMask + : header1 & SizeMask); + } + obj = (obj + sz1) + (headerTypeBytes[(longAt(obj + sz1)) & TypeMask]); + } + oop = null; + l1: /* end accessibleObjectAfter: */; + } +} + + /* This method implements a simple method lookup cache. If an entry for the given selector and class is found in the cache, set the values of 'newMethod' and 'primitiveFunctionPointer' and return true. Otherwise, @@ -17396,6 +17468,49 @@ } +/* Establish aContext at the base of a new stackPage, make the stackPage the + active one and set-up the interreter registers. This is used to boot the + system and bring it back after a snapshot. */ + +static void +marryContextInNewStackPageAndInitializeInterpreterRegisters(sqInt aContext) +{ DECL_MAYBE_SQ_GLOBAL_STRUCT + sqInt aMethodObj; + StackPage *newPage; + char *theFP; + sqInt top; + + assert(GIV(stackPage) == 0); + newPage = makeBaseFrameFor(aContext); + /* begin setStackPageAndLimit: */ + GIV(stackPage) = newPage; + if (GIV(stackLimit) != (((char *) (((usqInt) -1))))) { + GIV(stackLimit) = (GIV(stackPage)->stackLimit); + } + markStackPageMostRecentlyUsed(newPage); + GIV(framePointer) = (GIV(stackPage)->headFP); + GIV(stackPointer) = (GIV(stackPage)->headSP); + /* begin setMethod: */ + /* begin iframeMethod: */ + theFP = (GIV(stackPage)->headFP); + aMethodObj = longAt(theFP + FoxMethod); + GIV(method) = aMethodObj; + assert(isOopCompiledMethod(GIV(method))); + +# if MULTIPLEBYTECODESETS + bytecodeSetSelector = ((((longAt((GIV(method) + BaseHeaderSize) + (HeaderIndex << ShiftForWord))) >> 1)) < 0 + ? 256 + : 0); + +# endif /* MULTIPLEBYTECODESETS */ + + /* begin popStack */ + top = longAt(GIV(stackPointer)); + GIV(stackPointer) += BytesPerWord; + GIV(instructionPointer) = ((sqInt) top); +} + + /* Marry an unmarried frame. This means creating a spouse context initialized with a subset of the frame's state (state through the last argument) that references the frame. */ @@ -18124,6 +18239,17 @@ method will be inlined during C translation. */ static sqInt +oopisGreaterThanOrEqualTo(sqInt anOop, sqInt otherOop) +{ + return (((usqInt) anOop)) >= (((usqInt) otherOop)); +} + + +/* Compare two oop values, treating them as object memory locations. + Use #cCoerce:to: to ensure comparison of unsigned magnitudes. This + method will be inlined during C translation. */ + +static sqInt oopisGreaterThanandLessThan(sqInt anOop, sqInt baseOop, sqInt limitOop) { return ((((usqInt) anOop)) > (((usqInt) baseOop))) @@ -32199,45 +32325,13 @@ primitiveVoidVMState(void) { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt activeContext; - sqInt aMethodObj; - StackPage *newPage; char *sp; - char *theFP; - sqInt top; /* begin push: */ longAtput((sp = GIV(stackPointer) - BytesPerWord), GIV(instructionPointer)); GIV(stackPointer) = sp; activeContext = voidVMStateForSnapshot(); - /* begin marryContextInNewStackPageAndInitializeInterpreterRegisters: */ - assert(GIV(stackPage) == 0); - newPage = makeBaseFrameFor(activeContext); - /* begin setStackPageAndLimit: */ - GIV(stackPage) = newPage; - if (GIV(stackLimit) != (((char *) (((usqInt) -1))))) { - GIV(stackLimit) = (GIV(stackPage)->stackLimit); - } - markStackPageMostRecentlyUsed(newPage); - GIV(framePointer) = (GIV(stackPage)->headFP); - GIV(stackPointer) = (GIV(stackPage)->headSP); - /* begin setMethod: */ - /* begin iframeMethod: */ - theFP = (GIV(stackPage)->headFP); - aMethodObj = longAt(theFP + FoxMethod); - GIV(method) = aMethodObj; - assert(isOopCompiledMethod(GIV(method))); - -# if MULTIPLEBYTECODESETS - bytecodeSetSelector = ((((longAt((GIV(method) + BaseHeaderSize) + (HeaderIndex << ShiftForWord))) >> 1)) < 0 - ? 256 - : 0); - -# endif /* MULTIPLEBYTECODESETS */ - - /* begin popStack */ - top = longAt(GIV(stackPointer)); - GIV(stackPointer) += BytesPerWord; - GIV(instructionPointer) = ((sqInt) top); + marryContextInNewStackPageAndInitializeInterpreterRegisters(activeContext); } static void @@ -32738,7 +32832,7 @@ printf("\n"); } else { - print("widdowed (assuming framePointer valid)"); + print("widowed (assuming framePointer valid)"); /* begin cr */ printf("\n"); } @@ -33668,6 +33762,17 @@ goto l2; } printf("a(n) %.*s", nameLen, name); + if (((instanceSizeOf(classOop)) == (ValueIndex + 1)) + && (((longAt((classOop + BaseHeaderSize) + (SuperclassIndex << ShiftForWord))) == (superclassOf(fetchClassOfNonInt(longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (SchedulerAssociation << ShiftForWord)))))) + && ((((longAt((oop + BaseHeaderSize) + (KeyIndex << ShiftForWord))) & 1) == 0) + && (((((usqInt) (longAt(longAt((oop + BaseHeaderSize) + (KeyIndex << ShiftForWord))))) >> 8) & 15) >= 8)))) { + /* begin space */ + /* begin printChar: */ + putchar(' '); + printOopShort(longAt((oop + BaseHeaderSize) + (KeyIndex << ShiftForWord))); + print(" -> "); + printHex(longAt((oop + BaseHeaderSize) + (ValueIndex << ShiftForWord))); + } l2: /* end printOopShortInner: */; flush(); } @@ -36308,7 +36413,6 @@ { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt activeContext; sqInt activeProc; - sqInt aMethodObj; sqInt dataSize; sqInt fmt; sqInt header; @@ -36316,7 +36420,6 @@ sqInt header2; sqInt i; sqInt i1; - StackPage *newPage; sqInt object; sqInt object1; sqInt oop; @@ -36331,8 +36434,6 @@ sqInt stackIndex; sqInt sz; sqInt sz1; - char *theFP; - sqInt top; /* begin push: */ object1 = GIV(instructionPointer); @@ -36441,36 +36542,7 @@ } longAtput((activeContext + BaseHeaderSize) + (StackPointerIndex << ShiftForWord), (((stackIndex - 1) << 1) | 1)); } - /* begin marryContextInNewStackPageAndInitializeInterpreterRegisters: */ - VM_LABEL(2marryContextInNewStackPageAndInitializeInterpreterRegisters); - assert(GIV(stackPage) == 0); - newPage = makeBaseFrameFor(activeContext); - /* begin setStackPageAndLimit: */ - GIV(stackPage) = newPage; - if (GIV(stackLimit) != (((char *) (((usqInt) -1))))) { - GIV(stackLimit) = (GIV(stackPage)->stackLimit); - } - markStackPageMostRecentlyUsed(newPage); - GIV(framePointer) = (GIV(stackPage)->headFP); - GIV(stackPointer) = (GIV(stackPage)->headSP); - /* begin setMethod: */ - /* begin iframeMethod: */ - theFP = (GIV(stackPage)->headFP); - aMethodObj = longAt(theFP + FoxMethod); - GIV(method) = aMethodObj; - assert(isOopCompiledMethod(GIV(method))); - -# if MULTIPLEBYTECODESETS - bytecodeSetSelector = ((((longAt((GIV(method) + BaseHeaderSize) + (HeaderIndex << ShiftForWord))) >> 1)) < 0 - ? 256 - : 0); - -# endif /* MULTIPLEBYTECODESETS */ - - /* begin popStack */ - top = longAt(GIV(stackPointer)); - GIV(stackPointer) += BytesPerWord; - GIV(instructionPointer) = ((sqInt) top); + marryContextInNewStackPageAndInitializeInterpreterRegisters(activeContext); if (!GIV(primFailCode)) { /* begin push: */ object = GIV(falseObj); @@ -36861,40 +36933,40 @@ sz -= hdr & Size4Bit; if (fmt <= 4) { totalLength = ((usqInt) (sz - BaseHeaderSize)) >> ShiftForWord; - goto l1; + goto l2; } if (fmt < 8) { totalLength = ((usqInt) (sz - BaseHeaderSize)) >> 2; - goto l1; + goto l2; } else { totalLength = (sz - BaseHeaderSize) - (fmt & 3); - goto l1; + goto l2; } -l1: /* end lengthOf:baseHeader:format: */; +l2: /* end lengthOf:baseHeader:format: */; /* begin fixedFieldsOf:format:length: */ if ((fmt > 4) || (fmt == 2)) { fixedFields = 0; - goto l3; + goto l4; } if (fmt < 2) { fixedFields = totalLength; - goto l3; + goto l4; } /* begin fetchClassOfNonInt: */ if (((ccIndex = (((usqInt) (longAt(array))) >> 12) & 31)) == 0) { class = (longAt(array - BaseHeaderSize)) & AllButTypeMask; - goto l4; + goto l3; } else { class = longAt(((longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (CompactClasses << ShiftForWord))) + BaseHeaderSize) + ((ccIndex - 1) << ShiftForWord)); - goto l4; + goto l3; } -l4: /* end fetchClassOfNonInt: */; +l3: /* end fetchClassOfNonInt: */; classFormat = (longAt((class + BaseHeaderSize) + (InstanceSpecificationIndex << ShiftForWord))) - 1; fixedFields = (((((usqInt) classFormat) >> 11) & 192) + ((((usqInt) classFormat) >> 2) & 63)) - 1; -l3: /* end fixedFieldsOf:format:length: */; +l4: /* end fixedFieldsOf:format:length: */; if ((fmt == 3) && (((((usqInt) hdr) >> 12) & 31) == ClassMethodContextCompactIndex)) { /* begin stackPointerForMaybeMarriedContext: */ @@ -36904,17 +36976,17 @@ sp = stackPointerIndexForFrame(frameOfMarriedContext(array)); assert((ReceiverIndex + ((sp >> 1))) < (lengthOf(array))); stSize = sp; - goto l2; + goto l1; } /* begin fetchStackPointerOf: */ sp1 = longAt((array + BaseHeaderSize) + (StackPointerIndex << ShiftForWord)); if (!((sp1 & 1))) { stSize = 0; - goto l2; + goto l1; } assert((ReceiverIndex + ((sp1 >> 1))) < (lengthOf(array))); stSize = (sp1 >> 1); - l2: /* end stackPointerForMaybeMarriedContext: */; + l1: /* end stackPointerForMaybeMarriedContext: */; if (((((usqInt) index)) >= (((usqInt) 1))) && (((((usqInt) index)) <= (((usqInt) stSize))) && ((((longAt((array + BaseHeaderSize) + (SenderIndex << ShiftForWord))) & 1)) @@ -36925,7 +36997,9 @@ else { stSize = totalLength - fixedFields; } - if (((((usqInt) index)) >= (((usqInt) 1))) + if ((oopisGreaterThanOrEqualTo(index, (fmt >= 12 + ? ((((((usqInt) (longAt((array + BaseHeaderSize) + (HeaderIndex << ShiftForWord)))) >> 10) & 255) + LiteralStart) * BytesPerWord) + 1 + : 1))) && ((((usqInt) index)) <= (((usqInt) stSize)))) { /* begin subscript:with:format: */ if (fmt <= 4) { @@ -36978,40 +37052,40 @@ sz -= hdr & Size4Bit; if (fmt <= 4) { totalLength = ((usqInt) (sz - BaseHeaderSize)) >> ShiftForWord; - goto l1; + goto l2; } if (fmt < 8) { totalLength = ((usqInt) (sz - BaseHeaderSize)) >> 2; - goto l1; + goto l2; } else { totalLength = (sz - BaseHeaderSize) - (fmt & 3); - goto l1; + goto l2; } -l1: /* end lengthOf:baseHeader:format: */; +l2: /* end lengthOf:baseHeader:format: */; /* begin fixedFieldsOf:format:length: */ if ((fmt > 4) || (fmt == 2)) { fixedFields = 0; - goto l3; + goto l4; } if (fmt < 2) { fixedFields = totalLength; - goto l3; + goto l4; } /* begin fetchClassOfNonInt: */ if (((ccIndex = (((usqInt) (longAt(array))) >> 12) & 31)) == 0) { class = (longAt(array - BaseHeaderSize)) & AllButTypeMask; - goto l4; + goto l3; } else { class = longAt(((longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (CompactClasses << ShiftForWord))) + BaseHeaderSize) + ((ccIndex - 1) << ShiftForWord)); - goto l4; + goto l3; } -l4: /* end fetchClassOfNonInt: */; +l3: /* end fetchClassOfNonInt: */; classFormat = (longAt((class + BaseHeaderSize) + (InstanceSpecificationIndex << ShiftForWord))) - 1; fixedFields = (((((usqInt) classFormat) >> 11) & 192) + ((((usqInt) classFormat) >> 2) & 63)) - 1; -l3: /* end fixedFieldsOf:format:length: */; +l4: /* end fixedFieldsOf:format:length: */; if ((fmt == 3) && (((((usqInt) hdr) >> 12) & 31) == ClassMethodContextCompactIndex)) { /* begin stackPointerForMaybeMarriedContext: */ @@ -37021,17 +37095,17 @@ sp = stackPointerIndexForFrame(frameOfMarriedContext(array)); assert((ReceiverIndex + ((sp >> 1))) < (lengthOf(array))); stSize = sp; - goto l2; + goto l1; } /* begin fetchStackPointerOf: */ sp1 = longAt((array + BaseHeaderSize) + (StackPointerIndex << ShiftForWord)); if (!((sp1 & 1))) { stSize = 0; - goto l2; + goto l1; } assert((ReceiverIndex + ((sp1 >> 1))) < (lengthOf(array))); stSize = (sp1 >> 1); - l2: /* end stackPointerForMaybeMarriedContext: */; + l1: /* end stackPointerForMaybeMarriedContext: */; if (((((usqInt) index)) >= (((usqInt) 1))) && (((((usqInt) index)) <= (((usqInt) stSize))) && ((((longAt((array + BaseHeaderSize) + (SenderIndex << ShiftForWord))) & 1)) @@ -37043,7 +37117,9 @@ else { stSize = totalLength - fixedFields; } - if (((((usqInt) index)) >= (((usqInt) 1))) + if ((oopisGreaterThanOrEqualTo(index, (fmt >= 12 + ? ((((((usqInt) (longAt((array + BaseHeaderSize) + (HeaderIndex << ShiftForWord)))) >> 10) & 255) + LiteralStart) * BytesPerWord) + 1 + : 1))) && ((((usqInt) index)) <= (((usqInt) stSize)))) { /* begin subscript:with:storing:format: */ VM_LABEL(2subscriptwithstoringformat); Modified: branches/Cog/stacksrc/vm/interp.c =================================================================== --- branches/Cog/stacksrc/vm/interp.c 2012-04-24 17:25:08 UTC (rev 2551) +++ branches/Cog/stacksrc/vm/interp.c 2012-05-02 23:13:02 UTC (rev 2552) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.152 uuid: d39d62b0-45ca-4621-8f67-e3981bbe1875 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.159 uuid: cbf7f95a-6fe2-4578-898e-47afb8524be4 from - StackInterpreter VMMaker.oscog-eem.152 uuid: d39d62b0-45ca-4621-8f67-e3981bbe1875 + StackInterpreter VMMaker.oscog-eem.159 uuid: cbf7f95a-6fe2-4578-898e-47afb8524be4 */ -static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.152 uuid: d39d62b0-45ca-4621-8f67-e3981bbe1875 " __DATE__ ; +static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.159 uuid: cbf7f95a-6fe2-4578-898e-47afb8524be4 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -185,6 +185,7 @@ #define ImmutabilityBit 0x20000000 #define InstanceSpecificationIndex 2 #define InstructionPointerIndex 1 +#define KeyIndex 0 #define LargeContextBit 0x40000 #define LargeContextBytes 252 #define LargeContextSize 252 @@ -516,6 +517,7 @@ static sqInt loadImageSegmentFromoutPointers(sqInt segmentWordArray, sqInt outPointerArray); void loadInitialContext(void); void longPrintOop(sqInt oop); +void longPrintReferencesTo(sqInt anOop); static sqInt lookupInMethodCacheSelclass(sqInt selector, sqInt class); static sqInt lookupMethodInClass(sqInt class); static sqInt lookupMethodInDictionary(sqInt dictionary); @@ -534,6 +536,7 @@ static sqInt markStackPageMostRecentlyUsed(StackPage *page); static sqInt markStackPageNextMostRecentlyUsed(StackPage *page); static sqInt marriedContextpointsTostackDeltaForCurrentFrame(sqInt spouseContext, sqInt anOop, sqInt stackDeltaForCurrentFrame); +static void marryContextInNewStackPageAndInitializeInterpreterRegisters(sqInt aContext); static sqInt marryFrameSP(char *theFP, char *theSP); sqInt maybeSplObj(sqInt index); sqInt methodArgumentCount(void); @@ -561,6 +564,7 @@ sqInt oopFromChunk(sqInt chunk); static sqInt oopHasAcceptableClass(sqInt signedOop); static sqInt oopHasOkayClass(sqInt signedOop); +static sqInt oopisGreaterThanOrEqualTo(sqInt anOop, sqInt otherOop); static sqInt oopisGreaterThanandLessThan(sqInt anOop, sqInt baseOop, sqInt limitOop); static sqInt oopisLessThan(sqInt anOop, sqInt otherOop); static sqInt pageIndexFor(void *pointer); @@ -968,16 +972,16 @@ _iss usqInt youngStart; _iss sqInt messageSelector; _iss usqInt newMethod; +_iss usqInt endOfMemory; _iss usqInt instructionPointer; -_iss usqInt endOfMemory; _iss sqInt rootTableCount; _iss sqInt remapBufferCount; _iss sqInt trueObj; _iss sqInt falseObj; _iss StackPage * pages; -_iss char * stackLimit; _iss sqInt lkupClass; _iss usqInt reserveStart; +_iss char * stackLimit; _iss char * stackMemory; _iss sqInt bytesPerPage; _iss usqInt memoryLimit; @@ -1007,12 +1011,12 @@ _iss sqInt statGrowMemory; _iss sqInt statMarkCount; _iss sqInt classNameIndex; +_iss sqInt coInterpreter; _iss sqInt lastMethodCacheProbeWrite; _iss sqInt lowSpaceThreshold; _iss sqInt profileSemaphore; _iss usqLong statGCEndUsecs; _iss sqInt statSweepCount; -_iss sqInt coInterpreter; _iss usqInt compEnd; _iss sqInt metaclassSizeBytes; _iss sqInt pendingFinalizationSignals; @@ -1323,7 +1327,7 @@ /* 212 */ primitiveContextSize, /* 213 */ primitiveContextXray, /* 214 */ primitiveVoidVMState, - /* 215 */ (void (*)(void))0, + /* 215 */ primitiveFlushCacheByMethod, /* 216 */ (void (*)(void))0, /* 217 */ (void (*)(void))0, /* 218 */ primitiveDoNamedPrimitiveWithArgs, @@ -1687,7 +1691,7 @@ 0 }; char * breakSelector; sqInt breakSelectorLength = -1; -const char *interpreterVersion = "Croquet Closure Stack VM [StackInterpreter VMMaker.oscog-eem.152]"; +const char *interpreterVersion = "Croquet Closure Stack VM [StackInterpreter VMMaker.oscog-eem.159]"; volatile int sendTrace; sqInt suppressHeartbeatFlag; @@ -7157,8 +7161,11 @@ goto l92; } else { - result = (((byteAt((rcvr + BaseHeaderSize) + (((index >> 1)) - 1))) << 1) | 1); - goto l92; + if ((fmt < 12) + || (((index >> 1)) >= (((((((usqInt) (longAt((rcvr + BaseHeaderSize) + (HeaderIndex << ShiftForWord)))) >> 10) & 255) + LiteralStart) * BytesPerWord) + 1))) { + result = (((byteAt((rcvr + BaseHeaderSize) + (((index >> 1)) - 1))) << 1) | 1); + goto l92; + } } } /* begin primitiveFailFor: */ @@ -7236,25 +7243,25 @@ goto l94; } if (fmt >= 16) { - - /* Note fmt >= 16 is an artificial flag for strings */ - - valToPut = asciiOfCharacter(value); - if (!(!GIV(primFailCode))) { + if (!(isinstanceOfcompactClassIndex(value, longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassCharacter << ShiftForWord)), 0))) { + GIV(primFailCode) = PrimErrBadArgument; goto l94; } + valToPut = longAt((value + BaseHeaderSize) + (CharacterValueIndex << ShiftForWord)); } else { + if ((fmt >= 12) + && (((index >> 1)) < (((((((usqInt) (longAt((rcvr + BaseHeaderSize) + (HeaderIndex << ShiftForWord)))) >> 10) & 255) + LiteralStart) * BytesPerWord) + 1))) { + GIV(primFailCode) = PrimErrBadIndex; + goto l94; + } valToPut = value; } if ((valToPut & 1)) { valToPut = (valToPut >> 1); if (!((valToPut >= 0) && (valToPut <= 255))) { - /* begin primitiveFail */ - if (!GIV(primFailCode)) { - GIV(primFailCode) = 1; - } + GIV(primFailCode) = PrimErrBadArgument; goto l94; } byteAtput((rcvr + BaseHeaderSize) + (((index >> 1)) - 1), valToPut); @@ -9986,25 +9993,25 @@ goto l1; } if (fmt >= 16) { - - /* Note fmt >= 16 is an artificial flag for strings */ - - valToPut = asciiOfCharacter(value); - if (!(!GIV(primFailCode))) { + if (!(isinstanceOfcompactClassIndex(value, longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassCharacter << ShiftForWord)), 0))) { + GIV(primFailCode) = PrimErrBadArgument; goto l1; } + valToPut = longAt((value + BaseHeaderSize) + (CharacterValueIndex << ShiftForWord)); } else { + if ((fmt >= 12) + && (index < (((((((usqInt) (longAt((rcvr + BaseHeaderSize) + (HeaderIndex << ShiftForWord)))) >> 10) & 255) + LiteralStart) * BytesPerWord) + 1))) { + GIV(primFailCode) = PrimErrBadIndex; + goto l1; + } valToPut = value; } if ((valToPut & 1)) { valToPut = (valToPut >> 1); if (!((valToPut >= 0) && (valToPut <= 255))) { - /* begin primitiveFail */ - if (!GIV(primFailCode)) { - GIV(primFailCode) = 1; - } + GIV(primFailCode) = PrimErrBadArgument; goto l1; } byteAtput((rcvr + BaseHeaderSize) + (index - 1), valToPut); @@ -10122,8 +10129,11 @@ goto l1; } else { - result = (((byteAt((rcvr + BaseHeaderSize) + (index - 1))) << 1) | 1); - goto l1; + if ((fmt < 12) + || (index >= (((((((usqInt) (longAt((rcvr + BaseHeaderSize) + (HeaderIndex << ShiftForWord)))) >> 10) & 255) + LiteralStart) * BytesPerWord) + 1))) { + result = (((byteAt((rcvr + BaseHeaderSize) + (index - 1))) << 1) | 1); + goto l1; + } } } /* begin primitiveFailFor: */ @@ -11527,7 +11537,6 @@ char *theSP1; sqInt valuePointer; - assert(theFP != GIV(framePointer)); assert((GIV(stackPage) == 0) || (GIV(stackPage) == (mostRecentlyUsedPage()))); /* begin stackPageFor: */ @@ -14406,13 +14415,9 @@ { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt activeContext; sqInt activeProc; - sqInt aMethodObj; - StackPage *newPage; sqInt stackPageBytes; sqInt stackPagesBytes; - char *theFP; void *theStackMemory; - sqInt top; stackPageBytes = stackPageByteSize(); stackPagesBytes = computeStackZoneSize(); @@ -14426,36 +14431,7 @@ } activeProc = longAt(((longAt(((longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (SchedulerAssociation << ShiftForWord))) + BaseHeaderSize) + (ValueIndex << ShiftForWord))) + BaseHeaderSize) + (ActiveProcessIndex << ShiftForWord)); activeContext = longAt((activeProc + BaseHeaderSize) + (SuspendedContextIndex << ShiftForWord)); - /* begin marryContextInNewStackPageAndInitializeInterpreterRegisters: */ - VM_LABEL(0marryContextInNewStackPageAndInitializeInterpreterRegisters); - assert(GIV(stackPage) == 0); - newPage = makeBaseFrameFor(activeContext); - /* begin setStackPageAndLimit: */ - GIV(stackPage) = newPage; - if (GIV(stackLimit) != (((char *) (((usqInt) -1))))) { - GIV(stackLimit) = (GIV(stackPage)->stackLimit); - } - markStackPageMostRecentlyUsed(newPage); - GIV(framePointer) = (GIV(stackPage)->headFP); - GIV(stackPointer) = (GIV(stackPage)->headSP); - /* begin setMethod: */ - /* begin iframeMethod: */ - theFP = (GIV(stackPage)->headFP); - aMethodObj = longAt(theFP + FoxMethod); - GIV(method) = aMethodObj; - assert(isOopCompiledMethod(GIV(method))); - -# if MULTIPLEBYTECODESETS - bytecodeSetSelector = ((((longAt((GIV(method) + BaseHeaderSize) + (HeaderIndex << ShiftForWord))) >> 1)) < 0 - ? 256 - : 0); - -# endif /* MULTIPLEBYTECODESETS */ - - /* begin popStack */ - top = longAt(GIV(stackPointer)); - GIV(stackPointer) += BytesPerWord; - GIV(instructionPointer) = ((sqInt) top); + marryContextInNewStackPageAndInitializeInterpreterRegisters(activeContext); ioInitHeartbeat(); interpret(); return null; @@ -15148,7 +15124,8 @@ StackPage *thePage; sqInt value; - assert(isContext(aOnceMarriedContext)); + assert((isContext(aOnceMarriedContext)) + && (isMarriedOrWidowedContext(aOnceMarriedContext))); /* begin frameOfMarriedContext: */ value = longAt((aOnceMarriedContext + BaseHeaderSize) + (SenderIndex << ShiftForWord)); /* begin withoutSmallIntegerTags: */ @@ -15909,10 +15886,6 @@ { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt activeContext; sqInt activeProc; - sqInt aMethodObj; - StackPage *newPage; - char *theFP; - sqInt top; if ((checkForLeaks & 1) != 0) { clearLeakMapAndMapAccessibleObjects(); @@ -15920,36 +15893,7 @@ } activeProc = longAt(((longAt(((longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (SchedulerAssociation << ShiftForWord))) + BaseHeaderSize) + (ValueIndex << ShiftForWord))) + BaseHeaderSize) + (ActiveProcessIndex << ShiftForWord)); activeContext = longAt((activeProc + BaseHeaderSize) + (SuspendedContextIndex << ShiftForWord)); - /* begin marryContextInNewStackPageAndInitializeInterpreterRegisters: */ - VM_LABEL(1marryContextInNewStackPageAndInitializeInterpreterRegisters); - assert(GIV(stackPage) == 0); - newPage = makeBaseFrameFor(activeContext); - /* begin setStackPageAndLimit: */ - GIV(stackPage) = newPage; - if (GIV(stackLimit) != (((char *) (((usqInt) -1))))) { - GIV(stackLimit) = (GIV(stackPage)->stackLimit); - } - markStackPageMostRecentlyUsed(newPage); - GIV(framePointer) = (GIV(stackPage)->headFP); - GIV(stackPointer) = (GIV(stackPage)->headSP); - /* begin setMethod: */ - /* begin iframeMethod: */ - theFP = (GIV(stackPage)->headFP); - aMethodObj = longAt(theFP + FoxMethod); - GIV(method) = aMethodObj; - assert(isOopCompiledMethod(GIV(method))); - -# if MULTIPLEBYTECODESETS - bytecodeSetSelector = ((((longAt((GIV(method) + BaseHeaderSize) + (HeaderIndex << ShiftForWord))) >> 1)) < 0 - ? 256 - : 0); - -# endif /* MULTIPLEBYTECODESETS */ - - /* begin popStack */ - top = longAt(GIV(stackPointer)); - GIV(stackPointer) += BytesPerWord; - GIV(instructionPointer) = ((sqInt) top); + marryContextInNewStackPageAndInitializeInterpreterRegisters(activeContext); } void @@ -16053,6 +15997,134 @@ } +/* Scan the heap long printing the oops of any and all objects that refer to + anOop + */ + +void +longPrintReferencesTo(sqInt anOop) +{ DECL_MAYBE_SQ_GLOBAL_STRUCT + sqInt header; + sqInt header1; + sqInt header2; + sqInt i; + sqInt obj; + sqInt obj1; + sqInt oop; + sqInt prntObj; + sqInt sz; + sqInt sz1; + sqInt sz2; + + prntObj = 0; + /* begin firstAccessibleObject */ + obj1 = memory + (headerTypeBytes[(longAt(memory)) & TypeMask]); + while ((((usqInt) obj1)) < (((usqInt) GIV(freeStart)))) { + if (!(((longAt(obj1)) & TypeMask) == HeaderTypeFree)) { + oop = obj1; + goto l2; + } + /* begin objectAfter: */ + if (DoAssertionChecks) { + if ((((usqInt) obj1)) >= (((usqInt) GIV(endOfMemory)))) { + error("no objects after the end of memory"); + } + } + if (((longAt(obj1)) & TypeMask) == HeaderTypeFree) { + sz = (longAt(obj1)) & AllButTypeMask; + } + else { + /* begin sizeBitsOf: */ + header = longAt(obj1); + sz = ((header & TypeMask) == HeaderTypeSizeAndClass + ? (longAt(obj1 - (BytesPerWord * 2))) & LongSizeMask + : header & SizeMask); + } + obj1 = (obj1 + sz) + (headerTypeBytes[(longAt(obj1 + sz)) & TypeMask]); + } + error("heap is empty"); + oop = null; +l2: /* end firstAccessibleObject */; + while (!(oop == null)) { + if ((((oop & 1) == 0) + && (((((usqInt) (longAt(oop))) >> 8) & 15) <= 4)) + || (((((usqInt) (longAt(oop))) >> 8) & 15) >= 12)) { + if (((((usqInt) (longAt(oop))) >> 8) & 15) >= 12) { + i = ((((usqInt) (longAt((oop + BaseHeaderSize) + (HeaderIndex << ShiftForWord)))) >> 10) & 255) - 1; + } + else { + if (((oop & 1) == 0) + && (((((usqInt) (longAt(oop))) >> 12) & 31) == ClassMethodContextCompactIndex)) { + i = (CtxtTempFrameStart + (fetchStackPointerOf(oop))) - 1; + } + else { + i = (lengthOf(oop)) - 1; + } + } + while (i >= 0) { + if (anOop == (longAt((oop + BaseHeaderSize) + (i << ShiftForWord)))) { + printHex(oop); + print(" @ "); + printNum(i); + /* begin cr */ + printf("\n"); + prntObj = 1; + i = 0; + } + i -= 1; + } + if (prntObj) { + prntObj = 0; + longPrintOop(oop); + } + } + /* begin accessibleObjectAfter: */ + /* begin objectAfter: */ + if (DoAssertionChecks) { + if ((((usqInt) oop)) >= (((usqInt) GIV(endOfMemory)))) { + error("no objects after the end of memory"); + } + } + if (((longAt(oop)) & TypeMask) == HeaderTypeFree) { + sz2 = (longAt(oop)) & AllButTypeMask; + } + else { + /* begin sizeBitsOf: */ + header2 = longAt(oop); + sz2 = ((header2 & TypeMask) == HeaderTypeSizeAndClass + ? (longAt(oop - (BytesPerWord * 2))) & LongSizeMask + : header2 & SizeMask); + } + obj = (oop + sz2) + (headerTypeBytes[(longAt(oop + sz2)) & TypeMask]); + while ((((usqInt) obj)) < (((usqInt) GIV(freeStart)))) { + if (!(((longAt(obj)) & TypeMask) == HeaderTypeFree)) { + oop = obj; + goto l1; + } + /* begin objectAfter: */ + if (DoAssertionChecks) { + if ((((usqInt) obj)) >= (((usqInt) GIV(endOfMemory)))) { + error("no objects after the end of memory"); + } + } + if (((longAt(obj)) & TypeMask) == HeaderTypeFree) { + sz1 = (longAt(obj)) & AllButTypeMask; + } + else { + /* begin sizeBitsOf: */ + header1 = longAt(obj); + sz1 = ((header1 & TypeMask) == HeaderTypeSizeAndClass + ? (longAt(obj - (BytesPerWord * 2))) & LongSizeMask + : header1 & SizeMask); + } + obj = (obj + sz1) + (headerTypeBytes[(longAt(obj + sz1)) & TypeMask]); + } + oop = null; + l1: /* end accessibleObjectAfter: */; + } +} + + /* This method implements a simple method lookup cache. If an entry for the given selector and class is found in the cache, set the values of 'newMethod' and 'primitiveFunctionPointer' and return true. Otherwise, @@ -17392,6 +17464,49 @@ } +/* Establish aContext at the base of a new stackPage, make the stackPage the + active one and set-up the interreter registers. This is used to boot the + system and bring it back after a snapshot. */ + +static void +marryContextInNewStackPageAndInitializeInterpreterRegisters(sqInt aContext) +{ DECL_MAYBE_SQ_GLOBAL_STRUCT + sqInt aMethodObj; + StackPage *newPage; + char *theFP; + sqInt top; + + assert(GIV(stackPage) == 0); + newPage = makeBaseFrameFor(aContext); + /* begin setStackPageAndLimit: */ + GIV(stackPage) = newPage; + if (GIV(stackLimit) != (((char *) (((usqInt) -1))))) { + GIV(stackLimit) = (GIV(stackPage)->stackLimit); + } + markStackPageMostRecentlyUsed(newPage); + GIV(framePointer) = (GIV(stackPage)->headFP); + GIV(stackPointer) = (GIV(stackPage)->headSP); + /* begin setMethod: */ + /* begin iframeMethod: */ + theFP = (GIV(stackPage)->headFP); + aMethodObj = longAt(theFP + FoxMethod); + GIV(method) = aMethodObj; + assert(isOopCompiledMethod(GIV(method))); + +# if MULTIPLEBYTECODESETS + bytecodeSetSelector = ((((longAt((GIV(method) + BaseHeaderSize) + (HeaderIndex << ShiftForWord))) >> 1)) < 0 + ? 256 + : 0); + +# endif /* MULTIPLEBYTECODESETS */ + + /* begin popStack */ + top = longAt(GIV(stackPointer)); + GIV(stackPointer) += BytesPerWord; + GIV(instructionPointer) = ((sqInt) top); +} + + /* Marry an unmarried frame. This means creating a spouse context initialized with a subset of the frame's state (state through the last argument) that references the frame. */ @@ -18120,6 +18235,17 @@ method will be inlined during C translation. */ static sqInt +oopisGreaterThanOrEqualTo(sqInt anOop, sqInt otherOop) +{ + return (((usqInt) anOop)) >= (((usqInt) otherOop)); +} + + +/* Compare two oop values, treating them as object memory locations. + Use #cCoerce:to: to ensure comparison of unsigned magnitudes. This + method will be inlined during C translation. */ + +static sqInt oopisGreaterThanandLessThan(sqInt anOop, sqInt baseOop, sqInt limitOop) { return ((((usqInt) anOop)) > (((usqInt) baseOop))) @@ -32195,45 +32321,13 @@ primitiveVoidVMState(void) { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt activeContext; - sqInt aMethodObj; - StackPage *newPage; char *sp; - char *theFP; - sqInt top; /* begin push: */ longAtput((sp = GIV(stackPointer) - BytesPerWord), GIV(instructionPointer)); GIV(stackPointer) = sp; activeContext = voidVMStateForSnapshot(); - /* begin marryContextInNewStackPageAndInitializeInterpreterRegisters: */ - assert(GIV(stackPage) == 0); - newPage = makeBaseFrameFor(activeContext); - /* begin setStackPageAndLimit: */ - GIV(stackPage) = newPage; - if (GIV(stackLimit) != (((char *) (((usqInt) -1))))) { - GIV(stackLimit) = (GIV(stackPage)->stackLimit); - } - markStackPageMostRecentlyUsed(newPage); - GIV(framePointer) = (GIV(stackPage)->headFP); - GIV(stackPointer) = (GIV(stackPage)->headSP); - /* begin setMethod: */ - /* begin iframeMethod: */ - theFP = (GIV(stackPage)->headFP); - aMethodObj = longAt(theFP + FoxMethod); - GIV(method) = aMethodObj; - assert(isOopCompiledMethod(GIV(method))); - -# if MULTIPLEBYTECODESETS - bytecodeSetSelector = ((((longAt((GIV(method) + BaseHeaderSize) + (HeaderIndex << ShiftForWord))) >> 1)) < 0 - ? 256 - : 0); - -# endif /* MULTIPLEBYTECODESETS */ - - /* begin popStack */ - top = longAt(GIV(stackPointer)); - GIV(stackPointer) += BytesPerWord; - GIV(instructionPointer) = ((sqInt) top); + marryContextInNewStackPageAndInitializeInterpreterRegisters(activeContext); } static void @@ -32734,7 +32828,7 @@ printf("\n"); } else { - print("widdowed (assuming framePointer valid)"); + print("widowed (assuming framePointer valid)"); /* begin cr */ printf("\n"); } @@ -33664,6 +33758,17 @@ goto l2; } printf("a(n) %.*s", nameLen, name); + if (((instanceSizeOf(classOop)) == (ValueIndex + 1)) + && (((longAt((classOop + BaseHeaderSize) + (SuperclassIndex << ShiftForWord))) == (superclassOf(fetchClassOfNonInt(longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (SchedulerAssociation << ShiftForWord)))))) + && ((((longAt((oop + BaseHeaderSize) + (KeyIndex << ShiftForWord))) & 1) == 0) + && (((((usqInt) (longAt(longAt((oop + BaseHeaderSize) + (KeyIndex << ShiftForWord))))) >> 8) & 15) >= 8)))) { + /* begin space */ + /* begin printChar: */ + putchar(' '); + printOopShort(longAt((oop + BaseHeaderSize) + (KeyIndex << ShiftForWord))); + print(" -> "); + printHex(longAt((oop + BaseHeaderSize) + (ValueIndex << ShiftForWord))); + } l2: /* end printOopShortInner: */; flush(); } @@ -36304,7 +36409,6 @@ { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt activeContext; sqInt activeProc; - sqInt aMethodObj; sqInt dataSize; sqInt fmt; sqInt header; @@ -36312,7 +36416,6 @@ sqInt header2; sqInt i; sqInt i1; - StackPage *newPage; sqInt object; sqInt object1; sqInt oop; @@ -36327,8 +36430,6 @@ sqInt stackIndex; sqInt sz; sqInt sz1; - char *theFP; - sqInt top; /* begin push: */ object1 = GIV(instructionPointer); @@ -36437,36 +36538,7 @@ } longAtput((activeContext + BaseHeaderSize) + (StackPointerIndex << ShiftForWord), (((stackIndex - 1) << 1) | 1)); } - /* begin marryContextInNewStackPageAndInitializeInterpreterRegisters: */ - VM_LABEL(2marryContextInNewStackPageAndInitializeInterpreterRegisters); - assert(GIV(stackPage) == 0); - newPage = makeBaseFrameFor(activeContext); - /* begin setStackPageAndLimit: */ - GIV(stackPage) = newPage; - if (GIV(stackLimit) != (((char *) (((usqInt) -1))))) { - GIV(stackLimit) = (GIV(stackPage)->stackLimit); - } - markStackPageMostRecentlyUsed(newPage); - GIV(framePointer) = (GIV(stackPage)->headFP); - GIV(stackPointer) = (GIV(stackPage)->headSP); - /* begin setMethod: */ - /* begin iframeMethod: */ - theFP = (GIV(stackPage)->headFP); - aMethodObj = longAt(theFP + FoxMethod); - GIV(method) = aMethodObj; - assert(isOopCompiledMethod(GIV(method))); - -# if MULTIPLEBYTECODESETS - bytecodeSetSelector = ((((longAt((GIV(method) + BaseHeaderSize) + (HeaderIndex << ShiftForWord))) >> 1)) < 0 - ? 256 - : 0); - -# endif /* MULTIPLEBYTECODESETS */ - - /* begin popStack */ - top = longAt(GIV(stackPointer)); - GIV(stackPointer) += BytesPerWord; - GIV(instructionPointer) = ((sqInt) top); + marryContextInNewStackPageAndInitializeInterpreterRegisters(activeContext); if (!GIV(primFailCode)) { /* begin push: */ object = GIV(falseObj); @@ -36857,40 +36929,40 @@ sz -= hdr & Size4Bit; if (fmt <= 4) { totalLength = ((usqInt) (sz - BaseHeaderSize)) >> ShiftForWord; - goto l1; + goto l2; } if (fmt < 8) { totalLength = ((usqInt) (sz - BaseHeaderSize)) >> 2; - goto l1; + goto l2; } else { totalLength = (sz - BaseHeaderSize) - (fmt & 3); - goto l1; + goto l2; } -l1: /* end lengthOf:baseHeader:format: */; +l2: /* end lengthOf:baseHeader:format: */; /* begin fixedFieldsOf:format:length: */ if ((fmt > 4) || (fmt == 2)) { fixedFields = 0; - goto l3; + goto l4; } if (fmt < 2) { fixedFields = totalLength; - goto l3; + goto l4; } /* begin fetchClassOfNonInt: */ if (((ccIndex = (((usqInt) (longAt(array))) >> 12) & 31)) == 0) { class = (longAt(array - BaseHeaderSize)) & AllButTypeMask; - goto l4; + goto l3; } else { class = longAt(((longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (CompactClasses << ShiftForWord))) + BaseHeaderSize) + ((ccIndex - 1) << ShiftForWord)); - goto l4; + goto l3; } -l4: /* end fetchClassOfNonInt: */; +l3: /* end fetchClassOfNonInt: */; classFormat = (longAt((class + BaseHeaderSize) + (InstanceSpecificationIndex << ShiftForWord))) - 1; fixedFields = (((((usqInt) classFormat) >> 11) & 192) + ((((usqInt) classFormat) >> 2) & 63)) - 1; -l3: /* end fixedFieldsOf:format:length: */; +l4: /* end fixedFieldsOf:format:length: */; if ((fmt == 3) && (((((usqInt) hdr) >> 12) & 31) == ClassMethodContextCompactIndex)) { /* begin stackPointerForMaybeMarriedContext: */ @@ -36900,17 +36972,17 @@ sp = stackPointerIndexForFrame(frameOfMarriedContext(array)); assert((ReceiverIndex + ((sp >> 1))) < (lengthOf(array))); stSize = sp; - goto l2; + goto l1; } /* begin fetchStackPointerOf: */ sp1 = longAt((array + BaseHeaderSize) + (StackPointerIndex << ShiftForWord)); if (!((sp1 & 1))) { stSize = 0; - goto l2; + goto l1; } assert((ReceiverIndex + ((sp1 >> 1))) < (lengthOf(array))); stSize = (sp1 >> 1); - l2: /* end stackPointerForMaybeMarriedContext: */; + l1: /* end stackPointerForMaybeMarriedContext: */; if (((((usqInt) index)) >= (((usqInt) 1))) && (((((usqInt) index)) <= (((usqInt) stSize))) && ((((longAt((array + BaseHeaderSize) + (SenderIndex << ShiftForWord))) & 1)) @@ -36921,7 +36993,9 @@ else { stSize = totalLength - fixedFields; } - if (((((usqInt) index)) >= (((usqInt) 1))) + if ((oopisGreaterThanOrEqualTo(index, (fmt >= 12 + ? ((((((usqInt) (longAt((array + BaseHeaderSize) + (HeaderIndex << ShiftForWord)))) >> 10) & 255) + LiteralStart) * BytesPerWord) + 1 + : 1))) && ((((usqInt) index)) <= (((usqInt) stSize)))) { /* begin subscript:with:format: */ if (fmt <= 4) { @@ -36974,40 +37048,40 @@ sz -= hdr & Size4Bit; if (fmt <= 4) { totalLength = ((usqInt) (sz - BaseHeaderSize)) >> ShiftForWord; - goto l1; + goto l2; } if (fmt < 8) { totalLength = ((usqInt) (sz - BaseHeaderSize)) >> 2; - goto l1; + goto l2; } else { totalLength = (sz - BaseHeaderSize) - (fmt & 3); - goto l1; + goto l2; } -l1: /* end lengthOf:baseHeader:format: */; +l2: /* end lengthOf:baseHeader:format: */; /* begin fixedFieldsOf:format:length: */ if ((fmt > 4) || (fmt == 2)) { fixedFields = 0; - goto l3; + goto l4; } if (fmt < 2) { fixedFields = totalLength; - goto l3; + goto l4; } /* begin fetchClassOfNonInt: */ if (((ccIndex = (((usqInt) (longAt(array))) >> 12) & 31)) == 0) { class = (longAt(array - BaseHeaderSize)) & AllButTypeMask; - goto l4; + goto l3; } else { class = longAt(((longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (CompactClasses << ShiftForWord))) + BaseHeaderSize) + ((ccIndex - 1) << ShiftForWord)); - goto l4; + goto l3; } -l4: /* end fetchClassOfNonInt: */; +l3: /* end fetchClassOfNonInt: */; classFormat = (longAt((class + BaseHeaderSize) + (InstanceSpecificationIndex << ShiftForWord))) - 1; fixedFields = (((((usqInt) classFormat) >> 11) & 192) + ((((usqInt) classFormat) >> 2) & 63)) - 1; -l3: /* end fixedFieldsOf:format:length: */; +l4: /* end fixedFieldsOf:format:length: */; if ((fmt == 3) && (((((usqInt) hdr) >> 12) & 31) == ClassMethodContextCompactIndex)) { /* begin stackPointerForMaybeMarriedContext: */ @@ -37017,17 +37091,17 @@ sp = stackPointerIndexForFrame(frameOfMarriedContext(array)); assert((ReceiverIndex + ((sp >> 1))) < (lengthOf(array))); stSize = sp; - goto l2; + goto l1; } /* begin fetchStackPointerOf: */ sp1 = longAt((array + BaseHeaderSize) + (StackPointerIndex << ShiftForWord)); if (!((sp1 & 1))) { stSize = 0; - goto l2; + goto l1; } assert((ReceiverIndex + ((sp1 >> 1))) < (lengthOf(array))); stSize = (sp1 >> 1); - l2: /* end stackPointerForMaybeMarriedContext: */; + l1: /* end stackPointerForMaybeMarriedContext: */; if (((((usqInt) index)) >= (((usqInt) 1))) && (((((usqInt) index)) <= (((usqInt) stSize))) && ((((longAt((array + BaseHeaderSize) + (SenderIndex << ShiftForWord))) & 1)) @@ -37039,7 +37113,9 @@ else { stSize = totalLength - fixedFields; } - if (((((usqInt) index)) >= (((usqInt) 1))) + if ((oopisGreaterThanOrEqualTo(index, (fmt >= 12 + ? ((((((usqInt) (longAt((array + BaseHeaderSize) + (HeaderIndex << ShiftForWord)))) >> 10) & 255) + LiteralStart) * BytesPerWord) + 1 + : 1))) && ((((usqInt) index)) <= (((usqInt) stSize)))) { /* begin subscript:with:storing:format: */ VM_LABEL(2subscriptwithstoringformat); Modified: branches/Cog/stacksrc/vm/interp.h =================================================================== --- branches/Cog/stacksrc/vm/interp.h 2012-04-24 17:25:08 UTC (rev 2551) +++ branches/Cog/stacksrc/vm/interp.h 2012-05-02 23:13:02 UTC (rev 2552) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.152 uuid: d39d62b0-45ca-4621-8f67-e3981bbe1875 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.159 uuid: cbf7f95a-6fe2-4578-898e-47afb8524be4 */ #define VM_PROXY_MAJOR 1 Modified: branches/Cog/stacksrc/vm/vmCallback.h =================================================================== --- branches/Cog/stacksrc/vm/vmCallback.h 2012-04-24 17:25:08 UTC (rev 2551) +++ branches/Cog/stacksrc/vm/vmCallback.h 2012-05-02 23:13:02 UTC (rev 2552) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.152 uuid: d39d62b0-45ca-4621-8f67-e3981bbe1875 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.159 uuid: cbf7f95a-6fe2-4578-898e-47afb8524be4 */ #define VM_CALLBACK_INC 1

1 0

[CogVM-blessed] -headless stopped working
by Stefan Marr 02 May '12

02 May '12

Hi Esteban: I just downloaded a Cog-Mac-Cocoa-blessed from: https://ci.lille.inria.fr/pharo/job/Cog-Mac-Cocoa-blessed/ It tells me, it is currently 19days old. And it ignores the -headless parameter. The old VM I used so far is from Jul 6th and does execute headless without problems. I did not find the mail on the list that was naming the primitives to get more version infos out of the VMs, sorry. The latest StackVM also got that problem, but it works with the version from July. Is there actually something like -version on the command line to ask for the exact version infos? I checked -help, which also offers a lot less info then it used to. It still mentions -headless, but misses the options below. Best regards Stefan Missing help for commandline options: -breaksel selector set breakpoint on send of selector -eden <size>[mk] set eden memory to bytes -leakcheck num check for leaks in the heap -stackpages num use n stack pages -codesize <size>[mk] set machine code memory to bytes -sendtrace[=num] enable send tracing (optionally to a specific value) -tracestores enable store tracing (assert check stores) -cogmaxlits <n> set max number of literals for methods compiled to machine code -cogminjumps <n> set min number of backward jumps for interpreted methods to be considered for compilation to machine code -pathenc <enc> set encoding for pathnames (default: macintosh) -- Stefan Marr Software Languages Lab Vrije Universiteit Brussel Pleinlaan 2 / B-1050 Brussels / Belgium http://soft.vub.ac.be/~smarr Phone: +32 2 629 2974 Fax: +32 2 629 3525

4 5

VM Maker: VMMaker.oscog-eem.159.mcz
by commits＠source.squeak.org 02 May '12

02 May '12

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.159.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.159 Author: eem Time: 2 May 2012, 11:42:18.255 am UUID: cbf7f95a-6fe2-4578-898e-47afb8524be4 Ancestors: VMMaker.oscog-eem.158 Plugins: Fix ThreadedFFIPlugin's preambleCCode for Pharo's mingw config. Merge fix for JPEGReadWriter2Plugin (http://bugs.squeak.org/view.php?id=7691) Merge with VMMaker version s of plugins JPEGReaderPlugin, KlattSynthesizerPlugin Matrix2x3Plugin Mpeg3Plugin =============== Diff against VMMaker.oscog-eem.157 =============== Item was changed: VMClass subclass: #CogMemoryManager (excessive size, no diff calculated) Item was changed: ----- Method: CogVMSimulator>>ensureMultiThreadingOverridesAreUpToDate (in category 'initialization') ----- ensureMultiThreadingOverridesAreUpToDate "Make sure the CoInterpreterMT switch methods are implemented. These methods select between CoInterpreterMT's implementation or CoInterpreter's implementation depending on cogThreadManager being non-nil or nil respectively. i.e. they allow us to use this one simulator class to simulate for both CoInterpreterMT and CoInterpreter." | thisClass me mtInterpreterClass | thisClass := thisContext methodClass. mtInterpreterClass := thisClass superclass. me := thisClass name, '>>', thisContext method selector. "We want override switches for everything implemented by CoInterpreter and CoInterpreterMT that is either not implemented by CogVMSimulator or already implemented by CogVMSimulator as an override switch." (mtInterpreterClass selectors select: [:sel| (mtInterpreterClass superclass whichClassIncludesSelector: sel) notNil and: [(thisClass organization categoryOfElement: sel) ifNil: [true] ifNotNil: [:cat| cat == #'multi-threading simulation switch']]]) do: [:sel| | argNames desiredSource | argNames := Parser new initPattern: (mtInterpreterClass sourceCodeAt: sel) notifying: nil return: [:pattern| pattern second]. desiredSource := String streamContents: [:str| argNames isEmpty ifTrue: [str nextPutAll: sel] ifFalse: [sel keywords with: argNames do: [:kw :arg| str nextPutAll: kw; space; nextPutAll: arg; space]. str skip: -1]. str crtab; nextPutAll: '"This method includes or excludes ', mtInterpreterClass name, ' methods as required.'; crtab; nextPutAll: ' Auto-generated by ', me, '"'; cr; crtab; nextPutAll: '^self perform: '; store: sel; crtab: 2; nextPutAll: 'withArguments: {'. argNames do: [:arg| str nextPutAll: arg] separatedBy: [str nextPut: $.; space]. str nextPut: $}; crtab: 2; nextPutAll: 'inSuperclass: (cogThreadManager ifNil: ['; print: mtInterpreterClass superclass; nextPutAll: '] ifNotNil: ['; print: mtInterpreterClass; nextPutAll: '])']. desiredSource ~= (thisClass sourceCodeAt: sel ifAbsent: ['']) asString ifTrue: [((thisClass includesSelector: sel) and: [(thisClass compiledMethodAt: sel) messages includesAnyOf: #(halt halt:)]) + ifTrue: [self transcript cr; nextPutAll: 'WARNING, because of halts, not generating '; nextPutAll: desiredSource; cr; flush] - ifTrue: [Transcript cr; nextPutAll: 'WARNING, because of halts, not generating '; nextPutAll: desiredSource; cr; flush] ifFalse: [thisClass compile: desiredSource classified: #'multi-threading simulation switch']]]. "Make sure obsolete CoInterpreterMT switch methods are deleted." ((thisContext methodClass organization listAtCategoryNamed: #'multi-threading simulation switch') select: [:sel| (mtInterpreterClass whichClassIncludesSelector: sel) isNil]) do: [:sel| thisClass removeSelector: sel]! Item was changed: ----- Method: Cogit>>simulateCogCodeAt: (in category 'simulation only') ----- simulateCogCodeAt: address "<Integer>" <doNotGenerate> | stackZoneBase | stackZoneBase := coInterpreter stackZoneBase. processor eip: address. [[[singleStep ifTrue: [[processor sp < stackZoneBase ifTrue: [self halt]. self recordRegisters. printRegisters ifTrue: [processor printRegistersOn: coInterpreter transcript]. self recordLastInstruction. printInstructions ifTrue: + [coInterpreter transcript nextPutAll: lastNInstructions last; cr; flush]. - [Transcript nextPutAll: lastNInstructions last; cr; flush]. (breakPC isInteger ifTrue: [processor pc = breakPC and: [breakBlock value: self]] ifFalse: [breakBlock value: self]) ifTrue: ["printRegisters := printInstructions := true" "self reportLastNInstructions" "coInterpreter printExternalHeadFrame" "coInterpreter printFrameAndCallers: coInterpreter framePointer SP: coInterpreter stackPointer" "coInterpreter shortPrintFrameAndCallers: coInterpreter framePointer" "coInterpreter printFrame: processor fp WithSP: processor sp" "coInterpreter printFrameAndCallers: processor fp SP: processor sp" "coInterpreter shortPrintFrameAndCallers: processor fp" "self disassembleMethodFor: processor pc" coInterpreter changed: #byteCountText. self halt: 'machine code breakpoint at ', (breakPC isInteger ifTrue: [breakPC hex] ifFalse: [String streamContents: [:s| breakBlock decompile printOn: s indent: 0]])]] value]. "So that the Debugger's Over steps over all this" singleStep ifTrue: [processor singleStepIn: coInterpreter memory minimumAddress: guardPageSize readOnlyBelow: coInterpreter cogCodeSize] ifFalse: [processor runInMemory: coInterpreter memory minimumAddress: guardPageSize readOnlyBelow: coInterpreter cogCodeSize]. ((printRegisters or: [printInstructions]) and: [clickConfirm]) ifTrue: [(self confirm: 'continue?') ifFalse: [self halt]]. true] whileTrue] on: ProcessorSimulationTrap do: [:ex| self handleSimulationTrap: ex]. true] whileTrue! Item was changed: ----- Method: FilePluginSimulator>>sqFileStdioHandlesInto: (in category 'simulation') ----- sqFileStdioHandlesInto: anArray + interpreterProxy transcript clear. - Transcript clear. "See FilePluginSimulator>>initialiseModule" anArray at: 1 put: 0; at: 2 put: 1; at: 3 put: 2. ^7! Item was changed: ----- Method: JPEGReadWriter2Plugin>>primJPEGReadImage:fromByteArray:onForm:doDithering:errorMgr: (in category 'primitives') ----- primJPEGReadImage: aJPEGDecompressStruct fromByteArray: source onForm: form doDithering: ditherFlag errorMgr: aJPEGErrorMgr2Struct + | pcinfo pjerr buffer rowStride formBits formDepth i j formPix ok rOff gOff bOff rOff2 gOff2 bOff2 formWidth formHeight pixPerWord formPitch formBitsSize sourceSize r1 r2 g1 g2 b1 b2 formBitsOops dmv1 dmv2 di dmi dmo | - | pcinfo pjerr buffer rowStride formBits formDepth i j formPix ok rOff gOff bOff rOff2 gOff2 bOff2 formWidth formHeight pixPerWord formPitch formBitsSize sourceSize r1 r2 g1 g2 b1 b2 formBitsAsInt dmv1 dmv2 di dmi dmo | <export: true> <var: #pcinfo type: 'j_decompress_ptr '> <var: #pjerr type: 'error_ptr2 '> <var: #buffer type: 'JSAMPARRAY '> <var: #formBits type: 'unsigned * '> self primitive: 'primJPEGReadImagefromByteArrayonFormdoDitheringerrorMgr' parameters: #(ByteArray ByteArray Form Boolean ByteArray). "Avoid warnings when saving method" pcinfo := nil. pjerr := nil. buffer := nil. rowStride := nil. formDepth := nil. formBits := nil. i := nil. j := nil. formPix := nil. ok := nil. rOff := nil. gOff := nil. bOff := nil. rOff2 := nil. gOff2 := nil. bOff2 := nil. sourceSize := nil. r1 := nil. r2 := nil. g1 := nil. g2 := nil. b1 := nil. b2 := nil. dmv1 := nil. dmv2 := nil. di := nil. dmi := nil. dmo := nil. pcinfo. pjerr. buffer. rowStride. formBits. formDepth. i. j. formPix. ok. rOff. gOff. bOff. rOff2. gOff2. bOff2. sourceSize. r1. r2. g1.g2. b1. b2. dmv1. dmv2. di. dmi. dmo. + formBitsOops := interpreterProxy fetchPointer: 0 ofObject: form. - formBits :=self cCoerce: (interpreterProxy fetchPointer: 0 ofObject: form) to: 'unsigned *'. - formBitsAsInt := interpreterProxy fetchPointer: 0 ofObject: form. formDepth := interpreterProxy fetchInteger: 3 ofObject: form. "Various parameter checks" self cCode: ' interpreterProxy->success ((interpreterProxy->stSizeOf(interpreterProxy->stackValue(4))) >= (sizeof(struct jpeg_decompress_struct))); interpreterProxy->success ((interpreterProxy->stSizeOf(interpreterProxy->stackValue(0))) >= (sizeof(struct error_mgr2))); if (interpreterProxy->failed()) return null; ' inSmalltalk: []. formWidth := (self cCode: '((j_decompress_ptr)aJPEGDecompressStruct)->image_width' inSmalltalk: [0]). formHeight := (self cCode: '((j_decompress_ptr)aJPEGDecompressStruct)->image_height' inSmalltalk: [0]). pixPerWord := 32 // formDepth. formPitch := formWidth + (pixPerWord-1) // pixPerWord * 4. + formBitsSize := interpreterProxy byteSizeOf: formBitsOops. - formBitsSize := interpreterProxy byteSizeOf: formBitsAsInt. interpreterProxy success: + ((interpreterProxy isWordsOrBytes: formBitsOops) - ((interpreterProxy isWordsOrBytes: formBitsAsInt) and: [formBitsSize = (formPitch * formHeight)]). interpreterProxy failed ifTrue: [^ nil]. + formBits := interpreterProxy firstIndexableField: formBitsOops. self cCode: ' sourceSize = interpreterProxy->stSizeOf(interpreterProxy->stackValue(3)); if (sourceSize == 0) { interpreterProxy->success(false); return null; } pcinfo = (j_decompress_ptr)aJPEGDecompressStruct; pjerr = (error_ptr2)aJPEGErrorMgr2Struct; pcinfo->err = jpeg_std_error(&pjerr->pub); pjerr->pub.error_exit = error_exit; ok = 1; if (setjmp(pjerr->setjmp_buffer)) { jpeg_destroy_decompress(pcinfo); ok = 0; } if (ok) { ok = jpeg_mem_src_newLocationOfData(pcinfo, source, sourceSize); if (ok) { /* Dither Matrix taken from Form>>orderedDither32To16, but rewritten for this method. */ int ditherMatrix1[] = { 2, 0, 14, 12, 1, 3, 13, 15 }; int ditherMatrix2[] = { 10, 8, 6, 4, 9, 11, 5, 7 }; jpeg_start_decompress(pcinfo); rowStride = pcinfo->output_width * pcinfo->output_components; if (pcinfo->out_color_components == 3) { rOff = 0; gOff = 1; bOff = 2; rOff2 = 3; gOff2 = 4; bOff2 = 5; } else { rOff = 0; gOff = 0; bOff = 0; rOff2 = 1; gOff2 = 1; bOff2 = 1; } /* Make a one-row-high sample array that will go away when done with image */ buffer = (*(pcinfo->mem)->alloc_sarray) ((j_common_ptr) pcinfo, JPOOL_IMAGE, rowStride, 1); /* Step 6: while (scan lines remain to be read) */ /* jpeg_read_scanlines(...); */ /* Here we use the library state variable cinfo.output_scanline as the * loop counter, so that we dont have to keep track ourselves. */ while (pcinfo->output_scanline < pcinfo->output_height) { /* jpeg_read_scanlines expects an array of pointers to scanlines. * Here the array is only one element long, but you could ask for * more than one scanline at a time if thats more convenient. */ (void) jpeg_read_scanlines(pcinfo, buffer, 1); switch (formDepth) { case 32: + for(i = 0, j = 0; i < rowStride; i +=(pcinfo->out_color_components), j++) { - for(i = 0, j = 1; i < rowStride; i +=(pcinfo->out_color_components), j++) { formPix = (255 << 24) | (buffer[0][i+rOff] << 16) | (buffer[0][i+gOff] << 8) | buffer[0][i+bOff]; if (formPix == 0) formPix = 1; formBits [ ((pcinfo->output_scanline - 1) * (pcinfo->image_width)) + j ] = formPix; } break; case 16: + for(i = 0, j = 0; i < rowStride; i +=(pcinfo->out_color_components*2), j++) { - for(i = 0, j = 1; i < rowStride; i +=(pcinfo->out_color_components*2), j++) { r1 = buffer[0][i+rOff]; r2 = buffer[0][i+rOff2]; g1 = buffer[0][i+gOff]; g2 = buffer[0][i+gOff2]; b1 = buffer[0][i+bOff]; b2 = buffer[0][i+bOff2]; if (!!ditherFlag) { r1 = r1 >> 3; r2 = r2 >> 3; g1 = g1 >> 3; g2 = g2 >> 3; b1 = b1 >> 3; b2 = b2 >> 3; } else { /* Do 4x4 ordered dithering. Taken from Form>>orderedDither32To16 */ dmv1 = ditherMatrix1[ ((pcinfo->output_scanline & 3 )<< 1) | (j&1) ]; dmv2 = ditherMatrix2[ ((pcinfo->output_scanline & 3 )<< 1) | (j&1) ]; di = (r1 * 496) >> 8; dmi = di & 15; dmo = di >> 4; if(dmv1 < dmi) { r1 = dmo+1; } else { r1 = dmo; }; di = (g1 * 496) >> 8; dmi = di & 15; dmo = di >> 4; if(dmv1 < dmi) { g1 = dmo+1; } else { g1 = dmo; }; di = (b1 * 496) >> 8; dmi = di & 15; dmo = di >> 4; if(dmv1 < dmi) { b1 = dmo+1; } else { b1 = dmo; }; di = (r2 * 496) >> 8; dmi = di & 15; dmo = di >> 4; if(dmv2 < dmi) { r2 = dmo+1; } else { r2 = dmo; }; di = (g2 * 496) >> 8; dmi = di & 15; dmo = di >> 4; if(dmv2 < dmi) { g2 = dmo+1; } else { g2 = dmo; }; di = (b2 * 496) >> 8; dmi = di & 15; dmo = di >> 4; if(dmv2 < dmi) { b2 = dmo+1; } else { b2 = dmo; }; } formPix = (r1 << 10) | (g1 << 5) | b1; if (!!formPix) formPix = 1; formPix = (formPix << 16) | (r2 << 10) | (g2 << 5) | b2; if (!!(formPix & 65535)) formPix = formPix | 1; formBits [ ((pcinfo->output_scanline - 1) * (pcinfo->image_width)) / 2 + j ] = formPix; } break; } } jpeg_finish_decompress(pcinfo); } jpeg_destroy_decompress(pcinfo); } ' inSmalltalk: [].! Item was changed: ----- Method: JPEGReadWriter2Plugin>>primJPEGWriteImage:onByteArray:form:quality:progressiveJPEG:errorMgr: (in category 'primitives') ----- primJPEGWriteImage: aJPEGCompressStruct onByteArray: destination form: form quality: quality progressiveJPEG: progressiveFlag errorMgr: aJPEGErrorMgr2Struct + | pcinfo pjerr buffer rowStride formBits formWidth formHeight formDepth i j formPix destinationSize pixPerWord formPitch formBitsSize formBitsOops | - | pcinfo pjerr buffer rowStride formBits formWidth formHeight formDepth i j formPix destinationSize pixPerWord formPitch formBitsSize formBitsAsInt | <export: true> <var: #pcinfo type: 'j_compress_ptr '> <var: #pjerr type: 'error_ptr2 '> <var: #buffer type: 'JSAMPARRAY '> <var: #formBits type: 'unsigned * '> <var: #destinationSize type: 'unsigned int'> self primitive: 'primJPEGWriteImageonByteArrayformqualityprogressiveJPEGerrorMgr' parameters: #(ByteArray ByteArray Form SmallInteger Boolean ByteArray). pcinfo := nil. pjerr := nil. buffer :=nil. rowStride := nil. formBits := nil. formWidth := nil. formHeight := nil. formDepth := nil. i := nil. j := nil. formPix := nil. destinationSize := nil. pcinfo. pjerr. buffer. rowStride. formBits. formWidth. formHeight. formDepth. i. j. formPix. destinationSize. + formBitsOops := interpreterProxy fetchPointer: 0 ofObject: form. - formBits :=self cCoerce: (interpreterProxy fetchPointer: 0 ofObject: form) to: 'unsigned *'. - formBitsAsInt := interpreterProxy fetchPointer: 0 ofObject: form. formWidth := interpreterProxy fetchInteger: 1 ofObject: form. formHeight := interpreterProxy fetchInteger: 2 ofObject: form. formDepth := interpreterProxy fetchInteger: 3 ofObject: form. "Various parameter checks" self cCode: ' interpreterProxy->success ((interpreterProxy->stSizeOf(interpreterProxy->stackValue(5))) >= (sizeof(struct jpeg_compress_struct))); interpreterProxy->success ((interpreterProxy->stSizeOf(interpreterProxy->stackValue(0))) >= (sizeof(struct error_mgr2))); if (interpreterProxy->failed()) return null; ' inSmalltalk: []. pixPerWord := 32 // formDepth. formPitch := formWidth + (pixPerWord-1) // pixPerWord * 4. + formBitsSize := interpreterProxy byteSizeOf: formBitsOops. - formBitsSize := interpreterProxy byteSizeOf: formBitsAsInt. interpreterProxy success: + ((interpreterProxy isWordsOrBytes: formBitsOops) - ((interpreterProxy isWordsOrBytes: formBitsAsInt) and: [formBitsSize = (formPitch * formHeight)]). interpreterProxy failed ifTrue: [^ nil]. + formBits := interpreterProxy firstIndexableField: formBitsOops. - self cCode: ' destinationSize = interpreterProxy->stSizeOf(interpreterProxy->stackValue(4)); pcinfo = (j_compress_ptr)aJPEGCompressStruct; pjerr = (error_ptr2)aJPEGErrorMgr2Struct; if (destinationSize) { pcinfo->err = jpeg_std_error(&pjerr->pub); pjerr->pub.error_exit = error_exit; if (setjmp(pjerr->setjmp_buffer)) { jpeg_destroy_compress(pcinfo); destinationSize = 0; } if (destinationSize) { jpeg_create_compress(pcinfo); jpeg_mem_dest(pcinfo, destination, &destinationSize); pcinfo->image_width = formWidth; pcinfo->image_height = formHeight; pcinfo->input_components = 3; pcinfo->in_color_space = JCS_RGB; jpeg_set_defaults(pcinfo); if (quality > 0) jpeg_set_quality (pcinfo, quality, 1); if (progressiveFlag) jpeg_simple_progression(pcinfo); jpeg_start_compress(pcinfo, TRUE); rowStride = formWidth * 3; /* Make a one-row-high sample array that will go away when done with image */ buffer = (*(pcinfo->mem)->alloc_sarray) ((j_common_ptr) pcinfo, JPOOL_IMAGE, rowStride, 1); while (pcinfo->next_scanline < pcinfo->image_height) { switch (formDepth) { case 32: + for(i = 0, j = 0; i < rowStride; i +=3, j++) { - for(i = 0, j = 1; i < rowStride; i +=3, j++) { formPix = formBits [ ((pcinfo->next_scanline) * formWidth) + j ]; buffer[0][i] = (formPix >> 16) & 255; buffer[0][i+1] = (formPix >> 8) & 255; buffer[0][i+2] = formPix & 255; } break; case 16: + for(i = 0, j = 0; i < rowStride; i +=6, j++) { - for(i = 0, j = 1; i < rowStride; i +=6, j++) { formPix = formBits [ ((pcinfo->next_scanline) * formWidth) / 2 + j ]; buffer[0][i] = (formPix >> 23) & 248; buffer[0][i+1] = (formPix >> 18) & 248; buffer[0][i+2] = (formPix >> 13) & 248; buffer[0][i+3] = (formPix >> 7) & 248; buffer[0][i+4] = (formPix >> 2) & 248; buffer[0][i+5] = (formPix << 3) & 248; } break; } (void) jpeg_write_scanlines(pcinfo, buffer, 1); } jpeg_finish_compress(pcinfo); jpeg_destroy_compress(pcinfo); } } ' inSmalltalk: []. ^(self cCode: 'destinationSize' inSmalltalk: [0]) asOop: SmallInteger! Item was changed: ----- Method: JPEGReaderPlugin>>idctBlockInt:qt: (in category 'decoding') ----- idctBlockInt: anArray qt: qt | ws anACTerm dcval z2 z3 z1 t2 t3 t0 t1 t10 t13 t11 t12 z4 z5 v | + <var: #anArray type: 'int *'> + <var: #qt type: 'int *'> + <var: #ws declareC: 'int ws[64]'> - <var: #anArray type:'int *'> - <var: #qt type:'int *'> - <var: #ws declareC:'int ws[64]'> self cCode:'' inSmalltalk:[ws := CArrayAccessor on: (IntegerArray new: 64)]. "Pass 1: process columns from anArray, store into work array" 0 to: DCTSize-1 do:[:i | anACTerm := -1. 1 to: DCTSize-1 do:[:row| anACTerm = -1 ifTrue:[ (anArray at: row * DCTSize + i) = 0 ifFalse:[anACTerm := row]]]. anACTerm = -1 ifTrue:[ dcval := (anArray at: i) * (qt at: 0) bitShift: Pass1Bits. 0 to: DCTSize-1 do: [:j | ws at: (j * DCTSize + i) put: dcval] ] ifFalse:[ z2 := (anArray at: (DCTSize * 2 + i)) * (qt at: (DCTSize * 2 + i)). z3 := (anArray at: (DCTSize * 6 + i)) * (qt at: (DCTSize * 6 + i)). z1 := (z2 + z3) * FIXn0n541196100. t2 := z1 + (z3 * (0 - FIXn1n847759065)). t3 := z1 + (z2 * FIXn0n765366865). z2 := (anArray at: i) * (qt at: i). z3 := (anArray at: (DCTSize * 4 + i)) * (qt at: (DCTSize * 4 + i)). t0 := (z2 + z3) bitShift: ConstBits. t1 := (z2 - z3) bitShift: ConstBits. t10 := t0 + t3. t13 := t0 - t3. t11 := t1 + t2. t12 := t1 - t2. t0 := (anArray at: (DCTSize * 7 + i)) * (qt at: (DCTSize * 7 + i)). t1 := (anArray at: (DCTSize * 5 + i)) * (qt at: (DCTSize * 5 + i)). t2 := (anArray at: (DCTSize * 3 + i)) * (qt at: (DCTSize * 3 + i)). t3 := (anArray at: (DCTSize + i)) * (qt at: (DCTSize + i)). z1 := t0 + t3. z2 := t1 + t2. z3 := t0 + t2. z4 := t1 + t3. z5 := (z3 + z4) * FIXn1n175875602. t0 := t0 * FIXn0n298631336. t1 := t1 * FIXn2n053119869. t2 := t2 * FIXn3n072711026. t3 := t3 * FIXn1n501321110. z1 := z1 * (0 - FIXn0n899976223). z2 := z2 * (0 - FIXn2n562915447). z3 := z3 * (0 - FIXn1n961570560). z4 := z4 * (0 - FIXn0n390180644). z3 := z3 + z5. z4 := z4 + z5. t0 := t0 + z1 + z3. t1 := t1 +z2 +z4. t2 := t2 + z2 + z3. t3 := t3 + z1 + z4. ws at: i put: (t10 + t3) // Pass1Div. ws at: (DCTSize * 7 + i) put: (t10 - t3) // Pass1Div. ws at: (DCTSize * 1 + i) put: (t11 + t2) // Pass1Div. ws at: (DCTSize * 6 + i) put: (t11 - t2) // Pass1Div. ws at: (DCTSize * 2 + i) put: (t12 + t1) // Pass1Div. ws at: (DCTSize * 5 + i) put: (t12 - t1) // Pass1Div. ws at: (DCTSize * 3 + i) put: (t13 + t0) // Pass1Div. ws at: (DCTSize * 4 + i) put: (t13 - t0) // Pass1Div]]. "Pass 2: process rows from work array, store back into anArray" 0 to: DCTSize2-DCTSize by: DCTSize do:[:i | z2 := ws at: i + 2. z3 := ws at: i + 6. z1 := (z2 + z3) * FIXn0n541196100. t2 := z1 + (z3 * (0-FIXn1n847759065)). t3 := z1 + (z2 * FIXn0n765366865). t0 := (ws at: i) + (ws at: (i + 4)) bitShift: ConstBits. t1 := (ws at: i) - (ws at: (i + 4)) bitShift: ConstBits. t10 := t0 + t3. t13 := t0 - t3. t11 := t1 + t2. t12 := t1 -t2. t0 := ws at: (i + 7). t1 := ws at: (i + 5). t2 := ws at: (i + 3). t3 := ws at: (i + 1). z1 := t0 + t3. z2 := t1 + t2. z3 := t0 + t2. z4 := t1 + t3. z5 := (z3 + z4) * FIXn1n175875602. t0 := t0 * FIXn0n298631336. t1 := t1 * FIXn2n053119869. t2 := t2 * FIXn3n072711026. t3 := t3 * FIXn1n501321110. z1 := z1 * (0-FIXn0n899976223). z2 := z2 * (0-FIXn2n562915447). z3 := z3 * (0-FIXn1n961570560). z4 := z4 * (0-FIXn0n390180644). z3 := z3 + z5. z4 := z4 + z5. t0 := t0 + z1 + z3. t1 := t1 + z2 + z4. t2 := t2 + z2 + z3. t3 := t3 + z1 + z4. v := (t10 + t3) // Pass2Div + SampleOffset. v := v min: MaxSample. v := v max: 0. anArray at: i put: v. v := (t10 - t3) // Pass2Div + SampleOffset. v := v min: MaxSample. v := v max: 0. anArray at: (i + 7) put: v. v := (t11 + t2) // Pass2Div + SampleOffset. v := v min: MaxSample. v := v max: 0. anArray at: (i + 1) put: v. v := (t11 - t2) // Pass2Div + SampleOffset. v := v min: MaxSample. v := v max: 0. anArray at: (i + 6) put: v. v := (t12 + t1) // Pass2Div + SampleOffset. v := v min: MaxSample. v := v max: 0. anArray at: (i + 2) put: v. v := (t12 - t1) // Pass2Div + SampleOffset. v := v min: MaxSample. v := v max: 0. anArray at: (i + 5) put: v. v := (t13 + t0) // Pass2Div + SampleOffset. v := v min: MaxSample. v := v max: 0. anArray at: (i + 3) put: v. v := (t13 - t0) // Pass2Div + SampleOffset. v := v min: MaxSample. v := v max: 0. anArray at: (i + 4) put: v].! Item was changed: ----- Method: JPEGReaderPlugin>>jpegDecodeValueFrom:size: (in category 'stream support') ----- jpegDecodeValueFrom: table size: tableSize "Decode the next value in the receiver using the given huffman table." | bits bitsNeeded tableIndex value index | + <var: #table type: 'int *'> - <var: #table type:'int *'> bitsNeeded := (table at: 0) >> 24. "Initial bits needed" bitsNeeded > MaxBits ifTrue:[^-1]. tableIndex := 2. "First real table" [true] whileTrue:[ bits := self getBits: bitsNeeded. "Get bits" bits < 0 ifTrue:[^-1]. index := tableIndex + bits - 1. index >= tableSize ifTrue:[^-1]. value := table at: index. "Lookup entry in table" (value bitAnd: 16r3F000000) = 0 ifTrue:[^value]. "Check if it is a leaf node" "Fetch sub table" tableIndex := value bitAnd: 16rFFFF. "Table offset in low 16 bit" bitsNeeded := (value >> 24) bitAnd: 255. "Additional bits in high 8 bit" bitsNeeded > MaxBits ifTrue:[^-1]]. ^-1! Item was changed: ----- Method: KlattSynthesizerPlugin>>checkedFloatPtrOf: (in category 'private') ----- checkedFloatPtrOf: oop "Return the first indexable word of oop which is assumed to be variableWordSubclass" + <returnTypeC: 'float *'> - <returnTypeC:'float *'> interpreterProxy success: (interpreterProxy isWords: oop). interpreterProxy failed ifTrue:[^0]. ^self cCoerce: (interpreterProxy firstIndexableField: oop) to:'float *'! Item was changed: ----- Method: KlattSynthesizerPlugin>>checkedShortPtrOf: (in category 'private') ----- checkedShortPtrOf: oop "Return the first indexable word of oop which is assumed to be variableWordSubclass" + <returnTypeC: 'short *'> - <returnTypeC:'short *'> interpreterProxy success: (interpreterProxy isWords: oop). interpreterProxy failed ifTrue:[^0]. ^self cCoerce: (interpreterProxy firstIndexableField: oop) to:'short *'! Item was changed: ----- Method: Matrix2x3Plugin>>loadArgumentMatrix: (in category 'private') ----- loadArgumentMatrix: matrix "Load the argument matrix" + <returnTypeC: 'float *'> - <returnTypeC:'float *'> interpreterProxy failed ifTrue:[^nil]. ((interpreterProxy isWords: matrix) and:[(interpreterProxy slotSizeOf: matrix) = 6]) ifFalse:[interpreterProxy primitiveFail. ^nil]. ^self cCoerce: (interpreterProxy firstIndexableField: matrix) to:'float *'.! Item was changed: ----- Method: Matrix2x3Plugin>>matrix2x3ComposeMatrix:with:into: (in category 'transforming') ----- matrix2x3ComposeMatrix: m1 with: m2 into: m3 "Multiply matrix m1 with m2 and store the result into m3." | a11 a12 a13 a21 a22 a23 | + <var: #m1 type: 'const float *'> + <var: #m2 type: 'const float *'> + <var: #m3 type: 'float *'> + <var: #a11 type: 'double '> + <var: #a12 type: 'double '> + <var: #a13 type: 'double '> + <var: #a21 type: 'double '> + <var: #a22 type: 'double '> + <var: #a23 type: 'double '> - <var: #m1 type:'const float *'> - <var: #m2 type:'const float *'> - <var: #m3 type:'float *'> - <var: #a11 type:'double '> - <var: #a12 type:'double '> - <var: #a13 type:'double '> - <var: #a21 type:'double '> - <var: #a22 type:'double '> - <var: #a23 type:'double '> a11 := ((m1 at: 0) * (m2 at: 0)) + ((m1 at: 1) * (m2 at: 3)). a12 := ((m1 at: 0) * (m2 at: 1)) + ((m1 at: 1) * (m2 at: 4)). a13 := ((m1 at: 0) * (m2 at: 2)) + ((m1 at: 1) * (m2 at: 5)) + (m1 at: 2). a21 := ((m1 at: 3) * (m2 at: 0)) + ((m1 at: 4) * (m2 at: 3)). a22 := ((m1 at: 3) * (m2 at: 1)) + ((m1 at: 4) * (m2 at: 4)). a23 := ((m1 at: 3) * (m2 at: 2)) + ((m1 at: 4) * (m2 at: 5)) + (m1 at: 5). m3 at: 0 put: (self cCoerce: a11 to: 'float'). m3 at: 1 put: (self cCoerce: a12 to: 'float'). m3 at: 2 put: (self cCoerce: a13 to: 'float'). m3 at: 3 put: (self cCoerce: a21 to: 'float'). m3 at: 4 put: (self cCoerce: a22 to: 'float'). m3 at: 5 put: (self cCoerce: a23 to: 'float'). ! Item was changed: ----- Method: Matrix2x3Plugin>>matrix2x3InvertPoint: (in category 'transforming') ----- matrix2x3InvertPoint: m "Invert the pre-loaded argument point by the given matrix" | x y det detX detY | + <var: #m type: 'float *'> + <var: #x type: 'double '> + <var: #y type: 'double '> + <var: #det type: 'double '> + <var: #detX type: 'double '> + <var: #detY type: 'double '> - <var: #m type:'float *'> - <var: #x type:'double '> - <var: #y type:'double '> - <var: #det type:'double '> - <var: #detX type:'double '> - <var: #detY type:'double '> x := m23ArgX - (m at: 2). y := m23ArgY - (m at: 5). det := ((m at: 0) * (m at: 4)) - ((m at: 1) * (m at: 3)). det = 0.0 ifTrue:[^interpreterProxy primitiveFail]."Matrix is singular." det := 1.0 / det. detX := (x * (m at: 4)) - ((m at: 1) * y). detY := ((m at: 0) * y) - (x * (m at: 3)). m23ResultX := detX * det. m23ResultY := detY * det.! Item was changed: ----- Method: Matrix2x3Plugin>>matrix2x3TransformPoint: (in category 'transforming') ----- matrix2x3TransformPoint: m "Transform the pre-loaded argument point by the given matrix" + <var: #m type: 'float *'> - <var: #m type:'float *'> m23ResultX := (m23ArgX * (m at: 0)) + (m23ArgY * (m at: 1)) + (m at: 2). m23ResultY := (m23ArgX * (m at: 3)) + (m23ArgY * (m at: 4)) + (m at: 5).! Item was changed: ----- Method: Matrix2x3Plugin>>primitiveComposeMatrix (in category 'primitives') ----- primitiveComposeMatrix - <export: true> | m1 m2 m3 result | + <export: true> <inline: false> <var: #m1 type: #'float *'> <var: #m2 type: #'float *'> <var: #m3 type: #'float *'> self cCode: '' "Make this fail in simulation" inSmalltalk: [interpreterProxy success: false. ^ nil]. m3 := self loadArgumentMatrix: (result := interpreterProxy stackObjectValue: 0). m2 := self loadArgumentMatrix: (interpreterProxy stackObjectValue: 1). m1 := self loadArgumentMatrix: (interpreterProxy stackObjectValue: 2). interpreterProxy failed ifTrue:[^nil]. self matrix2x3ComposeMatrix: m1 with: m2 into: m3. interpreterProxy pop: 3 thenPush: result! Item was changed: ----- Method: Matrix2x3Plugin>>primitiveInvertPoint (in category 'primitives') ----- primitiveInvertPoint | matrix | <export: true> <inline: false> + <var: #matrix type: 'float *'> - <var: #matrix type:'float *'> self loadArgumentPoint: (interpreterProxy stackObjectValue: 0). matrix := self loadArgumentMatrix: (interpreterProxy stackObjectValue: 1). interpreterProxy failed ifTrue:[^nil]. self matrix2x3InvertPoint: matrix. interpreterProxy failed ifFalse:[self roundAndStoreResultPoint: 2].! Item was changed: ----- Method: Matrix2x3Plugin>>primitiveInvertRectInto (in category 'primitives') ----- primitiveInvertRectInto | matrix srcOop dstOop originX originY cornerX cornerY minX maxX minY maxY | <export: true> <inline: false> + <var: #matrix type: 'float *'> + <var: #originX type: 'double '> + <var: #originY type: 'double '> + <var: #cornerX type: 'double '> + <var: #cornerY type: 'double '> + <var: #minX type: 'double '> + <var: #maxX type: 'double '> + <var: #minY type: 'double '> + <var: #maxY type: 'double '> - <var: #matrix type:'float *'> - <var: #originX type:'double '> - <var: #originY type:'double '> - <var: #cornerX type:'double '> - <var: #cornerY type:'double '> - <var: #minX type:'double '> - <var: #maxX type:'double '> - <var: #minY type:'double '> - <var: #maxY type:'double '> dstOop := interpreterProxy stackObjectValue: 0. srcOop := interpreterProxy stackObjectValue: 1. matrix := self loadArgumentMatrix: (interpreterProxy stackObjectValue: 2). interpreterProxy failed ifTrue:[^nil]. (interpreterProxy fetchClassOf: srcOop) = (interpreterProxy fetchClassOf: dstOop) ifFalse:[^interpreterProxy primitiveFail]. (interpreterProxy isPointers: srcOop) ifFalse:[^interpreterProxy primitiveFail]. (interpreterProxy slotSizeOf: srcOop) = 2 ifFalse:[^interpreterProxy primitiveFail]. "Load top-left point" self loadArgumentPoint: (interpreterProxy fetchPointer: 0 ofObject: srcOop). interpreterProxy failed ifTrue:[^nil]. originX := m23ArgX. originY := m23ArgY. self matrix2x3InvertPoint: matrix. minX := maxX := m23ResultX. minY := maxY := m23ResultY. "Load bottom-right point" self loadArgumentPoint:(interpreterProxy fetchPointer: 1 ofObject: srcOop). interpreterProxy failed ifTrue:[^nil]. cornerX := m23ArgX. cornerY := m23ArgY. self matrix2x3InvertPoint: matrix. minX := minX min: m23ResultX. maxX := maxX max: m23ResultX. minY := minY min: m23ResultY. maxY := maxY max: m23ResultY. "Load top-right point" m23ArgX := cornerX. m23ArgY := originY. self matrix2x3InvertPoint: matrix. minX := minX min: m23ResultX. maxX := maxX max: m23ResultX. minY := minY min: m23ResultY. maxY := maxY max: m23ResultY. "Load bottom-left point" m23ArgX := originX. m23ArgY := cornerY. self matrix2x3InvertPoint: matrix. minX := minX min: m23ResultX. maxX := maxX max: m23ResultX. minY := minY min: m23ResultY. maxY := maxY max: m23ResultY. interpreterProxy failed ifFalse:[ dstOop := self roundAndStoreResultRect: dstOop x0: minX y0: minY x1: maxX y1: maxY]. interpreterProxy failed ifFalse:[ interpreterProxy pop: 3 thenPush: dstOop + ] + ! - ]! Item was changed: ----- Method: Matrix2x3Plugin>>primitiveIsIdentity (in category 'primitives') ----- primitiveIsIdentity | matrix | <export: true> <inline: false> + <var: #matrix type: 'float *'> - <var: #matrix type:'float *'> matrix := self loadArgumentMatrix: (interpreterProxy stackObjectValue: 0). interpreterProxy failed ifTrue:[^nil]. interpreterProxy pop: 1. interpreterProxy pushBool:( ((matrix at: 0) = (self cCoerce: 1.0 to: 'float')) & ((matrix at: 1) = (self cCoerce: 0.0 to: 'float')) & ((matrix at: 2) = (self cCoerce: 0.0 to: 'float')) & ((matrix at: 3) = (self cCoerce: 0.0 to: 'float')) & ((matrix at: 4) = (self cCoerce: 1.0 to: 'float')) & ((matrix at: 5) = (self cCoerce: 0.0 to: 'float'))).! Item was changed: ----- Method: Matrix2x3Plugin>>primitiveIsPureTranslation (in category 'primitives') ----- primitiveIsPureTranslation | matrix | <export: true> <inline: false> + <var: #matrix type: 'float *'> - <var: #matrix type:'float *'> matrix := self loadArgumentMatrix: (interpreterProxy stackObjectValue: 0). interpreterProxy failed ifTrue:[^nil]. interpreterProxy pop: 1. interpreterProxy pushBool:( ((matrix at: 0) = (self cCoerce: 1.0 to: 'float')) & ((matrix at: 1) = (self cCoerce: 0.0 to: 'float')) & ((matrix at: 3) = (self cCoerce: 0.0 to: 'float')) & ((matrix at: 4) = (self cCoerce: 1.0 to: 'float'))).! Item was changed: ----- Method: Matrix2x3Plugin>>primitiveTransformPoint (in category 'primitives') ----- primitiveTransformPoint | matrix | <export: true> <inline: false> + <var: #matrix type: 'float *'> - <var: #matrix type:'float *'> self loadArgumentPoint: (interpreterProxy stackObjectValue: 0). matrix := self loadArgumentMatrix: (interpreterProxy stackObjectValue: 1). interpreterProxy failed ifTrue:[^nil]. self matrix2x3TransformPoint: matrix. self roundAndStoreResultPoint: 2.! Item was changed: ----- Method: Matrix2x3Plugin>>primitiveTransformRectInto (in category 'primitives') ----- primitiveTransformRectInto | matrix srcOop dstOop originX originY cornerX cornerY minX maxX minY maxY | <export: true> <inline: false> + <var: #matrix type: 'float *'> + <var: #originX type: 'double '> + <var: #originY type: 'double '> + <var: #cornerX type: 'double '> + <var: #cornerY type: 'double '> + <var: #minX type: 'double '> + <var: #maxX type: 'double '> + <var: #minY type: 'double '> + <var: #maxY type: 'double '> - <var: #matrix type:'float *'> - <var: #originX type:'double '> - <var: #originY type:'double '> - <var: #cornerX type:'double '> - <var: #cornerY type:'double '> - <var: #minX type:'double '> - <var: #maxX type:'double '> - <var: #minY type:'double '> - <var: #maxY type:'double '> dstOop := interpreterProxy stackObjectValue: 0. srcOop := interpreterProxy stackObjectValue: 1. matrix := self loadArgumentMatrix: (interpreterProxy stackObjectValue: 2). interpreterProxy failed ifTrue:[^nil]. (interpreterProxy fetchClassOf: srcOop) = (interpreterProxy fetchClassOf: dstOop) ifFalse:[^interpreterProxy primitiveFail]. (interpreterProxy isPointers: srcOop) ifFalse:[^interpreterProxy primitiveFail]. (interpreterProxy slotSizeOf: srcOop) = 2 ifFalse:[^interpreterProxy primitiveFail]. "Load top-left point" self loadArgumentPoint: (interpreterProxy fetchPointer: 0 ofObject: srcOop). interpreterProxy failed ifTrue:[^nil]. originX := m23ArgX. originY := m23ArgY. self matrix2x3TransformPoint: matrix. minX := maxX := m23ResultX. minY := maxY := m23ResultY. "Load bottom-right point" self loadArgumentPoint:(interpreterProxy fetchPointer: 1 ofObject: srcOop). interpreterProxy failed ifTrue:[^nil]. cornerX := m23ArgX. cornerY := m23ArgY. self matrix2x3TransformPoint: matrix. minX := minX min: m23ResultX. maxX := maxX max: m23ResultX. minY := minY min: m23ResultY. maxY := maxY max: m23ResultY. "Load top-right point" m23ArgX := cornerX. m23ArgY := originY. self matrix2x3TransformPoint: matrix. minX := minX min: m23ResultX. maxX := maxX max: m23ResultX. minY := minY min: m23ResultY. maxY := maxY max: m23ResultY. "Load bottom-left point" m23ArgX := originX. m23ArgY := cornerY. self matrix2x3TransformPoint: matrix. minX := minX min: m23ResultX. maxX := maxX max: m23ResultX. minY := minY min: m23ResultY. maxY := maxY max: m23ResultY. dstOop := self roundAndStoreResultRect: dstOop x0: minX y0: minY x1: maxX y1: maxY. interpreterProxy failed ifFalse:[ interpreterProxy pop: 3 thenPush: dstOop + ] + ! - ]! Item was changed: ----- Method: Matrix2x3Plugin>>roundAndStoreResultRect:x0:y0:x1:y1: (in category 'private') ----- roundAndStoreResultRect: dstOop x0: x0 y0: y0 x1: x1 y1: y1 "Check, round and store the result of a rectangle operation" | minX maxX minY maxY originOop cornerOop rectOop | + <var: #x0 type: 'double '> + <var: #y0 type: 'double '> + <var: #x1 type: 'double '> + <var: #y1 type: 'double '> + <var: #minX type: 'double '> + <var: #maxX type: 'double '> + <var: #minY type: 'double '> + <var: #maxY type: 'double '> - <var: #x0 type:'double '> - <var: #y0 type:'double '> - <var: #x1 type:'double '> - <var: #y1 type:'double '> - <var: #minX type:'double '> - <var: #maxX type:'double '> - <var: #minY type:'double '> - <var: #maxY type:'double '> minX := x0 + 0.5. (self okayIntValue: minX) ifFalse:[^interpreterProxy primitiveFail]. maxX := x1 + 0.5. (self okayIntValue: maxX) ifFalse:[^interpreterProxy primitiveFail]. minY := y0 + 0.5. (self okayIntValue: minY) ifFalse:[^interpreterProxy primitiveFail]. maxY := y1 + 0.5. (self okayIntValue: maxY) ifFalse:[^interpreterProxy primitiveFail]. interpreterProxy pushRemappableOop: dstOop. originOop := interpreterProxy makePointwithxValue: minX asInteger yValue: minY asInteger. interpreterProxy pushRemappableOop: originOop. cornerOop := interpreterProxy makePointwithxValue: maxX asInteger yValue: maxY asInteger. originOop := interpreterProxy popRemappableOop. rectOop := interpreterProxy popRemappableOop. interpreterProxy storePointer: 0 ofObject: rectOop withValue: originOop. interpreterProxy storePointer: 1 ofObject: rectOop withValue: cornerOop. ^rectOop! Item was changed: ----- Method: Mpeg3Plugin>>primitiveMPEG3CheckSig: (in category 'primitives') ----- primitiveMPEG3CheckSig: path | result sz storage | "int mpeg3_check_sig(char *path)" <var: #storage declareC: 'char storage[1024] '> self primitive: 'primitiveMPEG3CheckSig' parameters: #(String). sz := interpreterProxy byteSizeOf: path cPtrAsOop. + interpreterProxy ioFilename: storage fromString: path ofLength: sz resolveAliases: true. - self cCode: 'sqFilenameFromStringOpen(storage, path, sz)'. self cCode: 'result = mpeg3_check_sig(storage)'. ^result asOop: Boolean ! Item was changed: ----- Method: Mpeg3Plugin>>primitiveMPEG3EndOfVideo:stream: (in category 'primitives') ----- primitiveMPEG3EndOfVideo: fileHandle stream: aNumber | file result | "int mpeg3_end_of_video(mpeg3_t *file, int stream)" + <var: #file type: 'mpeg3_t * '> - <var: #file type: 'mpeg3_t *'> self primitive: 'primitiveMPEG3EndOfVideo' parameters: #(Oop SmallInteger). file := self mpeg3tValueOf: fileHandle. file = nil ifTrue: [^0]. aNumber < 0 ifTrue: [interpreterProxy success: false. ^nil]. aNumber >= (self cCode: 'result = mpeg3_total_vstreams(file)') ifTrue: [ interpreterProxy success: false. ^0 ]. self cCode: 'result = mpeg3_end_of_video(file,aNumber)'. ^result asOop: Boolean ! Item was changed: ----- Method: Mpeg3Plugin>>primitiveMPEG3GetTime: (in category 'primitives') ----- primitiveMPEG3GetTime: fileHandle | file result | "double mpeg3_get_time(mpeg3_t *file)" + <var: #result type: 'double '> - <var: # result type: 'double '> <var: #file type: 'mpeg3_t * '> self primitive: 'primitiveMPEG3GetTime' parameters: #(Oop). file := self mpeg3tValueOf: fileHandle. file = nil ifTrue: [^nil]. self cCode: 'result = mpeg3_get_time(file)'. ^result asOop: Float. ! Item was changed: ----- Method: Mpeg3Plugin>>primitiveMPEG3Open: (in category 'primitives') ----- primitiveMPEG3Open: path | mpeg3Oop index sz storage | "mpeg3_t* mpeg3_open(char *path)" <var: #index declareC: 'mpeg3_t ** index'> <var: #storage declareC: 'char storage[1024]'> self primitive: 'primitiveMPEG3Open' parameters: #(String). sz := interpreterProxy byteSizeOf: path cPtrAsOop. + interpreterProxy ioFilename: storage fromString: path ofLength: sz resolveAliases: true. - self cCode: 'sqFilenameFromStringOpen(storage, path, sz)'. mpeg3Oop := interpreterProxy instantiateClass: interpreterProxy classByteArray indexableSize: 4. index := self cCoerce: (interpreterProxy firstIndexableField: mpeg3Oop) to: 'mpeg3_t **'. self cCode: '*index = mpeg3_open(storage,0); makeFileEntry(*index)'. ^mpeg3Oop. ! Item was changed: ----- Method: Mpeg3Plugin>>primitiveMPEG3ReadFrame:buffer:bufferOffset:x:y:w:h:ow:oh:colorModel:stream:bytesPerRow: (in category 'primitives') ----- primitiveMPEG3ReadFrame: fileHandle buffer: aBuffer bufferOffset: aBufferOffset x: xNumber y: yNumber w: width h: height ow: outWidth oh: outHeight colorModel: model stream: aNumber bytesPerRow: aByteNumber | file result outputRowsPtr bufferBaseAddr | + <var: #file declareC: 'mpeg3_t * file'> + <var: #bufferBaseAddr declareC: 'unsigned char *bufferBaseAddr'> + <var: #outputRowsPtr declareC: 'unsigned char ** outputRowsPtr'> "int mpeg3_read_frame(mpeg3_t *file, unsigned char **output_rows, int in_x, int in_y, int in_w, int in_h, int out_w, int out_h, int color_model, int stream)" - <var: #file declareC: 'mpeg3_t * file'> - <var: #bufferBaseAddr declareC: 'unsigned char *bufferBaseAddr'> - <var: #outputRowsPtr declareC: 'unsigned char ** outputRowsPtr'> self primitive: 'primitiveMPEG3ReadFrameBufferOffset' parameters: #(Oop WordArray SmallInteger SmallInteger SmallInteger SmallInteger SmallInteger SmallInteger SmallInteger SmallInteger SmallInteger SmallInteger). file := self mpeg3tValueOf: fileHandle. file = nil ifTrue: [^0]. aNumber < 0 ifTrue: [ interpreterProxy success: false. ^nil ]. aNumber >= (self cCode: 'result = mpeg3_total_vstreams(file)') ifTrue: [ interpreterProxy success: false. ^0 ]. bufferBaseAddr := self cCoerce: aBuffer to: 'unsigned char *'. self cCode: 'outputRowsPtr = (unsigned char **) memoryAllocate(1,sizeof(unsigned char*) * outHeight)'. 0 to: outHeight-1 do: [:i | outputRowsPtr at: i put: (bufferBaseAddr + aBufferOffset + (aByteNumber*i))]. self cCode: 'result = mpeg3_read_frame(file,outputRowsPtr,xNumber,yNumber,width,height,outWidth,outHeight,model,aNumber)'. self cCode: 'memoryFree(outputRowsPtr)'. ^result asSmallIntegerObj ! Item was changed: ----- Method: Mpeg3Plugin>>primitiveMPEG3ReadFrame:buffer:x:y:w:h:ow:oh:colorModel:stream:bytesPerRow: (in category 'primitives') ----- primitiveMPEG3ReadFrame: fileHandle buffer: aBuffer x: xNumber y: yNumber w: width h: height ow: outWidth oh: outHeight colorModel: model stream: aNumber bytesPerRow: aByteNumber | file result outputRowsPtr bufferBaseAddr | + <var: #file type: 'mpeg3_t * '> + <var: #bufferBaseAddr type: 'unsigned char *'> + <var: #outputRowsPtr type: 'unsigned char ** '> "int mpeg3_read_frame(mpeg3_t *file, unsigned char **output_rows, int in_x, int in_y, int in_w, int in_h, int out_w, int out_h, int color_model, int stream)" - <var: #file type: 'mpeg3_t * '> - <var: #bufferBaseAddr type: 'unsigned char *'> - <var: #outputRowsPtr type: 'unsigned char ** '> self primitive: 'primitiveMPEG3ReadFrame' parameters: #(Oop WordArray SmallInteger SmallInteger SmallInteger SmallInteger SmallInteger SmallInteger SmallInteger SmallInteger SmallInteger). file := self mpeg3tValueOf: fileHandle. file = nil ifTrue: [^0]. aNumber < 0 ifTrue: [ interpreterProxy success: false. ^nil ]. aNumber >= (self cCode: 'result = mpeg3_total_vstreams(file)') ifTrue: [ interpreterProxy success: false. ^0 ]. bufferBaseAddr := self cCoerce: aBuffer to: 'unsigned char *'. self cCode: 'outputRowsPtr = (unsigned char **) memoryAllocate(1,sizeof(unsigned char*) * outHeight)'. 0 to: outHeight-1 do: [:i | outputRowsPtr at: i put: (bufferBaseAddr + (aByteNumber*i))]. self cCode: 'result = mpeg3_read_frame(file,outputRowsPtr,xNumber,yNumber,width,height,outWidth,outHeight,model,aNumber)'. self cCode: 'memoryFree(outputRowsPtr)'. ^result asSmallIntegerObj ! Item was changed: ----- Method: Mpeg3Plugin>>primitiveMPEG3TellPercentage: (in category 'primitives') ----- primitiveMPEG3TellPercentage: fileHandle | file result | "double mpeg3_tell_percentage(mpeg3_t *file)" + <var: #result type: 'double '> - <var: # result type: 'double '> <var: #file type: 'mpeg3_t * '> self primitive: 'primitiveMPEG3TellPercentage' parameters: #(Oop). file := self mpeg3tValueOf: fileHandle. file = nil ifTrue: [^nil]. self cCode: 'result = mpeg3_tell_percentage(file)'. ^result asOop: Float. ! Item was added: + ----- Method: NewCoObjectMemorySimulator>>transcript (in category 'simulation only') ----- + transcript + "hack around the CoInterpreter/ObjectMemory split refactoring" + ^coInterpreter transcript! Item was added: + ----- Method: StackInterpreter>>headerIndicatesAlternateBytecodeSet: (in category 'internal interpreter access') ----- + headerIndicatesAlternateBytecodeSet: methodHeader + "A negative header selects the alternate bytecode set." + ^(objectMemory integerValueOf: methodHeader) < 0! Item was changed: ----- Method: StackInterpreter>>methodUsesAlternateBytecodeSet: (in category 'internal interpreter access') ----- methodUsesAlternateBytecodeSet: aMethodObj <api> <inline: true> "A negative header selects the alternate bytecode set." + ^self headerIndicatesAlternateBytecodeSet: (self headerOf: aMethodObj)! - ^(objectMemory integerValueOf: (self headerOf: aMethodObj)) < 0! Item was changed: ----- Method: TMethod>>inlineCaseStatementBranchesIn:localizingVars: (in category 'inlining') ----- inlineCaseStatementBranchesIn: aCodeGen localizingVars: varsList + | stmt sel newStatements maxTemp usedVars exitLabel v | - | stmt sel meth newStatements maxTemp usedVars exitLabel v | maxTemp := 0. parseTree nodesDo: [ :n | n isCaseStmt ifTrue: [ n cases do: [ :stmtNode | stmt := stmtNode statements first. stmt isSend ifTrue: [ sel := stmt selector. + (aCodeGen methodNamed: sel) ifNotNil: + [:meth| + (meth hasUnrenamableCCode + or: [meth args notEmpty]) ifFalse: [ + meth := meth copy. + meth hasReturn ifTrue: [ + exitLabel := meth unusedLabelForInliningInto: self. + meth exitVar: nil label: exitLabel. + labels add: exitLabel. + ] ifFalse: [ exitLabel := nil ]. - meth := aCodeGen methodNamed: sel. - (meth notNil - and: [meth hasUnrenamableCCode - or: [meth args notEmpty]]) ifFalse: [ - meth := meth copy. - meth hasReturn ifTrue: [ - exitLabel := meth unusedLabelForInliningInto: self. - meth exitVar: nil label: exitLabel. - labels add: exitLabel. - ] ifFalse: [ exitLabel := nil ]. + meth renameLabelsForInliningInto: self. + meth labels do: [ :label | labels add: label ]. + newStatements := stmtNode statements asOrderedCollection. + newStatements removeFirst. - meth renameLabelsForInliningInto: self. - meth labels do: [ :label | labels add: label ]. - newStatements := stmtNode statements asOrderedCollection. - newStatements removeFirst. + exitLabel ~= nil ifTrue: [ + newStatements addFirst: + (TLabeledCommentNode new + setLabel: exitLabel comment: 'end case'). + ]. + + newStatements addFirst: meth asInlineNode. - exitLabel ~= nil ifTrue: [ newStatements addFirst: + (TLabeledCommentNode new setComment: meth selector). + stmtNode setStatements: newStatements. - (TLabeledCommentNode new - setLabel: exitLabel comment: 'end case'). ]. - - newStatements addFirst: meth asInlineNode. - newStatements addFirst: - (TLabeledCommentNode new setComment: meth selector). - stmtNode setStatements: newStatements. ]. ]. ]. ]. ]. usedVars := (locals, args) asSet. 1 to: maxTemp do: [ :i | v := ('t', i printString). (usedVars includes: v) ifTrue: [ self error: 'temp variable name conflicts with an existing local or arg' ]. locals addLast: v. ]. "make local versions of the given globals" varsList do: [ :var | (usedVars includes: var) ifFalse: [ locals addFirst: var asString ]. + ].! - ]. - ! Item was changed: ----- Method: ThreadedFFIPlugin class>>preambleCCode (in category 'translation') ----- preambleCCode "For a source of builtin defines grep for builtin_define in a gcc release config directory." ^' #include "sqAssert.h" /* for assert */ #ifdef _MSC_VER # define alloca _alloca #endif #if defined(__GNUC__) && (defined(_X86_) || defined(i386) || defined(__i386) || defined(__i386__)) # define setsp(sp) asm volatile ("movl %0,%%esp" : : "m"(sp)) # define getsp() ({ void *esp; asm volatile ("movl %%esp,%0" : "=r"(esp) : ); esp;}) #endif #if !!defined(getsp) # define getsp() 0 #endif #if !!defined(setsp) # define setsp(ignored) 0 #endif #if !!defined(STACK_ALIGN_BYTES) # if __APPLE__ && __MACH__ && __i386__ # define STACK_ALIGN_BYTES 16 # elif __linux__ && __i386__ # define STACK_ALIGN_BYTES 16 # elif defined(__amd64__) || defined(__x86_64__) || defined(__amd64) || defined(__x86_64) # define STACK_ALIGN_BYTES 16 # elif defined(powerpc) || defined(__powerpc__) || defined(_POWER) || defined(__POWERPC__) || defined(__PPC__) # define STACK_ALIGN_BYTES 16 # elif defined(__sparc64__) || defined(__sparcv9__) || defined(__sparc_v9__) /* must preceed 32-bit sparc defs */ # define STACK_ALIGN_BYTES 16 # elif defined(sparc) || defined(__sparc__) || defined(__sparclite__) # define STACK_ALIGN_BYTES 8 # else # define STACK_ALIGN_BYTES 0 # endif #endif /* !!defined(STACK_ALIGN_BYTES) */ #if !!defined(STACK_OFFSET_BYTES) # define STACK_OFFSET_BYTES 0 #endif #if defined(_X86_) || defined(i386) || defined(__i386) || defined(__i386__) /* Both Mac OS X x86 and Win32 x86 return structs of a power of two in size * less than or equal to eight bytes in length in registers. Linux never does so. */ # if __linux__ # define WIN32_X86_STRUCT_RETURN 0 # else # define WIN32_X86_STRUCT_RETURN 1 # endif # if WIN32 # define PLATFORM_API_USES_CALLEE_POPS_CONVENTION 1 # else # define PLATFORM_API_USES_CALLEE_POPS_CONVENTION 0 # endif + #endif /* defined(_X86_) || defined(i386) || defined(__i386) || defined(__i386__) */ + + #if !!defined(ALLOCA_LIES_SO_USE_GETSP) # if defined(__MINGW32__) && (__GNUC__ >= 3) /* * cygwin -mno-cygwin (MinGW) gcc 3.4.x''s alloca is a library routine that answers * %esp + 4, so the outgoing stack is offset by one word if uncorrected. * Grab the actual stack pointer to correct. */ # define ALLOCA_LIES_SO_USE_GETSP 1 + # else + # define ALLOCA_LIES_SO_USE_GETSP 0 # endif + #endif /* !!defined(ALLOCA_LIES_SO_USE_GETSP) */ - #endif /* defined(_X86_) || defined(i386) || defined(__i386) || defined(__i386__) */ - #if !!defined(ALLOCA_LIES_SO_USE_GETSP) - # define ALLOCA_LIES_SO_USE_GETSP 0 - #endif - /* The dispatchOn:in:with:with: generates an unwanted call on error. Just squash it. */ #define error(foo) 0 /* but print assert failures. */ void warning(char *s) { /* Print an error message but don''t exit. */ printf("\n%s\n", s); } '!

1 0

JPEGReadWriter2Plugin crash fixed
by Páhi András 02 May '12

02 May '12

Hi, I have found the origin of various crashes in the Squeak VM, which is related to the JPEGReadWriter2Plugin. The hunt begun with Juan's Cuis 4.0 release, see the emails exchanged below and the description. I have attached the fixed C source, but the fix should go in the VM sources, because the code is generated as I see. Please include the fix in the VM sources. Regards, Andras Pahi ----- Original Message ----- From: Juan Vuletich (mail lists) To: Páhi András Sent: Thursday, April 26, 2012 9:26 PM Subject: Re: Cuis 4.0 crash on startup Wow Páhi! This is great! Please send all this to the vm-dev mail list, and ask for it to be included (or directions to do it yourself). It is my bug in the end... I wrote JPEGReadWriter2Plugin about 10 years ago... Cheers, Juan Vuletich Quoting Páhi András <pahia(a)t-online.hu>: Hi, Replace the winbuild/src/JPEGReadWriter2Plugin/JPEGReadWriter2Plugin.c file with the attached file, recompile the Squeak VM and Cuis 4.0 rocks. In the plugin there was a 1 off access in the formBits array. Because the code is generated, it needs to be corrected in the VM sources. How can I got there ? Executing several times World buildMagnifiedBackgroundImage in Cuis 3.3 crashed the Squeak VM. I exported the background image data, converted from JPEG to other format (BMP/PNG) and set the new format image to World backgroundImageData:. Everything worked as expected. I replaced the formBits array accesses in JPEGReadWriter2Plugin2.c with my routines, checking the indices and reporting off-array access attempts. Then I fixed the places in the C source. Regards, Andras Pahi ----- Original Message ----- From: Juan Vuletich (mail lists) To: Páhi András Sent: Thursday, April 26, 2012 12:47 PM Subject: Re: Cuis 4.0 crash on startup Great. Thanks. You might ask for help or directions in the vm-dev mail list. I'm sure that several people are at least aware of the bug. Cheers, Juan Vuletich Quoting Páhi András <pahia(a)t-online.hu>: Hi, Thank you for your reply. I will dig into the issues with the Windows VM. Regards, Andras Pahi ----- Original Message ----- From: Juan Vuletich (mail lists) To: Páhi András Sent: Thursday, April 26, 2012 11:59 AM Subject: Re: Cuis 4.0 crash on startup Hi Páhi, There is some problem with that Windows VM, not limited to Cuis. If you google "Squeak VM 4.1.1 windows crash" you'll find many results, for example http://bugs.squeak.org/view.php?id=7585 http://bugs.squeak.org/bug_view_advanced_page.php?bug_id=7686 and http://bugs.squeak.org/view.php?id=7523 . I'm not involved in the development of the Windows VM, all I can do is recommend using Cog until this is fixed somehow. Regards, Juan Vuletich Quoting Páhi András <pahia(a)t-online.hu>: Hi, I have just gave a shoot on Cuis 4.0 using SqueakVM 4.1.1 on Windows. It even does not start, the crash dump is attached, but with the latest Cog VM it runs fine. I checked the older Cuis 3.3 image with the same SqueakVM, it runs fine. Regards, Andras Pahi Cheers, Juan Vuletich

4 5

AioPlugin and SqueakSSL plugin included in Cocoa (please test)
by Esteban Lorenzano 02 May '12

02 May '12

Hi, I added AioPlugin and SqueakSSL plugins in Cocoa builds. Aio tests in OSProcess are green, but some other fails, and I don't know the reason. Also, Zodiac tests are all green, but I think there are things missing. Can you test and provide feedback? link: https://ci.lille.inria.fr/pharo/job/Cog-VM/Architecture=32,OS=mac/lastSucce… Thanks, Esteban

2 1

AioPlugin: VMConstruction-Plugins-AioPlugin-dtl.14.mcz
by squeak-dev-noreply＠lists.squeakfoundation.org 02 May '12

02 May '12

Dave Lewis uploaded a new version of VMConstruction-Plugins-AioPlugin to project AioPlugin: http://www.squeaksource.com/AioPlugin/VMConstruction-Plugins-AioPlugin-dtl.… ==================== Summary ==================== Name: VMConstruction-Plugins-AioPlugin-dtl.14 Author: dtl Time: 1 May 2012, 8:30:17 am UUID: 965d54b7-4309-42fd-adb0-64400d3c780b Ancestors: VMConstruction-Plugins-AioPlugin-EstebanLorenzano.13 AioPlugin 2.2.6 Fix #versionString implementation to match OSProcessPlugin (value declared on instance side only). Remove remaining references to SQAIO_H, no longer required.

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

Vm-dev May 2012