Vm-dev December 2015

vm-dev@lists.squeakfoundation.org

33 participants
207 discussions

Re: [squeak-dev] Re: [Cuis] Sorting Unicode strings (Re: [Unicode] collation sequences (Re: Unicode Support))
by Eliot Miranda 15 Dec '15

15 Dec '15

Hi Dale, On Thu, Dec 10, 2015 at 12:27 PM, Dale Henrichs < dale.henrichs(a)gemtalksystems.com> wrote: > > > On 12/09/2015 04:31 PM, Levente Uzonyi wrote: > >> On Wed, 9 Dec 2015, Dale Henrichs wrote: >> >> >>> >>> On 12/09/2015 12:44 AM, Stephan Eggermont wrote: >>> >>>> On 08-12-15 22:35, Dale Henrichs wrote: >>>> >>>>> What I meant is that you can't _always_ use the code point for >>>>> collation, i.e., sorting based on the value of code points is not >>>>> always >>>>> correct[1]. >>>>> >>>> >>>> I have given up on universal sorting when I learned that dutch >>>> libraries sorting of author names depends on the country of origin of the >>>> author. So if Jan van Beek is dutch he will be sorted under B, while if >>>> he's belgian under V. I haven't checked what happens if the author >>>> emigrates, or changes nationality... >>>> >>>> Stephan >>>> >>>> Well, with ICU (and GemStone's implementation) you can choose which >>> collator to use (Country specific) at the image level or on a comparison by >>> comparison bases ... for example for an indexed collection (Unicode) >>> Strings, you can choose the collator to use for that particular index ... >>> so while it's true that universal sorter is not possible, it is possible to >>> choose a collator that will satisfy a particlar customer .... >>> >> >> I expect my image to compare strings using the codepoint-based (+language >> tags) lexicographical method, because it's simple, deterministic and fast. >> Imagine having failing tests just because your image uses different >> default comparison methods based on some (external) parameter... >> It's also a nightmare to find out why your program is slow on some >> machine, while it's fast on another. >> > > When we implemented the Unicode support in GemStone we preserved the > legacy string classes and their legacy behavior ... We added new Unicode* > classes with the new collator-based behavior for sorting and comparison ... > That way legacy applications (and legacy) tests were not impacted by the > choice of collator ... And folks could choose whether or not their > application would benefit by the use of the new Unicode* classes.... > > The ICU library performance is actually comparable to our original > implementations, so there isn't a noticeable performance difference - we > built the support into our vm and if folks are interested in some of the > gory technical details, we'd be willing to share our experience, as there > are several things that we did to minimize potential performance impacts --- > Just so you know, I will dig my heels in as deeply as I am able to prevent the use of C++ libraries in the VM. It destroys the simulator, which is the most important thing we have for VM development productivity. As far as I'm concerned any use of external libraries to implement core functionality kills the VM-in-Smalltalk concept that Squeak (and Pharo) are built upon. So for me it's a non-starter. I hope others agree. _,,,^..^,,,_ best, Eliot

1 0

[commit][3535] Avoid miosvm depending on having .
by commits＠squeakvm.org 15 Dec '15

15 Dec '15

Revision: 3535 Author: eliot Date: 2015-12-15 13:29:51 -0800 (Tue, 15 Dec 2015) Log Message: ----------- Avoid miosvm depending on having . in one's PATH. Modified Paths: -------------- branches/Cog/build.macos32x86/squeak.cog.spur/miosvm branches/Cog/build.macos64x64/squeak.cog.spur/miosvm Modified: branches/Cog/build.macos32x86/squeak.cog.spur/miosvm =================================================================== --- branches/Cog/build.macos32x86/squeak.cog.spur/miosvm 2015-12-15 21:21:00 UTC (rev 3534) +++ branches/Cog/build.macos32x86/squeak.cog.spur/miosvm 2015-12-15 21:29:51 UTC (rev 3535) @@ -29,12 +29,12 @@ exit 1 fi trap 'exit 2' HUP INT PIPE TERM -test -n "$D" && (makeiosvm $C -d 2>&1 | tee $D;grep "BUILD .*ED" $D) -test -n "$A" && (makeiosvm $C -a 2>&1 | tee $A;grep "BUILD .*ED" $A) -test -n "$F" && (makeiosvm $C -s 2>&1 | tee $F;grep "BUILD .*ED" $F) -test -n "$DT" && (makeiosvm $C -md 2>&1 | tee $DT;grep "BUILD .*ED" $DT) -test -n "$AT" && (makeiosvm $C -ma 2>&1 | tee $AT;grep "BUILD .*ED" $AT) -test -n "$FT" && (makeiosvm $C -ms 2>&1 | tee $FT;grep "BUILD .*ED" $FT) +test -n "$D" && (./makeiosvm $C -d 2>&1 | tee $D;grep "BUILD .*ED" $D) +test -n "$A" && (./makeiosvm $C -a 2>&1 | tee $A;grep "BUILD .*ED" $A) +test -n "$F" && (./makeiosvm $C -s 2>&1 | tee $F;grep "BUILD .*ED" $F) +test -n "$DT" && (./makeiosvm $C -md 2>&1 | tee $DT;grep "BUILD .*ED" $DT) +test -n "$AT" && (./makeiosvm $C -ma 2>&1 | tee $AT;grep "BUILD .*ED" $AT) +test -n "$FT" && (./makeiosvm $C -ms 2>&1 | tee $FT;grep "BUILD .*ED" $FT) test -n "$D" && (echo $D;grep "BUILD .*ED" $D) test -n "$A" && (echo $A;grep "BUILD .*ED" $A) Modified: branches/Cog/build.macos64x64/squeak.cog.spur/miosvm =================================================================== --- branches/Cog/build.macos64x64/squeak.cog.spur/miosvm 2015-12-15 21:21:00 UTC (rev 3534) +++ branches/Cog/build.macos64x64/squeak.cog.spur/miosvm 2015-12-15 21:29:51 UTC (rev 3535) @@ -29,12 +29,12 @@ exit 1 fi trap 'exit 2' HUP INT PIPE TERM -test -n "$D" && (makeiosvm $C -d 2>&1 | tee $D;grep "BUILD .*ED" $D) -test -n "$A" && (makeiosvm $C -a 2>&1 | tee $A;grep "BUILD .*ED" $A) -test -n "$F" && (makeiosvm $C -s 2>&1 | tee $F;grep "BUILD .*ED" $F) -test -n "$DT" && (makeiosvm $C -md 2>&1 | tee $DT;grep "BUILD .*ED" $DT) -test -n "$AT" && (makeiosvm $C -ma 2>&1 | tee $AT;grep "BUILD .*ED" $AT) -test -n "$FT" && (makeiosvm $C -ms 2>&1 | tee $FT;grep "BUILD .*ED" $FT) +test -n "$D" && (./makeiosvm $C -d 2>&1 | tee $D;grep "BUILD .*ED" $D) +test -n "$A" && (./makeiosvm $C -a 2>&1 | tee $A;grep "BUILD .*ED" $A) +test -n "$F" && (./makeiosvm $C -s 2>&1 | tee $F;grep "BUILD .*ED" $F) +test -n "$DT" && (./makeiosvm $C -md 2>&1 | tee $DT;grep "BUILD .*ED" $DT) +test -n "$AT" && (./makeiosvm $C -ma 2>&1 | tee $AT;grep "BUILD .*ED" $AT) +test -n "$FT" && (./makeiosvm $C -ms 2>&1 | tee $FT;grep "BUILD .*ED" $FT) test -n "$D" && (echo $D;grep "BUILD .*ED" $D) test -n "$A" && (echo $A;grep "BUILD .*ED" $A)

1 0

[commit][3534] Update the mac HowToBuild to reflect current levels of chaos .
by commits＠squeakvm.org 15 Dec '15

15 Dec '15

