[commit][3395] CogVM source as per Name: VMMaker.oscog-eem.1403

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

[commit][3395] CogVM source as per Name: VMMaker.oscog-eem.1403

commits-3
 
Revision: 3395
Author:   eliot
Date:     2015-06-29 18:32:55 -0700 (Mon, 29 Jun 2015)
Log Message:
-----------
CogVM source as per Name: VMMaker.oscog-eem.1403

Fix long-standing bug in primitiveVMParameter for
setting, and hence allow Spur to set maxOldSpaceSize.

Modified Paths:
--------------
    branches/Cog/nsspursrc/vm/cogit.h
    branches/Cog/nsspursrc/vm/cointerp.c
    branches/Cog/nsspursrc/vm/cointerp.h
    branches/Cog/nsspursrc/vm/gcc3x-cointerp.c
    branches/Cog/nsspurstack64src/vm/gcc3x-interp.c
    branches/Cog/nsspurstack64src/vm/interp.c
    branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c
    branches/Cog/nsspurstacksrc/vm/interp.c
    branches/Cog/spursistasrc/vm/cogit.h
    branches/Cog/spursistasrc/vm/cointerp.c
    branches/Cog/spursistasrc/vm/cointerp.h
    branches/Cog/spursistasrc/vm/gcc3x-cointerp.c
    branches/Cog/spursrc/vm/cogit.h
    branches/Cog/spursrc/vm/cointerp.c
    branches/Cog/spursrc/vm/cointerp.h
    branches/Cog/spursrc/vm/gcc3x-cointerp.c
    branches/Cog/spurstack64src/vm/gcc3x-interp.c
    branches/Cog/spurstack64src/vm/interp.c
    branches/Cog/spurstacksrc/vm/gcc3x-interp.c
    branches/Cog/spurstacksrc/vm/interp.c
    branches/Cog/src/vm/cogit.h
    branches/Cog/src/vm/cointerp.c
    branches/Cog/src/vm/cointerp.h
    branches/Cog/src/vm/cointerpmt.c
    branches/Cog/src/vm/cointerpmt.h
    branches/Cog/src/vm/gcc3x-cointerp.c
    branches/Cog/src/vm/gcc3x-cointerpmt.c
    branches/Cog/stacksrc/vm/gcc3x-interp.c
    branches/Cog/stacksrc/vm/interp.c

Property Changed:
----------------
    branches/Cog/platforms/Cross/vm/sqSCCSVersion.h

Modified: branches/Cog/nsspursrc/vm/cogit.h
===================================================================
--- branches/Cog/nsspursrc/vm/cogit.h 2015-06-30 00:54:16 UTC (rev 3394)
+++ branches/Cog/nsspursrc/vm/cogit.h 2015-06-30 01:32:55 UTC (rev 3395)
@@ -1,5 +1,5 @@
 /* Automatically generated by
- CCodeGenerator VMMaker.oscog-eem.1402 uuid: 6f030706-bed6-4c29-a2f7-5e3653737178
+ CCodeGenerator VMMaker.oscog-eem.1403 uuid: 66fdf690-416b-4359-be28-c0387023baa6
  */
 
 

Modified: branches/Cog/nsspursrc/vm/cointerp.c
===================================================================
--- branches/Cog/nsspursrc/vm/cointerp.c 2015-06-30 00:54:16 UTC (rev 3394)
+++ branches/Cog/nsspursrc/vm/cointerp.c 2015-06-30 01:32:55 UTC (rev 3395)
@@ -1,9 +1,9 @@
 /* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1402 uuid: 6f030706-bed6-4c29-a2f7-5e3653737178
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1403 uuid: 66fdf690-416b-4359-be28-c0387023baa6
    from
- CoInterpreter VMMaker.oscog-eem.1402 uuid: 6f030706-bed6-4c29-a2f7-5e3653737178
+ CoInterpreter VMMaker.oscog-eem.1403 uuid: 66fdf690-416b-4359-be28-c0387023baa6
  */
-static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1402 uuid: 6f030706-bed6-4c29-a2f7-5e3653737178 " __DATE__ ;
+static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1403 uuid: 66fdf690-416b-4359-be28-c0387023baa6 " __DATE__ ;
 char *__interpBuildInfo = __buildInfo;
 
 
@@ -2410,7 +2410,7 @@
 /*560*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, 0, 0, 0,-1,-1
  };
 char expensiveAsserts = 0;
-const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.1402";
+const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.1403";
 sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */;
 volatile int sendTrace;
 
@@ -60603,7 +60603,7 @@
     usqInt prevFree;
     usqInt prevFreeChunk;
     usqInt prevPrevFree;
-    sqInt prevPrevFreeChunk;
+    usqInt prevPrevFreeChunk;
     sqInt slotBytes;
     sqInt slotBytes1;
     usqInt there;
@@ -65377,7 +65377,7 @@
     sqInt largeChild;
     sqInt newEndOfMemory;
     sqInt next;
-    usqInt node;
+    sqInt node;
     SpurSegmentInfo *seg;
     sqInt smallChild;
     sqInt treeNode;
@@ -65481,7 +65481,7 @@
 static sqInt
 readHeapFromImageFiledataBytes(sqImageFile f, sqInt numBytes)
 {   DECL_MAYBE_SQ_GLOBAL_STRUCT
-    usqInt bridge;
+    sqInt bridge;
     usqInt bridgehead;
     usqInt bridgeSpan;
     sqInt bytesRead;
@@ -65697,7 +65697,7 @@
     usqLong firstSavedBridgeWord;
     sqInt nWritten;
     usqInt pier1;
-    usqInt pier2;
+    sqInt pier2;
     usqLong secondSavedBridgeWord;
 
  pier1 = (((segment->segSize)) + ((segment->segStart))) - (2 * BaseHeaderSize);
@@ -83300,7 +83300,7 @@
  }
  index = (index >> 1);
  if ((index < 1)
- || (index > 0x3F)) {
+ || (index > paramsArraySize)) {
  (GIV(primFailCode) = PrimErrBadIndex);
  return;
  }

Modified: branches/Cog/nsspursrc/vm/cointerp.h
===================================================================
--- branches/Cog/nsspursrc/vm/cointerp.h 2015-06-30 00:54:16 UTC (rev 3394)
+++ branches/Cog/nsspursrc/vm/cointerp.h 2015-06-30 01:32:55 UTC (rev 3395)
@@ -1,5 +1,5 @@
 /* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1402 uuid: 6f030706-bed6-4c29-a2f7-5e3653737178
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1403 uuid: 66fdf690-416b-4359-be28-c0387023baa6
  */
 
 

Modified: branches/Cog/nsspursrc/vm/gcc3x-cointerp.c
===================================================================
--- branches/Cog/nsspursrc/vm/gcc3x-cointerp.c 2015-06-30 00:54:16 UTC (rev 3394)
+++ branches/Cog/nsspursrc/vm/gcc3x-cointerp.c 2015-06-30 01:32:55 UTC (rev 3395)
@@ -2,11 +2,11 @@
 
 
 /* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1402 uuid: 6f030706-bed6-4c29-a2f7-5e3653737178
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1403 uuid: 66fdf690-416b-4359-be28-c0387023baa6
    from
- CoInterpreter VMMaker.oscog-eem.1402 uuid: 6f030706-bed6-4c29-a2f7-5e3653737178
+ CoInterpreter VMMaker.oscog-eem.1403 uuid: 66fdf690-416b-4359-be28-c0387023baa6
  */
