Vm-dev July 2014

vm-dev@lists.squeakfoundation.org

22 participants
157 discussions

[commit][3027] Improve the GdbARMPlugin.
by commits＠squeakvm.org 03 Jul '14

03 Jul '14

Revision: 3027 Author: rowledge Date: 2014-07-02 17:26:26 -0700 (Wed, 02 Jul 2014) Log Message: ----------- Improve the GdbARMPlugin. Add support for separate read & write error notifications to the VM sim. Fix problem with loading bytes - the lower code was happily fetching the word at 0xXXXX3 and then assorted shifts & masks provided completely the wrong byte... Makefile changes - and more needed to be properly clean Pay attention to early comment in sqGdbARMPlugin.c about link to config.h Modified Paths: -------------- trunk/platforms/Cross/plugins/GdbARMPlugin/GdbARMPlugin.h trunk/platforms/Cross/plugins/GdbARMPlugin/Makefile trunk/platforms/Cross/plugins/GdbARMPlugin/Makefile.unix trunk/platforms/Cross/plugins/GdbARMPlugin/armulmem.c trunk/platforms/Cross/plugins/GdbARMPlugin/sqGdbARMPlugin.c Modified: trunk/platforms/Cross/plugins/GdbARMPlugin/GdbARMPlugin.h =================================================================== --- trunk/platforms/Cross/plugins/GdbARMPlugin/GdbARMPlugin.h 2014-07-02 22:44:11 UTC (rev 3026) +++ trunk/platforms/Cross/plugins/GdbARMPlugin/GdbARMPlugin.h 2014-07-03 00:26:26 UTC (rev 3027) @@ -2,15 +2,19 @@ /* Bochs seems to use error code 1 for execution errors. * So we use > 1 for various errors */ + +/* TPR - added MemoryWriteBoundsError */ #define NoError 0 #define ExecutionError 1 #define BadCPUInstance 2 -#define MemoryBoundsError 3 -#define PanicError 4 -#define UnsupportedOperationError 5 -#define SomethingLoggedError 6 +#define MemoryLoadBoundsError 3 +#define MemoryWriteBoundsError 4 +#define InstructionPrefetchError 5 +#define PanicError 6 +#define UnsupportedOperationError 7 +#define SomethingLoggedError 8 -// The library is compiled with TFlag, therefore, we also need to set it. +// TPR - The library is compiled with TFlag, therefore, we also need to set it. #define MODET #if !defined(ulong) Modified: trunk/platforms/Cross/plugins/GdbARMPlugin/Makefile =================================================================== --- trunk/platforms/Cross/plugins/GdbARMPlugin/Makefile 2014-07-02 22:44:11 UTC (rev 3026) +++ trunk/platforms/Cross/plugins/GdbARMPlugin/Makefile 2014-07-03 00:26:26 UTC (rev 3027) @@ -1,4 +1,6 @@ -GDBBUILDFOLDER = /d/build/gdb-7.4 +# edit this to suit your system; it really ought to use relative paths +# or some other convenience +GDBBUILDFOLDER = /home/tim/Documents/Raspbian-Cog/gdb-arm/gdb-7.6 CC = gcc CFLAGS = -I$(GBDBUILDFOLDER)/bfd Modified: trunk/platforms/Cross/plugins/GdbARMPlugin/Makefile.unix =================================================================== --- trunk/platforms/Cross/plugins/GdbARMPlugin/Makefile.unix 2014-07-02 22:44:11 UTC (rev 3026) +++ trunk/platforms/Cross/plugins/GdbARMPlugin/Makefile.unix 2014-07-03 00:26:26 UTC (rev 3027) @@ -1,4 +1,6 @@ -GDBBUILDFOLDER = $(topdir)/../gdb +# edit this to suit your system; it really ought to use relative paths +# or some other convenience +GDBBUILDFOLDER = /home/tim/Documents/Raspbian-Cog/gdb-arm/gdb-7.6 XCFLAGS = -m32 -DNEED_UI_LOOP_HOOK XINCLUDES += -I$(GDBBUILDFOLDER)/sim/arm Modified: trunk/platforms/Cross/plugins/GdbARMPlugin/armulmem.c =================================================================== --- trunk/platforms/Cross/plugins/GdbARMPlugin/armulmem.c 2014-07-02 22:44:11 UTC (rev 3026) +++ trunk/platforms/Cross/plugins/GdbARMPlugin/armulmem.c 2014-07-03 00:26:26 UTC (rev 3027) @@ -1,7 +1,9 @@ /* This file is a compy of armvirt.c, which is part of the ARMulator distributed e.g. with gdb and skyeye. - In order to overwrite GetWord and PutWord, I had to copy the whole file. + In order to overwrite GetWord and PutWord, I (lars wasserman) had to copy the whole file and alter the Make to use it instead of the default ARM armvirt.c. Also changed: ReLoadInstr. + TPR - changed the errors returned in PutWord & GetWord to discriminate between read & write bounds errors for better simulation + TPR - changed Get/PutWord to ensure address used is an actual word address ie bottom two bits are zeros. Without that, fetching bytes becomes... fun */ #include "GdbARMPlugin.h" @@ -71,14 +73,14 @@ if(address < minReadAddress || address + 4 > (state->MemSize)) { //raise memory access error - state->EndCondition = MemoryBoundsError; + state->EndCondition = MemoryLoadBoundsError; state->Emulate = FALSE; gdb_log_printf(NULL, "Illegal memory read at %#p. ", address); return 0; } else { - return *((ARMword*) (state->MemDataPtr + address)); + return *((ARMword*) (state->MemDataPtr + (address & ~3))); } } @@ -92,12 +94,12 @@ if(address < minWriteAddress || address + 4 > (state->MemSize)) { state->Emulate = FALSE; - state->EndCondition = MemoryBoundsError; + state->EndCondition = MemoryWriteBoundsError; gdb_log_printf(NULL, "Illegal memory write at %#p. ", address); } else { - *((ARMword*) (state->MemDataPtr + address)) = data; + *((ARMword*) (state->MemDataPtr + (address & ~3))) = data; } } Modified: trunk/platforms/Cross/plugins/GdbARMPlugin/sqGdbARMPlugin.c =================================================================== --- trunk/platforms/Cross/plugins/GdbARMPlugin/sqGdbARMPlugin.c 2014-07-02 22:44:11 UTC (rev 3026) +++ trunk/platforms/Cross/plugins/GdbARMPlugin/sqGdbARMPlugin.c 2014-07-03 00:26:26 UTC (rev 3027) @@ -2,8 +2,8 @@ #define FOR_COG_PLUGIN 1 #include "GdbARMPlugin.h" - //disassembler +#include <gdbconfig.h> /* TPR - <---- this is actually a *link* to the gdb gdb-7.6/bfd/config.h because it otherwise clashes with the Squeak one also in the assorted include paths. Must be a proper way to handle this case; it must happen elsewhere */ #include <bfd.h> #include <dis-asm.h> @@ -45,6 +45,7 @@ { if(lastCPU == NULL) ARMul_EmulateInit(); lastCPU = ARMul_NewState(); + ARMul_SelectProcessor (lastCPU, ARM_v5_Prop | ARM_v5e_Prop | ARM_XScale_Prop | ARM_v6_Prop); return lastCPU; } @@ -165,6 +166,8 @@ dis->buffer = memory; dis->buffer_length = byteSize; + // first print the address + gdb_log_printf( NULL, "%08lx: ", laddr); //other possible functions are listed in opcodes/dissassemble.c unsigned int size = print_insn_little_arm((bfd_vma) laddr, dis); @@ -202,7 +205,7 @@ // This is the SWI number which is returned by our memory interface // if there is an instruction fetch for an illegal address. state->Emulate = STOP; - state->EndCondition = MemoryBoundsError; + state->EndCondition = InstructionPrefetchError; // during execution, the pc points the next fetch address, which is 8 byte after the current instruction. gdb_log_printf(NULL, "Illegal Instruction fetch address (%#p).", state->Reg[15]-8);

1 0

[commit][3026] CogVM source as per VMMaker.oscog-eem.794
by commits＠squeakvm.org 03 Jul '14

03 Jul '14