Revision: 3534 Author: eliot Date: 2015-12-15 13:21:00 -0800 (Tue, 15 Dec 2015) Log Message: ----------- Update the mac HowToBuild to reflect current levels of chaos. Include the versionInfoPlist imnvocation in the mac build logs. Modified Paths: -------------- branches/Cog/build.macos32x86/HowToBuild branches/Cog/build.macos32x86/squeak.cog.spur/makeiosvm branches/Cog/build.macos64x64/HowToBuild branches/Cog/build.macos64x64/squeak.cog.spur/makeiosvm Modified: branches/Cog/build.macos32x86/HowToBuild =================================================================== --- branches/Cog/build.macos32x86/HowToBuild 2015-12-15 19:48:51 UTC (rev 3533) +++ branches/Cog/build.macos32x86/HowToBuild 2015-12-15 21:21:00 UTC (rev 3534) @@ -18,7 +18,7 @@ Another distinction is between Stack, Cog and Sista VMs. Stack VMs are those with context-to-stack mapping that optimise message sending by keeping method -activations on a stack instead of in contexts. These are pure interpreters but +actications on a stack instead of in contexts. These are pure interpreters but significantly faster than the standard context-based Interpreter VM. Cog VMs add a JIT to the mix, compiling methods used more than once to maxchine code on the fly. Sista VMs, as yet unrealised and in development, add support for @@ -67,10 +67,13 @@ Building out of the box ----------------------- -0. As of this writing (June 2014) this Mac build system builds only on 10.6.x -(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. +0. As of this writing (December 2015) only the squeak.cog.spur builds build +on 10.9 and later, using John McIntosh's Cocoa platform support files. The +rest of the builds build only on 10.6.x (and probably 10.5.x) using the old +Carbon libraries. We are transitioning as fast as possible to Cocoa. +Volunteers welcome. +Carbon Builds: 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 @@ -82,13 +85,31 @@ 3. cd to the VM configuration of your choice and execute ./mvm -A -This will build Fast.app, Debug.app and Assert.app applivations containing the +This will build Fast.app, Debug.app and Assert.app applications containing the three basic VM configurations. If the configuration includes the multi-threaded VM you can use mvm -AS to make the single-threaded VMs, mvm -AT to make the multi-threadeds in FastMT.app et al, and mvm -A to make them all. mvm -d will make the Debug.app VM, etc. mvm -? provides the gory details. +Cocoa Builds: +1. Install the tools (Xcode etc); the SqueakCogSpur32x86.xcodeproj is set-up to +build using clang 6.x or clang 7.x. +2. Either disable the building of the Bochs plugins (see each makeiosvm file, +disabling the lines beginning "# Build the BochsIA32Plugin") or build the +Bochs support libraries (see Building the Bochs Support Libraries below). + +3. cd to the VM configuration of your choice and execute + ./miosvm -A +This will build CocoaFast.app, CocoaDebug.app and CocoaAssert.app applications +containing the three basic VM configurations. If the configuration includes +the multi-threaded VM you can use miosvm -AS to make the single-threaded VMs, +miosvm -AT to make the multi-threadeds in FastMT.app et al, and miosvm -A to make +them all. miosvm -d will make the CocoaDebug.app VM, etc. miosvm -? provides the +gory details. + + + Each build directory contains three files plugins.int plugins.ext @@ -101,13 +122,15 @@ Building the Bochs Support Libraries ------------------------------------ If you want to get the Cog VM simulator working you'll need to build the -BochsIA32Plugin and to build that you'll need to first build bochs. First -check-out the processor simulator source tree containing Bochs: +BochsIA32Plugin and/or the BochsX64Plugin to build that you'll need to first +build bochs. First check-out the processor simulator source tree containing +Bochs: svn co http://www.squeakvm.org/svn/squeak/branches/Cog/processors -Then build libraries macbochs/{cpu/libcpu.a,disasm/libdisasm.a,fpu/libfpu.a} - $ cd ../processors/IA32/macbochs +Then build the libraries. cd to e.g. build.macos32x86/bochsx86, run + + $ cd build.macos32x86/bochsx86 $ ./conf.COG - $ ../bochs/makeem + $ ../../processors/IA32/bochs/makeem Using gcc with Xcode 6.x, Mac OS X > 10.6 @@ -146,4 +169,4 @@ Eliot Miranda -November 2015 +December 2015 Modified: branches/Cog/build.macos32x86/squeak.cog.spur/makeiosvm =================================================================== --- branches/Cog/build.macos32x86/squeak.cog.spur/makeiosvm 2015-12-15 19:48:51 UTC (rev 3533) +++ branches/Cog/build.macos32x86/squeak.cog.spur/makeiosvm 2015-12-15 21:21:00 UTC (rev 3534) @@ -66,6 +66,7 @@ else cp -Rp build/$BUILD_CONFIGURATION/$APP "$DEST" fi +echo ../../scripts/versionInfoPlist ../../platforms SqueakCogSpur32x86.plist "$DEST/Contents/Info.plist" ../../scripts/versionInfoPlist ../../platforms SqueakCogSpur32x86.plist "$DEST/Contents/Info.plist" # Build the Float plugin Modified: branches/Cog/build.macos64x64/HowToBuild =================================================================== --- branches/Cog/build.macos64x64/HowToBuild 2015-12-15 19:48:51 UTC (rev 3533) +++ branches/Cog/build.macos64x64/HowToBuild 2015-12-15 21:21:00 UTC (rev 3534) @@ -18,7 +18,7 @@ Another distinction is between Stack, Cog and Sista VMs. Stack VMs are those with context-to-stack mapping that optimise message sending by keeping method -activations on a stack instead of in contexts. These are pure interpreters but +actications on a stack instead of in contexts. These are pure interpreters but significantly faster than the standard context-based Interpreter VM. Cog VMs add a JIT to the mix, compiling methods used more than once to maxchine code on the fly. Sista VMs, as yet unrealised and in development, add support for @@ -66,33 +66,34 @@ Building out of the box ----------------------- -0. As of this writing (June 2014) this Mac build system builds only on 10.6.x -(and probably 10.5.x) using the old Carbon libraries. I plan to build on -Mavericks/Yosemite using John McIntosh's Cocoa platform support files soon. +0. As of this writing (December 2015) only the squeak.cog.spur builds build +on 10.9 and later, using John McIntosh's Cocoa platform support files. The +rest of the builds don't work yet. We are transitioning as fast as possible +to Cocoa. Volunteers welcome. -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. +1. Install the tools (Xcode etc); the SqueakCogSpur32x86.xcodeproj is set-up to +build using clang 6.x or clang 7.x. -2. Either disable the building of the Bochs plugin (see each makevm file, +2. Either disable the building of the Bochs plugins (see each makeiosvm file, disabling the lines beginning "# Build the BochsIA32Plugin") or build the Bochs support libraries (see Building the Bochs Support Libraries below). 3. cd to the VM configuration of your choice and execute - ./mvm -A -This will build Fast.app, Debug.app and Assert.app applivations containing the -three basic VM configurations. If the configuration includes the multi-threaded -VM you can use mvm -AS to make the single-threaded VMs, mvm -AT to make the -multi-threadeds in FastMT.app et al, and mvm -A to make them all. mvm -d will -make the Debug.app VM, etc. mvm -? provides the gory details. + ./miosvm -A +This will build CocoaFast.app, CocoaDebug.app and CocoaAssert.app applications +containing the three basic VM configurations. If the configuration includes +the multi-threaded VM you can use miosvm -AS to make the single-threaded VMs, +miosvm -AT to make the multi-threadeds in FastMT.app et al, and miosvm -A to make +them all. miosvm -d will make the CocoaDebug.app VM, etc. miosvm -? provides the +gory details. + Each build directory contains three files 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. @@ -100,24 +101,16 @@ Building the Bochs Support Libraries ------------------------------------ If you want to get the Cog VM simulator working you'll need to build the -BochsIA32Plugin and to build that you'll need to first build bochs. First -check-out the processor simulator source tree containing Bochs: +BochsIA32Plugin and/or the BochsX64Plugin to build that you'll need to first +build bochs. First check-out the processor simulator source tree containing +Bochs: svn co http://www.squeakvm.org/svn/squeak/branches/Cog/processors -Then build libraries macbochs/{cpu/libcpu.a,disasm/libdisasm.a,fpu/libfpu.a} - $ cd ../processors/IA32/macbochs +Then build the libraries. cd to e.g. build.macos32x86/bochsx86, run + + $ cd build.macos32x86/bochsx86 $ ./conf.COG - $ ../bochs/makeem + $ ../../processors/IA32/bochs/makeem -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: --ftree-pre --fpartial-inlining --fcaller-saves - -They're turned off in the xcode files provided. - - Eliot Miranda -December 2014 +December 2015 Modified: branches/Cog/build.macos64x64/squeak.cog.spur/makeiosvm =================================================================== --- branches/Cog/build.macos64x64/squeak.cog.spur/makeiosvm 2015-12-15 19:48:51 UTC (rev 3533) +++ branches/Cog/build.macos64x64/squeak.cog.spur/makeiosvm 2015-12-15 21:21:00 UTC (rev 3534) @@ -66,6 +66,7 @@ else cp -Rp build/$BUILD_CONFIGURATION/$APP "$DEST" fi +echo ../../scripts/versionInfoPlist ../../platforms SqueakCogSpur32x86.plist "$DEST/Contents/Info.plist" ../../scripts/versionInfoPlist ../../platforms SqueakCogSpur32x86.plist "$DEST/Contents/Info.plist" # Build the Float plugin

1 0

[commit][3533] CogVM source as per VMMaker.oscog-eem.1597
by commits＠squeakvm.org 15 Dec '15

15 Dec '15

Revision: 3533 Author: eliot Date: 2015-12-15 11:48:51 -0800 (Tue, 15 Dec 2015) Log Message: ----------- CogVM source as per VMMaker.oscog-eem.1597 Cogit: Fix regression in x86's register save/restore. Eliminate some warnings in cogitX64.c. Use the right conversions for computing 32-bit offsets in jumps and calls. Nuke genJump[Not]SmallInteger:scratch: in favour of genJump[Not]SmallInteger:scratchReg: Plugins: Fix the Alien plugins for 64-bits in the simulator which alas changes the C code to no effect. Modified Paths: -------------- branches/Cog/nsspursrc/plugins/IA32ABI/IA32ABI.c branches/Cog/nsspursrc/vm/cogit.h 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/lastCheckin branches/Cog/spur64src/vm/cogit.h branches/Cog/spur64src/vm/cogitX64.c branches/Cog/spur64src/vm/cointerp.c branches/Cog/spur64src/vm/cointerp.h branches/Cog/spur64src/vm/gcc3x-cointerp.c branches/Cog/spursistasrc/vm/cogit.h 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/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/IA32ABI/IA32ABI.c branches/Cog/src/vm/cogit.h 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/IA32ABI/IA32ABI.c =================================================================== --- branches/Cog/nsspursrc/plugins/IA32ABI/IA32ABI.c 2015-12-14 19:30:06 UTC (rev 3532) +++ branches/Cog/nsspursrc/plugins/IA32ABI/IA32ABI.c 2015-12-15 19:48:51 UTC (rev 3533) @@ -1,9 +1,9 @@ /* Automatically generated by - VMPluginCodeGenerator VMMaker.oscog-rmacnak.1532 uuid: 20303656-4854-4e5b-8bcd-eeff8cf5d262 + VMPluginCodeGenerator * VMMaker.oscog-eem.1596 uuid: b5172901-ebc3-4132-b421-446d4a1d080f from - NewsqueakIA32ABIPlugin VMMaker.oscog-rmacnak.1532 uuid: 20303656-4854-4e5b-8bcd-eeff8cf5d262 + NewsqueakIA32ABIPlugin * VMMaker.oscog-eem.1596 uuid: b5172901-ebc3-4132-b421-446d4a1d080f */ -static char __buildInfo[] = "NewsqueakIA32ABIPlugin VMMaker.oscog-rmacnak.1532 uuid: 20303656-4854-4e5b-8bcd-eeff8cf5d262 " __DATE__ ; +static char __buildInfo[] = "NewsqueakIA32ABIPlugin * VMMaker.oscog-eem.1596 uuid: b5172901-ebc3-4132-b421-446d4a1d080f " __DATE__ ; @@ -227,9 +227,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "IA32ABI VMMaker.oscog-rmacnak.1532 (i)" + "IA32ABI VMMaker.oscog-eem.1596 (i)" #else - "IA32ABI VMMaker.oscog-rmacnak.1532 (e)" + "IA32ABI VMMaker.oscog-eem.1596 (e)" #endif ; @@ -1507,7 +1507,13 @@ sqInt valueOop; rcvr = stackValue(0); - value = ((sqInt) (longAt(rcvr + BaseHeaderSize))); + value = +# if BytesPerOop == 8 + ((sqLong) (longAt(rcvr + BaseHeaderSize))) +# else /* BytesPerOop == 8 */ + ((int) (longAt(rcvr + BaseHeaderSize))) +# endif /* BytesPerOop == 8 */ + ; valueOop = (BytesPerWord == 8 ? signed64BitIntegerFor(value) : signed32BitIntegerFor(value)); @@ -1535,10 +1541,15 @@ if (failed()) { return primitiveFailFor(PrimErrBadArgument); } - if (isOopImmutable(rcvr)) { - return primitiveFailFor(PrimErrNoModification); - } + +# if BytesPerOop == 8 longAtput(rcvr + BaseHeaderSize, ((usqInt) value)); + +# else /* BytesPerOop == 8 */ + longAtput(rcvr + BaseHeaderSize, ((usqInt) value)); + +# endif /* BytesPerOop == 8 */ + return methodReturnValue(valueOop); } Modified: branches/Cog/nsspursrc/vm/cogit.h =================================================================== --- branches/Cog/nsspursrc/vm/cogit.h 2015-12-14 19:30:06 UTC (rev 3532) +++ branches/Cog/nsspursrc/vm/cogit.h 2015-12-15 19:48:51 UTC (rev 3533) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.1594 uuid: 79da8b81-d1f3-469a-869c-16c79d12649a + CCodeGenerator VMMaker.oscog-eem.1597 uuid: d40647ee-f0e2-471a-8007-2d2ca3483790 */ Modified: branches/Cog/nsspursrc/vm/cogitIA32.c =================================================================== --- branches/Cog/nsspursrc/vm/cogitIA32.c 2015-12-14 19:30:06 UTC (rev 3532) +++ branches/Cog/nsspursrc/vm/cogitIA32.c 2015-12-15 19:48:51 UTC (rev 3533) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.1594 uuid: 79da8b81-d1f3-469a-869c-16c79d12649a + CCodeGenerator VMMaker.oscog-eem.1597 uuid: d40647ee-f0e2-471a-8007-2d2ca3483790 from - StackToRegisterMappingCogit VMMaker.oscog-eem.1594 uuid: 79da8b81-d1f3-469a-869c-16c79d12649a + StackToRegisterMappingCogit VMMaker.oscog-eem.1597 uuid: d40647ee-f0e2-471a-8007-2d2ca3483790 */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1594 uuid: 79da8b81-d1f3-469a-869c-16c79d12649a " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1597 uuid: d40647ee-f0e2-471a-8007-2d2ca3483790 " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -929,7 +929,7 @@ static sqInt genLongUnconditionalForwardJump(void); static sqInt NoDbgRegParms genLookupForPerformNumArgs(sqInt numArgs); static AbstractInstruction * NoDbgRegParms genMoveConstantR(sqInt constant, sqInt reg); -static AbstractInstruction * NoDbgRegParms genMoveTrueR(sqInt reg); +static sqInt NoDbgRegParms genMoveTrueR(sqInt reg); static sqInt NoDbgRegParms genMustBeBooleanTrampolineForcalled(sqInt boolean, char *trampolineName); static sqInt genPrimitiveEqual(void); static sqInt genPrimitiveFloatAdd(void); @@ -2372,7 +2372,7 @@ sqInt callDistance; callDistance = literalBeforeFollowingAddress(self_in_callTargetFromReturnAddress, callSiteReturnAddress); - return callSiteReturnAddress + (((sqInt) callDistance)); + return callSiteReturnAddress + (((int) callDistance)); } /* CogIA32Compiler>>#cmpC32RTempByteSize */ @@ -3296,7 +3296,7 @@ case CallFull: /* begin concretizeCall */ assert((((self_in_dispatchConcretize->operands))[0]) != 0); - offset2 = (((sqInt) (((self_in_dispatchConcretize->operands))[0]))) - (((sqInt) (((self_in_dispatchConcretize->address)) + 5))); + offset2 = (((int) (((self_in_dispatchConcretize->operands))[0]))) - (((int) (((self_in_dispatchConcretize->address)) + 5))); ((self_in_dispatchConcretize->machineCode))[0] = 232; ((self_in_dispatchConcretize->machineCode))[1] = (offset2 & 0xFF); ((self_in_dispatchConcretize->machineCode))[2] = ((((usqInt) offset2) >> 8) & 0xFF); @@ -3322,7 +3322,7 @@ jumpTarget = ((AbstractInstruction *) ((jumpTarget->address))); } assert(jumpTarget != 0); - offset12 = (((sqInt) jumpTarget)) - (((sqInt) (((self_in_dispatchConcretize->address)) + 5))); + offset12 = (((int) jumpTarget)) - (((int) (((self_in_dispatchConcretize->address)) + 5))); ((self_in_dispatchConcretize->machineCode))[0] = 233; ((self_in_dispatchConcretize->machineCode))[1] = (offset12 & 0xFF); ((self_in_dispatchConcretize->machineCode))[2] = ((((usqInt) offset12) >> 8) & 0xFF); @@ -3345,7 +3345,7 @@ } assert(jumpTarget12 != 0); jumpTarget3 = jumpTarget12; - offset14 = (((sqInt) jumpTarget3)) - (((sqInt) (((self_in_dispatchConcretize->address)) + 2))); + offset14 = (((int) jumpTarget3)) - (((int) (((self_in_dispatchConcretize->address)) + 2))); if ((((self_in_dispatchConcretize->machineCodeSize)) == 0 ? isQuick(self_in_dispatchConcretize, offset14) : ((self_in_dispatchConcretize->machineCodeSize)) == 2)) { @@ -3365,14 +3365,14 @@ } assert(jumpTarget11 != 0); jumpTarget2 = jumpTarget11; - offset15 = (((sqInt) jumpTarget2)) - (((sqInt) (((self_in_dispatchConcretize->address)) + 6))); + offset15 = (((int) jumpTarget2)) - (((int) (((self_in_dispatchConcretize->address)) + 6))); ((self_in_dispatchConcretize->machineCode))[0] = 15; ((self_in_dispatchConcretize->machineCode))[1] = (128 + 4); ((self_in_dispatchConcretize->machineCode))[2] = (offset15 & 0xFF); ((self_in_dispatchConcretize->machineCode))[3] = ((((usqInt) offset15) >> 8) & 0xFF); ((self_in_dispatchConcretize->machineCode))[4] = ((((usqInt) offset15) >> 16) & 0xFF); ((self_in_dispatchConcretize->machineCode))[5] = ((((usqInt) offset15) >> 24) & 0xFF); - ((usqInt) (((self_in_dispatchConcretize->machineCodeSize) = 6))); + ((self_in_dispatchConcretize->machineCodeSize) = 6); return; case JumpLongNonZero: @@ -3389,7 +3389,7 @@ } assert(jumpTarget13 != 0); jumpTarget4 = jumpTarget13; - offset16 = (((sqInt) jumpTarget4)) - (((sqInt) (((self_in_dispatchConcretize->address)) + 2))); + offset16 = (((int) jumpTarget4)) - (((int) (((self_in_dispatchConcretize->address)) + 2))); if ((((self_in_dispatchConcretize->machineCodeSize)) == 0 ? isQuick(self_in_dispatchConcretize, offset16) : ((self_in_dispatchConcretize->machineCodeSize)) == 2)) { @@ -3409,14 +3409,14 @@ } assert(jumpTarget111 != 0); jumpTarget21 = jumpTarget111; - offset17 = (((sqInt) jumpTarget21)) - (((sqInt) (((self_in_dispatchConcretize->address)) + 6))); + offset17 = (((int) jumpTarget21)) - (((int) (((self_in_dispatchConcretize->address)) + 6))); ((self_in_dispatchConcretize->machineCode))[0] = 15; ((self_in_dispatchConcretize->machineCode))[1] = (128 + 5); ((self_in_dispatchConcretize->machineCode))[2] = (offset17 & 0xFF); ((self_in_dispatchConcretize->machineCode))[3] = ((((usqInt) offset17) >> 8) & 0xFF); ((self_in_dispatchConcretize->machineCode))[4] = ((((usqInt) offset17) >> 16) & 0xFF); ((self_in_dispatchConcretize->machineCode))[5] = ((((usqInt) offset17) >> 24) & 0xFF); - ((usqInt) (((self_in_dispatchConcretize->machineCodeSize) = 6))); + ((self_in_dispatchConcretize->machineCodeSize) = 6); return; case Jump: @@ -3428,7 +3428,7 @@ jumpTarget1 = ((AbstractInstruction *) ((jumpTarget1->address))); } assert(jumpTarget1 != 0); - offset13 = (((sqInt) jumpTarget1)) - (((sqInt) (((self_in_dispatchConcretize->address)) + 2))); + offset13 = (((int) jumpTarget1)) - (((int) (((self_in_dispatchConcretize->address)) + 2))); if ((((self_in_dispatchConcretize->machineCodeSize)) == 0 ? isQuick(self_in_dispatchConcretize, offset13) : ((self_in_dispatchConcretize->machineCodeSize)) == 2)) { @@ -3437,7 +3437,7 @@ ((self_in_dispatchConcretize->machineCodeSize) = 2); return; } - offset13 = (((sqInt) jumpTarget1)) - (((sqInt) (((self_in_dispatchConcretize->address)) + 5))); + offset13 = (((int) jumpTarget1)) - (((int) (((self_in_dispatchConcretize->address)) + 5))); ((self_in_dispatchConcretize->machineCode))[0] = 233; ((self_in_dispatchConcretize->machineCode))[1] = (offset13 & 0xFF); ((self_in_dispatchConcretize->machineCode))[2] = ((((usqInt) offset13) >> 8) & 0xFF); @@ -3458,7 +3458,7 @@ } assert(jumpTarget14 != 0); jumpTarget5 = jumpTarget14; - offset18 = (((sqInt) jumpTarget5)) - (((sqInt) (((self_in_dispatchConcretize->address)) + 2))); + offset18 = (((int) jumpTarget5)) - (((int) (((self_in_dispatchConcretize->address)) + 2))); if ((((self_in_dispatchConcretize->machineCodeSize)) == 0 ? isQuick(self_in_dispatchConcretize, offset18) : ((self_in_dispatchConcretize->machineCodeSize)) == 2)) { @@ -3478,14 +3478,14 @@ } assert(jumpTarget112 != 0); jumpTarget22 = jumpTarget112; - offset19 = (((sqInt) jumpTarget22)) - (((sqInt) (((self_in_dispatchConcretize->address)) + 6))); + offset19 = (((int) jumpTarget22)) - (((int) (((self_in_dispatchConcretize->address)) + 6))); ((self_in_dispatchConcretize->machineCode))[0] = 15; ((self_in_dispatchConcretize->machineCode))[1] = (128 + 8); ((self_in_dispatchConcretize->machineCode))[2] = (offset19 & 0xFF); ((self_in_dispatchConcretize->machineCode))[3] = ((((usqInt) offset19) >> 8) & 0xFF); ((self_in_dispatchConcretize->machineCode))[4] = ((((usqInt) offset19) >> 16) & 0xFF); ((self_in_dispatchConcretize->machineCode))[5] = ((((usqInt) offset19) >> 24) & 0xFF); - ((usqInt) (((self_in_dispatchConcretize->machineCodeSize) = 6))); + ((self_in_dispatchConcretize->machineCodeSize) = 6); return; case JumpNonNegative: @@ -3500,7 +3500,7 @@ } assert(jumpTarget15 != 0); jumpTarget6 = jumpTarget15; - offset20 = (((sqInt) jumpTarget6)) - (((sqInt) (((self_in_dispatchConcretize->address)) + 2))); + offset20 = (((int) jumpTarget6)) - (((int) (((self_in_dispatchConcretize->address)) + 2))); if ((((self_in_dispatchConcretize->machineCodeSize)) == 0 ? isQuick(self_in_dispatchConcretize, offset20) : ((self_in_dispatchConcretize->machineCodeSize)) == 2)) { @@ -3520,14 +3520,14 @@ } assert(jumpTarget113 != 0); jumpTarget23 = jumpTarget113; - offset110 = (((sqInt) jumpTarget23)) - (((sqInt) (((self_in_dispatchConcretize->address)) + 6))); + offset110 = (((int) jumpTarget23)) - (((int) (((self_in_dispatchConcretize->address)) + 6))); ((self_in_dispatchConcretize->machineCode))[0] = 15; ((self_in_dispatchConcretize->machineCode))[1] = (128 + 9); ((self_in_dispatchConcretize->machineCode))[2] = (offset110 & 0xFF); ((self_in_dispatchConcretize->machineCode))[3] = ((((usqInt) offset110) >> 8) & 0xFF); ((self_in_dispatchConcretize->machineCode))[4] = ((((usqInt) offset110) >> 16) & 0xFF); ((self_in_dispatchConcretize->machineCode))[5] = ((((usqInt) offset110) >> 24) & 0xFF); - ((usqInt) (((self_in_dispatchConcretize->machineCodeSize) = 6))); + ((self_in_dispatchConcretize->machineCodeSize) = 6); return; case JumpOverflow: @@ -3542,7 +3542,7 @@ } assert(jumpTarget16 != 0); jumpTarget7 = jumpTarget16; - offset21 = (((sqInt) jumpTarget7)) - (((sqInt) (((self_in_dispatchConcretize->address)) + 2))); + offset21 = (((int) jumpTarget7)) - (((int) (((self_in_dispatchConcretize->address)) + 2))); if ((((self_in_dispatchConcretize->machineCodeSize)) == 0 ? isQuick(self_in_dispatchConcretize, offset21) : ((self_in_dispatchConcretize->machineCodeSize)) == 2)) { @@ -3562,14 +3562,14 @@ } assert(jumpTarget114 != 0); jumpTarget24 = jumpTarget114; - offset111 = (((sqInt) jumpTarget24)) - (((sqInt) (((self_in_dispatchConcretize->address)) + 6))); + offset111 = (((int) jumpTarget24)) - (((int) (((self_in_dispatchConcretize->address)) + 6))); ((self_in_dispatchConcretize->machineCode))[0] = 15; ((self_in_dispatchConcretize->machineCode))[1] = (128); ((self_in_dispatchConcretize->machineCode))[2] = (offset111 & 0xFF); ((self_in_dispatchConcretize->machineCode))[3] = ((((usqInt) offset111) >> 8) & 0xFF); ((self_in_dispatchConcretize->machineCode))[4] = ((((usqInt) offset111) >> 16) & 0xFF); ((self_in_dispatchConcretize->machineCode))[5] = ((((usqInt) offset111) >> 24) & 0xFF); - ((usqInt) (((self_in_dispatchConcretize->machineCodeSize) = 6))); + ((self_in_dispatchConcretize->machineCodeSize) = 6); return; case JumpNoOverflow: @@ -3584,7 +3584,7 @@ } assert(jumpTarget17 != 0); jumpTarget8 = jumpTarget17; - offset22 = (((sqInt) jumpTarget8)) - (((sqInt) (((self_in_dispatchConcretize->address)) + 2))); + offset22 = (((int) jumpTarget8)) - (((int) (((self_in_dispatchConcretize->address)) + 2))); if ((((self_in_dispatchConcretize->machineCodeSize)) == 0 ? isQuick(self_in_dispatchConcretize, offset22) : ((self_in_dispatchConcretize->machineCodeSize)) == 2)) { @@ -3604,14 +3604,14 @@ } assert(jumpTarget115 != 0); jumpTarget25 = jumpTarget115; - offset112 = (((sqInt) jumpTarget25)) - (((sqInt) (((self_in_dispatchConcretize->address)) + 6))); + offset112 = (((int) jumpTarget25)) - (((int) (((self_in_dispatchConcretize->address)) + 6))); ((self_in_dispatchConcretize->machineCode))[0] = 15; ((self_in_dispatchConcretize->machineCode))[1] = (128 + 1); ((self_in_dispatchConcretize->machineCode))[2] = (offset112 & 0xFF); ((self_in_dispatchConcretize->machineCode))[3] = ((((usqInt) offset112) >> 8) & 0xFF); ((self_in_dispatchConcretize->machineCode))[4] = ((((usqInt) offset112) >> 16) & 0xFF); ((self_in_dispatchConcretize->machineCode))[5] = ((((usqInt) offset112) >> 24) & 0xFF); - ((usqInt) (((self_in_dispatchConcretize->machineCodeSize) = 6))); + ((self_in_dispatchConcretize->machineCodeSize) = 6); return; case JumpCarry: @@ -3628,7 +3628,7 @@ } assert(jumpTarget18 != 0); jumpTarget9 = jumpTarget18; - offset23 = (((sqInt) jumpTarget9)) - (((sqInt) (((self_in_dispatchConcretize->address)) + 2))); + offset23 = (((int) jumpTarget9)) - (((int) (((self_in_dispatchConcretize->address)) + 2))); if ((((self_in_dispatchConcretize->machineCodeSize)) == 0 ? isQuick(self_in_dispatchConcretize, offset23) : ((self_in_dispatchConcretize->machineCodeSize)) == 2)) { @@ -3648,14 +3648,14 @@ } assert(jumpTarget116 != 0); jumpTarget26 = jumpTarget116; - offset113 = (((sqInt) jumpTarget26)) - (((sqInt) (((self_in_dispatchConcretize->address)) + 6))); + offset113 = (((int) jumpTarget26)) - (((int) (((self_in_dispatchConcretize->address)) + 6))); ((self_in_dispatchConcretize->machineCode))[0] = 15; ((self_in_dispatchConcretize->machineCode))[1] = (128 + 2); ((self_in_dispatchConcretize->machineCode))[2] = (offset113 & 0xFF); ((self_in_dispatchConcretize->machineCode))[3] = ((((usqInt) offset113) >> 8) & 0xFF); ((self_in_dispatchConcretize->machineCode))[4] = ((((usqInt) offset113) >> 16) & 0xFF); ((self_in_dispatchConcretize->machineCode))[5] = ((((usqInt) offset113) >> 24) & 0xFF); - ((usqInt) (((self_in_dispatchConcretize->machineCodeSize) = 6))); + ((self_in_dispatchConcretize->machineCodeSize) = 6); return; case JumpNoCarry: @@ -3672,7 +3672,7 @@ } assert(jumpTarget19 != 0); jumpTarget10 = jumpTarget19; - offset24 = (((sqInt) jumpTarget10)) - (((sqInt) (((self_in_dispatchConcretize->address)) + 2))); + offset24 = (((int) jumpTarget10)) - (((int) (((self_in_dispatchConcretize->address)) + 2))); if ((((self_in_dispatchConcretize->machineCodeSize)) == 0 ? isQuick(self_in_dispatchConcretize, offset24) : ((self_in_dispatchConcretize->machineCodeSize)) == 2)) { @@ -3692,14 +3692,14 @@ } assert(jumpTarget117 != 0); jumpTarget27 = jumpTarget117; - offset114 = (((sqInt) jumpTarget27)) - (((sqInt) (((self_in_dispatchConcretize->address)) + 6))); + offset114 = (((int) jumpTarget27)) - (((int) (((self_in_dispatchConcretize->address)) + 6))); ((self_in_dispatchConcretize->machineCode))[0] = 15; ((self_in_dispatchConcretize->machineCode))[1] = (128 + 3); ((self_in_dispatchConcretize->machineCode))[2] = (offset114 & 0xFF); ((self_in_dispatchConcretize->machineCode))[3] = ((((usqInt) offset114) >> 8) & 0xFF); ((self_in_dispatchConcretize->machineCode))[4] = ((((usqInt) offset114) >> 16) & 0xFF); ((self_in_dispatchConcretize->machineCode))[5] = ((((usqInt) offset114) >> 24) & 0xFF); - ((usqInt) (((self_in_dispatchConcretize->machineCodeSize) = 6))); + ((self_in_dispatchConcretize->machineCodeSize) = 6); return; case JumpLess: @@ -3714,7 +3714,7 @@ } assert(jumpTarget110 != 0); jumpTarget20 = jumpTarget110; - offset25 = (((sqInt) jumpTarget20)) - (((sqInt) (((self_in_dispatchConcretize->address)) + 2))); + offset25 = (((int) jumpTarget20)) - (((int) (((self_in_dispatchConcretize->address)) + 2))); if ((((self_in_dispatchConcretize->machineCodeSize)) == 0 ? isQuick(self_in_dispatchConcretize, offset25) : ((self_in_dispatchConcretize->machineCodeSize)) == 2)) { @@ -3734,14 +3734,14 @@ } assert(jumpTarget118 != 0); jumpTarget28 = jumpTarget118; - offset115 = (((sqInt) jumpTarget28)) - (((sqInt) (((self_in_dispatchConcretize->address)) + 6))); + offset115 = (((int) jumpTarget28)) - (((int) (((self_in_dispatchConcretize->address)) + 6))); ((self_in_dispatchConcretize->machineCode))[0] = 15; ((self_in_dispatchConcretize->machineCode))[1] = (128 + 12); ((self_in_dispatchConcretize->machineCode))[2] = (offset115 & 0xFF); ((self_in_dispatchConcretize->machineCode))[3] = ((((usqInt) offset115) >> 8) & 0xFF); ((self_in_dispatchConcretize->machineCode))[4] = ((((usqInt) offset115) >> 16) & 0xFF); ((self_in_dispatchConcretize->machineCode))[5] = ((((usqInt) offset115) >> 24) & 0xFF); - ((usqInt) (((self_in_dispatchConcretize->machineCodeSize) = 6))); + ((self_in_dispatchConcretize->machineCodeSize) = 6); return; case JumpGreaterOrEqual: @@ -3756,7 +3756,7 @@ } assert(jumpTarget119 != 0); jumpTarget29 = jumpTarget119; - offset26 = (((sqInt) jumpTarget29)) - (((sqInt) (((self_in_dispatchConcretize->address)) + 2))); + offset26 = (((int) jumpTarget29)) - (((int) (((self_in_dispatchConcretize->address)) + 2))); if ((((self_in_dispatchConcretize->machineCodeSize)) == 0 ? isQuick(self_in_dispatchConcretize, offset26) : ((self_in_dispatchConcretize->machineCodeSize)) == 2)) { @@ -3776,14 +3776,14 @@ } assert(jumpTarget1110 != 0); jumpTarget210 = jumpTarget1110; - offset116 = (((sqInt) jumpTarget210)) - (((sqInt) (((self_in_dispatchConcretize->address)) + 6))); + offset116 = (((int) jumpTarget210)) - (((int) (((self_in_dispatchConcretize->address)) + 6))); ((self_in_dispatchConcretize->machineCode))[0] = 15; ((self_in_dispatchConcretize->machineCode))[1] = (128 + 13); ((self_in_dispatchConcretize->machineCode))[2] = (offset116 & 0xFF); ((self_in_dispatchConcretize->machineCode))[3] = ((((usqInt) offset116) >> 8) & 0xFF); ((self_in_dispatchConcretize->machineCode))[4] = ((((usqInt) offset116) >> 16) & 0xFF); ((self_in_dispatchConcretize->machineCode))[5] = ((((usqInt) offset116) >> 24) & 0xFF); - ((usqInt) (((self_in_dispatchConcretize->machineCodeSize) = 6))); + ((self_in_dispatchConcretize->machineCodeSize) = 6); return; case JumpGreater: @@ -3798,7 +3798,7 @@ } assert(jumpTarget120 != 0); jumpTarget30 = jumpTarget120; - offset27 = (((sqInt) jumpTarget30)) - (((sqInt) (((self_in_dispatchConcretize->address)) + 2))); + offset27 = (((int) jumpTarget30)) - (((int) (((self_in_dispatchConcretize->address)) + 2))); if ((((self_in_dispatchConcretize->machineCodeSize)) == 0 ? isQuick(self_in_dispatchConcretize, offset27) : ((self_in_dispatchConcretize->machineCodeSize)) == 2)) { @@ -3818,14 +3818,14 @@ } assert(jumpTarget1111 != 0); jumpTarget211 = jumpTarget1111; - offset117 = (((sqInt) jumpTarget211)) - (((sqInt) (((self_in_dispatchConcretize->address)) + 6))); + offset117 = (((int) jumpTarget211)) - (((int) (((self_in_dispatchConcretize->address)) + 6))); ((self_in_dispatchConcretize->machineCode))[0] = 15; ((self_in_dispatchConcretize->machineCode))[1] = (128 + 15); ((self_in_dispatchConcretize->machineCode))[2] = (offset117 & 0xFF); ((self_in_dispatchConcretize->machineCode))[3] = ((((usqInt) offset117) >> 8) & 0xFF); ((self_in_dispatchConcretize->machineCode))[4] = ((((usqInt) offset117) >> 16) & 0xFF); ((self_in_dispatchConcretize->machineCode))[5] = ((((usqInt) offset117) >> 24) & 0xFF); - ((usqInt) (((self_in_dispatchConcretize->machineCodeSize) = 6))); + ((self_in_dispatchConcretize->machineCodeSize) = 6); return; case JumpLessOrEqual: @@ -3840,7 +3840,7 @@ } assert(jumpTarget121 != 0); jumpTarget31 = jumpTarget121; - offset28 = (((sqInt) jumpTarget31)) - (((sqInt) (((self_in_dispatchConcretize->address)) + 2))); + offset28 = (((int) jumpTarget31)) - (((int) (((self_in_dispatchConcretize->address)) + 2))); if ((((self_in_dispatchConcretize->machineCodeSize)) == 0 ? isQuick(self_in_dispatchConcretize, offset28) : ((self_in_dispatchConcretize->machineCodeSize)) == 2)) { @@ -3860,14 +3860,14 @@ } assert(jumpTarget1112 != 0); jumpTarget212 = jumpTarget1112; - offset118 = (((sqInt) jumpTarget212)) - (((sqInt) (((self_in_dispatchConcretize->address)) + 6))); + offset118 = (((int) jumpTarget212)) - (((int) (((self_in_dispatchConcretize->address)) + 6))); ((self_in_dispatchConcretize->machineCode))[0] = 15; ((self_in_dispatchConcretize->machineCode))[1] = (128 + 14); ((self_in_dispatchConcretize->machineCode))[2] = (offset118 & 0xFF); ((self_in_dispatchConcretize->machineCode))[3] = ((((usqInt) offset118) >> 8) & 0xFF); ((self_in_dispatchConcretize->machineCode))[4] = ((((usqInt) offset118) >> 16) & 0xFF); ((self_in_dispatchConcretize->machineCode))[5] = ((((usqInt) offset118) >> 24) & 0xFF); - ((usqInt) (((self_in_dispatchConcretize->machineCodeSize) = 6))); + ((self_in_dispatchConcretize->machineCodeSize) = 6); return; case JumpAbove: @@ -3883,7 +3883,7 @@ } assert(jumpTarget122 != 0); jumpTarget32 = jumpTarget122; - offset29 = (((sqInt) jumpTarget32)) - (((sqInt) (((self_in_dispatchConcretize->address)) + 2))); + offset29 = (((int) jumpTarget32)) - (((int) (((self_in_dispatchConcretize->address)) + 2))); if ((((self_in_dispatchConcretize->machineCodeSize)) == 0 ? isQuick(self_in_dispatchConcretize, offset29) : ((self_in_dispatchConcretize->machineCodeSize)) == 2)) { @@ -3903,14 +3903,14 @@ } assert(jumpTarget1113 != 0); jumpTarget213 = jumpTarget1113; - offset119 = (((sqInt) jumpTarget213)) - (((sqInt) (((self_in_dispatchConcretize->address)) + 6))); + offset119 = (((int) jumpTarget213)) - (((int) (((self_in_dispatchConcretize->address)) + 6))); ((self_in_dispatchConcretize->machineCode))[0] = 15; ((self_in_dispatchConcretize->machineCode))[1] = (128 + 7); ((self_in_dispatchConcretize->machineCode))[2] = (offset119 & 0xFF); ((self_in_dispatchConcretize->machineCode))[3] = ((((usqInt) offset119) >> 8) & 0xFF); ((self_in_dispatchConcretize->machineCode))[4] = ((((usqInt) offset119) >> 16) & 0xFF); ((self_in_dispatchConcretize->machineCode))[5] = ((((usqInt) offset119) >> 24) & 0xFF); - ((usqInt) (((self_in_dispatchConcretize->machineCodeSize) = 6))); + ((self_in_dispatchConcretize->machineCodeSize) = 6); return; case JumpBelowOrEqual: @@ -3926,7 +3926,7 @@ } assert(jumpTarget123 != 0); jumpTarget33 = jumpTarget123; - offset30 = (((sqInt) jumpTarget33)) - (((sqInt) (((self_in_dispatchConcretize->address)) + 2))); + offset30 = (((int) jumpTarget33)) - (((int) (((self_in_dispatchConcretize->address)) + 2))); if ((((self_in_dispatchConcretize->machineCodeSize)) == 0 ? isQuick(self_in_dispatchConcretize, offset30) : ((self_in_dispatchConcretize->machineCodeSize)) == 2)) { @@ -3946,14 +3946,14 @@ } assert(jumpTarget1114 != 0); jumpTarget214 = jumpTarget1114; - offset120 = (((sqInt) jumpTarget214)) - (((sqInt) (((self_in_dispatchConcretize->address)) + 6))); + offset120 = (((int) jumpTarget214)) - (((int) (((self_in_dispatchConcretize->address)) + 6))); ((self_in_dispatchConcretize->machineCode))[0] = 15; ((self_in_dispatchConcretize->machineCode))[1] = (128 + 6); ((self_in_dispatchConcretize->machineCode))[2] = (offset120 & 0xFF); ((self_in_dispatchConcretize->machineCode))[3] = ((((usqInt) offset120) >> 8) & 0xFF); ((self_in_dispatchConcretize->machineCode))[4] = ((((usqInt) offset120) >> 16) & 0xFF); ((self_in_dispatchConcretize->machineCode))[5] = ((((usqInt) offset120) >> 24) & 0xFF); - ((usqInt) (((self_in_dispatchConcretize->machineCodeSize) = 6))); + ((self_in_dispatchConcretize->machineCodeSize) = 6); return; case JumpFPOrdered: @@ -3968,7 +3968,7 @@ } assert(jumpTarget124 != 0); jumpTarget34 = jumpTarget124; - offset31 = (((sqInt) jumpTarget34)) - (((sqInt) (((self_in_dispatchConcretize->address)) + 2))); + offset31 = (((int) jumpTarget34)) - (((int) (((self_in_dispatchConcretize->address)) + 2))); if ((((self_in_dispatchConcretize->machineCodeSize)) == 0 ? isQuick(self_in_dispatchConcretize, offset31) : ((self_in_dispatchConcretize->machineCodeSize)) == 2)) { @@ -3988,14 +3988,14 @@ } assert(jumpTarget1115 != 0); jumpTarget215 = jumpTarget1115; - offset121 = (((sqInt) jumpTarget215)) - (((sqInt) (((self_in_dispatchConcretize->address)) + 6))); + offset121 = (((int) jumpTarget215)) - (((int) (((self_in_dispatchConcretize->address)) + 6))); ((self_in_dispatchConcretize->machineCode))[0] = 15; ((self_in_dispatchConcretize->machineCode))[1] = (128 + 11); ((self_in_dispatchConcretize->machineCode))[2] = (offset121 & 0xFF); ((self_in_dispatchConcretize->machineCode))[3] = ((((usqInt) offset121) >> 8) & 0xFF); ((self_in_dispatchConcretize->machineCode))[4] = ((((usqInt) offset121) >> 16) & 0xFF); ((self_in_dispatchConcretize->machineCode))[5] = ((((usqInt) offset121) >> 24) & 0xFF); - ((usqInt) (((self_in_dispatchConcretize->machineCodeSize) = 6))); + ((self_in_dispatchConcretize->machineCodeSize) = 6); return; case JumpFPUnordered: @@ -4010,7 +4010,7 @@ } assert(jumpTarget125 != 0); jumpTarget35 = jumpTarget125; - offset32 = (((sqInt) jumpTarget35)) - (((sqInt) (((self_in_dispatchConcretize->address)) + 2))); + offset32 = (((int) jumpTarget35)) - (((int) (((self_in_dispatchConcretize->address)) + 2))); if ((((self_in_dispatchConcretize->machineCodeSize)) == 0 ? isQuick(self_in_dispatchConcretize, offset32) : ((self_in_dispatchConcretize->machineCodeSize)) == 2)) { @@ -4030,14 +4030,14 @@ } assert(jumpTarget1116 != 0); jumpTarget216 = jumpTarget1116; - offset122 = (((sqInt) jumpTarget216)) - (((sqInt) (((self_in_dispatchConcretize->address)) + 6))); + offset122 = (((int) jumpTarget216)) - (((int) (((self_in_dispatchConcretize->address)) + 6))); ((self_in_dispatchConcretize->machineCode))[0] = 15; ((self_in_dispatchConcretize->machineCode))[1] = (128 + 10); ((self_in_dispatchConcretize->machineCode))[2] = (offset122 & 0xFF); ((self_in_dispatchConcretize->machineCode))[3] = ((((usqInt) offset122) >> 8) & 0xFF); ((self_in_dispatchConcretize->machineCode))[4] = ((((usqInt) offset122) >> 16) & 0xFF); ((self_in_dispatchConcretize->machineCode))[5] = ((((usqInt) offset122) >> 24) & 0xFF); - ((usqInt) (((self_in_dispatchConcretize->machineCodeSize) = 6))); + ((self_in_dispatchConcretize->machineCodeSize) = 6); return; case RetN: @@ -5754,18 +5754,14 @@ static sqInt NoDbgRegParms genRestoreRegs(AbstractInstruction * self_in_genRestoreRegs) { - /* begin PopR: */ - genoperand(PopR, EAX); - /* begin PopR: */ - genoperand(PopR, EBX); - /* begin PopR: */ - genoperand(PopR, ECX); - /* begin PopR: */ - genoperand(PopR, EDX); - /* begin PopR: */ - genoperand(PopR, ESI); - /* begin PopR: */ - genoperand(PopR, EDI); + sqInt reg; + + for (reg = EAX; reg <= EDI; reg += 1) { + if (!(((reg >= ESP) && (reg <= EBP)))) { + /* begin PopR: */ + genoperand(PopR, reg); + } + } return 0; } @@ -5803,10 +5799,12 @@ { sqInt reg; - assert(((EDI - EAX) + 1) == 6); + assert(((EDI - EAX) + 1) == 8); for (reg = EDI; reg >= EAX; reg += -1) { - /* begin PushR: */ - genoperand(PushR, reg); + if (!(((reg >= ESP) && (reg <= EBP)))) { + /* begin PushR: */ + genoperand(PushR, reg); + } } return 0; } @@ -5985,7 +5983,7 @@ static sqInt NoDbgRegParms isQuick(AbstractInstruction * self_in_isQuick, unsigned long operand) { - return (((((sqInt) operand)) >= -128) && ((((sqInt) operand)) <= 0x7F)); + return (((((int) operand)) >= -128) && ((((int) operand)) <= 0x7F)); } @@ -6297,7 +6295,7 @@ byteAtput(callSiteReturnAddress - 2, (((usqInt) callDistance) >> 16) & 0xFF); byteAtput(callSiteReturnAddress - 3, (((usqInt) callDistance) >> 8) & 0xFF); byteAtput(callSiteReturnAddress - 4, callDistance & 0xFF); - assert((((usqInt) (callTargetFromReturnAddress(self_in_rewriteCallAttarget, callSiteReturnAddress)))) == callTargetAddress); + assert((callTargetFromReturnAddress(self_in_rewriteCallAttarget, callSiteReturnAddress)) == callTargetAddress); return 5; } @@ -10037,14 +10035,14 @@ generateMapAtstart(sqInt addressOrNull, sqInt startAddress) { unsigned char annotation; - usqInt delta; + sqInt delta; sqInt i; AbstractInstruction *instruction; sqInt length; - usqInt location; - usqInt mapEntry; + sqInt location; + sqInt mapEntry; sqInt maxDelta; - usqInt mcpc; + sqInt mcpc; length = 0; location = startAddress; @@ -18665,7 +18663,6 @@ /* begin JumpNonZero: */ jumpCmp = genConditionalBranchoperand(JumpNonZero, ((sqInt)0)); } - /* begin genMoveTrueR: */ /* begin genMoveConstant:R: */ constant = trueObject(); if (shouldAnnotateObjectReference(constant)) { @@ -21295,7 +21292,7 @@ } /* SimpleStackBasedCogit>>#genMoveTrueR: */ -static AbstractInstruction * NoDbgRegParms +static sqInt NoDbgRegParms genMoveTrueR(sqInt reg) { AbstractInstruction *anInstruction; Modified: branches/Cog/nsspursrc/vm/cointerp.c =================================================================== --- branches/Cog/nsspursrc/vm/cointerp.c 2015-12-14 19:30:06 UTC (rev 3532) +++ branches/Cog/nsspursrc/vm/cointerp.c 2015-12-15 19:48:51 UTC (rev 3533) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1594 uuid: 79da8b81-d1f3-469a-869c-16c79d12649a + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1597 uuid: d40647ee-f0e2-471a-8007-2d2ca3483790 from - CoInterpreter VMMaker.oscog-eem.1594 uuid: 79da8b81-d1f3-469a-869c-16c79d12649a + CoInterpreter VMMaker.oscog-eem.1597 uuid: d40647ee-f0e2-471a-8007-2d2ca3483790 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1594 uuid: 79da8b81-d1f3-469a-869c-16c79d12649a " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1597 uuid: d40647ee-f0e2-471a-8007-2d2ca3483790 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -240,7 +240,8 @@ #define GCModeImageSegment 16 #define GCModeIncremental 4 #define GCModeNewSpace 2 -#define HasBeenReturnedFromMCPC 0xFFFFFFFFUL +#define HasBeenReturnedFromMCPC -1 +#define HasBeenReturnedFromMCPCOop 0xFFFFFFFFUL #define HeaderIndex 0 #define IFrameSlots 7 #define InstanceSpecificationIndex 2 @@ -505,7 +506,6 @@ static sqInt NoDbgRegParms frameMethodObject(char *theFP); static sqInt NoDbgRegParms frameNumArgs(char *theFP); extern usqInt framePointerAddress(void); -static char * NoDbgRegParms frameReceiverLocation(char *theFP); static sqInt NoDbgRegParms frameReceiver(char *theFP); extern void (*functionPointerForCompiledMethodprimitiveIndex(sqInt methodObj, sqInt primIndex))(void) ; extern sqInt getCheckAllocFiller(void); @@ -1243,7 +1243,7 @@ static void NoDbgRegParms addLastLinktoList(sqInt proc, sqInt aList); static void NoDbgRegParms addNewMethodToNSCache(sqInt rule); static sqInt NoDbgRegParms addressCouldBeClassObj(sqInt maybeClassObj); -static char * NoDbgRegParms allocateMemoryminimumimageFileheaderSize(sqInt heapSize, sqInt minimumMemory, sqImageFile fileStream, sqInt headerSize); +static char * allOnesAsCharStar(void); extern sqInt argumentCountOfClosure(sqInt closurePointer); extern sqInt argumentCountOfMethodHeader(sqInt header); extern sqInt argumentCountOf(sqInt methodPointer); @@ -1309,8 +1309,6 @@ extern double floatArg(sqInt index); static void NoDbgRegParms followForwardedFrameContentsstackPointer(char *theFP, char *theSP); extern sqInt forceInterruptCheck(void); -static char * NoDbgRegParms frameCallerFP(char *theFP); -static char * NoDbgRegParms frameCallerSavedIP(char *theFP); static char * NoDbgRegParms frameCallerSP(char *theFP); static sqInt NoDbgRegParms frameContext(char *theFP); static char * NoDbgRegParms frameOfMarriedContext(sqInt aContext); @@ -2397,7 +2395,7 @@ /*560*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, 0, 0, 0,-1,-1 }; char expensiveAsserts = 0; -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.1594"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.1597"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -5297,7 +5295,6 @@ contextToReturnTo = callerContextOrNil; } else { - /* begin frameCallerFP: */ frameToReturnTo = pointerForOop(longAt(theFP + FoxSavedFP)); } } @@ -5430,10 +5427,8 @@ else { do { callerFP = localFP; - /* begin frameCallerFP: */ localFP = pointerForOop(longAt(localFP + FoxSavedFP)); } while(localFP != frameToReturnTo); - /* begin frameCallerSavedIP: */ localIP = pointerForOop(longAt(callerFP + FoxCallerSavedIP)); localSP = (frameCallerSP(callerFP)) - BytesPerWord; } @@ -5547,7 +5542,6 @@ char *theSP; VM_LABEL(commonCallerReturn); - /* begin frameCallerFP: */ callersFPOrNull = pointerForOop(longAt(localFP + FoxSavedFP)); if (callersFPOrNull == 0) { @@ -5600,7 +5594,7 @@ frameAbove = 0; goto l236; } - while (((callerFP = frameCallerFP(fp))) != 0) { + while (((callerFP = pointerForOop(longAt(fp + FoxSavedFP)))) != 0) { if (callerFP == theFP) { frameAbove = fp; goto l236; @@ -5700,7 +5694,6 @@ goto l235; } - /* begin frameCallerSavedIP: */ localIP = pointerForOop(longAt(localFP + FoxCallerSavedIP)); localSP = localFP + (frameStackedReceiverOffsetNumArgs(((((usqInt)(longAt(localFP + FoxMethod)))) < (startOfMemory()) ? ((mframeCogMethod(localFP))->cmNumArgs) @@ -6374,7 +6367,7 @@ GIV(method) = GIV(newMethod); assert(isOopCompiledMethod(GIV(method))); assert((methodHeaderOf(GIV(method))) == methodHeader); - GIV(bytecodeSetSelector) = ((((sqInt) methodHeader)) < 0 + GIV(bytecodeSetSelector) = ((((int) methodHeader)) < 0 ? 256 : 0); @@ -6401,7 +6394,7 @@ localIP += 3; if (GIV(primFailCode) != 0) { - if ((byteAt(localIP + 1)) == (((((sqInt) methodHeader)) < 0 + if ((byteAt(localIP + 1)) == (((((int) methodHeader)) < 0 ? AltLongStoreBytecode : LongStoreBytecode))) { /* begin getErrorObjectFromPrimFailCode */ @@ -6523,7 +6516,7 @@ value = longAt((rcvr1 + BaseHeaderSize) + (byte3 << (shiftForWord()))); if ((byte3 == InstructionPointerIndex) && (((value & 1)) - && ((((sqInt) value)) < 0))) { + && ((((int) value)) < 0))) { /* begin internalMustMapMachineCodePC:context: */ /* begin externalizeIPandSP */ assert((((usqInt)localIP)) != (ceReturnToInterpreterPC())); @@ -6552,7 +6545,6 @@ spouseFP = pointerForOop(senderOop - 1); if (byte3 == SenderIndex) { /* begin ensureCallerContext: */ - /* begin frameCallerFP: */ callerFP = pointerForOop(longAt(spouseFP + FoxSavedFP)); if (callerFP == 0) { @@ -8965,8 +8957,8 @@ sqInt fmt; sqInt fmt1; sqInt fmt2; - sqLong hdr; - sqLong hdr1; + sqInt hdr; + sqInt hdr1; sqInt index; sqInt index1; sqInt newLargeInteger; @@ -9013,7 +9005,7 @@ /* begin install:inAtCache:at:string: */ assert(!(isContext(rcvr))); hdr = long64At(rcvr); - fmt1 = (((unsigned sqLong)hdr) >> (formatShift())) & (formatMask()); + fmt1 = (((usqInt) hdr) >> (formatShift())) & (formatMask()); if ((fmt1 == (indexablePointersFormat())) && ((hdr & (classIndexMask())) == ClassMethodContextCompactIndex)) { @@ -9079,7 +9071,7 @@ /* begin install:inAtCache:at:string: */ assert(!(isContext(rcvr))); hdr1 = long64At(rcvr); - fmt2 = (((unsigned sqLong)hdr1) >> (formatShift())) & (formatMask()); + fmt2 = (((usqInt) hdr1) >> (formatShift())) & (formatMask()); /* begin lengthOf:format: */ /* begin numSlotsOfAny: */ numSlots21 = byteAt(rcvr + 7); @@ -9262,8 +9254,8 @@ sqInt fmt; sqInt fmt1; sqInt fmt2; - sqLong hdr; - sqLong hdr1; + sqInt hdr; + sqInt hdr1; sqInt index; sqInt isCharacter; usqInt numSlots; @@ -9305,7 +9297,7 @@ /* begin install:inAtCache:at:string: */ assert(!(isContext(rcvr))); hdr = long64At(rcvr); - fmt1 = (((unsigned sqLong)hdr) >> (formatShift())) & (formatMask()); + fmt1 = (((usqInt) hdr) >> (formatShift())) & (formatMask()); if ((fmt1 == (indexablePointersFormat())) && ((hdr & (classIndexMask())) == ClassMethodContextCompactIndex)) { @@ -9371,7 +9363,7 @@ /* begin install:inAtCache:at:string: */ assert(!(isContext(rcvr))); hdr1 = long64At(rcvr); - fmt2 = (((unsigned sqLong)hdr1) >> (formatShift())) & (formatMask()); + fmt2 = (((usqInt) hdr1) >> (formatShift())) & (formatMask()); /* begin lengthOf:format: */ /* begin numSlotsOfAny: */ numSlots21 = byteAt(rcvr + 7); @@ -11571,8 +11563,8 @@ sqInt fmt; sqInt fmt1; sqInt fmt2; - sqLong hdr; - sqLong hdr1; + sqInt hdr; + sqInt hdr1; sqInt index; sqInt index1; sqInt newLargeInteger; @@ -11619,7 +11611,7 @@ /* begin install:inAtCache:at:string: */ assert(!(isContext(rcvr))); hdr = long64At(rcvr); - fmt1 = (((unsigned sqLong)hdr) >> (formatShift())) & (formatMask()); + fmt1 = (((usqInt) hdr) >> (formatShift())) & (formatMask()); if ((fmt1 == (indexablePointersFormat())) && ((hdr & (classIndexMask())) == ClassMethodContextCompactIndex)) { @@ -11685,7 +11677,7 @@ /* begin install:inAtCache:at:string: */ assert(!(isContext(rcvr))); hdr1 = long64At(rcvr); - fmt2 = (((unsigned sqLong)hdr1) >> (formatShift())) & (formatMask()); + fmt2 = (((usqInt) hdr1) >> (formatShift())) & (formatMask()); /* begin lengthOf:format: */ /* begin numSlotsOfAny: */ numSlots21 = byteAt(rcvr + 7); @@ -11868,8 +11860,8 @@ sqInt fmt; sqInt fmt1; sqInt fmt2; - sqLong hdr; - sqLong hdr1; + sqInt hdr; + sqInt hdr1; sqInt index; sqInt isCharacter; usqInt numSlots; @@ -11911,7 +11903,7 @@ /* begin install:inAtCache:at:string: */ assert(!(isContext(rcvr))); hdr = long64At(rcvr); - fmt1 = (((unsigned sqLong)hdr) >> (formatShift())) & (formatMask()); + fmt1 = (((usqInt) hdr) >> (formatShift())) & (formatMask()); if ((fmt1 == (indexablePointersFormat())) && ((hdr & (classIndexMask())) == ClassMethodContextCompactIndex)) { @@ -11977,7 +11969,7 @@ /* begin install:inAtCache:at:string: */ assert(!(isContext(rcvr))); hdr1 = long64At(rcvr); - fmt2 = (((unsigned sqLong)hdr1) >> (formatShift())) & (formatMask()); + fmt2 = (((usqInt) hdr1) >> (formatShift())) & (formatMask()); /* begin lengthOf:format: */ /* begin numSlotsOfAny: */ numSlots21 = byteAt(rcvr + 7); @@ -12689,7 +12681,7 @@ value = longAt((rcvr + BaseHeaderSize) + (index << (shiftForWord()))); if ((index == InstructionPointerIndex) && (((value & 1)) - && ((((sqInt) value)) < 0))) { + && ((((int) value)) < 0))) { /* begin internalMustMapMachineCodePC:context: */ /* begin externalizeIPandSP */ assert((((usqInt)localIP)) != (ceReturnToInterpreterPC())); @@ -12718,7 +12710,6 @@ spouseFP = pointerForOop(senderOop - 1); if (index == SenderIndex) { /* begin ensureCallerContext: */ - /* begin frameCallerFP: */ callerFP = pointerForOop(longAt(spouseFP + FoxSavedFP)); if (callerFP == 0) { @@ -13824,7 +13815,7 @@ GIV(method) = GIV(newMethod); assert(isOopCompiledMethod(GIV(method))); assert((methodHeaderOf(GIV(method))) == methodHeader); - GIV(bytecodeSetSelector) = ((((sqInt) methodHeader)) < 0 + GIV(bytecodeSetSelector) = ((((int) methodHeader)) < 0 ? 256 : 0); @@ -13851,7 +13842,7 @@ localIP += 3; if (GIV(primFailCode) != 0) { - if ((byteAt(localIP + 1)) == (((((sqInt) methodHeader)) < 0 + if ((byteAt(localIP + 1)) == (((((int) methodHeader)) < 0 ? AltLongStoreBytecode : LongStoreBytecode))) { /* begin getErrorObjectFromPrimFailCode */ @@ -14194,7 +14185,7 @@ GIV(method) = GIV(newMethod); assert(isOopCompiledMethod(GIV(method))); assert((methodHeaderOf(GIV(method))) == methodHeader); - GIV(bytecodeSetSelector) = ((((sqInt) methodHeader)) < 0 + GIV(bytecodeSetSelector) = ((((int) methodHeader)) < 0 ? 256 : 0); @@ -14221,7 +14212,7 @@ localIP += 3; if (GIV(primFailCode) != 0) { - if ((byteAt(localIP + 1)) == (((((sqInt) methodHeader)) < 0 + if ((byteAt(localIP + 1)) == (((((int) methodHeader)) < 0 ? AltLongStoreBytecode : LongStoreBytecode))) { /* begin getErrorObjectFromPrimFailCode */ @@ -14671,7 +14662,7 @@ GIV(method) = GIV(newMethod); assert(isOopCompiledMethod(GIV(method))); assert((methodHeaderOf(GIV(method))) == methodHeader); - GIV(bytecodeSetSelector) = ((((sqInt) methodHeader)) < 0 + GIV(bytecodeSetSelector) = ((((int) methodHeader)) < 0 ? 256 : 0); @@ -14698,7 +14689,7 @@ localIP += 3; if (GIV(primFailCode) != 0) { - if ((byteAt(localIP + 1)) == (((((sqInt) methodHeader)) < 0 + if ((byteAt(localIP + 1)) == (((((int) methodHeader)) < 0 ? AltLongStoreBytecode : LongStoreBytecode))) { /* begin getErrorObjectFromPrimFailCode */ @@ -15157,7 +15148,7 @@ GIV(method) = GIV(newMethod); assert(isOopCompiledMethod(GIV(method))); assert((methodHeaderOf(GIV(method))) == methodHeader); - GIV(bytecodeSetSelector) = ((((sqInt) methodHeader)) < 0 + GIV(bytecodeSetSelector) = ((((int) methodHeader)) < 0 ? 256 : 0); @@ -15184,7 +15175,7 @@ localIP += 3; if (GIV(primFailCode) != 0) { - if ((byteAt(localIP + 1)) == (((((sqInt) methodHeader)) < 0 + if ((byteAt(localIP + 1)) == (((((int) methodHeader)) < 0 ? AltLongStoreBytecode : LongStoreBytecode))) { /* begin getErrorObjectFromPrimFailCode */ @@ -15576,7 +15567,7 @@ initialPC = ((GIV(newMethod) + ((LiteralStart + (literalCountOfMethodHeader(methodHeader))) * BytesPerOop)) + BaseHeaderSize) + (3); if (GIV(primFailCode) != 0) { - if ((byteAt(initialPC)) == (((((sqInt) methodHeader)) < 0 + if ((byteAt(initialPC)) == (((((int) methodHeader)) < 0 ? AltLongStoreBytecode : LongStoreBytecode))) { /* begin getErrorObjectFromPrimFailCode */ @@ -15672,7 +15663,7 @@ GIV(method) = GIV(newMethod); assert(isOopCompiledMethod(GIV(method))); assert((methodHeaderOf(GIV(method))) == methodHeader); - GIV(bytecodeSetSelector) = ((((sqInt) methodHeader)) < 0 + GIV(bytecodeSetSelector) = ((((int) methodHeader)) < 0 ? 256 : 0); @@ -15704,7 +15695,7 @@ GIV(instructionPointer) += 3; if (GIV(primFailCode) != 0) { - if ((byteAt(GIV(instructionPointer) + 1)) == (((((sqInt) methodHeader)) < 0 + if ((byteAt(GIV(instructionPointer) + 1)) == (((((int) methodHeader)) < 0 ? AltLongStoreBytecode : LongStoreBytecode))) { /* begin getErrorObjectFromPrimFailCode */ @@ -15999,7 +15990,7 @@ prevFrameWasCogged = 0; } theIP = ((usqInt)(longAt(theFP + FoxCallerSavedIP))); - if (!(((callerFP = frameCallerFP(theFP))) != 0)) break; + if (!(((callerFP = pointerForOop(longAt(theFP + FoxSavedFP)))) != 0)) break; theFP = callerFP; } assertl(theIP == (ceBaseFrameReturnPC()), ln); @@ -16048,7 +16039,6 @@ char *p; usqInt pc; usqInt pc1; - sqInt savedIP; char *sp; char *sp1; sqInt startBcpc; @@ -16069,13 +16059,11 @@ longAtput(GIV(framePointer) + FoxCallerSavedIP, ceBaseFrameReturnPC()); } else { - if (!(isMachineCodeFrame(frameCallerFP(GIV(framePointer))))) { + if (!((((usqInt)(longAt((pointerForOop(longAt(GIV(framePointer) + FoxSavedFP))) + FoxMethod)))) < (startOfMemory()))) { /* begin iframeSavedIP:put: */ - /* begin frameCallerFP: */ theFP = pointerForOop(longAt(GIV(framePointer) + FoxSavedFP)); - savedIP = ((sqInt)(frameCallerSavedIP(GIV(framePointer)))); assert(!(isMachineCodeFrame(theFP))); - longAtput(theFP + FoxIFSavedIP, savedIP); + longAtput(theFP + FoxIFSavedIP, ((sqInt)(pointerForOop(longAt(GIV(framePointer) + FoxCallerSavedIP))))); longAtput(GIV(framePointer) + FoxCallerSavedIP, ceReturnToInterpreterPC()); } } @@ -16362,17 +16350,8 @@ assert((((GIV(stackPage)->baseFP)) + (2 * BytesPerWord)) < ((GIV(stackPage)->baseAddress))); assert((addressCouldBeObj(longAt(((GIV(stackPage)->baseAddress)) - BytesPerWord))) && (isContext(longAt(((GIV(stackPage)->baseAddress)) - BytesPerWord)))); - assert((addressCouldBeObj(longAt((GIV(stackPage)->baseAddress)))) - && (isContext(longAt((GIV(stackPage)->baseAddress))))); - - /* The stack page is effectively free now, so free it. We must free it to be - correct in determining if contextToReturnTo is still married, and in case - makeBaseFrameFor: cogs a method, which may cause a code compaction, - in which case the frame must be free to avoid the relocation machinery - tracing the dead frame. Since freeing now temporarily violates the page-list - ordering invariant, use the assert-free version. */ - contextToReturnTo = longAt((GIV(stackPage)->baseAddress)); + assert(addressCouldBeObj(contextToReturnTo)); freeStackPageNoAssert(GIV(stackPage)); isAContext = ((contextToReturnTo & (tagMask())) == 0) && (((longAt(contextToReturnTo)) & (classIndexMask())) == ClassMethodContextCompactIndex); @@ -16405,7 +16384,7 @@ frameAbove = 0; goto l1; } - while (((callerFP = frameCallerFP(fp))) != 0) { + while (((callerFP = pointerForOop(longAt(fp + FoxSavedFP)))) != 0) { if (callerFP == GIV(framePointer)) { frameAbove = fp; goto l1; @@ -17371,7 +17350,6 @@ contextToReturnTo = callerContextOrNil; } else { - /* begin frameCallerFP: */ frameToReturnTo = pointerForOop(longAt(theFP + FoxSavedFP)); } } @@ -17502,10 +17480,9 @@ else { do { callerFP = GIV(framePointer); - /* begin frameCallerFP: */ GIV(framePointer) = pointerForOop(longAt(GIV(framePointer) + FoxSavedFP)); } while(GIV(framePointer) != frameToReturnTo); - GIV(instructionPointer) = ((usqInt)(frameCallerSavedIP(callerFP))); + GIV(instructionPointer) = ((usqInt)(pointerForOop(longAt(callerFP + FoxCallerSavedIP)))); /* begin frameCallerSP: */ assert(!(isBaseFrame(callerFP))); GIV(stackPointer) = (callerFP + (frameStackedReceiverOffsetNumArgs(((((usqInt)(longAt(callerFP + FoxMethod)))) < (startOfMemory()) @@ -18577,7 +18554,6 @@ theSP += BytesPerWord; } while (1) { - /* begin frameReceiverLocation: */ frameRcvrOffset = ((((usqInt)(longAt(theFP + FoxMethod)))) < (startOfMemory()) ? theFP + FoxMFReceiver : theFP + FoxIFReceiver); @@ -18639,7 +18615,7 @@ ok = 0; } } - if (!(((callerFP = frameCallerFP(theFP))) != 0)) break; + if (!(((callerFP = pointerForOop(longAt(theFP + FoxSavedFP)))) != 0)) break; theSP = (theFP + FoxCallerSavedIP) + BytesPerWord; theFP = callerFP; } @@ -18792,7 +18768,7 @@ /* begin mframeCogMethod: */ cogMethod = ((CogBlockMethod *) ((longAt(theFP + FoxMethod)) & MFMethodMask)); if (theIP == (ceCannotResumePC())) { - return HasBeenReturnedFromMCPC; + return HasBeenReturnedFromMCPCOop; } if (((cogMethod->cmType)) == CMMethod) { return ((((((sqInt)cogMethod)) - theIP) << 1) | 1); @@ -18865,7 +18841,6 @@ return 1; } calleeFP = theFP; - /* begin frameCallerFP: */ theFP = pointerForOop(longAt(theFP + FoxSavedFP)); if (!(theFP != 0)) break; @@ -19227,7 +19202,7 @@ value = longAt((aContext + BaseHeaderSize) + (offset << (shiftForWord()))); return ((offset == InstructionPointerIndex) && (((value & 1)) - && ((((sqInt) value)) < 0)) + && ((((int) value)) < 0)) ? (/* begin externalWriteBackHeadFramePointers */ assert((GIV(framePointer) - GIV(stackPointer)) < (LargeContextSlots * BytesPerOop)), assert(GIV(stackPage) == (mostRecentlyUsedPage())), @@ -19597,7 +19572,7 @@ && (((longAt(oop)) & (classIndexMask())) == (isForwardedObjectClassIndexPun()))) { longAtput(theFP + offset, followForwarded(oop)); } - if (!(((callerFP = frameCallerFP(theFP))) != 0)) break; + if (!(((callerFP = pointerForOop(longAt(theFP + FoxSavedFP)))) != 0)) break; theIPPtr = ((usqInt)(theFP + FoxCallerSavedIP)); theFP = callerFP; } @@ -19747,15 +19722,6 @@ return ((usqInt)((&GIV(framePointer)))); } @@ Diff output truncated at 50000 characters. @@

1 0

VM Maker: VMMaker.oscog-eem.1597.mcz
by commits＠source.squeak.org 15 Dec '15

15 Dec '15

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.1597.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.1597 Author: eem Time: 15 December 2015, 11:14:56.69 am UUID: d40647ee-f0e2-471a-8007-2d2ca3483790 Ancestors: VMMaker.oscog-eem.1596 Fix a regression in VMMaker.oscog-eem.1596 =============== Diff against VMMaker.oscog-eem.1596 =============== Item was changed: ----- Method: CCodeGenerator>>generateSignedIntToLong:on:indent: (in category 'C translation') ----- generateSignedIntToLong: msgNode on: aStream indent: level "Generate the C code for this message onto the given stream." aStream nextPutAll: '((usqInt) '. + (vmClass notNil + and: [vmClass objectMemoryClass wordSize = 8]) ifTrue: - vmClass objectMemoryClass wordSize = 8 ifTrue: [aStream nextPutAll: '(int)']. self emitCExpression: msgNode receiver on: aStream. aStream nextPut: $)!

