[Vm-dev] [commit][2655] CogVM source as per VMMaker.oscog-eem.248.
commits at squeakvm.org
commits at squeakvm.org
Thu Jan 3 22:00:53 UTC 2013
Revision: 2655
Author: eliot
Date: 2013-01-03 14:00:52 -0800 (Thu, 03 Jan 2013)
Log Message:
-----------
CogVM source as per VMMaker.oscog-eem.248.
Integrate directed shift changes from cog issue 111 that affect the
CoInterpreter and Cogit.
Make the translated primitive plugins include info from their
primitive supplying classes.
Add a script that reverts and touches file to correct date (why svn/hg/git
revert omit this I can't fathom; points to support for manual edit only?).
Modified Paths:
--------------
branches/Cog/nscogsrc/plugins/MiscPrimitivePlugin/MiscPrimitivePlugin.c
branches/Cog/nscogsrc/vm/cogit.c
branches/Cog/nscogsrc/vm/cogit.h
branches/Cog/nscogsrc/vm/cogmethod.h
branches/Cog/nscogsrc/vm/cointerp.c
branches/Cog/nscogsrc/vm/cointerp.h
branches/Cog/nscogsrc/vm/exampleSqNamedPrims.h
branches/Cog/nscogsrc/vm/gcc3x-cointerp.c
branches/Cog/nscogsrc/vm/interp.h
branches/Cog/nscogsrc/vm/vmCallback.h
branches/Cog/src/plugins/ADPCMCodecPlugin/ADPCMCodecPlugin.c
branches/Cog/src/plugins/MiscPrimitivePlugin/MiscPrimitivePlugin.c
branches/Cog/src/plugins/SoundGenerationPlugin/SoundGenerationPlugin.c
branches/Cog/src/vm/cogit.c
branches/Cog/src/vm/cogit.h
branches/Cog/src/vm/cogmethod.h
branches/Cog/src/vm/cointerp.c
branches/Cog/src/vm/cointerp.h
branches/Cog/src/vm/cointerpmt.c
branches/Cog/src/vm/cointerpmt.h
branches/Cog/src/vm/exampleSqNamedPrims.h
branches/Cog/src/vm/gcc3x-cointerp.c
branches/Cog/src/vm/gcc3x-cointerpmt.c
branches/Cog/src/vm/interp.h
branches/Cog/src/vm/vmCallback.h
Added Paths:
-----------
branches/Cog/scripts/svnrevert
Property Changed:
----------------
branches/Cog/platforms/Cross/vm/sqSCCSVersion.h
Modified: branches/Cog/nscogsrc/plugins/MiscPrimitivePlugin/MiscPrimitivePlugin.c
===================================================================
--- branches/Cog/nscogsrc/plugins/MiscPrimitivePlugin/MiscPrimitivePlugin.c 2013-01-03 04:59:02 UTC (rev 2654)
+++ branches/Cog/nscogsrc/plugins/MiscPrimitivePlugin/MiscPrimitivePlugin.c 2013-01-03 22:00:52 UTC (rev 2655)
@@ -1,9 +1,17 @@
/* Automatically generated by
- VMPluginCodeGenerator VMMaker.oscog-eem.235 uuid: 954df856-3f83-498c-9735-6cd3777ba9c7
+ VMPluginCodeGenerator VMMaker.oscog-eem.248 uuid: 325b96ad-3c25-438e-af36-04a93839f195
from
- MiscPrimitivePlugin VMMaker.oscog-eem.235 uuid: 954df856-3f83-498c-9735-6cd3777ba9c7
+ MiscPrimitivePlugin VMMaker.oscog-eem.248 uuid: 325b96ad-3c25-438e-af36-04a93839f195
+ Bitmap * Graphics-ar.142 uuid: 9a11fdac-93ce-8344-877f-55d10866f795
+ ByteArray * Collections-eem.375 uuid: c9da6558-3bd7-4f0f-b0e5-bc21208275f0
+ ByteString * Collections-eem.375 uuid: c9da6558-3bd7-4f0f-b0e5-bc21208275f0
+ SampledSound * Sound-ar.30 uuid: c0c6133c-73b7-7b47-9858-99b64868d35c
*/
-static char __buildInfo[] = "MiscPrimitivePlugin VMMaker.oscog-eem.235 uuid: 954df856-3f83-498c-9735-6cd3777ba9c7 " __DATE__ ;
+static char __buildInfo[] = "MiscPrimitivePlugin VMMaker.oscog-eem.248 uuid: 325b96ad-3c25-438e-af36-04a93839f195\n\
+Bitmap * Graphics-ar.142 uuid: 9a11fdac-93ce-8344-877f-55d10866f795\n\
+ByteArray * Collections-eem.375 uuid: c9da6558-3bd7-4f0f-b0e5-bc21208275f0\n\
+ByteString * Collections-eem.375 uuid: c9da6558-3bd7-4f0f-b0e5-bc21208275f0\n\
+SampledSound * Sound-ar.30 uuid: c0c6133c-73b7-7b47-9858-99b64868d35c " __DATE__ ;
@@ -87,9 +95,9 @@
struct VirtualMachine* interpreterProxy;
static const char *moduleName =
#ifdef SQUEAK_BUILTIN_PLUGIN
- "MiscPrimitivePlugin VMMaker.oscog-eem.235 (i)"
+ "MiscPrimitivePlugin VMMaker.oscog-eem.248 (i)"
#else
- "MiscPrimitivePlugin VMMaker.oscog-eem.235 (e)"
+ "MiscPrimitivePlugin VMMaker.oscog-eem.248 (e)"
#endif
;
Modified: branches/Cog/nscogsrc/vm/cogit.c
===================================================================
--- branches/Cog/nscogsrc/vm/cogit.c 2013-01-03 04:59:02 UTC (rev 2654)
+++ branches/Cog/nscogsrc/vm/cogit.c 2013-01-03 22:00:52 UTC (rev 2655)
@@ -1,9 +1,9 @@
/* Automatically generated by
- CCodeGenerator VMMaker.oscog-eem.244 uuid: c9625bb4-bc55-4b75-942c-084c12ea9648
+ CCodeGenerator VMMaker.oscog-eem.248 uuid: 325b96ad-3c25-438e-af36-04a93839f195
from
- StackToRegisterMappingCogit VMMaker.oscog-eem.244 uuid: c9625bb4-bc55-4b75-942c-084c12ea9648
+ StackToRegisterMappingCogit VMMaker.oscog-eem.248 uuid: 325b96ad-3c25-438e-af36-04a93839f195
*/
-static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.244 uuid: c9625bb4-bc55-4b75-942c-084c12ea9648 " __DATE__ ;
+static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.248 uuid: 325b96ad-3c25-438e-af36-04a93839f195 " __DATE__ ;
char *__cogitBuildInfo = __buildInfo;
@@ -16280,7 +16280,7 @@
static sqInt
registerMaskFor(sqInt reg)
{
- return (((1 - reg) < 0) ? ((usqInt) 1 >> -(1 - reg)) : ((usqInt) 1 << (1 - reg)));
+ return 1 << (1 - reg);
}
@@ -16290,7 +16290,7 @@
static sqInt
registerMaskForand(sqInt reg1, sqInt reg2)
{
- return ((((1 - reg1) < 0) ? ((usqInt) 1 >> -(1 - reg1)) : ((usqInt) 1 << (1 - reg1)))) | ((((1 - reg2) < 0) ? ((usqInt) 1 >> -(1 - reg2)) : ((usqInt) 1 << (1 - reg2))));
+ return (1 << (1 - reg1)) | (1 << (1 - reg2));
}
@@ -16300,7 +16300,7 @@
static sqInt
registerMaskForandand(sqInt reg1, sqInt reg2, sqInt reg3)
{
- return (((((1 - reg1) < 0) ? ((usqInt) 1 >> -(1 - reg1)) : ((usqInt) 1 << (1 - reg1)))) | ((((1 - reg2) < 0) ? ((usqInt) 1 >> -(1 - reg2)) : ((usqInt) 1 << (1 - reg2))))) | ((((1 - reg3) < 0) ? ((usqInt) 1 >> -(1 - reg3)) : ((usqInt) 1 << (1 - reg3))));
+ return ((1 << (1 - reg1)) | (1 << (1 - reg2))) | (1 << (1 - reg3));
}
static sqInt
Modified: branches/Cog/nscogsrc/vm/cogit.h
===================================================================
--- branches/Cog/nscogsrc/vm/cogit.h 2013-01-03 04:59:02 UTC (rev 2654)
+++ branches/Cog/nscogsrc/vm/cogit.h 2013-01-03 22:00:52 UTC (rev 2655)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGenerator VMMaker.oscog-eem.244 uuid: c9625bb4-bc55-4b75-942c-084c12ea9648
+ CCodeGenerator VMMaker.oscog-eem.248 uuid: 325b96ad-3c25-438e-af36-04a93839f195
*/
Modified: branches/Cog/nscogsrc/vm/cogmethod.h
===================================================================
--- branches/Cog/nscogsrc/vm/cogmethod.h 2013-01-03 04:59:02 UTC (rev 2654)
+++ branches/Cog/nscogsrc/vm/cogmethod.h 2013-01-03 22:00:52 UTC (rev 2655)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGenerator VMMaker.oscog-eem.244 uuid: c9625bb4-bc55-4b75-942c-084c12ea9648
+ CCodeGenerator VMMaker.oscog-eem.248 uuid: 325b96ad-3c25-438e-af36-04a93839f195
*/
typedef struct {
Modified: branches/Cog/nscogsrc/vm/cointerp.c
===================================================================
--- branches/Cog/nscogsrc/vm/cointerp.c 2013-01-03 04:59:02 UTC (rev 2654)
+++ branches/Cog/nscogsrc/vm/cointerp.c 2013-01-03 22:00:52 UTC (rev 2655)
@@ -1,9 +1,9 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.246 uuid: 1e176c89-522a-4632-ba15-e12f800d1022
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.248 uuid: 325b96ad-3c25-438e-af36-04a93839f195
from
- CoInterpreter VMMaker.oscog-eem.246 uuid: 1e176c89-522a-4632-ba15-e12f800d1022
+ CoInterpreter VMMaker.oscog-eem.248 uuid: 325b96ad-3c25-438e-af36-04a93839f195
*/
-static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.246 uuid: 1e176c89-522a-4632-ba15-e12f800d1022 " __DATE__ ;
+static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.248 uuid: 325b96ad-3c25-438e-af36-04a93839f195 " __DATE__ ;
char *__interpBuildInfo = __buildInfo;
@@ -1928,7 +1928,7 @@
0 };
static void (*externalPrimitiveTable[MaxExternalPrimitiveTableSize + 1 /* 4097 */])(void);
static usqInt heapBase;
-const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.246";
+const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.248";
sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */;
volatile int sendTrace;
@@ -6127,7 +6127,7 @@
/* don't ask if one should compile a second time... */
- GIV(backwardJumpCount) = ((((BytesPerWord * 8) - 2) < 0) ? ((usqInt) 1 >> -((BytesPerWord * 8) - 2)) : ((usqInt) 1 << ((BytesPerWord * 8) - 2)));
+ GIV(backwardJumpCount) = 1 << ((BytesPerWord * 8) - 2);
}
}
}
@@ -12371,7 +12371,7 @@
/* don't ask if one should compile a second time... */
- GIV(backwardJumpCount) = ((((BytesPerWord * 8) - 2) < 0) ? ((usqInt) 1 >> -((BytesPerWord * 8) - 2)) : ((usqInt) 1 << ((BytesPerWord * 8) - 2)));
+ GIV(backwardJumpCount) = 1 << ((BytesPerWord * 8) - 2);
}
}
}
@@ -49160,7 +49160,7 @@
static sqInt
stackPageByteSize(void)
{
- return (((highBit(((512 + ((IFrameSlots + 64) * BytesPerWord)) + ((stackPageHeadroomBytes()) + 1024)) - 1)) < 0) ? ((usqInt) 1 >> -(highBit(((512 + ((IFrameSlots + 64) * BytesPerWord)) + ((stackPageHeadroomBytes()) + 1024)) - 1))) : ((usqInt) 1 << (highBit(((512 + ((IFrameSlots + 64) * BytesPerWord)) + ((stackPageHeadroomBytes()) + 1024)) - 1))));
+ return 1 << (highBit(((512 + ((IFrameSlots + 64) * BytesPerWord)) + ((stackPageHeadroomBytes()) + 1024)) - 1));
}
Modified: branches/Cog/nscogsrc/vm/cointerp.h
===================================================================
--- branches/Cog/nscogsrc/vm/cointerp.h 2013-01-03 04:59:02 UTC (rev 2654)
+++ branches/Cog/nscogsrc/vm/cointerp.h 2013-01-03 22:00:52 UTC (rev 2655)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.246 uuid: 1e176c89-522a-4632-ba15-e12f800d1022
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.248 uuid: 325b96ad-3c25-438e-af36-04a93839f195
*/
Modified: branches/Cog/nscogsrc/vm/exampleSqNamedPrims.h
===================================================================
--- branches/Cog/nscogsrc/vm/exampleSqNamedPrims.h 2013-01-03 04:59:02 UTC (rev 2654)
+++ branches/Cog/nscogsrc/vm/exampleSqNamedPrims.h 2013-01-03 22:00:52 UTC (rev 2655)
@@ -1,5 +1,5 @@
/* This is an automatically generated table of all builtin modules in the VM
- CoInterpreterPrimitives VMMaker.oscog-eem.243
+ CoInterpreterPrimitives VMMaker.oscog-eem.248
*/
extern sqExport vm_exports[];
Modified: branches/Cog/nscogsrc/vm/gcc3x-cointerp.c
===================================================================
--- branches/Cog/nscogsrc/vm/gcc3x-cointerp.c 2013-01-03 04:59:02 UTC (rev 2654)
+++ branches/Cog/nscogsrc/vm/gcc3x-cointerp.c 2013-01-03 22:00:52 UTC (rev 2655)
@@ -2,11 +2,11 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.246 uuid: 1e176c89-522a-4632-ba15-e12f800d1022
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.248 uuid: 325b96ad-3c25-438e-af36-04a93839f195
from
- CoInterpreter VMMaker.oscog-eem.246 uuid: 1e176c89-522a-4632-ba15-e12f800d1022
+ CoInterpreter VMMaker.oscog-eem.248 uuid: 325b96ad-3c25-438e-af36-04a93839f195
*/
-static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.246 uuid: 1e176c89-522a-4632-ba15-e12f800d1022 " __DATE__ ;
+static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.248 uuid: 325b96ad-3c25-438e-af36-04a93839f195 " __DATE__ ;
char *__interpBuildInfo = __buildInfo;
@@ -1931,7 +1931,7 @@
0 };
static void (*externalPrimitiveTable[MaxExternalPrimitiveTableSize + 1 /* 4097 */])(void);
static usqInt heapBase;
-const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.246";
+const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.248";
sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */;
volatile int sendTrace;
@@ -6136,7 +6136,7 @@
/* don't ask if one should compile a second time... */
- GIV(backwardJumpCount) = ((((BytesPerWord * 8) - 2) < 0) ? ((usqInt) 1 >> -((BytesPerWord * 8) - 2)) : ((usqInt) 1 << ((BytesPerWord * 8) - 2)));
+ GIV(backwardJumpCount) = 1 << ((BytesPerWord * 8) - 2);
}
}
}
@@ -12380,7 +12380,7 @@
/* don't ask if one should compile a second time... */
- GIV(backwardJumpCount) = ((((BytesPerWord * 8) - 2) < 0) ? ((usqInt) 1 >> -((BytesPerWord * 8) - 2)) : ((usqInt) 1 << ((BytesPerWord * 8) - 2)));
+ GIV(backwardJumpCount) = 1 << ((BytesPerWord * 8) - 2);
}
}
}
@@ -49169,7 +49169,7 @@
static sqInt
stackPageByteSize(void)
{
- return (((highBit(((512 + ((IFrameSlots + 64) * BytesPerWord)) + ((stackPageHeadroomBytes()) + 1024)) - 1)) < 0) ? ((usqInt) 1 >> -(highBit(((512 + ((IFrameSlots + 64) * BytesPerWord)) + ((stackPageHeadroomBytes()) + 1024)) - 1))) : ((usqInt) 1 << (highBit(((512 + ((IFrameSlots + 64) * BytesPerWord)) + ((stackPageHeadroomBytes()) + 1024)) - 1))));
+ return 1 << (highBit(((512 + ((IFrameSlots + 64) * BytesPerWord)) + ((stackPageHeadroomBytes()) + 1024)) - 1));
}
Modified: branches/Cog/nscogsrc/vm/interp.h
===================================================================
--- branches/Cog/nscogsrc/vm/interp.h 2013-01-03 04:59:02 UTC (rev 2654)
+++ branches/Cog/nscogsrc/vm/interp.h 2013-01-03 22:00:52 UTC (rev 2655)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.246 uuid: 1e176c89-522a-4632-ba15-e12f800d1022
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.248 uuid: 325b96ad-3c25-438e-af36-04a93839f195
*/
#define VM_PROXY_MAJOR 1
Modified: branches/Cog/nscogsrc/vm/vmCallback.h
===================================================================
--- branches/Cog/nscogsrc/vm/vmCallback.h 2013-01-03 04:59:02 UTC (rev 2654)
+++ branches/Cog/nscogsrc/vm/vmCallback.h 2013-01-03 22:00:52 UTC (rev 2655)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.246 uuid: 1e176c89-522a-4632-ba15-e12f800d1022
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.248 uuid: 325b96ad-3c25-438e-af36-04a93839f195
*/
#define VM_CALLBACK_INC 1
Property changes on: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h
___________________________________________________________________
Modified: checkindate
- Wed Jan 2 18:30:24 PST 2013
+ Thu Jan 3 13:56:35 PST 2013
Added: branches/Cog/scripts/svnrevert
===================================================================
--- branches/Cog/scripts/svnrevert (rev 0)
+++ branches/Cog/scripts/svnrevert 2013-01-03 22:00:52 UTC (rev 2655)
@@ -0,0 +1,9 @@
+#!/bin/sh
+# Revert file(s) and touch them back to the checkin date
+for f in "$@"
+do
+ if svn revert "$f"; then
+ changed="`svn info \"$f\" | grep 'Last Changed Date:' | sed 's/ *(.*//'`"
+ touch -t "`date -j -f 'Last Changed Date: %Y-%m-%d %H:%M:%S %z' \"$changed\" '+%Y%m%d%H%M.%S'`" "$f"
+ fi
+done
Property changes on: branches/Cog/scripts/svnrevert
___________________________________________________________________
Added: svn:executable
+ *
Modified: branches/Cog/src/plugins/ADPCMCodecPlugin/ADPCMCodecPlugin.c
===================================================================
--- branches/Cog/src/plugins/ADPCMCodecPlugin/ADPCMCodecPlugin.c 2013-01-03 04:59:02 UTC (rev 2654)
+++ branches/Cog/src/plugins/ADPCMCodecPlugin/ADPCMCodecPlugin.c 2013-01-03 22:00:52 UTC (rev 2655)
@@ -1,9 +1,11 @@
/* Automatically generated by
- VMPluginCodeGenerator VMMaker.oscog-eem.235 uuid: 954df856-3f83-498c-9735-6cd3777ba9c7
+ VMPluginCodeGenerator VMMaker.oscog-eem.248 uuid: 325b96ad-3c25-438e-af36-04a93839f195
from
- ADPCMCodecPlugin VMMaker.oscog-eem.235 uuid: 954df856-3f83-498c-9735-6cd3777ba9c7
+ ADPCMCodecPlugin VMMaker.oscog-eem.248 uuid: 325b96ad-3c25-438e-af36-04a93839f195
+ ADPCMCodec * Sound-ar.30 uuid: c0c6133c-73b7-7b47-9858-99b64868d35c
*/
-static char __buildInfo[] = "ADPCMCodecPlugin VMMaker.oscog-eem.235 uuid: 954df856-3f83-498c-9735-6cd3777ba9c7 " __DATE__ ;
+static char __buildInfo[] = "ADPCMCodecPlugin VMMaker.oscog-eem.248 uuid: 325b96ad-3c25-438e-af36-04a93839f195\n\
+ADPCMCodec * Sound-ar.30 uuid: c0c6133c-73b7-7b47-9858-99b64868d35c " __DATE__ ;
@@ -87,9 +89,9 @@
struct VirtualMachine* interpreterProxy;
static const char *moduleName =
#ifdef SQUEAK_BUILTIN_PLUGIN
- "ADPCMCodecPlugin VMMaker.oscog-eem.235 (i)"
+ "ADPCMCodecPlugin VMMaker.oscog-eem.248 (i)"
#else
- "ADPCMCodecPlugin VMMaker.oscog-eem.235 (e)"
+ "ADPCMCodecPlugin VMMaker.oscog-eem.248 (e)"
#endif
;
@@ -208,13 +210,13 @@
/* begin nextBits: */
result = 0;
remaining = 16;
- while (1) {
+ while(1) {
shift = remaining - bitPosition;
- result += ((shift < 0) ? ((usqInt) currentByte >> -shift) : ((usqInt) currentByte << shift));
if (shift > 0) {
/* consumed currentByte buffer; fetch next byte */
+ result += currentByte << shift;
remaining -= bitPosition;
currentByte = encodedBytes[(byteIndex += 1)];
bitPosition = 8;
@@ -223,11 +225,12 @@
/* still some bits left in currentByte buffer */
+ result += ((usqInt) currentByte) >> (0 - shift);
/* mask out the consumed bits: */
bitPosition -= remaining;
- currentByte = currentByte & ((((bitPosition - 8) < 0) ? ((usqInt) 255 >> -(bitPosition - 8)) : ((usqInt) 255 << (bitPosition - 8))));
+ currentByte = currentByte & (((usqInt) 255) >> (8 - bitPosition));
predicted = result;
goto l1;
}
@@ -239,13 +242,13 @@
/* begin nextBits: */
result1 = 0;
remaining1 = 6;
- while (1) {
+ while(1) {
shift1 = remaining1 - bitPosition;
- result1 += ((shift1 < 0) ? ((usqInt) currentByte >> -shift1) : ((usqInt) currentByte << shift1));
if (shift1 > 0) {
/* consumed currentByte buffer; fetch next byte */
+ result1 += currentByte << shift1;
remaining1 -= bitPosition;
currentByte = encodedBytes[(byteIndex += 1)];
bitPosition = 8;
@@ -254,11 +257,12 @@
/* still some bits left in currentByte buffer */
+ result1 += ((usqInt) currentByte) >> (0 - shift1);
/* mask out the consumed bits: */
bitPosition -= remaining1;
- currentByte = currentByte & ((((bitPosition - 8) < 0) ? ((usqInt) 255 >> -(bitPosition - 8)) : ((usqInt) 255 << (bitPosition - 8))));
+ currentByte = currentByte & (((usqInt) 255) >> (8 - bitPosition));
index = result1;
goto l2;
}
@@ -270,13 +274,13 @@
/* begin nextBits: */
result2 = 0;
remaining2 = bitsPerSample;
- while (1) {
+ while(1) {
shift2 = remaining2 - bitPosition;
- result2 += ((shift2 < 0) ? ((usqInt) currentByte >> -shift2) : ((usqInt) currentByte << shift2));
if (shift2 > 0) {
/* consumed currentByte buffer; fetch next byte */
+ result2 += currentByte << shift2;
remaining2 -= bitPosition;
currentByte = encodedBytes[(byteIndex += 1)];
bitPosition = 8;
@@ -285,11 +289,12 @@
/* still some bits left in currentByte buffer */
+ result2 += ((usqInt) currentByte) >> (0 - shift2);
/* mask out the consumed bits: */
bitPosition -= remaining2;
- currentByte = currentByte & ((((bitPosition - 8) < 0) ? ((usqInt) 255 >> -(bitPosition - 8)) : ((usqInt) 255 << (bitPosition - 8))));
+ currentByte = currentByte & (((usqInt) 255) >> (8 - bitPosition));
delta = result2;
goto l3;
}
@@ -439,13 +444,13 @@
/* begin nextBits: */
result = 0;
remaining = 16;
- while (1) {
+ while(1) {
shift = remaining - bitPosition;
- result += ((shift < 0) ? ((usqInt) currentByte >> -shift) : ((usqInt) currentByte << shift));
if (shift > 0) {
/* consumed currentByte buffer; fetch next byte */
+ result += currentByte << shift;
remaining -= bitPosition;
currentByte = encodedBytes[(byteIndex += 1)];
bitPosition = 8;
@@ -454,11 +459,12 @@
/* still some bits left in currentByte buffer */
+ result += ((usqInt) currentByte) >> (0 - shift);
/* mask out the consumed bits: */
bitPosition -= remaining;
- currentByte = currentByte & ((((bitPosition - 8) < 0) ? ((usqInt) 255 >> -(bitPosition - 8)) : ((usqInt) 255 << (bitPosition - 8))));
+ currentByte = currentByte & (((usqInt) 255) >> (8 - bitPosition));
predictedLeft = result;
goto l1;
}
@@ -467,13 +473,13 @@
/* begin nextBits: */
result1 = 0;
remaining1 = 6;
- while (1) {
+ while(1) {
shift1 = remaining1 - bitPosition;
- result1 += ((shift1 < 0) ? ((usqInt) currentByte >> -shift1) : ((usqInt) currentByte << shift1));
if (shift1 > 0) {
/* consumed currentByte buffer; fetch next byte */
+ result1 += currentByte << shift1;
remaining1 -= bitPosition;
currentByte = encodedBytes[(byteIndex += 1)];
bitPosition = 8;
@@ -482,11 +488,12 @@
/* still some bits left in currentByte buffer */
+ result1 += ((usqInt) currentByte) >> (0 - shift1);
/* mask out the consumed bits: */
bitPosition -= remaining1;
- currentByte = currentByte & ((((bitPosition - 8) < 0) ? ((usqInt) 255 >> -(bitPosition - 8)) : ((usqInt) 255 << (bitPosition - 8))));
+ currentByte = currentByte & (((usqInt) 255) >> (8 - bitPosition));
indexLeft = result1;
goto l2;
}
@@ -495,13 +502,13 @@
/* begin nextBits: */
result2 = 0;
remaining2 = 16;
- while (1) {
+ while(1) {
shift2 = remaining2 - bitPosition;
- result2 += ((shift2 < 0) ? ((usqInt) currentByte >> -shift2) : ((usqInt) currentByte << shift2));
if (shift2 > 0) {
/* consumed currentByte buffer; fetch next byte */
+ result2 += currentByte << shift2;
remaining2 -= bitPosition;
currentByte = encodedBytes[(byteIndex += 1)];
bitPosition = 8;
@@ -510,11 +517,12 @@
/* still some bits left in currentByte buffer */
+ result2 += ((usqInt) currentByte) >> (0 - shift2);
/* mask out the consumed bits: */
bitPosition -= remaining2;
- currentByte = currentByte & ((((bitPosition - 8) < 0) ? ((usqInt) 255 >> -(bitPosition - 8)) : ((usqInt) 255 << (bitPosition - 8))));
+ currentByte = currentByte & (((usqInt) 255) >> (8 - bitPosition));
predictedRight = result2;
goto l3;
}
@@ -523,13 +531,13 @@
/* begin nextBits: */
result3 = 0;
remaining3 = 6;
- while (1) {
+ while(1) {
shift3 = remaining3 - bitPosition;
- result3 += ((shift3 < 0) ? ((usqInt) currentByte >> -shift3) : ((usqInt) currentByte << shift3));
if (shift3 > 0) {
/* consumed currentByte buffer; fetch next byte */
+ result3 += currentByte << shift3;
remaining3 -= bitPosition;
currentByte = encodedBytes[(byteIndex += 1)];
bitPosition = 8;
@@ -538,11 +546,12 @@
/* still some bits left in currentByte buffer */
+ result3 += ((usqInt) currentByte) >> (0 - shift3);
/* mask out the consumed bits: */
bitPosition -= remaining3;
- currentByte = currentByte & ((((bitPosition - 8) < 0) ? ((usqInt) 255 >> -(bitPosition - 8)) : ((usqInt) 255 << (bitPosition - 8))));
+ currentByte = currentByte & (((usqInt) 255) >> (8 - bitPosition));
indexRight = result3;
goto l4;
}
@@ -561,13 +570,13 @@
/* begin nextBits: */
result4 = 0;
remaining4 = bitsPerSample;
- while (1) {
+ while(1) {
shift4 = remaining4 - bitPosition;
- result4 += ((shift4 < 0) ? ((usqInt) currentByte >> -shift4) : ((usqInt) currentByte << shift4));
if (shift4 > 0) {
/* consumed currentByte buffer; fetch next byte */
+ result4 += currentByte << shift4;
remaining4 -= bitPosition;
currentByte = encodedBytes[(byteIndex += 1)];
bitPosition = 8;
@@ -576,11 +585,12 @@
/* still some bits left in currentByte buffer */
+ result4 += ((usqInt) currentByte) >> (0 - shift4);
/* mask out the consumed bits: */
bitPosition -= remaining4;
- currentByte = currentByte & ((((bitPosition - 8) < 0) ? ((usqInt) 255 >> -(bitPosition - 8)) : ((usqInt) 255 << (bitPosition - 8))));
+ currentByte = currentByte & (((usqInt) 255) >> (8 - bitPosition));
deltaLeft = result4;
goto l5;
}
@@ -589,13 +599,13 @@
/* begin nextBits: */
result5 = 0;
remaining5 = bitsPerSample;
- while (1) {
+ while(1) {
shift5 = remaining5 - bitPosition;
- result5 += ((shift5 < 0) ? ((usqInt) currentByte >> -shift5) : ((usqInt) currentByte << shift5));
if (shift5 > 0) {
/* consumed currentByte buffer; fetch next byte */
+ result5 += currentByte << shift5;
remaining5 -= bitPosition;
currentByte = encodedBytes[(byteIndex += 1)];
bitPosition = 8;
@@ -604,11 +614,12 @@
/* still some bits left in currentByte buffer */
+ result5 += ((usqInt) currentByte) >> (0 - shift5);
/* mask out the consumed bits: */
bitPosition -= remaining5;
- currentByte = currentByte & ((((bitPosition - 8) < 0) ? ((usqInt) 255 >> -(bitPosition - 8)) : ((usqInt) 255 << (bitPosition - 8))));
+ currentByte = currentByte & (((usqInt) 255) >> (8 - bitPosition));
deltaRight = result5;
goto l6;
}
@@ -771,31 +782,32 @@
/* begin nextBits:put: */
buf = p;
bufBits = 16;
- while (1) {
+ while(1) {
bitsAvailable = 8 - bitPosition;
/* either left or right shift */
/* append high bits of buf to end of currentByte: */
shift = bitsAvailable - bufBits;
- currentByte += ((shift < 0) ? ((usqInt) buf >> -shift) : ((usqInt) buf << shift));
if (shift < 0) {
/* currentByte buffer filled; output it */
+ currentByte += ((usqInt) buf) >> (0 - shift);
encodedBytes[(byteIndex += 1)] = currentByte;
bitPosition = 0;
/* clear saved high bits of buf: */
currentByte = 0;
- buf = buf & (((((0 - shift) < 0) ? ((usqInt) 1 >> -(0 - shift)) : ((usqInt) 1 << (0 - shift)))) - 1);
+ buf = buf & ((1 << (0 - shift)) - 1);
bufBits -= bitsAvailable;
}
else {
/* still some bits available in currentByte buffer */
+ currentByte += buf << shift;
bitPosition += bufBits;
goto l1;
}
@@ -820,31 +832,32 @@
/* begin nextBits:put: */
buf1 = index;
bufBits1 = 6;
- while (1) {
+ while(1) {
bitsAvailable1 = 8 - bitPosition;
/* either left or right shift */
/* append high bits of buf to end of currentByte: */
shift1 = bitsAvailable1 - bufBits1;
- currentByte += ((shift1 < 0) ? ((usqInt) buf1 >> -shift1) : ((usqInt) buf1 << shift1));
if (shift1 < 0) {
/* currentByte buffer filled; output it */
+ currentByte += ((usqInt) buf1) >> (0 - shift1);
encodedBytes[(byteIndex += 1)] = currentByte;
bitPosition = 0;
/* clear saved high bits of buf: */
currentByte = 0;
- buf1 = buf1 & (((((0 - shift1) < 0) ? ((usqInt) 1 >> -(0 - shift1)) : ((usqInt) 1 << (0 - shift1)))) - 1);
+ buf1 = buf1 & ((1 << (0 - shift1)) - 1);
bufBits1 -= bitsAvailable1;
}
else {
/* still some bits available in currentByte buffer */
+ currentByte += buf1 << shift1;
bitPosition += bufBits1;
goto l2;
}
@@ -907,31 +920,32 @@
/* begin nextBits:put: */
buf2 = sign | delta;
bufBits2 = bitsPerSample;
- while (1) {
+ while(1) {
bitsAvailable2 = 8 - bitPosition;
/* either left or right shift */
/* append high bits of buf to end of currentByte: */
shift2 = bitsAvailable2 - bufBits2;
- currentByte += ((shift2 < 0) ? ((usqInt) buf2 >> -shift2) : ((usqInt) buf2 << shift2));
if (shift2 < 0) {
/* currentByte buffer filled; output it */
+ currentByte += ((usqInt) buf2) >> (0 - shift2);
encodedBytes[(byteIndex += 1)] = currentByte;
bitPosition = 0;
/* clear saved high bits of buf: */
currentByte = 0;
- buf2 = buf2 & (((((0 - shift2) < 0) ? ((usqInt) 1 >> -(0 - shift2)) : ((usqInt) 1 << (0 - shift2)))) - 1);
+ buf2 = buf2 & ((1 << (0 - shift2)) - 1);
bufBits2 -= bitsAvailable2;
}
else {
/* still some bits available in currentByte buffer */
+ currentByte += buf2 << shift2;
bitPosition += bufBits2;
goto l3;
}
Modified: branches/Cog/src/plugins/MiscPrimitivePlugin/MiscPrimitivePlugin.c
===================================================================
--- branches/Cog/src/plugins/MiscPrimitivePlugin/MiscPrimitivePlugin.c 2013-01-03 04:59:02 UTC (rev 2654)
+++ branches/Cog/src/plugins/MiscPrimitivePlugin/MiscPrimitivePlugin.c 2013-01-03 22:00:52 UTC (rev 2655)
@@ -1,9 +1,17 @@
/* Automatically generated by
- VMPluginCodeGenerator VMMaker.oscog-eem.235 uuid: 954df856-3f83-498c-9735-6cd3777ba9c7
+ VMPluginCodeGenerator VMMaker.oscog-eem.248 uuid: 325b96ad-3c25-438e-af36-04a93839f195
from
- MiscPrimitivePlugin VMMaker.oscog-eem.235 uuid: 954df856-3f83-498c-9735-6cd3777ba9c7
+ MiscPrimitivePlugin VMMaker.oscog-eem.248 uuid: 325b96ad-3c25-438e-af36-04a93839f195
+ Bitmap * Graphics-ar.142 uuid: 9a11fdac-93ce-8344-877f-55d10866f795
+ ByteArray * Collections-eem.375 uuid: c9da6558-3bd7-4f0f-b0e5-bc21208275f0
+ ByteString * Collections-eem.375 uuid: c9da6558-3bd7-4f0f-b0e5-bc21208275f0
+ SampledSound * Sound-ar.30 uuid: c0c6133c-73b7-7b47-9858-99b64868d35c
*/
-static char __buildInfo[] = "MiscPrimitivePlugin VMMaker.oscog-eem.235 uuid: 954df856-3f83-498c-9735-6cd3777ba9c7 " __DATE__ ;
+static char __buildInfo[] = "MiscPrimitivePlugin VMMaker.oscog-eem.248 uuid: 325b96ad-3c25-438e-af36-04a93839f195\n\
+Bitmap * Graphics-ar.142 uuid: 9a11fdac-93ce-8344-877f-55d10866f795\n\
+ByteArray * Collections-eem.375 uuid: c9da6558-3bd7-4f0f-b0e5-bc21208275f0\n\
+ByteString * Collections-eem.375 uuid: c9da6558-3bd7-4f0f-b0e5-bc21208275f0\n\
+SampledSound * Sound-ar.30 uuid: c0c6133c-73b7-7b47-9858-99b64868d35c " __DATE__ ;
@@ -87,9 +95,9 @@
struct VirtualMachine* interpreterProxy;
static const char *moduleName =
#ifdef SQUEAK_BUILTIN_PLUGIN
- "MiscPrimitivePlugin VMMaker.oscog-eem.235 (i)"
+ "MiscPrimitivePlugin VMMaker.oscog-eem.248 (i)"
#else
- "MiscPrimitivePlugin VMMaker.oscog-eem.235 (e)"
+ "MiscPrimitivePlugin VMMaker.oscog-eem.248 (e)"
#endif
;
Modified: branches/Cog/src/plugins/SoundGenerationPlugin/SoundGenerationPlugin.c
===================================================================
--- branches/Cog/src/plugins/SoundGenerationPlugin/SoundGenerationPlugin.c 2013-01-03 04:59:02 UTC (rev 2654)
+++ branches/Cog/src/plugins/SoundGenerationPlugin/SoundGenerationPlugin.c 2013-01-03 22:00:52 UTC (rev 2655)
@@ -1,9 +1,11 @@
/* Automatically generated by
- VMPluginCodeGenerator VMMaker.oscog-eem.235 uuid: 954df856-3f83-498c-9735-6cd3777ba9c7
+ VMPluginCodeGenerator VMMaker.oscog-eem.248 uuid: 325b96ad-3c25-438e-af36-04a93839f195
from
- SoundGenerationPlugin VMMaker.oscog-eem.235 uuid: 954df856-3f83-498c-9735-6cd3777ba9c7
+ SoundGenerationPlugin VMMaker.oscog-eem.248 uuid: 325b96ad-3c25-438e-af36-04a93839f195
+ AbstractSound * Sound-ar.30 uuid: c0c6133c-73b7-7b47-9858-99b64868d35c
*/
-static char __buildInfo[] = "SoundGenerationPlugin VMMaker.oscog-eem.235 uuid: 954df856-3f83-498c-9735-6cd3777ba9c7 " __DATE__ ;
+static char __buildInfo[] = "SoundGenerationPlugin VMMaker.oscog-eem.248 uuid: 325b96ad-3c25-438e-af36-04a93839f195\n\
+AbstractSound * Sound-ar.30 uuid: c0c6133c-73b7-7b47-9858-99b64868d35c " __DATE__ ;
@@ -93,9 +95,9 @@
struct VirtualMachine* interpreterProxy;
static const char *moduleName =
#ifdef SQUEAK_BUILTIN_PLUGIN
- "SoundGenerationPlugin VMMaker.oscog-eem.235 (i)"
+ "SoundGenerationPlugin VMMaker.oscog-eem.248 (i)"
#else
- "SoundGenerationPlugin VMMaker.oscog-eem.235 (e)"
+ "SoundGenerationPlugin VMMaker.oscog-eem.248 (e)"
#endif
;
Modified: branches/Cog/src/vm/cogit.c
===================================================================
--- branches/Cog/src/vm/cogit.c 2013-01-03 04:59:02 UTC (rev 2654)
+++ branches/Cog/src/vm/cogit.c 2013-01-03 22:00:52 UTC (rev 2655)
@@ -1,9 +1,9 @@
/* Automatically generated by
- CCodeGenerator VMMaker.oscog-eem.244 uuid: c9625bb4-bc55-4b75-942c-084c12ea9648
+ CCodeGenerator VMMaker.oscog-eem.248 uuid: 325b96ad-3c25-438e-af36-04a93839f195
from
- StackToRegisterMappingCogit VMMaker.oscog-eem.244 uuid: c9625bb4-bc55-4b75-942c-084c12ea9648
+ StackToRegisterMappingCogit VMMaker.oscog-eem.248 uuid: 325b96ad-3c25-438e-af36-04a93839f195
*/
-static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.244 uuid: c9625bb4-bc55-4b75-942c-084c12ea9648 " __DATE__ ;
+static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.248 uuid: 325b96ad-3c25-438e-af36-04a93839f195 " __DATE__ ;
char *__cogitBuildInfo = __buildInfo;
@@ -15074,7 +15074,7 @@
static sqInt
registerMaskFor(sqInt reg)
{
- return (((1 - reg) < 0) ? ((usqInt) 1 >> -(1 - reg)) : ((usqInt) 1 << (1 - reg)));
+ return 1 << (1 - reg);
}
@@ -15084,7 +15084,7 @@
static sqInt
registerMaskForand(sqInt reg1, sqInt reg2)
{
- return ((((1 - reg1) < 0) ? ((usqInt) 1 >> -(1 - reg1)) : ((usqInt) 1 << (1 - reg1)))) | ((((1 - reg2) < 0) ? ((usqInt) 1 >> -(1 - reg2)) : ((usqInt) 1 << (1 - reg2))));
+ return (1 << (1 - reg1)) | (1 << (1 - reg2));
}
@@ -15094,7 +15094,7 @@
static sqInt
registerMaskForandand(sqInt reg1, sqInt reg2, sqInt reg3)
{
- return (((((1 - reg1) < 0) ? ((usqInt) 1 >> -(1 - reg1)) : ((usqInt) 1 << (1 - reg1)))) | ((((1 - reg2) < 0) ? ((usqInt) 1 >> -(1 - reg2)) : ((usqInt) 1 << (1 - reg2))))) | ((((1 - reg3) < 0) ? ((usqInt) 1 >> -(1 - reg3)) : ((usqInt) 1 << (1 - reg3))));
+ return ((1 << (1 - reg1)) | (1 << (1 - reg2))) | (1 << (1 - reg3));
}
static sqInt
Modified: branches/Cog/src/vm/cogit.h
===================================================================
--- branches/Cog/src/vm/cogit.h 2013-01-03 04:59:02 UTC (rev 2654)
+++ branches/Cog/src/vm/cogit.h 2013-01-03 22:00:52 UTC (rev 2655)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGenerator VMMaker.oscog-eem.244 uuid: c9625bb4-bc55-4b75-942c-084c12ea9648
+ CCodeGenerator VMMaker.oscog-eem.248 uuid: 325b96ad-3c25-438e-af36-04a93839f195
*/
Modified: branches/Cog/src/vm/cogmethod.h
===================================================================
--- branches/Cog/src/vm/cogmethod.h 2013-01-03 04:59:02 UTC (rev 2654)
+++ branches/Cog/src/vm/cogmethod.h 2013-01-03 22:00:52 UTC (rev 2655)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGenerator VMMaker.oscog-eem.244 uuid: c9625bb4-bc55-4b75-942c-084c12ea9648
+ CCodeGenerator VMMaker.oscog-eem.248 uuid: 325b96ad-3c25-438e-af36-04a93839f195
*/
typedef struct {
Modified: branches/Cog/src/vm/cointerp.c
===================================================================
--- branches/Cog/src/vm/cointerp.c 2013-01-03 04:59:02 UTC (rev 2654)
+++ branches/Cog/src/vm/cointerp.c 2013-01-03 22:00:52 UTC (rev 2655)
@@ -1,9 +1,9 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.246 uuid: 1e176c89-522a-4632-ba15-e12f800d1022
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.248 uuid: 325b96ad-3c25-438e-af36-04a93839f195
from
- CoInterpreter VMMaker.oscog-eem.246 uuid: 1e176c89-522a-4632-ba15-e12f800d1022
+ CoInterpreter VMMaker.oscog-eem.248 uuid: 325b96ad-3c25-438e-af36-04a93839f195
*/
-static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.246 uuid: 1e176c89-522a-4632-ba15-e12f800d1022 " __DATE__ ;
+static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.248 uuid: 325b96ad-3c25-438e-af36-04a93839f195 " __DATE__ ;
char *__interpBuildInfo = __buildInfo;
@@ -1918,7 +1918,7 @@
0 };
static void (*externalPrimitiveTable[MaxExternalPrimitiveTableSize + 1 /* 4097 */])(void);
static usqInt heapBase;
-const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.246]";
+const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.248]";
sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */;
volatile int sendTrace;
@@ -5925,7 +5925,7 @@
/* don't ask if one should compile a second time... */
- GIV(backwardJumpCount) = ((((BytesPerWord * 8) - 2) < 0) ? ((usqInt) 1 >> -((BytesPerWord * 8) - 2)) : ((usqInt) 1 << ((BytesPerWord * 8) - 2)));
+ GIV(backwardJumpCount) = 1 << ((BytesPerWord * 8) - 2);
}
}
}
@@ -44610,7 +44610,7 @@
static sqInt
stackPageByteSize(void)
{
- return (((highBit(((512 + ((IFrameSlots + 64) * BytesPerWord)) + ((stackPageHeadroomBytes()) + 1024)) - 1)) < 0) ? ((usqInt) 1 >> -(highBit(((512 + ((IFrameSlots + 64) * BytesPerWord)) + ((stackPageHeadroomBytes()) + 1024)) - 1))) : ((usqInt) 1 << (highBit(((512 + ((IFrameSlots + 64) * BytesPerWord)) + ((stackPageHeadroomBytes()) + 1024)) - 1))));
+ return 1 << (highBit(((512 + ((IFrameSlots + 64) * BytesPerWord)) + ((stackPageHeadroomBytes()) + 1024)) - 1));
}
Modified: branches/Cog/src/vm/cointerp.h
===================================================================
--- branches/Cog/src/vm/cointerp.h 2013-01-03 04:59:02 UTC (rev 2654)
+++ branches/Cog/src/vm/cointerp.h 2013-01-03 22:00:52 UTC (rev 2655)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.246 uuid: 1e176c89-522a-4632-ba15-e12f800d1022
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.248 uuid: 325b96ad-3c25-438e-af36-04a93839f195
*/
Modified: branches/Cog/src/vm/cointerpmt.c
===================================================================
--- branches/Cog/src/vm/cointerpmt.c 2013-01-03 04:59:02 UTC (rev 2654)
+++ branches/Cog/src/vm/cointerpmt.c 2013-01-03 22:00:52 UTC (rev 2655)
@@ -1,9 +1,9 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.246 uuid: 1e176c89-522a-4632-ba15-e12f800d1022
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.248 uuid: 325b96ad-3c25-438e-af36-04a93839f195
from
- CoInterpreterMT VMMaker.oscog-eem.246 uuid: 1e176c89-522a-4632-ba15-e12f800d1022
+ CoInterpreterMT VMMaker.oscog-eem.248 uuid: 325b96ad-3c25-438e-af36-04a93839f195
*/
-static char __buildInfo[] = "CoInterpreterMT VMMaker.oscog-eem.246 uuid: 1e176c89-522a-4632-ba15-e12f800d1022 " __DATE__ ;
+static char __buildInfo[] = "CoInterpreterMT VMMaker.oscog-eem.248 uuid: 325b96ad-3c25-438e-af36-04a93839f195 " __DATE__ ;
char *__interpBuildInfo = __buildInfo;
@@ -2017,7 +2017,7 @@
0 };
static void (*externalPrimitiveTable[MaxExternalPrimitiveTableSize + 1 /* 4097 */])(void);
static usqInt heapBase;
-const char *interpreterVersion = "Croquet Closure Cog MT VM [CoInterpreterMT VMMaker.oscog-eem.246]";
+const char *interpreterVersion = "Croquet Closure Cog MT VM [CoInterpreterMT VMMaker.oscog-eem.248]";
sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */;
volatile int sendTrace;
sqInt willNotThreadWarnCount;
@@ -6026,7 +6026,7 @@
/* don't ask if one should compile a second time... */
- GIV(backwardJumpCount) = ((((BytesPerWord * 8) - 2) < 0) ? ((usqInt) 1 >> -((BytesPerWord * 8) - 2)) : ((usqInt) 1 << ((BytesPerWord * 8) - 2)));
+ GIV(backwardJumpCount) = 1 << ((BytesPerWord * 8) - 2);
}
}
}
@@ -46060,7 +46060,7 @@
static sqInt
stackPageByteSize(void)
{
- return (((highBit(((512 + ((IFrameSlots + 64) * BytesPerWord)) + ((stackPageHeadroomBytes()) + 1024)) - 1)) < 0) ? ((usqInt) 1 >> -(highBit(((512 + ((IFrameSlots + 64) * BytesPerWord)) + ((stackPageHeadroomBytes()) + 1024)) - 1))) : ((usqInt) 1 << (highBit(((512 + ((IFrameSlots + 64) * BytesPerWord)) + ((stackPageHeadroomBytes()) + 1024)) - 1))));
+ return 1 << (highBit(((512 + ((IFrameSlots + 64) * BytesPerWord)) + ((stackPageHeadroomBytes()) + 1024)) - 1));
}
Modified: branches/Cog/src/vm/cointerpmt.h
===================================================================
--- branches/Cog/src/vm/cointerpmt.h 2013-01-03 04:59:02 UTC (rev 2654)
+++ branches/Cog/src/vm/cointerpmt.h 2013-01-03 22:00:52 UTC (rev 2655)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.246 uuid: 1e176c89-522a-4632-ba15-e12f800d1022
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.248 uuid: 325b96ad-3c25-438e-af36-04a93839f195
*/
Modified: branches/Cog/src/vm/exampleSqNamedPrims.h
===================================================================
--- branches/Cog/src/vm/exampleSqNamedPrims.h 2013-01-03 04:59:02 UTC (rev 2654)
+++ branches/Cog/src/vm/exampleSqNamedPrims.h 2013-01-03 22:00:52 UTC (rev 2655)
@@ -1,5 +1,5 @@
/* This is an automatically generated table of all builtin modules in the VM
- CoInterpreterMT VMMaker.oscog-eem.243
+ CoInterpreterMT VMMaker.oscog-eem.248
*/
extern sqExport vm_exports[];
Modified: branches/Cog/src/vm/gcc3x-cointerp.c
===================================================================
--- branches/Cog/src/vm/gcc3x-cointerp.c 2013-01-03 04:59:02 UTC (rev 2654)
+++ branches/Cog/src/vm/gcc3x-cointerp.c 2013-01-03 22:00:52 UTC (rev 2655)
@@ -2,11 +2,11 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.246 uuid: 1e176c89-522a-4632-ba15-e12f800d1022
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.248 uuid: 325b96ad-3c25-438e-af36-04a93839f195
from
- CoInterpreter VMMaker.oscog-eem.246 uuid: 1e176c89-522a-4632-ba15-e12f800d1022
+ CoInterpreter VMMaker.oscog-eem.248 uuid: 325b96ad-3c25-438e-af36-04a93839f195
*/
-static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.246 uuid: 1e176c89-522a-4632-ba15-e12f800d1022 " __DATE__ ;
+static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.248 uuid: 325b96ad-3c25-438e-af36-04a93839f195 " __DATE__ ;
char *__interpBuildInfo = __buildInfo;
@@ -1921,7 +1921,7 @@
0 };
static void (*externalPrimitiveTable[MaxExternalPrimitiveTableSize + 1 /* 4097 */])(void);
static usqInt heapBase;
-const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.246]";
+const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.248]";
sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */;
volatile int sendTrace;
@@ -5934,7 +5934,7 @@
/* don't ask if one should compile a second time... */
- GIV(backwardJumpCount) = ((((BytesPerWord * 8) - 2) < 0) ? ((usqInt) 1 >> -((BytesPerWord * 8) - 2)) : ((usqInt) 1 << ((BytesPerWord * 8) - 2)));
+ GIV(backwardJumpCount) = 1 << ((BytesPerWord * 8) - 2);
}
}
}
@@ -44619,7 +44619,7 @@
static sqInt
stackPageByteSize(void)
{
- return (((highBit(((512 + ((IFrameSlots + 64) * BytesPerWord)) + ((stackPageHeadroomBytes()) + 1024)) - 1)) < 0) ? ((usqInt) 1 >> -(highBit(((512 + ((IFrameSlots + 64) * BytesPerWord)) + ((stackPageHeadroomBytes()) + 1024)) - 1))) : ((usqInt) 1 << (highBit(((512 + ((IFrameSlots + 64) * BytesPerWord)) + ((stackPageHeadroomBytes()) + 1024)) - 1))));
+ return 1 << (highBit(((512 + ((IFrameSlots + 64) * BytesPerWord)) + ((stackPageHeadroomBytes()) + 1024)) - 1));
}
Modified: branches/Cog/src/vm/gcc3x-cointerpmt.c
===================================================================
--- branches/Cog/src/vm/gcc3x-cointerpmt.c 2013-01-03 04:59:02 UTC (rev 2654)
+++ branches/Cog/src/vm/gcc3x-cointerpmt.c 2013-01-03 22:00:52 UTC (rev 2655)
@@ -2,11 +2,11 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.246 uuid: 1e176c89-522a-4632-ba15-e12f800d1022
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.248 uuid: 325b96ad-3c25-438e-af36-04a93839f195
from
- CoInterpreterMT VMMaker.oscog-eem.246 uuid: 1e176c89-522a-4632-ba15-e12f800d1022
+ CoInterpreterMT VMMaker.oscog-eem.248 uuid: 325b96ad-3c25-438e-af36-04a93839f195
*/
-static char __buildInfo[] = "CoInterpreterMT VMMaker.oscog-eem.246 uuid: 1e176c89-522a-4632-ba15-e12f800d1022 " __DATE__ ;
+static char __buildInfo[] = "CoInterpreterMT VMMaker.oscog-eem.248 uuid: 325b96ad-3c25-438e-af36-04a93839f195 " __DATE__ ;
char *__interpBuildInfo = __buildInfo;
@@ -2020,7 +2020,7 @@
0 };
static void (*externalPrimitiveTable[MaxExternalPrimitiveTableSize + 1 /* 4097 */])(void);
static usqInt heapBase;
-const char *interpreterVersion = "Croquet Closure Cog MT VM [CoInterpreterMT VMMaker.oscog-eem.246]";
+const char *interpreterVersion = "Croquet Closure Cog MT VM [CoInterpreterMT VMMaker.oscog-eem.248]";
sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */;
volatile int sendTrace;
sqInt willNotThreadWarnCount;
@@ -6035,7 +6035,7 @@
/* don't ask if one should compile a second time... */
- GIV(backwardJumpCount) = ((((BytesPerWord * 8) - 2) < 0) ? ((usqInt) 1 >> -((BytesPerWord * 8) - 2)) : ((usqInt) 1 << ((BytesPerWord * 8) - 2)));
+ GIV(backwardJumpCount) = 1 << ((BytesPerWord * 8) - 2);
}
}
}
@@ -46069,7 +46069,7 @@
static sqInt
stackPageByteSize(void)
{
- return (((highBit(((512 + ((IFrameSlots + 64) * BytesPerWord)) + ((stackPageHeadroomBytes()) + 1024)) - 1)) < 0) ? ((usqInt) 1 >> -(highBit(((512 + ((IFrameSlots + 64) * BytesPerWord)) + ((stackPageHeadroomBytes()) + 1024)) - 1))) : ((usqInt) 1 << (highBit(((512 + ((IFrameSlots + 64) * BytesPerWord)) + ((stackPageHeadroomBytes()) + 1024)) - 1))));
+ return 1 << (highBit(((512 + ((IFrameSlots + 64) * BytesPerWord)) + ((stackPageHeadroomBytes()) + 1024)) - 1));
}
Modified: branches/Cog/src/vm/interp.h
===================================================================
--- branches/Cog/src/vm/interp.h 2013-01-03 04:59:02 UTC (rev 2654)
+++ branches/Cog/src/vm/interp.h 2013-01-03 22:00:52 UTC (rev 2655)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.246 uuid: 1e176c89-522a-4632-ba15-e12f800d1022
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.248 uuid: 325b96ad-3c25-438e-af36-04a93839f195
*/
#define VM_PROXY_MAJOR 1
Modified: branches/Cog/src/vm/vmCallback.h
===================================================================
--- branches/Cog/src/vm/vmCallback.h 2013-01-03 04:59:02 UTC (rev 2654)
+++ branches/Cog/src/vm/vmCallback.h 2013-01-03 22:00:52 UTC (rev 2655)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.246 uuid: 1e176c89-522a-4632-ba15-e12f800d1022
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.248 uuid: 325b96ad-3c25-438e-af36-04a93839f195
*/
#define VM_CALLBACK_INC 1
More information about the Vm-dev
mailing list