-static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1402 uuid: 6f030706-bed6-4c29-a2f7-5e3653737178 " __DATE__ ;
+static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1403 uuid: 66fdf690-416b-4359-be28-c0387023baa6 " __DATE__ ;
 char *__interpBuildInfo = __buildInfo;
 
 
@@ -2413,7 +2413,7 @@
 /*560*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, 0, 0, 0,-1,-1
  };
 char expensiveAsserts = 0;
-const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.1402";
+const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.1403";
 sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */;
 volatile int sendTrace;
 
@@ -60612,7 +60612,7 @@
     usqInt prevFree;
     usqInt prevFreeChunk;
     usqInt prevPrevFree;
-    sqInt prevPrevFreeChunk;
+    usqInt prevPrevFreeChunk;
     sqInt slotBytes;
     sqInt slotBytes1;
     usqInt there;
@@ -65386,7 +65386,7 @@
     sqInt largeChild;
     sqInt newEndOfMemory;
     sqInt next;
-    usqInt node;
+    sqInt node;
     SpurSegmentInfo *seg;
     sqInt smallChild;
     sqInt treeNode;
@@ -65490,7 +65490,7 @@
 static sqInt
 readHeapFromImageFiledataBytes(sqImageFile f, sqInt numBytes)
 {   DECL_MAYBE_SQ_GLOBAL_STRUCT
-    usqInt bridge;
+    sqInt bridge;
     usqInt bridgehead;
     usqInt bridgeSpan;
     sqInt bytesRead;
@@ -65706,7 +65706,7 @@
     usqLong firstSavedBridgeWord;
     sqInt nWritten;
     usqInt pier1;
-    usqInt pier2;
+    sqInt pier2;
     usqLong secondSavedBridgeWord;
 
  pier1 = (((segment->segSize)) + ((segment->segStart))) - (2 * BaseHeaderSize);
@@ -83309,7 +83309,7 @@
  }
  index = (index >> 1);
  if ((index < 1)
- || (index > 0x3F)) {
+ || (index > paramsArraySize)) {
  (GIV(primFailCode) = PrimErrBadIndex);
  return;
  }

Modified: branches/Cog/nsspurstack64src/vm/gcc3x-interp.c
===================================================================
--- branches/Cog/nsspurstack64src/vm/gcc3x-interp.c 2015-06-30 00:54:16 UTC (rev 3394)
+++ branches/Cog/nsspurstack64src/vm/gcc3x-interp.c 2015-06-30 01:32:55 UTC (rev 3395)
@@ -2,11 +2,11 @@
 
 
 /* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1402 uuid: 6f030706-bed6-4c29-a2f7-5e3653737178
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1403 uuid: 66fdf690-416b-4359-be28-c0387023baa6
    from
- StackInterpreter VMMaker.oscog-eem.1402 uuid: 6f030706-bed6-4c29-a2f7-5e3653737178
+ StackInterpreter VMMaker.oscog-eem.1403 uuid: 66fdf690-416b-4359-be28-c0387023baa6
  */
-static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1402 uuid: 6f030706-bed6-4c29-a2f7-5e3653737178 " __DATE__ ;
+static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1403 uuid: 66fdf690-416b-4359-be28-c0387023baa6 " __DATE__ ;
 char *__interpBuildInfo = __buildInfo;
 
 
@@ -2173,7 +2173,7 @@
  /* 575 */ (void (*)(void))0,
  0 };
 char expensiveAsserts = 0;
-const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscog-eem.1402";
+const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscog-eem.1403";
 volatile int sendTrace;
 sqInt suppressHeartbeatFlag;
 
@@ -76398,7 +76398,7 @@
  }
  index = (index >> 3);
  if ((index < 1)
- || (index > 0x3F)) {
+ || (index > paramsArraySize)) {
  (GIV(primFailCode) = PrimErrBadIndex);
  return;
  }

Modified: branches/Cog/nsspurstack64src/vm/interp.c
===================================================================
--- branches/Cog/nsspurstack64src/vm/interp.c 2015-06-30 00:54:16 UTC (rev 3394)
+++ branches/Cog/nsspurstack64src/vm/interp.c 2015-06-30 01:32:55 UTC (rev 3395)
@@ -1,9 +1,9 @@
 /* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1402 uuid: 6f030706-bed6-4c29-a2f7-5e3653737178
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1403 uuid: 66fdf690-416b-4359-be28-c0387023baa6
    from
- StackInterpreter VMMaker.oscog-eem.1402 uuid: 6f030706-bed6-4c29-a2f7-5e3653737178
+ StackInterpreter VMMaker.oscog-eem.1403 uuid: 66fdf690-416b-4359-be28-c0387023baa6
  */
-static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1402 uuid: 6f030706-bed6-4c29-a2f7-5e3653737178 " __DATE__ ;
+static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1403 uuid: 66fdf690-416b-4359-be28-c0387023baa6 " __DATE__ ;
 char *__interpBuildInfo = __buildInfo;
 
 
@@ -2170,7 +2170,7 @@
  /* 575 */ (void (*)(void))0,
  0 };
 char expensiveAsserts = 0;
-const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscog-eem.1402";
+const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscog-eem.1403";
 volatile int sendTrace;
 sqInt suppressHeartbeatFlag;
 
@@ -76389,7 +76389,7 @@
  }
  index = (index >> 3);
  if ((index < 1)
- || (index > 0x3F)) {
+ || (index > paramsArraySize)) {
  (GIV(primFailCode) = PrimErrBadIndex);
  return;
  }

Modified: branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c
===================================================================
--- branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c 2015-06-30 00:54:16 UTC (rev 3394)
+++ branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c 2015-06-30 01:32:55 UTC (rev 3395)
@@ -2,11 +2,11 @@
 
 
 /* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1402 uuid: 6f030706-bed6-4c29-a2f7-5e3653737178
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1403 uuid: 66fdf690-416b-4359-be28-c0387023baa6
    from
- StackInterpreter VMMaker.oscog-eem.1402 uuid: 6f030706-bed6-4c29-a2f7-5e3653737178
+ StackInterpreter VMMaker.oscog-eem.1403 uuid: 66fdf690-416b-4359-be28-c0387023baa6
  */
-static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1402 uuid: 6f030706-bed6-4c29-a2f7-5e3653737178 " __DATE__ ;
+static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1403 uuid: 66fdf690-416b-4359-be28-c0387023baa6 " __DATE__ ;
 char *__interpBuildInfo = __buildInfo;
 
 
@@ -2144,7 +2144,7 @@
  /* 575 */ (void (*)(void))0,
  0 };
 char expensiveAsserts = 0;
-const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscog-eem.1402";
+const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscog-eem.1403";
 volatile int sendTrace;
 sqInt suppressHeartbeatFlag;
 