Revision: 3026 Author: eliot Date: 2014-07-02 15:44:11 -0700 (Wed, 02 Jul 2014) Log Message: ----------- CogVM source as per VMMaker.oscog-eem.794 Fix the shift for divide issues in the LargeIntegersPlugin. Add code to generateDivide:on:indent: to spit out checking asserts if required. Change the SmartSyntaxPluginCodeGenerator to generate code that ifdefs out the remapOop:in: rigmarole on Spur. Fix inline cache for Characters in Spur. Update mksistaarchives for new build structure on Mac (only). Modified Paths: -------------- branches/Cog/nsspursrc/vm/cogit.c branches/Cog/nsspursrc/vm/cogit.h branches/Cog/nsspursrc/vm/cogmethod.h branches/Cog/scripts/mksistaarchives branches/Cog/spursistasrc/vm/cogit.c branches/Cog/spursistasrc/vm/cogit.h branches/Cog/spursistasrc/vm/cogmethod.h branches/Cog/spursrc/vm/cogit.c branches/Cog/spursrc/vm/cogit.h branches/Cog/spursrc/vm/cogmethod.h branches/Cog/src/plugins/LargeIntegers/LargeIntegers.c Property Changed: ---------------- branches/Cog/platforms/Cross/vm/sqSCCSVersion.h Modified: branches/Cog/nsspursrc/vm/cogit.c =================================================================== --- branches/Cog/nsspursrc/vm/cogit.c 2014-07-02 03:12:22 UTC (rev 3025) +++ branches/Cog/nsspursrc/vm/cogit.c 2014-07-02 22:44:11 UTC (rev 3026) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.790 uuid: 1c0587fb-44ad-43f6-8bfd-2a0f91e21a59 + CCodeGenerator VMMaker.oscog-eem.793 uuid: aa676593-2c7b-4ad7-92a5-9d1e27cb7377 from - StackToRegisterMappingCogit VMMaker.oscog-eem.790 uuid: 1c0587fb-44ad-43f6-8bfd-2a0f91e21a59 + StackToRegisterMappingCogit VMMaker.oscog-eem.793 uuid: aa676593-2c7b-4ad7-92a5-9d1e27cb7377 */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.790 uuid: 1c0587fb-44ad-43f6-8bfd-2a0f91e21a59 " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.793 uuid: aa676593-2c7b-4ad7-92a5-9d1e27cb7377 " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -18457,7 +18457,7 @@ movl 0(%edx), rDest andl $0x3fffff, rDest Lcmp: - But we expect most SMallInteger arithmetic to be performwd in-line and so + But we expect most SmallInteger arithmetic to be performed in-line and so prefer the version that is faster for non-immediates (because it branches for immediates only). */ @@ -18834,13 +18834,9 @@ static sqInt inlineCacheTagForInstance(sqInt oop) { - if (isImmediate(oop)) { - if ((oop & 1)) { - return ((0 << 1) | 1); - } - return oop & (tagMask()); - } - return classIndexOf(oop); + return (isImmediate(oop) + ? oop & 1 + : classIndexOf(oop)); } Modified: branches/Cog/nsspursrc/vm/cogit.h =================================================================== --- branches/Cog/nsspursrc/vm/cogit.h 2014-07-02 03:12:22 UTC (rev 3025) +++ branches/Cog/nsspursrc/vm/cogit.h 2014-07-02 22:44:11 UTC (rev 3026) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.790 uuid: 1c0587fb-44ad-43f6-8bfd-2a0f91e21a59 + CCodeGenerator VMMaker.oscog-eem.793 uuid: aa676593-2c7b-4ad7-92a5-9d1e27cb7377 */ Modified: branches/Cog/nsspursrc/vm/cogmethod.h =================================================================== --- branches/Cog/nsspursrc/vm/cogmethod.h 2014-07-02 03:12:22 UTC (rev 3025) +++ branches/Cog/nsspursrc/vm/cogmethod.h 2014-07-02 22:44:11 UTC (rev 3026) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.790 uuid: 1c0587fb-44ad-43f6-8bfd-2a0f91e21a59 + CCodeGenerator VMMaker.oscog-eem.793 uuid: aa676593-2c7b-4ad7-92a5-9d1e27cb7377 */ typedef struct { Property changes on: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h ___________________________________________________________________ Modified: checkindate - Tue Jul 1 20:11:53 PDT 2014 + Wed Jul 2 15:43:04 PDT 2014 Modified: branches/Cog/scripts/mksistaarchives =================================================================== --- branches/Cog/scripts/mksistaarchives 2014-07-02 03:12:22 UTC (rev 3025) +++ branches/Cog/scripts/mksistaarchives 2014-07-02 22:44:11 UTC (rev 3026) @@ -5,7 +5,8 @@ " cd `dirname $0`/../products NSB=newspeak.sista.spur -SQB=squeak.sista.spur +SQCB=squeak.sista.v3 +SQSB=squeak.sista.spur if [ $# = 0 ]; then CL=1 CM=1 @@ -44,6 +45,8 @@ TAG=`date +%g.%U.`$REV echo REV=$REV TAG=$TAG if [ -n "$CL" ]; then + echo not yet implemented 1>&2 + exit 1 for archive in sistaspurlinuxht; do rm -rf $archive-$TAG.tgz echo $archive '=>' $archive-$TAG.tgz @@ -52,6 +55,8 @@ done fi if [ -n "$NL" ]; then + echo not yet implemented 1>&2 + exit 1 set -- nssistaspurlinuxht for archive in nsvmspurlinuxht; do rm -rf $archive-$TAG.tgz @@ -63,22 +68,39 @@ fi if [ -n "$CM" ]; then set -- Fast.app + for app in Sista.app; do + test -d $app || mkdir $app + if [ -d ../build.macos32x86/$SQCB/$1 ]; then + rm -rf $app/* $app-$TAG.tgz + echo build.macos32x86/$SQCB/$1 '=>' $app '=>' $app-$TAG.tgz + (cd ../build.macos32x86/$SQCB/$1 >/dev/null;tar cf - *) \ + | (cd $app;tar xf -) + tar czf $app-$TAG.tgz $app + EXES="$EXES $app/Contents/MacOS/Squeak" + else + echo build.macos32x86/$SQCB/$1 is missing + fi + shift + done + set -- Fast.app for app in SistaSpur.app; do test -d $app || mkdir $app - if [ -d ../build.macos32x86/$SQB/$1 ]; then + if [ -d ../build.macos32x86/$SQSB/$1 ]; then rm -rf $app/* $app-$TAG.tgz - echo build.macos32x86/$SQB/$1 '=>' $app '=>' $app-$TAG.tgz - (cd ../build.macos32x86/$SQB/$1 >/dev/null;tar cf - *) \ + echo build.macos32x86/$SQSB/$1 '=>' $app '=>' $app-$TAG.tgz + (cd ../build.macos32x86/$SQSB/$1 >/dev/null;tar cf - *) \ | (cd $app;tar xf -) tar czf $app-$TAG.tgz $app EXES="$EXES $app/Contents/MacOS/Squeak" else - echo build.macos32x86/$SQB/$1 is missing + echo build.macos32x86/$SQSB/$1 is missing fi shift done fi if [ -n "$NM" ]; then + echo not yet implemented 1>&2 + exit 1 set -- Fast.app for app in Newspeak\ Spur\ Virtual\ Machine.app; do test -d $app || mkdir $app @@ -96,25 +118,29 @@ done fi if [ -n "$CW" ]; then + echo not yet implemented 1>&2 + exit 1 set -- build/vm for dir in sistaspurwin; do test -d $dir || mkdir $dir - if [ -d ../build.win32x86/$SQB/$1 ]; then + if [ -d ../build.win32x86/$SQSB/$1 ]; then rm -rf $dir/* $dir-$TAG.zip - echo build.win32x86/$SQB/$1 '=>' $dir '=>' $dir-$TAG.zip - (cd ../build.win32x86/$SQB/$1 >/dev/null; \ + echo build.win32x86/$SQSB/$1 '=>' $dir '=>' $dir-$TAG.zip + (cd ../build.win32x86/$SQSB/$1 >/dev/null; \ tar cf - Squeak.exe Squeak.map Squeak.exe.manifest \ SqueakConsole.exe SqueakConsole.map *.dll) \ | (cd $dir;tar xf -) zip -qr $dir-$TAG.zip $dir EXES="$EXES $dir/Squeak.exe $dir/SqueakConsole.exe" else - echo build.win32x86/$SQB/$1 is missing + echo build.win32x86/$SQSB/$1 is missing fi shift done fi if [ -n "$NW" ]; then + echo not yet implemented 1>&2 + exit 1 set -- build/vm for dir in nsvmspurwin; do test -d $dir || mkdir $dir Modified: branches/Cog/spursistasrc/vm/cogit.c =================================================================== --- branches/Cog/spursistasrc/vm/cogit.c 2014-07-02 03:12:22 UTC (rev 3025) +++ branches/Cog/spursistasrc/vm/cogit.c 2014-07-02 22:44:11 UTC (rev 3026) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.792 uuid: 9d8d23c8-c855-48a6-8bdd-402765c01a99 + CCodeGenerator VMMaker.oscog-eem.793 uuid: aa676593-2c7b-4ad7-92a5-9d1e27cb7377 from - SistaStackToRegisterMappingCogit VMMaker.oscog-eem.792 uuid: 9d8d23c8-c855-48a6-8bdd-402765c01a99 + SistaStackToRegisterMappingCogit VMMaker.oscog-eem.793 uuid: aa676593-2c7b-4ad7-92a5-9d1e27cb7377 */ -static char __buildInfo[] = "SistaStackToRegisterMappingCogit VMMaker.oscog-eem.792 uuid: 9d8d23c8-c855-48a6-8bdd-402765c01a99 " __DATE__ ; +static char __buildInfo[] = "SistaStackToRegisterMappingCogit VMMaker.oscog-eem.793 uuid: aa676593-2c7b-4ad7-92a5-9d1e27cb7377 " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -16895,7 +16895,7 @@ movl 0(%edx), rDest andl $0x3fffff, rDest Lcmp: - But we expect most SMallInteger arithmetic to be performwd in-line and so + But we expect most SmallInteger arithmetic to be performed in-line and so prefer the version that is faster for non-immediates (because it branches for immediates only). */ @@ -17288,13 +17288,9 @@ static sqInt inlineCacheTagForInstance(sqInt oop) { - if (isImmediate(oop)) { - if ((oop & 1)) { - return ((0 << 1) | 1); - } - return oop & (tagMask()); - } - return classIndexOf(oop); + return (isImmediate(oop) + ? oop & 1 + : classIndexOf(oop)); } Modified: branches/Cog/spursistasrc/vm/cogit.h =================================================================== --- branches/Cog/spursistasrc/vm/cogit.h 2014-07-02 03:12:22 UTC (rev 3025) +++ branches/Cog/spursistasrc/vm/cogit.h 2014-07-02 22:44:11 UTC (rev 3026) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.792 uuid: 9d8d23c8-c855-48a6-8bdd-402765c01a99 + CCodeGenerator VMMaker.oscog-eem.793 uuid: aa676593-2c7b-4ad7-92a5-9d1e27cb7377 */ Modified: branches/Cog/spursistasrc/vm/cogmethod.h =================================================================== --- branches/Cog/spursistasrc/vm/cogmethod.h 2014-07-02 03:12:22 UTC (rev 3025) +++ branches/Cog/spursistasrc/vm/cogmethod.h 2014-07-02 22:44:11 UTC (rev 3026) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.792 uuid: 9d8d23c8-c855-48a6-8bdd-402765c01a99 + CCodeGenerator VMMaker.oscog-eem.793 uuid: aa676593-2c7b-4ad7-92a5-9d1e27cb7377 */ typedef struct { Modified: branches/Cog/spursrc/vm/cogit.c =================================================================== --- branches/Cog/spursrc/vm/cogit.c 2014-07-02 03:12:22 UTC (rev 3025) +++ branches/Cog/spursrc/vm/cogit.c 2014-07-02 22:44:11 UTC (rev 3026) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.790 uuid: 1c0587fb-44ad-43f6-8bfd-2a0f91e21a59 + CCodeGenerator VMMaker.oscog-eem.793 uuid: aa676593-2c7b-4ad7-92a5-9d1e27cb7377 from - StackToRegisterMappingCogit VMMaker.oscog-eem.790 uuid: 1c0587fb-44ad-43f6-8bfd-2a0f91e21a59 + StackToRegisterMappingCogit VMMaker.oscog-eem.793 uuid: aa676593-2c7b-4ad7-92a5-9d1e27cb7377 */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.790 uuid: 1c0587fb-44ad-43f6-8bfd-2a0f91e21a59 " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.793 uuid: aa676593-2c7b-4ad7-92a5-9d1e27cb7377 " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -16805,7 +16805,7 @@ movl 0(%edx), rDest andl $0x3fffff, rDest Lcmp: - But we expect most SMallInteger arithmetic to be performwd in-line and so + But we expect most SmallInteger arithmetic to be performed in-line and so prefer the version that is faster for non-immediates (because it branches for immediates only). */ @@ -17175,13 +17175,9 @@ static sqInt inlineCacheTagForInstance(sqInt oop) { - if (isImmediate(oop)) { - if ((oop & 1)) { - return ((0 << 1) | 1); - } - return oop & (tagMask()); - } - return classIndexOf(oop); + return (isImmediate(oop) + ? oop & 1 + : classIndexOf(oop)); } Modified: branches/Cog/spursrc/vm/cogit.h =================================================================== --- branches/Cog/spursrc/vm/cogit.h 2014-07-02 03:12:22 UTC (rev 3025) +++ branches/Cog/spursrc/vm/cogit.h 2014-07-02 22:44:11 UTC (rev 3026) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.790 uuid: 1c0587fb-44ad-43f6-8bfd-2a0f91e21a59 + CCodeGenerator VMMaker.oscog-eem.793 uuid: aa676593-2c7b-4ad7-92a5-9d1e27cb7377 */ Modified: branches/Cog/spursrc/vm/cogmethod.h =================================================================== --- branches/Cog/spursrc/vm/cogmethod.h 2014-07-02 03:12:22 UTC (rev 3025) +++ branches/Cog/spursrc/vm/cogmethod.h 2014-07-02 22:44:11 UTC (rev 3026) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.790 uuid: 1c0587fb-44ad-43f6-8bfd-2a0f91e21a59 + CCodeGenerator VMMaker.oscog-eem.793 uuid: aa676593-2c7b-4ad7-92a5-9d1e27cb7377 */ typedef struct { Modified: branches/Cog/src/plugins/LargeIntegers/LargeIntegers.c =================================================================== --- branches/Cog/src/plugins/LargeIntegers/LargeIntegers.c 2014-07-02 03:12:22 UTC (rev 3025) +++ branches/Cog/src/plugins/LargeIntegers/LargeIntegers.c 2014-07-02 22:44:11 UTC (rev 3026) @@ -1,9 +1,9 @@ /* Automatically generated by - SmartSyntaxPluginCodeGenerator VMMaker.oscog-eem.790 uuid: 1c0587fb-44ad-43f6-8bfd-2a0f91e21a59 + SmartSyntaxPluginCodeGenerator VMMaker.oscog-eem.794 uuid: 7fd23b24-d4aa-4291-996a-760b99e0d7e2 from - LargeIntegersPlugin VMMaker.oscog-eem.790 uuid: 1c0587fb-44ad-43f6-8bfd-2a0f91e21a59 + LargeIntegersPlugin VMMaker.oscog-eem.794 uuid: 7fd23b24-d4aa-4291-996a-760b99e0d7e2 */ -static char __buildInfo[] = "LargeIntegersPlugin VMMaker.oscog-eem.790 uuid: 1c0587fb-44ad-43f6-8bfd-2a0f91e21a59 " __DATE__ ; +static char __buildInfo[] = "LargeIntegersPlugin VMMaker.oscog-eem.794 uuid: 7fd23b24-d4aa-4291-996a-760b99e0d7e2 " __DATE__ ; @@ -53,14 +53,14 @@ static int cBytesReplacefromtowithstartingAt(unsigned char * pTo, sqInt start, sqInt stop, unsigned char * pFrom, sqInt repStart); static sqInt cCopyIntValtoBytes(sqInt val, sqInt bytes); static sqInt cCoreBytesRshiftCountnfbytesfromlentolen(sqInt count, sqInt n, sqInt f, sqInt b, unsigned char * pFrom, sqInt fromLen, unsigned char * pTo, sqInt toLen); -static sqInt cCoreDigitDivDivlenremlenquolen(unsigned char * pDiv, sqInt divLen, unsigned char * pRem, sqInt remLen, unsigned char * pQuo, sqInt quoLen); +static sqInt cCoreDigitDivDivlenremlenquolen(unsigned char *pDiv, sqInt divLen, unsigned char *pRem, sqInt remLen, unsigned char *pQuo, sqInt quoLen); static unsigned char cDigitAddlenwithleninto(unsigned char * pByteShort, sqInt shortLen, unsigned char * pByteLong, sqInt longLen, unsigned char * pByteRes); static sqInt cDigitComparewithlen(unsigned char * pFirst, unsigned char * pSecond, sqInt len); static sqInt cDigitLengthOfCSI(sqInt csi); static unsigned char cDigitMultiplylenwithleninto(unsigned char * pByteShort, sqInt shortLen, unsigned char * pByteLong, sqInt longLen, unsigned char * pByteRes); static sqInt cDigitOfCSIat(sqInt csi, sqInt ix); -static sqInt cDigitSublenwithleninto(unsigned char * pByteSmall, sqInt smallLen, unsigned char * pByteLarge, sqInt largeLen, unsigned char * pByteRes); -static sqInt cdigitMontgomerylentimeslenmodulolenmInvModBinto(unsigned char * pBytesFirst, sqInt firstLen, unsigned char * pBytesSecond, sqInt secondLen, unsigned char * pBytesThird, sqInt thirdLen, sqInt mInv, unsigned char * pBytesRes); +static sqInt cDigitSublenwithleninto(unsigned char *pByteSmall, sqInt smallLen, unsigned char *pByteLarge, sqInt largeLen, unsigned char *pByteRes); +static sqInt cdigitMontgomerylentimeslenmodulolenmInvModBinto(unsigned char *pBytesFirst, sqInt firstLen, unsigned char *pBytesSecond, sqInt secondLen, unsigned char *pBytesThird, sqInt thirdLen, sqInt mInv, unsigned char *pBytesRes); static sqInt cHighBit(sqInt uint); static sqInt createLargeFromSmallInteger(sqInt anOop); static sqInt digitAddLargewith(sqInt firstInteger, sqInt secondInteger); @@ -172,9 +172,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "LargeIntegers v1.5 VMMaker.oscog-eem.790 (i)" + "LargeIntegers v1.5 VMMaker.oscog-eem.794 (i)" #else - "LargeIntegers v1.5 VMMaker.oscog-eem.790 (e)" + "LargeIntegers v1.5 VMMaker.oscog-eem.794 (e)" #endif ; static const int orOpIndex = 1; @@ -300,9 +300,16 @@ sqInt newBytes; sqInt oldLen; - pushRemappableOop(aBytesObject); + +#if SPURVM newBytes = instantiateClassindexableSize(fetchClassOf(aBytesObject), newLen); - aBytesObject = popRemappableOop(); + +#else /* SPURVM */ +pushRemappableOop(aBytesObject); + newBytes = instantiateClassindexableSize(fetchClassOf(aBytesObject), newLen); + aBytesObject = popRemappableOop() +#endif /* SPURVM */ +; oldLen = slotSizeOf(aBytesObject); if (oldLen < newLen) { copyLen = oldLen; @@ -342,9 +349,16 @@ return integerObjectOf(0); } newLen = ((highBit + shiftCount) + 7) / 8; - pushRemappableOop(aBytesOop); + +#if SPURVM newBytes = instantiateClassindexableSize(fetchClassOf(aBytesOop), newLen); - aBytesOop = popRemappableOop(); + +#else /* SPURVM */ +pushRemappableOop(aBytesOop); + newBytes = instantiateClassindexableSize(fetchClassOf(aBytesOop), newLen); + aBytesOop = popRemappableOop() +#endif /* SPURVM */ +; /* begin cBytesLshift:from:len:to:len: */ pFrom = firstIndexableField(aBytesOop); pTo = firstIndexableField(newBytes); @@ -452,9 +466,16 @@ } oldLen = slotSizeOf(aBytesOop); newLen = i - b; - pushRemappableOop(aBytesOop); + +#if SPURVM newBytes = instantiateClassindexableSize(fetchClassOf(aBytesOop), newLen); - aBytesOop = popRemappableOop(); + +#else /* SPURVM */ +pushRemappableOop(aBytesOop); + newBytes = instantiateClassindexableSize(fetchClassOf(aBytesOop), newLen); + aBytesOop = popRemappableOop() +#endif /* SPURVM */ +; /* begin cCoreBytesRshiftCount:n:f:bytes:from:len:to:len: */ pFrom = firstIndexableField(aBytesOop); pTo = firstIndexableField(newBytes); @@ -683,7 +704,7 @@ } static sqInt -cCoreDigitDivDivlenremlenquolen(unsigned char * pDiv, sqInt divLen, unsigned char * pRem, sqInt remLen, unsigned char * pQuo, sqInt quoLen) +cCoreDigitDivDivlenremlenquolen(unsigned char *pDiv, sqInt divLen, unsigned char *pRem, sqInt remLen, unsigned char *pQuo, sqInt quoLen) { sqInt a; sqInt cond; @@ -709,12 +730,9 @@ dl = divLen - 1; ql = quoLen; dh = pDiv[dl - 1]; - if (dl == 1) { - dnh = 0; - } - else { - dnh = pDiv[dl - 2]; - } + dnh = (dl == 1 + ? 0 + : pDiv[dl - 2]); for (k = 1; k <= ql; k += 1) { /* maintain quo*arg+rem=self */ @@ -783,13 +801,9 @@ a = 0; for (i = 1; i <= divLen; i += 1) { hi = (pDiv[i - 1]) * (((usqInt) q >> 8)); - - /* pRem at: l - 1 put: lo - (lo // 256 * 256). */ - /* sign-tolerant form of (lo bitAnd: 255) -> obsolete... */ - lo = (a + (pRem[l - 1])) - ((pDiv[i - 1]) * (q & 0xFF)); - pRem[l - 1] = (lo & 0xFF); - a = (lo / 256) - hi; + pRem[l - 1] = lo; + a = (((signed)lo >> 8)) - hi; l += 1; } if (a < 0) { @@ -801,7 +815,7 @@ a = 0; for (i = 1; i <= divLen; i += 1) { a = ((((usqInt) a >> 8)) + (pRem[l - 1])) + (pDiv[i - 1]); - pRem[l - 1] = (a & 0xFF); + pRem[l - 1] = a; l += 1; } } @@ -947,7 +961,7 @@ } static sqInt -cDigitSublenwithleninto(unsigned char * pByteSmall, sqInt smallLen, unsigned char * pByteLarge, sqInt largeLen, unsigned char * pByteRes) +cDigitSublenwithleninto(unsigned char *pByteSmall, sqInt smallLen, unsigned char *pByteLarge, sqInt largeLen, unsigned char *pByteRes) { sqInt i; sqInt z; @@ -958,27 +972,27 @@ z = 0; for (i = 0; i < smallLen; i += 1) { z = (z + (pByteLarge[i])) - (pByteSmall[i]); - pByteRes[i] = (z - ((z / 256) * 256)); + pByteRes[i] = z; z = ((signed)z >> 8); } for (i = smallLen; i < largeLen; i += 1) { z += pByteLarge[i]; - pByteRes[i] = (z - ((z / 256) * 256)); + pByteRes[i] = z; z = ((signed)z >> 8); } } static sqInt -cdigitMontgomerylentimeslenmodulolenmInvModBinto(unsigned char * pBytesFirst, sqInt firstLen, unsigned char * pBytesSecond, sqInt secondLen, unsigned char * pBytesThird, sqInt thirdLen, sqInt mInv, unsigned char * pBytesRes) +cdigitMontgomerylentimeslenmodulolenmInvModBinto(unsigned char *pBytesFirst, sqInt firstLen, unsigned char *pBytesSecond, sqInt secondLen, unsigned char *pBytesThird, sqInt thirdLen, sqInt mInv, unsigned char *pBytesRes) { - usqInt accum; + usqInt accum; sqInt i; sqInt k; - unsigned char lastByte; + unsigned char lastByte; sqInt limit1; sqInt limit2; sqInt limit3; - unsigned char u; + unsigned char u; limit1 = firstLen - 1; limit2 = secondLen - 1; @@ -1020,8 +1034,8 @@ accum = 0; for (i = 0; i <= limit3; i += 1) { accum = (accum + (pBytesRes[i])) - (pBytesThird[i]); - pBytesRes[i] = (accum - ((accum / 256) * 256)); - accum = accum / 256; + pBytesRes[i] = accum; + accum = ((signed)accum >> 8); } } } @@ -1146,11 +1160,18 @@ longInt = firstInteger; longLen = firstLen; } - pushRemappableOop(shortInt); + +#if SPURVM + sum = instantiateClassindexableSize(resClass, longLen); + +#else /* SPURVM */ +pushRemappableOop(shortInt); pushRemappableOop(longInt); sum = instantiateClassindexableSize(resClass, longLen); longInt = popRemappableOop(); - shortInt = popRemappableOop(); + shortInt = popRemappableOop() +#endif /* SPURVM */ +; /* begin cDigitAdd:len:with:len:into: */ pByteShort = firstIndexableField(shortInt); pByteLong = firstIndexableField(longInt); @@ -1171,9 +1192,16 @@ /* sum := sum growby: 1. */ - pushRemappableOop(sum); + +#if SPURVM newSum = instantiateClassindexableSize(resClass, longLen + 1); - sum = popRemappableOop(); + +#else /* SPURVM */ +pushRemappableOop(sum); + newSum = instantiateClassindexableSize(resClass, longLen + 1); + sum = popRemappableOop() +#endif /* SPURVM */ +; cBytesCopyFromtolen(firstIndexableField(sum), firstIndexableField(newSum), longLen); /* C index! */ @@ -1210,9 +1238,16 @@ if ((integerValueOf(firstInteger)) < 0) { return primitiveFail(); } - pushRemappableOop(secondInteger); + +#if SPURVM firstLarge = createLargeFromSmallInteger(firstInteger); - secondInteger = popRemappableOop(); + +#else /* SPURVM */ +pushRemappableOop(secondInteger); + firstLarge = createLargeFromSmallInteger(firstInteger); + secondInteger = popRemappableOop() +#endif /* SPURVM */ +; } else { if ((fetchClassOf(firstInteger)) == (classLargeNegativeInteger())) { @@ -1224,9 +1259,16 @@ if ((integerValueOf(secondInteger)) < 0) { return primitiveFail(); } - pushRemappableOop(firstLarge); + +#if SPURVM secondLarge = createLargeFromSmallInteger(secondInteger); - firstLarge = popRemappableOop(); + +#else /* SPURVM */ +pushRemappableOop(firstLarge); + secondLarge = createLargeFromSmallInteger(secondInteger); + firstLarge = popRemappableOop() +#endif /* SPURVM */ +; } else { if ((fetchClassOf(secondInteger)) == (classLargeNegativeInteger())) { @@ -1248,11 +1290,18 @@ longLen = firstLen; longLarge = firstLarge; } - pushRemappableOop(shortLarge); + +#if SPURVM + result = instantiateClassindexableSize(classLargePositiveInteger(), longLen); + +#else /* SPURVM */ +pushRemappableOop(shortLarge); pushRemappableOop(longLarge); result = instantiateClassindexableSize(classLargePositiveInteger(), longLen); longLarge = popRemappableOop(); - shortLarge = popRemappableOop(); + shortLarge = popRemappableOop() +#endif /* SPURVM */ +; /* begin cByteOp:short:len:long:len:into: */ pByteShort = firstIndexableField(shortLarge); pByteLong = firstIndexableField(longLarge); @@ -1346,10 +1395,10 @@ sqInt l1; sqInt lo; sqInt mul; - unsigned char * pDiv; + unsigned char *pDiv; unsigned char *pointer; - unsigned char * pQuo; - unsigned char * pRem; + unsigned char *pQuo; + unsigned char *pRem; sqInt q; sqInt ql; sqInt quo; @@ -1373,29 +1422,61 @@ } l = (firstLen - secondLen) + 1; if (l <= 0) { - pushRemappableOop(firstInteger); + +#if SPURVM result = instantiateClassindexableSize(classArray(), 2); - firstInteger = popRemappableOop(); + +#else /* SPURVM */ +pushRemappableOop(firstInteger); + result = instantiateClassindexableSize(classArray(), 2); + firstInteger = popRemappableOop() +#endif /* SPURVM */ +; stObjectatput(result,1,(integerObjectOf(0))); stObjectatput(result,2,firstInteger); return result; } d = 8 - (cHighBit(((pointer = firstIndexableField(secondInteger)))[secondLen - 1])); - pushRemappableOop(firstInteger); + +#if SPURVM div = bytesLshift(secondInteger, d); div = bytesOrIntgrowTo(div, (digitLength(div)) + 1); - firstInteger = popRemappableOop(); - pushRemappableOop(div); + +#else /* SPURVM */ +pushRemappableOop(firstInteger); + div = bytesLshift(secondInteger, d); + div = bytesOrIntgrowTo(div, (digitLength(div)) + 1); + firstInteger = popRemappableOop() +#endif /* SPURVM */ +; + +#if SPURVM rem = bytesLshift(firstInteger, d); if ((digitLength(rem)) == firstLen) { rem = bytesOrIntgrowTo(rem, firstLen + 1); } - div = popRemappableOop(); - pushRemappableOop(div); + +#else /* SPURVM */ +pushRemappableOop(div); + rem = bytesLshift(firstInteger, d); + if ((digitLength(rem)) == firstLen) { + rem = bytesOrIntgrowTo(rem, firstLen + 1); + } + div = popRemappableOop() +#endif /* SPURVM */ +; + +#if SPURVM + quo = instantiateClassindexableSize(resultClass, l); + +#else /* SPURVM */ +pushRemappableOop(div); pushRemappableOop(rem); quo = instantiateClassindexableSize(resultClass, l); rem = popRemappableOop(); - div = popRemappableOop(); + div = popRemappableOop() +#endif /* SPURVM */ +; /* begin cCoreDigitDivDiv:len:rem:len:quo:len: */ pDiv = firstIndexableField(div); /* begin digitLength: */ @@ -1484,12 +1565,9 @@ dl = divLen - 1; ql = quoLen; dh = pDiv[dl - 1]; - if (dl == 1) { - dnh = 0; - } - else { - dnh = pDiv[dl - 2]; - } + dnh = (dl == 1 + ? 0 + : pDiv[dl - 2]); for (k = 1; k <= ql; k += 1) { /* maintain quo*arg+rem=self */ @@ -1558,13 +1636,9 @@ a = 0; for (i = 1; i <= divLen; i += 1) { hi = (pDiv[i - 1]) * (((usqInt) q >> 8)); - - /* pRem at: l - 1 put: lo - (lo // 256 * 256). */ - /* sign-tolerant form of (lo bitAnd: 255) -> obsolete... */ - lo = (a + (pRem[l1 - 1])) - ((pDiv[i - 1]) * (q & 0xFF)); - pRem[l1 - 1] = (lo & 0xFF); - a = (lo / 256) - hi; + pRem[l1 - 1] = lo; + a = (((signed)lo >> 8)) - hi; l1 += 1; } if (a < 0) { @@ -1576,20 +1650,34 @@ a = 0; for (i = 1; i <= divLen; i += 1) { a = ((((usqInt) a >> 8)) + (pRem[l1 - 1])) + (pDiv[i - 1]); - pRem[l1 - 1] = (a & 0xFF); + pRem[l1 - 1] = a; l1 += 1; } } pQuo[quoLen - k] = q; } - pushRemappableOop(quo); + +#if SPURVM rem = bytesRshiftbyteslookfirst(rem, d, 0, (digitLength(div)) - 1); - quo = popRemappableOop(); - pushRemappableOop(quo); + +#else /* SPURVM */ +pushRemappableOop(quo); + rem = bytesRshiftbyteslookfirst(rem, d, 0, (digitLength(div)) - 1); + quo = popRemappableOop() +#endif /* SPURVM */ +; + +#if SPURVM + result = instantiateClassindexableSize(classArray(), 2); + +#else /* SPURVM */ +pushRemappableOop(quo); pushRemappableOop(rem); result = instantiateClassindexableSize(classArray(), 2); rem = popRemappableOop(); - quo = popRemappableOop(); + quo = popRemappableOop() +#endif /* SPURVM */ +; stObjectatput(result,1,quo); stObjectatput(result,2,rem); return result; @@ -1622,22 +1710,22 @@ static sqInt digitMontgomerytimesmodulomInvModB(sqInt firstLarge, sqInt secondLarge, sqInt thirdLarge, sqInt mInv) { - usqInt accum; + usqInt accum; sqInt firstLen; sqInt i; sqInt k; - unsigned char lastByte; + unsigned char lastByte; sqInt limit1; sqInt limit2; sqInt limit3; - unsigned char * pBytesFirst; - unsigned char * pBytesRes; - unsigned char * pBytesSecond; - unsigned char * pBytesThird; + unsigned char *pBytesFirst; + unsigned char *pBytesRes; + unsigned char *pBytesSecond; + unsigned char *pBytesThird; sqInt prod; sqInt secondLen; sqInt thirdLen; - unsigned char u; + unsigned char u; firstLen = slotSizeOf(firstLarge); secondLen = slotSizeOf(secondLarge); @@ -1652,13 +1740,20 @@ && (mInv <= 0xFF))) { return primitiveFail(); } - pushRemappableOop(firstLarge); + +#if SPURVM + prod = instantiateClassindexableSize(classLargePositiveInteger(), thirdLen); + +#else /* SPURVM */ +pushRemappableOop(firstLarge); pushRemappableOop(secondLarge); pushRemappableOop(thirdLarge); prod = instantiateClassindexableSize(classLargePositiveInteger(), thirdLen); thirdLarge = popRemappableOop(); secondLarge = popRemappableOop(); - firstLarge = popRemappableOop(); + firstLarge = popRemappableOop() +#endif /* SPURVM */ +; /* begin cdigitMontgomery:len:times:len:modulo:len:mInvModB:into: */ pBytesFirst = firstIndexableField(firstLarge); pBytesSecond = firstIndexableField(secondLarge); @@ -1704,8 +1799,8 @@ accum = 0; for (i = 0; i <= limit3; i += 1) { accum = (accum + (pBytesRes[i])) - (pBytesThird[i]); - pBytesRes[i] = (accum - ((accum / 256) * 256)); - accum = accum / 256; + pBytesRes[i] = accum; + accum = ((signed)accum >> 8); } } return normalizePositive(prod); @@ -1757,11 +1852,18 @@ else { resultClass = classLargePositiveInteger(); } - pushRemappableOop(shortInt); + +#if SPURVM + prod = instantiateClassindexableSize(resultClass, longLen + shortLen); + +#else /* SPURVM */ +pushRemappableOop(shortInt); pushRemappableOop(longInt); prod = instantiateClassindexableSize(resultClass, longLen + shortLen); longInt = popRemappableOop(); - shortInt = popRemappableOop(); + shortInt = popRemappableOop() +#endif /* SPURVM */ +; /* begin cDigitMultiply:len:with:len:into: */ pByteShort = firstIndexableField(shortInt); pByteLong = firstIndexableField(longInt); @@ -1854,9 +1956,9 @@ sqInt larger; sqInt largerLen; sqInt neg; - unsigned char * pByteLarge; - unsigned char * pByteRes; - unsigned char * pByteSmall; + unsigned char *pByteLarge; + unsigned char *pByteRes; + unsigned char *pByteSmall; sqInt res; sqInt resLen; sqInt secondLen; @@ -1891,13 +1993,22 @@ neg = firstNeg; } resLen = largerLen; - pushRemappableOop(smaller); + +#if SPURVM + res = instantiateClassindexableSize((neg + ? classLargeNegativeInteger() + : classLargePositiveInteger()), resLen); + +#else /* SPURVM */ +pushRemappableOop(smaller); pushRemappableOop(larger); res = instantiateClassindexableSize((neg ? classLargeNegativeInteger() : classLargePositiveInteger()), resLen); larger = popRemappableOop(); - smaller = popRemappableOop(); + smaller = popRemappableOop() +#endif /* SPURVM */ +; /* begin cDigitSub:len:with:len:into: */ pByteSmall = firstIndexableField(smaller); pByteLarge = firstIndexableField(larger); @@ -1908,12 +2019,12 @@ z = 0; for (i = 0; i < smallerLen; i += 1) { z = (z + (pByteLarge[i])) - (pByteSmall[i]); - pByteRes[i] = (z - ((z / 256) * 256)); + pByteRes[i] = z; z = ((signed)z >> 8); } for (i = smallerLen; i < largerLen; i += 1) { z += pByteLarge[i]; - pByteRes[i] = (z - ((z / 256) * 256)); + pByteRes[i] = z; z = ((signed)z >> 8); } return (neg @@ -2322,9 +2433,16 @@ /* convert it to a not normalized LargeInteger */ - pushRemappableOop(secondInteger); + +#if SPURVM firstLarge = createLargeFromSmallInteger(firstInteger); - secondInteger = popRemappableOop(); + +#else /* SPURVM */ +pushRemappableOop(secondInteger); + firstLarge = createLargeFromSmallInteger(firstInteger); + secondInteger = popRemappableOop() +#endif /* SPURVM */ +; } else { firstLarge = firstInteger; @@ -2333,9 +2451,16 @@ /* convert it to a not normalized LargeInteger */ - pushRemappableOop(firstLarge); + +#if SPURVM secondLarge = createLargeFromSmallInteger(secondInteger); - firstLarge = popRemappableOop(); + +#else /* SPURVM */ +pushRemappableOop(firstLarge); + secondLarge = createLargeFromSmallInteger(secondInteger); + firstLarge = popRemappableOop() +#endif /* SPURVM */ +; } else { secondLarge = secondInteger; @@ -2369,9 +2494,16 @@ /* convert it to a not normalized LargeInteger */ - pushRemappableOop(secondInteger); + +#if SPURVM firstLarge = createLargeFromSmallInteger(firstInteger); - secondInteger = popRemappableOop(); + +#else /* SPURVM */ +pushRemappableOop(secondInteger); + firstLarge = createLargeFromSmallInteger(firstInteger); + secondInteger = popRemappableOop() +#endif /* SPURVM */ +; } else { firstLarge = firstInteger; @@ -2380,9 +2512,16 @@ /* convert it to a not normalized LargeInteger */ - pushRemappableOop(firstLarge); + +#if SPURVM secondLarge = createLargeFromSmallInteger(secondInteger); - firstLarge = popRemappableOop(); + +#else /* SPURVM */ +pushRemappableOop(firstLarge); + secondLarge = createLargeFromSmallInteger(secondInteger); + firstLarge = popRemappableOop() +#endif /* SPURVM */ +; } else { secondLarge = secondInteger; @@ -2842,9 +2981,16 @@ /* convert to LargeInteger */ - pushRemappableOop(secondInteger); + +#if SPURVM firstAsLargeInteger = createLargeFromSmallInteger(firstInteger); - secondInteger = popRemappableOop(); + +#else /* SPURVM */ +pushRemappableOop(secondInteger); + firstAsLargeInteger = createLargeFromSmallInteger(firstInteger); + secondInteger = popRemappableOop() +#endif /* SPURVM */ +; } else { firstAsLargeInteger = firstInteger; @@ -2857,9 +3003,16 @@ primitiveFail(); return null; } - pushRemappableOop(firstAsLargeInteger); + +#if SPURVM secondAsLargeInteger = createLargeFromSmallInteger(secondInteger); - firstAsLargeInteger = popRemappableOop(); + +#else /* SPURVM */ +pushRemappableOop(firstAsLargeInteger); + secondAsLargeInteger = createLargeFromSmallInteger(secondInteger); + firstAsLargeInteger = popRemappableOop() +#endif /* SPURVM */ +; } else { secondAsLargeInteger = secondInteger; @@ -2899,9 +3052,16 @@ /* convert to LargeInteger */ - pushRemappableOop(secondInteger); + +#if SPURVM firstAsLargeInteger = createLargeFromSmallInteger(firstInteger); - secondInteger = popRemappableOop(); + +#else /* SPURVM */ +pushRemappableOop(secondInteger); + firstAsLargeInteger = createLargeFromSmallInteger(firstInteger); + secondInteger = popRemappableOop() +#endif /* SPURVM */ +; } else { firstAsLargeInteger = firstInteger; @@ -2914,9 +3074,16 @@ primitiveFail(); return null; } - pushRemappableOop(firstAsLargeInteger); + +#if SPURVM secondAsLargeInteger = createLargeFromSmallInteger(secondInteger); - firstAsLargeInteger = popRemappableOop(); + +#else /* SPURVM */ +pushRemappableOop(firstAsLargeInteger); + secondAsLargeInteger = createLargeFromSmallInteger(secondInteger); + firstAsLargeInteger = popRemappableOop() +#endif /* SPURVM */ +; } else { secondAsLargeInteger = secondInteger; @@ -2952,9 +3119,16 @@ /* convert it to a not normalized LargeInteger */ - pushRemappableOop(secondInteger); + +#if SPURVM firstLarge = createLargeFromSmallInteger(firstInteger); - secondInteger = popRemappableOop(); + +#else /* SPURVM */ +pushRemappableOop(secondInteger); + firstLarge = createLargeFromSmallInteger(firstInteger); + secondInteger = popRemappableOop() +#endif /* SPURVM */ +; } else { firstLarge = firstInteger; @@ -2963,9 +3137,16 @@ /* convert it to a not normalized LargeInteger */ - pushRemappableOop(firstLarge); + +#if SPURVM secondLarge = createLargeFromSmallInteger(secondInteger); - firstLarge = popRemappableOop(); + +#else /* SPURVM */ +pushRemappableOop(firstLarge); + secondLarge = createLargeFromSmallInteger(secondInteger); + firstLarge = popRemappableOop() +#endif /* SPURVM */ +; } else { secondLarge = secondInteger; @@ -3001,9 +3182,16 @@ /* convert it to a not normalized LargeInteger */ - pushRemappableOop(secondInteger); + +#if SPURVM firstLarge = createLargeFromSmallInteger(firstInteger); - secondInteger = popRemappableOop(); + +#else /* SPURVM */ +pushRemappableOop(secondInteger); + firstLarge = createLargeFromSmallInteger(firstInteger); + secondInteger = popRemappableOop() +#endif /* SPURVM */ +; } else { firstLarge = firstInteger; @@ -3012,9 +3200,16 @@ /* convert it to a not normalized LargeInteger */ - pushRemappableOop(firstLarge); + +#if SPURVM secondLarge = createLargeFromSmallInteger(secondInteger); - firstLarge = popRemappableOop(); + +#else /* SPURVM */ +pushRemappableOop(firstLarge); + secondLarge = createLargeFromSmallInteger(secondInteger); + firstLarge = popRemappableOop() +#endif /* SPURVM */ +; } else { secondLarge = secondInteger; @@ -3048,9 +3243,16 @@ /* convert it to a not normalized LargeInteger */ - pushRemappableOop(secondInteger); + +#if SPURVM firstLarge = createLargeFromSmallInteger(firstInteger); - secondInteger = popRemappableOop(); + +#else /* SPURVM */ +pushRemappableOop(secondInteger); + firstLarge = createLargeFromSmallInteger(firstInteger); + secondInteger = popRemappableOop() +#endif /* SPURVM */ +; } else { firstLarge = firstInteger; @@ -3059,9 +3261,16 @@ /* convert it to a not normalized LargeInteger */ - pushRemappableOop(firstLarge); + +#if SPURVM secondLarge = createLargeFromSmallInteger(secondInteger); - firstLarge = popRemappableOop(); + +#else /* SPURVM */ +pushRemappableOop(firstLarge); + secondLarge = createLargeFromSmallInteger(secondInteger); + firstLarge = popRemappableOop() +#endif /* SPURVM */ +; } else { secondLarge = secondInteger; @@ -3095,9 +3304,16 @@ /* convert it to a not normalized LargeInteger */ - pushRemappableOop(secondInteger); + +#if SPURVM firstLarge = createLargeFromSmallInteger(firstInteger); - secondInteger = popRemappableOop(); + +#else /* SPURVM */ +pushRemappableOop(secondInteger); + firstLarge = createLargeFromSmallInteger(firstInteger); + secondInteger = popRemappableOop() +#endif /* SPURVM */ +; } else { firstLarge = firstInteger; @@ -3106,9 +3322,16 @@ /* convert it to a not normalized LargeInteger */ - pushRemappableOop(firstLarge); + +#if SPURVM secondLarge = createLargeFromSmallInteger(secondInteger); - firstLarge = popRemappableOop(); + +#else /* SPURVM */ +pushRemappableOop(firstLarge); + secondLarge = createLargeFromSmallInteger(secondInteger); + firstLarge = popRemappableOop() +#endif /* SPURVM */ +; } else { secondLarge = secondInteger; @@ -3149,20 +3372,20 @@ EXPORT(sqInt) primMontgomeryTimesModulo(void) { - usqInt accum; + usqInt accum; sqInt firstInteger; sqInt firstLarge; sqInt firstLen; sqInt i; sqInt k; - unsigned char lastByte; + unsigned char lastByte; sqInt limit1; sqInt limit2; sqInt limit3; - unsigned char * pBytesFirst; - unsigned char * pBytesRes; - unsigned char * pBytesSecond; - unsigned char * pBytesThird; + unsigned char *pBytesFirst; + unsigned char *pBytesRes; + unsigned char *pBytesSecond; + unsigned char *pBytesThird; sqInt prod; sqInt secondLarge; sqInt secondLen; @@ -3171,7 +3394,7 @@ sqInt thirdLarge; sqInt thirdLen; sqInt thirdModuloInteger; - unsigned char u; + unsigned char u; sqInt _return_value; success(isKindOf(stackValue(2), "Integer")); @@ -3189,11 +3412,18 @@ /* convert it to a not normalized LargeInteger */ - pushRemappableOop(secondOperandInteger); + +#if SPURVM + firstLarge = createLargeFromSmallInteger(firstInteger); + +#else /* SPURVM */ +pushRemappableOop(secondOperandInteger); pushRemappableOop(thirdModuloInteger); firstLarge = createLargeFromSmallInteger(firstInteger); thirdModuloInteger = popRemappableOop(); - secondOperandInteger = popRemappableOop(); + secondOperandInteger = popRemappableOop() +#endif /* SPURVM */ +; } else { firstLarge = firstInteger; @@ -3202,11 +3432,18 @@ /* convert it to a not normalized LargeInteger */ - pushRemappableOop(firstLarge); + +#if SPURVM + secondLarge = createLargeFromSmallInteger(secondOperandInteger); + +#else /* SPURVM */ +pushRemappableOop(firstLarge); pushRemappableOop(thirdModuloInteger); secondLarge = createLargeFromSmallInteger(secondOperandInteger); thirdModuloInteger = popRemappableOop(); - firstLarge = popRemappableOop(); + firstLarge = popRemappableOop() +#endif /* SPURVM */ +; } else { secondLarge = secondOperandInteger; @@ -3215,11 +3452,18 @@ /* convert it to a not normalized LargeInteger */ - pushRemappableOop(firstLarge); + +#if SPURVM + thirdLarge = createLargeFromSmallInteger(thirdModuloInteger); + +#else /* SPURVM */ +pushRemappableOop(firstLarge); pushRemappableOop(secondLarge); thirdLarge = createLargeFromSmallInteger(thirdModuloInteger); secondLarge = popRemappableOop(); - firstLarge = popRemappableOop(); + firstLarge = popRemappableOop() +#endif /* SPURVM */ +; } else { thirdLarge = thirdModuloInteger; @@ -3241,13 +3485,20 @@ _return_value = primitiveFail(); goto l1; } - pushRemappableOop(firstLarge); + +#if SPURVM + prod = instantiateClassindexableSize(classLargePositiveInteger(), thirdLen); + +#else /* SPURVM */ +pushRemappableOop(firstLarge); pushRemappableOop(secondLarge); pushRemappableOop(thirdLarge); prod = instantiateClassindexableSize(classLargePositiveInteger(), thirdLen); thirdLarge = popRemappableOop(); secondLarge = popRemappableOop(); - firstLarge = popRemappableOop(); + firstLarge = popRemappableOop() +#endif /* SPURVM */ +; /* begin cdigitMontgomery:len:times:len:modulo:len:mInvModB:into: */ pBytesFirst = firstIndexableField(firstLarge); pBytesSecond = firstIndexableField(secondLarge); @@ -3293,8 +3544,8 @@ accum = 0; for (i = 0; i <= limit3; i += 1) { accum = (accum + (pBytesRes[i])) - (pBytesThird[i]); - pBytesRes[i] = (accum - ((accum / 256) * 256)); - accum = accum / 256; + pBytesRes[i] = accum; + accum = ((signed)accum >> 8); } } _return_value = normalizePositive(prod);

1 0

VM Maker: VMMaker.oscog-eem.794.mcz
by commits＠source.squeak.org 03 Jul '14

03 Jul '14

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.794.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.794 Author: eem Time: 2 July 2014, 3:40:54.432 pm UUID: 7fd23b24-d4aa-4291-996a-760b99e0d7e2 Ancestors: VMMaker.oscog-eem.793 Fix the shift for divide issues in the LargeIntegersPlugin. Add code to generateDivide:on:indent: to spit out checking asserts if required. Change the SmartSyntaxPluginCodeGenerator to generate code that ifdefs out the remapOop:in: rigmarole on Spur. =============== Diff against VMMaker.oscog-eem.793 =============== Item was changed: ----- Method: CCodeGenerator>>generateDivide:on:indent: (in category 'C translation') ----- generateDivide: msgNode on: aStream indent: level "Generate the C code for this message onto the given stream." + | rcvr arg divisor check | + rcvr := msgNode receiver. + arg := msgNode args first. + check := false "If you need to check the validity of divides that had been implemented by signed shifts, change this to true..." + and: [arg isConstant + and: [(divisor := arg value) isInteger + and: [divisor isPowerOfTwo + and: [divisor > 0 + and: [divisor <= (1 bitShift: 31)]]]]]. + check ifTrue: + [aStream nextPut: $(; nextPutAll: 'assert(((sqInt) '. + self emitCExpression: rcvr on: aStream. + aStream nextPutAll: ' >> ', (divisor log: 2) asInteger printString. + aStream nextPutAll: ') == ('. + self emitCExpression: rcvr on: aStream. + aStream nextPutAll: ' / '. + self emitCExpression: msgNode args first on: aStream. + aStream nextPutAll: ')),']. self emitCExpression: msgNode receiver on: aStream. aStream nextPutAll: ' / '. + self emitCExpression: msgNode args first on: aStream. + check ifTrue: + [aStream nextPut: $)]! - self emitCExpression: msgNode args first on: aStream! Item was changed: ----- Method: CogObjectRepresentation>>maybeCompileRetry:onPrimitiveFail: (in category 'primitive generators') ----- maybeCompileRetry: retryInst onPrimitiveFail: primIndex + <var: #retryInst type: #'AbstractInstruction *'> - <var: #retry type: #'AbstractInstruction *'> "Object representations with lazy forwarding will want to check for forwarding pointers on primitive failure and retry the primitive if found. By default do nothing."! Item was changed: ----- Method: CogObjectRepresentationForSpur>>maybeCompileRetry:onPrimitiveFail: (in category 'primitive generators') ----- maybeCompileRetry: retryInst onPrimitiveFail: primIndex + <var: #retryInst type: #'AbstractInstruction *'> - <var: #retry type: #'AbstractInstruction *'> "If primIndex has an accessorDepth, check for primitive failure and call ceCheckForAndFollowForwardedPrimitiveStateFor:. If ceCheck.... answers true, retry the primitive." | accessorDepth jmp | <var: #jmp type: #'AbstractInstruction *'> accessorDepth := coInterpreter accessorDepthForPrimitiveIndex: primIndex. accessorDepth < 0 ifTrue: [^0]. cogit MoveAw: coInterpreter primFailCodeAddress R: TempReg. cogit CmpCq: 0 R: TempReg. jmp := cogit JumpZero: 0. cogit compileCallFor: #ceCheckForAndFollowForwardedPrimitiveStateFor: numArgs: 1 arg: primIndex arg: nil arg: nil arg: nil resultReg: TempReg saveRegs: false. cogit CmpCq: 0 R: TempReg. cogit JumpNonZero: retryInst. jmp jmpTarget: cogit Label. ^0! Item was changed: ----- Method: LargeIntegersPlugin>>cCoreDigitDivDiv:len:rem:len:quo:len: (in category 'C core') ----- cCoreDigitDivDiv: pDiv len: divLen rem: pRem len: remLen quo: pQuo len: quoLen | dl ql dh dnh j t hi lo r3 l a cond q r1r2 mul | + <var: #pDiv type: #'unsigned char *'> + <var: #pRem type: #'unsigned char *'> + <var: #pQuo type: #'unsigned char *'> - <var: #pDiv type: 'unsigned char * '> - <var: #pRem type: 'unsigned char * '> - <var: #pQuo type: 'unsigned char * '> dl := divLen - 1. "Last actual byte of data (ST ix)" ql := quoLen. dh := pDiv at: dl - 1. + dnh := dl = 1 + ifTrue: [0] + ifFalse: [pDiv at: dl - 2]. - dl = 1 - ifTrue: [dnh := 0] - ifFalse: [dnh := pDiv at: dl - 2]. 1 to: ql do: [:k | "maintain quo*arg+rem=self" "Estimate rem/div by dividing the leading two bytes of rem by dh." "The estimate is q = qhi*16+qlo, where qhi and qlo are nibbles." "Nibbles are kicked off!! We use full 16 bits now, because we are in the year 2000 ;-) [sr]" j := remLen + 1 - k. "r1 := rem digitAt: j." + (pRem at: j - 1) = dh - (pRem at: j - 1) - = dh ifTrue: [q := 255] ifFalse: ["Compute q = (r1,r2)//dh, t = (r1,r2)\\dh. Note that r1,r2 are bytes, not nibbles. Be careful not to generate intermediate results exceeding 13 bits." "r2 := (rem digitAt: j - 2)." + r1r2 := ((pRem at: j - 1) bitShift: 8) + (pRem at: j - 2). - r1r2 := ((pRem at: j - 1) - bitShift: 8) - + (pRem at: j - 2). t := r1r2 \\ dh. q := r1r2 // dh. "Next compute (hi,lo) := q*dnh" mul := q * dnh. hi := mul bitShift: -8. lo := mul bitAnd: 255. "Correct overestimate of q. Max of 2 iterations through loop -- see Knuth vol. 2" j < 3 ifTrue: [r3 := 0] ifFalse: [r3 := pRem at: j - 3]. [(t < hi or: [t = hi and: [r3 < lo]]) ifTrue: ["i.e. (t,r3) < (hi,lo)" q := q - 1. lo := lo - dnh. lo < 0 ifTrue: [hi := hi - 1. lo := lo + 256]. cond := hi >= dh] ifFalse: [cond := false]. cond] whileTrue: [hi := hi - dh]]. "Subtract q*div from rem" l := j - dl. a := 0. 1 to: divLen do: [:i | + hi := (pDiv at: i - 1) * (q bitShift: -8). + lo := a + (pRem at: l - 1) - ((pDiv at: i - 1) * (q bitAnd: 255)). + pRem at: l - 1 put: (self cCode: [lo] inSmalltalk: [lo bitAnd: 255]). + a := (lo signedBitShift: -8) - hi. - hi := (pDiv at: i - 1) - * (q bitShift: -8). - lo := a + (pRem at: l - 1) - ((pDiv at: i - 1) - * (q bitAnd: 255)). - "pRem at: l - 1 put: lo - (lo // 256 * 256)." - "sign-tolerant form of (lo bitAnd: 255) -> obsolete..." - pRem at: l - 1 put: (lo bitAnd: 255). - "... is sign-tolerant!! [sr]" - a := lo // 256 - hi. l := l + 1]. + a < 0 ifTrue: "Add div back into rem, decrease q by 1" + [q := q - 1. + l := j - dl. + a := 0. + 1 to: divLen do: + [:i | + a := (a bitShift: -8) + (pRem at: l - 1) + (pDiv at: i - 1). + pRem at: l - 1 put: (self cCode: [a] inSmalltalk: [a bitAnd: 255]). + l := l + 1]]. - a < 0 - ifTrue: - ["Add div back into rem, decrease q by 1" - q := q - 1. - l := j - dl. - a := 0. - 1 to: divLen do: - [:i | - a := (a bitShift: -8) - + (pRem at: l - 1) + (pDiv at: i - 1). - pRem at: l - 1 put: (a bitAnd: 255). - l := l + 1]]. pQuo at: quoLen - k put: q]! Item was changed: ----- Method: LargeIntegersPlugin>>cDigitSub:len:with:len:into: (in category 'C core') ----- cDigitSub: pByteSmall len: smallLen with: pByteLarge len: largeLen into: pByteRes | z | + <var: #pByteSmall type: #'unsigned char *'> + <var: #pByteLarge type: #'unsigned char *'> + <var: #pByteRes type: #'unsigned char *'> - <var: #pByteSmall type: 'unsigned char * '> - <var: #pByteLarge type: 'unsigned char * '> - <var: #pByteRes type: 'unsigned char * '> z := 0. "Loop invariant is -1<=z<=1" 0 to: smallLen - 1 do: [:i | z := z + (pByteLarge at: i) - (pByteSmall at: i). + pByteRes at: i put: (self cCode: [z] inSmalltalk: [z bitAnd: 255]). - pByteRes at: i put: z - (z // 256 * 256). "sign-tolerant form of (z bitAnd: 255)" z := z signedBitShift: -8]. smallLen to: largeLen - 1 do: [:i | z := z + (pByteLarge at: i) . + pByteRes at: i put: (self cCode: [z] inSmalltalk: [z bitAnd: 255]). - pByteRes at: i put: z - (z // 256 * 256). "sign-tolerant form of (z bitAnd: 255)" z := z signedBitShift: -8]. ! Item was changed: ----- Method: LargeIntegersPlugin>>cdigitMontgomery:len:times:len:modulo:len:mInvModB:into: (in category 'C core') ----- cdigitMontgomery: pBytesFirst len: firstLen times: pBytesSecond len: secondLen modulo: pBytesThird len: thirdLen mInvModB: mInv into: pBytesRes | u limit1 limit2 limit3 accum lastByte | + <var: #pBytesFirst type: #'unsigned char *'> + <var: #pBytesSecond type: #'unsigned char *'> + <var: #pBytesThird type: #'unsigned char *'> + <var: #pBytesRes type: #'unsigned char *'> + <var: #accum type: #usqInt> + <var: #u type: #'unsigned char'> + <var: #lastByte type: #'unsigned char'> - <var: #pBytesFirst type: 'unsigned char * '> - <var: #pBytesSecond type: 'unsigned char * '> - <var: #pBytesThird type: 'unsigned char * '> - <var: #pBytesRes type: 'unsigned char * '> - <var: #accum type: 'usqInt '> - <var: #u type: 'unsigned char '> - <var: #lastByte type: 'unsigned char '> limit1 := firstLen - 1. limit2 := secondLen - 1. limit3 := thirdLen - 1. lastByte := 0. 0 to: limit1 do: [:i | accum := (pBytesRes at: 0) + ((pBytesFirst at: i)*(pBytesSecond at: 0)). u := accum * mInv bitAnd: 255. accum := accum + (u * (pBytesThird at: 0)). 1 to: limit2 do: [:k | accum := (accum >> 8) + (pBytesRes at: k) + ((pBytesFirst at: i)*(pBytesSecond at: k)) + (u * (pBytesThird at: k)). pBytesRes at: k-1 put: (accum bitAnd: 255)]. secondLen to: limit3 do: [:k | accum := (accum >> 8) + (pBytesRes at: k) + (u * (pBytesThird at: k)). pBytesRes at: k-1 put: (accum bitAnd: 255)]. accum := (accum >> 8) + lastByte. pBytesRes at: limit3 put: (accum bitAnd: 255). lastByte := accum >> 8]. firstLen to: limit3 do: [:i | accum := (pBytesRes at: 0). u := accum * mInv bitAnd: 255. accum := accum + (u * (pBytesThird at: 0)). 1 to: limit3 do: [:k | accum := (accum >> 8) + (pBytesRes at: k) + (u * (pBytesThird at: k)). pBytesRes at: k-1 put: (accum bitAnd: 255)]. accum := (accum >> 8) + lastByte. pBytesRes at: limit3 put: (accum bitAnd: 255). lastByte := accum >> 8]. (lastByte = 0 and: [(self cDigitCompare: pBytesThird with: pBytesRes len: thirdLen) = 1]) ifFalse: [ "self cDigitSub: pBytesThird len: thirdLen with: pBytesRes len: thirdLen into: pBytesRes" accum := 0. 0 to: limit3 do: [:i | accum := accum + (pBytesRes at: i) - (pBytesThird at: i). + pBytesRes at: i put: (self cCode: [accum] inSmalltalk: [accum bitAnd: 255]). + accum := accum signedBitShift: -8]].! - pBytesRes at: i put: accum - (accum // 256 * 256). - "sign-tolerant form of (z bitAnd: 255)" - accum := accum // 256]].! Item was changed: ----- Method: SmartSyntaxInterpreterPlugin>>remapOop:in: (in category 'simulation') ----- remapOop: oopOrList in: aBlock + "Call remapOop: for the variable oopOrList (or all of the variables in oopOrList) before evaluating + aBlock, and restore them after. If this is Spur, do nothing, since Spur does not GC on allocation + and the SmartSyntaxPluginCodeGenerator generates null code for this op in Spur." <doNotGenerate> | ctxt tempNames tempIndices | + interpreterProxy hasSpurMemoryManagerAPI ifTrue: + [^aBlock value]. ctxt := thisContext sender. tempNames := ctxt tempNames. oopOrList isArray ifTrue: [tempIndices := oopOrList collect: [:tempName| tempNames indexOf: tempName]. tempIndices do: [:index| interpreterProxy pushRemappableOop: (ctxt namedTempAt: index)]] ifFalse: [interpreterProxy pushRemappableOop: oopOrList]. ^aBlock ensure: [oopOrList isArray ifTrue: [tempIndices reverseDo: [:index| ctxt namedTempAt: index put: interpreterProxy popRemappableOop]] ifFalse: [1 to: ctxt numTemps do: [:index| (ctxt tempAt: index) = oopOrList ifTrue: [ctxt tempAt: index put: interpreterProxy topRemappableOop]]. interpreterProxy popRemappableOop]]! Item was changed: ----- Method: SmartSyntaxPluginCodeGenerator>>generateRemapOopIn:on:indent: (in category 'translating builtins') ----- generateRemapOopIn: aNode on: aStream indent: level "Generate the C code for this message onto the given stream." + aStream cr; nextPutAll: '#if SPURVM'; cr. + self generateSpurRemapOopIn: aNode on: aStream indent: level. + aStream cr; nextPutAll: '#else /* SPURVM */'; cr. + self generateV3RemapOopIn: aNode on: aStream indent: level. + aStream cr; nextPutAll: '#endif /* SPURVM */'; cr! - | idList | - pluginFunctionsUsed add: #pushRemappableOop:; add: #popRemappableOop. - idList := aNode args first nameOrValue. - idList class == Array ifFalse: [idList := Array with: idList]. - idList do: - [:each | - aStream - nextPutAll: 'pushRemappableOop('; - nextPutAll: each asString; - nextPutAll: ');'] - separatedBy: [aStream crtab: level]. - aStream cr. - aNode args second emitCCodeOn: aStream level: level generator: self. - level timesRepeat: [aStream tab]. - idList reversed do: - [:each | - aStream - nextPutAll: each asString; - nextPutAll: ' = popRemappableOop()'] - separatedBy: [aStream nextPut: $;; crtab: level].! Item was added: + ----- Method: SmartSyntaxPluginCodeGenerator>>generateSpurRemapOopIn:on:indent: (in category 'translating builtins') ----- + generateSpurRemapOopIn: aNode on: aStream indent: level + "Generate just the block argument for this message as Spur does not GC on allocation." + + aNode args second emitCCodeOn: aStream level: level generator: self! Item was added: + ----- Method: SmartSyntaxPluginCodeGenerator>>generateV3RemapOopIn:on:indent: (in category 'translating builtins') ----- + generateV3RemapOopIn: aNode on: aStream indent: level + "Generate call on remapOop: for the variable oopOrList (or all of the + variables in oopOrList) before evaluating aBlock, and restore them after. + This keeps the oops valid if, as V3 will, there is a GC on allocation." + + | idList | + pluginFunctionsUsed add: #pushRemappableOop:; add: #popRemappableOop. + idList := aNode args first nameOrValue. + idList class == Array ifFalse: [idList := Array with: idList]. + idList do: + [:each | + aStream + nextPutAll: 'pushRemappableOop('; + nextPutAll: each asString; + nextPutAll: ');'] + separatedBy: [aStream crtab: level]. + aStream cr. + aNode args second emitCCodeOn: aStream level: level generator: self. + level timesRepeat: [aStream tab]. + idList reversed do: + [:each | + aStream + nextPutAll: each asString; + nextPutAll: ' = popRemappableOop()'] + separatedBy: [aStream nextPut: $;; crtab: level]!

1 0

VM Maker: VMMaker.oscog-eem.793.mcz
by commits＠source.squeak.org 02 Jul '14

02 Jul '14

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.793.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.793 Author: eem Time: 2 July 2014, 1:31:40.735 pm UUID: aa676593-2c7b-4ad7-92a5-9d1e27cb7377 Ancestors: VMMaker.oscog-eem.792 Fix inline cache for Characters in Spur. =============== Diff against VMMaker.oscog-eem.792 =============== Item was changed: ----- Method: CogObjectRepresentationFor32BitSpur>>getInlineCacheClassTagFrom:into: (in category 'compile abstract instructions') ----- getInlineCacheClassTagFrom: sourceReg into: destReg "Extract the inline cache tag for the object in sourceReg into destReg. The inline cache tag for a given object is the value loaded in inline caches to distinguish objects of different classes. In Spur this is either the tags for immediates, (with 1 & 3 collapsed to 1 for SmallIntegers, and 2 collapsed to 0 for Characters), or the receiver's classIndex. Generate something like this: Limm: andl $0x1, rDest j Lcmp Lentry: movl rSource, rDest andl $0x3, rDest jnz Limm movl 0(%edx), rDest andl $0x3fffff, rDest Lcmp: At least on a 2.2GHz Intel Core i7 the following is slightly faster than the above, 136m sends/sec vs 130m sends/sec for nfib in tinyBenchmarks Lentry: movl rSource, rDest andl $0x3, rDest jz LnotImm andl $1, rDest j Lcmp LnotImm: movl 0(%edx), rDest andl $0x3fffff, rDest Lcmp: + But we expect most SmallInteger arithmetic to be performed in-line and so prefer the - But we expect most SMallInteger arithmetic to be performwd in-line and so prefer the version that is faster for non-immediates (because it branches for immediates only)." | immLabel jumpNotImm entryLabel jumpCompare | <var: #immLabel type: #'AbstractInstruction *'> <var: #jumpNotImm type: #'AbstractInstruction *'> <var: #entryLabel type: #'AbstractInstruction *'> <var: #jumpCompare type: #'AbstractInstruction *'> false ifTrue: [cogit AlignmentNops: BytesPerWord. entryLabel := cogit Label. cogit MoveR: sourceReg R: destReg. cogit AndCq: objectMemory tagMask R: destReg. jumpNotImm := cogit JumpZero: 0. cogit AndCq: 1 R: destReg. jumpCompare := cogit Jump: 0. "Get least significant half of header word in destReg" self flag: #endianness. jumpNotImm jmpTarget: (cogit MoveMw: 0 r: sourceReg R: destReg). jumpCompare jmpTarget: (cogit AndCq: objectMemory classIndexMask R: destReg)] ifFalse: [cogit AlignmentNops: BytesPerWord. immLabel := cogit Label. cogit AndCq: 1 R: destReg. jumpCompare := cogit Jump: 0. cogit AlignmentNops: BytesPerWord. entryLabel := cogit Label. cogit MoveR: sourceReg R: destReg. cogit AndCq: objectMemory tagMask R: destReg. cogit JumpNonZero: immLabel. self flag: #endianness. "Get least significant half of header word in destReg" cogit MoveMw: 0 r: sourceReg R: destReg. cogit AndCq: objectMemory classIndexMask R: destReg. jumpCompare jmpTarget: cogit Label]. ^entryLabel! Item was added: + ----- Method: CogObjectRepresentationFor32BitSpur>>inlineCacheTagForInstance: (in category 'in-line cacheing') ----- + inlineCacheTagForInstance: oop + "c.f. getInlineCacheClassTagFrom:into:" + ^(objectMemory isImmediate: oop) + ifTrue: [oop bitAnd: 1] + ifFalse: [objectMemory classIndexOf: oop]! Item was added: + ----- Method: CogObjectRepresentationFor64BitSpur>>inlineCacheTagForInstance: (in category 'in-line cacheing') ----- + inlineCacheTagForInstance: oop + "c.f. getInlineCacheClassTagFrom:into:" + ^(objectMemory isImmediate: oop) + ifTrue: [oop bitAnd: objectMemory tagMask] + ifFalse: [objectMemory classIndexOf: oop]! Item was changed: ----- Method: CogObjectRepresentationForSpur>>inlineCacheTagForInstance: (in category 'in-line cacheing') ----- inlineCacheTagForInstance: oop + self subclassResponsibility! - "c.f. getInlineCacheClassTagFrom:into:" - (objectMemory isImmediate: oop) ifTrue: - [(objectMemory isIntegerObject: oop) ifTrue: - [^objectMemory integerObjectOf: 0]. "the SmallInteger tag" - ^oop bitAnd: objectMemory tagMask]. "the other tags" - ^objectMemory classIndexOf: oop!

1 0

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

02 Jul '14

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

2 2

Re: [Vm-dev] VM Maker: VMMaker.oscog-eem.790.mcz
by Nicolas Cellier 02 Jul '14

02 Jul '14

2014-07-01 4:22 GMT+02:00 <commits(a)source.squeak.org>: > > Item was changed: > ----- Method: LargeIntegersPlugin>>cDigitSub:len:with:len:into: (in > category 'C core') ----- > + cDigitSub: pByteSmall len: smallLen with: pByteLarge len: largeLen into: > pByteRes > + | z | > - cDigitSub: pByteSmall > - len: smallLen > - with: pByteLarge > - len: largeLen > - into: pByteRes > - | z limit | > <var: #pByteSmall type: 'unsigned char * '> > <var: #pByteLarge type: 'unsigned char * '> > <var: #pByteRes type: 'unsigned char * '> > > + z := 0. "Loop invariant is -1<=z<=1" > + 0 to: smallLen - 1 do: > - z := 0. > - "Loop invariant is -1<=z<=1" > - limit := smallLen - 1. > - 0 to: limit do: > [:i | > z := z + (pByteLarge at: i) - (pByteSmall at: i). > + pByteRes at: i put: z - (z // 256 * 256). "sign-tolerant > form of (z bitAnd: 255)" > Frankly, having z declared unsigned int and just doing pByteRes at: i put: (z bitAnd: 16rFF) as I suggested would be way way simpler and will ALWAYS work. Why the hell invoke the complications of signed arithmetic when the content pByteRes is unsigned??? Even if z is declared signed, (z bitAnd: 255) would work on a vast majority of compiler/processor because most compiler/processor would use a 2-complement representation. But it's technically implementation-defined. + z := z signedBitShift: -8]. > i think this one is OK too on a vast majority of machines, but this is as well technically implementation defined. Some weird compiler/processor pair may as well fill left bits with zeroes, or not even use 2-complement... z here is a carry and should contain either 0, or -1 (that is UINT_MAX) after this operation. > + smallLen to: largeLen - 1 do: > - pByteRes at: i put: z - (z // 256 * 256). > - "sign-tolerant form of (z bitAnd: 255)" > - z := z // 256]. > - limit := largeLen - 1. > - smallLen to: limit do: > [:i | > z := z + (pByteLarge at: i) . > + pByteRes at: i put: z - (z // 256 * 256). "sign-tolerant > form of (z bitAnd: 255)" > + z := z signedBitShift: -8]. > - pByteRes at: i put: z - (z // 256 * 256). > - "sign-tolerant form of (z bitAnd: 255)" > - z := z // 256]. > ! > Isn't there another funny signed shift in Large Integer division? This would deserve a review too, because division is inlining its own sort of subtraction...

3 13

Using MACROS from standard headers in slang [was VM Maker: VMMaker.oscog-eem.790.mcz]
by Nicolas Cellier 02 Jul '14

02 Jul '14

2014-07-02 7:44 GMT+02:00 Nicolas Cellier < nicolas.cellier.aka.nice(a)gmail.com>: > > > > 2014-07-02 0:28 GMT+02:00 David T. Lewis <lewis(a)mail.msen.com>: > > >> On Tue, Jul 01, 2014 at 09:21:00PM +0200, Nicolas Cellier wrote: >> > >> > 2014-07-01 4:22 GMT+02:00 <commits(a)source.squeak.org>: >> > >> > > >> > > Item was changed: >> > > ----- Method: LargeIntegersPlugin>>cDigitSub:len:with:len:into: (in >> > > category 'C core') ----- >> > > + cDigitSub: pByteSmall len: smallLen with: pByteLarge len: largeLen >> into: >> > > pByteRes >> > > + | z | >> > > - cDigitSub: pByteSmall >> > > - len: smallLen >> > > - with: pByteLarge >> > > - len: largeLen >> > > - into: pByteRes >> > > - | z limit | >> > > <var: #pByteSmall type: 'unsigned char * '> >> > > <var: #pByteLarge type: 'unsigned char * '> >> > > <var: #pByteRes type: 'unsigned char * '> >> > > >> > > + z := 0. "Loop invariant is -1<=z<=1" >> > > + 0 to: smallLen - 1 do: >> > > - z := 0. >> > > - "Loop invariant is -1<=z<=1" >> > > - limit := smallLen - 1. >> > > - 0 to: limit do: >> > > [:i | >> > > z := z + (pByteLarge at: i) - (pByteSmall at: i). >> > > + pByteRes at: i put: z - (z // 256 * 256). >> "sign-tolerant >> > > form of (z bitAnd: 255)" >> > > >> > >> > Frankly, having z declared unsigned int and just doing pByteRes at: i >> put: >> > (z bitAnd: 16rFF) as I suggested would be way way simpler and will >> ALWAYS >> > work. >> > Why the hell invoke the complications of signed arithmetic when the >> content >> > pByteRes is unsigned??? >> >> Nicolas, >> >> This sounds right to me. >> >> Do you have a final version of #cDigitSub:len:with:len:into: that you can >> recommend? The version in VMMaker-nice.342 produces failures in the >> KernelTests-Numbers tests when compiled in 64-bit mode, but I think that >> you have since suggested some other improvements in this email thread. >> >> Dave >> >> > Hi David, > that's interesting. VMMaker-nice.342 contains all the 32bits LargeInteger > modifications, not just the #cDigitSub:len:with:len:into:. > I tried to declare everything as <unsigned int> rather than <usqInt> with > the assumption that sizeof(unsigned int)*2==sizeof(unsigned long long). > But I never tried to compile a 64 bits VM, I think I lost the recipe for > brewing such a flavour. > I'm on MacOSX, could you provide a link to the shortest way to do it? > Once I can check it, I'll publish a corrected version. > Thanks > > Nicolas > One thing I remember is that my modifications are full of hardcoded constants like 16rFFFFFFFF that are making the code hardly future proof. Normally, I would never code like that in C, but use standard macros like UINT_MAX. It's just that I don't know how to do it in SLANG... Any hint? As for our own constants, like SmallInteger minVal and maxVal, we should really have our own MACRO for this, there are way too many repetitions of these constants spreaded in the code. Nicolas

3 3

[commit][3025] CogVM source as per VMMaker.oscog-eem.792
by commits＠squeakvm.org 02 Jul '14

02 Jul '14

Revision: 3025 Author: eliot Date: 2014-07-01 20:12:22 -0700 (Tue, 01 Jul 2014) Log Message: ----------- CogVM source as per VMMaker.oscog-eem.792 Fix potential liveness of ReceiverResultReg across counting jumps by reloading ReceiverResultReg before returning from the trampoline through which ceCounterTripped: is called. Modified Paths: -------------- branches/Cog/sistasrc/vm/cogit.c branches/Cog/sistasrc/vm/cogit.h branches/Cog/sistasrc/vm/cogmethod.h branches/Cog/spursistasrc/vm/cogit.c branches/Cog/spursistasrc/vm/cogit.h branches/Cog/spursistasrc/vm/cogmethod.h Property Changed: ---------------- branches/Cog/platforms/Cross/vm/sqSCCSVersion.h Property changes on: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h ___________________________________________________________________ Modified: checkindate - Tue Jul 1 08:38:13 PDT 2014 + Tue Jul 1 20:11:53 PDT 2014 Modified: branches/Cog/sistasrc/vm/cogit.c =================================================================== --- branches/Cog/sistasrc/vm/cogit.c 2014-07-01 15:39:10 UTC (rev 3024) +++ branches/Cog/sistasrc/vm/cogit.c 2014-07-02 03:12:22 UTC (rev 3025) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.790 uuid: 1c0587fb-44ad-43f6-8bfd-2a0f91e21a59 + CCodeGenerator VMMaker.oscog-eem.792 uuid: 9d8d23c8-c855-48a6-8bdd-402765c01a99 from - SistaStackToRegisterMappingCogit VMMaker.oscog-eem.790 uuid: 1c0587fb-44ad-43f6-8bfd-2a0f91e21a59 + SistaStackToRegisterMappingCogit VMMaker.oscog-eem.792 uuid: 9d8d23c8-c855-48a6-8bdd-402765c01a99 */ -static char __buildInfo[] = "SistaStackToRegisterMappingCogit VMMaker.oscog-eem.790 uuid: 1c0587fb-44ad-43f6-8bfd-2a0f91e21a59 " __DATE__ ; +static char __buildInfo[] = "SistaStackToRegisterMappingCogit VMMaker.oscog-eem.792 uuid: 9d8d23c8-c855-48a6-8bdd-402765c01a99 " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -12864,19 +12864,21 @@ genMustBeBooleanTrampolineForcalled(sqInt boolean, char *trampolineName) { AbstractInstruction *jumpMBB; - sqInt reg1; opcodeIndex = 0; /* begin CmpCq:R: */ genoperandoperand(CmpCqR, 0, SendNumArgsReg); /* begin JumpZero: */ jumpMBB = genoperand(JumpZero, ((sqInt)0)); - compileTrampolineFornumArgsargargargargsaveRegspushLinkRegresultReg(ceCounterTripped, 1, TempReg, null, null, null, 0, 1, null); - if ((cResultRegister(backEnd)) != TempReg) { - /* begin MoveR:R: */ - reg1 = cResultRegister(backEnd); - genoperandoperand(MoveRR, reg1, TempReg); - } + + genSmalltalkToCStackSwitch(); + compileCallFornumArgsargargargargresultRegsaveRegs(ceCounterTripped, 1, TempReg, null, null, null, TempReg, 0); + genLoadStackPointers(backEnd); + + /* begin MoveMw:r:R: */ + genoperandoperandoperand(MoveMwrR, FoxMFReceiver, FPReg, ReceiverResultReg); + /* begin RetN: */ + genoperand(RetN, 0); assert(!(shouldAnnotateObjectReference(boolean))); jmpTarget(jumpMBB, gAddCqR(boolean, TempReg)); return genTrampolineForcallednumArgsargargargargsaveRegspushLinkRegresultRegappendOpcodes(ceSendMustBeBoolean, trampolineName, 1, TempReg, null, null, null, 0, 1, null, 1); Modified: branches/Cog/sistasrc/vm/cogit.h =================================================================== --- branches/Cog/sistasrc/vm/cogit.h 2014-07-01 15:39:10 UTC (rev 3024) +++ branches/Cog/sistasrc/vm/cogit.h 2014-07-02 03:12:22 UTC (rev 3025) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.790 uuid: 1c0587fb-44ad-43f6-8bfd-2a0f91e21a59 + CCodeGenerator VMMaker.oscog-eem.792 uuid: 9d8d23c8-c855-48a6-8bdd-402765c01a99 */ Modified: branches/Cog/sistasrc/vm/cogmethod.h =================================================================== --- branches/Cog/sistasrc/vm/cogmethod.h 2014-07-01 15:39:10 UTC (rev 3024) +++ branches/Cog/sistasrc/vm/cogmethod.h 2014-07-02 03:12:22 UTC (rev 3025) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.790 uuid: 1c0587fb-44ad-43f6-8bfd-2a0f91e21a59 + CCodeGenerator VMMaker.oscog-eem.792 uuid: 9d8d23c8-c855-48a6-8bdd-402765c01a99 */ typedef struct { Modified: branches/Cog/spursistasrc/vm/cogit.c =================================================================== --- branches/Cog/spursistasrc/vm/cogit.c 2014-07-01 15:39:10 UTC (rev 3024) +++ branches/Cog/spursistasrc/vm/cogit.c 2014-07-02 03:12:22 UTC (rev 3025) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.790 uuid: 1c0587fb-44ad-43f6-8bfd-2a0f91e21a59 + CCodeGenerator VMMaker.oscog-eem.792 uuid: 9d8d23c8-c855-48a6-8bdd-402765c01a99 from - SistaStackToRegisterMappingCogit VMMaker.oscog-eem.790 uuid: 1c0587fb-44ad-43f6-8bfd-2a0f91e21a59 + SistaStackToRegisterMappingCogit VMMaker.oscog-eem.792 uuid: 9d8d23c8-c855-48a6-8bdd-402765c01a99 */ -static char __buildInfo[] = "SistaStackToRegisterMappingCogit VMMaker.oscog-eem.790 uuid: 1c0587fb-44ad-43f6-8bfd-2a0f91e21a59 " __DATE__ ; +static char __buildInfo[] = "SistaStackToRegisterMappingCogit VMMaker.oscog-eem.792 uuid: 9d8d23c8-c855-48a6-8bdd-402765c01a99 " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -13959,19 +13959,21 @@ genMustBeBooleanTrampolineForcalled(sqInt boolean, char *trampolineName) { AbstractInstruction *jumpMBB; - sqInt reg1; opcodeIndex = 0; /* begin CmpCq:R: */ genoperandoperand(CmpCqR, 0, SendNumArgsReg); /* begin JumpZero: */ jumpMBB = genoperand(JumpZero, ((sqInt)0)); - compileTrampolineFornumArgsargargargargsaveRegspushLinkRegresultReg(ceCounterTripped, 1, TempReg, null, null, null, 0, 1, null); - if ((cResultRegister(backEnd)) != TempReg) { - /* begin MoveR:R: */ - reg1 = cResultRegister(backEnd); - genoperandoperand(MoveRR, reg1, TempReg); - } + + genSmalltalkToCStackSwitch(); + compileCallFornumArgsargargargargresultRegsaveRegs(ceCounterTripped, 1, TempReg, null, null, null, TempReg, 0); + genLoadStackPointers(backEnd); + + /* begin MoveMw:r:R: */ + genoperandoperandoperand(MoveMwrR, FoxMFReceiver, FPReg, ReceiverResultReg); + /* begin RetN: */ + genoperand(RetN, 0); assert(!(shouldAnnotateObjectReference(boolean))); jmpTarget(jumpMBB, gAddCqR(boolean, TempReg)); return genTrampolineForcallednumArgsargargargargsaveRegspushLinkRegresultRegappendOpcodes(ceSendMustBeBoolean, trampolineName, 1, TempReg, null, null, null, 0, 1, null, 1); Modified: branches/Cog/spursistasrc/vm/cogit.h =================================================================== --- branches/Cog/spursistasrc/vm/cogit.h 2014-07-01 15:39:10 UTC (rev 3024) +++ branches/Cog/spursistasrc/vm/cogit.h 2014-07-02 03:12:22 UTC (rev 3025) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.790 uuid: 1c0587fb-44ad-43f6-8bfd-2a0f91e21a59 + CCodeGenerator VMMaker.oscog-eem.792 uuid: 9d8d23c8-c855-48a6-8bdd-402765c01a99 */ Modified: branches/Cog/spursistasrc/vm/cogmethod.h =================================================================== --- branches/Cog/spursistasrc/vm/cogmethod.h 2014-07-01 15:39:10 UTC (rev 3024) +++ branches/Cog/spursistasrc/vm/cogmethod.h 2014-07-02 03:12:22 UTC (rev 3025) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.790 uuid: 1c0587fb-44ad-43f6-8bfd-2a0f91e21a59 + CCodeGenerator VMMaker.oscog-eem.792 uuid: 9d8d23c8-c855-48a6-8bdd-402765c01a99 */ typedef struct {

1 0

VM Maker: VMMaker.oscog-eem.792.mcz
by commits＠source.squeak.org 02 Jul '14

02 Jul '14

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.792.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.792 Author: eem Time: 1 July 2014, 8:08:46.954 pm UUID: 9d8d23c8-c855-48a6-8bdd-402765c01a99 Ancestors: VMMaker.oscog-eem.791 Fix potential liveness of ReceiverResultReg across counting jumps by reloading ReceiverResultReg before returning from the trampoline through which ceCounterTripped: is called. =============== Diff against VMMaker.oscog-eem.791 =============== Item was changed: ----- Method: SistaStackToRegisterMappingCogit>>genMustBeBooleanTrampolineFor:called: (in category 'initialization') ----- genMustBeBooleanTrampolineFor: boolean called: trampolineName "This can be entered in one of two states, depending on SendNumArgsReg. See e.g. genJumpIf:to:. If SendNumArgsReg is non-zero then this has been entered via the initial test of the counter in the jump executed count (i.e. the counter has tripped). In this case TempReg contains the boolean to be tested and should not be offset, and ceCounterTripped should be invoked with the unoffset TempReg. If SendNumArgsReg is zero then this has been entered for must-be-boolean processing. TempReg has been offset by boolean and must be corrected and ceSendMustBeBoolean: invoked with the corrected value." <var: #trampolineName type: #'char *'> | jumpMBB | <var: #jumpMBB type: #'AbstractInstruction *'> <inline: false> opcodeIndex := 0. self CmpCq: 0 R: SendNumArgsReg. jumpMBB := self JumpZero: 0. + "Open-code self compileTrampolineFor: #ceCounterTripped: numArgs: 1 arg: TempReg ... + so we can restore ResultReceiverReg." + backEnd hasLinkRegister ifTrue: + [self PushR: LinkReg]. + self genSmalltalkToCStackSwitch. + self + compileCallFor: #ceCounterTripped: - self compileTrampolineFor: #ceCounterTripped: numArgs: 1 arg: TempReg arg: nil arg: nil arg: nil + resultReg: TempReg "(*)" + saveRegs: false. + "(*) For the case where the ceCounterTripped: call returns (e.g. because there's no callback selector - saveRegs: false - pushLinkReg: true - resultReg: nil. - "For the case where the ceCounterTripped: call returns (e.g. because there's no callback selector installed), the call to the ceSendMustBeBooleanAddTrue/FalseTrampoline is followed by a jump back to the start of the counter/condition test sequence. For this case copy the C result to TempReg (the register that is tested), to reload it with the boolean to be tested." + backEnd genLoadStackPointers. + backEnd hasLinkRegister ifTrue: + [self PopR: LinkReg]. + "To keep ResultReceiverReg live if optStatus thiught it was, simply reload it + from the frame pointer. This avoids having to reload it in the common case + (counter does not trip) if it was live." + self MoveMw: FoxMFReceiver r: FPReg R: ReceiverResultReg. + self RetN: 0. - backEnd cResultRegister ~= TempReg ifTrue: - [self MoveR: backEnd cResultRegister R: TempReg]. "If the objectRepresentation does want true & false to be mobile then we need to record these addresses." self assert: (objectRepresentation shouldAnnotateObjectReference: boolean) not. jumpMBB jmpTarget: (self AddCq: boolean R: TempReg). ^self genTrampolineFor: #ceSendMustBeBoolean: called: trampolineName numArgs: 1 arg: TempReg arg: nil arg: nil arg: nil saveRegs: false pushLinkReg: true resultReg: nil appendOpcodes: true!

1 0

VM Maker: CMakeVMMakerSqueak-tty.81.mcz
by commits＠source.squeak.org 01 Jul '14

01 Jul '14

Timothy M uploaded a new version of CMakeVMMakerSqueak to project VM Maker: http://source.squeak.org/VMMaker/CMakeVMMakerSqueak-tty.81.mcz ==================== Summary ==================== Name: CMakeVMMakerSqueak-tty.81 Author: tty Time: 1 July 2014, 2:07:31.67 pm UUID: 672b7f43-3b93-4e5f-a037-fad1fc9e8a39 Ancestors: CMakeVMMakerSqueak-tty.80 Linux64x86w32BitSqueakCogV3Config generates and runs. Next up, cleanup on this class then configure for other build configurations =============== Diff against CMakeVMMakerSqueak-tty.80 =============== Item was added: + ----- Method: CMakePluginGeneratorForSqueak>>addCrossSources: (in category 'as yet unclassified') ----- + addCrossSources: sources + + ^ self addSources: sources prefixed: '${pluginCross}/' + ! Item was added: + ----- Method: CMakePluginGeneratorForSqueak>>addExternalDependency: (in category 'as yet unclassified') ----- + addExternalDependency: aString + "We need to collect external dependencies to internal plugins because we need to force its + resolve before, and if we just add teh dependency in executable some times is not enough. + check StackIPhoneConfig>>#configureFT2Plugin: as an example" + externalDependencies := externalDependencies copyWith: aString.! Item was added: + ----- Method: CMakePluginGeneratorForSqueak>>addExternalLibrary: (in category 'cmake commands') ----- + addExternalLibrary: aLibrary + self isInternal + ifTrue: [ vmGen addExternalLibrary: aLibrary ] + ifFalse: [ super addExternalLibrary: aLibrary ].! Item was added: + ----- Method: CMakePluginGeneratorForSqueak>>addPlatformSources: (in category 'as yet unclassified') ----- + addPlatformSources: sources + + ^ self addSources: sources prefixed: '${pluginPlatform}/' + ! Item was added: + ----- Method: CMakePluginGeneratorForSqueak>>config (in category 'as yet unclassified') ----- + config + ^ vmGen config! Item was added: + ----- Method: CMakePluginGeneratorForSqueak>>configurationName (in category 'as yet unclassified') ----- + configurationName + ^ vmGen configurationName! Item was added: + ----- Method: CMakePluginGeneratorForSqueak>>doNotGenerate (in category 'as yet unclassified') ----- + doNotGenerate + + "Forcely exclude plugin form build. Use this method only for debugging purposes. + + Front-end users should simply specify different list of plugins for building VM, + effectively excluding any unwanted stuff " + + ^doNotGenerate! Item was added: + ----- Method: CMakePluginGeneratorForSqueak>>doNotGenerate: (in category 'as yet unclassified') ----- + doNotGenerate: aValue + + "Forcely exclude plugin form build. Use this method only for debugging purposes. + + Front-end users should simply specify different list of plugins for building VM, + effectively excluding any unwanted stuff " + + doNotGenerate := aValue! Item was added: + ----- Method: CMakePluginGeneratorForSqueak>>externalDependencies (in category 'as yet unclassified') ----- + externalDependencies + ^ externalDependencies! Item was added: + ----- Method: CMakePluginGeneratorForSqueak>>generate (in category 'squeak compatibility') ----- + generate + + | name | + output := String new writeStream. + + name := plugin moduleName. + #( vmGen config setGlobalOptions: self. + + self + printHeader; + project: name; + "include directories generated for build" + include: '../directories.cmake'. + + self set: 'CMAKE_CONFIGURATION_TYPES' to: 'Release'. + ). + + self message: (internal ifTrue: [ 'Adding internal plugin: '] ifFalse: ['Adding external plugin: ']) , name. + + self + set: #pluginName toString: name; + set: #pluginSrc toString: '${srcPluginsDir}/', name; + set: #pluginCross toString: '${crossDir}/plugins/', name; + set: #pluginPlatform toString: '${targetPlatform}/plugins/', name. + + + "clear LINKLIBS variable" + self set: #LINKLIBS to: ''. + + internal + ifTrue: [ self puts: 'add_definitions(-DSQUEAK_BUILTIN_PLUGIN)']. + + self addSources: { name , '.c' } prefixed: '${pluginSrc}/'. + + " default include directories for plugin " + self includeDirectories: '${pluginSrc} ${pluginCross} ${targetPlatform}/plugins/${pluginName}'. + + "Not needed because there are already there (inherited from main configuration)" + "self addDefinitions: vmGen config compilerFlags." + + " perform config's configureXYZ: message to apply per-plugin custom rules, if any " + + vmGen config configurePlugin: plugin with: self. + + extraRules ifNotNil: [ extraRules value: self ]. + + " generate a static lib for internal plugin, or shared for external" + internal ifTrue: [ + self cmd: 'add_library' params: name , ' STATIC ${sources}'. + ] ifFalse: [ + self cmd: 'add_library' params: name , ' SHARED ${sources}'. + + " self cmd: 'set_property' params: 'TARGET ' , name , ' PROPERTY LINK_FLAGS -bundle'" + ]. + + vmGen config extraPluginSettings: self. + self isExternal ifTrue: [ + self cmd: 'target_link_libraries' + params: self moduleName , ' ${LINKLIBS}'. + ]. + + " see senders of #linkFlags " + self + cmd: 'set_property' + params: 'TARGET ', name, ' PROPERTY LINK_FLAGS "${linkFlags}"'. + + "set dependencies" + self puts: 'IF (',self moduleName , '_dependencies)'. + + self cmd: 'add_dependencies' + params: name , ' ${', self moduleName , '_dependencies}'. + + self puts: 'ENDIF (',self moduleName , '_dependencies)'. + self saveFile.! Item was added: + ----- Method: CMakePluginGeneratorForSqueak>>initialize (in category 'initialize-release') ----- + initialize + super initialize. + externalDependencies := #().! Item was added: + ----- Method: CMakePluginGeneratorForSqueak>>isExternal (in category 'as yet unclassified') ----- + isExternal + ^ internal not! Item was added: + ----- Method: CMakePluginGeneratorForSqueak>>isInternal (in category 'as yet unclassified') ----- + isInternal + ^ internal! Item was added: + ----- Method: CMakePluginGeneratorForSqueak>>moduleName (in category 'accessing') ----- + moduleName + ^plugin moduleName! Item was added: + ----- Method: CMakePluginGeneratorForSqueak>>plugin (in category 'as yet unclassified') ----- + plugin + ^ plugin! Item was added: + ----- Method: CMakePluginGeneratorForSqueak>>vmGenerator (in category 'squeak compatibility') ----- + vmGenerator + "Make it accessible from plugin generator side" + ^ vmGen! Item was changed: ----- Method: CMakeVMGeneratorForSqueak>>generatePlugin:internal:extraRules: (in category 'as yet unclassified') ----- generatePlugin: aPlugin internal: aBoolean extraRules: aBlock " this method called back from plugin" + ^ CMakePluginGeneratorForSqueak new - ^ CMakePluginGenerator new generate: aPlugin for: self internal: aBoolean extraRules: aBlock! Item was changed: ----- Method: CPlatformConfigForSqueak>>linkFlags (in category 'cmake buildType redirects') ----- linkFlags " '-lSM -lICE -ldl -lGL -lpthread -lm -lnsl -lX11' -L/usr/lib32 etc..." |d flags| d:= SqueakCMakeVMMakerAbstractBuilder default buildTypeAndDirectoryInfo copy. d at: #build put: [self linkFlagsBuild]; at: #buildAssert put: [self linkFlagsBuildAssert]; at: #buildAssertITimerHeartbeat put: [self linkFlagsBuildAssertITimerHeartbeat]; at:#buildDebug put: [self linkFlagsBuildDebug]; at: #buildDebugITimerHeartbeat put: [self linkFlagsBuildDebugITimerHeartbeat ]; at: #buildITimerHeartbeat put: [self linkFlagsBuildITimerHeartbeat]; at: #buildMultiThreaded put: [self linkFlagsBuildMultiThreaded ]; at: #buildMultiThreadedAssert put: [self linkFlagsBuildMultiThreadedAssert]; at: #buildMultiThreadedDebug put: [self linkFlagsBuildMultiThreadedDebug ]; at: #buildNone put:[self linkFlagsNoBuildType]. flags := String streamContents: [:stream | ((d at: buildType) value collect: #withBlanksTrimmed as: Set) asStringOn: stream delimiter: ' ']. ^flags. ! Item was changed: ----- Method: Linux64x86w32BitConfig>>preferredIncludesBuild (in category 'source files') ----- preferredIncludesBuild + ^ #( '${targetPlatform}/plugins/B3DAcceleratorPlugin') - ^ #( '${targetPlatform}/plugins/AioPlugin' - '${targetPlatform}/plugins/B3DAcceleratorPlugin' - '${targetPlatform}/plugins/DropPlugin' - '${targetPlatform}/plugins/FilePlugin' - '${targetPlatform}/plugins/HostWindowPlugin' - '${targetPlatform}/plugins/JPEGReadWriter2Plugin' - '${targetPlatform}/plugins/LocalePlugin' - '${targetPlatform}/plugins/Mpeg3Plugin' - '${targetPlatform}/plugins/PseudoTTYPlugin' - '${targetPlatform}/plugins/SerialPlugin' - '${targetPlatform}/plugins/SoundPlugin' - '${crossDir}/plugins/SoundGenerationPlugin' - '${targetPlatform}/plugins/SqueakSSL' - '${targetPlatform}/plugins/UnixOSProcessPlugin' - '${targetPlatform}/plugins/AsynchFilePlugin' - '${targetPlatform}/plugins/BochsIA32Plugin' - '${targetPlatform}/plugins/FileCopyPlugin' - '${targetPlatform}/plugins/FloatMathPlugin' - '${targetPlatform}/plugins/InternetConfigPlugin' - '${targetPlatform}/plugins/JoystickTabletPlugin' - '${targetPlatform}/plugins/MIDIPlugin' - '${targetPlatform}/plugins/PrintJobPlugin' - '${targetPlatform}/plugins/SecurityPlugin' - '${crossDir}/plugins/SocketPlugin' - '${targetPlatform}/plugins/SqueakFFIPrims' - '${targetPlatform}/plugins/UUIDPlugin' - '${targetPlatform}/plugins/XDisplayControlPlugin' - ) - "SystemNavigation default browseMethodsWhoseNamesContain: 'preferredIncludes'" ! Item was changed: ----- Method: Linux64x86w32BitConfig>>setExtraTargetPropertiesBuild: (in category 'cmake buildType redirects') ----- setExtraTargetPropertiesBuild: aMaker self flag:'tty'. "I am nervous about this method up here in this class, but pharo has it in CogUnixConfig, so using as is for now" + aMaker message: 'setExtraTargetPropertiesBuild: aMaker'. + aMaker setTargetProperties: 'LINK_FLAGS "-m32"'. aMaker puts: 'set_source_files_properties( ${srcVMDir}/cogit.c PROPERTIES COMPILE_FLAGS "' , self compilerFlags , '")'. aMaker cmd: 'set_source_files_properties' params: ' ${targetPlatform}/vm/sqUnixHeartbeat.c PROPERTIES COMPILE_FLAGS "' , self compilerFlags , '"'. + - " aMaker addExternalLibraries: #( 'uuid' "" 'ssl' "" 'crypto' "" 'm' 'dl' 'pthread' ). + - " aMaker set: 'EXECUTABLE_OUTPUT_PATH' toString: self outputDir fullName. self addVMDrivers: aMaker.! Item was changed: ----- Method: Linux64x86w32BitConfig>>setGlobalOptionsAfterDetermineSystemBuild: (in category 'cmake buildType redirects') ----- setGlobalOptionsAfterDetermineSystemBuild: aMaker " SystemNavigation default browseMethodsWhoseNamesContain: 'setGlobalOptionsAfterDetermineSystemBuild:'" + aMaker message: 'setGlobalOptionsAfterDetermineSystemBuild: aMaker'. + " aMaker set: 'CMAKE_FIND_ROOT_PATH' to: '/usr/lib ' " ! - aMaker message: 'setGlobalOptionsAfterDetermineSystemBuild: aMaker'. ! Item was changed: ----- Method: Linux64x86w32BitConfig>>setGlobalOptionsBuild: (in category 'cmake buildType redirects') ----- setGlobalOptionsBuild: aMaker aMaker message: 'setGlobalOptionsBuild: aMaker'. + aMaker linkDirectories: '/usr/lib'. + + " SystemNavigation default browseMethodsWhoseNamesContain: 'setGlobalOptions:' "! - " maker set: 'CMAKE_LIBRARY_PATH ${CMAKE_LIBRARY_PATH}' to: ' /usr/lib/gcc/x86_64-slackware-linux/4.8.2/'. - set any CMake global options, before declaring a project in cmake file - - set(CMAKE_LIBRARY_PATH ${CMAKE_LIBRARY_PATH} /opt/local/lib) - SystemNavigation default browseMethodsWhoseNamesContain: 'setGlobalOptions:' - "! Item was changed: ----- Method: Linux64x86w32BitSqueakCogV3Config>>compilerFlagsBuild (in category 'cmake buildType redirects') ----- compilerFlagsBuild "Some gcc versions (3.4*) create a broken VM using -O2, so try -O1 if you have problems" ^{ + '-g3' "more debugging" + . '-O1' "low optimization level" + . '-m32' + . '-msse2' + . '-D_GNU_SOURCE' + . '-D_FILE_OFFSET_BITS=64' + . '-DNDEBUG' "disable assertions" + . '-DLSB_FIRST=1' "" + . '-DUSE_GLOBAL_STRUCT=0' + . '-DDEBUGVM=0' + . '-DCOGMTVM=0' + . '-fno-tree-pre ' + . '-fno-caller-saves' + . '-L/usr/lib' - '-g3' "more debugging" - .'-O1' "low optimization level" - .'-m32' - .'-msse2' - .'-D_GNU_SOURCE' - .'-D_FILE_OFFSET_BITS=64' - .'-DNDEBUG' "disable assertions" - .'-DLSB_FIRST=1' "" - .'-DUSE_GLOBAL_STRUCT=0' - .'-DDEBUGVM=0' - .'-DCOGMTVM=0' - .'-fno-tree-pre ' - .'-fno-caller-saves' } ! Item was changed: ----- Method: Linux64x86w32BitSqueakCogV3Config>>defaultExternalPlugins (in category 'plugins') ----- defaultExternalPlugins "" + ^ #()! - ^ (super defaultExternalPlugins copyWithoutAll: #(BochsIA32Plugin #UUIDPlugin))! Item was added: + ----- Method: Linux64x86w32BitSqueakCogV3Config>>defaultInternalPlugins (in category 'plugins') ----- + defaultInternalPlugins + ^super defaultInternalPlugins copyWithoutAll:#(#FloatMathPlugin)! Item was changed: ----- Method: Linux64x86w32BitSqueakCogV3Config>>dirInstall (in category 'cmake') ----- dirInstall "the directory of the finished product.. the place where 'make install' puts stuff. SystemNavigation default browseMethodsWhoseNamesContain: 'outputDir' " + ^self squeakCogV3! - ^self squeakCogV3 , '.noGL'! Item was changed: ----- Method: Linux64x86w32BitSqueakCogV3Config>>linkFlagsBuild (in category 'cmake buildType redirects') ----- linkFlagsBuild "Answer array of libraries to link to" + ^ { '-L/usr/lib' + . '-L/usr/lib/X11' + . '-luuid' - ^ { - '-luuid' . 'lSM' . '-lICE' . '-ldl' . '-lGL' . '-lpthread' . '-lm' . '-lnsl' . '-lX11' + } addAll: (self lDFlagsBuild) - } !

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

Vm-dev July 2014