Vm-dev November 2015

vm-dev@lists.squeakfoundation.org

32 participants
118 discussions

[commit][3507] Fix typo
by commits＠squeakvm.org 26 Nov '15

26 Nov '15

Revision: 3507 Author: topa Date: 2015-11-26 13:16:03 -0800 (Thu, 26 Nov 2015) Log Message: ----------- Fix typo Modified Paths: -------------- trunk/platforms/win32/HowToBuild.txt Modified: trunk/platforms/win32/HowToBuild.txt =================================================================== --- trunk/platforms/win32/HowToBuild.txt 2015-11-25 19:45:14 UTC (rev 3506) +++ trunk/platforms/win32/HowToBuild.txt 2015-11-26 21:16:03 UTC (rev 3507) @@ -23,7 +23,7 @@ cd SqueakX.Y.Z-N If you prefer to live dangerously, the current developers' sources can be -checked out from the Sqeuak VM repository: +checked out from the Squeak VM repository: svn co http://squeakvm.org/svn/squeak/trunk/platforms

1 0

[commit][3505] Add Squeak3D plugin to build
by commits＠squeakvm.org 25 Nov '15

25 Nov '15

Revision: 3505 Author: rowledge Date: 2015-11-25 11:41:38 -0800 (Wed, 25 Nov 2015) Log Message: ----------- Add Squeak3D plugin to build Modified Paths: -------------- branches/Cog/build.linux32ARM/squeak.cog.spur/plugins.ext Modified: branches/Cog/build.linux32ARM/squeak.cog.spur/plugins.ext =================================================================== --- branches/Cog/build.linux32ARM/squeak.cog.spur/plugins.ext 2015-11-24 23:24:22 UTC (rev 3504) +++ branches/Cog/build.linux32ARM/squeak.cog.spur/plugins.ext 2015-11-25 19:41:38 UTC (rev 3505) @@ -1,6 +1,7 @@ # Copied, perhaps edited, from ../../src/examplePlugins.ext EXTERNAL_PLUGINS = \ -#B3DAcceleratorPlugin \ +B3DAcceleratorPlugin \ +Squeak3D \ #BochsIA32Plugin \ #GdbARMPlugin \ SqueakFFIPrims \

2 1

[commit][3506] Add Squeak3D plugin to build
by commits＠squeakvm.org 25 Nov '15

25 Nov '15

Revision: 3506 Author: rowledge Date: 2015-11-25 11:45:14 -0800 (Wed, 25 Nov 2015) Log Message: ----------- Add Squeak3D plugin to build Modified Paths: -------------- branches/Cog/image/BuildSqueakSpurTrunkVMMakerImage.st Modified: branches/Cog/image/BuildSqueakSpurTrunkVMMakerImage.st =================================================================== --- branches/Cog/image/BuildSqueakSpurTrunkVMMakerImage.st 2015-11-25 19:41:38 UTC (rev 3505) +++ branches/Cog/image/BuildSqueakSpurTrunkVMMakerImage.st 2015-11-25 19:45:14 UTC (rev 3506) @@ -10,7 +10,9 @@ ('http://www.squeaksource.com/OSProcessPlugin' 9 ('VMConstruction-Plugins-OSProcessPlugin.oscog')) ('http://www.squeaksource.com/rb' 5 ('AST-Core' 'AST-Semantic' 'AST-Tests-Core' 'AST-Tests-Semantic' 'Refactoring-Changes' 'Refactoring-Core' 'Refactoring-Environment' 'Refactoring-Tests-Changes' 'Refactoring-Tests-Core' 'Refactoring-Tests-Environment')) ('http://www.squeaksource.com/Speech' 2 ('SharedPool-Speech' )) - ('http://www.squeaksource.com/XDCP' 9 ('VMConstruction-Plugins-XDisplayControlPlugin' ))). + ('http://www.squeaksource.com/XDCP' 9 ('VMConstruction-Plugins-XDisplayControlPlugin' )) + ('http://www.squeaksource.com/Balloon3D' 10 ('Balloon3D-Plugins' 'Balloon3D-Plugins-Simulator' )) + ). load := (manifest collect: [:tuple|

1 0

Re: [Pharo-dev] what is exactly flushCache?
by Eliot Miranda 25 Nov '15

25 Nov '15

Hi Stef, > On Nov 24, 2015, at 12:00 PM, stepharo <stepharo(a)free.fr> wrote: > > Thanks for this great explanation and yes I know about this cache but I do not why > I was wondering that we did not need to update it from the image. > Now I would like to add such comment inside the system because I like self explanation. > > "See Object documentation whatIsAPrimitive." gets frustrates me. It's still appropriate to explain to newbies what primitives are and how they are invoked. Interesting to consider what the minimum knowledge programmers have when first using the system. Do they know, for example, that methods contain bytecode for a stack machine, or that underneath the system is a virtual machine containing a bytecode execution engine, a set of primitives and (a) garbage collector(s)? > So I imagine that is Behavior flushCache flushing for the class in the class,selector pair. Again because of inheritance the VM can't just flush entries for a specific class, so the VM responds to Behavior>>flushCache flushes the entire cache. > What would be a good place to add such comment? MethodDictionary. It sounds reasonable to me but tell me. If the comments in the various flushCache implementations are correct and reference each other then I think that's enough. > TBehavior >> flushCache > "Tell the interpreter to remove the contents of its method lookup cache, if it has > one. Essential. See Object documentation whatIsAPrimitive." > > <primitive: 89> > self primitiveFailed I would rewrite this to say "Tell the virtual machine to remove the contents of its method lookup caches, if it has any. This must be done when the system modifies the class hierarchy so that message lookups reflect the revised organization. c.f. Symbol>>flushCache & CompiledMethod>>flushCache. Essential. See Object documentation whatIsAPrimitive." > Symbol >> flushCache > "Tell the interpreter to remove all entries with this symbol as a selector from its method lookup cache, if it has one. This primitive must be called whenever a method is redefined or removed. > NOTE: Only one of the two selective flush methods (Symbol or CompiledMethod) needs to be used." > > <primitive: 119> I would rewrite this to say "Tell the virtual machine to remove all entries with this symbol as a selector from its method lookup caches, if it has any. This must be done whenever a method is added, redefined or removed, so that message lookups reflect the revised organization. c.f. Behavior>>flushCache & CompiledMethod>>flushCache. Essential. See Object documentation whatIsAPrimitive." > CompiledMethod >> flushCache > "Tell the interpreter to remove all references to this method from its method lookup cache, if it has one. This primitive must be called whenever a method is redefined or removed. > NOTE: Only one of two selective flush methods (Symbol or CompiledMethod) needs to be used." > > <primitive: 116> I would rewrite this to say "Tell the virtual machine to remove all references to this method from its method lookup caches, and to discard any optimized version of the method, if it has any of these. This must be done whenever a method is modified in place, such as modifying its literals or machine code, to reflect the revised code. c.f. Behavior>>flushCache & Symbol>>flushCache. Essential. See Object documentation whatIsAPrimitive." > Le 24/11/15 19:10, Eliot Miranda a écrit : >> Hi Stephane, >> >> the VM caches method lookups in a lookup cache from class,selector pairs to method,primitive pairs, where primitive may be null. This is called the first-level method lookup cache. The JIT VM caches message lookups in machine code, so that a particular piece of machine code exists in a state that invokes a method for a specific class very fast by embedding the class reference in a register load and the target method in a call instruction, and having the target method verify this "cache probe" (this is an "in-line cache). The JIT also caches the translation of a byte coded method to machine code, by hiding a reference to a machine code method in a byte coded method. >> >> These caches can be invalidated in several circumstances: >> >> 1a. if one adds or removes a method from a class's method dictionary it may change the correct results of a lookup not merely of the class whose dictionary was updated but also subclasses of the class. >> 1b. if one replaces a method in a method dictionary this changes the target method for a lookup of the selector for the class and subclasses >> >> 2. if one wants to rewrite the byte code or literals of a method, for example because a Slot definition has changed, then if the method has been compiled to machine code, the machine code must be discarded before the new code may be executed >> >> 1a & 1b are done via Symbol>>flushCache. In response the normal VM flushes its first-level method lookup cache, and the JIT also scans all of machine code looking for inline caches with that selector, and voiding them, reverting each send site for that selector to the "unlinked" state. >> >> There used to be confusion in Squeak, which Pharo inherited, that using CompiledMethod>>flushCache was somehow the right way to void caches when updating method dictionaries, flushing the old method in the dictionary, if any, and the new method. It isn't, precisely because adding or removing methods affects the visibility of inherited methods with the same selector. So MethodDictionary code should use Symbol>>flushCache, and only once, on each update of a method dictionary. As a result, the VM will ensure that the necessary send caches are flushed for that selector. >> >> 2. is done via CompiledMethod>>flushCache. In response the VM searches the first-level method lookup cache and removes all entries whose target is the method. In addition the JIT discards the machine code for the method, and searches for all send sites with that method's machine code as the target and voids them, reverting them to the unlinked state. >> >> The VM must be told to flush the cached state for a compiled method via CompiledMethod>>flushCache and will /try/ and void the state for that method. But it can't always deal with existing activations of that method, because if there are activations running the machine code, that machine code can't merely be thrown away, and can't be replaced because its length may change, depending on literals or byte codes. So this kind of byte coded method manipulation needs to be done with case and some understanding of the total system state. >> >> HTH >> >> >>> On Tue, Nov 24, 2015 at 9:37 AM, stepharo <stepharo(a)free.fr> wrote: >>> Clement >>> >>> do you know what is flushCache and why we need to invoke it? >>> >>> Stef >> >> _,,,^..^,,,_ >> best, Eliot _,,,^..^,,,_ (phone)

1 0

[commit][3504] Add instructions for pluging in another compiler into Xcode.
by commits＠squeakvm.org 25 Nov '15

25 Nov '15

Revision: 3504 Author: eliot Date: 2015-11-24 15:24:22 -0800 (Tue, 24 Nov 2015) Log Message: ----------- Add instructions for pluging in another compiler into Xcode. Modified Paths: -------------- branches/Cog/build.macos32x86/HowToBuild Modified: branches/Cog/build.macos32x86/HowToBuild =================================================================== --- branches/Cog/build.macos32x86/HowToBuild 2015-11-24 23:10:56 UTC (rev 3503) +++ branches/Cog/build.macos32x86/HowToBuild 2015-11-24 23:24:22 UTC (rev 3504) @@ -71,7 +71,7 @@ (and probably 10.5.x) using the old Carbon libraries. I plan to build on Mavericks using John McIntosh's Cocoa platform support files soon. -1. Install the tools (xcode etc); the CoreVM.xcodeproj is set-up to build +1. Install the tools (Xcode etc); the CoreVM.xcodeproj is set-up to build using gcc 4.2 but you can optionally install the Intel C++ compiler 11.1 and change the compilerSpec in CoreVM.xcodeproj/project.pbxproj to get better performance. @@ -93,7 +93,7 @@ plugins.int plugins.ext On other platforms editing these and making is all one needs to do to change the -set of plugins. Alas on xcode one also has to edit the relevant xcode projects +set of plugins. Alas on Xcode one also has to edit the relevant Xcode projects to add and remove source files. If you're brave enough to contemplate this you're brave enough to figure out how to do this yourself. @@ -110,6 +110,31 @@ $ ../bochs/makeem +Using gcc with Xcode 6.x, Mac OS X > 10.6 +----------------------------------------- +We're in the process of transitioning from a Carbon/Mac OS X 10.6/Xcode +3.1.x build system to a Cocoa/Mac OS X 10.9 or above/Xcode 6.x/7.x build +system. We're still building a VM that should run on 10.6. By default +Xcode uses the clang compiler. +You may want to use a different compiler. For example, to install gcc 5.2 +see http://hamelot.co.uk/programming/add-gcc-compiler-to-xcode-6/ +(Thanks Hammad!). +Essentially +- install brew + ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)" +- get all available versions of gcc + brew tap homebrew/versions +- build gcc 5.2 (Eliot: my first attempt failed with some library + incompatibility during the bootstrap, I then installed 4.8 successfully + and retried installing 5.2 and miraculously this time it worked) + brew install gcc5 +- get the GCC 5.2 plugin for Xcode: + git clone https://github.com/hmazhar/xcode-gcc.git +- install the Xcode plugin for the gcc 5.2 compiler + open /Applications/Xcode.app/Contents/PlugIns/Xcode3Core.ideplugin/Contents/SharedSupport/Developer/Library/Xcode/Plug-ins/ + open xcode-gcc + and use the finder to copy the plugin into the Xcode app bundle. + Optimization level and gcc version ---------------------------------- There are issues with gcc version > 4.2.1. Any of the following flags may break the build at -O2: @@ -117,8 +142,8 @@ -fpartial-inlining -fcaller-saves -They're turned off in the xcode files provided. +They're turned off in the Xcode files provided. Eliot Miranda -June 2014 +November 2015

1 0

[commit][3503] Add -fwrapv flag to Xcode iOS Spur build ( needs to be in all other Xcode projects also).
by commits＠squeakvm.org 25 Nov '15

25 Nov '15

Revision: 3503 Author: eliot Date: 2015-11-24 15:10:56 -0800 (Tue, 24 Nov 2015) Log Message: ----------- Add -fwrapv flag to Xcode iOS Spur build (needs to be in all other Xcode projects also). Modified Paths: -------------- branches/Cog/build.macos32x86/squeak.cog.spur/SqueakCogSpur32x86.xcodeproj/project.pbxproj branches/Cog/build.macos32x86/squeak.cog.spur/makeclean Added Paths: ----------- branches/Cog/build.macos32x86/squeak.cog.spur/makeiosclean Property Changed: ---------------- branches/Cog/platforms/Cross/vm/sqSCCSVersion.h Modified: branches/Cog/build.macos32x86/squeak.cog.spur/SqueakCogSpur32x86.xcodeproj/project.pbxproj =================================================================== --- branches/Cog/build.macos32x86/squeak.cog.spur/SqueakCogSpur32x86.xcodeproj/project.pbxproj 2015-11-24 22:58:27 UTC (rev 3502) +++ branches/Cog/build.macos32x86/squeak.cog.spur/SqueakCogSpur32x86.xcodeproj/project.pbxproj 2015-11-24 23:10:56 UTC (rev 3503) @@ -1847,6 +1847,7 @@ LD_GENERATE_MAP_FILE = YES; MACOSX_DEPLOYMENT_TARGET = 10.6; OTHER_CFLAGS = ""; + "OTHER_CFLAGS[arch=*]" = "-fwrapv"; PRODUCT_BUNDLE_IDENTIFIER = org.squeak.osx3286.cog; PRODUCT_NAME = Squeak; }; @@ -1947,6 +1948,7 @@ LD_GENERATE_MAP_FILE = YES; MACOSX_DEPLOYMENT_TARGET = 10.6; OTHER_CFLAGS = ""; + "OTHER_CFLAGS[arch=*]" = "-fwrapv"; PRODUCT_BUNDLE_IDENTIFIER = org.squeak.osx3286.cog; PRODUCT_NAME = Squeak; }; @@ -1977,6 +1979,7 @@ LD_GENERATE_MAP_FILE = YES; MACOSX_DEPLOYMENT_TARGET = 10.6; OTHER_CFLAGS = ""; + "OTHER_CFLAGS[arch=*]" = "-fwrapv"; PRODUCT_BUNDLE_IDENTIFIER = org.squeak.osx3286.cog; PRODUCT_NAME = Squeak; }; Modified: branches/Cog/build.macos32x86/squeak.cog.spur/makeclean =================================================================== --- branches/Cog/build.macos32x86/squeak.cog.spur/makeclean 2015-11-24 22:58:27 UTC (rev 3502) +++ branches/Cog/build.macos32x86/squeak.cog.spur/makeclean 2015-11-24 23:10:56 UTC (rev 3503) @@ -1,3 +1,5 @@ #!/bin/bash rm -r ./build ./*/build ./plugin-projects/*/build ./Fast.app ./FastMT.app ./Debug.app ./DebugMT.app ./Assert.app ./AssertMT.app ./Croquet.app ./Squeak.app +xcodebuild -project CoreVM.xcodeproj clean +xcodebuild -project CoreMTVM.xcodeproj clean Copied: branches/Cog/build.macos32x86/squeak.cog.spur/makeiosclean (from rev 3501, branches/Cog/build.macos32x86/squeak.cog.spur/makeclean) =================================================================== --- branches/Cog/build.macos32x86/squeak.cog.spur/makeiosclean (rev 0) +++ branches/Cog/build.macos32x86/squeak.cog.spur/makeiosclean 2015-11-24 23:10:56 UTC (rev 3503) @@ -0,0 +1,4 @@ +#!/bin/bash + +rm -r ./build ./*/build ./plugin-projects/*/build ./Cocoa*.app +xcodebuild -project SqueakCogSpur32x86.xcodeproj clean Property changes on: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h ___________________________________________________________________ Modified: checkindate - Tue Nov 24 14:53:43 PST 2015 + Tue Nov 24 15:09:27 PST 2015