@@ -72391,7 +72391,7 @@
  }
  index = (index >> 1);
  if ((index < 1)
- || (index > 0x3F)) {
+ || (index > paramsArraySize)) {
  (GIV(primFailCode) = PrimErrBadIndex);
  return;
  }

Modified: branches/Cog/nsspurstacksrc/vm/interp.c
===================================================================
--- branches/Cog/nsspurstacksrc/vm/interp.c 2015-06-30 00:54:16 UTC (rev 3394)
+++ branches/Cog/nsspurstacksrc/vm/interp.c 2015-06-30 01:32:55 UTC (rev 3395)
@@ -1,9 +1,9 @@
 /* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1402 uuid: 6f030706-bed6-4c29-a2f7-5e3653737178
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1403 uuid: 66fdf690-416b-4359-be28-c0387023baa6
    from
- StackInterpreter VMMaker.oscog-eem.1402 uuid: 6f030706-bed6-4c29-a2f7-5e3653737178
+ StackInterpreter VMMaker.oscog-eem.1403 uuid: 66fdf690-416b-4359-be28-c0387023baa6
  */
-static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1402 uuid: 6f030706-bed6-4c29-a2f7-5e3653737178 " __DATE__ ;
+static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1403 uuid: 66fdf690-416b-4359-be28-c0387023baa6 " __DATE__ ;
 char *__interpBuildInfo = __buildInfo;
 
 
@@ -2141,7 +2141,7 @@
  /* 575 */ (void (*)(void))0,
  0 };
 char expensiveAsserts = 0;
-const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscog-eem.1402";
+const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscog-eem.1403";
 volatile int sendTrace;
 sqInt suppressHeartbeatFlag;
 
@@ -72382,7 +72382,7 @@
  }
  index = (index >> 1);
  if ((index < 1)
- || (index > 0x3F)) {
+ || (index > paramsArraySize)) {
  (GIV(primFailCode) = PrimErrBadIndex);
  return;
  }


Property changes on: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h
___________________________________________________________________
Modified: checkindate
   - Mon Jun 29 17:53:25 PDT 2015
   + Mon Jun 29 18:32:20 PDT 2015

Modified: branches/Cog/spursistasrc/vm/cogit.h
===================================================================
--- branches/Cog/spursistasrc/vm/cogit.h 2015-06-30 00:54:16 UTC (rev 3394)
+++ branches/Cog/spursistasrc/vm/cogit.h 2015-06-30 01:32:55 UTC (rev 3395)
@@ -1,5 +1,5 @@
 /* Automatically generated by
- CCodeGenerator VMMaker.oscog-eem.1402 uuid: 6f030706-bed6-4c29-a2f7-5e3653737178
+ CCodeGenerator VMMaker.oscog-eem.1403 uuid: 66fdf690-416b-4359-be28-c0387023baa6
  */
 
 

Modified: branches/Cog/spursistasrc/vm/cointerp.c
===================================================================
--- branches/Cog/spursistasrc/vm/cointerp.c 2015-06-30 00:54:16 UTC (rev 3394)
+++ branches/Cog/spursistasrc/vm/cointerp.c 2015-06-30 01:32:55 UTC (rev 3395)
@@ -1,9 +1,9 @@
 /* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1402 uuid: 6f030706-bed6-4c29-a2f7-5e3653737178
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1403 uuid: 66fdf690-416b-4359-be28-c0387023baa6
    from
- CoInterpreter VMMaker.oscog-eem.1402 uuid: 6f030706-bed6-4c29-a2f7-5e3653737178
+ CoInterpreter VMMaker.oscog-eem.1403 uuid: 66fdf690-416b-4359-be28-c0387023baa6
  */
-static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1402 uuid: 6f030706-bed6-4c29-a2f7-5e3653737178 " __DATE__ ;
+static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1403 uuid: 66fdf690-416b-4359-be28-c0387023baa6 " __DATE__ ;
 char *__interpBuildInfo = __buildInfo;
 
 
@@ -1194,7 +1194,7 @@
 static sqInt storeImageSegmentIntooutPointersroots(sqInt segmentWordArray, sqInt outPointerArray, sqInt arrayOfRoots) NoDbgRegParms;
 extern sqInt storePointerUncheckedofObjectwithValue(sqInt fieldIndex, sqInt objOop, sqInt valuePointer);
 extern sqInt storePointerofObjectwithValue(sqInt fieldIndex, sqInt objOop, sqInt valuePointer);
-extern sqInt stringForCString(const char *aCString);
+extern usqInt stringForCString(const char *aCString);
 static sqInt sufficientSpaceAfterGC(sqInt numBytes) NoDbgRegParms;
 static sqInt swizzleObjStackAt(sqInt objStackRootIndex) NoDbgRegParms;
 extern void tenuringIncrementalGC(void);
@@ -2385,7 +2385,7 @@
 /*560*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, 0, 0, 0,-1,-1
  };
 char expensiveAsserts = 0;
-const char *interpreterVersion = "Croquet Closure Cog[Spur] VM [CoInterpreterPrimitives VMMaker.oscog-eem.1402]";
+const char *interpreterVersion = "Croquet Closure Cog[Spur] VM [CoInterpreterPrimitives VMMaker.oscog-eem.1403]";
 sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */;
 volatile int sendTrace;
 
@@ -30849,7 +30849,7 @@
     usqInt newObj;
     usqInt numBytes;
     sqInt numSlots;
-    sqInt s;
+    usqInt s;
     char *sp;
     sqInt sz;
 
@@ -36526,7 +36526,7 @@
     sqInt err;
     sqInt hash;
     sqInt instSpec;
-    sqInt newObj;
+    usqInt newObj;
     usqInt newObj1;
     usqInt numBytes;
     sqInt numSlots;
@@ -36644,7 +36644,7 @@
     sqInt i;
     usqInt instSpec;
     sqInt literalCount;
-    sqInt newObj;
+    usqInt newObj;
     usqInt newObj1;
     usqInt numBytes;
     sqInt numSlots;
@@ -42542,7 +42542,7 @@
     sqInt fillValue;
     sqInt hash;
     usqInt instSpec;
-    sqInt newObj;
+    usqInt newObj;
     usqInt newObj1;
     usqInt numBytes;
     usqInt numSlots;
@@ -44674,7 +44674,7 @@
     sqInt entry;
     sqInt expectedIndex;
     sqInt expectedIndex1;
-    sqInt freeChunk;
+    usqInt freeChunk;
     sqInt i;
     sqInt i1;
     sqInt index;
@@ -44713,8 +44713,8 @@
     sqInt ptr1;
     sqInt ptr2;
     sqInt slotBytes;
