[Vm-dev] [commit][3287] CogVM source as per VMMaker.oscog-eem.1117
commits at squeakvm.org
commits at squeakvm.org
Wed Mar 25 00:18:39 UTC 2015
Revision: 3287
Author: eliot
Date: 2015-03-24 17:18:37 -0700 (Tue, 24 Mar 2015)
Log Message:
-----------
CogVM source as per VMMaker.oscog-eem.1117
Fix initialization of numPushNilsFunction and
pushNilSizeFunction in Newspeak Spur VMs.
Fix an assert in SpurSegmentManager>>insertSegmentFor:
Modified Paths:
--------------
branches/Cog/nsspursrc/vm/cogit.c
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/nsspurstacksrc/vm/gcc3x-interp.c
branches/Cog/nsspurstacksrc/vm/interp.c
branches/Cog/sistasrc/vm/cogit.c
branches/Cog/sistasrc/vm/cogit.h
branches/Cog/spursistasrc/vm/cogit.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.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.c
branches/Cog/src/vm/cogit.h
Property Changed:
----------------
branches/Cog/platforms/Cross/vm/sqSCCSVersion.h
Modified: branches/Cog/nsspursrc/vm/cogit.c
===================================================================
--- branches/Cog/nsspursrc/vm/cogit.c 2015-03-24 02:11:16 UTC (rev 3286)
+++ branches/Cog/nsspursrc/vm/cogit.c 2015-03-25 00:18:37 UTC (rev 3287)
@@ -1,9 +1,9 @@
/* Automatically generated by
- CCodeGenerator VMMaker.oscog-eem.1111 uuid: d49aabf6-9652-4eaf-b08d-0ccddc9c9146
+ CCodeGenerator VMMaker.oscog-eem.1117 uuid: 71e6dd3b-c884-47ec-a004-bce9fe9517c5
from
- StackToRegisterMappingCogit VMMaker.oscog-eem.1111 uuid: d49aabf6-9652-4eaf-b08d-0ccddc9c9146
+ StackToRegisterMappingCogit VMMaker.oscog-eem.1117 uuid: 71e6dd3b-c884-47ec-a004-bce9fe9517c5
*/
-static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1111 uuid: d49aabf6-9652-4eaf-b08d-0ccddc9c9146 " __DATE__ ;
+static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1117 uuid: 71e6dd3b-c884-47ec-a004-bce9fe9517c5 " __DATE__ ;
char *__cogitBuildInfo = __buildInfo;
@@ -1088,8 +1088,8 @@
static CogSimStackEntry ssTopDescriptor(void);
static CogSimStackEntry * ssValue(sqInt n) NoDbgRegParms;
static sqInt tryCollapseTempVectorInitializationOfSize(sqInt slots) NoDbgRegParms;
-static sqInt v3PushNilSize(sqInt aMethodObj) NoDbgRegParms;
-static sqInt v3NumPushNils(BytecodeDescriptor *descriptor, sqInt pc, sqInt nExts, sqInt aMethodObj) NoDbgRegParms;
+static sqInt v3or4PushNilSize(sqInt aMethodObj) NoDbgRegParms;
+static sqInt v3or4NumPushNils(BytecodeDescriptor *descriptor, sqInt pc, sqInt nExts, sqInt aMethodObj) NoDbgRegParms;
static sqInt oopisGreaterThanOrEqualTo(sqInt anOop, sqInt otherOop) NoDbgRegParms;
static sqInt oopisGreaterThanOrEqualToandLessThan(sqInt anOop, sqInt baseOop, sqInt limitOop) NoDbgRegParms;
static sqInt oopisGreaterThan(sqInt anOop, sqInt otherOop) NoDbgRegParms;
@@ -18371,7 +18371,7 @@
sqInt initialIndexOfIRC;
sqInt initialOpcodeIndex;
sqInt initialStackPtr;
- sqInt (* const pushNilSizeFunction)(sqInt) = v3PushNilSize;
+ sqInt (* const pushNilSizeFunction)(sqInt) = v3or4PushNilSize;
sqInt result;
sqInt savedNeedsFrame;
sqInt savedNumArgs;
@@ -22034,7 +22034,7 @@
sqInt framelessStackDelta;
sqInt nExts;
sqInt numPushNils;
- sqInt (* const numPushNilsFunction)(struct _BytecodeDescriptor *,sqInt,sqInt,sqInt) = v3NumPushNils;
+ sqInt (* const numPushNilsFunction)(struct _BytecodeDescriptor *,sqInt,sqInt,sqInt) = v3or4NumPushNils;
sqInt pc;
sqInt pushingNils;
@@ -22596,15 +22596,27 @@
}
static sqInt
-v3PushNilSize(sqInt aMethodObj)
+v3or4PushNilSize(sqInt aMethodObj)
{
- return 1;
+ return (methodUsesAlternateBytecodeSet(aMethodObj)
+ ? 3
+ : 1);
}
static sqInt
-v3NumPushNils(BytecodeDescriptor *descriptor, sqInt pc, sqInt nExts, sqInt aMethodObj)
+v3or4NumPushNils(BytecodeDescriptor *descriptor, sqInt pc, sqInt nExts, sqInt aMethodObj)
{
- return (((descriptor->generator)) == genPushConstantNilBytecode
+ sqInt numNils;
+
+ if (((numNils = (((descriptor->generator)) == genPushConstantNilBytecode
+ ? 1
+ : 0))) > 0) {
+ return numNils;
+ }
+ return ((((descriptor->generator)) == genExtPushPseudoVariableOrOuterBytecode)
+ && ((assert((fetchByteofObject(pc, aMethodObj)) == 77),
+ (nExts == 1)
+ && ((fetchByteofObject(pc - 1, aMethodObj)) == 2)))
? 1
: 0);
}
Modified: branches/Cog/nsspursrc/vm/cogit.h
===================================================================
--- branches/Cog/nsspursrc/vm/cogit.h 2015-03-24 02:11:16 UTC (rev 3286)
+++ branches/Cog/nsspursrc/vm/cogit.h 2015-03-25 00:18:37 UTC (rev 3287)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGenerator VMMaker.oscog-eem.1111 uuid: d49aabf6-9652-4eaf-b08d-0ccddc9c9146
+ CCodeGenerator VMMaker.oscog-eem.1117 uuid: 71e6dd3b-c884-47ec-a004-bce9fe9517c5
*/
Modified: branches/Cog/nsspursrc/vm/cointerp.c
===================================================================
--- branches/Cog/nsspursrc/vm/cointerp.c 2015-03-24 02:11:16 UTC (rev 3286)
+++ branches/Cog/nsspursrc/vm/cointerp.c 2015-03-25 00:18:37 UTC (rev 3287)
@@ -1,9 +1,9 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1113 uuid: 9b08eea7-d3db-440f-ba64-16abc799fcf8
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1117 uuid: 71e6dd3b-c884-47ec-a004-bce9fe9517c5
from
- CoInterpreter VMMaker.oscog-eem.1113 uuid: 9b08eea7-d3db-440f-ba64-16abc799fcf8
+ CoInterpreter VMMaker.oscog-eem.1117 uuid: 71e6dd3b-c884-47ec-a004-bce9fe9517c5
*/
-static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1113 uuid: 9b08eea7-d3db-440f-ba64-16abc799fcf8 " __DATE__ ;
+static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1117 uuid: 71e6dd3b-c884-47ec-a004-bce9fe9517c5 " __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 = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.1113";
+const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.1117";
sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */;
volatile int sendTrace;
@@ -14206,7 +14206,7 @@
CogMethod *cogMethod;
sqInt methodField;
sqInt methodField1;
- sqInt theIP;
+ usqInt theIP;
assertl(GIV(stackPage) == (mostRecentlyUsedPage()), ln);
assertl(addressIsInPage(GIV(stackPage), lifp), ln);
@@ -22092,7 +22092,7 @@
int index;
sqInt methodField;
usqInt numArgs;
- usqInt numTemps;
+ sqInt numTemps;
char *rcvrAddress;
sqInt rcvrOrClosure;
sqInt theMethod;
@@ -22125,7 +22125,7 @@
numArgs = (cogMethod->cmNumArgs);
/* begin temporaryCountOfMethodHeader: */
header = (homeMethod->methodHeader);
- numTemps = ((sqInt) ((((usqInt) header) >> MethodHeaderTempCountShift) & 0x3F));
+ numTemps = (((usqInt) header) >> MethodHeaderTempCountShift) & 0x3F;
}
else {
theMethod = ((((usqInt)(longAt(theFP + FoxMethod)))) < (startOfMemory())
@@ -22145,7 +22145,7 @@
assert((((((CogMethod *) header2))->objectHeader)) == (nullHeaderForMachineCodeMethod()));
header1 = ((((CogMethod *) header2))->methodHeader);
}
- numTemps = ((sqInt) ((((usqInt) header1) >> MethodHeaderTempCountShift) & 0x3F));
+ numTemps = (((usqInt) header1) >> MethodHeaderTempCountShift) & 0x3F;
}
if (((((usqInt)(longAt(theFP + FoxMethod)))) < (startOfMemory())
? ((longAt(theFP + FoxMethod)) & MFMethodFlagIsBlockFlag) != 0
@@ -28392,8 +28392,8 @@
sqInt totalLength1;
sqInt value;
sqInt value1;
- usqInt valueToStore;
- usqInt valueToStore1;
+ sqInt valueToStore;
+ sqInt valueToStore1;
/* begin commonAtPut: */
value = longAt(GIV(stackPointer));
@@ -31011,7 +31011,7 @@
sqInt arg;
sqInt fmt;
sqInt i;
- usqInt length;
+ sqInt length;
usqInt numBytes;
usqInt numSlots;
usqInt numSlots1;
@@ -31052,18 +31052,18 @@
/* bytes (the common case), including CompiledMethod */
- length = ((sqInt) (numBytes - (fmt & 7)));
+ length = numBytes - (fmt & 7);
goto l1;
}
if (fmt <= 9) {
- length = ((sqInt) numBytes);
+ length = numBytes;
goto l1;
}
if (fmt >= 12) {
- length = ((sqInt) (numBytes - ((fmt & 3) << 1)));
+ length = numBytes - ((fmt & 3) << 1);
goto l1;
}
- length = ((sqInt) (numBytes - ((fmt & 1) << 2)));
+ length = numBytes - ((fmt & 1) << 2);
l1: /* end numBytesOf: */;
if (!((((((usqInt) (longAt(rcvr))) >> 24) & 0x1F) == ((((usqInt) (longAt(arg))) >> 24) & 0x1F))
&& (length == (numBytesOf(arg))))) {
@@ -31081,9 +31081,9 @@
flag("endianness");
assert((classIndexOf(rcvr)) > (isForwardedObjectClassIndexPun()));
numSlots1 = byteAt(rcvr + 7);
- length = (numSlots1 == 0xFF
- ? longAt(rcvr - BaseHeaderSize)
- : numSlots1);
+ length = ((usqInt) ((numSlots1 == 0xFF
+ ? longAt(rcvr - BaseHeaderSize)
+ : numSlots1)));
if (!((isAppropriateForCopyObject(arg))
&& (length == (lengthOfformat(arg, (((usqInt) (longAt(arg))) >> 24) & 0x1F))))) {
(GIV(primFailCode) = PrimErrBadArgument);
@@ -38408,8 +38408,8 @@
sqInt totalLength1;
sqInt value;
sqInt value1;
- usqInt valueToStore;
- usqInt valueToStore1;
+ sqInt valueToStore;
+ sqInt valueToStore1;
/* begin commonAtPut: */
value = longAt(GIV(stackPointer));
@@ -42891,7 +42891,7 @@
sqInt ptr2;
sqInt slotBytes;
usqInt smallObj;
- sqInt start;
+ usqInt start;
classIndex = (long32At(aClass + 4)) & 0x3FFFFF;
if (classIndex == 0) {
@@ -61053,7 +61053,7 @@
if (!(segAddress == null)) {
/* begin insertSegmentFor: */
segAddress1 = ((unsigned long)segAddress);
- assert(segAddress1 > (segLimit(&GIV(segments)[0])));
+ assert(segAddress1 >= (segLimit(&GIV(segments)[0])));
if (GIV(numSegments) == GIV(numSegInfos)) {
allocateOrExtendSegmentInfos();
}
@@ -61427,7 +61427,7 @@
sqInt largeChild;
sqInt newEndOfMemory;
sqInt next;
- sqInt node;
+ usqInt node;
SpurSegmentInfo *seg;
sqInt smallChild;
sqInt treeNode;
@@ -61738,7 +61738,7 @@
usqLong firstSavedBridgeWord;
sqInt nWritten;
usqInt pier1;
- sqInt pier2;
+ usqInt pier2;
usqLong secondSavedBridgeWord;
pier1 = (((segment->segSize)) + ((segment->segStart))) - (2 * BaseHeaderSize);
@@ -62243,7 +62243,7 @@
static sqInt
checkForAndFollowForwardedPrimitiveState(void)
{ DECL_MAYBE_SQ_GLOBAL_STRUCT
- signed char accessorDepth;
+ sqInt accessorDepth;
sqInt firstBytecode;
sqInt found;
sqInt header;
@@ -73032,7 +73032,7 @@
sqInt sp1;
sqInt stSize;
sqInt totalLength;
- usqInt valueToStore;
+ sqInt valueToStore;
hdr = long64At(array);
fmt = (((unsigned sqLong)hdr) >> 24) & 0x1F;
@@ -74295,8 +74295,8 @@
sqInt totalLength;
sqInt totalLength1;
sqInt value;
- usqInt valueToStore;
- usqInt valueToStore1;
+ sqInt valueToStore;
+ sqInt valueToStore1;
value = longAt(GIV(stackPointer));
index = longAt(GIV(stackPointer) + (1 * BytesPerWord));
@@ -76068,7 +76068,7 @@
sqInt rcvr;
char *sp;
sqInt totalLength;
- usqInt valueToStore;
+ sqInt valueToStore;
newValue = longAt(GIV(stackPointer));
/* begin stackIntegerValue: */
Modified: branches/Cog/nsspursrc/vm/cointerp.h
===================================================================
--- branches/Cog/nsspursrc/vm/cointerp.h 2015-03-24 02:11:16 UTC (rev 3286)
+++ branches/Cog/nsspursrc/vm/cointerp.h 2015-03-25 00:18:37 UTC (rev 3287)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1113 uuid: 9b08eea7-d3db-440f-ba64-16abc799fcf8
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1117 uuid: 71e6dd3b-c884-47ec-a004-bce9fe9517c5
*/
Modified: branches/Cog/nsspursrc/vm/gcc3x-cointerp.c
===================================================================
--- branches/Cog/nsspursrc/vm/gcc3x-cointerp.c 2015-03-24 02:11:16 UTC (rev 3286)
+++ branches/Cog/nsspursrc/vm/gcc3x-cointerp.c 2015-03-25 00:18:37 UTC (rev 3287)
@@ -2,11 +2,11 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1113 uuid: 9b08eea7-d3db-440f-ba64-16abc799fcf8
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1117 uuid: 71e6dd3b-c884-47ec-a004-bce9fe9517c5
from
- CoInterpreter VMMaker.oscog-eem.1113 uuid: 9b08eea7-d3db-440f-ba64-16abc799fcf8
+ CoInterpreter VMMaker.oscog-eem.1117 uuid: 71e6dd3b-c884-47ec-a004-bce9fe9517c5
*/
-static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1113 uuid: 9b08eea7-d3db-440f-ba64-16abc799fcf8 " __DATE__ ;
+static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1117 uuid: 71e6dd3b-c884-47ec-a004-bce9fe9517c5 " __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 = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.1113";
+const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.1117";
sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */;
volatile int sendTrace;
@@ -14215,7 +14215,7 @@
CogMethod *cogMethod;
sqInt methodField;
sqInt methodField1;
- sqInt theIP;
+ usqInt theIP;
assertl(GIV(stackPage) == (mostRecentlyUsedPage()), ln);
assertl(addressIsInPage(GIV(stackPage), lifp), ln);
@@ -22101,7 +22101,7 @@
int index;
sqInt methodField;
usqInt numArgs;
- usqInt numTemps;
+ sqInt numTemps;
char *rcvrAddress;
sqInt rcvrOrClosure;
sqInt theMethod;
@@ -22134,7 +22134,7 @@
numArgs = (cogMethod->cmNumArgs);
/* begin temporaryCountOfMethodHeader: */
header = (homeMethod->methodHeader);
- numTemps = ((sqInt) ((((usqInt) header) >> MethodHeaderTempCountShift) & 0x3F));
+ numTemps = (((usqInt) header) >> MethodHeaderTempCountShift) & 0x3F;
}
else {
theMethod = ((((usqInt)(longAt(theFP + FoxMethod)))) < (startOfMemory())
@@ -22154,7 +22154,7 @@
assert((((((CogMethod *) header2))->objectHeader)) == (nullHeaderForMachineCodeMethod()));
header1 = ((((CogMethod *) header2))->methodHeader);
}
- numTemps = ((sqInt) ((((usqInt) header1) >> MethodHeaderTempCountShift) & 0x3F));
+ numTemps = (((usqInt) header1) >> MethodHeaderTempCountShift) & 0x3F;
}
if (((((usqInt)(longAt(theFP + FoxMethod)))) < (startOfMemory())
? ((longAt(theFP + FoxMethod)) & MFMethodFlagIsBlockFlag) != 0
@@ -28401,8 +28401,8 @@
sqInt totalLength1;
sqInt value;
sqInt value1;
- usqInt valueToStore;
- usqInt valueToStore1;
+ sqInt valueToStore;
+ sqInt valueToStore1;
/* begin commonAtPut: */
value = longAt(GIV(stackPointer));
@@ -31020,7 +31020,7 @@
sqInt arg;
sqInt fmt;
sqInt i;
- usqInt length;
+ sqInt length;
usqInt numBytes;
usqInt numSlots;
usqInt numSlots1;
@@ -31061,18 +31061,18 @@
/* bytes (the common case), including CompiledMethod */
- length = ((sqInt) (numBytes - (fmt & 7)));
+ length = numBytes - (fmt & 7);
goto l1;
}
if (fmt <= 9) {
- length = ((sqInt) numBytes);
+ length = numBytes;
goto l1;
}
if (fmt >= 12) {
- length = ((sqInt) (numBytes - ((fmt & 3) << 1)));
+ length = numBytes - ((fmt & 3) << 1);
goto l1;
}
- length = ((sqInt) (numBytes - ((fmt & 1) << 2)));
+ length = numBytes - ((fmt & 1) << 2);
l1: /* end numBytesOf: */;
if (!((((((usqInt) (longAt(rcvr))) >> 24) & 0x1F) == ((((usqInt) (longAt(arg))) >> 24) & 0x1F))
&& (length == (numBytesOf(arg))))) {
@@ -31090,9 +31090,9 @@
flag("endianness");
assert((classIndexOf(rcvr)) > (isForwardedObjectClassIndexPun()));
numSlots1 = byteAt(rcvr + 7);
- length = (numSlots1 == 0xFF
- ? longAt(rcvr - BaseHeaderSize)
- : numSlots1);
+ length = ((usqInt) ((numSlots1 == 0xFF
+ ? longAt(rcvr - BaseHeaderSize)
+ : numSlots1)));
if (!((isAppropriateForCopyObject(arg))
&& (length == (lengthOfformat(arg, (((usqInt) (longAt(arg))) >> 24) & 0x1F))))) {
(GIV(primFailCode) = PrimErrBadArgument);
@@ -38417,8 +38417,8 @@
sqInt totalLength1;
sqInt value;
sqInt value1;
- usqInt valueToStore;
- usqInt valueToStore1;
+ sqInt valueToStore;
+ sqInt valueToStore1;
/* begin commonAtPut: */
value = longAt(GIV(stackPointer));
@@ -42900,7 +42900,7 @@
sqInt ptr2;
sqInt slotBytes;
usqInt smallObj;
- sqInt start;
+ usqInt start;
classIndex = (long32At(aClass + 4)) & 0x3FFFFF;
if (classIndex == 0) {
@@ -61062,7 +61062,7 @@
if (!(segAddress == null)) {
/* begin insertSegmentFor: */
segAddress1 = ((unsigned long)segAddress);
- assert(segAddress1 > (segLimit(&GIV(segments)[0])));
+ assert(segAddress1 >= (segLimit(&GIV(segments)[0])));
if (GIV(numSegments) == GIV(numSegInfos)) {
allocateOrExtendSegmentInfos();
}
@@ -61436,7 +61436,7 @@
sqInt largeChild;
sqInt newEndOfMemory;
sqInt next;
- sqInt node;
+ usqInt node;
SpurSegmentInfo *seg;
sqInt smallChild;
sqInt treeNode;
@@ -61747,7 +61747,7 @@
usqLong firstSavedBridgeWord;
sqInt nWritten;
usqInt pier1;
- sqInt pier2;
+ usqInt pier2;
usqLong secondSavedBridgeWord;
pier1 = (((segment->segSize)) + ((segment->segStart))) - (2 * BaseHeaderSize);
@@ -62252,7 +62252,7 @@
static sqInt
checkForAndFollowForwardedPrimitiveState(void)
{ DECL_MAYBE_SQ_GLOBAL_STRUCT
- signed char accessorDepth;
+ sqInt accessorDepth;
sqInt firstBytecode;
sqInt found;
sqInt header;
@@ -73041,7 +73041,7 @@
sqInt sp1;
sqInt stSize;
sqInt totalLength;
- usqInt valueToStore;
+ sqInt valueToStore;
hdr = long64At(array);
fmt = (((unsigned sqLong)hdr) >> 24) & 0x1F;
@@ -74304,8 +74304,8 @@
sqInt totalLength;
sqInt totalLength1;
sqInt value;
- usqInt valueToStore;
- usqInt valueToStore1;
+ sqInt valueToStore;
+ sqInt valueToStore1;
value = longAt(GIV(stackPointer));
index = longAt(GIV(stackPointer) + (1 * BytesPerWord));
@@ -76077,7 +76077,7 @@
sqInt rcvr;
char *sp;
sqInt totalLength;
- usqInt valueToStore;
+ sqInt valueToStore;
newValue = longAt(GIV(stackPointer));
/* begin stackIntegerValue: */
Modified: branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c
===================================================================
--- branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c 2015-03-24 02:11:16 UTC (rev 3286)
+++ branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c 2015-03-25 00:18:37 UTC (rev 3287)
@@ -2,11 +2,11 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1113 uuid: 9b08eea7-d3db-440f-ba64-16abc799fcf8
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1117 uuid: 71e6dd3b-c884-47ec-a004-bce9fe9517c5
from
- StackInterpreter VMMaker.oscog-eem.1113 uuid: 9b08eea7-d3db-440f-ba64-16abc799fcf8
+ StackInterpreter VMMaker.oscog-eem.1117 uuid: 71e6dd3b-c884-47ec-a004-bce9fe9517c5
*/
-static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1113 uuid: 9b08eea7-d3db-440f-ba64-16abc799fcf8 " __DATE__ ;
+static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1117 uuid: 71e6dd3b-c884-47ec-a004-bce9fe9517c5 " __DATE__ ;
char *__interpBuildInfo = __buildInfo;
@@ -2112,7 +2112,7 @@
/* 575 */ (void (*)(void))0,
0 };
char expensiveAsserts = 0;
-const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscog-eem.1113";
+const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscog-eem.1117";
volatile int sendTrace;
sqInt suppressHeartbeatFlag;
@@ -47178,7 +47178,7 @@
if (!(segAddress == null)) {
/* begin insertSegmentFor: */
segAddress1 = ((unsigned long)segAddress);
- assert(segAddress1 > (segLimit(&GIV(segments)[0])));
+ assert(segAddress1 >= (segLimit(&GIV(segments)[0])));
if (GIV(numSegments) == GIV(numSegInfos)) {
allocateOrExtendSegmentInfos();
}
Modified: branches/Cog/nsspurstacksrc/vm/interp.c
===================================================================
--- branches/Cog/nsspurstacksrc/vm/interp.c 2015-03-24 02:11:16 UTC (rev 3286)
+++ branches/Cog/nsspurstacksrc/vm/interp.c 2015-03-25 00:18:37 UTC (rev 3287)
@@ -1,9 +1,9 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1113 uuid: 9b08eea7-d3db-440f-ba64-16abc799fcf8
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1117 uuid: 71e6dd3b-c884-47ec-a004-bce9fe9517c5
from
- StackInterpreter VMMaker.oscog-eem.1113 uuid: 9b08eea7-d3db-440f-ba64-16abc799fcf8
+ StackInterpreter VMMaker.oscog-eem.1117 uuid: 71e6dd3b-c884-47ec-a004-bce9fe9517c5
*/
-static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1113 uuid: 9b08eea7-d3db-440f-ba64-16abc799fcf8 " __DATE__ ;
+static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1117 uuid: 71e6dd3b-c884-47ec-a004-bce9fe9517c5 " __DATE__ ;
char *__interpBuildInfo = __buildInfo;
@@ -2109,7 +2109,7 @@
/* 575 */ (void (*)(void))0,
0 };
char expensiveAsserts = 0;
-const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscog-eem.1113";
+const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscog-eem.1117";
volatile int sendTrace;
sqInt suppressHeartbeatFlag;
@@ -47169,7 +47169,7 @@
if (!(segAddress == null)) {
/* begin insertSegmentFor: */
segAddress1 = ((unsigned long)segAddress);
- assert(segAddress1 > (segLimit(&GIV(segments)[0])));
+ assert(segAddress1 >= (segLimit(&GIV(segments)[0])));
if (GIV(numSegments) == GIV(numSegInfos)) {
allocateOrExtendSegmentInfos();
}
Property changes on: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h
___________________________________________________________________
Modified: checkindate
- Mon Mar 23 13:03:39 PDT 2015
+ Tue Mar 24 17:18:19 PDT 2015
Modified: branches/Cog/sistasrc/vm/cogit.c
===================================================================
--- branches/Cog/sistasrc/vm/cogit.c 2015-03-24 02:11:16 UTC (rev 3286)
+++ branches/Cog/sistasrc/vm/cogit.c 2015-03-25 00:18:37 UTC (rev 3287)
@@ -1,9 +1,9 @@
/* Automatically generated by
- CCodeGenerator VMMaker.oscog-eem.1111 uuid: d49aabf6-9652-4eaf-b08d-0ccddc9c9146
+ CCodeGenerator VMMaker.oscog-eem.1117 uuid: 71e6dd3b-c884-47ec-a004-bce9fe9517c5
from
- SistaStackToRegisterMappingCogit VMMaker.oscog-eem.1111 uuid: d49aabf6-9652-4eaf-b08d-0ccddc9c9146
+ SistaStackToRegisterMappingCogit VMMaker.oscog-eem.1117 uuid: 71e6dd3b-c884-47ec-a004-bce9fe9517c5
*/
-static char __buildInfo[] = "SistaStackToRegisterMappingCogit VMMaker.oscog-eem.1111 uuid: d49aabf6-9652-4eaf-b08d-0ccddc9c9146 " __DATE__ ;
+static char __buildInfo[] = "SistaStackToRegisterMappingCogit VMMaker.oscog-eem.1117 uuid: 71e6dd3b-c884-47ec-a004-bce9fe9517c5 " __DATE__ ;
char *__cogitBuildInfo = __buildInfo;
@@ -1044,7 +1044,7 @@
static void initSimStackForFramefulMethod(sqInt startpc) NoDbgRegParms;
static void initSimStackForFramelessBlock(sqInt startpc) NoDbgRegParms;
static void initSimStackForFramelessMethod(sqInt startpc) NoDbgRegParms;
-static sqInt liveRegisters(void);
+static usqInt liveRegisters(void);
static void marshallSendArguments(sqInt numArgs) NoDbgRegParms;
static void mergeafterContinuation(BytecodeFixup *fixup, sqInt mergeWithContinuation) NoDbgRegParms;
static sqInt methodAbortTrampolineFor(sqInt numArgs) NoDbgRegParms;
@@ -20986,11 +20986,11 @@
simSpillBase = (simStackPtr = methodOrBlockNumArgs - 1);
}
-static sqInt
+static usqInt
liveRegisters(void)
{
sqInt i;
- sqInt regsSet;
+ usqInt regsSet;
if (needsFrame) {
regsSet = 0;
Modified: branches/Cog/sistasrc/vm/cogit.h
===================================================================
--- branches/Cog/sistasrc/vm/cogit.h 2015-03-24 02:11:16 UTC (rev 3286)
+++ branches/Cog/sistasrc/vm/cogit.h 2015-03-25 00:18:37 UTC (rev 3287)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGenerator VMMaker.oscog-eem.1111 uuid: d49aabf6-9652-4eaf-b08d-0ccddc9c9146
+ CCodeGenerator VMMaker.oscog-eem.1117 uuid: 71e6dd3b-c884-47ec-a004-bce9fe9517c5
*/
Modified: branches/Cog/spursistasrc/vm/cogit.c
===================================================================
--- branches/Cog/spursistasrc/vm/cogit.c 2015-03-24 02:11:16 UTC (rev 3286)
+++ branches/Cog/spursistasrc/vm/cogit.c 2015-03-25 00:18:37 UTC (rev 3287)
@@ -1,9 +1,9 @@
/* Automatically generated by
- CCodeGenerator VMMaker.oscog-eem.1111 uuid: d49aabf6-9652-4eaf-b08d-0ccddc9c9146
+ CCodeGenerator VMMaker.oscog-eem.1117 uuid: 71e6dd3b-c884-47ec-a004-bce9fe9517c5
from
- SistaStackToRegisterMappingCogit VMMaker.oscog-eem.1111 uuid: d49aabf6-9652-4eaf-b08d-0ccddc9c9146
+ SistaStackToRegisterMappingCogit VMMaker.oscog-eem.1117 uuid: 71e6dd3b-c884-47ec-a004-bce9fe9517c5
*/
-static char __buildInfo[] = "SistaStackToRegisterMappingCogit VMMaker.oscog-eem.1111 uuid: d49aabf6-9652-4eaf-b08d-0ccddc9c9146 " __DATE__ ;
+static char __buildInfo[] = "SistaStackToRegisterMappingCogit VMMaker.oscog-eem.1117 uuid: 71e6dd3b-c884-47ec-a004-bce9fe9517c5 " __DATE__ ;
char *__cogitBuildInfo = __buildInfo;
Modified: branches/Cog/spursistasrc/vm/cogit.h
===================================================================
--- branches/Cog/spursistasrc/vm/cogit.h 2015-03-24 02:11:16 UTC (rev 3286)
+++ branches/Cog/spursistasrc/vm/cogit.h 2015-03-25 00:18:37 UTC (rev 3287)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGenerator VMMaker.oscog-eem.1111 uuid: d49aabf6-9652-4eaf-b08d-0ccddc9c9146
+ CCodeGenerator VMMaker.oscog-eem.1117 uuid: 71e6dd3b-c884-47ec-a004-bce9fe9517c5
*/
Modified: branches/Cog/spursistasrc/vm/cointerp.c
===================================================================
--- branches/Cog/spursistasrc/vm/cointerp.c 2015-03-24 02:11:16 UTC (rev 3286)
+++ branches/Cog/spursistasrc/vm/cointerp.c 2015-03-25 00:18:37 UTC (rev 3287)
@@ -1,9 +1,9 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1113 uuid: 9b08eea7-d3db-440f-ba64-16abc799fcf8
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1117 uuid: 71e6dd3b-c884-47ec-a004-bce9fe9517c5
from
- CoInterpreter VMMaker.oscog-eem.1113 uuid: 9b08eea7-d3db-440f-ba64-16abc799fcf8
+ CoInterpreter VMMaker.oscog-eem.1117 uuid: 71e6dd3b-c884-47ec-a004-bce9fe9517c5
*/
-static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1113 uuid: 9b08eea7-d3db-440f-ba64-16abc799fcf8 " __DATE__ ;
+static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1117 uuid: 71e6dd3b-c884-47ec-a004-bce9fe9517c5 " __DATE__ ;
char *__interpBuildInfo = __buildInfo;
@@ -1171,7 +1171,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);
-usqInt stringForCString(const char *aCString);
+sqInt stringForCString(const char *aCString);
static sqInt sufficientSpaceAfterGC(sqInt numBytes) NoDbgRegParms;
static sqInt swizzleObjStackAt(sqInt objStackRootIndex) NoDbgRegParms;
void tenuringIncrementalGC(void);
@@ -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.1113]";
+const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreterPrimitives VMMaker.oscog-eem.1117]";
sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */;
volatile int sendTrace;
@@ -6986,7 +6986,7 @@
sqInt objOop2;
sqInt prim;
sqInt rcvr;
- sqInt result;
+ usqInt result;
sqInt result1;
sqInt result2;
sqLong result64;
@@ -7041,9 +7041,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:
@@ -7066,18 +7066,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;
@@ -13965,7 +13965,7 @@
sqInt objOop2;
sqInt prim;
sqInt rcvr;
- sqInt result;
+ usqInt result;
sqInt result1;
sqInt result2;
sqLong result64;
@@ -14020,9 +14020,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:
@@ -14045,18 +14045,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;
@@ -14815,7 +14815,7 @@
CogMethod *cogMethod;
sqInt methodField;
sqInt methodField1;
- sqInt theIP;
+ usqInt theIP;
assertl(GIV(stackPage) == (mostRecentlyUsedPage()), ln);
assertl(addressIsInPage(GIV(stackPage), lifp), ln);
@@ -30136,7 +30136,7 @@
GIV(needGCFlag) = 1;
forceInterruptCheck();
}
- s = ((usqInt) (allocateSlotsInOldSpacebytesformatclassIndex(numSlots, numBytes, formatField, ClassByteStringCompactIndex)));
+ s = allocateSlotsInOldSpacebytesformatclassIndex(numSlots, numBytes, formatField, ClassByteStringCompactIndex);
goto l1;
}
if (numSlots >= 0xFF) {
@@ -31452,7 +31452,7 @@
sqInt arg;
sqInt fmt;
sqInt i;
- sqInt length;
+ usqInt length;
usqInt numBytes;
usqInt numSlots;
usqInt numSlots1;
@@ -31493,18 +31493,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))))) {
@@ -31522,9 +31522,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);
@@ -35516,7 +35516,7 @@
sqInt err;
sqInt hash;
sqInt instSpec;
- usqInt newObj;
+ sqInt newObj;
usqInt newObj1;
usqInt numBytes;
sqInt numSlots;
@@ -35631,7 +35631,7 @@
sqInt i;
sqInt instSpec;
sqInt literalCount;
- usqInt newObj;
+ sqInt newObj;
usqInt newObj1;
usqInt numBytes;
sqInt numSlots;
@@ -41413,7 +41413,7 @@
sqInt fillValue;
sqInt hash;
sqInt instSpec;
- usqInt newObj;
+ sqInt newObj;
usqInt newObj1;
usqInt numBytes;
usqInt numSlots;
@@ -43282,7 +43282,7 @@
sqInt entry;
sqInt expectedIndex;
sqInt expectedIndex1;
- usqInt freeChunk;
+ sqInt freeChunk;
sqInt i;
sqInt i1;
sqInt index;
@@ -43321,7 +43321,7 @@
sqInt ptr1;
sqInt ptr2;
sqInt slotBytes;
- usqInt smallObj;
+ sqInt smallObj;
sqInt start;
classIndex = (long32At(aClass + 4)) & 0x3FFFFF;
@@ -46256,7 +46256,7 @@
sqInt fmt;
sqInt hasYoung;
sqInt i;
- usqInt newObj;
+ sqInt newObj;
usqInt newObj1;
usqInt numBytes;
usqInt numSlots;
@@ -57389,13 +57389,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;
sqInt valuePointer;
sqInt valuePointer1;
@@ -60469,8 +60469,8 @@
sqInt prevPrevObj;
sqInt prevPrevObj1;
sqInt ptr;
- usqInt savedInHashes;
- usqInt savedOutHashes;
+ sqInt savedInHashes;
+ sqInt savedOutHashes;
sqInt segAddr;
sqInt segStart;
sqInt slotBytes;
@@ -60937,13 +60937,13 @@
/* Answer a new String copied from a null-terminated C string,
or nil if out of memory. */
-usqInt
+sqInt
stringForCString(const char *aCString)
{ DECL_MAYBE_SQ_GLOBAL_STRUCT
sqInt formatField;
sqInt len;
usqInt newObj;
- usqInt newString;
+ sqInt newString;
usqInt numBytes;
sqInt numSlots;
@@ -61485,7 +61485,7 @@
if (!(segAddress == null)) {
/* begin insertSegmentFor: */
segAddress1 = ((unsigned long)segAddress);
- assert(segAddress1 > (segLimit(&GIV(segments)[0])));
+ assert(segAddress1 >= (segLimit(&GIV(segments)[0])));
if (GIV(numSegments) == GIV(numSegInfos)) {
allocateOrExtendSegmentInfos();
}
Modified: branches/Cog/spursistasrc/vm/cointerp.h
===================================================================
--- branches/Cog/spursistasrc/vm/cointerp.h 2015-03-24 02:11:16 UTC (rev 3286)
+++ branches/Cog/spursistasrc/vm/cointerp.h 2015-03-25 00:18:37 UTC (rev 3287)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1113 uuid: 9b08eea7-d3db-440f-ba64-16abc799fcf8
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1117 uuid: 71e6dd3b-c884-47ec-a004-bce9fe9517c5
*/
@@ -250,7 +250,7 @@
sqInt splObj(sqInt index);
usqInt storeCheckBoundary(void);
sqInt storePointerUncheckedofObjectwithValue(sqInt fieldIndex, sqInt objOop, sqInt valuePointer);
-usqInt stringForCString(const char *aCString);
+sqInt stringForCString(const char *aCString);
void tenuringIncrementalGC(void);
sqInt topRemappableOop(void);
sqInt validFreeTree(void);
Modified: branches/Cog/spursistasrc/vm/gcc3x-cointerp.c
===================================================================
--- branches/Cog/spursistasrc/vm/gcc3x-cointerp.c 2015-03-24 02:11:16 UTC (rev 3286)
+++ branches/Cog/spursistasrc/vm/gcc3x-cointerp.c 2015-03-25 00:18:37 UTC (rev 3287)
@@ -2,11 +2,11 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1113 uuid: 9b08eea7-d3db-440f-ba64-16abc799fcf8
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1117 uuid: 71e6dd3b-c884-47ec-a004-bce9fe9517c5
from
- CoInterpreter VMMaker.oscog-eem.1113 uuid: 9b08eea7-d3db-440f-ba64-16abc799fcf8
+ CoInterpreter VMMaker.oscog-eem.1117 uuid: 71e6dd3b-c884-47ec-a004-bce9fe9517c5
*/
-static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1113 uuid: 9b08eea7-d3db-440f-ba64-16abc799fcf8 " __DATE__ ;
+static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1117 uuid: 71e6dd3b-c884-47ec-a004-bce9fe9517c5 " __DATE__ ;
char *__interpBuildInfo = __buildInfo;
@@ -1174,7 +1174,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);
-usqInt stringForCString(const char *aCString);
+sqInt stringForCString(const char *aCString);
static sqInt sufficientSpaceAfterGC(sqInt numBytes) NoDbgRegParms;
static sqInt swizzleObjStackAt(sqInt objStackRootIndex) NoDbgRegParms;
void tenuringIncrementalGC(void);
@@ -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.1113]";
+const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreterPrimitives VMMaker.oscog-eem.1117]";
sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */;
volatile int sendTrace;
@@ -6995,7 +6995,7 @@
sqInt objOop2;
sqInt prim;
sqInt rcvr;
- sqInt result;
+ usqInt result;
sqInt result1;
sqInt result2;
sqLong result64;
@@ -7050,9 +7050,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:
@@ -7075,18 +7075,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;
@@ -13974,7 +13974,7 @@
sqInt objOop2;
sqInt prim;
sqInt rcvr;
- sqInt result;
+ usqInt result;
sqInt result1;
sqInt result2;
sqLong result64;
@@ -14029,9 +14029,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:
@@ -14054,18 +14054,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;
@@ -14824,7 +14824,7 @@
CogMethod *cogMethod;
sqInt methodField;
sqInt methodField1;
- sqInt theIP;
+ usqInt theIP;
assertl(GIV(stackPage) == (mostRecentlyUsedPage()), ln);
assertl(addressIsInPage(GIV(stackPage), lifp), ln);
@@ -30145,7 +30145,7 @@
GIV(needGCFlag) = 1;
forceInterruptCheck();
}
- s = ((usqInt) (allocateSlotsInOldSpacebytesformatclassIndex(numSlots, numBytes, formatField, ClassByteStringCompactIndex)));
+ s = allocateSlotsInOldSpacebytesformatclassIndex(numSlots, numBytes, formatField, ClassByteStringCompactIndex);
goto l1;
}
if (numSlots >= 0xFF) {
@@ -31461,7 +31461,7 @@
sqInt arg;
sqInt fmt;
sqInt i;
- sqInt length;
+ usqInt length;
usqInt numBytes;
usqInt numSlots;
usqInt numSlots1;
@@ -31502,18 +31502,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))))) {
@@ -31531,9 +31531,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);
@@ -35525,7 +35525,7 @@
sqInt err;
sqInt hash;
sqInt instSpec;
- usqInt newObj;
+ sqInt newObj;
usqInt newObj1;
usqInt numBytes;
sqInt numSlots;
@@ -35640,7 +35640,7 @@
sqInt i;
sqInt instSpec;
sqInt literalCount;
- usqInt newObj;
+ sqInt newObj;
usqInt newObj1;
usqInt numBytes;
sqInt numSlots;
@@ -41422,7 +41422,7 @@
sqInt fillValue;
sqInt hash;
sqInt instSpec;
- usqInt newObj;
+ sqInt newObj;
usqInt newObj1;
usqInt numBytes;
usqInt numSlots;
@@ -43291,7 +43291,7 @@
sqInt entry;
sqInt expectedIndex;
sqInt expectedIndex1;
- usqInt freeChunk;
+ sqInt freeChunk;
sqInt i;
sqInt i1;
sqInt index;
@@ -43330,7 +43330,7 @@
sqInt ptr1;
sqInt ptr2;
sqInt slotBytes;
- usqInt smallObj;
+ sqInt smallObj;
sqInt start;
classIndex = (long32At(aClass + 4)) & 0x3FFFFF;
@@ -46265,7 +46265,7 @@
sqInt fmt;
sqInt hasYoung;
sqInt i;
- usqInt newObj;
+ sqInt newObj;
usqInt newObj1;
usqInt numBytes;
usqInt numSlots;
@@ -57398,13 +57398,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;
sqInt valuePointer;
sqInt valuePointer1;
@@ -60478,8 +60478,8 @@
sqInt prevPrevObj;
sqInt prevPrevObj1;
sqInt ptr;
- usqInt savedInHashes;
- usqInt savedOutHashes;
+ sqInt savedInHashes;
+ sqInt savedOutHashes;
sqInt segAddr;
sqInt segStart;
sqInt slotBytes;
@@ -60946,13 +60946,13 @@
/* Answer a new String copied from a null-terminated C string,
or nil if out of memory. */
-usqInt
+sqInt
stringForCString(const char *aCString)
{ DECL_MAYBE_SQ_GLOBAL_STRUCT
sqInt formatField;
sqInt len;
usqInt newObj;
- usqInt newString;
+ sqInt newString;
usqInt numBytes;
sqInt numSlots;
@@ -61494,7 +61494,7 @@
if (!(segAddress == null)) {
/* begin insertSegmentFor: */
segAddress1 = ((unsigned long)segAddress);
- assert(segAddress1 > (segLimit(&GIV(segments)[0])));
+ assert(segAddress1 >= (segLimit(&GIV(segments)[0])));
if (GIV(numSegments) == GIV(numSegInfos)) {
allocateOrExtendSegmentInfos();
}
Modified: branches/Cog/spursrc/vm/cogit.c
===================================================================
--- branches/Cog/spursrc/vm/cogit.c 2015-03-24 02:11:16 UTC (rev 3286)
+++ branches/Cog/spursrc/vm/cogit.c 2015-03-25 00:18:37 UTC (rev 3287)
@@ -1,9 +1,9 @@
/* Automatically generated by
- CCodeGenerator VMMaker.oscog-eem.1111 uuid: d49aabf6-9652-4eaf-b08d-0ccddc9c9146
+ CCodeGenerator VMMaker.oscog-eem.1117 uuid: 71e6dd3b-c884-47ec-a004-bce9fe9517c5
from
- StackToRegisterMappingCogit VMMaker.oscog-eem.1111 uuid: d49aabf6-9652-4eaf-b08d-0ccddc9c9146
+ StackToRegisterMappingCogit VMMaker.oscog-eem.1117 uuid: 71e6dd3b-c884-47ec-a004-bce9fe9517c5
*/
-static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1111 uuid: d49aabf6-9652-4eaf-b08d-0ccddc9c9146 " __DATE__ ;
+static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1117 uuid: 71e6dd3b-c884-47ec-a004-bce9fe9517c5 " __DATE__ ;
char *__cogitBuildInfo = __buildInfo;
@@ -20116,7 +20116,7 @@
{
sqInt i;
sqInt lastRequired;
- sqInt liveRegs;
+ usqInt liveRegs;
/* compute live regs while noting the last occurrence of required regs.
Modified: branches/Cog/spursrc/vm/cogit.h
===================================================================
--- branches/Cog/spursrc/vm/cogit.h 2015-03-24 02:11:16 UTC (rev 3286)
+++ branches/Cog/spursrc/vm/cogit.h 2015-03-25 00:18:37 UTC (rev 3287)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGenerator VMMaker.oscog-eem.1111 uuid: d49aabf6-9652-4eaf-b08d-0ccddc9c9146
+ CCodeGenerator VMMaker.oscog-eem.1117 uuid: 71e6dd3b-c884-47ec-a004-bce9fe9517c5
*/
Modified: branches/Cog/spursrc/vm/cointerp.c
===================================================================
--- branches/Cog/spursrc/vm/cointerp.c 2015-03-24 02:11:16 UTC (rev 3286)
+++ branches/Cog/spursrc/vm/cointerp.c 2015-03-25 00:18:37 UTC (rev 3287)
@@ -1,9 +1,9 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1113 uuid: 9b08eea7-d3db-440f-ba64-16abc799fcf8
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1117 uuid: 71e6dd3b-c884-47ec-a004-bce9fe9517c5
from
- CoInterpreter VMMaker.oscog-eem.1113 uuid: 9b08eea7-d3db-440f-ba64-16abc799fcf8
+ CoInterpreter VMMaker.oscog-eem.1117 uuid: 71e6dd3b-c884-47ec-a004-bce9fe9517c5
*/
-static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1113 uuid: 9b08eea7-d3db-440f-ba64-16abc799fcf8 " __DATE__ ;
+static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1117 uuid: 71e6dd3b-c884-47ec-a004-bce9fe9517c5 " __DATE__ ;
char *__interpBuildInfo = __buildInfo;
@@ -129,7 +129,7 @@
#define ActiveProcessIndex 1
#define AlternateHeaderHasPrimFlag 0x20000
#define AlternateHeaderNumLiteralsMask 0x7FFF
-#define AltLongStoreBytecode 129
+#define AltLongStoreBytecode 234
#define AtCacheFixedFields 4
#define AtCacheFmt 3
#define AtCacheMask 0x1C
@@ -1162,7 +1162,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);
-usqInt stringForCString(const char *aCString);
+sqInt stringForCString(const char *aCString);
static sqInt sufficientSpaceAfterGC(sqInt numBytes) NoDbgRegParms;
static sqInt swizzleObjStackAt(sqInt objStackRootIndex) NoDbgRegParms;
void tenuringIncrementalGC(void);
@@ -2352,7 +2352,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.1113]";
+const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreterPrimitives VMMaker.oscog-eem.1117]";
sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */;
volatile int sendTrace;
@@ -6768,7 +6768,7 @@
usqInt newObj;
usqInt numBytes;
sqInt popValues;
- sqInt size;
+ usqInt size;
VM_LABEL(pushNewArrayBytecode);
size = byteAtPointer(++localIP);
@@ -10268,7 +10268,7 @@
CogMethod *cogMethod;
sqInt methodField;
sqInt methodField1;
- usqInt theIP;
+ sqInt theIP;
assertl(GIV(stackPage) == (mostRecentlyUsedPage()), ln);
assertl(addressIsInPage(GIV(stackPage), lifp), ln);
@@ -16960,7 +16960,7 @@
{ DECL_MAYBE_SQ_GLOBAL_STRUCT
sqInt currentClass;
sqInt dictionary;
- sqInt hash;
+ usqInt hash;
sqInt index;
usqInt length;
usqInt mask;
@@ -26641,7 +26641,7 @@
sqInt arg;
sqInt fmt;
sqInt i;
- sqInt length;
+ usqInt length;
usqInt numBytes;
usqInt numSlots;
usqInt numSlots1;
@@ -26682,18 +26682,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))))) {
@@ -26711,9 +26711,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);
@@ -29204,7 +29204,7 @@
static void
primitiveIdentityHash(void)
{ DECL_MAYBE_SQ_GLOBAL_STRUCT
- sqInt hash;
+ usqInt hash;
sqInt integerVal;
char *sp;
sqInt thisReceiver;
@@ -30820,7 +30820,7 @@
sqInt i;
sqInt instSpec;
sqInt literalCount;
- usqInt newObj;
+ sqInt newObj;
usqInt newObj1;
usqInt numBytes;
sqInt numSlots;
@@ -30895,7 +30895,7 @@
GIV(needGCFlag) = 1;
forceInterruptCheck();
}
- newObj = allocateSlotsInOldSpacebytesformatclassIndex(numSlots, numBytes, instSpec, classIndex);
+ newObj = ((usqInt) (allocateSlotsInOldSpacebytesformatclassIndex(numSlots, numBytes, instSpec, classIndex)));
goto l1;
}
if (numSlots >= 0xFF) {
@@ -32869,9 +32869,9 @@
primitiveSetIdentityHash(void)
{ DECL_MAYBE_SQ_GLOBAL_STRUCT
sqInt hash;
- sqInt hash1;
+ usqInt hash1;
sqInt integerPointer;
- sqInt oldHash;
+ usqInt oldHash;
sqInt oop;
char *sp;
sqInt thisReceiver;
@@ -38471,7 +38471,7 @@
sqInt entry;
sqInt expectedIndex;
sqInt expectedIndex1;
- usqInt freeChunk;
+ sqInt freeChunk;
sqInt i;
sqInt i1;
sqInt index;
@@ -38511,7 +38511,7 @@
sqInt ptr2;
sqInt slotBytes;
usqInt smallObj;
- usqInt start;
+ sqInt start;
classIndex = (long32At(aClass + 4)) & 0x3FFFFF;
if (classIndex == 0) {
@@ -38525,7 +38525,7 @@
GIV(needGCFlag) = 1;
@@ Diff output truncated at 50000 characters. @@
More information about the Vm-dev
mailing list