1 0

[commit][3502] CogVM source as per VMMaker.oscog-rmacnak.1532
by commits＠squeakvm.org 24 Nov '15

24 Nov '15

Revision: 3502 Author: eliot Date: 2015-11-24 14:58:27 -0800 (Tue, 24 Nov 2015) Log Message: ----------- CogVM source as per VMMaker.oscog-rmacnak.1532 Cogit: Fix bug in Spur machine-code at:put: on 32-bit bits objects; method failed to fail for negative values. Change the generation of closed PICs; they are no longer compiled each time we make on or extend one, but rather copied from a prototype and updated as needed. Take a look at http://wiki.squeak.org/squeak/6205 for some explanations. Fixes a bad bug on ARM where we were generating class tags as instructions and getting away with it simply because class tags look like noops. Now that we generate all code in one go, out-of-line literals are no longer accidentally intermixed with the code. Changes due to as-yet-unreleased MIPSEL support. Branches are informed of their preceding instruction so that on MIPS the pair can be collapsed to a unitary compare-and-branch instruction. Implement the long conditional branch/long unconditional branch split necessitated by the MIPS processor in all of the closed PIC methods. Reorder CPIC instructions to suit MIPSEL, i.e. put the load before the compare and jump (the old code was there only to suit adjusting entries on x86, not for performance). Beef up the asserts in expectedClosedPICPrototype so that updating the class and method entries is tested. Changes due to as-yet-unreleased x64 support. Use CmpC32:R: to compare the class tag in CPICs to match in-line caches on 64-bit Spur. Add CmpC32R generation for X64. Refactor the gen[NS]Send: machinery to take selector indices instead of selector oops, to allow the x64/Spur64 JIT to use 32-bit in-line caches that hold selector indices, not selector oops. Scheme is commented in genLoadInlineCache:. Fix the use of 80 as a constant in the special selector machinery. This should be firstSpecialSelectorBytecodeOffset. Add [Alt]NumSpecialSelectors for range checking special selector indices, which are negative. Refactor context creation generation code in Spur object representations for sharing between 32 and 64 bits. Implement some 64-bit obj rep generation support. Clarify whether byte reads zero-extend by introducing CogAbstractInstruction>>byteReadsZeroExtend. Make sure the x86 does zero-extend and take the easy route with x64 having it not zero-extend. Slang: Make sure signed comparisons are used in the relevant isIntegerValue: implementations. Update Slang to collapse an ifTrue:ifFalse: if both arms are the same, to avoid the code duplication this introduces on the rest of the processors where conditional and unconditional branch offsets can be accessed in the same way. Fix Slang regression. TSendNode>>isSameAs: must take into account the receiver!! Include exported api variables (between Cogit and CoInterpreter) for better type checking and fewer warnings. Propagate types of actuals with other than the default sqInt type to untyped formals, hence fixing bogus inlining of genLoadHeaderIntoNewInstance: into genGetActiveContextLarge:inBlock:. Fix baaaad bug in node:typeCompatibleWith:inliningInto:in: which was looking up the type of the formal parameter in inlining in the target method, not the method being inlined! (bug surfaced by previous fix). Allow constant elimination for Const ifNil: [] ifNotNil: [], hence cleaning up uses of characterTable in the Spur VMs. Plugins: ThreadedFFIPlugin: - ExternalAddress now are taken correctly (nor as ByteArray or Alien, because they are different beasts). - allow pushing of pointers to any type (into a ByteArray, an ExternalAddress or an Alien), to allow passing parameters style int*, float*, etc. - allow reading in memory to allow read chunks of ByteArray Alien Plugins: Fix missing primitive failure for Alien typeAt: 0 [put:]. Add word accessors to Alien. Modified Paths: -------------- branches/Cog/nsspursrc/plugins/FilePlugin/FilePlugin.c branches/Cog/nsspursrc/plugins/IA32ABI/IA32ABI.c branches/Cog/nsspursrc/plugins/ZipPlugin/ZipPlugin.c branches/Cog/nsspursrc/vm/cogit.h branches/Cog/nsspursrc/vm/cogitARMv5.c branches/Cog/nsspursrc/vm/cogitIA32.c branches/Cog/nsspursrc/vm/cointerp.c branches/Cog/nsspursrc/vm/cointerp.h branches/Cog/nsspursrc/vm/gcc3x-cointerp.c branches/Cog/nsspurstack64src/vm/gcc3x-interp.c branches/Cog/nsspurstack64src/vm/interp.c branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c branches/Cog/nsspurstacksrc/vm/interp.c branches/Cog/scripts/revertIfEssentiallyUnchanged branches/Cog/spursistasrc/vm/cogit.h branches/Cog/spursistasrc/vm/cogitARMv5.c branches/Cog/spursistasrc/vm/cogitIA32.c branches/Cog/spursistasrc/vm/cointerp.c branches/Cog/spursistasrc/vm/cointerp.h branches/Cog/spursistasrc/vm/gcc3x-cointerp.c branches/Cog/spursrc/vm/cogit.h branches/Cog/spursrc/vm/cogitARMv5.c branches/Cog/spursrc/vm/cogitIA32.c branches/Cog/spursrc/vm/cointerp.c branches/Cog/spursrc/vm/cointerp.h branches/Cog/spursrc/vm/gcc3x-cointerp.c branches/Cog/spurstack64src/vm/gcc3x-interp.c branches/Cog/spurstack64src/vm/interp.c branches/Cog/spurstacksrc/vm/gcc3x-interp.c branches/Cog/spurstacksrc/vm/interp.c branches/Cog/src/plugins/SoundGenerationPlugin/SoundGenerationPlugin.c branches/Cog/src/plugins/SqueakFFIPrims/ARM32FFIPlugin.c branches/Cog/src/plugins/SqueakFFIPrims/IA32FFIPlugin.c branches/Cog/src/plugins/ZipPlugin/ZipPlugin.c branches/Cog/src/vm/cogit.h branches/Cog/src/vm/cogitARMv5.c branches/Cog/src/vm/cogitIA32.c 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/stacksrc/vm/gcc3x-interp.c branches/Cog/stacksrc/vm/interp.c Property Changed: ---------------- branches/Cog/platforms/Cross/vm/sqSCCSVersion.h Modified: branches/Cog/nsspursrc/plugins/FilePlugin/FilePlugin.c =================================================================== --- branches/Cog/nsspursrc/plugins/FilePlugin/FilePlugin.c 2015-11-15 23:53:15 UTC (rev 3501) +++ branches/Cog/nsspursrc/plugins/FilePlugin/FilePlugin.c 2015-11-24 22:58:27 UTC (rev 3502) @@ -1,9 +1,9 @@ /* Automatically generated by - VMPluginCodeGenerator VMMaker.oscog-eem.1448 uuid: 987a0908-6f37-437b-80a8-4db22a6e92bd + VMPluginCodeGenerator VMMaker.oscog-rmacnak.1532 uuid: 20303656-4854-4e5b-8bcd-eeff8cf5d262 from - FilePlugin VMMaker.oscog-eem.1448 uuid: 987a0908-6f37-437b-80a8-4db22a6e92bd + FilePlugin VMMaker.oscog-rmacnak.1532 uuid: 20303656-4854-4e5b-8bcd-eeff8cf5d262 */ -static char __buildInfo[] = "FilePlugin VMMaker.oscog-eem.1448 uuid: 987a0908-6f37-437b-80a8-4db22a6e92bd " __DATE__ ; +static char __buildInfo[] = "FilePlugin VMMaker.oscog-rmacnak.1532 uuid: 20303656-4854-4e5b-8bcd-eeff8cf5d262 " __DATE__ ; @@ -81,6 +81,7 @@ EXPORT(sqInt) primitiveFileSetPosition(void); EXPORT(sqInt) primitiveFileSize(void); EXPORT(sqInt) primitiveFileStdioHandles(void); +EXPORT(sqInt) primitiveFileSync(void); EXPORT(sqInt) primitiveFileTruncate(void); EXPORT(sqInt) primitiveFileWrite(void); EXPORT(sqInt) primitiveHasFileAccess(void); @@ -180,9 +181,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "FilePlugin VMMaker.oscog-eem.1448 (i)" + "FilePlugin VMMaker.oscog-rmacnak.1532 (i)" #else - "FilePlugin VMMaker.oscog-eem.1448 (e)" + "FilePlugin VMMaker.oscog-rmacnak.1532 (e)" #endif ; static void * sCCPfn; @@ -1100,7 +1101,32 @@ popthenPush(1, result); } + /* FilePlugin>>#primitiveFileSync */ +EXPORT(sqInt) +primitiveFileSync(void) +{ + SQFile *file; + sqInt objectPointer; + /* begin fileValueOf: */ + objectPointer = stackValue(0); + if (!((isBytes(objectPointer)) + && ((byteSizeOf(objectPointer)) == (sizeof(SQFile))))) { + primitiveFail(); + file = null; + goto l1; + } + file = firstIndexableField(objectPointer); +l1: /* end fileValueOf: */; + if (!(failed())) { + sqFileSync(file); + } + if (!(failed())) { + pop(1); + } +} + + /* ftruncate is not an ansi function so we have a macro to point to a suitable platform implementation */ @@ -1309,6 +1335,7 @@ {"FilePlugin", "primitiveFileSetPosition\000\001", (void*)primitiveFileSetPosition}, {"FilePlugin", "primitiveFileSize\000\001", (void*)primitiveFileSize}, {"FilePlugin", "primitiveFileStdioHandles\000\377", (void*)primitiveFileStdioHandles}, + {"FilePlugin", "primitiveFileSync\000\001", (void*)primitiveFileSync}, {"FilePlugin", "primitiveFileTruncate\000\001", (void*)primitiveFileTruncate}, {"FilePlugin", "primitiveFileWrite\000\001", (void*)primitiveFileWrite}, {"FilePlugin", "primitiveHasFileAccess\000\377", (void*)primitiveHasFileAccess}, @@ -1336,6 +1363,7 @@ signed char primitiveFileRenameAccessorDepth = 1; signed char primitiveFileSetPositionAccessorDepth = 1; signed char primitiveFileSizeAccessorDepth = 1; +signed char primitiveFileSyncAccessorDepth = 1; signed char primitiveFileTruncateAccessorDepth = 1; signed char primitiveFileWriteAccessorDepth = 1; Modified: branches/Cog/nsspursrc/plugins/IA32ABI/IA32ABI.c =================================================================== --- branches/Cog/nsspursrc/plugins/IA32ABI/IA32ABI.c 2015-11-15 23:53:15 UTC (rev 3501) +++ branches/Cog/nsspursrc/plugins/IA32ABI/IA32ABI.c 2015-11-24 22:58:27 UTC (rev 3502) @@ -1,9 +1,9 @@ /* Automatically generated by - VMPluginCodeGenerator VMMaker.oscog-eem.1325 uuid: a0bb0f7f-5e6e-48a7-bf73-fa5d135e06c0 + VMPluginCodeGenerator VMMaker.oscog-rmacnak.1532 uuid: 20303656-4854-4e5b-8bcd-eeff8cf5d262 from - NewsqueakIA32ABIPlugin VMMaker.oscog-eem.1325 uuid: a0bb0f7f-5e6e-48a7-bf73-fa5d135e06c0 + NewsqueakIA32ABIPlugin VMMaker.oscog-rmacnak.1532 uuid: 20303656-4854-4e5b-8bcd-eeff8cf5d262 */ -static char __buildInfo[] = "NewsqueakIA32ABIPlugin VMMaker.oscog-eem.1325 uuid: a0bb0f7f-5e6e-48a7-bf73-fa5d135e06c0 " __DATE__ ; +static char __buildInfo[] = "NewsqueakIA32ABIPlugin VMMaker.oscog-rmacnak.1532 uuid: 20303656-4854-4e5b-8bcd-eeff8cf5d262 " __DATE__ ; @@ -98,6 +98,8 @@ EXPORT(sqInt) primSignedLongLongAtPut(void); EXPORT(sqInt) primSignedShortAt(void); EXPORT(sqInt) primSignedShortAtPut(void); +EXPORT(sqInt) primSignedWordAt(void); +EXPORT(sqInt) primSignedWordAtPut(void); EXPORT(sqInt) primSizeField(void); EXPORT(sqInt) primSizeFieldPut(void); EXPORT(sqInt) primStrlenFromStartIndex(void); @@ -111,6 +113,8 @@ EXPORT(sqInt) primUnsignedLongLongAtPut(void); EXPORT(sqInt) primUnsignedShortAt(void); EXPORT(sqInt) primUnsignedShortAtPut(void); +EXPORT(sqInt) primUnsignedWordAt(void); +EXPORT(sqInt) primUnsignedWordAtPut(void); EXPORT(sqInt) primVarArgsCallOutDoubleReturn(void); EXPORT(sqInt) primVarArgsCallOutFloatReturn(void); EXPORT(sqInt) primVarArgsCallOutIntegralReturn(void); @@ -223,9 +227,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "IA32ABI VMMaker.oscog-eem.1325 (i)" + "IA32ABI VMMaker.oscog-rmacnak.1532 (i)" #else - "IA32ABI VMMaker.oscog-eem.1325 (e)" + "IA32ABI VMMaker.oscog-rmacnak.1532 (e)" #endif ; @@ -246,9 +250,17 @@ /* Answer if the indices byteIndex to byteIndex + length - 1 are valid zero-relative indices into the rcvr. - N.B. This code only works when translated because asUnisgnedInteger only - works for non-negative - values. Hence the override in NewsqueakIA32ABIPluginSimulator. */ + Beware! There be dragons here. The form below (byteIndex <= (dataSize abs + - length)) is used + because byteIndex + length could overflow, whereas (dataSize abs - length) + can't. We *don't* use the + obvious optimization + ^dataSize = 0 or: [byteIndex asUnsignedInteger <= (dataSize abs - length)] + because with C's Usual Arithmetic Conversions + 5. Otherwise, both operands are converted to the unsigned integer type + corresponding to the type of the operand with signed integer type. + means that the comparison will be unsigned, and if length > dataSize abs + then dataSize abs - length is large and positive. */ /* NewsqueakIA32ABIPlugin>>#index:length:inRange: */ static sqInt @@ -256,8 +268,10 @@ { sqInt dataSize; - return (((dataSize = longAt(rcvr + BaseHeaderSize))) == 0) - || (((((usqInt)byteIndex)) + length) <= (abs(dataSize))); + dataSize = longAt(rcvr + BaseHeaderSize); + return (dataSize == 0) + || ((byteIndex >= 0) + && (byteIndex <= ((abs(dataSize)) - length))); } /* NewsqueakIA32ABIPlugin>>#isAlien: */ @@ -465,7 +479,7 @@ if (mem == 0) { return primitiveFailFor(PrimErrNoCMemory); } - alien = instantiateClassindexableSize(classAlien(), 8); + alien = instantiateClassindexableSize(classAlien(), 2 * BytesPerOop); if (failed()) { return primitiveFailFor(PrimErrNoMemory); } @@ -704,7 +718,6 @@ { sqInt addr; sqInt byteOffset; - sqInt dataSize; double floatValue; sqInt rcvr; sqInt startAddr; @@ -714,8 +727,7 @@ if (failed()) { return primitiveFailFor(PrimErrBadArgument); } - if (!((((dataSize = longAt(rcvr + BaseHeaderSize))) == 0) - || (((((usqInt)byteOffset)) + 8) <= (abs(dataSize))))) { + if (!(indexlengthinRange(byteOffset, 8, rcvr))) { return primitiveFailFor(PrimErrBadIndex); } if (((startAddr = ((longAt(rcvr + BaseHeaderSize)) > 0 @@ -742,7 +754,6 @@ { sqInt addr; sqInt byteOffset; - sqInt dataSize; double floatValue; sqInt rcvr; sqInt startAddr; @@ -760,8 +771,7 @@ if (failed()) { return primitiveFailFor(PrimErrBadArgument); } - if (!((((dataSize = longAt(rcvr + BaseHeaderSize))) == 0) - || (((((usqInt)byteOffset)) + 8) <= (abs(dataSize))))) { + if (!(indexlengthinRange(byteOffset, 8, rcvr))) { return primitiveFailFor(PrimErrBadIndex); } if (isOopImmutable(rcvr)) { @@ -796,7 +806,6 @@ { sqInt addr; sqInt byteOffset; - sqInt dataSize; float floatValue; sqInt rcvr; sqInt startAddr; @@ -806,8 +815,7 @@ if (failed()) { return primitiveFailFor(PrimErrBadArgument); } - if (!((((dataSize = longAt(rcvr + BaseHeaderSize))) == 0) - || (((((usqInt)byteOffset)) + 4) <= (abs(dataSize))))) { + if (!(indexlengthinRange(byteOffset, 4, rcvr))) { return primitiveFailFor(PrimErrBadIndex); } if (((startAddr = ((longAt(rcvr + BaseHeaderSize)) > 0 @@ -834,7 +842,6 @@ { sqInt addr; sqInt byteOffset; - sqInt dataSize; float floatValue; sqInt rcvr; sqInt startAddr; @@ -852,8 +859,7 @@ if (failed()) { return primitiveFailFor(PrimErrBadArgument); } - if (!((((dataSize = longAt(rcvr + BaseHeaderSize))) == 0) - || (((((usqInt)byteOffset)) + 4) <= (abs(dataSize))))) { + if (!(indexlengthinRange(byteOffset, 4, rcvr))) { return primitiveFailFor(PrimErrBadIndex); } if (isOopImmutable(rcvr)) { @@ -1097,7 +1103,6 @@ { sqInt addr; sqInt byteOffset; - sqInt dataSize; sqInt rcvr; sqInt startAddr; signed char value; @@ -1108,8 +1113,7 @@ if (failed()) { return primitiveFailFor(PrimErrBadArgument); } - if (!((((dataSize = longAt(rcvr + BaseHeaderSize))) == 0) - || (((((usqInt)byteOffset)) + 1) <= (abs(dataSize))))) { + if (!(indexlengthinRange(byteOffset, 1, rcvr))) { return primitiveFailFor(PrimErrBadIndex); } if (((startAddr = ((longAt(rcvr + BaseHeaderSize)) > 0 @@ -1136,7 +1140,6 @@ { sqInt addr; sqInt byteOffset; - sqInt dataSize; sqInt rcvr; sqInt startAddr; sqInt value; @@ -1151,8 +1154,7 @@ || (value > 0x7F))) { return primitiveFailFor(PrimErrBadArgument); } - if (!((((dataSize = longAt(rcvr + BaseHeaderSize))) == 0) - || (((((usqInt)byteOffset)) + 1) <= (abs(dataSize))))) { + if (!(indexlengthinRange(byteOffset, 1, rcvr))) { return primitiveFailFor(PrimErrBadIndex); } if (isOopImmutable(rcvr)) { @@ -1181,7 +1183,6 @@ { sqInt addr; sqInt byteOffset; - sqInt dataSize; sqInt rcvr; sqInt startAddr; sqInt value; @@ -1192,8 +1193,7 @@ if (failed()) { return primitiveFailFor(PrimErrBadArgument); } - if (!((((dataSize = longAt(rcvr + BaseHeaderSize))) == 0) - || (((((usqInt)byteOffset)) + 4) <= (abs(dataSize))))) { + if (!(indexlengthinRange(byteOffset, 4, rcvr))) { return primitiveFailFor(PrimErrBadIndex); } if (((startAddr = ((longAt(rcvr + BaseHeaderSize)) > 0 @@ -1202,7 +1202,7 @@ return primitiveFailFor(PrimErrBadReceiver); } addr = startAddr + byteOffset; - value = longAt(addr); + value = long32At(addr); valueOop = signed32BitIntegerFor(value); return methodReturnValue(valueOop); } @@ -1220,7 +1220,6 @@ { sqInt addr; sqInt byteOffset; - sqInt dataSize; sqInt rcvr; sqInt startAddr; sqInt value; @@ -1233,8 +1232,7 @@ if (failed()) { return primitiveFailFor(PrimErrBadArgument); } - if (!((((dataSize = longAt(rcvr + BaseHeaderSize))) == 0) - || (((((usqInt)byteOffset)) + 4) <= (abs(dataSize))))) { + if (!(indexlengthinRange(byteOffset, 4, rcvr))) { return primitiveFailFor(PrimErrBadIndex); } if (isOopImmutable(rcvr)) { @@ -1246,7 +1244,7 @@ return primitiveFailFor(PrimErrBadReceiver); } addr = startAddr + byteOffset; - longAtput(addr, value); + long32Atput(addr, value); return methodReturnValue(valueOop); } @@ -1263,7 +1261,6 @@ { sqInt addr; sqInt byteOffset; - sqInt dataSize; sqInt rcvr; long long signedlonglongvalue; long long *signedlonglongvaluePtr; @@ -1277,8 +1274,7 @@ if (failed()) { return primitiveFailFor(PrimErrBadArgument); } - if (!((((dataSize = longAt(rcvr + BaseHeaderSize))) == 0) - || (((((usqInt)byteOffset)) + 8) <= (abs(dataSize))))) { + if (!(indexlengthinRange(byteOffset, 8, rcvr))) { return primitiveFailFor(PrimErrBadIndex); } if (((startAddr = ((longAt(rcvr + BaseHeaderSize)) > 0 @@ -1306,7 +1302,6 @@ { sqInt addr; sqInt byteOffset; - sqInt dataSize; sqInt rcvr; long long signedlonglongvalue; long long *signedlonglongvaluePtr; @@ -1323,8 +1318,7 @@ if (failed()) { return primitiveFailFor(PrimErrBadArgument); } - if (!((((dataSize = longAt(rcvr + BaseHeaderSize))) == 0) - || (((((usqInt)byteOffset)) + 8) <= (abs(dataSize))))) { + if (!(indexlengthinRange(byteOffset, 8, rcvr))) { return primitiveFailFor(PrimErrBadIndex); } if (isOopImmutable(rcvr)) { @@ -1354,7 +1348,6 @@ { sqInt addr; sqInt byteOffset; - sqInt dataSize; sqInt rcvr; sqInt startAddr; short value; @@ -1365,8 +1358,7 @@ if (failed()) { return primitiveFailFor(PrimErrBadArgument); } - if (!((((dataSize = longAt(rcvr + BaseHeaderSize))) == 0) - || (((((usqInt)byteOffset)) + 2) <= (abs(dataSize))))) { + if (!(indexlengthinRange(byteOffset, 2, rcvr))) { return primitiveFailFor(PrimErrBadIndex); } if (((startAddr = ((longAt(rcvr + BaseHeaderSize)) > 0 @@ -1393,7 +1385,6 @@ { sqInt addr; sqInt byteOffset; - sqInt dataSize; sqInt rcvr; sqInt startAddr; sqInt value; @@ -1408,8 +1399,7 @@ || (value > 0x7FFF))) { return primitiveFailFor(PrimErrBadArgument); } - if (!((((dataSize = longAt(rcvr + BaseHeaderSize))) == 0) - || (((((usqInt)byteOffset)) + 2) <= (abs(dataSize))))) { + if (!(indexlengthinRange(byteOffset, 2, rcvr))) { return primitiveFailFor(PrimErrBadIndex); } if (isOopImmutable(rcvr)) { @@ -1426,6 +1416,82 @@ } +/* Answer the signed word starting at the given byte offset (little endian). */ +/* <Alien> signedWordAt: index <Integer> ^<Integer> + <primitive: 'primSignedWordAt' error: errorCode module: 'IA32ABI'> */ + + /* NewsqueakIA32ABIPlugin>>#primSignedWordAt */ +EXPORT(sqInt) +primSignedWordAt(void) +{ + sqInt addr; + sqInt byteOffset; + sqInt rcvr; + sqInt startAddr; + sqInt value; + sqInt valueOop; + + byteOffset = (stackPositiveMachineIntegerValue(0)) - 1; + rcvr = stackObjectValue(1); + if (failed()) { + return primitiveFailFor(PrimErrBadArgument); + } + if (!(indexlengthinRange(byteOffset, BytesPerOop, rcvr))) { + return primitiveFailFor(PrimErrBadIndex); + } + if (((startAddr = ((longAt(rcvr + BaseHeaderSize)) > 0 + ? (rcvr + BaseHeaderSize) + BytesPerOop + : longAt((rcvr + BaseHeaderSize) + BytesPerOop)))) == 0) { + return primitiveFailFor(PrimErrBadReceiver); + } + addr = startAddr + byteOffset; + value = longAt(addr); + valueOop = signedMachineIntegerValueOf(value); + return methodReturnValue(valueOop); +} + + +/* Store a signed integer into the word starting at the given byte offset + (little endian). + */ +/* <Alien> signedWordAt: index <Integer> put: value <Integer> ^<Integer> + <primitive: 'primSignedWordAtPut' error: errorCode module: 'IA32ABI'> */ + + /* NewsqueakIA32ABIPlugin>>#primSignedWordAtPut */ +EXPORT(sqInt) +primSignedWordAtPut(void) +{ + sqInt addr; + sqInt byteOffset; + sqInt rcvr; + sqInt startAddr; + sqInt value; + sqInt valueOop; + + valueOop = stackValue(0); + byteOffset = (stackPositiveMachineIntegerValue(1)) - 1; + rcvr = stackObjectValue(2); + value = signedMachineIntegerValueOf(valueOop); + if (failed()) { + return primitiveFailFor(PrimErrBadArgument); + } + if (!(indexlengthinRange(byteOffset, BytesPerOop, rcvr))) { + return primitiveFailFor(PrimErrBadIndex); + } + if (isOopImmutable(rcvr)) { + return primitiveFailFor(PrimErrNoModification); + } + if (((startAddr = ((longAt(rcvr + BaseHeaderSize)) > 0 + ? (rcvr + BaseHeaderSize) + BytesPerOop + : longAt((rcvr + BaseHeaderSize) + BytesPerOop)))) == 0) { + return primitiveFailFor(PrimErrBadReceiver); + } + addr = startAddr + byteOffset; + longAtput(addr, value); + return methodReturnValue(valueOop); +} + + /* Answer the signed 32- or 64-bit integer comprising the size field (the first 32- or 64-bit field). */ @@ -1489,7 +1555,6 @@ primStrlenFromStartIndex(void) { sqInt byteOffset; - sqInt dataSize; sqInt index; sqInt limit; char *ptr; @@ -1500,8 +1565,7 @@ if (failed()) { return primitiveFailFor(PrimErrBadArgument); } - if (!((((dataSize = longAt(rcvr + BaseHeaderSize))) == 0) - || (((((usqInt)byteOffset)) + 1) <= (abs(dataSize))))) { + if (!(indexlengthinRange(byteOffset, 1, rcvr))) { return primitiveFailFor(PrimErrBadIndex); } limit = longAt(rcvr + BaseHeaderSize); @@ -1536,7 +1600,6 @@ { sqInt addr; sqInt byteOffset; - sqInt dataSize; char *ptr; sqInt rcvr; @@ -1545,8 +1608,7 @@ if (failed()) { return primitiveFailFor(PrimErrBadArgument); } - if (!((((dataSize = longAt(rcvr + BaseHeaderSize))) == 0) - || (((((usqInt)byteOffset)) + 4) <= (abs(dataSize))))) { + if (!(indexlengthinRange(byteOffset, BytesPerOop, rcvr))) { return primitiveFailFor(PrimErrBadIndex); } addr = (((longAt(rcvr + BaseHeaderSize)) > 0 @@ -1587,7 +1649,6 @@ { sqInt addr; sqInt byteOffset; - sqInt dataSize; sqInt rcvr; sqInt startAddr; unsigned char value; @@ -1598,8 +1659,7 @@ if (failed()) { return primitiveFailFor(PrimErrBadArgument); } - if (!((((dataSize = longAt(rcvr + BaseHeaderSize))) == 0) - || (((((usqInt)byteOffset)) + 1) <= (abs(dataSize))))) { + if (!(indexlengthinRange(byteOffset, 1, rcvr))) { return primitiveFailFor(PrimErrBadIndex); } if (((startAddr = ((longAt(rcvr + BaseHeaderSize)) > 0 @@ -1626,7 +1686,6 @@ { sqInt addr; sqInt byteOffset; - sqInt dataSize; sqInt rcvr; sqInt startAddr; sqInt value; @@ -1640,8 +1699,7 @@ || (value > 0xFF)) { return primitiveFailFor(PrimErrBadArgument); } - if (!((((dataSize = longAt(rcvr + BaseHeaderSize))) == 0) - || (((((usqInt)byteOffset)) + 1) <= (abs(dataSize))))) { + if (!(indexlengthinRange(byteOffset, 1, rcvr))) { return primitiveFailFor(PrimErrBadIndex); } if (isOopImmutable(rcvr)) { @@ -1670,7 +1728,6 @@ { sqInt addr; sqInt byteOffset; - sqInt dataSize; sqInt rcvr; sqInt startAddr; sqInt value; @@ -1681,8 +1738,7 @@ if (failed()) { return primitiveFailFor(PrimErrBadArgument); } - if (!((((dataSize = longAt(rcvr + BaseHeaderSize))) == 0) - || (((((usqInt)byteOffset)) + 4) <= (abs(dataSize))))) { + if (!(indexlengthinRange(byteOffset, 4, rcvr))) { return primitiveFailFor(PrimErrBadIndex); } if (((startAddr = ((longAt(rcvr + BaseHeaderSize)) > 0 @@ -1691,7 +1747,7 @@ return primitiveFailFor(PrimErrBadReceiver); } addr = startAddr + byteOffset; - value = longAt(addr); + value = long32At(addr); valueOop = positive32BitIntegerFor(value); return methodReturnValue(valueOop); } @@ -1709,7 +1765,6 @@ { sqInt addr; sqInt byteOffset; - sqInt dataSize; sqInt rcvr; sqInt startAddr; sqInt value; @@ -1722,8 +1777,7 @@ if (failed()) { return primitiveFailFor(PrimErrBadArgument); } - if (!((((dataSize = longAt(rcvr + BaseHeaderSize))) == 0) - || (((((usqInt)byteOffset)) + 4) <= (abs(dataSize))))) { + if (!(indexlengthinRange(byteOffset, 4, rcvr))) { return primitiveFailFor(PrimErrBadIndex); } if (isOopImmutable(rcvr)) { @@ -1735,7 +1789,7 @@ return primitiveFailFor(PrimErrBadReceiver); } addr = startAddr + byteOffset; - longAtput(addr, value); + long32Atput(addr, value); return methodReturnValue(valueOop); } @@ -1752,7 +1806,6 @@ { sqInt addr; sqInt byteOffset; - sqInt dataSize; sqInt rcvr; sqInt startAddr; unsigned long long unsignedlonglongvalue; @@ -1766,8 +1819,7 @@ if (failed()) { return primitiveFailFor(PrimErrBadArgument); } - if (!((((dataSize = longAt(rcvr + BaseHeaderSize))) == 0) - || (((((usqInt)byteOffset)) + 8) <= (abs(dataSize))))) { + if (!(indexlengthinRange(byteOffset, 8, rcvr))) { return primitiveFailFor(PrimErrBadIndex); } if (((startAddr = ((longAt(rcvr + BaseHeaderSize)) > 0 @@ -1796,7 +1848,6 @@ { sqInt addr; sqInt byteOffset; - sqInt dataSize; sqInt rcvr; sqInt startAddr; unsigned long long unsignedlonglongvalue; @@ -1813,8 +1864,7 @@ if (failed()) { return primitiveFailFor(PrimErrBadArgument); } - if (!((((dataSize = longAt(rcvr + BaseHeaderSize))) == 0) - || (((((usqInt)byteOffset)) + 8) <= (abs(dataSize))))) { + if (!(indexlengthinRange(byteOffset, 8, rcvr))) { return primitiveFailFor(PrimErrBadIndex); } if (isOopImmutable(rcvr)) { @@ -1844,7 +1894,6 @@ { sqInt addr; sqInt byteOffset; - sqInt dataSize; sqInt rcvr; sqInt startAddr; unsigned short value; @@ -1855,8 +1904,7 @@ if (failed()) { return primitiveFailFor(PrimErrBadArgument); } - if (!((((dataSize = longAt(rcvr + BaseHeaderSize))) == 0) - || (((((usqInt)byteOffset)) + 2) <= (abs(dataSize))))) { + if (!(indexlengthinRange(byteOffset, 2, rcvr))) { return primitiveFailFor(PrimErrBadIndex); } if (((startAddr = ((longAt(rcvr + BaseHeaderSize)) > 0 @@ -1883,7 +1931,6 @@ { sqInt addr; sqInt byteOffset; - sqInt dataSize; sqInt rcvr; sqInt startAddr; sqInt value; @@ -1897,8 +1944,7 @@ || (value > 0xFFFF)) { return primitiveFailFor(PrimErrBadArgument); } - if (!((((dataSize = longAt(rcvr + BaseHeaderSize))) == 0) - || (((((usqInt)byteOffset)) + 2) <= (abs(dataSize))))) { + if (!(indexlengthinRange(byteOffset, 2, rcvr))) { return primitiveFailFor(PrimErrBadIndex); } if (isOopImmutable(rcvr)) { @@ -1915,6 +1961,86 @@ } +/* Answer the unsigned word starting at the given byte offset (little + endian). + */ +/* <Alien> unsignedWordAt: index <Integer> ^<Integer> + <primitive: 'primUnsignedWordAt' error: errorCode module: 'IA32ABI'> */ + + /* NewsqueakIA32ABIPlugin>>#primUnsignedWordAt */ +EXPORT(sqInt) +primUnsignedWordAt(void) +{ + sqInt addr; + sqInt byteOffset; + sqInt rcvr; + sqInt startAddr; + sqInt value; + sqInt valueOop; + + byteOffset = (stackPositiveMachineIntegerValue(0)) - 1; + rcvr = stackObjectValue(1); + if (failed()) { + return primitiveFailFor(PrimErrBadArgument); + } + if (!(indexlengthinRange(byteOffset, BytesPerOop, rcvr))) { + return primitiveFailFor(PrimErrBadIndex); + } + if (((startAddr = ((longAt(rcvr + BaseHeaderSize)) > 0 + ? (rcvr + BaseHeaderSize) + BytesPerOop + : longAt((rcvr + BaseHeaderSize) + BytesPerOop)))) == 0) { + return primitiveFailFor(PrimErrBadReceiver); + } + addr = startAddr + byteOffset; + value = longAt(addr); + valueOop = (BytesPerWord == 8 + ? positive64BitIntegerFor(value) + : positive32BitIntegerFor(value)); + return methodReturnValue(valueOop); +} + + +/* Store an unsigned integer into 32 bits starting at the given byte offset + (little endian). + */ +/* <Alien> unsignedWordAt: index <Integer> put: value <Integer> ^<Integer> + <primitive: 'primUnsignedWordAtPut' error: errorCode module: 'IA32ABI'> */ + + /* NewsqueakIA32ABIPlugin>>#primUnsignedWordAtPut */ +EXPORT(sqInt) +primUnsignedWordAtPut(void) +{ + sqInt addr; + sqInt byteOffset; + sqInt rcvr; + sqInt startAddr; + sqInt value; + sqInt valueOop; + + valueOop = stackValue(0); + byteOffset = (stackPositiveMachineIntegerValue(1)) - 1; + rcvr = stackObjectValue(2); + value = positiveMachineIntegerValueOf(valueOop); + if (failed()) { + return primitiveFailFor(PrimErrBadArgument); + } + if (!(indexlengthinRange(byteOffset, BytesPerOop, rcvr))) { + return primitiveFailFor(PrimErrBadIndex); + } + if (isOopImmutable(rcvr)) { + return primitiveFailFor(PrimErrNoModification); + } + if (((startAddr = ((longAt(rcvr + BaseHeaderSize)) > 0 + ? (rcvr + BaseHeaderSize) + BytesPerOop + : longAt((rcvr + BaseHeaderSize) + BytesPerOop)))) == 0) { + return primitiveFailFor(PrimErrBadReceiver); + } + addr = startAddr + byteOffset; + longAtput(addr, value); + return methodReturnValue(valueOop); +} + + /* Call a foreign function that answers a double-precision floating-point result in %f0 according to IA32-ish ABI rules. The primitive will have a signature of @@ -2198,6 +2324,8 @@ {"IA32ABI", "primSignedLongLongAtPut\000\000", (void*)primSignedLongLongAtPut}, {"IA32ABI", "primSignedShortAt\000\000", (void*)primSignedShortAt}, {"IA32ABI", "primSignedShortAtPut\000\000", (void*)primSignedShortAtPut}, + {"IA32ABI", "primSignedWordAt\000\000", (void*)primSignedWordAt}, + {"IA32ABI", "primSignedWordAtPut\000\000", (void*)primSignedWordAtPut}, {"IA32ABI", "primSizeField\000\000", (void*)primSizeField}, {"IA32ABI", "primSizeFieldPut\000\000", (void*)primSizeFieldPut}, {"IA32ABI", "primStrlenFromStartIndex\000\000", (void*)primStrlenFromStartIndex}, @@ -2211,6 +2339,8 @@ {"IA32ABI", "primUnsignedLongLongAtPut\000\000", (void*)primUnsignedLongLongAtPut}, {"IA32ABI", "primUnsignedShortAt\000\000", (void*)primUnsignedShortAt}, {"IA32ABI", "primUnsignedShortAtPut\000\000", (void*)primUnsignedShortAtPut}, + {"IA32ABI", "primUnsignedWordAt\000\000", (void*)primUnsignedWordAt}, + {"IA32ABI", "primUnsignedWordAtPut\000\000", (void*)primUnsignedWordAtPut}, {"IA32ABI", "primVarArgsCallOutDoubleReturn\000\000", (void*)primVarArgsCallOutDoubleReturn}, {"IA32ABI", "primVarArgsCallOutFloatReturn\000\000", (void*)primVarArgsCallOutFloatReturn}, {"IA32ABI", "primVarArgsCallOutIntegralReturn\000\000", (void*)primVarArgsCallOutIntegralReturn}, @@ -2245,6 +2375,8 @@ signed char primSignedLongLongAtPutAccessorDepth = 0; signed char primSignedShortAtAccessorDepth = 0; signed char primSignedShortAtPutAccessorDepth = 0; +signed char primSignedWordAtAccessorDepth = 0; +signed char primSignedWordAtPutAccessorDepth = 0; signed char primSizeFieldAccessorDepth = 0; signed char primSizeFieldPutAccessorDepth = 0; signed char primStrlenFromStartIndexAccessorDepth = 0; @@ -2257,6 +2389,8 @@ signed char primUnsignedLongLongAtPutAccessorDepth = 0; signed char primUnsignedShortAtAccessorDepth = 0; signed char primUnsignedShortAtPutAccessorDepth = 0; +signed char primUnsignedWordAtAccessorDepth = 0; +signed char primUnsignedWordAtPutAccessorDepth = 0; signed char primVarArgsCallOutDoubleReturnAccessorDepth = 0; signed char primVarArgsCallOutFloatReturnAccessorDepth = 0; signed char primVarArgsCallOutIntegralReturnAccessorDepth = 0; Modified: branches/Cog/nsspursrc/plugins/ZipPlugin/ZipPlugin.c =================================================================== --- branches/Cog/nsspursrc/plugins/ZipPlugin/ZipPlugin.c 2015-11-15 23:53:15 UTC (rev 3501) +++ branches/Cog/nsspursrc/plugins/ZipPlugin/ZipPlugin.c 2015-11-24 22:58:27 UTC (rev 3502) @@ -1,9 +1,9 @@ /* Automatically generated by - VMPluginCodeGenerator VMMaker.oscog-eem.1325 uuid: a0bb0f7f-5e6e-48a7-bf73-fa5d135e06c0 + VMPluginCodeGenerator VMMaker.oscog-rmacnak.1532 uuid: 20303656-4854-4e5b-8bcd-eeff8cf5d262 from - DeflatePlugin VMMaker.oscog-eem.1325 uuid: a0bb0f7f-5e6e-48a7-bf73-fa5d135e06c0 + DeflatePlugin VMMaker.oscog-rmacnak.1532 uuid: 20303656-4854-4e5b-8bcd-eeff8cf5d262 */ -static char __buildInfo[] = "DeflatePlugin VMMaker.oscog-eem.1325 uuid: a0bb0f7f-5e6e-48a7-bf73-fa5d135e06c0 " __DATE__ ; +static char __buildInfo[] = "DeflatePlugin VMMaker.oscog-rmacnak.1532 uuid: 20303656-4854-4e5b-8bcd-eeff8cf5d262 " __DATE__ ; @@ -139,9 +139,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "ZipPlugin VMMaker.oscog-eem.1325 (i)" + "ZipPlugin VMMaker.oscog-rmacnak.1532 (i)" #else - "ZipPlugin VMMaker.oscog-eem.1325 (e)" + "ZipPlugin VMMaker.oscog-rmacnak.1532 (e)" #endif ; static sqInt readStreamInstSize; @@ -1124,15 +1124,11 @@ unsigned int *llBitLengths; unsigned int *llCodes; sqInt nBits; - sqInt nBits1; - sqInt nBits2; sqInt oop; sqInt rcvr; sqInt result; sqInt sum; sqInt value; - sqInt value1; - sqInt value2; if (!((methodArgumentCount()) == 4)) { return primitiveFail(); @@ -1278,15 +1274,13 @@ goto l7; } /* begin nextZipBits:put: */ - nBits1 = llBitLengths[code]; - value1 = llCodes[code]; - if (!((value1 >= 0) - && ((1 << nBits1) > value1))) { + if (!(((llCodes[code]) >= 0) + && ((1 << (llBitLengths[code])) > (llCodes[code])))) { primitiveFail(); goto l4; } - zipBitBuf = zipBitBuf | (value1 << zipBitPos); - zipBitPos += nBits1; + zipBitBuf = zipBitBuf | ((llCodes[code]) << zipBitPos); + zipBitPos += llBitLengths[code]; while ((zipBitPos >= 8) && (zipPosition < zipCollectionSize)) { zipCollection[zipPosition] = (zipBitBuf & 0xFF); @@ -1331,15 +1325,13 @@ goto l7; } /* begin nextZipBits:put: */ - nBits2 = distBitLengths[code]; - value2 = distCodes[code]; - if (!((value2 >= 0) - && ((1 << nBits2) > value2))) { + if (!(((distCodes[code]) >= 0) + && ((1 << (distBitLengths[code])) > (distCodes[code])))) { primitiveFail(); goto l5; } - zipBitBuf = zipBitBuf | (value2 << zipBitPos); - zipBitPos += nBits2; + zipBitBuf = zipBitBuf | ((distCodes[code]) << zipBitPos); + zipBitPos += distBitLengths[code]; while ((zipBitPos >= 8) && (zipPosition < zipCollectionSize)) { zipCollection[zipPosition] = (zipBitBuf & 0xFF); @@ -1414,13 +1406,9 @@ unsigned int *llBitLengths; unsigned int *llCodes; sqInt nBits; - sqInt nBits1; - sqInt nBits2; sqInt oop; sqInt sum; sqInt value; - sqInt value1; - sqInt value2; oop = fetchPointerofObject(0, literalStream); litPos = fetchIntegerofObject(1, literalStream); @@ -1525,15 +1513,13 @@ return primitiveFail(); } /* begin nextZipBits:put: */ - nBits1 = llBitLengths[code]; - value1 = llCodes[code]; - if (!((value1 >= 0) - && ((1 << nBits1) > value1))) { + if (!(((llCodes[code]) >= 0) + && ((1 << (llBitLengths[code])) > (llCodes[code])))) { primitiveFail(); goto l4; } - zipBitBuf = zipBitBuf | (value1 << zipBitPos); - zipBitPos += nBits1; + zipBitBuf = zipBitBuf | ((llCodes[code]) << zipBitPos); + zipBitPos += llBitLengths[code]; while ((zipBitPos >= 8) && (zipPosition < zipCollectionSize)) { zipCollection[zipPosition] = (zipBitBuf & 0xFF); @@ -1576,15 +1562,13 @@ return primitiveFail(); } /* begin nextZipBits:put: */ - nBits2 = distBitLengths[code]; - value2 = distCodes[code]; - if (!((value2 >= 0) - && ((1 << nBits2) > value2))) { + if (!(((distCodes[code]) >= 0) + && ((1 << (distBitLengths[code])) > (distCodes[code])))) { primitiveFail(); goto l5; } - zipBitBuf = zipBitBuf | (value2 << zipBitPos); - zipBitPos += nBits2; + zipBitBuf = zipBitBuf | ((distCodes[code]) << zipBitPos); + zipBitPos += distBitLengths[code]; while ((zipBitPos >= 8) && (zipPosition < zipCollectionSize)) { zipCollection[zipPosition] = (zipBitBuf & 0xFF); Modified: branches/Cog/nsspursrc/vm/cogit.h =================================================================== --- branches/Cog/nsspursrc/vm/cogit.h 2015-11-15 23:53:15 UTC (rev 3501) +++ branches/Cog/nsspursrc/vm/cogit.h 2015-11-24 22:58:27 UTC (rev 3502) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.1468 uuid: 2b6a8fd8-cddf-447d-bee4-11d53d2ef9bc + CCodeGenerator VMMaker.oscog-rmacnak.1532 uuid: 20303656-4854-4e5b-8bcd-eeff8cf5d262 */ Modified: branches/Cog/nsspursrc/vm/cogitARMv5.c =================================================================== --- branches/Cog/nsspursrc/vm/cogitARMv5.c 2015-11-15 23:53:15 UTC (rev 3501) +++ branches/Cog/nsspursrc/vm/cogitARMv5.c 2015-11-24 22:58:27 UTC (rev 3502) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.1468 uuid: 2b6a8fd8-cddf-447d-bee4-11d53d2ef9bc + CCodeGenerator VMMaker.oscog-rmacnak.1532 uuid: 20303656-4854-4e5b-8bcd-eeff8cf5d262 from - StackToRegisterMappingCogit VMMaker.oscog-eem.1468 uuid: 2b6a8fd8-cddf-447d-bee4-11d53d2ef9bc + StackToRegisterMappingCogit VMMaker.oscog-rmacnak.1532 uuid: 20303656-4854-4e5b-8bcd-eeff8cf5d262 */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1468 uuid: 2b6a8fd8-cddf-447d-bee4-11d53d2ef9bc " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-rmacnak.1532 uuid: 20303656-4854-4e5b-8bcd-eeff8cf5d262 " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -114,17 +114,18 @@ /*** Constants ***/ #define AddCqR 95 -#define AddCwR 102 +#define AddCwR 103 #define AddOpcode 4 -#define AddRdRd 109 +#define AddRdRd 110 #define AddRR 89 #define AL 14 #define AlignmentNops 3 #define AltBlockCreationBytecodeSize 3 #define AltFirstSpecialSelector 80 +#define AltNumSpecialSelectors 32 #define AndCqR 97 -#define AndCqRR 107 -#define AndCwR 104 +#define AndCqRR 108 +#define AndCwR 105 #define AndOpcode 0 #define AndRR 91 #define AnnotationShift 5 @@ -159,17 +160,18 @@ #define CMMaxUsageCount 7 #define CMMethod 2 #define CMOpenPIC 5 -#define CMPSMULL 120 +#define CMPSMULL 121 +#define CmpC32R 102 #define CmpCqR 94 #define CmpCwR 101 #define CmpNotOpcode 11 #define CmpOpcode 10 -#define CmpRdRd 108 +#define CmpRdRd 109 #define CmpRR 88 #define ConcreteIPReg 12 #define ConcreteVarBaseReg 10 #define ConstZero 1 -#define ConvertRRd 114 +#define ConvertRRd 115 #define CS 2 #define D0 0 #define D1 1 @@ -182,7 +184,7 @@ #define Debug DEBUGVM #define DisplacementMask 0x1F #define DisplacementX2N 0 -#define DivRdRd 112 +#define DivRdRd 113 #define DPFPReg0 -21 #define DPFPReg1 -22 #define DPFPReg2 -23 @@ -292,7 +294,9 @@ #define MFMethodFlagHasContextFlag 1 #define MFMethodFlagIsBlockFlag 2 #define MI 4 +#define MoveAbR 47 #define MoveAwR 45 +#define MoveC32R 69 #define MoveCqR 67 #define MoveCwR 68 #define MoveM16rR 55 @@ -301,6 +305,7 @@ #define MoveMwrR 49 #define MoveNotOpcode 15 #define MoveOpcode 13 +#define MoveRAb 48 #define MoveRAw 46 #define MoveRdM64r 73 #define MoveRdRd 71 @@ -311,9 +316,9 @@ #define MoveRXwrR 52 #define MoveXbrRR 65 #define MoveXwrRR 51 -#define MSR 116 +#define MSR 117 #define MULTIPLEBYTECODESETS 1 -#define MulRdRd 111 +#define MulRdRd 112 #define NE 1 #define NegateR 81 #define NewspeakVM 1 @@ -326,9 +331,10 @@ #define NumObjRefsInRuntime 0 #define NumOopsPerNSC 6 #define NumSendTrampolines 4 +#define NumSpecialSelectors 32 #define NumTrampolines 72 #define OrCqR 98 -#define OrCwR 105 +#define OrCwR 106 #define OrOpcode 12 #define OrRR 92 #define PC 15 @@ -365,11 +371,11 @@ #define SendNumArgsReg -6 #define ShouldNotJIT -8 #define SistaVM 0 -#define SMULL 115 +#define SMULL 116 #define SmallContextSlots 22 #define SP 13 #define SPReg -2 -#define SqrtRd 113 +#define SqrtRd 114 #define SSBaseOffset 1 #define SSConstant 2 #define SSRegister 3 @@ -377,9 +383,9 @@ #define StackPointerIndex 2 #define Stop 14 #define SubCqR 96 -#define SubCwR 103 +#define SubCwR 104 #define SubOpcode 2 -#define SubRdRd 110 +#define SubRdRd 111 #define SubRR 90 #define TempReg -4 #define TstCqR 99 @@ -391,7 +397,7 @@ #define VC 7 #define VS 6 #define XorCqR 100 -#define XorCwR 106 +#define XorCwR 107 #define XorOpcode 1 #define XorRR 93 #define YoungSelectorInPIC -5 @@ -420,6 +426,7 @@ static AbstractInstruction * NoDbgRegParms generateICacheFlush(AbstractInstruction * self_in_generateICacheFlush); static AbstractInstruction * NoDbgRegParms genWriteCResultIntoReg(AbstractInstruction * self_in_genWriteCResultIntoReg, sqInt abstractRegister); static AbstractInstruction * NoDbgRegParms getJmpTarget(AbstractInstruction * self_in_getJmpTarget); +static sqInt NoDbgRegParms inCurrentCompilation(AbstractInstruction * self_in_inCurrentCompilation, sqInt operand); static AbstractInstruction * NoDbgRegParms initializeSharableLiteral(AbstractInstruction * self_in_initializeSharableLiteral, sqInt literal); static AbstractInstruction * NoDbgRegParms initializeUniqueLiteral(AbstractInstruction * self_in_initializeUniqueLiteral, sqInt literal); static sqInt NoDbgRegParms isAFixup(AbstractInstruction * self_in_isAFixup, void *fixupOrAddress); @@ -428,6 +435,7 @@ static sqInt NoDbgRegParms isLongJump(AbstractInstruction * self_in_isLongJump); static AbstractInstruction * NoDbgRegParms jmpTarget(AbstractInstruction * self_in_jmpTarget, AbstractInstruction *anAbstractInstruction); static usqInt NoDbgRegParms labelOffset(AbstractInstruction * self_in_labelOffset); +static sqInt NoDbgRegParms literal32BeforeFollowingAddress(AbstractInstruction * self_in_literal32BeforeFollowingAddress, sqInt followingAddress); static sqInt NoDbgRegParms numCheckFeaturesOpcodes(AbstractInstruction * self_in_numCheckFeaturesOpcodes); static AbstractInstruction * NoDbgRegParms relocateJumpLongBeforeFollowingAddressby(AbstractInstruction * self_in_relocateJumpLongBeforeFollowingAddressby, sqInt pc, sqInt delta); static AbstractInstruction * NoDbgRegParms resolveJumpTarget(AbstractInstruction * self_in_resolveJumpTarget); @@ -441,6 +449,7 @@ static sqInt NoDbgRegParms andrnimmror(AbstractInstruction * self_in_andrnimmror, sqInt destReg, sqInt srcReg, sqInt immediate, sqInt rot); static sqInt NoDbgRegParms bicsrnimmror(AbstractInstruction * self_in_bicsrnimmror, sqInt destReg, sqInt srcReg, sqInt immediate, sqInt rot); static sqInt NoDbgRegParms bl(AbstractInstruction * self_in_bl, sqInt offset); +static sqInt NoDbgRegParms byteReadsZeroExtend(AbstractInstruction * self_in_byteReadsZeroExtend); static sqInt NoDbgRegParms b(AbstractInstruction * self_in_b, sqInt offset); static sqInt NoDbgRegParms callerSavedRegisterMask(AbstractInstruction * self_in_callerSavedRegisterMask); static sqInt NoDbgRegParms callInstructionByteSize(AbstractInstruction * self_in_callInstructionByteSize); @@ -458,6 +467,7 @@ static AbstractInstruction * NoDbgRegParms concretizeFillFromWord(AbstractInstruction * self_in_concretizeFillFromWord); static usqInt NoDbgRegParms concretizeMSR(AbstractInstruction * self_in_concretizeMSR); static usqInt NoDbgRegParms concretizeSMULL(AbstractInstruction * self_in_concretizeSMULL); +static sqInt NoDbgRegParms conditionIsNotNever(AbstractInstruction * self_in_conditionIsNotNever, sqInt instr); static sqInt NoDbgRegParms cResultRegister(AbstractInstruction * self_in_cResultRegister); static sqInt NoDbgRegParms dataOpTyperdrnrmlsr(AbstractInstruction * self_in_dataOpTyperdrnrmlsr, sqInt armOpcode, sqInt destReg, sqInt srcReg, sqInt addReg, sqInt shft); static void NoDbgRegParms dispatchConcretize(AbstractInstruction * self_in_dispatchConcretize); @@ -471,8 +481,6 @@ static sqInt NoDbgRegParms genLoadCStackPointers(AbstractInstruction * self_in_genLoadCStackPointers); static sqInt NoDbgRegParms genLoadStackPointers(AbstractInstruction * self_in_genLoadStackPointers); static AbstractInstruction * NoDbgRegParms genMulRR(AbstractInstruction * self_in_genMulRR, sqInt regSource, sqInt regDest); -static sqInt NoDbgRegParms genPassConstasArgument(AbstractInstruction * self_in_genPassConstasArgument, sqInt constant, sqInt zeroRelativeArgIndex); -static sqInt NoDbgRegParms genPassRegasArgument(AbstractInstruction * self_in_genPassRegasArgument, sqInt abstractRegister, sqInt zeroRelativeArgIndex); static AbstractInstruction * NoDbgRegParms genPushRegisterArgsForAbortMissNumArgs(AbstractInstruction * self_in_genPushRegisterArgsForAbortMissNumArgs, sqInt numArgs); static AbstractInstruction * NoDbgRegParms genPushRegisterArgsForNumArgsscratchReg(AbstractInstruction * self_in_genPushRegisterArgsForNumArgsscratchReg, sqInt numArgs, sqInt ignored); static sqInt NoDbgRegParms genRemoveNArgsFromStack(AbstractInstruction * self_in_genRemoveNArgsFromStack, sqInt n); @@ -489,12 +497,14 @@ static sqInt NoDbgRegParms instructionIsBL(AbstractInstruction * self_in_instructionIsBL, sqInt instr); static sqInt NoDbgRegParms instructionIsBX(AbstractInstruction * self_in_instructionIsBX, sqInt instr); static sqInt NoDbgRegParms instructionIsB(AbstractInstruction * self_in_instructionIsB, sqInt instr); +static sqInt NoDbgRegParms instructionIsCMP(AbstractInstruction * self_in_instructionIsCMP, sqInt instr); +static sqInt NoDbgRegParms instructionIsLDR(AbstractInstruction * self_in_instructionIsLDR, sqInt instr); static sqInt NoDbgRegParms instructionIsOR(AbstractInstruction * self_in_instructionIsOR, sqInt instr); static sqInt NoDbgRegParms instructionIsPush(AbstractInstruction * self_in_instructionIsPush, sqInt instr); static sqInt NoDbgRegParms instructionSizeAt(AbstractInstruction * self_in_instructionSizeAt, sqInt pc); static sqInt NoDbgRegParms inverseOpcodeFor(AbstractInstruction * self_in_inverseOpcodeFor, sqInt armOpcode); static sqInt NoDbgRegParms isAddressRelativeToVarBase(AbstractInstruction * self_in_isAddressRelativeToVarBase, usqInt varAddress); -static sqInt NoDbgRegParms isCallPreceedingReturnPC(AbstractInstruction * self_in_isCallPreceedingReturnPC, sqInt mcpc); +static sqInt NoDbgRegParms isCallPrecedingReturnPC(AbstractInstruction * self_in_isCallPrecedingReturnPC, sqInt mcpc); static sqInt NoDbgRegParms isInImmediateJumpRange(AbstractInstruction * self_in_isInImmediateJumpRange, unsigned long operand); static sqInt NoDbgRegParms isJumpAt(AbstractInstruction * self_in_isJumpAt, sqInt pc); static sqInt NoDbgRegParms isPCRelativeValueLoad(AbstractInstruction * self_in_isPCRelativeValueLoad, unsigned int instr); @@ -511,7 +521,6 @@ static sqInt NoDbgRegParms ldrrnrm(AbstractInstruction * self_in_ldrrnrm, sqInt destReg, sqInt baseReg, sqInt offsetReg); static sqInt NoDbgRegParms leafCallStackPointerDelta(AbstractInstruction * self_in_leafCallStackPointerDelta); static sqInt NoDbgRegParms loadCwInto(AbstractInstruction * self_in_loadCwInto, sqInt destReg); -static sqInt NoDbgRegParms loadLiteralByteSize(AbstractInstruction * self_in_loadLiteralByteSize); static sqInt NoDbgRegParms loadPICLiteralByteSize(AbstractInstruction * self_in_loadPICLiteralByteSize); static sqInt NoDbgRegParms machineCodeBytes(AbstractInstruction * self_in_machineCodeBytes); static sqInt NoDbgRegParms machineCodeWords(AbstractInstruction * self_in_machineCodeWords); @@ -529,6 +538,7 @@ static sqInt NoDbgRegParms mvnimmror(AbstractInstruction * self_in_mvnimmror, sqInt destReg, sqInt immediate8bitValue, sqInt rot); static AbstractInstruction * NoDbgRegParms nopsFromto(AbstractInstruction * self_in_nopsFromto, sqInt startAddr, sqInt endAddr); static sqInt NoDbgRegParms numICacheFlushOpcodes(AbstractInstruction * self_in_numICacheFlushOpcodes); +static sqInt NoDbgRegParms numIntRegArgs(AbstractInstruction * self_in_numIntRegArgs); static sqInt NoDbgRegParms orrimmror(AbstractInstruction * self_in_orrimmror, sqInt destReg, sqInt immediate8bitValue, sqInt rot); static AbstractInstruction * NoDbgRegParms padIfPossibleWithNopsFromto(AbstractInstruction * self_in_padIfPossibleWithNopsFromto, sqInt startAddr, sqInt endAddr); static sqInt NoDbgRegParms popR(AbstractInstruction * self_in_popR, sqInt dstReg); @@ -538,6 +548,8 @@ static sqInt NoDbgRegParms rewriteCallAttarget(AbstractInstruction * self_in_rewriteCallAttarget, usqInt callSiteReturnAddress, usqInt callTargetAddress); static sqInt NoDbgRegParms rewriteCallFullAttarget(AbstractInstruction * self_in_rewriteCallFullAttarget, sqInt callSiteReturnAddress, sqInt callTargetAddress); static sqInt NoDbgRegParms rewriteJumpFullAttarget(AbstractInstruction * self_in_rewriteJumpFullAttarget, sqInt callSiteReturnAddress, sqInt callTargetAddress); +static sqInt NoDbgRegParms rewriteJumpLongAttarget(AbstractInstruction * self_in_rewriteJumpLongAttarget, usqInt callSiteReturnAddress, usqInt callTargetAddress); +static sqInt NoDbgRegParms rewriteTransferAttarget(AbstractInstruction * self_in_rewriteTransferAttarget, usqInt callSiteReturnAddress, usqInt callTargetAddress); static sqInt NoDbgRegParms setsConditionCodesFor(AbstractInstruction * self_in_setsConditionCodesFor, sqInt aConditionalJumpOpcode); static sqInt NoDbgRegParms shiftSetsConditionCodesFor(AbstractInstruction * self_in_shiftSetsConditionCodesFor, sqInt aConditionalJumpOpcode); static sqInt NoDbgRegParms stackPageInterruptHeadroomBytes(AbstractInstruction * self_in_stackPageInterruptHeadroomBytes); @@ -605,15 +617,15 @@ static void NoDbgRegParms compileBlockEntry(BlockStart *blockStart); static void NoDbgRegParms compileCallFornumArgsargargargargresultRegsaveRegs(void *aRoutine, sqInt numArgs, sqInt regOrConst0, sqInt regOrConst1, sqInt regOrConst2, sqInt regOrConst3, sqInt resultRegOrNil, sqInt saveRegs); static AbstractInstruction * compileCPICEntry(void); -static sqInt NoDbgRegParms compileCPICCase0Case1MethodtagisMNUCasenumArgs(CogMethod *cPIC, CogMethod *case0CogMethod, sqInt case1Method, sqInt case1Tag, sqInt isMNUCase, sqInt numArgs); static void compileEntry(void); static sqInt compileMethodBody(void); -static sqInt NoDbgRegParms compileMNUCPICmethodOperandnumArgs(CogMethod *cPIC, sqInt methodOperand, sqInt numArgs); static sqInt NoDbgRegParms compilePICAbort(sqInt numArgs); static sqInt compilePrimitive(void); static void NoDbgRegParms compileTrampolineFornumArgsargargargargsaveRegspushLinkRegresultReg(void *aRoutine, sqInt numArgs, sqInt regOrConst0, sqInt regOrConst1, sqInt regOrConst2, sqInt regOrConst3, sqInt saveRegs, sqInt pushLinkReg, sqInt resultRegOrNil); static void computeEntryOffsets(void); static void computeMaximumSizes(void); +static sqInt NoDbgRegParms configureCPICCase0Case1MethodtagisMNUCasenumArgsdelta(CogMethod *cPIC, CogMethod *case0CogMethod, sqInt case1Method, sqInt case1Tag, sqInt isMNUCase, sqInt numArgs, sqInt addrDelta); +static sqInt NoDbgRegParms configureMNUCPICmethodOperandnumArgsdelta(CogMethod *cPIC, sqInt methodOperand, sqInt numArgs, sqInt addrDelta); static sqInt NoDbgRegParms cPICHasForwardedClass(CogMethod *cPIC); static sqInt NoDbgRegParms cPICHasFreedTargets(CogMethod *cPIC); static sqInt cPICPrototypeCaseOffset(void); @@ -655,6 +667,7 @@ static sqInt genGetLeafCallStackPointer(void); static sqInt NoDbgRegParms genInnerPICAbortTrampoline(char *name); static sqInt genLoadCStackPointersForPrimCall(void); +static void NoDbgRegParms genLoadInlineCache(sqInt selectorIndex); static sqInt genNonLocalReturnTrampoline(void); static sqInt NoDbgRegParms genNSSendTrampolineFornumArgsenclosingObjectCheckcalled(void *aRoutine, sqInt numArgs, sqInt eoCheckFlag, char *aString); static sqInt NoDbgRegParms genReturnTrampolineForcalledarg(void *aRoutine, char *aString, sqInt regOrConst0); @@ -711,6 +724,7 @@ extern void markAndTraceMachineCodeOfMarkedMethods(void); static void markAndTraceObjectReferencesInGeneratedRuntime(void); static sqInt NoDbgRegParms markAndTraceOrFreeCogMethodfirstVisit(CogMethod *cogMethod, sqInt firstVisit); +static sqInt NoDbgRegParms markAndTraceOrFreePICTargetin(sqInt entryPoint, CogMethod *cPIC); static sqInt NoDbgRegParms markLiteralsAndUnlinkIfUnmarkedSendpcmethod(sqInt annotation, char *mcpc, sqInt cogMethod); static sqInt NoDbgRegParms markLiteralspcmethod(sqInt annotation, char *mcpc, sqInt cogMethod); extern void markMethodAndReferents(CogBlockMethod *aCogMethod); @@ -730,7 +744,7 @@ static sqInt NoDbgRegParms needsFrameNever(sqInt stackDelta); static sqInt NoDbgRegParms noAssertMethodClassAssociationOf(sqInt methodPointer); static sqInt noCogMethodsMaximallyMarked(void); -static sqInt NoDbgRegParms noTargetsFreeInClosedPIC(CogMethod *cPIC); +static sqInt NoDbgRegParms noTargetsFreeInClosedPIC(sqInt cPIC); static sqInt NoDbgRegParms outputInstructionsAt(sqInt startAddress); static sqInt NoDbgRegParms outputInstructionsForGeneratedRuntimeAt(sqInt startAddress); static AbstractInstruction * NoDbgRegParms gPopR(sqInt reg); @@ -738,6 +752,7 @@ extern sqInt patchToOpenPICFornumArgsreceiver(sqInt selector, sqInt numArgs, sqInt receiver); static sqInt picAbortDiscriminatorValue(void); static sqInt picInterpretAbortOffset(void); +static AbstractInstruction * previousInstruction(void); static PrimitiveDescriptor * primitiveGeneratorOrNil(void); extern void printCogMethodFor(void *address); extern void printTrampolineTable(void); @@ -756,6 +771,8 @@ static void NoDbgRegParms relocateCallsInClosedPIC(CogMethod *cPIC); static sqInt NoDbgRegParms relocateIfCallOrMethodReferencemcpcdelta(sqInt annotation, char *mcpc, sqInt delta); static sqInt NoDbgRegParms remapIfObjectRefpchasYoung(sqInt annotation, char *mcpc, sqInt hasYoungPtr); +static sqInt NoDbgRegParms remapMaybeObjRefInClosedPICAt(sqInt mcpc); +static void NoDbgRegParms rewriteCPICCaseAttagobjReftarget(sqInt followingAddress, sqInt newTag, sqInt newObjRef, sqInt newTarget); static AbstractInstruction * NoDbgRegParms gSubCwR(sqInt wordConstant, sqInt reg); static sqInt scanForCleanBlocks(void); extern void setBreakMethod(sqInt anObj); @@ -777,8 +794,6 @@ extern void unlinkSendsOfisMNUSelector(sqInt selector, sqInt isMNUSelector); extern void unlinkSendsToFree(void); extern void unlinkSendsToandFreeIf(sqInt targetMethodObject, sqInt freeIfTrue); -static sqInt NoDbgRegParms updateMaybeClassRefInClosedPICAt(sqInt mcpc); -static sqInt NoDbgRegParms updateMaybeObjRefInClosedPICAt(sqInt mcpc); static AbstractInstruction * NoDbgRegParms gXorCwR(sqInt wordConstant, sqInt reg); static void zeroOpcodeIndex(void); extern void addAllToYoungReferrers(void); @@ -826,15 +841,11 @@ static sqInt NoDbgRegParms genConvertIntegerToSmallIntegerInReg(sqInt reg); static void NoDbgRegParms genConvertSmallIntegerToCharacterInReg(sqInt reg); static sqInt NoDbgRegParms genConvertSmallIntegerToIntegerInReg(sqInt reg); -static sqInt NoDbgRegParms genCreateClosureAtnumArgsnumCopiedcontextNumArgslargeinBlock(sqInt bcpc, sqInt numArgs, sqInt numCopied, sqInt ctxtNumArgs, sqInt isLargeCtxt, sqInt isInBlock); static sqInt NoDbgRegParms genFetchIndexRegisterfrominto(sqInt indexReg, sqInt tableObj, sqInt destReg); -static sqInt NoDbgRegParms genGetActiveContextLargeinBlock(sqInt isLarge, sqInt isInBlock); -static AbstractInstruction * NoDbgRegParms genGetClassTagOfintoscratchReg(sqInt instReg, sqInt destReg, sqInt scratchReg); static sqInt NoDbgRegParms genGetHashFieldNonImmOfasSmallIntegerInto(sqInt instReg, sqInt destReg); static sqInt NoDbgRegParms genGetHashFieldNonImmOfinto(sqInt instReg, sqInt destReg); static AbstractInstruction * NoDbgRegParms genGetInlineCacheClassTagFromintoforEntry(sqInt sourceReg, sqInt destReg, sqInt forEntry); static sqInt NoDbgRegParms genGetNumBytesOfinto(sqInt srcReg, sqInt destReg); -static sqInt NoDbgRegParms genGetNumSlotsOfinto(sqInt srcReg, sqInt destReg); static sqInt NoDbgRegParms genGetOverflowSlotsOfinto(sqInt srcReg, sqInt destReg); static sqInt NoDbgRegParms genInnerPrimitiveAtPut(sqInt retNoffset); static sqInt NoDbgRegParms genInnerPrimitiveAt(sqInt retNoffset); @@ -848,14 +859,12 @@ static AbstractInstruction * NoDbgRegParms genJumpNotSmallIntegerInScratchReg(sqInt aRegister); static AbstractInstruction * NoDbgRegParms genJumpNotSmallInteger(sqInt aRegister); static AbstractInstruction * NoDbgRegParms genJumpSmallInteger(sqInt aRegister); -static sqInt NoDbgRegParms genNewArrayOfSizeinitialized(sqInt size, sqInt initialized); -static sqInt NoDbgRegParms genNoPopCreateClosureAtnumArgsnumCopiedcontextNumArgslargeinBlock(sqInt bcpc, sqInt numArgs, sqInt numCopied, sqInt ctxtNumArgs, sqInt isLargeCtxt, sqInt isInBlock); @@ Diff output truncated at 50000 characters. @@