-    sqInt smallObj;
-    sqInt start;
+    usqInt smallObj;
+    usqInt start;
 
  classIndex = (long32At(aClass + 4)) & 0x3FFFFF;
  if (classIndex == 0) {
@@ -47655,7 +47655,7 @@
     sqInt fmt;
     sqInt hasYoung;
     sqInt i;
-    sqInt newObj;
+    usqInt newObj;
     usqInt newObj1;
     usqInt numBytes;
     usqInt numSlots;
@@ -58991,7 +58991,7 @@
     usqInt prevFree;
     usqInt prevFreeChunk;
     usqInt prevPrevFree;
-    usqInt prevPrevFreeChunk;
+    sqInt prevPrevFreeChunk;
     sqInt slotBytes;
     sqInt slotBytes1;
     usqInt there;
@@ -62344,8 +62344,8 @@
     sqInt prevPrevObj;
     sqInt prevPrevObj1;
     sqInt ptr;
-    sqInt savedInHashes;
-    sqInt savedOutHashes;
+    usqInt savedInHashes;
+    usqInt savedOutHashes;
     sqInt segAddr;
     sqInt segStart;
     sqInt slotBytes;
@@ -62815,13 +62815,13 @@
  or nil if out of memory. */
 
  /* SpurMemoryManager>>#stringForCString: */
-sqInt
+usqInt
 stringForCString(const char *aCString)
 {   DECL_MAYBE_SQ_GLOBAL_STRUCT
     sqInt formatField;
     sqInt len;
     usqInt newObj;
-    sqInt newString;
+    usqInt newString;
     usqInt numBytes;
     sqInt numSlots;
 
@@ -63876,7 +63876,7 @@
 static sqInt
 readHeapFromImageFiledataBytes(sqImageFile f, sqInt numBytes)
 {   DECL_MAYBE_SQ_GLOBAL_STRUCT
-    sqInt bridge;
+    usqInt bridge;
     usqInt bridgehead;
     usqInt bridgeSpan;
     sqInt bytesRead;
@@ -80641,7 +80641,7 @@
  }
  index = (index >> 1);
  if ((index < 1)
- || (index > 0x3F)) {
+ || (index > paramsArraySize)) {
  (GIV(primFailCode) = PrimErrBadIndex);
  return;
  }

Modified: branches/Cog/spursistasrc/vm/cointerp.h
===================================================================
--- branches/Cog/spursistasrc/vm/cointerp.h 2015-06-30 00:54:16 UTC (rev 3394)
+++ branches/Cog/spursistasrc/vm/cointerp.h 2015-06-30 01:32:55 UTC (rev 3395)
@@ -1,5 +1,5 @@
 /* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1402 uuid: 6f030706-bed6-4c29-a2f7-5e3653737178
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1403 uuid: 66fdf690-416b-4359-be28-c0387023baa6
  */
 
 
@@ -254,7 +254,7 @@
 extern sqInt splObj(sqInt index);
 extern usqInt storeCheckBoundary(void);
 extern sqInt storePointerUncheckedofObjectwithValue(sqInt fieldIndex, sqInt objOop, sqInt valuePointer);
-extern sqInt stringForCString(const char *aCString);
+extern usqInt stringForCString(const char *aCString);
 extern void tenuringIncrementalGC(void);
 extern sqInt topRemappableOop(void);
 extern sqInt validFreeTree(void);

Modified: branches/Cog/spursistasrc/vm/gcc3x-cointerp.c
===================================================================
--- branches/Cog/spursistasrc/vm/gcc3x-cointerp.c 2015-06-30 00:54:16 UTC (rev 3394)
+++ branches/Cog/spursistasrc/vm/gcc3x-cointerp.c 2015-06-30 01:32:55 UTC (rev 3395)
@@ -2,11 +2,11 @@
 
 
 /* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1402 uuid: 6f030706-bed6-4c29-a2f7-5e3653737178
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1403 uuid: 66fdf690-416b-4359-be28-c0387023baa6
    from
- CoInterpreter VMMaker.oscog-eem.1402 uuid: 6f030706-bed6-4c29-a2f7-5e3653737178
+ CoInterpreter VMMaker.oscog-eem.1403 uuid: 66fdf690-416b-4359-be28-c0387023baa6
  */
-static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1402 uuid: 6f030706-bed6-4c29-a2f7-5e3653737178 " __DATE__ ;
+static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1403 uuid: 66fdf690-416b-4359-be28-c0387023baa6 " __DATE__ ;
 char *__interpBuildInfo = __buildInfo;
 
 
@@ -1197,7 +1197,7 @@
 static sqInt storeImageSegmentIntooutPointersroots(sqInt segmentWordArray, sqInt outPointerArray, sqInt arrayOfRoots) NoDbgRegParms;
 extern sqInt storePointerUncheckedofObjectwithValue(sqInt fieldIndex, sqInt objOop, sqInt valuePointer);
 extern sqInt storePointerofObjectwithValue(sqInt fieldIndex, sqInt objOop, sqInt valuePointer);
-extern sqInt stringForCString(const char *aCString);
+extern usqInt stringForCString(const char *aCString);
 static sqInt sufficientSpaceAfterGC(sqInt numBytes) NoDbgRegParms;
 static sqInt swizzleObjStackAt(sqInt objStackRootIndex) NoDbgRegParms;
 extern void tenuringIncrementalGC(void);
@@ -2388,7 +2388,7 @@
 /*560*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, 0, 0, 0,-1,-1
  };
 char expensiveAsserts = 0;
-const char *interpreterVersion = "Croquet Closure Cog[Spur] VM [CoInterpreterPrimitives VMMaker.oscog-eem.1402]";
+const char *interpreterVersion = "Croquet Closure Cog[Spur] VM [CoInterpreterPrimitives VMMaker.oscog-eem.1403]";
 sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */;
 volatile int sendTrace;
 
@@ -30858,7 +30858,7 @@
     usqInt newObj;
     usqInt numBytes;
     sqInt numSlots;
-    sqInt s;
+    usqInt s;
     char *sp;
     sqInt sz;
 
@@ -36535,7 +36535,7 @@
     sqInt err;
     sqInt hash;
     sqInt instSpec;
-    sqInt newObj;
+    usqInt newObj;
     usqInt newObj1;
     usqInt numBytes;
     sqInt numSlots;
@@ -36653,7 +36653,7 @@
     sqInt i;
     usqInt instSpec;
     sqInt literalCount;
-    sqInt newObj;
+    usqInt newObj;
     usqInt newObj1;
     usqInt numBytes;
     sqInt numSlots;
@@ -42551,7 +42551,7 @@
     sqInt fillValue;
     sqInt hash;
     usqInt instSpec;
-    sqInt newObj;
+    usqInt newObj;
     usqInt newObj1;
     usqInt numBytes;
     usqInt numSlots;
@@ -44683,7 +44683,7 @@
     sqInt entry;
     sqInt expectedIndex;
     sqInt expectedIndex1;
-    sqInt freeChunk;
+    usqInt freeChunk;
     sqInt i;
     sqInt i1;
     sqInt index;
@@ -44722,8 +44722,8 @@
     sqInt ptr1;
     sqInt ptr2;
     sqInt slotBytes;
-    sqInt smallObj;
-    sqInt start;
+    usqInt smallObj;
+    usqInt start;
 
  classIndex = (long32At(aClass + 4)) & 0x3FFFFF;
  if (classIndex == 0) {
@@ -47664,7 +47664,7 @@
     sqInt fmt;
     sqInt hasYoung;
     sqInt i;
-    sqInt newObj;
+    usqInt newObj;
     usqInt newObj1;
     usqInt numBytes;
     usqInt numSlots;
@@ -59000,7 +59000,7 @@
     usqInt prevFree;
     usqInt prevFreeChunk;
     usqInt prevPrevFree;
-    usqInt prevPrevFreeChunk;
+    sqInt prevPrevFreeChunk;
     sqInt slotBytes;
     sqInt slotBytes1;
     usqInt there;
@@ -62353,8 +62353,8 @@
     sqInt prevPrevObj;
     sqInt prevPrevObj1;
     sqInt ptr;
-    sqInt savedInHashes;
-    sqInt savedOutHashes;
+    usqInt savedInHashes;
+    usqInt savedOutHashes;
     sqInt segAddr;
     sqInt segStart;
     sqInt slotBytes;
@@ -62824,13 +62824,13 @@
  or nil if out of memory. */
 
  /* SpurMemoryManager>>#stringForCString: */
-sqInt
+usqInt
 stringForCString(const char *aCString)
 {   DECL_MAYBE_SQ_GLOBAL_STRUCT
     sqInt formatField;
     sqInt len;
     usqInt newObj;
-    sqInt newString;
+    usqInt newString;
     usqInt numBytes;
     sqInt numSlots;
 
@@ -63885,7 +63885,7 @@
 static sqInt
 readHeapFromImageFiledataBytes(sqImageFile f, sqInt numBytes)
 {   DECL_MAYBE_SQ_GLOBAL_STRUCT
-    sqInt bridge;
+    usqInt bridge;
     usqInt bridgehead;
     usqInt bridgeSpan;
     sqInt bytesRead;
@@ -80650,7 +80650,7 @@
  }
  index = (index >> 1);
  if ((index < 1)
- || (index > 0x3F)) {
+ || (index > paramsArraySize)) {
  (GIV(primFailCode) = PrimErrBadIndex);
  return;
  }

Modified: branches/Cog/spursrc/vm/cogit.h
===================================================================
--- branches/Cog/spursrc/vm/cogit.h 2015-06-30 00:54:16 UTC (rev 3394)
+++ branches/Cog/spursrc/vm/cogit.h 2015-06-30 01:32:55 UTC (rev 3395)
@@ -1,5 +1,5 @@
 /* Automatically generated by
- CCodeGenerator VMMaker.oscog-eem.1402 uuid: 6f030706-bed6-4c29-a2f7-5e3653737178
+ CCodeGenerator VMMaker.oscog-eem.1403 uuid: 66fdf690-416b-4359-be28-c0387023baa6
  */
 
 

Modified: branches/Cog/spursrc/vm/cointerp.c
===================================================================
--- branches/Cog/spursrc/vm/cointerp.c 2015-06-30 00:54:16 UTC (rev 3394)
+++ branches/Cog/spursrc/vm/cointerp.c 2015-06-30 01:32:55 UTC (rev 3395)
@@ -1,9 +1,9 @@
 /* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1402 uuid: 6f030706-bed6-4c29-a2f7-5e3653737178
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1403 uuid: 66fdf690-416b-4359-be28-c0387023baa6
    from
- CoInterpreter VMMaker.oscog-eem.1402 uuid: 6f030706-bed6-4c29-a2f7-5e3653737178
+ CoInterpreter VMMaker.oscog-eem.1403 uuid: 66fdf690-416b-4359-be28-c0387023baa6
  */
-static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1402 uuid: 6f030706-bed6-4c29-a2f7-5e3653737178 " __DATE__ ;
+static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1403 uuid: 66fdf690-416b-4359-be28-c0387023baa6 " __DATE__ ;
 char *__interpBuildInfo = __buildInfo;
 
 
@@ -2372,7 +2372,7 @@
 /*560*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, 0, 0, 0,-1,-1
  };
 char expensiveAsserts = 0;
-const char *interpreterVersion = "Croquet Closure Cog[Spur] VM [CoInterpreterPrimitives VMMaker.oscog-eem.1402]";
+const char *interpreterVersion = "Croquet Closure Cog[Spur] VM [CoInterpreterPrimitives VMMaker.oscog-eem.1403]";
 sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */;
 volatile int sendTrace;
 
@@ -58436,7 +58436,7 @@
 bridgeFromto(SpurSegmentInfo *aSegment, SpurSegmentInfo *nextSegmentOrNil)
 {
     usqInt bridgeSpan;
-    usqInt clifton;
+    sqInt clifton;
     usqInt segEnd;
 
  segEnd = ((aSegment->segSize)) + ((aSegment->segStart));
@@ -75511,7 +75511,7 @@
  }
  index = (index >> 1);
  if ((index < 1)
- || (index > 0x3F)) {
+ || (index > paramsArraySize)) {
  (GIV(primFailCode) = PrimErrBadIndex);
  return;
  }

Modified: branches/Cog/spursrc/vm/cointerp.h
===================================================================
--- branches/Cog/spursrc/vm/cointerp.h 2015-06-30 00:54:16 UTC (rev 3394)
+++ branches/Cog/spursrc/vm/cointerp.h 2015-06-30 01:32:55 UTC (rev 3395)
@@ -1,5 +1,5 @@
 /* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1402 uuid: 6f030706-bed6-4c29-a2f7-5e3653737178
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1403 uuid: 66fdf690-416b-4359-be28-c0387023baa6
  */
 
 

Modified: branches/Cog/spursrc/vm/gcc3x-cointerp.c
===================================================================
--- branches/Cog/spursrc/vm/gcc3x-cointerp.c 2015-06-30 00:54:16 UTC (rev 3394)
+++ branches/Cog/spursrc/vm/gcc3x-cointerp.c 2015-06-30 01:32:55 UTC (rev 3395)
@@ -2,11 +2,11 @@
 
 
 /* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1402 uuid: 6f030706-bed6-4c29-a2f7-5e3653737178
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1403 uuid: 66fdf690-416b-4359-be28-c0387023baa6
    from
- CoInterpreter VMMaker.oscog-eem.1402 uuid: 6f030706-bed6-4c29-a2f7-5e3653737178
+ CoInterpreter VMMaker.oscog-eem.1403 uuid: 66fdf690-416b-4359-be28-c0387023baa6
  */
-static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1402 uuid: 6f030706-bed6-4c29-a2f7-5e3653737178 " __DATE__ ;
+static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1403 uuid: 66fdf690-416b-4359-be28-c0387023baa6 " __DATE__ ;
 char *__interpBuildInfo = __buildInfo;
 
 
@@ -2375,7 +2375,7 @@
 /*560*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, 0, 0, 0,-1,-1
  };
 char expensiveAsserts = 0;
-const char *interpreterVersion = "Croquet Closure Cog[Spur] VM [CoInterpreterPrimitives VMMaker.oscog-eem.1402]";
+const char *interpreterVersion = "Croquet Closure Cog[Spur] VM [CoInterpreterPrimitives VMMaker.oscog-eem.1403]";
 sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */;
 volatile int sendTrace;
 
@@ -58445,7 +58445,7 @@
 bridgeFromto(SpurSegmentInfo *aSegment, SpurSegmentInfo *nextSegmentOrNil)
 {
     usqInt bridgeSpan;
-    usqInt clifton;
+    sqInt clifton;
     usqInt segEnd;
 
  segEnd = ((aSegment->segSize)) + ((aSegment->segStart));
@@ -75520,7 +75520,7 @@
  }
  index = (index >> 1);
  if ((index < 1)
- || (index > 0x3F)) {
+ || (index > paramsArraySize)) {
  (GIV(primFailCode) = PrimErrBadIndex);
  return;
  }

Modified: branches/Cog/spurstack64src/vm/gcc3x-interp.c
===================================================================
--- branches/Cog/spurstack64src/vm/gcc3x-interp.c 2015-06-30 00:54:16 UTC (rev 3394)
+++ branches/Cog/spurstack64src/vm/gcc3x-interp.c 2015-06-30 01:32:55 UTC (rev 3395)
@@ -2,11 +2,11 @@
 
 
 /* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1402 uuid: 6f030706-bed6-4c29-a2f7-5e3653737178
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1403 uuid: 66fdf690-416b-4359-be28-c0387023baa6
    from
- StackInterpreter VMMaker.oscog-eem.1402 uuid: 6f030706-bed6-4c29-a2f7-5e3653737178
+ StackInterpreter VMMaker.oscog-eem.1403 uuid: 66fdf690-416b-4359-be28-c0387023baa6
  */
-static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1402 uuid: 6f030706-bed6-4c29-a2f7-5e3653737178 " __DATE__ ;
+static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1403 uuid: 66fdf690-416b-4359-be28-c0387023baa6 " __DATE__ ;
 char *__interpBuildInfo = __buildInfo;
 
 
@@ -2137,7 +2137,7 @@
  /* 575 */ (void (*)(void))0,
  0 };
 char expensiveAsserts = 0;
-const char *interpreterVersion = "Croquet Closure Stack VM [StackInterpreterPrimitives VMMaker.oscog-eem.1402]";
+const char *interpreterVersion = "Croquet Closure Stack VM [StackInterpreterPrimitives VMMaker.oscog-eem.1403]";
 volatile int sendTrace;
 sqInt suppressHeartbeatFlag;
 
@@ -69928,7 +69928,7 @@
  }
  index = (index >> 3);
  if ((index < 1)
- || (index > 0x3F)) {
+ || (index > paramsArraySize)) {
  (GIV(primFailCode) = PrimErrBadIndex);
  return;
  }

Modified: branches/Cog/spurstack64src/vm/interp.c
===================================================================
--- branches/Cog/spurstack64src/vm/interp.c 2015-06-30 00:54:16 UTC (rev 3394)
+++ branches/Cog/spurstack64src/vm/interp.c 2015-06-30 01:32:55 UTC (rev 3395)
@@ -1,9 +1,9 @@
 /* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1402 uuid: 6f030706-bed6-4c29-a2f7-5e3653737178
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1403 uuid: 66fdf690-416b-4359-be28-c0387023baa6
    from
- StackInterpreter VMMaker.oscog-eem.1402 uuid: 6f030706-bed6-4c29-a2f7-5e3653737178
+ StackInterpreter VMMaker.oscog-eem.1403 uuid: 66fdf690-416b-4359-be28-c0387023baa6
  */
-static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1402 uuid: 6f030706-bed6-4c29-a2f7-5e3653737178 " __DATE__ ;
+static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1403 uuid: 66fdf690-416b-4359-be28-c0387023baa6 " __DATE__ ;
 char *__interpBuildInfo = __buildInfo;
 
 
@@ -2134,7 +2134,7 @@
  /* 575 */ (void (*)(void))0,
  0 };
 char expensiveAsserts = 0;
-const char *interpreterVersion = "Croquet Closure Stack VM [StackInterpreterPrimitives VMMaker.oscog-eem.1402]";
+const char *interpreterVersion = "Croquet Closure Stack VM [StackInterpreterPrimitives VMMaker.oscog-eem.1403]";
 volatile int sendTrace;
 sqInt suppressHeartbeatFlag;
 
@@ -69919,7 +69919,7 @@
  }
  index = (index >> 3);
  if ((index < 1)
- || (index > 0x3F)) {
+ || (index > paramsArraySize)) {
  (GIV(primFailCode) = PrimErrBadIndex);
  return;
  }