1 0

VM Maker: VMMaker.oscog-eem.1596.mcz
by commits＠source.squeak.org 15 Dec '15

15 Dec '15

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.1596.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.1596 Author: eem Time: 15 December 2015, 10:53:18.704 am UUID: b5172901-ebc3-4132-b421-446d4a1d080f Ancestors: VMMaker.oscog-rmacnak.1595 64 vs 32 bits. Clarify translation of signedInt[From|To]Long[64]. signedInt[From|To]Long always operates on 32-bits and signedInt[From|To]Long64 always operates on 64-bits; there is no signedInt[From|To]MachineInteger. Refactor casting -1 as a stack limit into allOnesAsCharStar. Cogit: Fix regression in x86's register save/restore. Nuke uses of thirtyTwoBitLiteralBefore: in favour of preexisting literal32BeforeFollowingAddress:. Slang: Make sure functional methods that answer char * (allOnesAsCharStar) can be inlined. Plugins: Fix the Alien plugins for 64-bits =============== Diff against VMMaker.oscog-rmacnak.1595 =============== Item was added: + ----- Method: CCodeGenerator>>generateSignedIntFromLong64:on:indent: (in category 'C translation') ----- + generateSignedIntFromLong64: msgNode on: aStream indent: level + "Generate the C code for this message onto the given stream." + + aStream nextPutAll: '((sqLong) '. + self emitCExpression: msgNode receiver on: aStream. + aStream nextPut: $)! Item was changed: ----- Method: CCodeGenerator>>generateSignedIntFromLong:on:indent: (in category 'C translation') ----- generateSignedIntFromLong: msgNode on: aStream indent: level "Generate the C code for this message onto the given stream." + aStream nextPutAll: '((int) '. - aStream nextPutAll: '((sqInt) '. self emitCExpression: msgNode receiver on: aStream. + aStream nextPut: $)! - aStream nextPut: $) - - ! Item was changed: ----- Method: CCodeGenerator>>generateSignedIntFromShort:on:indent: (in category 'C translation') ----- generateSignedIntFromShort: msgNode on: aStream indent: level "Generate the C code for this message onto the given stream." aStream nextPutAll: '((short)'. self emitCExpression: msgNode receiver on: aStream. + aStream nextPut: $)! - aStream nextPut: $) - - ! Item was added: + ----- Method: CCodeGenerator>>generateSignedIntToLong64:on:indent: (in category 'C translation') ----- + generateSignedIntToLong64: msgNode on: aStream indent: level + "Generate the C code for this message onto the given stream." + + aStream nextPutAll: '((usqInt) '. + self emitCExpression: msgNode receiver on: aStream. + aStream nextPut: $)! Item was changed: ----- Method: CCodeGenerator>>generateSignedIntToLong:on:indent: (in category 'C translation') ----- generateSignedIntToLong: msgNode on: aStream indent: level "Generate the C code for this message onto the given stream." aStream nextPutAll: '((usqInt) '. + vmClass objectMemoryClass wordSize = 8 ifTrue: + [aStream nextPutAll: '(int)']. self emitCExpression: msgNode receiver on: aStream. + aStream nextPut: $)! - aStream nextPut: $) - - ! Item was changed: ----- Method: CCodeGenerator>>generateSignedIntToShort:on:indent: (in category 'C translation') ----- generateSignedIntToShort: msgNode on: aStream indent: level "Generate the C code for this message onto the given stream." aStream nextPutAll: '((usqInt) (short)'. self emitCExpression: msgNode receiver on: aStream. + aStream nextPut: $)! - aStream nextPut: $) - - ! Item was changed: ----- Method: CCodeGenerator>>initializeCTranslationDictionary (in category 'C translation support') ----- initializeCTranslationDictionary "Initialize the dictionary mapping message names to actions for C code generation." | pairs | translationDict := Dictionary new: 200. pairs := #( #& #generateAnd:on:indent: #| #generateOr:on:indent: #and: #generateSequentialAnd:on:indent: #or: #generateSequentialOr:on:indent: #not #generateNot:on:indent: #+ #generatePlus:on:indent: #- #generateMinus:on:indent: #negated #generateNegated:on:indent: #* #generateTimes:on:indent: #/ #generateDivide:on:indent: #// #generateDivide:on:indent: #\\ #generateModulo:on:indent: #<< #generateShiftLeft:on:indent: #>> #generateShiftRight:on:indent: #>>> #generateSignedShiftRight:on:indent: #min: #generateMin:on:indent: #max: #generateMax:on:indent: #between:and: #generateBetweenAnd:on:indent: #bitAnd: #generateBitAnd:on:indent: #bitOr: #generateBitOr:on:indent: #bitXor: #generateBitXor:on:indent: #bitShift: #generateBitShift:on:indent: #signedBitShift: #generateSignedBitShift:on:indent: #bitInvert32 #generateBitInvert:on:indent: #bitInvert64 #generateBitInvert:on:indent: #bitClear: #generateBitClear:on:indent: #truncateTo: #generateTruncateTo:on:indent: #rounded #generateRounded:on:indent: #< #generateLessThan:on:indent: #<= #generateLessThanOrEqual:on:indent: #= #generateEqual:on:indent: #> #generateGreaterThan:on:indent: #>= #generateGreaterThanOrEqual:on:indent: #~= #generateNotEqual:on:indent: #== #generateEqual:on:indent: #~~ #generateNotEqual:on:indent: #isNil #generateIsNil:on:indent: #notNil #generateNotNil:on:indent: #whileTrue: #generateWhileTrue:on:indent: #whileFalse: #generateWhileFalse:on:indent: #whileTrue #generateDoWhileTrue:on:indent: #whileFalse #generateDoWhileFalse:on:indent: #to:do: #generateToDo:on:indent: #to:by:do: #generateToByDo:on:indent: #repeat #generateRepeat:on:indent: #timesRepeat: #generateTimesRepeat:on:indent: #ifTrue: #generateIfTrue:on:indent: #ifFalse: #generateIfFalse:on:indent: #ifTrue:ifFalse: #generateIfTrueIfFalse:on:indent: #ifFalse:ifTrue: #generateIfFalseIfTrue:on:indent: #ifNotNil: #generateIfNotNil:on:indent: #ifNil: #generateIfNil:on:indent: #ifNotNil:ifNil: #generateIfNotNilIfNil:on:indent: #ifNil:ifNotNil: #generateIfNilIfNotNil:on:indent: #at: #generateAt:on:indent: #at:put: #generateAtPut:on:indent: #basicAt: #generateAt:on:indent: #basicAt:put: #generateAtPut:on:indent: #integerValueOf: #generateIntegerValueOf:on:indent: #integerObjectOf: #generateIntegerObjectOf:on:indent: #isIntegerObject: #generateIsIntegerObject:on:indent: #cCode: #generateInlineCCode:on:indent: #cCode:inSmalltalk: #generateInlineCCode:on:indent: #cPreprocessorDirective: #generateInlineCPreprocessorDirective:on:indent: #cppIf:ifTrue:ifFalse: #generateInlineCppIfElse:on:indent: #cppIf:ifTrue: #generateInlineCppIfElse:on:indent: #cCoerce:to: #generateCCoercion:on:indent: #cCoerceSimple:to: #generateCCoercion:on:indent: #addressOf: #generateAddressOf:on:indent: #addressOf:put: #generateAddressOf:on:indent: #asAddress:put: #generateAsAddress:on:indent: + #signedIntFromLong64 #generateSignedIntFromLong64:on:indent: - #signedIntFromLong64 #generateSignedIntFromLong:on:indent: #signedIntFromLong #generateSignedIntFromLong:on:indent: #signedIntFromShort #generateSignedIntFromShort:on:indent: + #signedIntToLong64 #generateSignedIntToLong64:on:indent: - #signedIntToLong64 #generateSignedIntToLong:on:indent: #signedIntToLong #generateSignedIntToLong:on:indent: #signedIntToShort #generateSignedIntToShort:on:indent: #preIncrement #generatePreIncrement:on:indent: #preDecrement #generatePreDecrement:on:indent: #inline: #generateInlineDirective:on:indent: #asFloat #generateAsFloat:on:indent: #asInteger #generateAsInteger:on:indent: #asUnsignedInteger #generateAsUnsignedInteger:on:indent: #asLong #generateAsLong:on:indent: #asUnsignedLong #generateAsUnsignedLong:on:indent: #asVoidPointer #generateAsVoidPointer:on:indent: #asSymbol #generateAsSymbol:on:indent: #flag: #generateFlag:on:indent: #anyMask: #generateBitAnd:on:indent: #noMask: #generateNoMask:on:indent: #raisedTo: #generateRaisedTo:on:indent: #touch: #generateTouch:on:indent: #bytesPerOop #generateBytesPerOop:on:indent: #bytesPerWord #generateBytesPerWord:on:indent: #wordSize #generateBytesPerWord:on:indent: #baseHeaderSize #generateBaseHeaderSize:on:indent: #minSmallInteger #generateSmallIntegerConstant:on:indent: #maxSmallInteger #generateSmallIntegerConstant:on:indent: #sharedCodeNamed:inCase: #generateSharedCodeDirective:on:indent: #perform: #generatePerform:on:indent: #perform:with: #generatePerform:on:indent: #perform:with:with: #generatePerform:on:indent: #perform:with:with:with: #generatePerform:on:indent: #perform:with:with:with:with: #generatePerform:on:indent: #perform:with:with:with:with:with: #generatePerform:on:indent: #value #generateValue:on:indent: #value: #generateValue:on:indent: #value:value: #generateValue:on:indent: #value:value:value: #generateValue:on:indent: #value:value:value:value: #generateValue:on:indent: #deny: #generateDeny:on:indent: #shouldNotImplement #generateSmalltalkMetaError:on:indent: #shouldBeImplemented #generateSmalltalkMetaError:on:indent: #subclassResponsibility #generateSmalltalkMetaError:on:indent: ). 1 to: pairs size by: 2 do: [:i | translationDict at: (pairs at: i) put: (pairs at: i + 1)]. pairs := #( #ifTrue: #generateIfTrueAsArgument:on:indent: #ifFalse: #generateIfFalseAsArgument:on:indent: #ifTrue:ifFalse: #generateIfTrueIfFalseAsArgument:on:indent: #ifFalse:ifTrue: #generateIfFalseIfTrueAsArgument:on:indent: #ifNotNil: #generateIfNotNilAsArgument:on:indent: #ifNil: #generateIfNilAsArgument:on:indent: #ifNotNil:ifNil: #generateIfNotNilIfNilAsArgument:on:indent: #ifNil:ifNotNil: #generateIfNilIfNotNilAsArgument:on:indent: #cCode: #generateInlineCCodeAsArgument:on:indent: #cCode:inSmalltalk: #generateInlineCCodeAsArgument:on:indent: #cppIf:ifTrue:ifFalse: #generateInlineCppIfElseAsArgument:on:indent: #cppIf:ifTrue: #generateInlineCppIfElseAsArgument:on:indent: #value #generateValueAsArgument:on:indent: #value: #generateValueAsArgument:on:indent: #value:value: #generateValueAsArgument:on:indent: ). asArgumentTranslationDict := Dictionary new: 8. 1 to: pairs size by: 2 do: [:i | asArgumentTranslationDict at: (pairs at: i) put: (pairs at: i + 1)]. ! Item was changed: StackInterpreterPrimitives subclass: #CoInterpreter instanceVariableNames: 'cogit cogMethodZone gcMode cogCodeSize desiredCogCodeSize heapBase lastCoggableInterpretedBlockMethod reenterInterpreter deferSmash deferredSmash primTraceLog primTraceLogIndex traceLog traceLogIndex traceSources cogCompiledCodeCompactionCalledFor statCodeCompactionCount statCodeCompactionUsecs lastUncoggableInterpretedBlockMethod flagInterpretedMethods maxLiteralCountForCompile minBackwardJumpCountForCompile' + classVariableNames: 'CSCallbackEnter CSCallbackLeave CSCheckEvents CSEnterCriticalSection CSExitCriticalSection CSOwnVM CSResume CSSignal CSSuspend CSSwitchIfNeccessary CSThreadBind CSThreadSchedulingLoop CSWait CSYield HasBeenReturnedFromMCPC HasBeenReturnedFromMCPCOop MFMethodFlagFrameIsMarkedFlag MinBackwardJumpCountForCompile PrimTraceLogSize ReturnToInterpreter RumpCStackSize TraceBlockActivation TraceBlockCreation TraceBufferSize TraceCodeCompaction TraceContextSwitch TraceDisownVM TraceFullGC TraceIncrementalGC TraceIsFromInterpreter TraceIsFromMachineCode TraceOwnVM TracePreemptDisowningThread TracePrimitiveFailure TracePrimitiveRetry TraceSources TraceStackOverflow TraceThreadSwitch TraceVMCallback TraceVMCallbackReturn' - classVariableNames: 'CSCallbackEnter CSCallbackLeave CSCheckEvents CSEnterCriticalSection CSExitCriticalSection CSOwnVM CSResume CSSignal CSSuspend CSSwitchIfNeccessary CSThreadBind CSThreadSchedulingLoop CSWait CSYield HasBeenReturnedFromMCPC MFMethodFlagFrameIsMarkedFlag MinBackwardJumpCountForCompile PrimTraceLogSize ReturnToInterpreter RumpCStackSize TraceBlockActivation TraceBlockCreation TraceBufferSize TraceCodeCompaction TraceContextSwitch TraceDisownVM TraceFullGC TraceIncrementalGC TraceIsFromInterpreter TraceIsFromMachineCode TraceOwnVM TracePreemptDisowningThread TracePrimitiveFailure TracePrimitiveRetry TraceSources TraceStackOverflow TraceThreadSwitch TraceVMCallback TraceVMCallbackReturn' poolDictionaries: 'CogMethodConstants VMStackFrameOffsets' category: 'VMMaker-JIT'! !CoInterpreter commentStamp: '<historical>' prior: 0! I am a variant of the StackInterpreter that can co-exist with the Cog JIT. I interpret unjitted methods, either because they have been found for the first time or because they are judged to be too big to JIT. See CogMethod class's comment for method interoperability.! Item was changed: ----- Method: CoInterpreter class>>initializeContextIndices (in category 'initialization') ----- initializeContextIndices super initializeContextIndices. + HasBeenReturnedFromMCPC := -1. + HasBeenReturnedFromMCPCOop := self objectMemoryClass basicNew integerObjectOf: HasBeenReturnedFromMCPC! - HasBeenReturnedFromMCPC := self objectMemoryClass basicNew integerObjectOf: -1! Item was changed: ----- Method: CoInterpreter>>ceBaseFrameReturn: (in category 'trampolines') ----- ceBaseFrameReturn: returnValue "Return across a page boundary. The context to return to (which may be married) is stored in the first word of the stack. We get here when a return instruction jumps to the ceBaseFrameReturn: address that is the return pc for base frames. A consequence of this is that the current frame is no longer valid since an interrupt may have overwritten its state as soon as the stack pointer has been cut-back beyond the return pc. So to have a context to send the cannotReturn: message to we also store the base frame's context in the second word of the stack page." <api> | contextToReturnTo contextToReturnFrom isAContext thePage newPage frameAbove | <var: #thePage type: #'StackPage *'> <var: #newPage type: #'StackPage *'> <var: #frameAbove type: #'char *'> self assert: (stackPages stackPageFor: stackPointer) = stackPage. self assert: stackPages mostRecentlyUsedPage = stackPage. cogit assertCStackWellAligned. self assert: framePointer = 0. self assert: stackPointer <= (stackPage baseAddress - objectMemory wordSize). self assert: stackPage baseFP + (2 * objectMemory wordSize) < stackPage baseAddress. "We would like to use the following assert but we can't since the stack pointer will be above the base frame pointer in the base frame return and hence the 0 a base frame pointer points at could be overwritten which will cause the isBaseFrame assert in frameCallerContext: to fail." "self assert: (self frameCallerContext: stackPage baseFP) = (stackPages longAt: stackPage baseAddress)." self assert: ((objectMemory addressCouldBeObj: (stackPages longAt: stackPage baseAddress - objectMemory wordSize)) and: [objectMemory isContext: (stackPages longAt: stackPage baseAddress - objectMemory wordSize)]). - self assert: ((objectMemory addressCouldBeObj: (stackPages longAt: stackPage baseAddress)) - and: [objectMemory isContext: (stackPages longAt: stackPage baseAddress)]). contextToReturnTo := stackPages longAt: stackPage baseAddress. + self assert: (objectMemory addressCouldBeObj: contextToReturnTo). "The stack page is effectively free now, so free it. We must free it to be correct in determining if contextToReturnTo is still married, and in case makeBaseFrameFor: cogs a method, which may cause a code compaction, in which case the frame must be free to avoid the relocation machinery tracing the dead frame. Since freeing now temporarily violates the page-list ordering invariant, use the assert-free version." stackPages freeStackPageNoAssert: stackPage. isAContext := objectMemory isContext: contextToReturnTo. (isAContext and: [self isStillMarriedContext: contextToReturnTo]) ifTrue: [framePointer := self frameOfMarriedContext: contextToReturnTo. thePage := stackPages stackPageFor: framePointer. framePointer = thePage headFP ifTrue: [stackPointer := thePage headSP] ifFalse: ["Returning to some interior frame, presumably because of a sender assignment. Move the frames above to another page (they may be in use, e.g. via coroutining). Make the interior frame the top frame." frameAbove := self findFrameAbove: framePointer inPage: thePage. "Since we've just deallocated a page we know that newStackPage won't deallocate an existing one." newPage := stackPages newStackPage. self assert: newPage = stackPage. self moveFramesIn: thePage through: frameAbove toPage: newPage. stackPages markStackPageMostRecentlyUsed: newPage. framePointer := thePage headFP. stackPointer := thePage headSP]] ifFalse: [(isAContext and: [objectMemory isIntegerObject: (objectMemory fetchPointer: InstructionPointerIndex ofObject: contextToReturnTo)]) ifFalse: [contextToReturnFrom := stackPages longAt: stackPage baseAddress - objectMemory wordSize. self tearDownAndRebuildFrameForCannotReturnBaseFrameReturnFrom: contextToReturnFrom to: contextToReturnTo returnValue: returnValue. ^self externalCannotReturn: returnValue from: contextToReturnFrom]. "void the instructionPointer to stop it being incorrectly updated in a code compaction in makeBaseFrameFor:." instructionPointer := 0. thePage := self makeBaseFrameFor: contextToReturnTo. framePointer := thePage headFP. stackPointer := thePage headSP]. self setStackPageAndLimit: thePage. self assert: (stackPages stackPageFor: framePointer) = stackPage. (self isMachineCodeFrame: framePointer) ifTrue: [self push: returnValue. cogit ceEnterCogCodePopReceiverReg. "NOTREACHED"]. instructionPointer := self stackTop. instructionPointer = cogit ceReturnToInterpreterPC ifTrue: [instructionPointer := self iframeSavedIP: framePointer]. self setMethod: (self iframeMethod: framePointer). self stackTopPut: returnValue. "a.k.a. pop saved ip then push result" self assert: (self checkIsStillMarriedContext: contextToReturnTo currentFP: framePointer). self siglong: reenterInterpreter jmp: ReturnToInterpreter. "NOTREACHED" ^nil! Item was changed: ----- Method: CoInterpreter>>encodedNativePCOf:cogMethod: (in category 'frame access') ----- encodedNativePCOf: mcpc cogMethod: cogMethod "Encode the mcpc in cogMethod as a value that can be stashed in a context. Mapping native pcs to bytecode pcs is quite expensive, requiring a search through the method map. We mitigate this cost by deferring mapping until we really have to, which is when a context's instruction pointer is accessed by Smalltalk code. But to defer mapping we have to be able to distinguish machine code from bytecode pcs, which we do by using negative values for machine code pcs. As a whorish performance hack we also include the block method offset in the pc of a block. The least significant 16 bits are the native pc and the most significant 15 bits are the block start, in block alignment units. So when mapping back we can find the start of the block. See mustMapMachineCodePC:context: for the code that does the actual mapping." <var: #cogMethod type: #'CogBlockMethod *'> | homeMethod blockOffset | <var: #homeMethod type: #'CogMethod *'> mcpc = cogit ceCannotResumePC ifTrue: + [^HasBeenReturnedFromMCPCOop]. - [^HasBeenReturnedFromMCPC]. cogMethod cmType = CMMethod ifTrue: [^objectMemory integerObjectOf: cogMethod asInteger - mcpc]. homeMethod := cogMethod cmHomeMethod. blockOffset := homeMethod asInteger - cogMethod asInteger / cogit blockAlignment. ^objectMemory integerObjectOf: ((blockOffset bitShift: 16) bitOr: (cogMethod asInteger - mcpc bitAnd: 16rFFFF))! Item was changed: ----- Method: CoInterpreter>>makeBaseFrameFor: (in category 'frame access') ----- makeBaseFrameFor: aContext "<Integer>" "Marry aContext with the base frame of a new stack page. Build the base frame to reflect the context's state. Answer the new page. Override to hold the caller context in a different place, In the StackInterpreter we use the caller saved ip, but in the Cog VM caller saved ip is the ceBaseReturn: trampoline. Simply hold the caller context in the first word of the stack." <returnTypeC: #'StackPage *'> | page pointer theMethod theIP numArgs stackPtrIndex maybeClosure rcvr | <inline: false> <var: #page type: #'StackPage *'> <var: #pointer type: #'char *'> <var: #cogMethod type: #'CogMethod *'> "theIP must be typed as signed because it is assigned ceCannotResumePC and so maybe implicitly typed as unsigned." <var: #theIP type: #sqInt> self assert: (objectMemory isContext: aContext). self assert: (self isSingleContext: aContext). self assert: (objectMemory goodContextSize: aContext). theIP := objectMemory fetchPointer: InstructionPointerIndex ofObject: aContext. + self assert: HasBeenReturnedFromMCPC < 0. - self assert: HasBeenReturnedFromMCPC signedIntFromLong < 0. theIP := (objectMemory isIntegerObject: theIP) ifTrue: [objectMemory integerValueOf: theIP] ifFalse: [HasBeenReturnedFromMCPC]. theMethod := objectMemory followObjField: MethodIndex ofObject: aContext. page := stackPages newStackPage. "first word on stack is caller context of base frame" stackPages longAt: (pointer := page baseAddress) put: (objectMemory followObjField: SenderIndex ofObject: aContext). "second word is the context itself; needed for cannotReturn processing; see ceBaseReturn:." stackPages longAt: (pointer := pointer - objectMemory wordSize) put: aContext. rcvr := objectMemory followField: ReceiverIndex ofObject: aContext. "If the frame is a closure activation then the closure should be on the stack in + the pushed receiver position (closures receive the value[:value:] messages). - the pushed receiver position (closures receiver the value[:value:] messages). Otherwise it should be the receiver proper." maybeClosure := objectMemory fetchPointer: ClosureIndex ofObject: aContext. maybeClosure ~= objectMemory nilObject ifTrue: [(objectMemory isForwarded: maybeClosure) ifTrue: [maybeClosure := objectMemory fixFollowedField: ClosureIndex ofObject: aContext withInitialValue: maybeClosure]. numArgs := self argumentCountOfClosure: maybeClosure. stackPages longAt: (pointer := pointer - objectMemory wordSize) put: maybeClosure] ifFalse: [| header | header := objectMemory methodHeaderOf: theMethod. numArgs := self argumentCountOfMethodHeader: header. "If this is a synthetic context its IP could be pointing at the CallPrimitive opcode. If so, skip it." + ((self methodHeaderHasPrimitive: header) + and: [theIP = (1 + (objectMemory lastPointerOfMethodHeader: header))]) ifTrue: - (theIP signedIntFromLong > 0 - and: [(self methodHeaderHasPrimitive: header) - and: [theIP = (1 + (objectMemory lastPointerOfMethodHeader: header))]]) ifTrue: [theIP := theIP + (self sizeOfCallPrimitiveBytecode: header)]. stackPages longAt: (pointer := pointer - objectMemory wordSize) put: rcvr]. "Put the arguments on the stack" 1 to: numArgs do: [:i| stackPages longAt: (pointer := pointer - objectMemory wordSize) put: (objectMemory fetchPointer: ReceiverIndex + i ofObject: aContext)]. "saved caller ip is base return trampoline" stackPages longAt: (pointer := pointer - objectMemory wordSize) put: cogit ceBaseFrameReturnPC. "base frame's saved fp is null" stackPages longAt: (pointer := pointer - objectMemory wordSize) put: 0. "N.B. Don't set the baseFP, which marks the page as in use, until after ensureMethodIsCogged: and/or instructionPointer:forContext:frame:. These can cause a compiled code compaction which, if marked as in use, will examine this partially initialized page and crash." page headFP: pointer. "Create either a machine code frame or an interpreter frame based on the pc. If the pc is -ve it is a machine code pc and so we produce a machine code frame. If +ve an interpreter frame. N.B. Do *not* change this to try and map from a bytecode pc to a machine code frame under any circumstances. See ensureContextIsExecutionSafeAfterAssignToStackPointer:" + theIP < 0 - theIP signedIntFromLong < 0 ifTrue: [| cogMethod | "Since we would have to generate a machine-code method to be able to map the native pc anyway we should create a native method and native frame." cogMethod := self ensureMethodIsCogged: theMethod. theMethod := cogMethod asInteger. maybeClosure ~= objectMemory nilObject ifTrue: ["If the pc is the special HasBeenReturnedFromMCPC pc set the pc appropriately so that the frame stays in the cannotReturn: state." + theIP = HasBeenReturnedFromMCPC - theIP = HasBeenReturnedFromMCPC signedIntFromLong ifTrue: [theMethod := (cogit findMethodForStartBcpc: (self startPCOfClosure: maybeClosure) inHomeMethod: (self cCoerceSimple: theMethod to: #'CogMethod *')) asInteger. theMethod = 0 ifTrue: [self error: 'cannot find machine code block matching closure''s startpc']. theIP := cogit ceCannotResumePC] ifFalse: [self assert: (theIP signedBitShift: -16) < -1. "See contextInstructionPointer:frame:" theMethod := theMethod - ((theIP signedBitShift: -16) * cogit blockAlignment). theIP := theMethod - theIP signedIntFromShort]. stackPages longAt: (pointer := pointer - objectMemory wordSize) put: theMethod + MFMethodFlagHasContextFlag + MFMethodFlagIsBlockFlag] ifFalse: [self assert: (theIP signedBitShift: -16) >= -1. "If the pc is the special HasBeenReturnedFromMCPC pc set the pc appropriately so that the frame stays in the cannotReturn: state." + theIP := theIP = HasBeenReturnedFromMCPC - theIP := theIP = HasBeenReturnedFromMCPC signedIntFromLong ifTrue: [cogit ceCannotResumePC] ifFalse: [theMethod asInteger - theIP]. stackPages longAt: (pointer := pointer - objectMemory wordSize) put: theMethod + MFMethodFlagHasContextFlag]. stackPages longAt: (pointer := pointer - objectMemory wordSize) put: aContext] ifFalse: [stackPages longAt: (pointer := pointer - objectMemory wordSize) put: theMethod. stackPages longAt: (pointer := pointer - objectMemory wordSize) put: aContext. stackPages longAt: (pointer := pointer - objectMemory wordSize) put: (self encodeFrameFieldHasContext: true isBlock: maybeClosure ~= objectMemory nilObject numArgs: numArgs). stackPages longAt: (pointer := pointer - objectMemory wordSize) put: 0. "FoxIFSavedIP" theIP := self iframeInstructionPointerForIndex: theIP method: theMethod]. page baseFP: page headFP. self assert: (self frameHasContext: page baseFP). self assert: (self frameNumArgs: page baseFP) == numArgs. stackPages longAt: (pointer := pointer - objectMemory wordSize) put: rcvr. stackPtrIndex := self quickFetchInteger: StackPointerIndex ofObject: aContext. self assert: ReceiverIndex + stackPtrIndex < (objectMemory lengthOf: aContext). numArgs + 1 to: stackPtrIndex do: [:i| stackPages longAt: (pointer := pointer - objectMemory wordSize) put: (objectMemory fetchPointer: ReceiverIndex + i ofObject: aContext)]. "top of stack is the instruction pointer" stackPages longAt: (pointer := pointer - objectMemory wordSize) put: theIP. page headSP: pointer. self assert: (self context: aContext hasValidInversePCMappingOf: theIP in: page baseFP). "Mark context as married by setting its sender to the frame pointer plus SmallInteger tags and the InstructionPointer to the saved fp (which ensures correct alignment w.r.t. the frame when we check for validity) plus SmallInteger tags." objectMemory storePointerUnchecked: SenderIndex ofObject: aContext withValue: (self withSmallIntegerTags: page baseFP). objectMemory storePointerUnchecked: InstructionPointerIndex ofObject: aContext withValue: (self withSmallIntegerTags: 0). self assert: (objectMemory isIntegerObject: (objectMemory fetchPointer: SenderIndex ofObject: aContext)). self assert: (self frameOfMarriedContext: aContext) = page baseFP. self assert: (self validStackPageBaseFrame: page). ^page! Item was changed: ----- Method: CoInterpreter>>mustMapMachineCodePC:context: (in category 'frame access') ----- mustMapMachineCodePC: theIP context: aOnceMarriedContext "Map the native pc theIP into a bytecode pc integer object and answer it. See contextInstructionPointer:frame: for the explanation." | maybeClosure methodObj cogMethod startBcpc bcpc | <inline: false> <var: #cogMethod type: #'CogMethod *'> + theIP = HasBeenReturnedFromMCPC ifTrue: - theIP = HasBeenReturnedFromMCPC signedIntFromLong ifTrue: [^objectMemory nilObject]. maybeClosure := objectMemory fetchPointer: ClosureIndex ofObject: aOnceMarriedContext. methodObj := objectMemory fetchPointer: MethodIndex ofObject: aOnceMarriedContext. maybeClosure ~= objectMemory nilObject ifTrue: [self assert: (theIP signedBitShift: -16) < -1. startBcpc := self startPCOfClosure: maybeClosure] ifFalse: [self assert: (theIP signedBitShift: -16) = -1. startBcpc := self startPCOfMethod: methodObj]. cogMethod := self ensureMethodIsCogged: methodObj. bcpc := self bytecodePCFor: theIP cogMethod: cogMethod startBcpc: startBcpc. self assert: bcpc >= (self startPCOfMethod: methodObj). "If there's a CallPrimitive we need to skip it." (bcpc = startBcpc and: [maybeClosure = objectMemory nilObject and: [self methodHeaderHasPrimitive: cogMethod methodHeader]]) ifTrue: [bcpc := bcpc + (self sizeOfCallPrimitiveBytecode: cogMethod methodHeader)]. ^objectMemory integerObjectOf: bcpc + 1! Item was changed: ----- Method: CoInterpreter>>tearDownAndRebuildFrameForCannotReturnBaseFrameReturnFrom:to:returnValue: (in category 'return bytecodes') ----- tearDownAndRebuildFrameForCannotReturnBaseFrameReturnFrom: contextToReturnFrom to: contextToReturnTo returnValue: returnValue "Handle the cannot return response for a base frame return to an invalid context. Build a new base frame for the context in the cannot resume state ready for the send of cannotReturn:. Since we have returned from the base frame of the page the context is effectively widowed. But its sender needs to be contextToReturnTo, and its pc needs to be the HasBeenReturnedFromMCPC marker. So bereave it (as a side-effect of isWidowedContext:), assign contextToReturnTo to sender, and rebuild its frame, which will have the ceCannotResumePC as its pc. Finally push returnValue and set instructionPointer to ceCannotResumePC in preparation for the send." | newPage | <inline: false> <var: #newPage type: #'StackPage *'> self assert: (stackPage ~= 0 and: [stackPage isFree]). self isWidowedContext: contextToReturnFrom. self assert: (self isMarriedOrWidowedContext: contextToReturnFrom) not. + objectMemory + storePointer: SenderIndex ofObject: contextToReturnFrom withValue: contextToReturnTo; + storePointer: InstructionPointerIndex ofObject: contextToReturnFrom withValue: HasBeenReturnedFromMCPCOop. - objectMemory storePointer: SenderIndex ofObject: contextToReturnFrom withValue: contextToReturnTo. - objectMemory storePointer: InstructionPointerIndex ofObject: contextToReturnFrom withValue: HasBeenReturnedFromMCPC. "void the instructionPointer to stop it being incorrectly updated in a code compaction in makeBaseFrameFor:." instructionPointer := 0. newPage := self makeBaseFrameFor: contextToReturnFrom. self assert: stackPage = newPage. self setStackPageAndLimit: newPage. framePointer := stackPage headFP. stackPointer := stackPage headSP. self assert: self stackTop = cogit ceCannotResumePC. "overwrite the ceSendCannotResumePC on the stack. If ever re-executed the returnValue will be taken from top-of-stack by ceCannotResume." self stackTopPut: returnValue. "Assign it to instructionPointer as externalCannotReturn:from: pushes it." + instructionPointer := cogit ceCannotResumePC! - instructionPointer := cogit ceCannotResumePC - ! Item was changed: ----- Method: CogIA32Compiler>>genRestoreRegs (in category 'abi') ----- genRestoreRegs + EAX to: EDI do: + [:reg| + (reg between: ESP and: EBP) ifFalse: + [cogit PopR: reg]]. - cogit - PopR: EAX; - PopR: EBX; - PopR: ECX; - PopR: EDX; - PopR: ESI; - PopR: EDI. ^0! Item was changed: ----- Method: CogIA32Compiler>>genSaveRegisters (in category 'abi') ----- genSaveRegisters "Save the general purpose registers for a trampoline call." + self assert: (EDI > EAX and: [EDI - EAX + 1 = 8]). + EDI to: EAX by: -1 do: + [:reg| + (reg between: ESP and: EBP) ifFalse: + [cogit PushR: reg]]. - self assert: (EDI > EAX and: [EDI - EAX + 1 = 6]). - EDI to: EAX by: -1 do: [:reg| cogit PushR: reg]. ^0! Item was changed: ----- Method: CogIA32Compiler>>rewriteCallAt:target: (in category 'inline cacheing') ----- rewriteCallAt: callSiteReturnAddress target: callTargetAddress "Rewrite a call instruction to call a different target. This variant is used to link PICs in ceSendMiss et al, and to rewrite cached primitive calls. Answer the extent of the code change which is used to compute the range of the icache to flush." <var: #callSiteReturnAddress type: #usqInt> <var: #callTargetAddress type: #usqInt> | callDistance | "self cCode: '' inSmalltalk: [cogit disassembleFrom: callSiteReturnAddress - 10 to: callSiteReturnAddress - 1]." false ifTrue: [self assert: callTargetAddress >= cogit minCallAddress] ifFalse: [callTargetAddress >= cogit minCallAddress ifFalse: [self error: 'linking callsite to invalid address']]. callDistance := (callTargetAddress - callSiteReturnAddress) signedIntToLong. objectMemory byteAt: callSiteReturnAddress - 1 put: (callDistance >> 24 bitAnd: 16rFF); byteAt: callSiteReturnAddress - 2 put: (callDistance >> 16 bitAnd: 16rFF); byteAt: callSiteReturnAddress - 3 put: (callDistance >> 8 bitAnd: 16rFF); byteAt: callSiteReturnAddress - 4 put: (callDistance bitAnd: 16rFF). + self assert: (self callTargetFromReturnAddress: callSiteReturnAddress) = callTargetAddress. - self assert: (self callTargetFromReturnAddress: callSiteReturnAddress) signedIntToLong = callTargetAddress. "self cCode: '' inSmalltalk: [cogit disassembleFrom: callSiteReturnAddress - 10 to: callSiteReturnAddress - 1]." ^5! Item was changed: ----- Method: CogInLineLiteralsX64Compiler>>inlineCacheTagAt: (in category 'inline cacheing') ----- inlineCacheTagAt: callSiteReturnAddress "Answer the inline cache tag for the return address of a send." + ^self literal32BeforeFollowingAddress: callSiteReturnAddress - 5! - ^self thirtyTwoBitLiteralBefore: callSiteReturnAddress - 5! Item was changed: ----- Method: CogVMSimulator>>initialize (in category 'initialization') ----- initialize "Initialize the CogVMSimulator when running the interpreter inside Smalltalk. The primary responsibility of this method is to allocate Smalltalk Arrays for variables that will be declared as statically-allocated global arrays in the translated code." super initialize. transcript := Transcript. objectMemory ifNil: [objectMemory := self class objectMemoryClass simulatorClass new]. cogit ifNil: [cogit := self class cogitClass new setInterpreter: self]. objectMemory coInterpreter: self cogit: cogit. cogit numRegArgs > 0 ifTrue: [debugStackDepthDictionary := Dictionary new]. cogThreadManager ifNotNil: [super initialize]. + self assert: ConstMinusOne = (objectMemory integerObjectOf: -1). + - "Note: we must initialize ConstMinusOne & HasBeenReturnedFromMCPC differently - for simulation, due to the fact that the simulator works only with +ve 32-bit values" - ConstMinusOne := objectMemory integerObjectOf: -1. - HasBeenReturnedFromMCPC := objectMemory integerObjectOf: -1. cogMethodZone := cogit methodZone. "Because Slang can't remove intermediate implicit receivers (cogit methodZone foo doesn't reduce to foo())" enableCog := true. methodCache := Array new: MethodCacheSize. nsMethodCache := Array new: NSMethodCacheSize. atCache := Array new: AtCacheTotalSize. self flushMethodCache. cogCompiledCodeCompactionCalledFor := false. gcSemaphoreIndex := 0. externalSemaphoreSignalRequests := externalSemaphoreSignalResponses := #(). externalPrimitiveTable := CArrayAccessor on: (Array new: MaxExternalPrimitiveTableSize). externalPrimitiveTableFirstFreeIndex := 0. primitiveTable := self class primitiveTable copy. mappedPluginEntries := OrderedCollection new. objectMemory hasSpurMemoryManagerAPI ifTrue: [primitiveAccessorDepthTable := Array new: primitiveTable size. pluginList := {}. self loadNewPlugin: ''] ifFalse: [pluginList := {'' -> self }]. desiredNumStackPages := desiredEdenBytes := desiredCogCodeSize := 0. "This is initialized on loading the image, but convenient for testing stack page values..." numStackPages := self defaultNumStackPages. startMicroseconds := Time totalSeconds * 1000000. maxLiteralCountForCompile := MaxLiteralCountForCompile. minBackwardJumpCountForCompile := MinBackwardJumpCountForCompile. flagInterpretedMethods := false. "initialize InterpreterSimulator variables used for debugging" byteCount := lastPollCount := sendCount := lookupCount := 0. quitBlock := [^ self]. traceOn := true. printSends := printFrameAtEachStep := printBytecodeAtEachStep := false. myBitBlt := BitBltSimulator new setInterpreter: self. displayForm := fakeForm := 'Display has not yet been installed' asDisplayText form. eventQueue := SharedQueue new. suppressHeartbeatFlag := deferSmash := deferredSmash := false. systemAttributes := Dictionary new. primTraceLog := CArrayAccessor on: (Array new: 256 withAll: 0). primTraceLogIndex := 0. traceLog := CArrayAccessor on: (Array new: TraceBufferSize withAll: 0). traceLogIndex := 0. traceSources := TraceSources. statCodeCompactionCount := 0. statCodeCompactionUsecs := 0. extSemTabSize := 256! Item was changed: ----- Method: CogX64Compiler>>callTargetFromReturnAddress: (in category 'inline cacheing') ----- callTargetFromReturnAddress: callSiteReturnAddress "Answer the address the call immediately preceding callSiteReturnAddress will jump to." | callDistance | + callDistance := self literal32BeforeFollowingAddress: callSiteReturnAddress. - callDistance := self thirtyTwoBitLiteralBefore: callSiteReturnAddress. ^callSiteReturnAddress + callDistance signedIntFromLong! Item was changed: ----- Method: CogX64Compiler>>rewriteCallAt:target: (in category 'inline cacheing') ----- rewriteCallAt: callSiteReturnAddress target: callTargetAddress "Rewrite a call instruction to call a different target. This variant is used to link PICs in ceSendMiss et al, and to rewrite cached primitive calls. Answer the extent of the code change which is used to compute the range of the icache to flush." <var: #callSiteReturnAddress type: #usqInt> <var: #callTargetAddress type: #usqInt> | callDistance | "self cCode: '' inSmalltalk: [cogit disassembleFrom: callSiteReturnAddress - 10 to: callSiteReturnAddress - 1]." false ifTrue: [self assert: callTargetAddress >= cogit minCallAddress] ifFalse: [callTargetAddress >= cogit minCallAddress ifFalse: [self error: 'linking callsite to invalid address']]. callDistance := (callTargetAddress - callSiteReturnAddress) signedIntToLong. objectMemory byteAt: callSiteReturnAddress - 1 put: (callDistance >> 24 bitAnd: 16rFF); byteAt: callSiteReturnAddress - 2 put: (callDistance >> 16 bitAnd: 16rFF); byteAt: callSiteReturnAddress - 3 put: (callDistance >> 8 bitAnd: 16rFF); byteAt: callSiteReturnAddress - 4 put: (callDistance bitAnd: 16rFF). + self assert: (self callTargetFromReturnAddress: callSiteReturnAddress) = callTargetAddress. - self assert: (self callTargetFromReturnAddress: callSiteReturnAddress) signedIntToLong = callTargetAddress. "self cCode: '' inSmalltalk: [cogit disassembleFrom: callSiteReturnAddress - 10 to: callSiteReturnAddress - 1]." ^5! Item was removed: - ----- Method: CogX64Compiler>>thirtyTwoBitLiteralBefore: (in category 'inline cacheing') ----- - thirtyTwoBitLiteralBefore: followingAddress - <inline: true> - ^self unalignedLong32At: followingAddress - 4! Item was changed: ----- Method: IA32ABIPlugin>>primSizeField (in category 'primitives-accessing') ----- primSizeField "Answer the signed 32- or 64-bit integer comprising the size field (the first 32- or 64-bit field)." "<Alien> primSizeField ^<Integer> <primitive: 'primSizeField' error: errorCode module: 'IA32ABI'>" | rcvr value valueOop | <export: true> rcvr := interpreterProxy stackValue: 0. + value := self cppIf: interpreterProxy bytesPerOop = 8 + ifTrue: [(self longAt: rcvr + interpreterProxy baseHeaderSize) signedIntFromLong64] + ifFalse: [(self longAt: rcvr + interpreterProxy baseHeaderSize) signedIntFromLong]. - value := (self longAt: rcvr + interpreterProxy baseHeaderSize) signedIntFromLong. valueOop := self signedMachineIntegerFor: value. ^interpreterProxy methodReturnValue: valueOop! Item was changed: ----- Method: IA32ABIPlugin>>primSizeFieldPut (in category 'primitives-accessing') ----- primSizeFieldPut "Store a signed integer into the size field (the first 32 bit field; little endian)." "<Alien> sizeFieldPut: value <Integer> ^<Integer> <primitive: 'primSizeFieldPut' error: errorCode module: 'IA32ABI'>" | rcvr value valueOop | <export: true> valueOop := interpreterProxy stackValue: 0. rcvr := interpreterProxy stackValue: 1. value := interpreterProxy signedMachineIntegerValueOf: valueOop. interpreterProxy failed ifTrue: [^interpreterProxy primitiveFailFor: PrimErrBadArgument]. + (self cppIf: interpreterProxy bytesPerOop = 8 + ifTrue: [self longAt: rcvr + interpreterProxy baseHeaderSize put: value signedIntToLong64] + ifFalse: [self longAt: rcvr + interpreterProxy baseHeaderSize put: value signedIntToLong]). - self longAt: rcvr + interpreterProxy baseHeaderSize put: value signedIntToLong. ^interpreterProxy methodReturnValue: valueOop! Item was changed: ----- Method: NewsqueakIA32ABIPlugin>>primSizeField (in category 'primitives-accessing') ----- primSizeField "Answer the signed 32- or 64-bit integer comprising the size field (the first 32- or 64-bit field)." "<Alien> primSizeField ^<Integer> <primitive: 'primSizeField' error: errorCode module: 'IA32ABI'>" | rcvr value valueOop | <export: true> rcvr := interpreterProxy stackValue: 0. + value := self cppIf: interpreterProxy bytesPerOop = 8 + ifTrue: [(self longAt: rcvr + interpreterProxy baseHeaderSize) signedIntFromLong64] + ifFalse: [(self longAt: rcvr + interpreterProxy baseHeaderSize) signedIntFromLong]. - value := (self longAt: rcvr + interpreterProxy baseHeaderSize) signedIntFromLong. valueOop := self signedMachineIntegerFor: value. ^interpreterProxy methodReturnValue: valueOop! Item was changed: ----- Method: NewsqueakIA32ABIPlugin>>primSizeFieldPut (in category 'primitives-accessing') ----- primSizeFieldPut "Store a signed integer into the size field (the first 32 bit field; little endian)." "<Alien> sizeFieldPut: value <Integer> ^<Integer> <primitive: 'primSizeFieldPut' error: errorCode module: 'IA32ABI'>" | rcvr value valueOop | <export: true> valueOop := interpreterProxy stackValue: 0. rcvr := interpreterProxy stackValue: 1. value := interpreterProxy signedMachineIntegerValueOf: valueOop. interpreterProxy failed ifTrue: [^interpreterProxy primitiveFailFor: PrimErrBadArgument]. + (self cppIf: interpreterProxy bytesPerOop = 8 + ifTrue: [self longAt: rcvr + interpreterProxy baseHeaderSize put: value signedIntToLong64] + ifFalse: [self longAt: rcvr + interpreterProxy baseHeaderSize put: value signedIntToLong]). - (interpreterProxy isOopImmutable: rcvr) ifTrue: - [^interpreterProxy primitiveFailFor: PrimErrNoModification]. - self longAt: rcvr + interpreterProxy baseHeaderSize put: value signedIntToLong. ^interpreterProxy methodReturnValue: valueOop! Item was changed: ----- Method: SpurMemoryManager>>initialize (in category 'initialization') ----- initialize "We can put all initializations that set something to 0 or to false here. In C all global variables are initialized to 0, and 0 is false." remapBuffer := Array new: RemapBufferSize. remapBufferCount := extraRootCount := 0. "see below" freeListsMask := totalFreeOldSpace := lowSpaceThreshold := 0. checkForLeaks := 0. needGCFlag := signalLowSpace := scavengeInProgress := marking := false. becomeEffectsFlags := 0. statScavenges := statIncrGCs := statFullGCs := 0. statScavengeGCUsecs := statIncrGCUsecs := statFullGCUsecs := statGCEndUsecs := 0. statSGCDeltaUsecs := statIGCDeltaUsecs := statFGCDeltaUsecs := 0. statGrowMemory := statShrinkMemory := statRootTableCount := statSurvivorCount := 0. statRootTableOverflows := statMarkCount := statSpecialMarkCount := statCompactPassCount := statCoalesces := 0. "We can initialize things that are allocated but are lazily initialized." unscannedEphemerons := SpurContiguousObjStack new. "we can initialize things that are virtual in C." scavenger := SpurGenerationScavengerSimulator new manager: self; yourself. segmentManager := SpurSegmentManager new manager: self; yourself. "We can also initialize here anything that is only for simulation." heapMap := CogCheck32BitHeapMap new. "N.B. We *don't* initialize extraRoots because we don't simulate it." + maxOldSpaceSize := self class initializationOptions ifNotNil: [:initOpts| initOpts at: #maxOldSpaceSize ifAbsent: [0]]! - maxOldSpaceSize := self class initializationOptions at: #maxOldSpaceSize ifAbsent: [0]! Item was added: + ----- Method: StackInterpreter>>allOnesAsCharStar (in category 'stack pages') ----- + allOnesAsCharStar + <inline: true> + ^(self + cCoerceSimple: (objectMemory wordSize = 8 + ifTrue: [-1 signedIntToLong64] + ifFalse: [-1 signedIntToLong]) + to: #'char *')! Item was changed: ----- Method: StackInterpreter>>assertValidStackLimits: (in category 'process primitive support') ----- assertValidStackLimits: ln <returnTypeC: #void> "Order in the stackLimit checks is important because stackLimit is smashed by interrupts. So always check for unsmashed value first to avoid race condition." self assert: (stackLimit = stackPage realStackLimit + or: [stackLimit = self allOnesAsCharStar]) - or: [stackLimit = (self cCoerceSimple: -1 signedIntToLong to: #'char *')]) l: ln. self assert: (stackPage stackLimit = stackPage realStackLimit + or: [stackPage stackLimit = self allOnesAsCharStar]) - or: [stackPage stackLimit = (self cCoerceSimple: -1 signedIntToLong to: #'char *')]) l: ln! Item was changed: ----- Method: StackInterpreter>>forceInterruptCheck (in category 'process primitive support') ----- forceInterruptCheck "Force an interrupt check ASAP. Must set the stack page's limit before stackLimit to avoid a race condition if this is called from an interrupt handler." | thePage iccFunc | <inline: false> <var: #thePage type: #'StackPage *'> <var: #iccFunc declareC: 'void (*iccFunc)()'> "Do _not_ set stackLimit until the stack system has been initialized. stackLimit is the initialization flag for the stack system." stackLimit = 0 ifTrue: [^nil]. thePage := stackPage. (thePage notNil and: [thePage ~= 0]) ifTrue: + [thePage stackLimit: self allOnesAsCharStar]. + stackLimit := self allOnesAsCharStar. - [thePage stackLimit: (self cCoerceSimple: -1 signedIntToLong to: #'char *')]. - stackLimit := self cCoerceSimple: -1 signedIntToLong to: #'char *'. self sqLowLevelMFence. "There is a race condition if we test the function and then dereference it a second time to call it. This is called from interrupt code but at the same time other code could be clearing the interruptCheckChain via setInterruptCheckChain:." (iccFunc := interruptCheckChain) notNil ifTrue: [self perform: iccFunc]. statForceInterruptCheck := statForceInterruptCheck + 1! Item was changed: ----- Method: StackInterpreter>>makeBaseFrameFor: (in category 'frame access') ----- makeBaseFrameFor: aContext "<Integer>" "Marry aContext with the base frame of a new stack page. Build the base frame to reflect the context's state. Answer the new page." <returnTypeC: #'StackPage *'> | page pointer theMethod theIP numArgs stackPtrIndex maybeClosure rcvr | <inline: false> <var: #page type: #'StackPage *'> <var: #pointer type: #'char *'> self assert: (objectMemory isContext: aContext). self assert: (self isSingleContext: aContext). self assert: (objectMemory goodContextSize: aContext). page := stackPages newStackPage. pointer := page baseAddress. theIP := objectMemory fetchPointer: InstructionPointerIndex ofObject: aContext. theMethod := objectMemory followObjField: MethodIndex ofObject: aContext. (objectMemory isIntegerObject: theIP) ifFalse: [self error: 'context is not resumable']. theIP := objectMemory integerValueOf: theIP. rcvr := objectMemory followField: ReceiverIndex ofObject: aContext. "If the frame is a closure activation then the closure should be on the stack in + the pushed receiver position (closures receive the value[:value:] messages). - the pushed receiver position (closures receiver the value[:value:] messages). Otherwise it should be the receiver proper." maybeClosure := objectMemory fetchPointer: ClosureIndex ofObject: aContext. maybeClosure ~= objectMemory nilObject ifTrue: [(objectMemory isForwarded: maybeClosure) ifTrue: [maybeClosure := objectMemory fixFollowedField: ClosureIndex ofObject: aContext withInitialValue: maybeClosure]. numArgs := self argumentCountOfClosure: maybeClosure. stackPages longAt: pointer put: maybeClosure] ifFalse: [| header | header := objectMemory methodHeaderOf: theMethod. numArgs := self argumentCountOfMethodHeader: header. "If this is a synthetic context its IP could be pointing at the CallPrimitive opcode. If so, skip it." + ((self methodHeaderHasPrimitive: header) + and: [theIP = (1 + (objectMemory lastPointerOfMethodHeader: header))]) ifTrue: - (theIP signedIntFromLong > 0 - and: [(self methodHeaderHasPrimitive: header) - and: [theIP = (1 + (objectMemory lastPointerOfMethodHeader: header))]]) ifTrue: [theIP := theIP + (self sizeOfCallPrimitiveBytecode: header)]. stackPages longAt: pointer put: rcvr]. "Put the arguments on the stack" 1 to: numArgs do: [:i| stackPages longAt: (pointer := pointer - objectMemory wordSize) put: (objectMemory fetchPointer: ReceiverIndex + i ofObject: aContext)]. "saved caller ip is sender context in base frame" stackPages longAt: (pointer := pointer - objectMemory wordSize) put: (objectMemory followObjField: SenderIndex ofObject: aContext). "base frame's saved fp is null" stackPages longAt: (pointer := pointer - objectMemory wordSize) put: 0. page baseFP: pointer; headFP: pointer. stackPages longAt: (pointer := pointer - objectMemory wordSize) put: theMethod. stackPages longAt: (pointer := pointer - objectMemory wordSize) put: (self encodeFrameFieldHasContext: true isBlock: maybeClosure ~= objectMemory nilObject numArgs: numArgs). self assert: (self frameHasContext: page baseFP). self assert: (self frameNumArgs: page baseFP) == numArgs. stackPages longAt: (pointer := pointer - objectMemory wordSize) put: aContext. stackPages longAt: (pointer := pointer - objectMemory wordSize) put: rcvr. stackPtrIndex := self quickFetchInteger: StackPointerIndex ofObject: aContext. self assert: ReceiverIndex + stackPtrIndex < (objectMemory lengthOf: aContext). numArgs + 1 to: stackPtrIndex do: [:i| stackPages longAt: (pointer := pointer - objectMemory wordSize) put: (objectMemory fetchPointer: ReceiverIndex + i ofObject: aContext)]. "top of stack is the instruction pointer" theIP := self iframeInstructionPointerForIndex: theIP method: theMethod. stackPages longAt: (pointer := pointer - objectMemory wordSize) put: theIP. page headSP: pointer. self assert: (self context: aContext hasValidInversePCMappingOf: theIP in: page baseFP). "Mark context as married by setting its sender to the frame pointer plus SmallInteger tags and the InstructionPointer to the saved fp (which ensures correct alignment w.r.t. the frame when we check for validity) plus SmallInteger tags." objectMemory storePointerUnchecked: SenderIndex ofObject: aContext withValue: (self withSmallIntegerTags: page baseFP). objectMemory storePointerUnchecked: InstructionPointerIndex ofObject: aContext withValue: (self withSmallIntegerTags: 0). self assert: (objectMemory isIntegerObject: (objectMemory fetchPointer: SenderIndex ofObject: aContext)). self assert: (self frameOfMarriedContext: aContext) = page baseFP. self assert: (self validStackPageBaseFrame: page). ^page! Item was changed: ----- Method: StackInterpreter>>setStackPageAndLimit: (in category 'stack pages') ----- setStackPageAndLimit: thePage "Set stackPage to a different page. Set stackLimit unless it has been smashed. Make the stackPage the most recently used" <inline: true> <var: #thePage type: #'StackPage *'> self assert: thePage ~= 0. stackPage := thePage. + stackLimit ~= self allOnesAsCharStar ifTrue: - stackLimit ~= (self cCoerceSimple: -1 signedIntToLong to: #'char *') ifTrue: [stackLimit := stackPage stackLimit]. stackPages markStackPageMostRecentlyUsed: thePage! Item was changed: ----- Method: StackInterpreterSimulator>>initialize (in category 'initialization') ----- initialize "Initialize the StackInterpreterSimulator when running the interpreter inside Smalltalk. The primary responsibility of this method is to allocate Smalltalk Arrays for variables that will be declared as statically-allocated global arrays in the translated code." super initialize. bootstrapping := false. transcript := Transcript. objectMemory ifNil: [objectMemory := self class objectMemoryClass simulatorClass new]. objectMemory coInterpreter: self. + self assert: ConstMinusOne = (objectMemory integerObjectOf: -1). - "Note: we must initialize ConstMinusOne differently for simulation, - due to the fact that the simulator works only with +ve 32-bit values" - ConstMinusOne := objectMemory integerObjectOf: -1. methodCache := Array new: MethodCacheSize. nsMethodCache := Array new: NSMethodCacheSize. atCache := Array new: AtCacheTotalSize. self flushMethodCache. gcSemaphoreIndex := 0. externalSemaphoreSignalRequests := externalSemaphoreSignalResponses := #(). externalPrimitiveTable := CArrayAccessor on: (Array new: MaxExternalPrimitiveTableSize). externalPrimitiveTableFirstFreeIndex := 0. primitiveTable := self class primitiveTable copy. mappedPluginEntries := OrderedCollection new. objectMemory hasSpurMemoryManagerAPI ifTrue: [primitiveAccessorDepthTable := Array new: primitiveTable size. pluginList := {}. self loadNewPlugin: ''] ifFalse: [pluginList := {'' -> self }]. desiredNumStackPages := desiredEdenBytes := 0. "This is initialized on loading the image, but convenient for testing stack page values..." numStackPages := self defaultNumStackPages. startMicroseconds := Time totalSeconds * 1000000. "initialize InterpreterSimulator variables used for debugging" byteCount := sendCount := lookupCount := 0. quitBlock := [^self]. traceOn := true. printSends := printReturns := printFrameAtEachStep := printBytecodeAtEachStep := false. myBitBlt := BitBltSimulator new setInterpreter: self. displayForm := fakeForm := 'Display has not yet been installed' asDisplayText form. eventQueue := SharedQueue new. suppressHeartbeatFlag := false. systemAttributes := Dictionary new. extSemTabSize := 256. disableBooleanCheat := false. assertVEPAES := true. "a flag so the assertValidExecutionPointers can be disabled for simulation speed"! Item was changed: ----- Method: TMethod>>isFunctional (in category 'inlining') ----- isFunctional "Answer true if the receiver is a functional method. That is, if it consists of a single return statement of an expression that contains no other returns. Answer false for methods with return types other than the simple integer types to work around bugs in the inliner." parseTree statements isEmpty ifTrue: [^false]. parseTree statements last isReturn ifFalse: [^false]. parseTree statements size = 1 ifFalse: [(parseTree statements size = 2 and: [parseTree statements first isSend and: [parseTree statements first selector == #flag:]]) ifFalse: [^false]]. parseTree statements last expression nodesDo: [ :n | n isReturn ifTrue: [^false]]. + ^#(sqInt usqInt sqLong usqLong #'sqInt *' #'CogMethod *' #'char *') includes: returnType! - ^#(sqInt usqInt sqLong usqLong #'sqInt *' #'CogMethod *') includes: returnType! Item was changed: + ----- Method: TSendNode>>hasSideEffect (in category 'testing') ----- - ----- Method: TSendNode>>hasSideEffect (in category 'as yet unclassified') ----- hasSideEffect "Answer if the parse tree rooted at this node has a side-effect or not." ^(#(#+ #- #* #/ #// #\\ #= #== #~= #~~) includes: selector) not!

1 0

Re: [Vm-dev] VM Maker: VMMaker.oscog-rmacnak.1595.mcz
by Eliot Miranda 15 Dec '15

15 Dec '15

> On Dec 15, 2015, at 12:15 AM, commits(a)source.squeak.org wrote: > > > Ryan Macnak uploaded a new version of VMMaker to project VM Maker: > http://source.squeak.org/VMMaker/VMMaker.oscog-rmacnak.1595.mcz > > ==================== Summary ==================== > > Name: VMMaker.oscog-rmacnak.1595 > Author: rmacnak > Time: 14 December 2015, 7:29:18.283 pm > UUID: 3aac3671-b1ff-45b9-8ed0-f3ecc5bca0b3 > Ancestors: VMMaker.oscog-eem.1594 > > MIPS: Complete simulation of the Newspeak test suite! (~30 billion instructions) (Modulo Aliens, which don't work under the IA32 simulation either.) Woot!! > Fix off-by-8 in patching I-type branches. Bug had the effect of skipping loading the cPIC address for a cPIC miss if the cPIC was created for an MNU case. > > Handle PushCw in storeLiteral:beforeFollowingAddress:. > > Add the GC's variant of rewriteInlineCacheTag:at:. > > Fix MNU in followForwardingPointersInScheduler. > > =============== Diff against VMMaker.oscog-eem.1594 =============== > > Item was changed: > ----- Method: CogMIPSELCompiler>>rewriteITypeBranchAtAddress:target: (in category 'inline cacheing') ----- > rewriteITypeBranchAtAddress: mcpc target: newTarget > + | newDisplacement oldInstruction newInstruction | > + newDisplacement := newTarget - (mcpc + 4). "Displacement is relative to delay slot." > + newDisplacement := newDisplacement >> 2. "Displacement is in words." > - | newDisplacement oldInstruction newInstruction | > - newDisplacement := newTarget - (mcpc - 4). "Displacement relative to delay slot" > - newDisplacement := newDisplacement >> 2. > > self assert: (newDisplacement between: -16r8000 and: 16r7FFF). > newDisplacement < 0 > ifTrue: [newDisplacement := newDisplacement + 16r10000] > ifFalse: [newDisplacement := newDisplacement]. > self assert: (newDisplacement between: 0 and: 16rFFFF). > > oldInstruction := objectMemory longAt: mcpc. > newInstruction := (oldInstruction bitAnd: 16rFFFF0000) bitOr: newDisplacement. > > objectMemory longAt: mcpc put: newInstruction.! > > Item was added: > + ----- Method: CogMIPSELCompiler>>rewriteInlineCacheTag:at: (in category 'inline cacheing') ----- > + rewriteInlineCacheTag: cacheTag at: callSiteReturnAddress > + "Rewrite an inline cache with a new tag. This variant is used > + by the garbage collector." > + > + "MoveCwR ClassReg selectorIndex/expectedClass > + Call: unlinked send stub/expectedTarget > + Push ReceiverResult <-- callSiteReturnAddress" > + > + "lui s3, selector/tagHigh > + ori s3, s3, selector/tagLow > + lui t9, stub/targetHigh > + ori t9, t9, stub/targetLow > + jalr t9 > + nop (delay slot) > + ... <-- callSiteReturnAddress" > + > + <var: #callSiteReturnAddress type: #usqInt> > + <var: #callTargetAddress type: #usqInt> > + self assert: (self opcodeAtAddress: callSiteReturnAddress - 24) = LUI. > + self assert: (self opcodeAtAddress: callSiteReturnAddress - 20) = ORI. > + self assert: (self opcodeAtAddress: callSiteReturnAddress - 16) = LUI. > + self assert: (self opcodeAtAddress: callSiteReturnAddress - 12) = ORI. > + self assert: (self opcodeAtAddress: callSiteReturnAddress - 8) = SPECIAL. > + self assert: (self functionAtAddress: callSiteReturnAddress - 8) = JALR. > + self assert: (objectMemory longAt: callSiteReturnAddress - 4) = self nop. > + "cogit disassembleFrom: callSiteReturnAddress - 24 to: callSiteReturnAddress." > + > + self literalAtAddress: callSiteReturnAddress - 20 put: cacheTag. > + > + self assert: (self opcodeAtAddress: callSiteReturnAddress - 24) = LUI. > + self assert: (self opcodeAtAddress: callSiteReturnAddress - 20) = ORI. > + self assert: (self opcodeAtAddress: callSiteReturnAddress - 16) = LUI. > + self assert: (self opcodeAtAddress: callSiteReturnAddress - 12) = ORI. > + self assert: (self opcodeAtAddress: callSiteReturnAddress - 8) = SPECIAL. > + self assert: (self functionAtAddress: callSiteReturnAddress - 8) = JALR. > + self assert: (objectMemory longAt: callSiteReturnAddress - 4) = self nop. > + "cogit disassembleFrom: callSiteReturnAddress - 24 to: callSiteReturnAddress."! > > Item was changed: > ----- Method: CogMIPSELCompiler>>storeLiteral:beforeFollowingAddress: (in category 'inline cacheing') ----- > storeLiteral: literal beforeFollowingAddress: followingAddress > "Rewrite the long constant loaded by a MoveCwR or PushCwR before the given address" > - | lastOpcode lastFunction oriAddress | > self flag: #bogus. "The caller ought to know what it is patching, and this should be split into separate methods with stricter checking." > > + "Cmp/MoveCwR > + pc-8 lui rx, uper > + pc-4 ori rx, rx, lower" > + (self opcodeAtAddress: followingAddress - 4) = ORI ifTrue: > + [^self literalAtAddress: followingAddress - 4 put: literal]. > + > + "PushCw > + pc-16 lui at, upper > + pc-12 ori at, at, lower > + pc-8 addiu sp, sp, -4 > + pc-4 sw at, 0(sp)" > + ((self opcodeAtAddress: followingAddress - 4) = SW and: > + [(self opcodeAtAddress: followingAddress - 8) = ADDIU]) ifTrue: > + [^self literalAtAddress: followingAddress - 12 put: literal]. > + > + self unreachable. > + ^0! > - lastOpcode := self opcodeAtAddress: followingAddress - 4. > - lastFunction := self functionAtAddress: followingAddress - 4. > - oriAddress := 0. > - lastOpcode = ORI ifTrue: [oriAddress := followingAddress - 4]. > - lastOpcode = ADDIU ifTrue: [oriAddress := followingAddress - 16]. > - lastOpcode = SPECIAL ifTrue: [lastFunction = SUBU ifTrue: [oriAddress := followingAddress - 8]]. > - self assert: oriAddress ~= 0. > - ^self literalAtAddress: oriAddress put: literal! > > Item was changed: > ----- Method: StackInterpreter>>followForwardingPointersInScheduler (in category 'object memory support') ----- > followForwardingPointersInScheduler > | schedAssoc sched procLists | > schedAssoc := objectMemory splObj: SchedulerAssociation. > "the GC follows pointers in the special objects array for us." > self assert: (objectMemory isForwarded: schedAssoc) not. > > "Make sure the active process has been followed." > + objectMemory followForwardedObjectFields: schedAssoc toDepth: 1. > - self followForwardedObjectFields: schedAssoc toDepth: 1. > > sched := objectMemory fetchPointer: ValueIndex ofObject: schedAssoc. > > procLists := objectMemory followObjField: ProcessListsIndex ofObject: sched. > > "Follow all links in the process list to ensure the lists are valid." > 0 to: (objectMemory numSlotsOf: procLists) - 1 do: > [:i| | list first last next | > list := objectMemory followObjField: i ofObject: procLists. > first := objectMemory followObjField: FirstLinkIndex ofObject: list. > last := objectMemory followObjField: LastLinkIndex ofObject: list. > [first ~= last] whileTrue: > [next := objectMemory followObjField: NextLinkIndex ofObject: first. > first := next]] > ! >

1 0

Mac/iOS VM obsolete SetMacFileTypeAndCreator
by Javier Diaz-Reinoso 15 Dec '15

15 Dec '15

I find that the actual CogVM and also the new branch Cocoa Cog and iOS VM are setting the Type and Creator info of files (work in Mac, not in iOS devices), this thing are about 14 years obsolete, I think is time to retire this code. I find the code in the files: - Cog/platforms/Cross/plugins/FilePlugin/sqFilePluginBasicPrims.c sqFileOpen - Cog/platforms/Mac OS/plugins/AsynchFilePlugin/sqMacAsyncFilePrims.c asyncFileOpen apart from be obsolete interfere with the correct display of the icon of the file.

3 2

Re: [Vm-dev] VM Maker: VMMaker.oscog-eem.1594.mcz
by Ryan Macnak 15 Dec '15

15 Dec '15

JIT builds still failing <https://travis-ci.org/newspeaklanguage/nsvm-linux-ci/jobs/96659717>. /home/travis/build/newspeaklanguage/nsvm-linux-ci/oscogvm/nsspursrc/vm/cogitIA32.c: In function ‘genNSSendnumArgsdepthsendTable’: /home/travis/build/newspeaklanguage/nsvm-linux-ci/oscogvm/nsspursrc/vm/cogitIA32.c:23996:15: warning: assignment makes integer from pointer without a cast [enabled by default] /home/travis/build/newspeaklanguage/nsvm-linux-ci/oscogvm/nsspursrc/vm/cogitIA32.c:23997:10: error: called object ‘selector’ is not a function /home/travis/build/newspeaklanguage/nsvm-linux-ci/oscogvm/nsspursrc/vm/cogitIA32.c:23998:9: error: called object ‘numArgs’ is not a function /home/travis/build/newspeaklanguage/nsvm-linux-ci/oscogvm/nsspursrc/vm/cogitIA32.c:23999:7: error: called object ‘depth’ is not a function On Sun, Dec 13, 2015 at 5:25 PM, <commits(a)source.squeak.org> wrote: > > Eliot Miranda uploaded a new version of VMMaker to project VM Maker: > http://source.squeak.org/VMMaker/VMMaker.oscog-eem.1594.mcz > > ==================== Summary ==================== > > Name: VMMaker.oscog-eem.1594 > Author: eem > Time: 13 December 2015, 5:24:57.076 pm > UUID: 79da8b81-d1f3-469a-869c-16c79d12649a > Ancestors: VMMaker.oscog-eem.1593 > > Cogit: > Don't inline AndCq:R:R: because its translation contains a jump and hence > won't work in a statement list expression (e.g. as in x86's > genJumpSmallInteger:scratchReg:). > > Nuke genJump[Not]SmallInteger:scratch: in favour of > genJump[Not]SmallInteger:scratchReg: > > Slang: > Eliminate leaves in statement lists generated as expressions. > > =============== Diff against VMMaker.oscog-eem.1593 =============== > > Item was removed: > - ----- Method: CogObjectRepresentation>>genJumpNotSmallInteger:scratch: > (in category 'compile abstract instructions') ----- > - genJumpNotSmallInteger: aRegister scratch: scratchReg > - "Generate a test for aRegister containing a SmallInteger and a > jump if not, answering the jump. > - If necessary use scratch reg (since testing for SmallInteger may > be destructive)." > - <returnTypeC: #'AbstractInstruction *'> > - | jumpNotInt | > - <inline: true> > - <var: 'jumpNotInt' type: #'AbstractInstruction *'> > - jumpNotInt := self genJumpNotSmallInteger: aRegister. > - jumpNotInt asInteger = UnimplementedOperation ifTrue: > - [cogit MoveR: aRegister R: scratchReg. > - jumpNotInt := self genJumpNotSmallIntegerInScratchReg: > TempReg]. > - ^jumpNotInt! > > Item was changed: > ----- Method: > CogObjectRepresentation>>genJumpNotSmallInteger:scratchReg: (in category > 'compile abstract instructions') ----- > genJumpNotSmallInteger: aRegister scratchReg: scratch > "Generate a compare and branch to test if aRegister contains other > than a SmallInteger. > Answer the jump. Use scratch if required. Subclasses will > override if scratch is needed." > + <inline: true> > - <returnTypeC: #'AbstractInstruction *'> > ^self genJumpNotSmallInteger: aRegister! > > Item was removed: > - ----- Method: CogObjectRepresentation>>genJumpSmallInteger:scratch: (in > category 'compile abstract instructions') ----- > - genJumpSmallInteger: aRegister scratch: scratchReg > - "Generate a test for aRegister containing a SmallInteger and a > jump if so, answering the jump. > - If necessary use scratch reg (since testing for SmallInteger may > be destructive)." > - <returnTypeC: #'AbstractInstruction *'> > - | jumpInt | > - <inline: true> > - <var: 'jumpInt' type: #'AbstractInstruction *'> > - jumpInt := self genJumpSmallInteger: aRegister. > - jumpInt asInteger = UnimplementedOperation ifTrue: > - [cogit MoveR: aRegister R: scratchReg. > - jumpInt := self genJumpSmallIntegerInScratchReg: TempReg]. > - ^jumpInt! > > Item was changed: > ----- Method: CogObjectRepresentation>>genJumpSmallInteger:scratchReg: > (in category 'compile abstract instructions') ----- > genJumpSmallInteger: aRegister scratchReg: scratch > "Generate a compare and branch to test if aRegister contains a > SmallInteger. > Answer the jump. Use scratch if required. Subclasses will > override if scratch is needed." > - <returnTypeC: #'AbstractInstruction *'> > ^self genJumpSmallInteger: aRegister! > > Item was changed: > ----- Method: CogObjectRepresentationFor32BitSpur>>genInnerPrimitiveAt: > (in category 'primitive generators') ----- > genInnerPrimitiveAt: retNoffset > "Implement the guts of primitiveAt" > | formatReg convertToIntAndReturn > jumpNotIndexable jumpImmediate jumpBadIndex > jumpIsBytes jumpIsShorts jumpIsWords jumpWordTooBig jumpIsArray > jumpHasFixedFields jumpIsContext > jumpBytesOutOfBounds jumpShortsOutOfBounds jumpWordsOutOfBounds > jumpArrayOutOfBounds jumpFixedFieldsOutOfBounds | > <inline: true> > "c.f. StackInterpreter>>stSizeOf: > SpurMemoryManager>>lengthOf:format: fixedFieldsOf:format:length:" > <var: #jumpIsBytes type: #'AbstractInstruction *'> > <var: #jumpIsShorts type: #'AbstractInstruction *'> > <var: #jumpBadIndex type: #'AbstractInstruction *'> > <var: #jumpIsContext type: #'AbstractInstruction *'> > <var: #jumpImmediate type: #'AbstractInstruction *'> > <var: #jumpWordTooBig type: #'AbstractInstruction *'> > <var: #jumpNotIndexable type: #'AbstractInstruction *'> > <var: #jumpHasFixedFields type: #'AbstractInstruction *'> > <var: #convertToIntAndReturn type: #'AbstractInstruction *'> > <var: #jumpArrayOutOfBounds type: #'AbstractInstruction *'> > <var: #jumpBytesOutOfBounds type: #'AbstractInstruction *'> > <var: #jumpShortsOutOfBounds type: #'AbstractInstruction *'> > <var: #jumpWordsOutOfBounds type: #'AbstractInstruction *'> > <var: #jumpFixedFieldsOutOfBounds type: #'AbstractInstruction *'> > > jumpImmediate := self genJumpImmediate: ReceiverResultReg. > cogit MoveR: Arg0Reg R: Arg1Reg. > + jumpBadIndex := self genJumpNotSmallInteger: Arg0Reg scratchReg: > TempReg. > - jumpBadIndex := self genJumpNotSmallInteger: Arg0Reg scratch: > TempReg. > self genConvertSmallIntegerToIntegerInReg: Arg1Reg. > cogit SubCq: 1 R: Arg1Reg. "1-rel => 0-rel" > > "formatReg := self formatOf: ReceiverResultReg" > self genGetFormatOf: ReceiverResultReg > into: (formatReg := SendNumArgsReg) > leastSignificantHalfOfBaseHeaderIntoScratch: TempReg. > > self genGetNumSlotsOf: ReceiverResultReg into: ClassReg. > > "dispatch on format in a combination of highest dynamic frequency > order first and convenience. > 0 = 0 sized objects (UndefinedObject True False et al) > 1 = non-indexable objects with inst vars (Point et al) > 2 = indexable objects with no inst vars (Array et al) > 3 = indexable objects with inst vars (MethodContext > AdditionalMethodState et al) > 4 = weak indexable objects with inst vars (WeakArray et > al) > 5 = weak non-indexable objects with inst vars > (ephemerons) (Ephemeron) > 6 unused, reserved for exotic pointer objects? > 7 Forwarded Object, 1st field is pointer, rest of fields > are ignored > 8 unused, reserved for exotic non-pointer objects? > 9 (?) 64-bit indexable > 10 - 11 32-bit indexable > 12 - 15 16-bit indexable > 16 - 23 byte indexable > 24 - 31 compiled method" > cogit CmpCq: objectMemory firstByteFormat R: formatReg. > jumpIsBytes := cogit JumpAboveOrEqual: 0. > cogit CmpCq: objectMemory > arrayFormat R: formatReg. > jumpIsArray := cogit JumpZero: 0. > jumpNotIndexable := cogit JumpBelow: 0. > cogit CmpCq: objectMemory > weakArrayFormat R: formatReg. > jumpHasFixedFields := cogit JumpBelowOrEqual: 0. > cogit CmpCq: objectMemory > firstShortFormat R: formatReg. > jumpIsShorts := cogit JumpAboveOrEqual: 0. > cogit CmpCq: objectMemory > firstLongFormat R: formatReg. > jumpIsWords := cogit JumpAboveOrEqual: 0. > "For now ignore 64-bit indexability." > jumpNotIndexable jmpTarget: cogit Label. > jumpNotIndexable := cogit Jump: 0. > > jumpIsBytes jmpTarget: > (cogit LogicalShiftLeftCq: objectMemory shiftForWord R: > ClassReg). > cogit AndCq: objectMemory wordSize - 1 R: formatReg. > cogit SubR: formatReg R: ClassReg; > CmpR: Arg1Reg R: ClassReg. > jumpBytesOutOfBounds := cogit JumpBelowOrEqual: 0. > cogit AddCq: objectMemory baseHeaderSize R: Arg1Reg. > cogit backEnd byteReadsZeroExtend > ifTrue: > [cogit MoveXbr: Arg1Reg R: ReceiverResultReg R: > ReceiverResultReg] > ifFalse: > [cogit "formatReg already contains a value <= > 16r1f, so no need to zero it" > MoveXbr: Arg1Reg R: ReceiverResultReg R: > formatReg; > MoveR: formatReg R: ReceiverResultReg]. > convertToIntAndReturn := cogit Label. > self genConvertIntegerToSmallIntegerInReg: ReceiverResultReg. > cogit RetN: retNoffset. > > jumpIsShorts jmpTarget: > (cogit LogicalShiftLeftCq: objectMemory shiftForWord - 1 > R: ClassReg). > cogit AndCq: 1 R: formatReg. > cogit SubR: formatReg R: ClassReg; > CmpR: Arg1Reg R: ClassReg. > jumpShortsOutOfBounds := cogit JumpBelowOrEqual: 0. > cogit AddR: Arg1Reg R: ReceiverResultReg. > cogit MoveM16: objectMemory baseHeaderSize r: ReceiverResultReg R: > ReceiverResultReg. > cogit Jump: convertToIntAndReturn. > > jumpIsWords jmpTarget: > (cogit CmpR: Arg1Reg R: ClassReg). > jumpWordsOutOfBounds := cogit JumpBelowOrEqual: 0. > cogit AddCq: objectMemory baseHeaderSize >> objectMemory > shiftForWord R: Arg1Reg. > cogit MoveXwr: Arg1Reg R: ReceiverResultReg R: TempReg. > cogit SubCq: objectMemory baseHeaderSize >> objectMemory > shiftForWord R: Arg1Reg. > jumpWordTooBig := self jumpNotSmallIntegerUnsignedValueInRegister: > TempReg. > cogit MoveR: TempReg R: ReceiverResultReg. > cogit Jump: convertToIntAndReturn. > > jumpHasFixedFields jmpTarget: > (cogit AndCq: objectMemory classIndexMask R: TempReg). > cogit MoveR: TempReg R: formatReg. > cogit CmpCq: ClassMethodContextCompactIndex R: TempReg. > jumpIsContext := cogit JumpZero: 0. > cogit PushR: ClassReg. > self genGetClassObjectOfClassIndex: formatReg into: ClassReg > scratchReg: TempReg. > self genLoadSlot: InstanceSpecificationIndex sourceReg: ClassReg > destReg: formatReg. > cogit PopR: ClassReg. > self genConvertSmallIntegerToIntegerInReg: formatReg. > cogit > AndCq: objectMemory fixedFieldsOfClassFormatMask R: > formatReg; > SubR: formatReg R: ClassReg; > CmpR: Arg1Reg R: ClassReg. > jumpFixedFieldsOutOfBounds := cogit JumpBelowOrEqual: 0. > "index is (formatReg (fixed fields) + Arg1Reg (0-rel index)) * > wordSize + baseHeaderSize" > cogit AddR: formatReg R: Arg1Reg. > cogit AddCq: objectMemory baseHeaderSize >> objectMemory > shiftForWord R: Arg1Reg. > cogit MoveXwr: Arg1Reg R: ReceiverResultReg R: ReceiverResultReg. > cogit RetN: retNoffset. > > jumpIsArray jmpTarget: > (cogit CmpR: Arg1Reg R: ClassReg). > jumpArrayOutOfBounds := cogit JumpBelowOrEqual: 0. > cogit AddCq: objectMemory baseHeaderSize >> objectMemory > shiftForWord R: Arg1Reg. > cogit MoveXwr: Arg1Reg R: ReceiverResultReg R: ReceiverResultReg. > cogit RetN: retNoffset. > > jumpFixedFieldsOutOfBounds jmpTarget: > (jumpArrayOutOfBounds jmpTarget: > (jumpBytesOutOfBounds jmpTarget: > (jumpShortsOutOfBounds jmpTarget: > (jumpWordsOutOfBounds jmpTarget: > (jumpWordTooBig jmpTarget: > (jumpNotIndexable jmpTarget: > (jumpIsContext jmpTarget: > (jumpBadIndex jmpTarget: > (jumpImmediate jmpTarget: cogit Label))))))))). > > ^0! > > Item was changed: > ----- Method: CogObjectRepresentationFor64BitSpur>>genInnerPrimitiveAt: > (in category 'primitive generators') ----- > genInnerPrimitiveAt: retNoffset > "Implement the guts of primitiveAt" > | formatReg convertToIntAndReturn > jumpNotIndexable jumpImmediate jumpBadIndex > jumpIsBytes jumpIsShorts jumpIsWords jumpIsArray > jumpHasFixedFields jumpIsContext > jumpBytesOutOfBounds jumpShortsOutOfBounds jumpWordsOutOfBounds > jumpArrayOutOfBounds jumpFixedFieldsOutOfBounds | > <inline: true> > "c.f. StackInterpreter>>stSizeOf: > SpurMemoryManager>>lengthOf:format: fixedFieldsOf:format:length:" > <var: #jumpIsBytes type: #'AbstractInstruction *'> > <var: #jumpIsShorts type: #'AbstractInstruction *'> > <var: #jumpBadIndex type: #'AbstractInstruction *'> > <var: #jumpIsContext type: #'AbstractInstruction *'> > <var: #jumpImmediate type: #'AbstractInstruction *'> > <var: #jumpNotIndexable type: #'AbstractInstruction *'> > <var: #jumpHasFixedFields type: #'AbstractInstruction *'> > <var: #convertToIntAndReturn type: #'AbstractInstruction *'> > <var: #jumpArrayOutOfBounds type: #'AbstractInstruction *'> > <var: #jumpBytesOutOfBounds type: #'AbstractInstruction *'> > <var: #jumpShortsOutOfBounds type: #'AbstractInstruction *'> > <var: #jumpWordsOutOfBounds type: #'AbstractInstruction *'> > <var: #jumpFixedFieldsOutOfBounds type: #'AbstractInstruction *'> > > jumpImmediate := self genJumpImmediate: ReceiverResultReg. > cogit MoveR: Arg0Reg R: Arg1Reg. > + jumpBadIndex := self genJumpNotSmallInteger: Arg0Reg scratchReg: > TempReg. > - jumpBadIndex := self genJumpNotSmallInteger: Arg0Reg scratch: > TempReg. > self genConvertSmallIntegerToIntegerInReg: Arg1Reg. > cogit SubCq: 1 R: Arg1Reg. "1-rel => 0-rel" > > "formatReg := self formatOf: ReceiverResultReg" > self genGetFormatOf: ReceiverResultReg > into: (formatReg := SendNumArgsReg) > leastSignificantHalfOfBaseHeaderIntoScratch: TempReg. > > self genGetNumSlotsOf: ReceiverResultReg into: ClassReg. > > "dispatch on format in a combination of highest dynamic frequency > order first and convenience. > 0 = 0 sized objects (UndefinedObject True False et al) > 1 = non-indexable objects with inst vars (Point et al) > 2 = indexable objects with no inst vars (Array et al) > 3 = indexable objects with inst vars (MethodContext > AdditionalMethodState et al) > 4 = weak indexable objects with inst vars (WeakArray et > al) > 5 = weak non-indexable objects with inst vars > (ephemerons) (Ephemeron) > 6 unused, reserved for exotic pointer objects? > 7 Forwarded Object, 1st field is pointer, rest of fields > are ignored > 8 unused, reserved for exotic non-pointer objects? > 9 (?) 64-bit indexable > 10 - 11 32-bit indexable > 12 - 15 16-bit indexable > 16 - 23 byte indexable > 24 - 31 compiled method" > cogit CmpCq: objectMemory firstByteFormat R: formatReg. > jumpIsBytes := cogit JumpAboveOrEqual: 0. > cogit CmpCq: objectMemory > arrayFormat R: formatReg. > jumpIsArray := cogit JumpZero: 0. > jumpNotIndexable := cogit JumpBelow: 0. > cogit CmpCq: objectMemory > weakArrayFormat R: formatReg. > jumpHasFixedFields := cogit JumpBelowOrEqual: 0. > cogit CmpCq: objectMemory > firstShortFormat R: formatReg. > jumpIsShorts := cogit JumpAboveOrEqual: 0. > cogit CmpCq: objectMemory > firstLongFormat R: formatReg. > jumpIsWords := cogit JumpAboveOrEqual: 0. > "For now ignore 64-bit indexability." > jumpNotIndexable jmpTarget: cogit Label. > jumpNotIndexable := cogit Jump: 0. > > jumpIsBytes jmpTarget: > (cogit LogicalShiftLeftCq: objectMemory shiftForWord R: > ClassReg). > cogit AndCq: objectMemory wordSize - 1 R: formatReg. > cogit SubR: formatReg R: ClassReg; > CmpR: Arg1Reg R: ClassReg. > jumpBytesOutOfBounds := cogit JumpBelowOrEqual: 0. > cogit AddCq: objectMemory baseHeaderSize R: Arg1Reg. > cogit backEnd byteReadsZeroExtend > ifTrue: > [cogit MoveXbr: Arg1Reg R: ReceiverResultReg R: > ReceiverResultReg] > ifFalse: > [cogit "formatReg already contains a value <= > 16r1f, so no need to zero it" > MoveXbr: Arg1Reg R: ReceiverResultReg R: > formatReg; > MoveR: formatReg R: ReceiverResultReg]. > convertToIntAndReturn := cogit Label. > self genConvertIntegerToSmallIntegerInReg: ReceiverResultReg. > cogit RetN: retNoffset. > > jumpIsShorts jmpTarget: > (cogit LogicalShiftLeftCq: objectMemory shiftForWord - 1 > R: ClassReg). > cogit AndCq: 1 R: formatReg. > cogit SubR: formatReg R: ClassReg; > CmpR: Arg1Reg R: ClassReg. > jumpShortsOutOfBounds := cogit JumpBelowOrEqual: 0. > cogit AddR: Arg1Reg R: ReceiverResultReg. > cogit MoveM16: objectMemory baseHeaderSize r: ReceiverResultReg R: > ReceiverResultReg. > cogit Jump: convertToIntAndReturn. > > jumpIsWords jmpTarget: > (cogit CmpR: Arg1Reg R: ClassReg). > jumpWordsOutOfBounds := cogit JumpBelowOrEqual: 0. > cogit AddCq: objectMemory baseHeaderSize >> (objectMemory > shiftForWord - 1) R: Arg1Reg. > cogit MoveX32r: Arg1Reg R: ReceiverResultReg R: TempReg. > cogit MoveR: TempReg R: ReceiverResultReg. > cogit Jump: convertToIntAndReturn. > > jumpHasFixedFields jmpTarget: > (cogit AndCq: objectMemory classIndexMask R: TempReg). > cogit MoveR: TempReg R: formatReg. > cogit CmpCq: ClassMethodContextCompactIndex R: TempReg. > jumpIsContext := cogit JumpZero: 0. > self genGetClassObjectOfClassIndex: formatReg into: Scratch0Reg > scratchReg: TempReg. > self genLoadSlot: InstanceSpecificationIndex sourceReg: > Scratch0Reg destReg: formatReg. > self genConvertSmallIntegerToIntegerInReg: formatReg. > cogit > AndCq: objectMemory fixedFieldsOfClassFormatMask R: > formatReg; > SubR: formatReg R: ClassReg; > CmpR: Arg1Reg R: ClassReg. > jumpFixedFieldsOutOfBounds := cogit JumpBelowOrEqual: 0. > "index is (formatReg (fixed fields) + Arg1Reg (0-rel index)) * > wordSize + baseHeaderSize" > cogit AddR: formatReg R: Arg1Reg. > cogit AddCq: objectMemory baseHeaderSize >> objectMemory > shiftForWord R: Arg1Reg. > cogit MoveXwr: Arg1Reg R: ReceiverResultReg R: ReceiverResultReg. > cogit RetN: retNoffset. > > jumpIsArray jmpTarget: > (cogit CmpR: Arg1Reg R: ClassReg). > jumpArrayOutOfBounds := cogit JumpBelowOrEqual: 0. > cogit AddCq: objectMemory baseHeaderSize >> objectMemory > shiftForWord R: Arg1Reg. > cogit MoveXwr: Arg1Reg R: ReceiverResultReg R: ReceiverResultReg. > cogit RetN: retNoffset. > > jumpFixedFieldsOutOfBounds jmpTarget: > (jumpArrayOutOfBounds jmpTarget: > (jumpBytesOutOfBounds jmpTarget: > (jumpShortsOutOfBounds jmpTarget: > (jumpWordsOutOfBounds jmpTarget: > (jumpNotIndexable jmpTarget: > (jumpIsContext jmpTarget: > (jumpBadIndex jmpTarget: > (jumpImmediate jmpTarget: cogit Label)))))))). > > ^0! > > Item was changed: > ----- Method: > CogObjectRepresentationFor64BitSpur>>genInnerPrimitiveNewWithArg: (in > category 'primitive generators') ----- > genInnerPrimitiveNewWithArg: retNoffset > "Implement primitiveNewWithArg for convenient cases: > - the receiver has a hash > - the receiver is variable and not compiled method > - single word header/num slots < numSlotsMask > - the result fits in eden > See superclass method for dynamic frequencies of formats. > For the moment we implement only arrayFormat, firstByteFormat & > firstLongFormat" > > | headerReg fillReg instSpecReg byteSizeReg maxSlots > jumpArrayTooBig jumpByteTooBig jumpLongTooBig > jumpArrayFormat jumpByteFormat jumpBytePrepDone jumpLongPrepDone > jumpUnhashed jumpNElementsNonInt jumpFailCuzFixed jumpNoSpace > jumpHasSlots fillLoop skip | > <var: 'skip' type: #'AbstractInstruction *'> > <var: 'fillLoop' type: #'AbstractInstruction *'> > <var: 'jumpHasSlots' type: #'AbstractInstruction *'> > <var: 'jumpNoSpace' type: #'AbstractInstruction *'> > <var: 'jumpUnhashed' type: #'AbstractInstruction *'> > <var: 'jumpByteFormat' type: #'AbstractInstruction *'> > <var: 'jumpByteTooBig' type: #'AbstractInstruction *'> > <var: 'jumpLongTooBig' type: #'AbstractInstruction *'> > <var: 'jumpArrayFormat' type: #'AbstractInstruction *'> > <var: 'jumpArrayTooBig' type: #'AbstractInstruction *'> > <var: 'jumpFailCuzFixed' type: #'AbstractInstruction *'> > <var: 'jumpBytePrepDone' type: #'AbstractInstruction *'> > <var: 'jumpLongPrepDone' type: #'AbstractInstruction *'> > <var: 'jumpNElementsNonInt' type: #'AbstractInstruction *'> > > "header will contain classIndex/class's hash & format & > numSlots/fixed size" > headerReg := SendNumArgsReg. > "Assume there's an available scratch register on 64-bit machines. > This holds the saved numFixedFileds and then the value to fill with" > fillReg := Scratch0Reg. > self assert: (cogit backEnd concreteRegister: fillReg) > 0. > "inst spec will hold class's instance specification and then byte > size" > instSpecReg := byteSizeReg := ClassReg. > "The max slots we'll allocate here are those for a single header" > maxSlots := objectMemory numSlotsMask - 1. > > "get freeStart as early as possible so as not to wait later..." > cogit MoveAw: objectMemory freeStartAddress R: Arg1Reg. > "get class's hash & fail if 0" > self genGetHashFieldNonImmOf: ReceiverResultReg into: headerReg. > jumpUnhashed := cogit JumpZero: 0. > "get index and fail if not a +ve integer" > + jumpNElementsNonInt := self genJumpNotSmallInteger: Arg0Reg > scratchReg: TempReg. > - jumpNElementsNonInt := self genJumpNotSmallInteger: Arg0Reg > scratch: TempReg. > "get class's format inst var for inst spec (format field)" > self genLoadSlot: InstanceSpecificationIndex sourceReg: > ReceiverResultReg destReg: instSpecReg. > cogit LogicalShiftRightCq: objectMemory fixedFieldsFieldWidth + > self numSmallIntegerTagBits R: instSpecReg. > cogit AndCq: objectMemory formatMask R: instSpecReg. > "Add format to classIndex/format header now" > cogit MoveR: instSpecReg R: TempReg. > cogit LogicalShiftLeftCq: objectMemory formatShift R: TempReg. > cogit AddR: TempReg R: headerReg. > "get integer value of num fields in fillReg now" > cogit MoveR: Arg0Reg R: fillReg. > self genConvertSmallIntegerToIntegerInReg: fillReg. > "dispatch on format, failing if not variable or if compiled method" > cogit CmpCq: objectMemory arrayFormat R: instSpecReg. > jumpArrayFormat := cogit JumpZero: 0. > cogit CmpCq: objectMemory firstByteFormat R: instSpecReg. > jumpByteFormat := cogit JumpZero: 0. > cogit CmpCq: objectMemory firstLongFormat R: instSpecReg. > jumpFailCuzFixed := cogit JumpNonZero: 0. > > cogit CmpCq: (objectMemory integerObjectOf: maxSlots * 2) R: > Arg0Reg. > jumpLongTooBig := cogit JumpAbove: 0. > "save num elements/slot size to instSpecReg" > cogit MoveR: fillReg R: instSpecReg. > "compute odd bits and add into headerReg; oddBits := 2 - nElements > bitAnd: 1" > cogit MoveCq: objectMemory wordSize / 4 R: TempReg. > cogit SubR: instSpecReg R: TempReg. > cogit AndCq: objectMemory wordSize / 4 - 1 R: TempReg. > cogit LogicalShiftLeftCq: objectMemory formatShift R: TempReg. > cogit AddR: TempReg R: headerReg. > "round up num elements to numSlots in instSpecReg" > cogit AddCq: objectMemory wordSize / 4 - 1 R: instSpecReg. > cogit LogicalShiftRightCq: objectMemory shiftForWord - 2 R: > instSpecReg. > cogit MoveCq: 0 R: fillReg. > jumpLongPrepDone := cogit Jump: 0. "go allocate" > > jumpByteFormat jmpTarget: > (cogit CmpCq: (objectMemory integerObjectOf: maxSlots * > objectMemory wordSize) R: Arg0Reg). > jumpByteTooBig := cogit JumpAbove: 0. > "save num elements to instSpecReg" > cogit MoveR: fillReg R: instSpecReg. > "compute odd bits and add into headerReg; oddBits := 4 - nElements > bitAnd: 3" > cogit MoveCq: objectMemory wordSize R: TempReg. > cogit SubR: instSpecReg R: TempReg. > cogit AndCq: objectMemory wordSize - 1 R: TempReg. > cogit LogicalShiftLeftCq: objectMemory formatShift R: TempReg. > cogit AddR: TempReg R: headerReg. > "round up num elements to numSlots in instSpecReg" > cogit AddCq: objectMemory wordSize - 1 R: instSpecReg. > cogit LogicalShiftRightCq: objectMemory shiftForWord R: > instSpecReg. > cogit MoveCq: 0 R: fillReg. > jumpBytePrepDone := cogit Jump: 0. "go allocate" > > jumpArrayFormat jmpTarget: > (cogit CmpCq: (objectMemory integerObjectOf: maxSlots) R: > Arg0Reg). > jumpArrayTooBig := cogit JumpAbove: 0. > "save num elements/slot size to instSpecReg" > cogit MoveR: fillReg R: instSpecReg. > cogit MoveCq: objectMemory nilObject R: fillReg. > "fall through to allocate" > > jumpBytePrepDone jmpTarget: > (jumpLongPrepDone jmpTarget: cogit Label). > > "store numSlots to headerReg" > cogit MoveR: instSpecReg R: TempReg. > cogit LogicalShiftLeftCq: objectMemory numSlotsFullShift R: > TempReg. > cogit AddR: TempReg R: headerReg. > "compute byte size; remember 0-sized objects still need 1 slot." > cogit CmpCq: 0 R: byteSizeReg. "a.k.a. instSpecReg" > jumpHasSlots := cogit JumpNonZero: 0. > cogit MoveCq: objectMemory baseHeaderSize * 2 R: byteSizeReg. > skip := cogit Jump: 0. > jumpHasSlots jmpTarget: > (cogit AddCq: objectMemory baseHeaderSize / objectMemory wordSize > R: byteSizeReg). > cogit LogicalShiftLeftCq: objectMemory shiftForWord R: byteSizeReg. > skip jmpTarget: > "check if allocation fits" > (cogit AddR: Arg1Reg R: byteSizeReg). > cogit CmpCq: objectMemory getScavengeThreshold R: byteSizeReg. > jumpNoSpace := cogit JumpAboveOrEqual: 0. > "get result, increment freeStart and write it back. Arg1Reg holds > new freeStart, the limit of the object" > cogit MoveR: Arg1Reg R: ReceiverResultReg. > cogit MoveR: byteSizeReg Aw: objectMemory freeStartAddress. > "write other half of header (numSlots/0 identityHash)" > cogit MoveR: headerReg Mw: 0 r: ReceiverResultReg. > "now fill" > cogit LoadEffectiveAddressMw: objectMemory baseHeaderSize r: > ReceiverResultReg R: Arg1Reg. > fillLoop := > cogit MoveR: fillReg Mw: 0 r: Arg1Reg. > cogit AddCq: 8 R: Arg1Reg. > cogit CmpR: Arg1Reg R: byteSizeReg. > cogit JumpAbove: fillLoop. > cogit RetN: retNoffset. > > jumpNoSpace jmpTarget: > (jumpUnhashed jmpTarget: > (jumpFailCuzFixed jmpTarget: > (jumpArrayTooBig jmpTarget: > (jumpByteTooBig jmpTarget: > (jumpLongTooBig jmpTarget: > (jumpNElementsNonInt jmpTarget: cogit Label)))))). > > ^0! > > Item was changed: > ----- Method: > CogObjectRepresentationForSpur>>genInnerPrimitiveAsCharacter:inReg: (in > category 'primitive generators') ----- > genInnerPrimitiveAsCharacter: retNOffset inReg: reg > | jumpNotInt jumpOutOfRange | > <var: 'jumpNotInt' type: #'AbstractInstruction *'> > <var: 'jumpOutOfRange' type: #'AbstractInstruction *'> > reg ~= ReceiverResultReg ifTrue: > + [jumpNotInt := self genJumpNotSmallInteger: reg > scratchReg: TempReg]. > - [jumpNotInt := self genJumpNotSmallInteger: reg scratch: > TempReg]. > cogit MoveR: reg R: TempReg. > self genConvertSmallIntegerToIntegerInReg: TempReg. > cogit CmpCq: 1 << 30 - 1 R: TempReg. > jumpOutOfRange := cogit JumpAbove: 0. > self genConvertSmallIntegerToCharacterInReg: reg. > reg ~= ReceiverResultReg ifTrue: > [cogit MoveR: reg R: ReceiverResultReg]. > cogit RetN: retNOffset. > jumpOutOfRange jmpTarget: cogit Label. > reg ~= ReceiverResultReg ifTrue: > [jumpNotInt jmpTarget: jumpOutOfRange getJmpTarget]. > ^0! > > Item was changed: > ----- Method: CogObjectRepresentationForSpur>>genInnerPrimitiveObjectAt: > (in category 'primitive generators') ----- > genInnerPrimitiveObjectAt: retNOffset > | headerReg > jumpBadIndex jumpNotCogMethod jumpBounds jumpNotHeaderIndex | > <var: #jumpBounds type: #'AbstractInstruction *'> > <var: #jumpBadIndex type: #'AbstractInstruction *'> > <var: #jumpNotCogMethod type: #'AbstractInstruction *'> > <var: #jumpNotHeaderIndex type: #'AbstractInstruction *'> > + jumpBadIndex := self genJumpNotSmallInteger: Arg0Reg scratchReg: > TempReg. > - jumpBadIndex := self genJumpNotSmallInteger: Arg0Reg scratch: > TempReg. > "get header into Arg1Reg..." > cogit MoveMw: objectMemory baseHeaderSize r: ReceiverResultReg R: > (headerReg := Arg1Reg). > + jumpNotCogMethod := self genJumpSmallInteger: headerReg > scratchReg: TempReg. > - jumpNotCogMethod := self genJumpSmallInteger: headerReg scratch: > TempReg. > cogit MoveMw: (cogit offset: CogMethod of: #methodHeader) r: > headerReg R: headerReg. > jumpNotCogMethod jmpTarget: (cogit > CmpCq: (objectMemory integerObjectOf: 1) R: Arg0Reg). > jumpNotHeaderIndex := cogit JumpNonZero: 0. > cogit > MoveR: headerReg R: ReceiverResultReg; > RetN: retNOffset. > jumpNotHeaderIndex jmpTarget: (cogit > AndCq: (objectMemory integerObjectOf: coInterpreter > alternateHeaderNumLiteralsMask) R: headerReg). > cogit > SubCq: (objectMemory integerObjectOf: 1) - objectMemory > smallIntegerTag R: Arg0Reg; > CmpR: headerReg R: Arg0Reg. > jumpBounds := cogit JumpAbove: 0. > > self genConvertSmallIntegerToIntegerInReg: Arg0Reg. > cogit > AddCq: objectMemory baseHeaderSize >> objectMemory > shiftForWord R: Arg0Reg; > MoveXwr: Arg0Reg R: ReceiverResultReg R: ReceiverResultReg; > RetN: retNOffset. > > jumpBounds jmpTarget: (cogit > AddCq: (objectMemory integerObjectOf: 1) - objectMemory > smallIntegerTag R: Arg0Reg). > jumpBadIndex jmpTarget: cogit Label. > ^CompletePrimitive! > > Item was changed: > ----- Method: CogObjectRepresentationForSpur>>genInnerPrimitiveStringAt: > (in category 'primitive generators') ----- > genInnerPrimitiveStringAt: retNoffset > "Implement the guts of primitiveStringAt; dispatch on size" > | formatReg jumpNotIndexable jumpBadIndex done > jumpIsBytes jumpIsShorts jumpIsWords jumpWordTooBig > jumpBytesOutOfBounds jumpShortsOutOfBounds jumpWordsOutOfBounds | > <inline: true> > "c.f. StackInterpreter>>stSizeOf: > SpurMemoryManager>>lengthOf:format: fixedFieldsOf:format:length:" > <var: #done type: #'AbstractInstruction *'> > <var: #jumpIsBytes type: #'AbstractInstruction *'> > <var: #jumpIsShorts type: #'AbstractInstruction *'> > <var: #jumpIsWords type: #'AbstractInstruction *'> > <var: #jumpBadIndex type: #'AbstractInstruction *'> > <var: #jumpWordTooBig type: #'AbstractInstruction *'> > <var: #jumpNotIndexable type: #'AbstractInstruction *'> > <var: #jumpBytesOutOfBounds type: #'AbstractInstruction *'> > <var: #jumpShortsOutOfBounds type: #'AbstractInstruction *'> > <var: #jumpWordsOutOfBounds type: #'AbstractInstruction *'> > > cogit MoveR: Arg0Reg R: Arg1Reg. > + jumpBadIndex := self genJumpNotSmallInteger: Arg0Reg scratchReg: > TempReg. > - jumpBadIndex := self genJumpNotSmallInteger: Arg0Reg scratch: > TempReg. > self genConvertSmallIntegerToIntegerInReg: Arg1Reg. > cogit SubCq: 1 R: Arg1Reg. "1-rel => 0-rel" > > self genGetFormatOf: ReceiverResultReg > into: (formatReg := SendNumArgsReg) > leastSignificantHalfOfBaseHeaderIntoScratch: NoReg. > > self genGetNumSlotsOf: ReceiverResultReg into: ClassReg. > > "dispatch on format in a combination of highest dynamic frequency > order first and convenience. > 0 = 0 sized objects (UndefinedObject True False et al) > 1 = non-indexable objects with inst vars (Point et al) > 2 = indexable objects with no inst vars (Array et al) > 3 = indexable objects with inst vars (MethodContext > AdditionalMethodState et al) > 4 = weak indexable objects with inst vars (WeakArray et > al) > 5 = weak non-indexable objects with inst vars > (ephemerons) (Ephemeron) > 6 unused, reserved for exotic pointer objects? > 7 Forwarded Object, 1st field is pointer, rest of fields > are ignored > 8 unused, reserved for exotic non-pointer objects? > 9 (?) 64-bit indexable > 10 - 11 32-bit indexable > 12 - 15 16-bit indexable > 16 - 23 byte indexable > 24 - 31 compiled method" > cogit CmpCq: objectMemory firstByteFormat R: formatReg. > jumpIsBytes := cogit JumpGreaterOrEqual: 0. > cogit CmpCq: objectMemory > firstShortFormat R: formatReg. > jumpIsShorts := cogit JumpGreaterOrEqual: 0. > cogit CmpCq: objectMemory > firstLongFormat R: formatReg. > jumpIsWords := cogit JumpGreaterOrEqual: 0. > jumpNotIndexable := cogit Jump: 0. > > jumpIsBytes jmpTarget: > (cogit LogicalShiftLeftCq: objectMemory shiftForWord R: > ClassReg). > cogit AndCq: objectMemory wordSize - 1 R: formatReg. > cogit SubR: formatReg R: ClassReg; > CmpR: Arg1Reg R: ClassReg. > jumpBytesOutOfBounds := cogit JumpBelowOrEqual: 0. > cogit AddCq: objectMemory baseHeaderSize R: Arg1Reg. > cogit MoveXbr: Arg1Reg R: ReceiverResultReg R: ReceiverResultReg. > cogit backEnd byteReadsZeroExtend ifFalse: > [cogit AndCq: 255 R: ReceiverResultReg]. > done := cogit Label. > self genConvertIntegerToCharacterInReg: ReceiverResultReg. > cogit RetN: retNoffset. > > jumpIsShorts jmpTarget: > (cogit LogicalShiftLeftCq: objectMemory shiftForWord - 1 > R: ClassReg). > cogit AndCq: 1 R: formatReg. > cogit SubR: formatReg R: ClassReg; > CmpR: Arg1Reg R: ClassReg. > jumpShortsOutOfBounds := cogit JumpBelowOrEqual: 0. > cogit AddR: Arg1Reg R: ReceiverResultReg. > cogit MoveM16: objectMemory baseHeaderSize r: ReceiverResultReg R: > ReceiverResultReg. > cogit Jump: done. > > jumpIsWords jmpTarget: > (cogit CmpR: Arg1Reg R: ClassReg). > jumpWordsOutOfBounds := cogit JumpBelowOrEqual: 0. > cogit AddCq: objectMemory baseHeaderSize >> objectMemory > shiftForWord R: Arg1Reg. > cogit MoveXwr: Arg1Reg R: ReceiverResultReg R: TempReg. > cogit SubCq: objectMemory baseHeaderSize >> objectMemory > shiftForWord R: Arg1Reg. > jumpWordTooBig := self jumpNotCharacterUnsignedValueInRegister: > TempReg. > cogit MoveR: TempReg R: ReceiverResultReg. > cogit Jump: done. > > jumpBytesOutOfBounds jmpTarget: > (jumpShortsOutOfBounds jmpTarget: > (jumpWordsOutOfBounds jmpTarget: > (jumpWordTooBig jmpTarget: > (jumpNotIndexable jmpTarget: > (jumpBadIndex jmpTarget: cogit Label))))). > > ^0! > > Item was changed: > ----- Method: Cogit>>AndCq:R:R: (in category 'abstract instructions') > ----- > AndCq: quickConstant R: srcReg R: destReg > + <inline: false> > - <inline: true> > <returnTypeC: #'AbstractInstruction *'> > | first | > <var: 'first' type: #'AbstractInstruction *'> > backEnd hasThreeAddressArithmetic ifTrue: > [^self gen: AndCqRR quickConstant: quickConstant operand: > srcReg operand: destReg]. > srcReg = destReg ifTrue: > [^self gen: AndCqR quickConstant: quickConstant operand: > destReg.]. > first := self gen: MoveRR operand: srcReg operand: destReg. > self gen: AndCqR quickConstant: quickConstant operand: destReg. > ^first! > > Item was changed: > ----- Method: > OutOfLineLiteralsManager>>checkQuickConstant:forInstruction: (in category > 'compile abstract instructions') ----- > checkQuickConstant: literal forInstruction: anInstruction > <var: #anInstruction type: #'AbstractInstruction *'> > <returnTypeC: #'AbstractInstruction *'> > + <inline: true> > anInstruction usesOutOfLineLiteral ifTrue: > + [anInstruction dependent: (self locateLiteral: (self > cCode: [literal] inSmalltalk: [literal bitAnd: 1 << (objectMemory wordSize > * 8) - 1]))]. > - [anInstruction dependent: (self locateLiteral: (self > cCode: [literal] inSmalltalk: [literal bitAnd: 16rFFFFFFFF]))]. > ^anInstruction! > > Item was changed: > ----- Method: > StackToRegisterMappingCogit>>genDoubleArithmetic:preOpCheck: (in category > 'primitive generators') ----- > genDoubleArithmetic: arithmeticOperator preOpCheck: preOpCheckOrNil > "Receiver and arg in registers. > Stack looks like > return address" > <var: #preOpCheckOrNil declareC: 'AbstractInstruction > *(*preOpCheckOrNil)(int rcvrReg, int argReg)'> > | jumpFailClass jumpFailClass2 jumpFailAlloc jumpFailCheck > jumpImmediate jumpNonInt doOp | > <var: #jumpFailClass type: #'AbstractInstruction *'> > <var: #jumpFailClass2 type: #'AbstractInstruction *'> > <var: #jumpFailAlloc type: #'AbstractInstruction *'> > <var: #jumpImmediate type: #'AbstractInstruction *'> > <var: #jumpNonInt type: #'AbstractInstruction *'> > <var: #jumpFailCheck type: #'AbstractInstruction *'> > <var: #doOp type: #'AbstractInstruction *'> > objectRepresentation genGetDoubleValueOf: ReceiverResultReg into: > DPFPReg0. > self MoveR: Arg0Reg R: ClassReg. > jumpImmediate := objectRepresentation genJumpImmediate: Arg0Reg. > objectRepresentation genGetCompactClassIndexNonImmOf: Arg0Reg > into: SendNumArgsReg. > objectRepresentation genCmpClassFloatCompactIndexR: SendNumArgsReg. > jumpFailClass := self JumpNonZero: 0. > objectRepresentation genGetDoubleValueOf: Arg0Reg into: DPFPReg1. > doOp := self Label. > preOpCheckOrNil ifNotNil: > [jumpFailCheck := self perform: preOpCheckOrNil with: > DPFPReg0 with: DPFPReg1]. > self gen: arithmeticOperator operand: DPFPReg1 operand: DPFPReg0. > jumpFailAlloc := objectRepresentation > genAllocFloatValue: > DPFPReg0 > into: SendNumArgsReg > scratchReg: ClassReg > scratchReg: TempReg. > self MoveR: SendNumArgsReg R: ReceiverResultReg. > self RetN: 0. > jumpImmediate jmpTarget: self Label. > objectRepresentation maybeGenConvertIfSmallFloatIn: Arg0Reg > scratchReg: TempReg into: DPFPReg1 andJumpTo: doOp. > objectRepresentation smallIntegerIsOnlyImmediateType ifFalse: > + [jumpNonInt := objectRepresentation > genJumpNotSmallInteger: Arg0Reg scratchReg: TempReg]. > - [jumpNonInt := objectRepresentation > genJumpNotSmallInteger: Arg0Reg scratch: TempReg]. > objectRepresentation genConvertSmallIntegerToIntegerInReg: > ClassReg. > self ConvertR: ClassReg Rd: DPFPReg1. > self Jump: doOp. > "We need to push the register args on two paths; this one and the > interpreter primitive path. > But the interpreter primitive path won't unless > regArgsHaveBeenPushed is false." > self assert: methodOrBlockNumArgs <= self numRegArgs. > jumpFailClass jmpTarget: self Label. > objectRepresentation smallIntegerIsOnlyImmediateType ifFalse: > [jumpNonInt jmpTarget: jumpFailClass getJmpTarget]. > preOpCheckOrNil ifNotNil: > [jumpFailCheck jmpTarget: jumpFailClass getJmpTarget]. > backEnd genPushRegisterArgsForNumArgs: methodOrBlockNumArgs > scratchReg: SendNumArgsReg. > jumpFailClass2 := self Jump: 0. > jumpFailAlloc jmpTarget: self Label. > self compileFallbackToInterpreterPrimitive: 0. > jumpFailClass2 jmpTarget: self Label. > ^0! > > Item was changed: > ----- Method: TReturnNode>>emitCCodeOn:level:generator: (in category 'C > code generation') ----- > emitCCodeOn: aStream level: level generator: aCodeGen > > (expression isSwitch > or: [expression isCaseStmt]) ifTrue: > [^expression emitCCodeOn: aStream addToEndOfCases: self > level: level generator: aCodeGen]. > > (expression isSend and: [expression isValueExpansion]) ifTrue: > [^self emitValueExpansionOn: aStream level: level > generator: aCodeGen]. > > 'void' = aCodeGen currentMethod returnType ifTrue: "If the > function is void, don't say 'return x' instead say ' x; return' " > [expression isLeaf ifFalse: > [expression emitCCodeAsArgumentOn: aStream level: > level generator: aCodeGen. > aStream nextPut: $;; crtab: level]. > aStream nextPutAll: 'return'. > ^self]. > aStream nextPutAll: 'return '. > + expression > + emitCCodeAsArgumentOn: aStream > + level: (expression isStmtList ifTrue: [level + 1] ifFalse: > [level]) > + generator: aCodeGen! > - expression emitCCodeAsArgumentOn: aStream level: level generator: > aCodeGen! > > Item was changed: > ----- Method: TStmtListNode>>emitCCodeAsArgumentOn:level:generator: (in > category 'C code generation') ----- > emitCCodeAsArgumentOn: aStream level: level generator: aCodeGen > + | size | > + (size := statements size) = 1 ifTrue: > - > - | statementWasComment | > - statements size = 1 ifTrue: > [^statements first emitCCodeAsArgumentOn: aStream level: > level generator: aCodeGen]. > - statementWasComment := false. > aStream nextPut: $(. "N.B. Comma binds weakest of all C > operators." > + statements withIndexDo: > + [:s :idx| | p1 p2 | > + p1 := aStream position. > + s emitCCommentOn: aStream level: level. > + (s isLeaf and: [s isLabel not and: [idx < statements > size]]) ifFalse: > + [s emitCCodeAsArgumentOn: aStream level: level + 1 > generator: aCodeGen]. > + p2 := aStream position. > + (idx < size and: [p2 > p1]) ifTrue: > - statements > - do: > - [:s | > - s emitCCommentOn: aStream level: level. > - s emitCCodeAsArgumentOn: aStream level: level + 1 > generator: aCodeGen. > - statementWasComment := s isComment] > - separatedBy: > [((self endsWithCloseBracket: aStream) > + or: [s isComment]) ifFalse: [aStream nextPut: > $,]. > + aStream crtab: level]]. > - or: [statementWasComment]) ifFalse: [aStream > nextPut: $,]. > - aStream crtab: level]. > aStream nextPut: $)! > >

2 1

VM Maker: VMMaker.oscog-rmacnak.1595.mcz
by commits＠source.squeak.org 15 Dec '15

15 Dec '15

Ryan Macnak uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-rmacnak.1595.mcz ==================== Summary ==================== Name: VMMaker.oscog-rmacnak.1595 Author: rmacnak Time: 14 December 2015, 7:29:18.283 pm UUID: 3aac3671-b1ff-45b9-8ed0-f3ecc5bca0b3 Ancestors: VMMaker.oscog-eem.1594 MIPS: Complete simulation of the Newspeak test suite! (~30 billion instructions) (Modulo Aliens, which don't work under the IA32 simulation either.) Fix off-by-8 in patching I-type branches. Bug had the effect of skipping loading the cPIC address for a cPIC miss if the cPIC was created for an MNU case. Handle PushCw in storeLiteral:beforeFollowingAddress:. Add the GC's variant of rewriteInlineCacheTag:at:. Fix MNU in followForwardingPointersInScheduler. =============== Diff against VMMaker.oscog-eem.1594 =============== Item was changed: ----- Method: CogMIPSELCompiler>>rewriteITypeBranchAtAddress:target: (in category 'inline cacheing') ----- rewriteITypeBranchAtAddress: mcpc target: newTarget + | newDisplacement oldInstruction newInstruction | + newDisplacement := newTarget - (mcpc + 4). "Displacement is relative to delay slot." + newDisplacement := newDisplacement >> 2. "Displacement is in words." - | newDisplacement oldInstruction newInstruction | - newDisplacement := newTarget - (mcpc - 4). "Displacement relative to delay slot" - newDisplacement := newDisplacement >> 2. self assert: (newDisplacement between: -16r8000 and: 16r7FFF). newDisplacement < 0 ifTrue: [newDisplacement := newDisplacement + 16r10000] ifFalse: [newDisplacement := newDisplacement]. self assert: (newDisplacement between: 0 and: 16rFFFF). oldInstruction := objectMemory longAt: mcpc. newInstruction := (oldInstruction bitAnd: 16rFFFF0000) bitOr: newDisplacement. objectMemory longAt: mcpc put: newInstruction.! Item was added: + ----- Method: CogMIPSELCompiler>>rewriteInlineCacheTag:at: (in category 'inline cacheing') ----- + rewriteInlineCacheTag: cacheTag at: callSiteReturnAddress + "Rewrite an inline cache with a new tag. This variant is used + by the garbage collector." + + "MoveCwR ClassReg selectorIndex/expectedClass + Call: unlinked send stub/expectedTarget + Push ReceiverResult <-- callSiteReturnAddress" + + "lui s3, selector/tagHigh + ori s3, s3, selector/tagLow + lui t9, stub/targetHigh + ori t9, t9, stub/targetLow + jalr t9 + nop (delay slot) + ... <-- callSiteReturnAddress" + + <var: #callSiteReturnAddress type: #usqInt> + <var: #callTargetAddress type: #usqInt> + self assert: (self opcodeAtAddress: callSiteReturnAddress - 24) = LUI. + self assert: (self opcodeAtAddress: callSiteReturnAddress - 20) = ORI. + self assert: (self opcodeAtAddress: callSiteReturnAddress - 16) = LUI. + self assert: (self opcodeAtAddress: callSiteReturnAddress - 12) = ORI. + self assert: (self opcodeAtAddress: callSiteReturnAddress - 8) = SPECIAL. + self assert: (self functionAtAddress: callSiteReturnAddress - 8) = JALR. + self assert: (objectMemory longAt: callSiteReturnAddress - 4) = self nop. + "cogit disassembleFrom: callSiteReturnAddress - 24 to: callSiteReturnAddress." + + self literalAtAddress: callSiteReturnAddress - 20 put: cacheTag. + + self assert: (self opcodeAtAddress: callSiteReturnAddress - 24) = LUI. + self assert: (self opcodeAtAddress: callSiteReturnAddress - 20) = ORI. + self assert: (self opcodeAtAddress: callSiteReturnAddress - 16) = LUI. + self assert: (self opcodeAtAddress: callSiteReturnAddress - 12) = ORI. + self assert: (self opcodeAtAddress: callSiteReturnAddress - 8) = SPECIAL. + self assert: (self functionAtAddress: callSiteReturnAddress - 8) = JALR. + self assert: (objectMemory longAt: callSiteReturnAddress - 4) = self nop. + "cogit disassembleFrom: callSiteReturnAddress - 24 to: callSiteReturnAddress."! Item was changed: ----- Method: CogMIPSELCompiler>>storeLiteral:beforeFollowingAddress: (in category 'inline cacheing') ----- storeLiteral: literal beforeFollowingAddress: followingAddress "Rewrite the long constant loaded by a MoveCwR or PushCwR before the given address" - | lastOpcode lastFunction oriAddress | self flag: #bogus. "The caller ought to know what it is patching, and this should be split into separate methods with stricter checking." + "Cmp/MoveCwR + pc-8 lui rx, uper + pc-4 ori rx, rx, lower" + (self opcodeAtAddress: followingAddress - 4) = ORI ifTrue: + [^self literalAtAddress: followingAddress - 4 put: literal]. + + "PushCw + pc-16 lui at, upper + pc-12 ori at, at, lower + pc-8 addiu sp, sp, -4 + pc-4 sw at, 0(sp)" + ((self opcodeAtAddress: followingAddress - 4) = SW and: + [(self opcodeAtAddress: followingAddress - 8) = ADDIU]) ifTrue: + [^self literalAtAddress: followingAddress - 12 put: literal]. + + self unreachable. + ^0! - lastOpcode := self opcodeAtAddress: followingAddress - 4. - lastFunction := self functionAtAddress: followingAddress - 4. - oriAddress := 0. - lastOpcode = ORI ifTrue: [oriAddress := followingAddress - 4]. - lastOpcode = ADDIU ifTrue: [oriAddress := followingAddress - 16]. - lastOpcode = SPECIAL ifTrue: [lastFunction = SUBU ifTrue: [oriAddress := followingAddress - 8]]. - self assert: oriAddress ~= 0. - ^self literalAtAddress: oriAddress put: literal! Item was changed: ----- Method: StackInterpreter>>followForwardingPointersInScheduler (in category 'object memory support') ----- followForwardingPointersInScheduler | schedAssoc sched procLists | schedAssoc := objectMemory splObj: SchedulerAssociation. "the GC follows pointers in the special objects array for us." self assert: (objectMemory isForwarded: schedAssoc) not. "Make sure the active process has been followed." + objectMemory followForwardedObjectFields: schedAssoc toDepth: 1. - self followForwardedObjectFields: schedAssoc toDepth: 1. sched := objectMemory fetchPointer: ValueIndex ofObject: schedAssoc. procLists := objectMemory followObjField: ProcessListsIndex ofObject: sched. "Follow all links in the process list to ensure the lists are valid." 0 to: (objectMemory numSlotsOf: procLists) - 1 do: [:i| | list first last next | list := objectMemory followObjField: i ofObject: procLists. first := objectMemory followObjField: FirstLinkIndex ofObject: list. last := objectMemory followObjField: LastLinkIndex ofObject: list. [first ~= last] whileTrue: [next := objectMemory followObjField: NextLinkIndex ofObject: first. first := next]] !

1 0

← Newer
1
...
5
6
7
8
9
10
11
...
21
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

Vm-dev December 2015