[Vm-dev] [commit][3326] CogVM source as per VMMaker.oscog-eem.1297
commits at squeakvm.org
commits at squeakvm.org
Sun May 10 17:44:58 UTC 2015
Revision: 3326
Author: eliot
Date: 2015-05-10 10:44:53 -0700 (Sun, 10 May 2015)
Log Message:
-----------
CogVM source as per VMMaker.oscog-eem.1297
Fix slip in primitiveClass.
Fix Slang warning in Sista special selector #==.
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-05-10 16:24:15 UTC (rev 3325)
+++ branches/Cog/nsspursrc/vm/cogit.h 2015-05-10 17:44:53 UTC (rev 3326)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGenerator VMMaker.oscog-eem.1296 uuid: 264a71ca-50a1-4e84-96f4-dcb1c571859b
+ CCodeGenerator VMMaker.oscog-eem.1297 uuid: 1125d82b-1be0-4ed8-bdfa-9557c360bf1b
*/
Modified: branches/Cog/nsspursrc/vm/cointerp.c
===================================================================
--- branches/Cog/nsspursrc/vm/cointerp.c 2015-05-10 16:24:15 UTC (rev 3325)
+++ branches/Cog/nsspursrc/vm/cointerp.c 2015-05-10 17:44:53 UTC (rev 3326)
@@ -1,9 +1,9 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1296 uuid: 264a71ca-50a1-4e84-96f4-dcb1c571859b
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1297 uuid: 1125d82b-1be0-4ed8-bdfa-9557c360bf1b
from
- CoInterpreter VMMaker.oscog-eem.1296 uuid: 264a71ca-50a1-4e84-96f4-dcb1c571859b
+ CoInterpreter VMMaker.oscog-eem.1297 uuid: 1125d82b-1be0-4ed8-bdfa-9557c360bf1b
*/
-static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1296 uuid: 264a71ca-50a1-4e84-96f4-dcb1c571859b " __DATE__ ;
+static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1297 uuid: 1125d82b-1be0-4ed8-bdfa-9557c360bf1b " __DATE__ ;
char *__interpBuildInfo = __buildInfo;
@@ -1188,7 +1188,7 @@
static sqInt storeImageSegmentIntooutPointersroots(sqInt segmentWordArray, sqInt outPointerArray, sqInt arrayOfRoots) NoDbgRegParms;
sqInt storePointerUncheckedofObjectwithValue(sqInt fieldIndex, sqInt objOop, sqInt valuePointer);
sqInt storePointerofObjectwithValue(sqInt fieldIndex, sqInt objOop, sqInt valuePointer);
-sqInt stringForCString(const char *aCString);
+usqInt stringForCString(const char *aCString);
static sqInt sufficientSpaceAfterGC(sqInt numBytes) NoDbgRegParms;
static sqInt swizzleObjStackAt(sqInt objStackRootIndex) NoDbgRegParms;
void tenuringIncrementalGC(void);
@@ -2378,7 +2378,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.1296";
+const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.1297";
sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */;
volatile int sendTrace;
@@ -15779,7 +15779,7 @@
CogMethod *cogMethod;
sqInt methodField;
sqInt methodField1;
- usqInt theIP;
+ sqInt theIP;
assertl(GIV(stackPage) == (mostRecentlyUsedPage()), ln);
assertl(addressIsInPage(GIV(stackPage), lifp), ln);
@@ -31741,7 +31741,7 @@
GIV(needGCFlag) = 1;
forceInterruptCheck();
}
- s = allocateSlotsInOldSpacebytesformatclassIndex(numSlots, numBytes, formatField, ClassByteStringCompactIndex);
+ s = ((usqInt) (allocateSlotsInOldSpacebytesformatclassIndex(numSlots, numBytes, formatField, ClassByteStringCompactIndex)));
goto l1;
}
if (numSlots >= 0xFF) {
@@ -33061,7 +33061,7 @@
sqInt arg;
sqInt fmt;
sqInt i;
- sqInt length;
+ usqInt length;
usqInt numBytes;
usqInt numSlots;
usqInt numSlots1;
@@ -33102,18 +33102,18 @@
/* bytes (the common case), including CompiledMethod */
- length = numBytes - (fmt & 7);
+ length = ((sqInt) (numBytes - (fmt & 7)));
goto l1;
}
if (fmt <= 9) {
- length = numBytes;
+ length = ((sqInt) numBytes);
goto l1;
}
if (fmt >= 12) {
- length = numBytes - ((fmt & 3) << 1);
+ length = ((sqInt) (numBytes - ((fmt & 3) << 1)));
goto l1;
}
- length = numBytes - ((fmt & 1) << 2);
+ length = ((sqInt) (numBytes - ((fmt & 1) << 2)));
l1: /* end numBytesOf: */;
if (!((((((usqInt) (longAt(rcvr))) >> 24) & 0x1F) == ((((usqInt) (longAt(arg))) >> 24) & 0x1F))
&& (length == (numBytesOf(arg))))) {
@@ -33131,9 +33131,9 @@
flag("endianness");
assert((classIndexOf(rcvr)) > (isForwardedObjectClassIndexPun()));
numSlots1 = byteAt(rcvr + 7);
- length = ((usqInt) ((numSlots1 == 0xFF
- ? longAt(rcvr - BaseHeaderSize)
- : numSlots1)));
+ length = (numSlots1 == 0xFF
+ ? longAt(rcvr - BaseHeaderSize)
+ : numSlots1);
if (!((isAppropriateForCopyObject(arg))
&& (length == (lengthOfformat(arg, (((usqInt) (longAt(arg))) >> 24) & 0x1F))))) {
(GIV(primFailCode) = PrimErrBadArgument);
@@ -37145,7 +37145,7 @@
sqInt err;
sqInt hash;
sqInt instSpec;
- sqInt newObj;
+ usqInt newObj;
usqInt newObj1;
usqInt numBytes;
sqInt numSlots;
@@ -37261,7 +37261,7 @@
sqInt i;
sqInt instSpec;
sqInt literalCount;
- sqInt newObj;
+ usqInt newObj;
usqInt newObj1;
usqInt numBytes;
sqInt numSlots;
@@ -43167,7 +43167,7 @@
GIV(needGCFlag) = 1;
forceInterruptCheck();
}
- newObj = allocateSlotsInOldSpacebytesformatclassIndex(numSlots, numBytes, instSpec, classIndex);
+ newObj = ((usqInt) (allocateSlotsInOldSpacebytesformatclassIndex(numSlots, numBytes, instSpec, classIndex)));
goto l1;
}
if (numSlots >= 0xFF) {
@@ -45150,7 +45150,7 @@
sqInt entry;
sqInt expectedIndex;
sqInt expectedIndex1;
- sqInt freeChunk;
+ usqInt freeChunk;
sqInt i;
sqInt i1;
sqInt index;
@@ -45189,8 +45189,8 @@
sqInt ptr1;
sqInt ptr2;
sqInt slotBytes;
- sqInt smallObj;
- sqInt start;
+ usqInt smallObj;
+ usqInt start;
classIndex = (long32At(aClass + 4)) & 0x3FFFFF;
if (classIndex == 0) {
@@ -48077,7 +48077,7 @@
sqInt fmt;
sqInt hasYoung;
sqInt i;
- sqInt newObj;
+ usqInt newObj;
usqInt newObj1;
usqInt numBytes;
usqInt numSlots;
@@ -62446,8 +62446,8 @@
sqInt prevPrevObj;
sqInt prevPrevObj1;
sqInt ptr;
- sqInt savedInHashes;
- sqInt savedOutHashes;
+ usqInt savedInHashes;
+ usqInt savedOutHashes;
sqInt segAddr;
sqInt segStart;
sqInt slotBytes;
@@ -62914,13 +62914,13 @@
/* Answer a new String copied from a null-terminated C string,
or nil if out of memory. */
-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;
@@ -63837,7 +63837,7 @@
sqInt largeChild;
sqInt newEndOfMemory;
sqInt next;
- usqInt node;
+ sqInt node;
SpurSegmentInfo *seg;
sqInt smallChild;
sqInt treeNode;
@@ -64149,7 +64149,7 @@
usqLong firstSavedBridgeWord;
sqInt nWritten;
usqInt pier1;
- sqInt pier2;
+ usqInt pier2;
usqLong secondSavedBridgeWord;
pier1 = (((segment->segSize)) + ((segment->segStart))) - (2 * BaseHeaderSize);
@@ -78744,7 +78744,7 @@
sqInt header1;
sqInt i;
sqInt methodHeader;
- usqInt numSlots;
+ sqInt numSlots;
usqInt numSlots1;
sqInt rcvr;
char *sp;
@@ -78800,9 +78800,9 @@
flag("endianness");
assert((classIndexOf(rcvr)) > (isForwardedObjectClassIndexPun()));
numSlots1 = byteAt(rcvr + 7);
- numSlots = (numSlots1 == 0xFF
- ? longAt(rcvr - BaseHeaderSize)
- : numSlots1);
+ numSlots = ((usqInt) ((numSlots1 == 0xFF
+ ? longAt(rcvr - BaseHeaderSize)
+ : numSlots1)));
}
}
else {
Modified: branches/Cog/nsspursrc/vm/cointerp.h
===================================================================
--- branches/Cog/nsspursrc/vm/cointerp.h 2015-05-10 16:24:15 UTC (rev 3325)
+++ branches/Cog/nsspursrc/vm/cointerp.h 2015-05-10 17:44:53 UTC (rev 3326)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1296 uuid: 264a71ca-50a1-4e84-96f4-dcb1c571859b
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1297 uuid: 1125d82b-1be0-4ed8-bdfa-9557c360bf1b
*/
@@ -261,7 +261,7 @@
sqInt splObj(sqInt index);
usqInt storeCheckBoundary(void);
sqInt storePointerUncheckedofObjectwithValue(sqInt fieldIndex, sqInt objOop, sqInt valuePointer);
-sqInt stringForCString(const char *aCString);
+usqInt stringForCString(const char *aCString);
void tenuringIncrementalGC(void);
sqInt topRemappableOop(void);
sqInt validFreeTree(void);
Modified: branches/Cog/nsspursrc/vm/gcc3x-cointerp.c
===================================================================
--- branches/Cog/nsspursrc/vm/gcc3x-cointerp.c 2015-05-10 16:24:15 UTC (rev 3325)
+++ branches/Cog/nsspursrc/vm/gcc3x-cointerp.c 2015-05-10 17:44:53 UTC (rev 3326)
@@ -2,11 +2,11 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1296 uuid: 264a71ca-50a1-4e84-96f4-dcb1c571859b
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1297 uuid: 1125d82b-1be0-4ed8-bdfa-9557c360bf1b
from
- CoInterpreter VMMaker.oscog-eem.1296 uuid: 264a71ca-50a1-4e84-96f4-dcb1c571859b
+ CoInterpreter VMMaker.oscog-eem.1297 uuid: 1125d82b-1be0-4ed8-bdfa-9557c360bf1b
*/
-static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1296 uuid: 264a71ca-50a1-4e84-96f4-dcb1c571859b " __DATE__ ;
+static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1297 uuid: 1125d82b-1be0-4ed8-bdfa-9557c360bf1b " __DATE__ ;
char *__interpBuildInfo = __buildInfo;
@@ -1191,7 +1191,7 @@
static sqInt storeImageSegmentIntooutPointersroots(sqInt segmentWordArray, sqInt outPointerArray, sqInt arrayOfRoots) NoDbgRegParms;
sqInt storePointerUncheckedofObjectwithValue(sqInt fieldIndex, sqInt objOop, sqInt valuePointer);
sqInt storePointerofObjectwithValue(sqInt fieldIndex, sqInt objOop, sqInt valuePointer);
-sqInt stringForCString(const char *aCString);
+usqInt stringForCString(const char *aCString);
static sqInt sufficientSpaceAfterGC(sqInt numBytes) NoDbgRegParms;
static sqInt swizzleObjStackAt(sqInt objStackRootIndex) NoDbgRegParms;
void tenuringIncrementalGC(void);
@@ -2381,7 +2381,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.1296";
+const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.1297";
sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */;
volatile int sendTrace;
@@ -15788,7 +15788,7 @@
CogMethod *cogMethod;
sqInt methodField;
sqInt methodField1;
- usqInt theIP;
+ sqInt theIP;
assertl(GIV(stackPage) == (mostRecentlyUsedPage()), ln);
assertl(addressIsInPage(GIV(stackPage), lifp), ln);
@@ -31750,7 +31750,7 @@
GIV(needGCFlag) = 1;
forceInterruptCheck();
}
- s = allocateSlotsInOldSpacebytesformatclassIndex(numSlots, numBytes, formatField, ClassByteStringCompactIndex);
+ s = ((usqInt) (allocateSlotsInOldSpacebytesformatclassIndex(numSlots, numBytes, formatField, ClassByteStringCompactIndex)));
goto l1;
}
if (numSlots >= 0xFF) {
@@ -33070,7 +33070,7 @@
sqInt arg;
sqInt fmt;
sqInt i;
- sqInt length;
+ usqInt length;
usqInt numBytes;
usqInt numSlots;
usqInt numSlots1;
@@ -33111,18 +33111,18 @@
/* bytes (the common case), including CompiledMethod */
- length = numBytes - (fmt & 7);
+ length = ((sqInt) (numBytes - (fmt & 7)));
goto l1;
}
if (fmt <= 9) {
- length = numBytes;
+ length = ((sqInt) numBytes);
goto l1;
}
if (fmt >= 12) {
- length = numBytes - ((fmt & 3) << 1);
+ length = ((sqInt) (numBytes - ((fmt & 3) << 1)));
goto l1;
}
- length = numBytes - ((fmt & 1) << 2);
+ length = ((sqInt) (numBytes - ((fmt & 1) << 2)));
l1: /* end numBytesOf: */;
if (!((((((usqInt) (longAt(rcvr))) >> 24) & 0x1F) == ((((usqInt) (longAt(arg))) >> 24) & 0x1F))
&& (length == (numBytesOf(arg))))) {
@@ -33140,9 +33140,9 @@
flag("endianness");
assert((classIndexOf(rcvr)) > (isForwardedObjectClassIndexPun()));
numSlots1 = byteAt(rcvr + 7);
- length = ((usqInt) ((numSlots1 == 0xFF
- ? longAt(rcvr - BaseHeaderSize)
- : numSlots1)));
+ length = (numSlots1 == 0xFF
+ ? longAt(rcvr - BaseHeaderSize)
+ : numSlots1);
if (!((isAppropriateForCopyObject(arg))
&& (length == (lengthOfformat(arg, (((usqInt) (longAt(arg))) >> 24) & 0x1F))))) {
(GIV(primFailCode) = PrimErrBadArgument);
@@ -37154,7 +37154,7 @@
sqInt err;
sqInt hash;
sqInt instSpec;
- sqInt newObj;
+ usqInt newObj;
usqInt newObj1;
usqInt numBytes;
sqInt numSlots;
@@ -37270,7 +37270,7 @@
sqInt i;
sqInt instSpec;
sqInt literalCount;
- sqInt newObj;
+ usqInt newObj;
usqInt newObj1;
usqInt numBytes;
sqInt numSlots;
@@ -43176,7 +43176,7 @@
GIV(needGCFlag) = 1;
forceInterruptCheck();
}
- newObj = allocateSlotsInOldSpacebytesformatclassIndex(numSlots, numBytes, instSpec, classIndex);
+ newObj = ((usqInt) (allocateSlotsInOldSpacebytesformatclassIndex(numSlots, numBytes, instSpec, classIndex)));
goto l1;
}
if (numSlots >= 0xFF) {
@@ -45159,7 +45159,7 @@
sqInt entry;
sqInt expectedIndex;
sqInt expectedIndex1;
- sqInt freeChunk;
+ usqInt freeChunk;
sqInt i;
sqInt i1;
sqInt index;
@@ -45198,8 +45198,8 @@
sqInt ptr1;
sqInt ptr2;
sqInt slotBytes;
- sqInt smallObj;
- sqInt start;
+ usqInt smallObj;
+ usqInt start;
classIndex = (long32At(aClass + 4)) & 0x3FFFFF;
if (classIndex == 0) {
@@ -48086,7 +48086,7 @@
sqInt fmt;
sqInt hasYoung;
sqInt i;
- sqInt newObj;
+ usqInt newObj;
usqInt newObj1;
usqInt numBytes;
usqInt numSlots;
@@ -62455,8 +62455,8 @@
sqInt prevPrevObj;
sqInt prevPrevObj1;
sqInt ptr;
- sqInt savedInHashes;
- sqInt savedOutHashes;
+ usqInt savedInHashes;
+ usqInt savedOutHashes;
sqInt segAddr;
sqInt segStart;
sqInt slotBytes;
@@ -62923,13 +62923,13 @@
/* Answer a new String copied from a null-terminated C string,
or nil if out of memory. */
-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;
@@ -63846,7 +63846,7 @@
sqInt largeChild;
sqInt newEndOfMemory;
sqInt next;
- usqInt node;
+ sqInt node;
SpurSegmentInfo *seg;
sqInt smallChild;
sqInt treeNode;
@@ -64158,7 +64158,7 @@
usqLong firstSavedBridgeWord;
sqInt nWritten;
usqInt pier1;
- sqInt pier2;
+ usqInt pier2;
usqLong secondSavedBridgeWord;
pier1 = (((segment->segSize)) + ((segment->segStart))) - (2 * BaseHeaderSize);
@@ -78753,7 +78753,7 @@
sqInt header1;
sqInt i;
sqInt methodHeader;
- usqInt numSlots;
+ sqInt numSlots;
usqInt numSlots1;
sqInt rcvr;
char *sp;
@@ -78809,9 +78809,9 @@
flag("endianness");
assert((classIndexOf(rcvr)) > (isForwardedObjectClassIndexPun()));
numSlots1 = byteAt(rcvr + 7);
- numSlots = (numSlots1 == 0xFF
- ? longAt(rcvr - BaseHeaderSize)
- : numSlots1);
+ numSlots = ((usqInt) ((numSlots1 == 0xFF
+ ? longAt(rcvr - BaseHeaderSize)
+ : numSlots1)));
}
}
else {
Modified: branches/Cog/nsspurstack64src/vm/gcc3x-interp.c
===================================================================
--- branches/Cog/nsspurstack64src/vm/gcc3x-interp.c 2015-05-10 16:24:15 UTC (rev 3325)
+++ branches/Cog/nsspurstack64src/vm/gcc3x-interp.c 2015-05-10 17:44:53 UTC (rev 3326)
@@ -2,11 +2,11 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1296 uuid: 264a71ca-50a1-4e84-96f4-dcb1c571859b
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1297 uuid: 1125d82b-1be0-4ed8-bdfa-9557c360bf1b
from
- StackInterpreter VMMaker.oscog-eem.1296 uuid: 264a71ca-50a1-4e84-96f4-dcb1c571859b
+ StackInterpreter VMMaker.oscog-eem.1297 uuid: 1125d82b-1be0-4ed8-bdfa-9557c360bf1b
*/
-static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1296 uuid: 264a71ca-50a1-4e84-96f4-dcb1c571859b " __DATE__ ;
+static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1297 uuid: 1125d82b-1be0-4ed8-bdfa-9557c360bf1b " __DATE__ ;
char *__interpBuildInfo = __buildInfo;
@@ -2149,7 +2149,7 @@
/* 575 */ (void (*)(void))0,
0 };
char expensiveAsserts = 0;
-const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscog-eem.1296";
+const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscog-eem.1297";
volatile int sendTrace;
sqInt suppressHeartbeatFlag;
Modified: branches/Cog/nsspurstack64src/vm/interp.c
===================================================================
--- branches/Cog/nsspurstack64src/vm/interp.c 2015-05-10 16:24:15 UTC (rev 3325)
+++ branches/Cog/nsspurstack64src/vm/interp.c 2015-05-10 17:44:53 UTC (rev 3326)
@@ -1,9 +1,9 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1296 uuid: 264a71ca-50a1-4e84-96f4-dcb1c571859b
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1297 uuid: 1125d82b-1be0-4ed8-bdfa-9557c360bf1b
from
- StackInterpreter VMMaker.oscog-eem.1296 uuid: 264a71ca-50a1-4e84-96f4-dcb1c571859b
+ StackInterpreter VMMaker.oscog-eem.1297 uuid: 1125d82b-1be0-4ed8-bdfa-9557c360bf1b
*/
-static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1296 uuid: 264a71ca-50a1-4e84-96f4-dcb1c571859b " __DATE__ ;
+static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1297 uuid: 1125d82b-1be0-4ed8-bdfa-9557c360bf1b " __DATE__ ;
char *__interpBuildInfo = __buildInfo;
@@ -2146,7 +2146,7 @@
/* 575 */ (void (*)(void))0,
0 };
char expensiveAsserts = 0;
-const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscog-eem.1296";
+const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscog-eem.1297";
volatile int sendTrace;
sqInt suppressHeartbeatFlag;
Modified: branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c
===================================================================
--- branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c 2015-05-10 16:24:15 UTC (rev 3325)
+++ branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c 2015-05-10 17:44:53 UTC (rev 3326)
@@ -2,11 +2,11 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1296 uuid: 264a71ca-50a1-4e84-96f4-dcb1c571859b
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1297 uuid: 1125d82b-1be0-4ed8-bdfa-9557c360bf1b
from
- StackInterpreter VMMaker.oscog-eem.1296 uuid: 264a71ca-50a1-4e84-96f4-dcb1c571859b
+ StackInterpreter VMMaker.oscog-eem.1297 uuid: 1125d82b-1be0-4ed8-bdfa-9557c360bf1b
*/
-static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1296 uuid: 264a71ca-50a1-4e84-96f4-dcb1c571859b " __DATE__ ;
+static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1297 uuid: 1125d82b-1be0-4ed8-bdfa-9557c360bf1b " __DATE__ ;
char *__interpBuildInfo = __buildInfo;
@@ -2120,7 +2120,7 @@
/* 575 */ (void (*)(void))0,
0 };
char expensiveAsserts = 0;
-const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscog-eem.1296";
+const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscog-eem.1297";
volatile int sendTrace;
sqInt suppressHeartbeatFlag;
Modified: branches/Cog/nsspurstacksrc/vm/interp.c
===================================================================
--- branches/Cog/nsspurstacksrc/vm/interp.c 2015-05-10 16:24:15 UTC (rev 3325)
+++ branches/Cog/nsspurstacksrc/vm/interp.c 2015-05-10 17:44:53 UTC (rev 3326)
@@ -1,9 +1,9 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1296 uuid: 264a71ca-50a1-4e84-96f4-dcb1c571859b
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1297 uuid: 1125d82b-1be0-4ed8-bdfa-9557c360bf1b
from
- StackInterpreter VMMaker.oscog-eem.1296 uuid: 264a71ca-50a1-4e84-96f4-dcb1c571859b
+ StackInterpreter VMMaker.oscog-eem.1297 uuid: 1125d82b-1be0-4ed8-bdfa-9557c360bf1b
*/
-static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1296 uuid: 264a71ca-50a1-4e84-96f4-dcb1c571859b " __DATE__ ;
+static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1297 uuid: 1125d82b-1be0-4ed8-bdfa-9557c360bf1b " __DATE__ ;
char *__interpBuildInfo = __buildInfo;
@@ -2117,7 +2117,7 @@
/* 575 */ (void (*)(void))0,
0 };
char expensiveAsserts = 0;
-const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscog-eem.1296";
+const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscog-eem.1297";
volatile int sendTrace;
sqInt suppressHeartbeatFlag;
Property changes on: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h
___________________________________________________________________
Modified: checkindate
- Sun May 10 09:19:27 PDT 2015
+ Sun May 10 10:44:23 PDT 2015
Modified: branches/Cog/spursistasrc/vm/cogit.h
===================================================================
--- branches/Cog/spursistasrc/vm/cogit.h 2015-05-10 16:24:15 UTC (rev 3325)
+++ branches/Cog/spursistasrc/vm/cogit.h 2015-05-10 17:44:53 UTC (rev 3326)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGenerator VMMaker.oscog-eem.1296 uuid: 264a71ca-50a1-4e84-96f4-dcb1c571859b
+ CCodeGenerator VMMaker.oscog-eem.1297 uuid: 1125d82b-1be0-4ed8-bdfa-9557c360bf1b
*/
Modified: branches/Cog/spursistasrc/vm/cointerp.c
===================================================================
--- branches/Cog/spursistasrc/vm/cointerp.c 2015-05-10 16:24:15 UTC (rev 3325)
+++ branches/Cog/spursistasrc/vm/cointerp.c 2015-05-10 17:44:53 UTC (rev 3326)
@@ -1,9 +1,9 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1296 uuid: 264a71ca-50a1-4e84-96f4-dcb1c571859b
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1297 uuid: 1125d82b-1be0-4ed8-bdfa-9557c360bf1b
from
- CoInterpreter VMMaker.oscog-eem.1296 uuid: 264a71ca-50a1-4e84-96f4-dcb1c571859b
+ CoInterpreter VMMaker.oscog-eem.1297 uuid: 1125d82b-1be0-4ed8-bdfa-9557c360bf1b
*/
-static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1296 uuid: 264a71ca-50a1-4e84-96f4-dcb1c571859b " __DATE__ ;
+static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1297 uuid: 1125d82b-1be0-4ed8-bdfa-9557c360bf1b " __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 VM [CoInterpreterPrimitives VMMaker.oscog-eem.1296]";
+const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreterPrimitives VMMaker.oscog-eem.1297]";
sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */;
volatile int sendTrace;
@@ -7005,7 +7005,7 @@
sqInt objOop2;
sqInt prim;
sqInt rcvr;
- sqInt result;
+ usqInt result;
sqInt result1;
sqInt result2;
sqLong result64;
@@ -7060,9 +7060,9 @@
flag("endianness");
assert((classIndexOf(objOop)) > (isForwardedObjectClassIndexPun()));
numSlots = byteAt(objOop + 7);
- result = ((usqInt) ((numSlots == 0xFF
- ? longAt(objOop - BaseHeaderSize)
- : numSlots)));
+ result = (numSlots == 0xFF
+ ? longAt(objOop - BaseHeaderSize)
+ : numSlots);
longAtPointerput(localSP, ((result << 1) | 1));
break;
case 2:
@@ -7085,18 +7085,18 @@
/* bytes (the common case), including CompiledMethod */
- result = numBytes - (fmt & 7);
+ result = ((sqInt) (numBytes - (fmt & 7)));
goto l11;
}
if (fmt <= 9) {
- result = numBytes;
+ result = ((sqInt) numBytes);
goto l11;
}
if (fmt >= 12) {
- result = numBytes - ((fmt & 3) << 1);
+ result = ((sqInt) (numBytes - ((fmt & 3) << 1)));
goto l11;
}
- result = numBytes - ((fmt & 1) << 2);
+ result = ((sqInt) (numBytes - ((fmt & 1) << 2)));
l11: /* end numBytesOf: */;
longAtPointerput(localSP, ((result << 1) | 1));
break;
@@ -14008,7 +14008,7 @@
sqInt objOop2;
sqInt prim;
sqInt rcvr;
- sqInt result;
+ usqInt result;
sqInt result1;
sqInt result2;
sqLong result64;
@@ -14063,9 +14063,9 @@
flag("endianness");
assert((classIndexOf(objOop)) > (isForwardedObjectClassIndexPun()));
numSlots = byteAt(objOop + 7);
- result = ((usqInt) ((numSlots == 0xFF
- ? longAt(objOop - BaseHeaderSize)
- : numSlots)));
+ result = (numSlots == 0xFF
+ ? longAt(objOop - BaseHeaderSize)
+ : numSlots);
longAtPointerput(localSP, ((result << 1) | 1));
break;
case 2:
@@ -14088,18 +14088,18 @@
/* bytes (the common case), including CompiledMethod */
- result = numBytes - (fmt & 7);
+ result = ((sqInt) (numBytes - (fmt & 7)));
goto l217;
}
if (fmt <= 9) {
- result = numBytes;
+ result = ((sqInt) numBytes);
goto l217;
}
if (fmt >= 12) {
- result = numBytes - ((fmt & 3) << 1);
+ result = ((sqInt) (numBytes - ((fmt & 3) << 1)));
goto l217;
}
- result = numBytes - ((fmt & 1) << 2);
+ result = ((sqInt) (numBytes - ((fmt & 1) << 2)));
l217: /* end numBytesOf: */;
longAtPointerput(localSP, ((result << 1) | 1));
break;
@@ -30371,7 +30371,7 @@
sqInt tagBits1;
instance = longAt(GIV(stackPointer));
- (argumentCount(assert())) == 0;
+ assert(GIV(argumentCount) == 0);
/* begin pop:thenPush: */
oop1 = (((tagBits1 = instance & 3)) != 0
? longAt((GIV(classTableFirstPage) + BaseHeaderSize) + (tagBits1 << (shiftForWord())))
@@ -31775,7 +31775,7 @@
sqInt arg;
sqInt fmt;
sqInt i;
- sqInt length;
+ usqInt length;
usqInt numBytes;
usqInt numSlots;
usqInt numSlots1;
@@ -31816,18 +31816,18 @@
/* bytes (the common case), including CompiledMethod */
- length = numBytes - (fmt & 7);
+ length = ((sqInt) (numBytes - (fmt & 7)));
goto l1;
}
if (fmt <= 9) {
- length = numBytes;
+ length = ((sqInt) numBytes);
goto l1;
}
if (fmt >= 12) {
- length = numBytes - ((fmt & 3) << 1);
+ length = ((sqInt) (numBytes - ((fmt & 3) << 1)));
goto l1;
}
- length = numBytes - ((fmt & 1) << 2);
+ length = ((sqInt) (numBytes - ((fmt & 1) << 2)));
l1: /* end numBytesOf: */;
if (!((((((usqInt) (longAt(rcvr))) >> 24) & 0x1F) == ((((usqInt) (longAt(arg))) >> 24) & 0x1F))
&& (length == (numBytesOf(arg))))) {
@@ -31845,9 +31845,9 @@
flag("endianness");
assert((classIndexOf(rcvr)) > (isForwardedObjectClassIndexPun()));
numSlots1 = byteAt(rcvr + 7);
- length = ((usqInt) ((numSlots1 == 0xFF
- ? longAt(rcvr - BaseHeaderSize)
- : numSlots1)));
+ length = (numSlots1 == 0xFF
+ ? longAt(rcvr - BaseHeaderSize)
+ : numSlots1);
if (!((isAppropriateForCopyObject(arg))
&& (length == (lengthOfformat(arg, (((usqInt) (longAt(arg))) >> 24) & 0x1F))))) {
(GIV(primFailCode) = PrimErrBadArgument);
@@ -57923,13 +57923,13 @@
sqInt obj21;
sqInt pigBytes;
usqInt prevFree;
- usqInt prevFreeChunk;
+ sqInt prevFreeChunk;
usqInt prevPrevFree;
- usqInt prevPrevFreeChunk;
+ sqInt prevPrevFreeChunk;
sqInt slotBytes;
sqInt slotBytes1;
usqInt there;
- usqInt thisFreeChunk;
+ sqInt thisFreeChunk;
sqInt usedChunk;
nextNext = 0;
@@ -62326,7 +62326,7 @@
bridgeFromto(SpurSegmentInfo *aSegment, SpurSegmentInfo *nextSegmentOrNil)
{
sqInt bridgeSpan;
- usqInt clifton;
+ sqInt clifton;
usqInt segEnd;
segEnd = ((aSegment->segSize)) + ((aSegment->segStart));
@@ -62869,7 +62869,7 @@
usqLong firstSavedBridgeWord;
sqInt nWritten;
usqInt pier1;
- usqInt pier2;
+ sqInt pier2;
usqLong secondSavedBridgeWord;
pier1 = (((segment->segSize)) + ((segment->segStart))) - (2 * BaseHeaderSize);
@@ -77407,7 +77407,7 @@
sqInt header1;
sqInt i;
sqInt methodHeader;
- sqInt numSlots;
+ usqInt numSlots;
usqInt numSlots1;
sqInt rcvr;
char *sp;
@@ -77463,9 +77463,9 @@
flag("endianness");
assert((classIndexOf(rcvr)) > (isForwardedObjectClassIndexPun()));
numSlots1 = byteAt(rcvr + 7);
- numSlots = ((usqInt) ((numSlots1 == 0xFF
- ? longAt(rcvr - BaseHeaderSize)
- : numSlots1)));
+ numSlots = (numSlots1 == 0xFF
+ ? longAt(rcvr - BaseHeaderSize)
+ : numSlots1);
}
}
else {
Modified: branches/Cog/spursistasrc/vm/cointerp.h
===================================================================
--- branches/Cog/spursistasrc/vm/cointerp.h 2015-05-10 16:24:15 UTC (rev 3325)
+++ branches/Cog/spursistasrc/vm/cointerp.h 2015-05-10 17:44:53 UTC (rev 3326)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1296 uuid: 264a71ca-50a1-4e84-96f4-dcb1c571859b
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1297 uuid: 1125d82b-1be0-4ed8-bdfa-9557c360bf1b
*/
Modified: branches/Cog/spursistasrc/vm/gcc3x-cointerp.c
===================================================================
--- branches/Cog/spursistasrc/vm/gcc3x-cointerp.c 2015-05-10 16:24:15 UTC (rev 3325)
+++ branches/Cog/spursistasrc/vm/gcc3x-cointerp.c 2015-05-10 17:44:53 UTC (rev 3326)
@@ -2,11 +2,11 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1296 uuid: 264a71ca-50a1-4e84-96f4-dcb1c571859b
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1297 uuid: 1125d82b-1be0-4ed8-bdfa-9557c360bf1b
from
- CoInterpreter VMMaker.oscog-eem.1296 uuid: 264a71ca-50a1-4e84-96f4-dcb1c571859b
+ CoInterpreter VMMaker.oscog-eem.1297 uuid: 1125d82b-1be0-4ed8-bdfa-9557c360bf1b
*/
-static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1296 uuid: 264a71ca-50a1-4e84-96f4-dcb1c571859b " __DATE__ ;
+static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1297 uuid: 1125d82b-1be0-4ed8-bdfa-9557c360bf1b " __DATE__ ;
char *__interpBuildInfo = __buildInfo;
@@ -2378,7 +2378,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 VM [CoInterpreterPrimitives VMMaker.oscog-eem.1296]";
+const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreterPrimitives VMMaker.oscog-eem.1297]";
sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */;
volatile int sendTrace;
@@ -7014,7 +7014,7 @@
sqInt objOop2;
sqInt prim;
sqInt rcvr;
- sqInt result;
+ usqInt result;
sqInt result1;
sqInt result2;
sqLong result64;
@@ -7069,9 +7069,9 @@
flag("endianness");
assert((classIndexOf(objOop)) > (isForwardedObjectClassIndexPun()));
numSlots = byteAt(objOop + 7);
- result = ((usqInt) ((numSlots == 0xFF
- ? longAt(objOop - BaseHeaderSize)
- : numSlots)));
+ result = (numSlots == 0xFF
+ ? longAt(objOop - BaseHeaderSize)
+ : numSlots);
longAtPointerput(localSP, ((result << 1) | 1));
break;
case 2:
@@ -7094,18 +7094,18 @@
/* bytes (the common case), including CompiledMethod */
- result = numBytes - (fmt & 7);
+ result = ((sqInt) (numBytes - (fmt & 7)));
goto l11;
}
if (fmt <= 9) {
- result = numBytes;
+ result = ((sqInt) numBytes);
goto l11;
}
if (fmt >= 12) {
- result = numBytes - ((fmt & 3) << 1);
+ result = ((sqInt) (numBytes - ((fmt & 3) << 1)));
goto l11;
}
- result = numBytes - ((fmt & 1) << 2);
+ result = ((sqInt) (numBytes - ((fmt & 1) << 2)));
l11: /* end numBytesOf: */;
longAtPointerput(localSP, ((result << 1) | 1));
break;
@@ -14017,7 +14017,7 @@
sqInt objOop2;
sqInt prim;
sqInt rcvr;
- sqInt result;
+ usqInt result;
sqInt result1;
sqInt result2;
sqLong result64;
@@ -14072,9 +14072,9 @@
flag("endianness");
assert((classIndexOf(objOop)) > (isForwardedObjectClassIndexPun()));
numSlots = byteAt(objOop + 7);
- result = ((usqInt) ((numSlots == 0xFF
- ? longAt(objOop - BaseHeaderSize)
- : numSlots)));
+ result = (numSlots == 0xFF
+ ? longAt(objOop - BaseHeaderSize)
+ : numSlots);
longAtPointerput(localSP, ((result << 1) | 1));
break;
case 2:
@@ -14097,18 +14097,18 @@
/* bytes (the common case), including CompiledMethod */
- result = numBytes - (fmt & 7);
+ result = ((sqInt) (numBytes - (fmt & 7)));
goto l217;
}
if (fmt <= 9) {
- result = numBytes;
+ result = ((sqInt) numBytes);
goto l217;
}
if (fmt >= 12) {
- result = numBytes - ((fmt & 3) << 1);
+ result = ((sqInt) (numBytes - ((fmt & 3) << 1)));
goto l217;
}
- result = numBytes - ((fmt & 1) << 2);
+ result = ((sqInt) (numBytes - ((fmt & 1) << 2)));
l217: /* end numBytesOf: */;
longAtPointerput(localSP, ((result << 1) | 1));
break;
@@ -30380,7 +30380,7 @@
sqInt tagBits1;
instance = longAt(GIV(stackPointer));
- (argumentCount(assert())) == 0;
+ assert(GIV(argumentCount) == 0);
/* begin pop:thenPush: */
oop1 = (((tagBits1 = instance & 3)) != 0
? longAt((GIV(classTableFirstPage) + BaseHeaderSize) + (tagBits1 << (shiftForWord())))
@@ -31784,7 +31784,7 @@
sqInt arg;
sqInt fmt;
sqInt i;
- sqInt length;
+ usqInt length;
usqInt numBytes;
usqInt numSlots;
usqInt numSlots1;
@@ -31825,18 +31825,18 @@
/* bytes (the common case), including CompiledMethod */
- length = numBytes - (fmt & 7);
+ length = ((sqInt) (numBytes - (fmt & 7)));
goto l1;
}
if (fmt <= 9) {
- length = numBytes;
+ length = ((sqInt) numBytes);
goto l1;
}
if (fmt >= 12) {
- length = numBytes - ((fmt & 3) << 1);
+ length = ((sqInt) (numBytes - ((fmt & 3) << 1)));
goto l1;
}
- length = numBytes - ((fmt & 1) << 2);
+ length = ((sqInt) (numBytes - ((fmt & 1) << 2)));
l1: /* end numBytesOf: */;
if (!((((((usqInt) (longAt(rcvr))) >> 24) & 0x1F) == ((((usqInt) (longAt(arg))) >> 24) & 0x1F))
&& (length == (numBytesOf(arg))))) {
@@ -31854,9 +31854,9 @@
flag("endianness");
assert((classIndexOf(rcvr)) > (isForwardedObjectClassIndexPun()));
numSlots1 = byteAt(rcvr + 7);
- length = ((usqInt) ((numSlots1 == 0xFF
- ? longAt(rcvr - BaseHeaderSize)
- : numSlots1)));
+ length = (numSlots1 == 0xFF
+ ? longAt(rcvr - BaseHeaderSize)
+ : numSlots1);
if (!((isAppropriateForCopyObject(arg))
&& (length == (lengthOfformat(arg, (((usqInt) (longAt(arg))) >> 24) & 0x1F))))) {
(GIV(primFailCode) = PrimErrBadArgument);
@@ -57932,13 +57932,13 @@
sqInt obj21;
sqInt pigBytes;
usqInt prevFree;
- usqInt prevFreeChunk;
+ sqInt prevFreeChunk;
usqInt prevPrevFree;
- usqInt prevPrevFreeChunk;
+ sqInt prevPrevFreeChunk;
sqInt slotBytes;
sqInt slotBytes1;
usqInt there;
- usqInt thisFreeChunk;
+ sqInt thisFreeChunk;
sqInt usedChunk;
nextNext = 0;
@@ -62335,7 +62335,7 @@
bridgeFromto(SpurSegmentInfo *aSegment, SpurSegmentInfo *nextSegmentOrNil)
{
sqInt bridgeSpan;
- usqInt clifton;
+ sqInt clifton;
usqInt segEnd;
segEnd = ((aSegment->segSize)) + ((aSegment->segStart));
@@ -62878,7 +62878,7 @@
usqLong firstSavedBridgeWord;
sqInt nWritten;
usqInt pier1;
- usqInt pier2;
+ sqInt pier2;
usqLong secondSavedBridgeWord;
pier1 = (((segment->segSize)) + ((segment->segStart))) - (2 * BaseHeaderSize);
@@ -77416,7 +77416,7 @@
sqInt header1;
sqInt i;
sqInt methodHeader;
- sqInt numSlots;
+ usqInt numSlots;
usqInt numSlots1;
sqInt rcvr;
char *sp;
@@ -77472,9 +77472,9 @@
flag("endianness");
assert((classIndexOf(rcvr)) > (isForwardedObjectClassIndexPun()));
numSlots1 = byteAt(rcvr + 7);
- numSlots = ((usqInt) ((numSlots1 == 0xFF
- ? longAt(rcvr - BaseHeaderSize)
- : numSlots1)));
+ numSlots = (numSlots1 == 0xFF
+ ? longAt(rcvr - BaseHeaderSize)
+ : numSlots1);
}
}
else {
Modified: branches/Cog/spursrc/vm/cogit.h
===================================================================
--- branches/Cog/spursrc/vm/cogit.h 2015-05-10 16:24:15 UTC (rev 3325)
+++ branches/Cog/spursrc/vm/cogit.h 2015-05-10 17:44:53 UTC (rev 3326)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGenerator VMMaker.oscog-eem.1296 uuid: 264a71ca-50a1-4e84-96f4-dcb1c571859b
+ CCodeGenerator VMMaker.oscog-eem.1297 uuid: 1125d82b-1be0-4ed8-bdfa-9557c360bf1b
*/
Modified: branches/Cog/spursrc/vm/cointerp.c
===================================================================
--- branches/Cog/spursrc/vm/cointerp.c 2015-05-10 16:24:15 UTC (rev 3325)
+++ branches/Cog/spursrc/vm/cointerp.c 2015-05-10 17:44:53 UTC (rev 3326)
@@ -1,9 +1,9 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1296 uuid: 264a71ca-50a1-4e84-96f4-dcb1c571859b
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1297 uuid: 1125d82b-1be0-4ed8-bdfa-9557c360bf1b
from
- CoInterpreter VMMaker.oscog-eem.1296 uuid: 264a71ca-50a1-4e84-96f4-dcb1c571859b
+ CoInterpreter VMMaker.oscog-eem.1297 uuid: 1125d82b-1be0-4ed8-bdfa-9557c360bf1b
*/
-static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1296 uuid: 264a71ca-50a1-4e84-96f4-dcb1c571859b " __DATE__ ;
+static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1297 uuid: 1125d82b-1be0-4ed8-bdfa-9557c360bf1b " __DATE__ ;
char *__interpBuildInfo = __buildInfo;
@@ -2363,7 +2363,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 VM [CoInterpreterPrimitives VMMaker.oscog-eem.1296]";
+const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreterPrimitives VMMaker.oscog-eem.1297]";
sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */;
volatile int sendTrace;
@@ -10281,7 +10281,7 @@
CogMethod *cogMethod;
sqInt methodField;
sqInt methodField1;
- sqInt theIP;
+ usqInt theIP;
assertl(GIV(stackPage) == (mostRecentlyUsedPage()), ln);
assertl(addressIsInPage(GIV(stackPage), lifp), ln);
@@ -24088,8 +24088,8 @@
sqInt totalLength1;
sqInt value;
sqInt value1;
- sqInt valueToStore;
- sqInt valueToStore1;
+ usqInt valueToStore;
+ usqInt valueToStore1;
/* begin commonAtPut: */
value = longAt(GIV(stackPointer));
@@ -25323,7 +25323,7 @@
sqInt tagBits1;
instance = longAt(GIV(stackPointer));
- (argumentCount(assert())) == 0;
+ assert(GIV(argumentCount) == 0);
/* begin pop:thenPush: */
oop1 = (((tagBits1 = instance & 3)) != 0
? longAt((GIV(classTableFirstPage) + BaseHeaderSize) + (tagBits1 << (shiftForWord())))
@@ -25407,7 +25407,7 @@
GIV(needGCFlag) = 1;
forceInterruptCheck();
}
- s = ((usqInt) (allocateSlotsInOldSpacebytesformatclassIndex(numSlots, numBytes, formatField, ClassByteStringCompactIndex)));
+ s = allocateSlotsInOldSpacebytesformatclassIndex(numSlots, numBytes, formatField, ClassByteStringCompactIndex);
goto l1;
}
if (numSlots >= 0xFF) {
@@ -26718,7 +26718,7 @@
sqInt arg;
sqInt fmt;
sqInt i;
- sqInt length;
+ usqInt length;
usqInt numBytes;
usqInt numSlots;
usqInt numSlots1;
@@ -26759,18 +26759,18 @@
/* bytes (the common case), including CompiledMethod */
- length = numBytes - (fmt & 7);
+ length = ((sqInt) (numBytes - (fmt & 7)));
goto l1;
}
if (fmt <= 9) {
- length = numBytes;
+ length = ((sqInt) numBytes);
goto l1;
}
if (fmt >= 12) {
- length = numBytes - ((fmt & 3) << 1);
+ length = ((sqInt) (numBytes - ((fmt & 3) << 1)));
goto l1;
}
- length = numBytes - ((fmt & 1) << 2);
+ length = ((sqInt) (numBytes - ((fmt & 1) << 2)));
l1: /* end numBytesOf: */;
if (!((((((usqInt) (longAt(rcvr))) >> 24) & 0x1F) == ((((usqInt) (longAt(arg))) >> 24) & 0x1F))
&& (length == (numBytesOf(arg))))) {
@@ -26788,9 +26788,9 @@
flag("endianness");
assert((classIndexOf(rcvr)) > (isForwardedObjectClassIndexPun()));
numSlots1 = byteAt(rcvr + 7);
- length = ((usqInt) ((numSlots1 == 0xFF
- ? longAt(rcvr - BaseHeaderSize)
- : numSlots1)));
+ length = (numSlots1 == 0xFF
+ ? longAt(rcvr - BaseHeaderSize)
+ : numSlots1);
if (!((isAppropriateForCopyObject(arg))
&& (length == (lengthOfformat(arg, (((usqInt) (longAt(arg))) >> 24) & 0x1F))))) {
(GIV(primFailCode) = PrimErrBadArgument);
@@ -30802,7 +30802,7 @@
sqInt err;
sqInt hash;
sqInt instSpec;
- usqInt newObj;
+ sqInt newObj;
usqInt newObj1;
usqInt numBytes;
sqInt numSlots;
@@ -30918,7 +30918,7 @@
sqInt i;
sqInt instSpec;
sqInt literalCount;
- usqInt newObj;
+ sqInt newObj;
usqInt newObj1;
usqInt numBytes;
sqInt numSlots;
@@ -34128,8 +34128,8 @@
sqInt totalLength1;
sqInt value;
sqInt value1;
- sqInt valueToStore;
- sqInt valueToStore1;
+ usqInt valueToStore;
+ usqInt valueToStore1;
/* begin commonAtPut: */
value = longAt(GIV(stackPointer));
@@ -36713,7 +36713,7 @@
sqInt fillValue;
sqInt hash;
sqInt instSpec;
- usqInt newObj;
+ sqInt newObj;
usqInt newObj1;
usqInt numBytes;
usqInt numSlots;
@@ -38797,7 +38797,7 @@
sqInt entry;
sqInt expectedIndex;
sqInt expectedIndex1;
- usqInt freeChunk;
+ sqInt freeChunk;
sqInt i;
sqInt i1;
sqInt index;
@@ -38836,8 +38836,8 @@
sqInt ptr1;
sqInt ptr2;
sqInt slotBytes;
- usqInt smallObj;
- usqInt start;
+ sqInt smallObj;
+ sqInt start;
classIndex = (long32At(aClass + 4)) & 0x3FFFFF;
if (classIndex == 0) {
@@ -41724,7 +41724,7 @@
sqInt fmt;
sqInt hasYoung;
sqInt i;
- usqInt newObj;
+ sqInt newObj;
usqInt newObj1;
usqInt numBytes;
usqInt numSlots;
@@ -52859,13 +52859,13 @@
sqInt obj21;
sqInt pigBytes;
usqInt prevFree;
- sqInt prevFreeChunk;
+ usqInt prevFreeChunk;
usqInt prevPrevFree;
- sqInt prevPrevFreeChunk;
+ usqInt prevPrevFreeChunk;
sqInt slotBytes;
sqInt slotBytes1;
usqInt there;
- sqInt thisFreeChunk;
+ usqInt thisFreeChunk;
sqInt usedChunk;
nextNext = 0;
@@ -56093,8 +56093,8 @@
sqInt prevPrevObj;
sqInt prevPrevObj1;
sqInt ptr;
- usqInt savedInHashes;
- usqInt savedOutHashes;
+ sqInt savedInHashes;
+ sqInt savedOutHashes;
sqInt segAddr;
sqInt segStart;
sqInt slotBytes;
@@ -56567,7 +56567,7 @@
sqInt formatField;
sqInt len;
usqInt newObj;
- usqInt newString;
+ sqInt newString;
usqInt numBytes;
sqInt numSlots;
@@ -57484,7 +57484,7 @@
sqInt largeChild;
sqInt newEndOfMemory;
sqInt next;
- sqInt node;
+ usqInt node;
SpurSegmentInfo *seg;
sqInt smallChild;
sqInt treeNode;
@@ -69021,7 +69021,7 @@
sqInt sp1;
sqInt stSize;
sqInt totalLength;
- sqInt valueToStore;
+ usqInt valueToStore;
hdr = long64At(array);
fmt = (((unsigned sqLong)hdr) >> 24) & 0x1F;
@@ -70284,8 +70284,8 @@
sqInt totalLength;
sqInt totalLength1;
sqInt value;
- sqInt valueToStore;
- sqInt valueToStore1;
+ usqInt valueToStore;
+ usqInt valueToStore1;
value = longAt(GIV(stackPointer));
index = longAt(GIV(stackPointer) + (1 * BytesPerWord));
@@ -72065,7 +72065,7 @@
sqInt rcvr;
char *sp;
sqInt totalLength;
- sqInt valueToStore;
+ usqInt valueToStore;
newValue = longAt(GIV(stackPointer));
/* begin stackIntegerValue: */
Modified: branches/Cog/spursrc/vm/cointerp.h
===================================================================
--- branches/Cog/spursrc/vm/cointerp.h 2015-05-10 16:24:15 UTC (rev 3325)
+++ branches/Cog/spursrc/vm/cointerp.h 2015-05-10 17:44:53 UTC (rev 3326)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1296 uuid: 264a71ca-50a1-4e84-96f4-dcb1c571859b
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1297 uuid: 1125d82b-1be0-4ed8-bdfa-9557c360bf1b
*/
Modified: branches/Cog/spursrc/vm/gcc3x-cointerp.c
===================================================================
--- branches/Cog/spursrc/vm/gcc3x-cointerp.c 2015-05-10 16:24:15 UTC (rev 3325)
+++ branches/Cog/spursrc/vm/gcc3x-cointerp.c 2015-05-10 17:44:53 UTC (rev 3326)
@@ -2,11 +2,11 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1296 uuid: 264a71ca-50a1-4e84-96f4-dcb1c571859b
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1297 uuid: 1125d82b-1be0-4ed8-bdfa-9557c360bf1b
from
- CoInterpreter VMMaker.oscog-eem.1296 uuid: 264a71ca-50a1-4e84-96f4-dcb1c571859b
+ CoInterpreter VMMaker.oscog-eem.1297 uuid: 1125d82b-1be0-4ed8-bdfa-9557c360bf1b
*/
-static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1296 uuid: 264a71ca-50a1-4e84-96f4-dcb1c571859b " __DATE__ ;
+static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1297 uuid: 1125d82b-1be0-4ed8-bdfa-9557c360bf1b " __DATE__ ;
char *__interpBuildInfo = __buildInfo;
@@ -2366,7 +2366,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 VM [CoInterpreterPrimitives VMMaker.oscog-eem.1296]";
+const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreterPrimitives VMMaker.oscog-eem.1297]";
sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */;
volatile int sendTrace;
@@ -10290,7 +10290,7 @@
CogMethod *cogMethod;
sqInt methodField;
sqInt methodField1;
- sqInt theIP;
+ usqInt theIP;
assertl(GIV(stackPage) == (mostRecentlyUsedPage()), ln);
assertl(addressIsInPage(GIV(stackPage), lifp), ln);
@@ -24097,8 +24097,8 @@
sqInt totalLength1;
sqInt value;
sqInt value1;
- sqInt valueToStore;
- sqInt valueToStore1;
+ usqInt valueToStore;
+ usqInt valueToStore1;
/* begin commonAtPut: */
value = longAt(GIV(stackPointer));
@@ -25332,7 +25332,7 @@
sqInt tagBits1;
instance = longAt(GIV(stackPointer));
- (argumentCount(assert())) == 0;
+ assert(GIV(argumentCount) == 0);
/* begin pop:thenPush: */
oop1 = (((tagBits1 = instance & 3)) != 0
? longAt((GIV(classTableFirstPage) + BaseHeaderSize) + (tagBits1 << (shiftForWord())))
@@ -25416,7 +25416,7 @@
GIV(needGCFlag) = 1;
forceInterruptCheck();
}
- s = ((usqInt) (allocateSlotsInOldSpacebytesformatclassIndex(numSlots, numBytes, formatField, ClassByteStringCompactIndex)));
+ s = allocateSlotsInOldSpacebytesformatclassIndex(numSlots, numBytes, formatField, ClassByteStringCompactIndex);
goto l1;
}
if (numSlots >= 0xFF) {
@@ -26727,7 +26727,7 @@
sqInt arg;
sqInt fmt;
sqInt i;
- sqInt length;
+ usqInt length;
usqInt numBytes;
usqInt numSlots;
usqInt numSlots1;
@@ -26768,18 +26768,18 @@
/* bytes (the common case), including CompiledMethod */
- length = numBytes - (fmt & 7);
+ length = ((sqInt) (numBytes - (fmt & 7)));
goto l1;
}
if (fmt <= 9) {
- length = numBytes;
+ length = ((sqInt) numBytes);
goto l1;
}
if (fmt >= 12) {
- length = numBytes - ((fmt & 3) << 1);
+ length = ((sqInt) (numBytes - ((fmt & 3) << 1)));
goto l1;
}
- length = numBytes - ((fmt & 1) << 2);
+ length = ((sqInt) (numBytes - ((fmt & 1) << 2)));
l1: /* end numBytesOf: */;
if (!((((((usqInt) (longAt(rcvr))) >> 24) & 0x1F) == ((((usqInt) (longAt(arg))) >> 24) & 0x1F))
&& (length == (numBytesOf(arg))))) {
@@ -26797,9 +26797,9 @@
flag("endianness");
assert((classIndexOf(rcvr)) > (isForwardedObjectClassIndexPun()));
numSlots1 = byteAt(rcvr + 7);
- length = ((usqInt) ((numSlots1 == 0xFF
- ? longAt(rcvr - BaseHeaderSize)
- : numSlots1)));
+ length = (numSlots1 == 0xFF
+ ? longAt(rcvr - BaseHeaderSize)
+ : numSlots1);
if (!((isAppropriateForCopyObject(arg))
&& (length == (lengthOfformat(arg, (((usqInt) (longAt(arg))) >> 24) & 0x1F))))) {
(GIV(primFailCode) = PrimErrBadArgument);
@@ -30811,7 +30811,7 @@
sqInt err;
sqInt hash;
sqInt instSpec;
- usqInt newObj;
+ sqInt newObj;
usqInt newObj1;
usqInt numBytes;
sqInt numSlots;
@@ -30927,7 +30927,7 @@
sqInt i;
sqInt instSpec;
sqInt literalCount;
- usqInt newObj;
+ sqInt newObj;
usqInt newObj1;
usqInt numBytes;
sqInt numSlots;
@@ -34137,8 +34137,8 @@
sqInt totalLength1;
sqInt value;
sqInt value1;
- sqInt valueToStore;
- sqInt valueToStore1;
+ usqInt valueToStore;
+ usqInt valueToStore1;
/* begin commonAtPut: */
value = longAt(GIV(stackPointer));
@@ -36722,7 +36722,7 @@
sqInt fillValue;
sqInt hash;
sqInt instSpec;
- usqInt newObj;
+ sqInt newObj;
usqInt newObj1;
usqInt numBytes;
usqInt numSlots;
@@ -38806,7 +38806,7 @@
sqInt entry;
sqInt expectedIndex;
sqInt expectedIndex1;
- usqInt freeChunk;
+ sqInt freeChunk;
sqInt i;
sqInt i1;
sqInt index;
@@ -38845,8 +38845,8 @@
sqInt ptr1;
sqInt ptr2;
sqInt slotBytes;
- usqInt smallObj;
- usqInt start;
+ sqInt smallObj;
+ sqInt start;
classIndex = (long32At(aClass + 4)) & 0x3FFFFF;
if (classIndex == 0) {
@@ -41733,7 +41733,7 @@
sqInt fmt;
sqInt hasYoung;
sqInt i;
- usqInt newObj;
+ sqInt newObj;
usqInt newObj1;
usqInt numBytes;
usqInt numSlots;
@@ -52868,13 +52868,13 @@
sqInt obj21;
sqInt pigBytes;
usqInt prevFree;
- sqInt prevFreeChunk;
+ usqInt prevFreeChunk;
usqInt prevPrevFree;
- sqInt prevPrevFreeChunk;
+ usqInt prevPrevFreeChunk;
sqInt slotBytes;
sqInt slotBytes1;
usqInt there;
- sqInt thisFreeChunk;
+ usqInt thisFreeChunk;
sqInt usedChunk;
nextNext = 0;
@@ -56102,8 +56102,8 @@
sqInt prevPrevObj;
sqInt prevPrevObj1;
sqInt ptr;
- usqInt savedInHashes;
- usqInt savedOutHashes;
+ sqInt savedInHashes;
+ sqInt savedOutHashes;
sqInt segAddr;
sqInt segStart;
sqInt slotBytes;
@@ -56576,7 +56576,7 @@
sqInt formatField;
sqInt len;
usqInt newObj;
- usqInt newString;
+ sqInt newString;
usqInt numBytes;
sqInt numSlots;
@@ -57493,7 +57493,7 @@
sqInt largeChild;
sqInt newEndOfMemory;
sqInt next;
- sqInt node;
+ usqInt node;
SpurSegmentInfo *seg;
sqInt smallChild;
sqInt treeNode;
@@ -69030,7 +69030,7 @@
sqInt sp1;
sqInt stSize;
sqInt totalLength;
- sqInt valueToStore;
+ usqInt valueToStore;
hdr = long64At(array);
fmt = (((unsigned sqLong)hdr) >> 24) & 0x1F;
@@ -70293,8 +70293,8 @@
sqInt totalLength;
sqInt totalLength1;
sqInt value;
- sqInt valueToStore;
- sqInt valueToStore1;
+ usqInt valueToStore;
+ usqInt valueToStore1;
value = longAt(GIV(stackPointer));
index = longAt(GIV(stackPointer) + (1 * BytesPerWord));
@@ -72074,7 +72074,7 @@
sqInt rcvr;
char *sp;
sqInt totalLength;
- sqInt valueToStore;
+ usqInt valueToStore;
newValue = longAt(GIV(stackPointer));
@@ Diff output truncated at 50000 characters. @@
More information about the Vm-dev
mailing list