Modified: branches/Cog/spurstacksrc/vm/gcc3x-interp.c
===================================================================
--- branches/Cog/spurstacksrc/vm/gcc3x-interp.c 2015-06-30 00:54:16 UTC (rev 3394)
+++ branches/Cog/spurstacksrc/vm/gcc3x-interp.c 2015-06-30 01:32:55 UTC (rev 3395)
@@ -2,11 +2,11 @@
 
 
 /* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1402 uuid: 6f030706-bed6-4c29-a2f7-5e3653737178
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1403 uuid: 66fdf690-416b-4359-be28-c0387023baa6
    from
- StackInterpreter VMMaker.oscog-eem.1402 uuid: 6f030706-bed6-4c29-a2f7-5e3653737178
+ StackInterpreter VMMaker.oscog-eem.1403 uuid: 66fdf690-416b-4359-be28-c0387023baa6
  */
-static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1402 uuid: 6f030706-bed6-4c29-a2f7-5e3653737178 " __DATE__ ;
+static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1403 uuid: 66fdf690-416b-4359-be28-c0387023baa6 " __DATE__ ;
 char *__interpBuildInfo = __buildInfo;
 
 
@@ -2108,7 +2108,7 @@
  /* 575 */ (void (*)(void))0,
  0 };
 char expensiveAsserts = 0;