1 0

clang and bytecodePrimMultiply
by Eliot Miranda 24 Nov '15

24 Nov '15

Hi All, I'm trying to use clang in Xcode on Mac OS X to compile a new 32-bit VM. One of my installations is Mavericks 10.9 with Xcode 6.2 and clang 6.0. The other is 10.10.5 with Xcode 7.1 and clang 7.0. Both seem to have problems with the integer side of bytecodePrimMultiply, the interpreter's multiplication routine: CASE(184) /* bytecodePrimMultiply */ { sqInt arg; sqInt rcvr; sqInt result; char *sp; VM_LABEL(bytecodePrimMultiply); rcvr = longAtPointer(localSP + (1 * BytesPerOop)); arg = longAtPointer(localSP + (0 * BytesPerOop)); if (((rcvr & arg) & 1) != 0) { // both SmallIntegers? rcvr = (rcvr >> 1); // convert from SmallInteger to value arg = (arg >> 1); result = rcvr * arg; // multiply if ((arg == 0) || (((result / arg) == rcvr) // check for overflow && ((((sqInt)(result ^ (result << 1)))) >= 0))) { // check for SmallInteger overflow /* begin internalPop:thenPush: */ longAtPointerput((localSP += (2 - 1) * BytesPerOop), ((result << 1) | 1)); /* begin fetchNextBytecode */ currentBytecode = byteAtPointer(++localIP); goto l58; } } else { clang 6 inserts a spurious instruction at 0x36799: 0x36784: 89 ca movl %ecx, %edx // both SmallIntegers? 0x36786: 83 e2 01 andl $0x1, %edx 0x36789: 85 d0 testl %eax, %edx 0x3678b: 74 6b je 0x367f8 0x3678d: d1 f9 sarl %ecx // convert from SmallInteger to value 0x3678f: d1 f8 sarl %eax 0x36791: 0f af c8 imull %eax, %ecx // do the multiply 0x36794: 8d 14 09 leal (%ecx,%ecx), %edx 0x36797: 85 c0 testl %eax, %eax 0x36799: 89 f7 movl %esi, %edi // AFAICS, totally spurious 0x3679b: 74 08 je 0x367a5 0x3679d: 31 d1 xorl %edx, %ecx // check for SmallInteger overflow 0x3679f: 0f 88 96 01 00 00 js 0x3693b 0x367a5: 83 ca 01 orl $0x1, %edx clang 7 does better: 0x36741: 89 ca movl %ecx, %edx // both SmallIntegers? 0x36743: 83 e2 01 andl $0x1, %edx 0x36746: 85 d0 testl %eax, %edx 0x36748: 74 67 je 0x367b1 0x3674a: d1 f9 sarl %ecx // convert from SmallInteger to value 0x3674c: d1 f8 sarl %eax 0x3674e: 0f af c8 imull %eax, %ecx // do the multiply 0x36751: 8d 14 09 leal (%ecx,%ecx), %edx 0x36754: 85 c0 testl %eax, %eax 0x36756: 74 08 je 0x36760 0x36758: 31 d1 xorl %edx, %ecx // check for SmallInteger overflow 0x3675a: 0f 88 a9 01 00 00 js 0x36909 0x36760: 83 ca 01 orl $0x1, %edx What I don't understand is how, given typedef long sqInt; sqInt arg; sqInt rcvr; sqInt result; ... result = rcvr * arg; // multiply clang reasons it doesn't need to evaluate || (((result / arg) == rcvr) // check for overflow Given that arg and receiver can both have values > 64k, the result can of course overflow and there's no guarantee that because result = rcvr * arg, that (result / arg) == rcvr. Am I missing something? Are there flags I should be using? This looks like a pretty basic issue. _,,,^..^,,,_ best, Eliot

3 3

Re: [Pharo-dev] what is exactly flushCache?
by Eliot Miranda 24 Nov '15

24 Nov '15

Hi Stephane, the VM caches method lookups in a lookup cache from class,selector pairs to method,primitive pairs, where primitive may be null. This is called the first-level method lookup cache. The JIT VM caches message lookups in machine code, so that a particular piece of machine code exists in a state that invokes a method for a specific class very fast by embedding the class reference in a register load and the target method in a call instruction, and having the target method verify this "cache probe" (this is an "in-line cache). The JIT also caches the translation of a byte coded method to machine code, by hiding a reference to a machine code method in a byte coded method. These caches can be invalidated in several circumstances: 1a. if one adds or removes a method from a class's method dictionary it may change the correct results of a lookup not merely of the class whose dictionary was updated but also subclasses of the class. 1b. if one replaces a method in a method dictionary this changes the target method for a lookup of the selector for the class and subclasses 2. if one wants to rewrite the byte code or literals of a method, for example because a Slot definition has changed, then if the method has been compiled to machine code, the machine code must be discarded before the new code may be executed 1a & 1b are done via Symbol>>flushCache. In response the normal VM flushes its first-level method lookup cache, and the JIT also scans all of machine code looking for inline caches with that selector, and voiding them, reverting each send site for that selector to the "unlinked" state. There used to be confusion in Squeak, which Pharo inherited, that using CompiledMethod>>flushCache was somehow the right way to void caches when updating method dictionaries, flushing the old method in the dictionary, if any, and the new method. It isn't, precisely because adding or removing methods affects the visibility of inherited methods with the same selector. So MethodDictionary code should use Symbol>>flushCache, and only once, on each update of a method dictionary. As a result, the VM will ensure that the necessary send caches are flushed for that selector. 2. is done via CompiledMethod>>flushCache. In response the VM searches the first-level method lookup cache and removes all entries whose target is the method. In addition the JIT discards the machine code for the method, and searches for all send sites with that method's machine code as the target and voids them, reverting them to the unlinked state. The VM must be told to flush the cached state for a compiled method via CompiledMethod>>flushCache and will /try/ and void the state for that method. But it can't always deal with existing activations of that method, because if there are activations running the machine code, that machine code can't merely be thrown away, and can't be replaced because its length may change, depending on literals or byte codes. So this kind of byte coded method manipulation needs to be done with case and some understanding of the total system state. HTH On Tue, Nov 24, 2015 at 9:37 AM, stepharo <stepharo(a)free.fr> wrote: > Clement > > do you know what is flushCache and why we need to invoke it? > > Stef > > -- _,,,^..^,,,_ best, Eliot

2 1

Re: [Pharo-dev] vm crash in SmalltalkImage>garbageCollect
by Mariano Martinez Peck 24 Nov '15

24 Nov '15

OK, I made it work by compiling a VM with #checkForLeaks answering 1. I see plenty of leaks but they are all of the pattern "cache tag leak in CM". See a piece of the gdb output: ----------- cache tag leak in CM 0x1f4a8b58 @ 0x1f4a8bfa cache tag leak in CM 0x1f4a9800 @ 0x1f4a98a9 cache tag leak in CM 0x1f4ad8a0 @ 0x1f4ad974 cache tag leak in CM 0x1f4ae380 @ 0x1f4ae3ea cache tag leak in CM 0x1f4ae510 @ 0x1f4ae577 cache tag leak in CM 0x1f4af708 @ 0x1f4af94e checkCodeIntegrity(0) 11637 fwdBlockValid(fwdBlock2) 40450 Program received signal SIGSEGV, Segmentation fault. 0x000ab672 in updatePointersInRangeFromto (memStart=525336576, memEnd=555384320) at /Users/mariano/Pharo/git/pharo-vm/src/vm/gcc3x-cointerp.c:40451 40451 targetObj = longAt(fwdBlock2); ------------- There is none other type of leak displayed. Any idea what does this mean? On Mon, Nov 23, 2015 at 11:28 PM, Mariano Martinez Peck < marianopeck(a)gmail.com> wrote: > > > > > On Mon, Nov 23, 2015 at 11:15 PM, Mariano Martinez Peck < > marianopeck(a)gmail.com> wrote: > >> >> >> On Mon, Nov 23, 2015 at 11:13 PM, Mariano Martinez Peck < >> marianopeck(a)gmail.com> wrote: >> >>> >>> >>> On Mon, Nov 23, 2015 at 9:57 PM, Andrei Chis <chisvasileandrei(a)gmail.com >>> > wrote: >>> >>>> Hi Eliot, >>>> >>>> Is an assert vm the same as a vm compiled with debugging support? >>>> Also can you point me to any documentation about the leak checker. >>>> >>>> >>> I was about to ask the same. I have the VM compiled with debug support >>> and gdb working. I can reproduce the crash. >>> After checking a bit in the VM about what Eliot says, I found out >>> methods like #clearLeakMapAndMapAccessibleObjects and #checkCodeIntegrity:. >>> >>> However, I tried, for example (clearLeakMapAndMapAccessibleObjects to >>> later call checkCodeIntegrity(0) ) from gdb: >>> >>> ------ >>> *fwdBlockValid(fwdBlock2) 40450* >>> >>> *Program received signal SIGSEGV, Segmentation fault.* >>> *0x000ab6d2 in ?? ()* >>> *(gdb) call clearLeakMapAndMapAccessibleObjects()* >>> ------- >>> >>> >>> And I get CPU at 100% never ending. >>> >> >> I forgot to said..I also compiled the VM with a hardcoded #checkForLeaks >> that answers 1 (to force the checker) but that did not work either. >> >> >> >>> >>> >>> Cheers, >>>> Andrei >>>> >>>> On Nov 24, 2015 1:45 AM, "Eliot Miranda" <eliot.miranda(a)gmail.com> >>>> wrote: >>>> > >>>> > Hi Andrei, >>>> > >>>> > On Mon, Nov 23, 2015 at 7:59 AM, Andrei Chis < >>>> chisvasileandrei(a)gmail.com> wrote: >>>> >> >>>> >> Hi, >>>> >> >>>> >> With both the latest and stable vm I have an use case in which the >>>> vm crashed in SmalltalkImage>>garbageCollect. >>>> >> >>>> >> To set up an image that exhibits the failure , execute this with the >>>> latest pharo version: >>>> >> >>>> >> /pharo Pharo.image eval --save "{ { 'ConfigurationOfRubric'. >>>> 'Pharo'. 'Rubric' }. { 'ConfigurationOfGlamourCore'. 'Moose'. 'Glamour' }. >>>> { 'ConfigurationOfGTInspectorCore'. 'Moose'. 'GToolkit' }. { >>>> 'ConfigurationOfGTPlaygroundCore'. 'Moose'. 'GToolkit' }. { >>>> 'ConfigurationOfGTEventRecorder'. 'Moose'. 'GToolkit' }. { >>>> 'ConfigurationOfGTSpotter'. 'Moose'. 'GToolkit' }. } do: [ :spec | Gofer >>>> new smalltalkhubUser: spec second project: spec third; package: spec first; >>>> load ]." >>>> >> >>>> >> ./pharo Pharo.image config >>>> http://www.smalltalkhub.com/mc/Pharo/Pharo50Inbox/main >>>> ConfigurationOfGToolkitCore --install=3.2 >>>> >> >>>> >> Then attempting to run the following code triggers the failure: >>>> >> >>>> >> ./pharo Pharo.image eval --save "TestRunner open model >>>> packageSearchUpdate: 'gt-tests-inspector'; classSearchUpdate: >>>> 'GTInspectorExamplesTest'; runAll" >>>> >> >>>> >> Based on the trace below the failure happens when the >>>> test GTInspectorExamplesTest calls 'Smalltalk>>garbageCollect' in the setUp >>>> method. >>>> >> >>>> >> That call can be removed, however, in other runs the failure happens >>>> in other methods calling Smalltalk>>garbageCollect. >>>> >> >>>> >> Is it possible that this is a bug with the image (some broken >>>> object) or is it a vm bug? >>>> > >>>> > >>>> > The way to test this is to build an assert VM and then use the leak >>>> checker. The leak checker will allow you to narrow down the cause. If the >>>> leak checker shows no corruption then its definitely a GC bug. If there >>>> leak checker does show corruption before GC then one still has to find out >>>> what caused the heap corruption, but you can use the leak checker to narrow >>>> the search. >>>> > >>>> > HTH >>>> > Eliot >>>> >>>> > >>>> >> Cheers, >>>> >> >>>> >> Andrei >>>> >> >>>> >> >>>> >> >>>> >> andrei$ ./pharo Pharo.image eval --save "{ { >>>> 'ConfigurationOfRubric'. 'Pharo'. 'Rubric' }. { >>>> 'ConfigurationOfGlamourCore'. 'Moose'. 'Glamour' }. { >>>> 'ConfigurationOfGTInspectorCore'. 'Moose'. 'GToolkit' }. { >>>> 'ConfigurationOfGTPlaygroundCore'. 'Moose'. 'GToolkit' }. { >>>> 'ConfigurationOfGTEventRecorder'. 'Moose'. 'GToolkit' }. { >>>> 'ConfigurationOfGTSpotter'. 'Moose'. 'GToolkit' }. } do: [ :spec | Gofer >>>> new smalltalkhubUser: spec second project: spec third; package: spec first; >>>> load ]." >>>> >> >>>> >> andrei$ ./pharo Pharo.image config >>>> http://www.smalltalkhub.com/mc/Pharo/Pharo50Inbox/main >>>> ConfigurationOfGToolkitCore --install=3.2 >>>> >> >>>> >> andrei$ ./pharo Pharo.image eval --save "TestRunner open model >>>> packageSearchUpdate: 'gt-tests-inspector'; classSearchUpdate: >>>> 'GTInspectorExamplesTest'; runAll" >>>> >> >>>> >> >>>> >> Segmentation fault Mon Nov 23 16:48:36 2015 >>>> >> >>>> >> >>>> >> >>>> >> https://github.com/pharo-project/pharo-vm.git Commit: >>>> 28d077d8df494ce050ca42c97c892471e8b8740c Date: 2015-10-16 12:02:43 +0200 >>>> By: Esteban Lorenzano <estebanlm(a)gmail.com> Jenkins build #15016 >>>> >> >>>> >> >>>> >> C stack backtrace: >>>> >> >>>> >> 0 Pharo 0x0004cacf reportStackState >>>> + 159 >>>> >> >>>> >> >>>> >> >>>> >> Smalltalk stack dump: >>>> >> >>>> >> 0xbffbf1a0 M SmalltalkImage>garbageCollect 0x1fd49e30: a(n) >>>> SmalltalkImage >>>> >> >>>> >> 0xbffbf1c0 I GTInspectorExamplesTest>setUp 0x2126bc80: a(n) >>>> GTInspectorExamplesTest >>>> >> >>>> >> 0x2126cb90 is not a context >>>> >> >>>> >> >>>> >> Most recent primitives >>>> >> >>>> >> @ >>>> >> >>>> >> basicNew >>>> >> >>>> >> @ >>>> >> >>>> >> @ >>>> >> >>>> >> @ >>>> >> >>>> >> @ >>>> >> >>>> >> @ >>>> >> >>>> >> @ >>>> >> >>>> >> @ >>>> >> >>>> >> @ >>>> >> >>>> >> @ >>>> >> >>>> >> basicNew >>>> >> >>>> >> basicNew >>>> >> >>>> >> basicNew >>>> >> >>>> >> @ >>>> >> >>>> >> @ >>>> >> >>>> >> @ >>>> >> >>>> >> @ >>>> >> >>>> >> shallowCopy >>>> >> >>>> >> new >>>> >> >>>> >> new: >>>> >> >>>> >> new: >>>> >> >>>> >> basicNew >>>> >> >>>> >> basicNew >>>> >> >>>> >> new: >>>> >> >>>> >> basicNew >>>> >> >>>> >> new: >>>> >> >>>> >> replaceFrom:to:with:startingAt: >>>> >> >>>> >> new: >>>> >> >>>> >> basicNew >>>> >> >>>> >> new: >>>> >> >>>> >> replaceFrom:to:with:startingAt: >>>> >> >>>> >> new: >>>> >> >>>> >> basicNew >>>> >> >>>> >> @ >>>> >> >>>> >> new: >>>> >> >>>> >> at:put: >>>> >> >>>> >> at:put: >>>> >> >>>> >> perform:with: >>>> >> >>>> >> perform:with: >>>> >> >>>> >> perform: >>>> >> >>>> >> @ >>>> >> >>>> >> @ >>>> >> >>>> >> basicNew >>>> >> >>>> >> @ >>>> >> >>>> >> @ >>>> >> >>>> >> @ >>>> >> >>>> >> @ >>>> >> >>>> >> @ >>>> >> >>>> >> @ >>>> >> >>>> >> basicNew >>>> >> >>>> >> @ >>>> >> >>>> >> new: >>>> >> >>>> >> at:put: >>>> >> >>>> >> at:put: >>>> >> >>>> >> perform:with: >>>> >> >>>> >> perform:with: >>>> >> >>>> >> perform: >>>> >> >>>> >> @ >>>> >> >>>> >> @ >>>> >> >>>> >> basicNew >>>> >> >>>> >> @ >>>> >> >>>> >> @ >>>> >> >>>> >> @ >>>> >> >>>> >> @ >>>> >> >>>> >> @ >>>> >> >>>> >> @ >>>> >> >>>> >> new >>>> >> >>>> >> @ >>>> >> >>>> >> @ >>>> >> >>>> >> @ >>>> >> >>>> >> @ >>>> >> >>>> >> @ >>>> >> >>>> >> basicNew >>>> >> >>>> >> @ >>>> >> >>>> >> @ >>>> >> >>>> >> new: >>>> >> >>>> >> at:put: >>>> >> >>>> >> @ >>>> >> >>>> >> @ >>>> >> >>>> >> basicNew >>>> >> >>>> >> @ >>>> >> >>>> >> @ >>>> >> >>>> >> @ >>>> >> >>>> >> @ >>>> >> >>>> >> new: >>>> >> >>>> >> at:put: >>>> >> >>>> >> at:put: >>>> >> >>>> >> at:put: >>>> >> >>>> >> at:put: >>>> >> >>>> >> new: >>>> >> >>>> >> @ >>>> >> >>>> >> at:put: >>>> >> >>>> >> @ >>>> >> >>>> >> at:put: >>>> >> >>>> >> @ >>>> >> >>>> >> at:put: >>>> >> >>>> >> @ >>>> >> >>>> >> at:put: >>>> >> >>>> >> @ >>>> >> >>>> >> @ >>>> >> >>>> >> @ >>>> >> >>>> >> @ >>>> >> >>>> >> @ >>>> >> >>>> >> @ >>>> >> >>>> >> basicNew >>>> >> >>>> >> @ >>>> >> >>>> >> @ >>>> >> >>>> >> basicNew >>>> >> >>>> >> @ >>>> >> >>>> >> @ >>>> >> >>>> >> basicNew >>>> >> >>>> >> @ >>>> >> >>>> >> @ >>>> >> >>>> >> @ >>>> >> >>>> >> @ >>>> >> >>>> >> @ >>>> >> >>>> >> shallowCopy >>>> >> >>>> >> shallowCopy >>>> >> >>>> >> @ >>>> >> >>>> >> @ >>>> >> >>>> >> new: >>>> >> >>>> >> at:put: >>>> >> >>>> >> at:put: >>>> >> >>>> >> at:put: >>>> >> >>>> >> at:put: >>>> >> >>>> >> new: >>>> >> >>>> >> @ >>>> >> >>>> >> at:put: >>>> >> >>>> >> @ >>>> >> >>>> >> at:put: >>>> >> >>>> >> @ >>>> >> >>>> >> at:put: >>>> >> >>>> >> @ >>>> >> >>>> >> at:put: >>>> >> >>>> >> @ >>>> >> >>>> >> @ >>>> >> >>>> >> @ >>>> >> >>>> >> @ >>>> >> >>>> >> @ >>>> >> >>>> >> @ >>>> >> >>>> >> basicNew >>>> >> >>>> >> @ >>>> >> >>>> >> @ >>>> >> >>>> >> basicNew >>>> >> >>>> >> @ >>>> >> >>>> >> @ >>>> >> >>>> >> basicNew >>>> >> >>>> >> @ >>>> >> >>>> >> @ >>>> >> >>>> >> @ >>>> >> >>>> >> @ >>>> >> >>>> >> @ >>>> >> >>>> >> basicNew >>>> >> >>>> >> @ >>>> >> >>>> >> @ >>>> >> >>>> >> @ >>>> >> >>>> >> @ >>>> >> >>>> >> basicNew >>>> >> >>>> >> @ >>>> >> >>>> >> @ >>>> >> >>>> >> basicNew >>>> >> >>>> >> @ >>>> >> >>>> >> @ >>>> >> >>>> >> basicNew >>>> >> >>>> >> @ >>>> >> >>>> >> @ >>>> >> >>>> >> @ >>>> >> >>>> >> @ >>>> >> >>>> >> @ >>>> >> >>>> >> basicNew >>>> >> >>>> >> @ >>>> >> >>>> >> @ >>>> >> >>>> >> @ >>>> >> >>>> >> @ >>>> >> >>>> >> basicNew >>>> >> >>>> >> @ >>>> >> >>>> >> @ >>>> >> >>>> >> perform: >>>> >> >>>> >> basicNew >>>> >> >>>> >> new: >>>> >> >>>> >> basicNew >>>> >> >>>> >> new: >>>> >> >>>> >> basicNew >>>> >> >>>> >> new: >>>> >> >>>> >> shallowCopy >>>> >> >>>> >> shallowCopy >>>> >> >>>> >> primUTCMicrosecondsClock >>>> >> >>>> >> // >>>> >> >>>> >> basicNew >>>> >> >>>> >> basicNew >>>> >> >>>> >> new: >>>> >> >>>> >> at:put: >>>> >> >>>> >> at:put: >>>> >> >>>> >> at:put: >>>> >> >>>> >> at:put: >>>> >> >>>> >> value >>>> >> >>>> >> valueNoContextSwitch >>>> >> >>>> >> basicNew >>>> >> >>>> >> new: >>>> >> >>>> >> basicNew >>>> >> >>>> >> new: >>>> >> >>>> >> new: >>>> >> >>>> >> basicNew >>>> >> >>>> >> new: >>>> >> >>>> >> replaceFrom:to:with:startingAt: >>>> >> >>>> >> primitiveGarbageCollect >>>> >> >>>> >> **IncrementalGC** >>>> >> >>>> >> **FullGC** >>>> >> >>>> >> garbageCollectMost >>>> >> >>>> >> **IncrementalGC** >>>> >> >>>> >> basicNew >>>> >> >>>> >> new: >>>> >> >>>> >> someInstance >>>> >> >>>> >> basicNew >>>> >> >>>> >> new: >>>> >> >>>> >> someInstance >>>> >> >>>> >> basicNew >>>> >> >>>> >> new: >>>> >> >>>> >> someInstance >>>> >> >>>> >> new: >>>> >> >>>> >> basicNew >>>> >> >>>> >> new: >>>> >> >>>> >> replaceFrom:to:with:startingAt: >>>> >> >>>> >> primitiveGarbageCollect >>>> >> >>>> >> **IncrementalGC** >>>> >> >>>> >> **FullGC** >>>> >> >>>> >> garbageCollectMost >>>> >> >>>> >> **IncrementalGC** >>>> >> >>>> >> wait >>>> >> >>>> >> shallowCopy >>>> >> >>>> >> shallowCopy >>>> >> >>>> >> signal >>>> >> >>>> >> wait >>>> >> >>>> >> shallowCopy >>>> >> >>>> >> shallowCopy >>>> >> >>>> >> at:put: >>>> >> >>>> >> at:put: >>>> >> >>>> >> at:put: >>>> >> >>>> >> at:put: >>>> >> >>>> >> at:put: >>>> >> >>>> >> at:put: >>>> >> >>>> >> signal >>>> >> >>>> >> wait >>>> >> >>>> >> shallowCopy >>>> >> >>>> >> shallowCopy >>>> >> >>>> >> at:put: >>>> >> >>>> >> at:put: >>>> >> >>>> >> signal >>>> >> >>>> >> new: >>>> >> >>>> >> basicNew >>>> >> >>>> >> new: >>>> >> >>>> >> replaceFrom:to:with:startingAt: >>>> >> >>>> >> primitiveGarbageCollect >>>> >> >>>> >> **IncrementalGC** >>>> >> >>>> >> **FullGC** >>>> >> >>>> >> >>>> >> (Segmentation fault) >>>> >> >>>> >> ./pharo: line 11: 5224 Abort trap: 6 >>>> "$DIR"/"pharo-vm/Pharo.app/Contents/MacOS/Pharo" --headless "$@" >>>> > >>>> > >>>> > >>>> > >>>> > -- >>>> > _,,,^..^,,,_ >>>> > best, Eliot >>>> >>>> >>> >>> >>> -- >>> Mariano >>> http://marianopeck.wordpress.com >>> >> >> >> >> -- >> Mariano >> http://marianopeck.wordpress.com >> > > > > -- > Mariano > http://marianopeck.wordpress.com > -- Mariano http://marianopeck.wordpress.com

2 1

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

Vm-dev November 2015