-const char *interpreterVersion = "Croquet Closure Stack VM [StackInterpreterPrimitives VMMaker.oscog-eem.1402]";
+const char *interpreterVersion = "Croquet Closure Stack VM [StackInterpreterPrimitives VMMaker.oscog-eem.1403]";
 volatile int sendTrace;
 sqInt suppressHeartbeatFlag;
 
@@ -66224,7 +66224,7 @@
  }
  index = (index >> 1);
  if ((index < 1)
- || (index > 0x3F)) {
+ || (index > paramsArraySize)) {
  (GIV(primFailCode) = PrimErrBadIndex);
  return;
  }

Modified: branches/Cog/spurstacksrc/vm/interp.c
===================================================================
--- branches/Cog/spurstacksrc/vm/interp.c 2015-06-30 00:54:16 UTC (rev 3394)
+++ branches/Cog/spurstacksrc/vm/interp.c 2015-06-30 01:32:55 UTC (rev 3395)
@@ -1,9 +1,9 @@
 /* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1402 uuid: 6f030706-bed6-4c29-a2f7-5e3653737178
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1403 uuid: 66fdf690-416b-4359-be28-c0387023baa6
    from
- StackInterpreter VMMaker.oscog-eem.1402 uuid: 6f030706-bed6-4c29-a2f7-5e3653737178
+ StackInterpreter VMMaker.oscog-eem.1403 uuid: 66fdf690-416b-4359-be28-c0387023baa6
  */
-static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1402 uuid: 6f030706-bed6-4c29-a2f7-5e3653737178 " __DATE__ ;
+static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1403 uuid: 66fdf690-416b-4359-be28-c0387023baa6 " __DATE__ ;
 char *__interpBuildInfo = __buildInfo;
 
 
@@ -2105,7 +2105,7 @@
  /* 575 */ (void (*)(void))0,
  0 };
 char expensiveAsserts = 0;
-const char *interpreterVersion = "Croquet Closure Stack VM [StackInterpreterPrimitives VMMaker.oscog-eem.1402]";
+const char *interpreterVersion = "Croquet Closure Stack VM [StackInterpreterPrimitives VMMaker.oscog-eem.1403]";
 volatile int sendTrace;
 sqInt suppressHeartbeatFlag;
 
@@ -66215,7 +66215,7 @@
  }
  index = (index >> 1);
  if ((index < 1)
- || (index > 0x3F)) {
+ || (index > paramsArraySize)) {
  (GIV(primFailCode) = PrimErrBadIndex);
  return;
  }

Modified: branches/Cog/src/vm/cogit.h
===================================================================
--- branches/Cog/src/vm/cogit.h 2015-06-30 00:54:16 UTC (rev 3394)
+++ branches/Cog/src/vm/cogit.h 2015-06-30 01:32:55 UTC (rev 3395)
@@ -1,5 +1,5 @@
 /* Automatically generated by
- CCodeGenerator VMMaker.oscog-eem.1402 uuid: 6f030706-bed6-4c29-a2f7-5e3653737178
+ CCodeGenerator VMMaker.oscog-eem.1403 uuid: 66fdf690-416b-4359-be28-c0387023baa6
  */
 
 

Modified: branches/Cog/src/vm/cointerp.c
===================================================================
--- branches/Cog/src/vm/cointerp.c 2015-06-30 00:54:16 UTC (rev 3394)
+++ branches/Cog/src/vm/cointerp.c 2015-06-30 01:32:55 UTC (rev 3395)
@@ -1,9 +1,9 @@
 /* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1401 uuid: 036f0933-639a-49dd-8a1d-a03bcdcb0a0a
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1403 uuid: 66fdf690-416b-4359-be28-c0387023baa6
    from
- CoInterpreter VMMaker.oscog-eem.1401 uuid: 036f0933-639a-49dd-8a1d-a03bcdcb0a0a
+ CoInterpreter VMMaker.oscog-eem.1403 uuid: 66fdf690-416b-4359-be28-c0387023baa6
  */
-static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1401 uuid: 036f0933-639a-49dd-8a1d-a03bcdcb0a0a " __DATE__ ;
+static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1403 uuid: 66fdf690-416b-4359-be28-c0387023baa6 " __DATE__ ;
 char *__interpBuildInfo = __buildInfo;
 
 
@@ -2106,7 +2106,7 @@
  /* 575 */ (void (*)(void))0,
  0 };
 char expensiveAsserts = 0;
-const char *interpreterVersion = "Croquet Closure Cog[SqueakV3] VM [CoInterpreterPrimitives VMMaker.oscog-eem.1401]";
+const char *interpreterVersion = "Croquet Closure Cog[SqueakV3] VM [CoInterpreterPrimitives VMMaker.oscog-eem.1403]";
 sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */;
 volatile int sendTrace;
 
@@ -54359,7 +54359,7 @@
  }
  index = (index >> 1);
  if ((index < 1)
- || (index > 0x3F)) {
+ || (index > paramsArraySize)) {
  (GIV(primFailCode) = PrimErrBadIndex);
  return;
  }

Modified: branches/Cog/src/vm/cointerp.h
===================================================================
--- branches/Cog/src/vm/cointerp.h 2015-06-30 00:54:16 UTC (rev 3394)
+++ branches/Cog/src/vm/cointerp.h 2015-06-30 01:32:55 UTC (rev 3395)
@@ -1,5 +1,5 @@
 /* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1401 uuid: 036f0933-639a-49dd-8a1d-a03bcdcb0a0a
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1403 uuid: 66fdf690-416b-4359-be28-c0387023baa6
  */
 
 

Modified: branches/Cog/src/vm/cointerpmt.c
===================================================================
--- branches/Cog/src/vm/cointerpmt.c 2015-06-30 00:54:16 UTC (rev 3394)
+++ branches/Cog/src/vm/cointerpmt.c 2015-06-30 01:32:55 UTC (rev 3395)
@@ -1,9 +1,9 @@
 /* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1401 uuid: 036f0933-639a-49dd-8a1d-a03bcdcb0a0a
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1403 uuid: 66fdf690-416b-4359-be28-c0387023baa6
    from
- CoInterpreterMT VMMaker.oscog-eem.1401 uuid: 036f0933-639a-49dd-8a1d-a03bcdcb0a0a
+ CoInterpreterMT VMMaker.oscog-eem.1403 uuid: 66fdf690-416b-4359-be28-c0387023baa6
  */
-static char __buildInfo[] = "CoInterpreterMT VMMaker.oscog-eem.1401 uuid: 036f0933-639a-49dd-8a1d-a03bcdcb0a0a " __DATE__ ;
+static char __buildInfo[] = "CoInterpreterMT VMMaker.oscog-eem.1403 uuid: 66fdf690-416b-4359-be28-c0387023baa6 " __DATE__ ;
 char *__interpBuildInfo = __buildInfo;
 
 
@@ -2202,7 +2202,7 @@
  /* 575 */ (void (*)(void))0,
  0 };
 char expensiveAsserts = 0;
-const char *interpreterVersion = "Croquet Closure Cog MT VM [CoInterpreterMT VMMaker.oscog-eem.1401]";
+const char *interpreterVersion = "Croquet Closure Cog MT VM [CoInterpreterMT VMMaker.oscog-eem.1403]";
 sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */;
 volatile int sendTrace;
 sqInt willNotThreadWarnCount;
@@ -56422,7 +56422,7 @@
  }
  index = (index >> 1);
  if ((index < 1)
- || (index > 0x3F)) {
+ || (index > paramsArraySize)) {
  (GIV(primFailCode) = PrimErrBadIndex);
  return;
  }

Modified: branches/Cog/src/vm/cointerpmt.h
===================================================================
--- branches/Cog/src/vm/cointerpmt.h 2015-06-30 00:54:16 UTC (rev 3394)
+++ branches/Cog/src/vm/cointerpmt.h 2015-06-30 01:32:55 UTC (rev 3395)
@@ -1,5 +1,5 @@
 /* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1401 uuid: 036f0933-639a-49dd-8a1d-a03bcdcb0a0a
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1403 uuid: 66fdf690-416b-4359-be28-c0387023baa6
  */
 
 

Modified: branches/Cog/src/vm/gcc3x-cointerp.c
===================================================================
--- branches/Cog/src/vm/gcc3x-cointerp.c 2015-06-30 00:54:16 UTC (rev 3394)
+++ branches/Cog/src/vm/gcc3x-cointerp.c 2015-06-30 01:32:55 UTC (rev 3395)
@@ -2,11 +2,11 @@
 
 
 /* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1401 uuid: 036f0933-639a-49dd-8a1d-a03bcdcb0a0a
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1403 uuid: 66fdf690-416b-4359-be28-c0387023baa6
    from
- CoInterpreter VMMaker.oscog-eem.1401 uuid: 036f0933-639a-49dd-8a1d-a03bcdcb0a0a
+ CoInterpreter VMMaker.oscog-eem.1403 uuid: 66fdf690-416b-4359-be28-c0387023baa6
  */
-static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1401 uuid: 036f0933-639a-49dd-8a1d-a03bcdcb0a0a " __DATE__ ;
+static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1403 uuid: 66fdf690-416b-4359-be28-c0387023baa6 " __DATE__ ;
 char *__interpBuildInfo = __buildInfo;
 
 
@@ -2109,7 +2109,7 @@
  /* 575 */ (void (*)(void))0,
  0 };
 char expensiveAsserts = 0;
-const char *interpreterVersion = "Croquet Closure Cog[SqueakV3] VM [CoInterpreterPrimitives VMMaker.oscog-eem.1401]";
+const char *interpreterVersion = "Croquet Closure Cog[SqueakV3] VM [CoInterpreterPrimitives VMMaker.oscog-eem.1403]";
 sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */;
 volatile int sendTrace;
 
@@ -54368,7 +54368,7 @@
  }
  index = (index >> 1);
  if ((index < 1)
- || (index > 0x3F)) {
+ || (index > paramsArraySize)) {
  (GIV(primFailCode) = PrimErrBadIndex);
  return;
  }

Modified: branches/Cog/src/vm/gcc3x-cointerpmt.c
===================================================================
--- branches/Cog/src/vm/gcc3x-cointerpmt.c 2015-06-30 00:54:16 UTC (rev 3394)
+++ branches/Cog/src/vm/gcc3x-cointerpmt.c 2015-06-30 01:32:55 UTC (rev 3395)
@@ -2,11 +2,11 @@
 
 
 /* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1401 uuid: 036f0933-639a-49dd-8a1d-a03bcdcb0a0a
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1403 uuid: 66fdf690-416b-4359-be28-c0387023baa6
    from
- CoInterpreterMT VMMaker.oscog-eem.1401 uuid: 036f0933-639a-49dd-8a1d-a03bcdcb0a0a
+ CoInterpreterMT VMMaker.oscog-eem.1403 uuid: 66fdf690-416b-4359-be28-c0387023baa6
  */
-static char __buildInfo[] = "CoInterpreterMT VMMaker.oscog-eem.1401 uuid: 036f0933-639a-49dd-8a1d-a03bcdcb0a0a " __DATE__ ;
+static char __buildInfo[] = "CoInterpreterMT VMMaker.oscog-eem.1403 uuid: 66fdf690-416b-4359-be28-c0387023baa6 " __DATE__ ;
 char *__interpBuildInfo = __buildInfo;
 
 
@@ -2205,7 +2205,7 @@
  /* 575 */ (void (*)(void))0,
  0 };
 char expensiveAsserts = 0;
-const char *interpreterVersion = "Croquet Closure Cog MT VM [CoInterpreterMT VMMaker.oscog-eem.1401]";
+const char *interpreterVersion = "Croquet Closure Cog MT VM [CoInterpreterMT VMMaker.oscog-eem.1403]";
 sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */;
 volatile int sendTrace;
 sqInt willNotThreadWarnCount;
@@ -56431,7 +56431,7 @@
  }
  index = (index >> 1);
  if ((index < 1)
- || (index > 0x3F)) {
+ || (index > paramsArraySize)) {
  (GIV(primFailCode) = PrimErrBadIndex);
  return;
  }

Modified: branches/Cog/stacksrc/vm/gcc3x-interp.c
===================================================================
--- branches/Cog/stacksrc/vm/gcc3x-interp.c 2015-06-30 00:54:16 UTC (rev 3394)
+++ branches/Cog/stacksrc/vm/gcc3x-interp.c 2015-06-30 01:32:55 UTC (rev 3395)
@@ -2,11 +2,11 @@
 
 
 /* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1401 uuid: 036f0933-639a-49dd-8a1d-a03bcdcb0a0a
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1403 uuid: 66fdf690-416b-4359-be28-c0387023baa6
    from
- StackInterpreter VMMaker.oscog-eem.1401 uuid: 036f0933-639a-49dd-8a1d-a03bcdcb0a0a
+ StackInterpreter VMMaker.oscog-eem.1403 uuid: 66fdf690-416b-4359-be28-c0387023baa6
  */
-static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1401 uuid: 036f0933-639a-49dd-8a1d-a03bcdcb0a0a " __DATE__ ;
+static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1403 uuid: 66fdf690-416b-4359-be28-c0387023baa6 " __DATE__ ;
 char *__interpBuildInfo = __buildInfo;
 
 
@@ -1872,7 +1872,7 @@
  /* 575 */ (void (*)(void))0,
  0 };
 char expensiveAsserts = 0;
-const char *interpreterVersion = "Croquet Closure Stack VM [StackInterpreterPrimitives VMMaker.oscog-eem.1401]";
+const char *interpreterVersion = "Croquet Closure Stack VM [StackInterpreterPrimitives VMMaker.oscog-eem.1403]";
 volatile int sendTrace;
 sqInt suppressHeartbeatFlag;
 
@@ -46722,7 +46722,7 @@
  }
  index = (index >> 1);
  if ((index < 1)
- || (index > 0x3F)) {
+ || (index > paramsArraySize)) {
  (GIV(primFailCode) = PrimErrBadIndex);
  return;
  }

Modified: branches/Cog/stacksrc/vm/interp.c
===================================================================
--- branches/Cog/stacksrc/vm/interp.c 2015-06-30 00:54:16 UTC (rev 3394)
+++ branches/Cog/stacksrc/vm/interp.c 2015-06-30 01:32:55 UTC (rev 3395)
@@ -1,9 +1,9 @@
 /* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1401 uuid: 036f0933-639a-49dd-8a1d-a03bcdcb0a0a
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1403 uuid: 66fdf690-416b-4359-be28-c0387023baa6
    from
- StackInterpreter VMMaker.oscog-eem.1401 uuid: 036f0933-639a-49dd-8a1d-a03bcdcb0a0a
+ StackInterpreter VMMaker.oscog-eem.1403 uuid: 66fdf690-416b-4359-be28-c0387023baa6
  */
-static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1401 uuid: 036f0933-639a-49dd-8a1d-a03bcdcb0a0a " __DATE__ ;
+static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1403 uuid: 66fdf690-416b-4359-be28-c0387023baa6 " __DATE__ ;
 char *__interpBuildInfo = __buildInfo;
 
 
@@ -1869,7 +1869,7 @@
  /* 575 */ (void (*)(void))0,
  0 };
 char expensiveAsserts = 0;
-const char *interpreterVersion = "Croquet Closure Stack VM [StackInterpreterPrimitives VMMaker.oscog-eem.1401]";
+const char *interpreterVersion = "Croquet Closure Stack VM [StackInterpreterPrimitives VMMaker.oscog-eem.1403]";
 volatile int sendTrace;
 sqInt suppressHeartbeatFlag;
 
@@ -46713,7 +46713,7 @@
  }
  index = (index >> 1);
  if ((index < 1)
- || (index > 0x3F)) {
+ || (index > paramsArraySize)) {
  (GIV(primFailCode) = PrimErrBadIndex);
  return;
  }