[Vm-dev] [commit][3059] CogVM source as per VMMaker.oscog-eem.843
commits at squeakvm.org
commits at squeakvm.org
Tue Aug 5 17:16:18 UTC 2014
Revision: 3059
Author: eliot
Date: 2014-08-05 10:16:14 -0700 (Tue, 05 Aug 2014)
Log Message:
-----------
CogVM source as per VMMaker.oscog-eem.843
Allow warnings to be treated as errors, adding -blockonwarn flag on Mac & Unix.
Modified Paths:
--------------
branches/Cog/nscogsrc/vm/cointerp.c
branches/Cog/nscogsrc/vm/cointerp.h
branches/Cog/nscogsrc/vm/gcc3x-cointerp.c
branches/Cog/nscogsrc/vm/interp.h
branches/Cog/nscogsrc/vm/vmCallback.h
branches/Cog/nsspursrc/vm/cointerp.c
branches/Cog/nsspursrc/vm/cointerp.h
branches/Cog/nsspursrc/vm/gcc3x-cointerp.c
branches/Cog/nsspursrc/vm/interp.h
branches/Cog/nsspursrc/vm/vmCallback.h
branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c
branches/Cog/nsspurstacksrc/vm/interp.c
branches/Cog/nsspurstacksrc/vm/interp.h
branches/Cog/nsspurstacksrc/vm/vmCallback.h
branches/Cog/platforms/Mac OS/vm/sqMacUnixCommandLineInterface.c
branches/Cog/platforms/unix/vm/sqUnixMain.c
branches/Cog/sistasrc/vm/cointerp.c
branches/Cog/sistasrc/vm/cointerp.h
branches/Cog/sistasrc/vm/gcc3x-cointerp.c
branches/Cog/sistasrc/vm/interp.h
branches/Cog/sistasrc/vm/vmCallback.h
branches/Cog/spursistasrc/vm/cointerp.c
branches/Cog/spursistasrc/vm/cointerp.h
branches/Cog/spursistasrc/vm/gcc3x-cointerp.c
branches/Cog/spursistasrc/vm/interp.h
branches/Cog/spursistasrc/vm/vmCallback.h
branches/Cog/spursrc/vm/cointerp.c
branches/Cog/spursrc/vm/cointerp.h
branches/Cog/spursrc/vm/gcc3x-cointerp.c
branches/Cog/spursrc/vm/interp.h
branches/Cog/spursrc/vm/vmCallback.h
branches/Cog/spurstacksrc/vm/gcc3x-interp.c
branches/Cog/spurstacksrc/vm/interp.c
branches/Cog/spurstacksrc/vm/interp.h
branches/Cog/spurstacksrc/vm/vmCallback.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/src/vm/interp.h
branches/Cog/src/vm/vmCallback.h
branches/Cog/stacksrc/vm/gcc3x-interp.c
branches/Cog/stacksrc/vm/interp.c
branches/Cog/stacksrc/vm/interp.h
branches/Cog/stacksrc/vm/vmCallback.h
Property Changed:
----------------
branches/Cog/platforms/Cross/vm/sqSCCSVersion.h
Modified: branches/Cog/nscogsrc/vm/cointerp.c
===================================================================
--- branches/Cog/nscogsrc/vm/cointerp.c 2014-08-05 02:15:28 UTC (rev 3058)
+++ branches/Cog/nscogsrc/vm/cointerp.c 2014-08-05 17:16:14 UTC (rev 3059)
@@ -1,9 +1,9 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.841 uuid: 6b9e05e0-8058-4d62-9349-faff621ab0e6
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.843 uuid: 5b054eac-e59e-46bd-a440-cc5ce9f9622b
from
- CoInterpreter VMMaker.oscog-eem.841 uuid: 6b9e05e0-8058-4d62-9349-faff621ab0e6
+ CoInterpreter VMMaker.oscog-eem.843 uuid: 5b054eac-e59e-46bd-a440-cc5ce9f9622b
*/
-static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.841 uuid: 6b9e05e0-8058-4d62-9349-faff621ab0e6 " __DATE__ ;
+static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.843 uuid: 5b054eac-e59e-46bd-a440-cc5ce9f9622b " __DATE__ ;
char *__interpBuildInfo = __buildInfo;
@@ -35,9 +35,10 @@
/* StackInterpreter class>>preambleCCode */
/* Disable Intel compiler inlining of warning which is used for breakpoints */
#pragma auto_inline off
-sqInt warnpid;
+sqInt warnpid, erroronwarn;
void
-warning(char *s) { /* Print an error message but don't exit. */
+warning(char *s) { /* Print an error message but don't necessarily exit. */
+ if (erroronwarn) error(s);
if (warnpid)
printf("\n%s pid %ld\n", s, (long)warnpid);
else
@@ -2082,7 +2083,7 @@
/* 574 */ (void (*)(void))0,
/* 575 */ (void (*)(void))0,
0 };
-const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.841";
+const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.843";
sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */;
volatile int sendTrace;
@@ -52571,7 +52572,7 @@
index = longAt(GIV(stackPointer));
if (!((index & 1))) {
- (GIV(primFailCode) = PrimErrBadArgument);
+ GIV(primFailCode) = PrimErrBadArgument;
return;
}
index = (index >> 1);
@@ -52736,7 +52737,7 @@
stSize = (sp1 >> 1);
l2: /* end fetchStackPointerOf: */;
if (!(((index >= 1) && (index <= stSize)))) {
- (GIV(primFailCode) = PrimErrBadIndex);
+ GIV(primFailCode) = PrimErrBadIndex;
return;
}
/* begin subscript:with:format: */
@@ -52761,7 +52762,7 @@
assert((senderOop & 1));
spouseFP = pointerForOop(senderOop - 1);
if (!(((index >= 1) && (index <= (stackPointerIndexForFrame(spouseFP)))))) {
- (GIV(primFailCode) = PrimErrBadIndex);
+ GIV(primFailCode) = PrimErrBadIndex;
return;
}
value = ((((usqInt)(longAt(spouseFP + FoxMethod)))) < (startOfMemory())
@@ -52822,7 +52823,7 @@
index = longAt(GIV(stackPointer) + (1 * BytesPerWord));
aContext = longAt(GIV(stackPointer) + (2 * BytesPerWord));
if (!((index & 1))) {
- (GIV(primFailCode) = PrimErrBadArgument);
+ GIV(primFailCode) = PrimErrBadArgument;
return;
}
hdr = longAt(aContext);
@@ -53006,7 +53007,7 @@
stSize = (sp1 >> 1);
l2: /* end fetchStackPointerOf: */;
if (!(((index >= 1) && (index <= stSize)))) {
- (GIV(primFailCode) = PrimErrBadIndex);
+ GIV(primFailCode) = PrimErrBadIndex;
return;
}
/* begin subscript:with:storing:format: */
@@ -53052,7 +53053,7 @@
assert((senderOop & 1));
spouseFP = pointerForOop(senderOop - 1);
if (!(((index >= 1) && (index <= (stackPointerIndexForFrame(spouseFP)))))) {
- (GIV(primFailCode) = PrimErrBadIndex);
+ GIV(primFailCode) = PrimErrBadIndex;
return;
}
if ((((usqInt)(longAt(spouseFP + FoxMethod)))) < (startOfMemory())) {
@@ -54257,7 +54258,7 @@
assert(pageListIsWellFormed());
if (GIV(fullGCLock) > 0) {
- (GIV(primFailCode) = PrimErrInappropriate);
+ GIV(primFailCode) = PrimErrInappropriate;
return;
}
incrementalGC();
Modified: branches/Cog/nscogsrc/vm/cointerp.h
===================================================================
--- branches/Cog/nscogsrc/vm/cointerp.h 2014-08-05 02:15:28 UTC (rev 3058)
+++ branches/Cog/nscogsrc/vm/cointerp.h 2014-08-05 17:16:14 UTC (rev 3059)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.841 uuid: 6b9e05e0-8058-4d62-9349-faff621ab0e6
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.843 uuid: 5b054eac-e59e-46bd-a440-cc5ce9f9622b
*/
Modified: branches/Cog/nscogsrc/vm/gcc3x-cointerp.c
===================================================================
--- branches/Cog/nscogsrc/vm/gcc3x-cointerp.c 2014-08-05 02:15:28 UTC (rev 3058)
+++ branches/Cog/nscogsrc/vm/gcc3x-cointerp.c 2014-08-05 17:16:14 UTC (rev 3059)
@@ -2,11 +2,11 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.841 uuid: 6b9e05e0-8058-4d62-9349-faff621ab0e6
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.843 uuid: 5b054eac-e59e-46bd-a440-cc5ce9f9622b
from
- CoInterpreter VMMaker.oscog-eem.841 uuid: 6b9e05e0-8058-4d62-9349-faff621ab0e6
+ CoInterpreter VMMaker.oscog-eem.843 uuid: 5b054eac-e59e-46bd-a440-cc5ce9f9622b
*/
-static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.841 uuid: 6b9e05e0-8058-4d62-9349-faff621ab0e6 " __DATE__ ;
+static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.843 uuid: 5b054eac-e59e-46bd-a440-cc5ce9f9622b " __DATE__ ;
char *__interpBuildInfo = __buildInfo;
@@ -38,9 +38,10 @@
/* StackInterpreter class>>preambleCCode */
/* Disable Intel compiler inlining of warning which is used for breakpoints */
#pragma auto_inline off
-sqInt warnpid;
+sqInt warnpid, erroronwarn;
void
-warning(char *s) { /* Print an error message but don't exit. */
+warning(char *s) { /* Print an error message but don't necessarily exit. */
+ if (erroronwarn) error(s);
if (warnpid)
printf("\n%s pid %ld\n", s, (long)warnpid);
else
@@ -2085,7 +2086,7 @@
/* 574 */ (void (*)(void))0,
/* 575 */ (void (*)(void))0,
0 };
-const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.841";
+const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.843";
sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */;
volatile int sendTrace;
@@ -52580,7 +52581,7 @@
index = longAt(GIV(stackPointer));
if (!((index & 1))) {
- (GIV(primFailCode) = PrimErrBadArgument);
+ GIV(primFailCode) = PrimErrBadArgument;
return;
}
index = (index >> 1);
@@ -52745,7 +52746,7 @@
stSize = (sp1 >> 1);
l2: /* end fetchStackPointerOf: */;
if (!(((index >= 1) && (index <= stSize)))) {
- (GIV(primFailCode) = PrimErrBadIndex);
+ GIV(primFailCode) = PrimErrBadIndex;
return;
}
/* begin subscript:with:format: */
@@ -52770,7 +52771,7 @@
assert((senderOop & 1));
spouseFP = pointerForOop(senderOop - 1);
if (!(((index >= 1) && (index <= (stackPointerIndexForFrame(spouseFP)))))) {
- (GIV(primFailCode) = PrimErrBadIndex);
+ GIV(primFailCode) = PrimErrBadIndex;
return;
}
value = ((((usqInt)(longAt(spouseFP + FoxMethod)))) < (startOfMemory())
@@ -52831,7 +52832,7 @@
index = longAt(GIV(stackPointer) + (1 * BytesPerWord));
aContext = longAt(GIV(stackPointer) + (2 * BytesPerWord));
if (!((index & 1))) {
- (GIV(primFailCode) = PrimErrBadArgument);
+ GIV(primFailCode) = PrimErrBadArgument;
return;
}
hdr = longAt(aContext);
@@ -53015,7 +53016,7 @@
stSize = (sp1 >> 1);
l2: /* end fetchStackPointerOf: */;
if (!(((index >= 1) && (index <= stSize)))) {
- (GIV(primFailCode) = PrimErrBadIndex);
+ GIV(primFailCode) = PrimErrBadIndex;
return;
}
/* begin subscript:with:storing:format: */
@@ -53061,7 +53062,7 @@
assert((senderOop & 1));
spouseFP = pointerForOop(senderOop - 1);
if (!(((index >= 1) && (index <= (stackPointerIndexForFrame(spouseFP)))))) {
- (GIV(primFailCode) = PrimErrBadIndex);
+ GIV(primFailCode) = PrimErrBadIndex;
return;
}
if ((((usqInt)(longAt(spouseFP + FoxMethod)))) < (startOfMemory())) {
@@ -54266,7 +54267,7 @@
assert(pageListIsWellFormed());
if (GIV(fullGCLock) > 0) {
- (GIV(primFailCode) = PrimErrInappropriate);
+ GIV(primFailCode) = PrimErrInappropriate;
return;
}
incrementalGC();
Modified: branches/Cog/nscogsrc/vm/interp.h
===================================================================
--- branches/Cog/nscogsrc/vm/interp.h 2014-08-05 02:15:28 UTC (rev 3058)
+++ branches/Cog/nscogsrc/vm/interp.h 2014-08-05 17:16:14 UTC (rev 3059)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.841 uuid: 6b9e05e0-8058-4d62-9349-faff621ab0e6
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.843 uuid: 5b054eac-e59e-46bd-a440-cc5ce9f9622b
*/
#define VM_PROXY_MAJOR 1
Modified: branches/Cog/nscogsrc/vm/vmCallback.h
===================================================================
--- branches/Cog/nscogsrc/vm/vmCallback.h 2014-08-05 02:15:28 UTC (rev 3058)
+++ branches/Cog/nscogsrc/vm/vmCallback.h 2014-08-05 17:16:14 UTC (rev 3059)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.841 uuid: 6b9e05e0-8058-4d62-9349-faff621ab0e6
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.843 uuid: 5b054eac-e59e-46bd-a440-cc5ce9f9622b
*/
#define VM_CALLBACK_INC 1
Modified: branches/Cog/nsspursrc/vm/cointerp.c
===================================================================
--- branches/Cog/nsspursrc/vm/cointerp.c 2014-08-05 02:15:28 UTC (rev 3058)
+++ branches/Cog/nsspursrc/vm/cointerp.c 2014-08-05 17:16:14 UTC (rev 3059)
@@ -1,9 +1,9 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.841 uuid: 6b9e05e0-8058-4d62-9349-faff621ab0e6
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.843 uuid: 5b054eac-e59e-46bd-a440-cc5ce9f9622b
from
- CoInterpreter VMMaker.oscog-eem.841 uuid: 6b9e05e0-8058-4d62-9349-faff621ab0e6
+ CoInterpreter VMMaker.oscog-eem.843 uuid: 5b054eac-e59e-46bd-a440-cc5ce9f9622b
*/
-static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.841 uuid: 6b9e05e0-8058-4d62-9349-faff621ab0e6 " __DATE__ ;
+static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.843 uuid: 5b054eac-e59e-46bd-a440-cc5ce9f9622b " __DATE__ ;
char *__interpBuildInfo = __buildInfo;
@@ -35,9 +35,10 @@
/* StackInterpreter class>>preambleCCode */
/* Disable Intel compiler inlining of warning which is used for breakpoints */
#pragma auto_inline off
-sqInt warnpid;
+sqInt warnpid, erroronwarn;
void
-warning(char *s) { /* Print an error message but don't exit. */
+warning(char *s) { /* Print an error message but don't necessarily exit. */
+ if (erroronwarn) error(s);
if (warnpid)
printf("\n%s pid %ld\n", s, (long)warnpid);
else
@@ -2319,7 +2320,7 @@
/*540*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,
/*560*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, 0, 0, 0,-1,-1
};
-const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.841";
+const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.843";
sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */;
volatile int sendTrace;
@@ -5610,6 +5611,7 @@
GIV(framePointer) = localFP;
ceEnterCogCodePopReceiverReg();
+ null;
goto l290;
}
localIP = pointerForOop(longAt(localFP + FoxIFSavedIP));
@@ -5627,7 +5629,7 @@
/* begin fetchNextBytecode */
currentBytecode = (byteAtPointer(++localIP)) + GIV(bytecodeSetSelector);
- /* return self */
+ null;
l290: /* end baseFrameReturn */;
goto l289;
}
@@ -64579,7 +64581,7 @@
index = longAt(GIV(stackPointer));
if (!((index & 1))) {
- (GIV(primFailCode) = PrimErrBadArgument);
+ GIV(primFailCode) = PrimErrBadArgument;
return;
}
index = (index >> 1);
@@ -64796,7 +64798,7 @@
stSize = (sp1 >> 1);
l2: /* end fetchStackPointerOf: */;
if (!(((index >= 1) && (index <= stSize)))) {
- (GIV(primFailCode) = PrimErrBadIndex);
+ GIV(primFailCode) = PrimErrBadIndex;
return;
}
/* begin subscript:with:format: */
@@ -64821,7 +64823,7 @@
assert((senderOop & 1));
spouseFP = pointerForOop(senderOop - 1);
if (!(((index >= 1) && (index <= (stackPointerIndexForFrame(spouseFP)))))) {
- (GIV(primFailCode) = PrimErrBadIndex);
+ GIV(primFailCode) = PrimErrBadIndex;
return;
}
value = ((((usqInt)(longAt(spouseFP + FoxMethod)))) < (startOfMemory())
Modified: branches/Cog/nsspursrc/vm/cointerp.h
===================================================================
--- branches/Cog/nsspursrc/vm/cointerp.h 2014-08-05 02:15:28 UTC (rev 3058)
+++ branches/Cog/nsspursrc/vm/cointerp.h 2014-08-05 17:16:14 UTC (rev 3059)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.841 uuid: 6b9e05e0-8058-4d62-9349-faff621ab0e6
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.843 uuid: 5b054eac-e59e-46bd-a440-cc5ce9f9622b
*/
Modified: branches/Cog/nsspursrc/vm/gcc3x-cointerp.c
===================================================================
--- branches/Cog/nsspursrc/vm/gcc3x-cointerp.c 2014-08-05 02:15:28 UTC (rev 3058)
+++ branches/Cog/nsspursrc/vm/gcc3x-cointerp.c 2014-08-05 17:16:14 UTC (rev 3059)
@@ -2,11 +2,11 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.841 uuid: 6b9e05e0-8058-4d62-9349-faff621ab0e6
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.843 uuid: 5b054eac-e59e-46bd-a440-cc5ce9f9622b
from
- CoInterpreter VMMaker.oscog-eem.841 uuid: 6b9e05e0-8058-4d62-9349-faff621ab0e6
+ CoInterpreter VMMaker.oscog-eem.843 uuid: 5b054eac-e59e-46bd-a440-cc5ce9f9622b
*/
-static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.841 uuid: 6b9e05e0-8058-4d62-9349-faff621ab0e6 " __DATE__ ;
+static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.843 uuid: 5b054eac-e59e-46bd-a440-cc5ce9f9622b " __DATE__ ;
char *__interpBuildInfo = __buildInfo;
@@ -38,9 +38,10 @@
/* StackInterpreter class>>preambleCCode */
/* Disable Intel compiler inlining of warning which is used for breakpoints */
#pragma auto_inline off
-sqInt warnpid;
+sqInt warnpid, erroronwarn;
void
-warning(char *s) { /* Print an error message but don't exit. */
+warning(char *s) { /* Print an error message but don't necessarily exit. */
+ if (erroronwarn) error(s);
if (warnpid)
printf("\n%s pid %ld\n", s, (long)warnpid);
else
@@ -2322,7 +2323,7 @@
/*540*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,
/*560*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, 0, 0, 0,-1,-1
};
-const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.841";
+const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.843";
sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */;
volatile int sendTrace;
@@ -5619,6 +5620,7 @@
GIV(framePointer) = localFP;
ceEnterCogCodePopReceiverReg();
+ null;
goto l290;
}
localIP = pointerForOop(longAt(localFP + FoxIFSavedIP));
@@ -5636,7 +5638,7 @@
/* begin fetchNextBytecode */
currentBytecode = (byteAtPointer(++localIP)) + GIV(bytecodeSetSelector);
- /* return self */
+ null;
l290: /* end baseFrameReturn */;
goto l289;
}
@@ -64588,7 +64590,7 @@
index = longAt(GIV(stackPointer));
if (!((index & 1))) {
- (GIV(primFailCode) = PrimErrBadArgument);
+ GIV(primFailCode) = PrimErrBadArgument;
return;
}
index = (index >> 1);
@@ -64805,7 +64807,7 @@
stSize = (sp1 >> 1);
l2: /* end fetchStackPointerOf: */;
if (!(((index >= 1) && (index <= stSize)))) {
- (GIV(primFailCode) = PrimErrBadIndex);
+ GIV(primFailCode) = PrimErrBadIndex;
return;
}
/* begin subscript:with:format: */
@@ -64830,7 +64832,7 @@
assert((senderOop & 1));
spouseFP = pointerForOop(senderOop - 1);
if (!(((index >= 1) && (index <= (stackPointerIndexForFrame(spouseFP)))))) {
- (GIV(primFailCode) = PrimErrBadIndex);
+ GIV(primFailCode) = PrimErrBadIndex;
return;
}
value = ((((usqInt)(longAt(spouseFP + FoxMethod)))) < (startOfMemory())
Modified: branches/Cog/nsspursrc/vm/interp.h
===================================================================
--- branches/Cog/nsspursrc/vm/interp.h 2014-08-05 02:15:28 UTC (rev 3058)
+++ branches/Cog/nsspursrc/vm/interp.h 2014-08-05 17:16:14 UTC (rev 3059)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.841 uuid: 6b9e05e0-8058-4d62-9349-faff621ab0e6
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.843 uuid: 5b054eac-e59e-46bd-a440-cc5ce9f9622b
*/
#define VM_PROXY_MAJOR 1
Modified: branches/Cog/nsspursrc/vm/vmCallback.h
===================================================================
--- branches/Cog/nsspursrc/vm/vmCallback.h 2014-08-05 02:15:28 UTC (rev 3058)
+++ branches/Cog/nsspursrc/vm/vmCallback.h 2014-08-05 17:16:14 UTC (rev 3059)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.841 uuid: 6b9e05e0-8058-4d62-9349-faff621ab0e6
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.843 uuid: 5b054eac-e59e-46bd-a440-cc5ce9f9622b
*/
#define VM_CALLBACK_INC 1
Modified: branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c
===================================================================
--- branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c 2014-08-05 02:15:28 UTC (rev 3058)
+++ branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c 2014-08-05 17:16:14 UTC (rev 3059)
@@ -2,11 +2,11 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.841 uuid: 6b9e05e0-8058-4d62-9349-faff621ab0e6
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.843 uuid: 5b054eac-e59e-46bd-a440-cc5ce9f9622b
from
- StackInterpreter VMMaker.oscog-eem.841 uuid: 6b9e05e0-8058-4d62-9349-faff621ab0e6
+ StackInterpreter VMMaker.oscog-eem.843 uuid: 5b054eac-e59e-46bd-a440-cc5ce9f9622b
*/
-static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.841 uuid: 6b9e05e0-8058-4d62-9349-faff621ab0e6 " __DATE__ ;
+static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.843 uuid: 5b054eac-e59e-46bd-a440-cc5ce9f9622b " __DATE__ ;
char *__interpBuildInfo = __buildInfo;
@@ -34,9 +34,10 @@
/* StackInterpreter class>>preambleCCode */
/* Disable Intel compiler inlining of warning which is used for breakpoints */
#pragma auto_inline off
-sqInt warnpid;
+sqInt warnpid, erroronwarn;
void
-warning(char *s) { /* Print an error message but don't exit. */
+warning(char *s) { /* Print an error message but don't necessarily exit. */
+ if (erroronwarn) error(s);
if (warnpid)
printf("\n%s pid %ld\n", s, (long)warnpid);
else
@@ -2070,7 +2071,7 @@
0 };
char * breakSelector;
sqInt breakSelectorLength = -1;
-const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreter_VMMaker.oscog-eem.841";
+const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreter_VMMaker.oscog-eem.843";
volatile int sendTrace;
sqInt suppressHeartbeatFlag;
Modified: branches/Cog/nsspurstacksrc/vm/interp.c
===================================================================
--- branches/Cog/nsspurstacksrc/vm/interp.c 2014-08-05 02:15:28 UTC (rev 3058)
+++ branches/Cog/nsspurstacksrc/vm/interp.c 2014-08-05 17:16:14 UTC (rev 3059)
@@ -1,9 +1,9 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.841 uuid: 6b9e05e0-8058-4d62-9349-faff621ab0e6
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.843 uuid: 5b054eac-e59e-46bd-a440-cc5ce9f9622b
from
- StackInterpreter VMMaker.oscog-eem.841 uuid: 6b9e05e0-8058-4d62-9349-faff621ab0e6
+ StackInterpreter VMMaker.oscog-eem.843 uuid: 5b054eac-e59e-46bd-a440-cc5ce9f9622b
*/
-static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.841 uuid: 6b9e05e0-8058-4d62-9349-faff621ab0e6 " __DATE__ ;
+static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.843 uuid: 5b054eac-e59e-46bd-a440-cc5ce9f9622b " __DATE__ ;
char *__interpBuildInfo = __buildInfo;
@@ -31,9 +31,10 @@
/* StackInterpreter class>>preambleCCode */
/* Disable Intel compiler inlining of warning which is used for breakpoints */
#pragma auto_inline off
-sqInt warnpid;
+sqInt warnpid, erroronwarn;
void
-warning(char *s) { /* Print an error message but don't exit. */
+warning(char *s) { /* Print an error message but don't necessarily exit. */
+ if (erroronwarn) error(s);
if (warnpid)
printf("\n%s pid %ld\n", s, (long)warnpid);
else
@@ -2067,7 +2068,7 @@
0 };
char * breakSelector;
sqInt breakSelectorLength = -1;
-const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreter_VMMaker.oscog-eem.841";
+const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreter_VMMaker.oscog-eem.843";
volatile int sendTrace;
sqInt suppressHeartbeatFlag;
Modified: branches/Cog/nsspurstacksrc/vm/interp.h
===================================================================
--- branches/Cog/nsspurstacksrc/vm/interp.h 2014-08-05 02:15:28 UTC (rev 3058)
+++ branches/Cog/nsspurstacksrc/vm/interp.h 2014-08-05 17:16:14 UTC (rev 3059)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.841 uuid: 6b9e05e0-8058-4d62-9349-faff621ab0e6
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.843 uuid: 5b054eac-e59e-46bd-a440-cc5ce9f9622b
*/
#define VM_PROXY_MAJOR 1
Modified: branches/Cog/nsspurstacksrc/vm/vmCallback.h
===================================================================
--- branches/Cog/nsspurstacksrc/vm/vmCallback.h 2014-08-05 02:15:28 UTC (rev 3058)
+++ branches/Cog/nsspurstacksrc/vm/vmCallback.h 2014-08-05 17:16:14 UTC (rev 3059)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.841 uuid: 6b9e05e0-8058-4d62-9349-faff621ab0e6
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.843 uuid: 5b054eac-e59e-46bd-a440-cc5ce9f9622b
*/
#define VM_CALLBACK_INC 1
Property changes on: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h
___________________________________________________________________
Modified: checkindate
- Mon Aug 4 19:14:37 PDT 2014
+ Tue Aug 5 10:15:13 PDT 2014
Modified: branches/Cog/platforms/Mac OS/vm/sqMacUnixCommandLineInterface.c
===================================================================
--- branches/Cog/platforms/Mac OS/vm/sqMacUnixCommandLineInterface.c 2014-08-05 02:15:28 UTC (rev 3058)
+++ branches/Cog/platforms/Mac OS/vm/sqMacUnixCommandLineInterface.c 2014-08-05 17:16:14 UTC (rev 3059)
@@ -165,6 +165,11 @@
extern int blockOnError;
blockOnError = true;
return 1; }
+ else if (!strcmp(argv[0], "-blockonwarn")) {
+ extern int blockOnError;
+ extern sqInt erroronwarn;
+ erroronwarn = blockOnError = true;
+ return 1; }
else if (!strcmp(argv[0], "-timephases")) {
extern void printPhaseTime(int);
printPhaseTime(1);
@@ -329,6 +334,7 @@
printf(" -version print version information, then exit\n");
printf(" -blockonerror on error or segv block, not exit. useful for attaching gdb\n");
+ printf(" -blockonwarning on warning block, don't warn. useful for attaching gdb\n");
}
static void printUsageNotes(void)
Modified: branches/Cog/platforms/unix/vm/sqUnixMain.c
===================================================================
--- branches/Cog/platforms/unix/vm/sqUnixMain.c 2014-08-05 02:15:28 UTC (rev 3058)
+++ branches/Cog/platforms/unix/vm/sqUnixMain.c 2014-08-05 17:16:14 UTC (rev 3059)
@@ -904,6 +904,7 @@
}
int blockOnError = 0; /* to allow attaching gdb on fatal error */
+extern sqInt erroronwarn;
static void
block()
@@ -1355,6 +1356,7 @@
else if (!strcmp(argv[0], "-notimer")) { useItimer = 0; return 1; }
else if (!strcmp(argv[0], "-nohandlers")) { installHandlers= 0; return 1; }
else if (!strcmp(argv[0], "-blockonerror")) { blockOnError = 1; return 1; }
+ else if (!strcmp(argv[0], "-blockonwarn")) { erroronwarn = blockOnError = 1; return 1; }
else if (!strcmp(argv[0], "-timephases")) {
printPhaseTime(1);
return 1; }
@@ -1518,6 +1520,7 @@
printf(" -reportheadroom report unused stack headroom on exit\n");
#endif
printf(" -blockonerror on error or segv block, not exit. useful for attaching gdb\n");
+ printf(" -blockonwarning on warning block, don't warn. useful for attaching gdb\n");
#if 1
printf("Deprecated:\n");
# if !STACKVM
Modified: branches/Cog/sistasrc/vm/cointerp.c
===================================================================
--- branches/Cog/sistasrc/vm/cointerp.c 2014-08-05 02:15:28 UTC (rev 3058)
+++ branches/Cog/sistasrc/vm/cointerp.c 2014-08-05 17:16:14 UTC (rev 3059)
@@ -1,9 +1,9 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.841 uuid: 6b9e05e0-8058-4d62-9349-faff621ab0e6
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.843 uuid: 5b054eac-e59e-46bd-a440-cc5ce9f9622b
from
- CoInterpreter VMMaker.oscog-eem.841 uuid: 6b9e05e0-8058-4d62-9349-faff621ab0e6
+ CoInterpreter VMMaker.oscog-eem.843 uuid: 5b054eac-e59e-46bd-a440-cc5ce9f9622b
*/
-static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.841 uuid: 6b9e05e0-8058-4d62-9349-faff621ab0e6 " __DATE__ ;
+static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.843 uuid: 5b054eac-e59e-46bd-a440-cc5ce9f9622b " __DATE__ ;
char *__interpBuildInfo = __buildInfo;
@@ -35,9 +35,10 @@
/* StackInterpreter class>>preambleCCode */
/* Disable Intel compiler inlining of warning which is used for breakpoints */
#pragma auto_inline off
-sqInt warnpid;
+sqInt warnpid, erroronwarn;
void
-warning(char *s) { /* Print an error message but don't exit. */
+warning(char *s) { /* Print an error message but don't necessarily exit. */
+ if (erroronwarn) error(s);
if (warnpid)
printf("\n%s pid %ld\n", s, (long)warnpid);
else
@@ -2078,7 +2079,7 @@
/* 574 */ (void (*)(void))0,
/* 575 */ (void (*)(void))0,
0 };
-const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.841]";
+const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.843]";
sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */;
volatile int sendTrace;
@@ -54097,7 +54098,7 @@
assert(pageListIsWellFormed());
if (GIV(fullGCLock) > 0) {
- (GIV(primFailCode) = PrimErrInappropriate);
+ GIV(primFailCode) = PrimErrInappropriate;
return;
}
incrementalGC();
Modified: branches/Cog/sistasrc/vm/cointerp.h
===================================================================
--- branches/Cog/sistasrc/vm/cointerp.h 2014-08-05 02:15:28 UTC (rev 3058)
+++ branches/Cog/sistasrc/vm/cointerp.h 2014-08-05 17:16:14 UTC (rev 3059)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.841 uuid: 6b9e05e0-8058-4d62-9349-faff621ab0e6
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.843 uuid: 5b054eac-e59e-46bd-a440-cc5ce9f9622b
*/
Modified: branches/Cog/sistasrc/vm/gcc3x-cointerp.c
===================================================================
--- branches/Cog/sistasrc/vm/gcc3x-cointerp.c 2014-08-05 02:15:28 UTC (rev 3058)
+++ branches/Cog/sistasrc/vm/gcc3x-cointerp.c 2014-08-05 17:16:14 UTC (rev 3059)
@@ -2,11 +2,11 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.841 uuid: 6b9e05e0-8058-4d62-9349-faff621ab0e6
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.843 uuid: 5b054eac-e59e-46bd-a440-cc5ce9f9622b
from
- CoInterpreter VMMaker.oscog-eem.841 uuid: 6b9e05e0-8058-4d62-9349-faff621ab0e6
+ CoInterpreter VMMaker.oscog-eem.843 uuid: 5b054eac-e59e-46bd-a440-cc5ce9f9622b
*/
-static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.841 uuid: 6b9e05e0-8058-4d62-9349-faff621ab0e6 " __DATE__ ;
+static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.843 uuid: 5b054eac-e59e-46bd-a440-cc5ce9f9622b " __DATE__ ;
char *__interpBuildInfo = __buildInfo;
@@ -38,9 +38,10 @@
/* StackInterpreter class>>preambleCCode */
/* Disable Intel compiler inlining of warning which is used for breakpoints */
#pragma auto_inline off
-sqInt warnpid;
+sqInt warnpid, erroronwarn;
void
-warning(char *s) { /* Print an error message but don't exit. */
+warning(char *s) { /* Print an error message but don't necessarily exit. */
+ if (erroronwarn) error(s);
if (warnpid)
printf("\n%s pid %ld\n", s, (long)warnpid);
else
@@ -2081,7 +2082,7 @@
/* 574 */ (void (*)(void))0,
/* 575 */ (void (*)(void))0,
0 };
-const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.841]";
+const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.843]";
sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */;
volatile int sendTrace;
@@ -54106,7 +54107,7 @@
assert(pageListIsWellFormed());
if (GIV(fullGCLock) > 0) {
- (GIV(primFailCode) = PrimErrInappropriate);
+ GIV(primFailCode) = PrimErrInappropriate;
return;
}
incrementalGC();
Modified: branches/Cog/sistasrc/vm/interp.h
===================================================================
--- branches/Cog/sistasrc/vm/interp.h 2014-08-05 02:15:28 UTC (rev 3058)
+++ branches/Cog/sistasrc/vm/interp.h 2014-08-05 17:16:14 UTC (rev 3059)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.841 uuid: 6b9e05e0-8058-4d62-9349-faff621ab0e6
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.843 uuid: 5b054eac-e59e-46bd-a440-cc5ce9f9622b
*/
#define VM_PROXY_MAJOR 1
Modified: branches/Cog/sistasrc/vm/vmCallback.h
===================================================================
--- branches/Cog/sistasrc/vm/vmCallback.h 2014-08-05 02:15:28 UTC (rev 3058)
+++ branches/Cog/sistasrc/vm/vmCallback.h 2014-08-05 17:16:14 UTC (rev 3059)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.841 uuid: 6b9e05e0-8058-4d62-9349-faff621ab0e6
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.843 uuid: 5b054eac-e59e-46bd-a440-cc5ce9f9622b
*/
#define VM_CALLBACK_INC 1
Modified: branches/Cog/spursistasrc/vm/cointerp.c
===================================================================
--- branches/Cog/spursistasrc/vm/cointerp.c 2014-08-05 02:15:28 UTC (rev 3058)
+++ branches/Cog/spursistasrc/vm/cointerp.c 2014-08-05 17:16:14 UTC (rev 3059)
@@ -1,9 +1,9 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.841 uuid: 6b9e05e0-8058-4d62-9349-faff621ab0e6
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.843 uuid: 5b054eac-e59e-46bd-a440-cc5ce9f9622b
from
- CoInterpreter VMMaker.oscog-eem.841 uuid: 6b9e05e0-8058-4d62-9349-faff621ab0e6
+ CoInterpreter VMMaker.oscog-eem.843 uuid: 5b054eac-e59e-46bd-a440-cc5ce9f9622b
*/
-static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.841 uuid: 6b9e05e0-8058-4d62-9349-faff621ab0e6 " __DATE__ ;
+static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.843 uuid: 5b054eac-e59e-46bd-a440-cc5ce9f9622b " __DATE__ ;
char *__interpBuildInfo = __buildInfo;
@@ -35,9 +35,10 @@
/* StackInterpreter class>>preambleCCode */
/* Disable Intel compiler inlining of warning which is used for breakpoints */
#pragma auto_inline off
-sqInt warnpid;
+sqInt warnpid, erroronwarn;
void
-warning(char *s) { /* Print an error message but don't exit. */
+warning(char *s) { /* Print an error message but don't necessarily exit. */
+ if (erroronwarn) error(s);
if (warnpid)
printf("\n%s pid %ld\n", s, (long)warnpid);
else
@@ -1123,7 +1124,7 @@
sqInt removeGCRoot(sqInt *varLoc);
static void runLeakCheckerForFullGCexcludeUnmarkedNewSpaceObjsclassIndicesShouldBeValid(sqInt fullGCFlag, sqInt excludeUnmarkedNewSpaceObjs, sqInt classIndicesShouldBeValid) NoDbgRegParms;
static void scavengingGCTenuringIf(sqInt tenuringCriterion) NoDbgRegParms;
-static usqInt shortentoIndexableSize(sqInt objOop, sqInt indexableSize) NoDbgRegParms;
+static sqInt shortentoIndexableSize(sqInt objOop, sqInt indexableSize) NoDbgRegParms;
void shortPrintObjectsFromto(sqInt startAddress, sqInt endAddress);
sqInt shouldRemapObj(sqInt objOop);
sqInt shouldRemapOop(sqInt oop);
@@ -2316,7 +2317,7 @@
/*540*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,
/*560*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, 0, 0, 0,-1,-1
};
-const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.841]";
+const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.843]";
sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */;
volatile int sendTrace;
@@ -51589,7 +51590,7 @@
zero if no change
was possible. */
-static usqInt
+static sqInt
shortentoIndexableSize(sqInt objOop, sqInt indexableSize)
{
usqInt bytesAfter;
@@ -64568,7 +64569,7 @@
index = longAt(GIV(stackPointer) + (1 * BytesPerWord));
aContext = longAt(GIV(stackPointer) + (2 * BytesPerWord));
if (!((index & 1))) {
- GIV(primFailCode) = PrimErrBadArgument;
+ (GIV(primFailCode) = PrimErrBadArgument);
return;
}
hdr = long64At(aContext);
@@ -64814,7 +64815,7 @@
stSize = (sp1 >> 1);
l2: /* end fetchStackPointerOf: */;
if (!(((index >= 1) && (index <= stSize)))) {
- GIV(primFailCode) = PrimErrBadIndex;
+ (GIV(primFailCode) = PrimErrBadIndex);
return;
}
/* begin subscript:with:storing:format: */
@@ -64870,7 +64871,7 @@
assert((senderOop & 1));
spouseFP = pointerForOop(senderOop - 1);
if (!(((index >= 1) && (index <= (stackPointerIndexForFrame(spouseFP)))))) {
- GIV(primFailCode) = PrimErrBadIndex;
+ (GIV(primFailCode) = PrimErrBadIndex);
return;
}
if ((((usqInt)(longAt(spouseFP + FoxMethod)))) < (startOfMemory())) {
Modified: branches/Cog/spursistasrc/vm/cointerp.h
===================================================================
--- branches/Cog/spursistasrc/vm/cointerp.h 2014-08-05 02:15:28 UTC (rev 3058)
+++ branches/Cog/spursistasrc/vm/cointerp.h 2014-08-05 17:16:14 UTC (rev 3059)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.841 uuid: 6b9e05e0-8058-4d62-9349-faff621ab0e6
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.843 uuid: 5b054eac-e59e-46bd-a440-cc5ce9f9622b
*/
Modified: branches/Cog/spursistasrc/vm/gcc3x-cointerp.c
===================================================================
--- branches/Cog/spursistasrc/vm/gcc3x-cointerp.c 2014-08-05 02:15:28 UTC (rev 3058)
+++ branches/Cog/spursistasrc/vm/gcc3x-cointerp.c 2014-08-05 17:16:14 UTC (rev 3059)
@@ -2,11 +2,11 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.841 uuid: 6b9e05e0-8058-4d62-9349-faff621ab0e6
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.843 uuid: 5b054eac-e59e-46bd-a440-cc5ce9f9622b
from
- CoInterpreter VMMaker.oscog-eem.841 uuid: 6b9e05e0-8058-4d62-9349-faff621ab0e6
+ CoInterpreter VMMaker.oscog-eem.843 uuid: 5b054eac-e59e-46bd-a440-cc5ce9f9622b
*/
-static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.841 uuid: 6b9e05e0-8058-4d62-9349-faff621ab0e6 " __DATE__ ;
+static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.843 uuid: 5b054eac-e59e-46bd-a440-cc5ce9f9622b " __DATE__ ;
char *__interpBuildInfo = __buildInfo;
@@ -38,9 +38,10 @@
/* StackInterpreter class>>preambleCCode */
/* Disable Intel compiler inlining of warning which is used for breakpoints */
#pragma auto_inline off
-sqInt warnpid;
+sqInt warnpid, erroronwarn;
void
-warning(char *s) { /* Print an error message but don't exit. */
+warning(char *s) { /* Print an error message but don't necessarily exit. */
+ if (erroronwarn) error(s);
if (warnpid)
printf("\n%s pid %ld\n", s, (long)warnpid);
else
@@ -1126,7 +1127,7 @@
sqInt removeGCRoot(sqInt *varLoc);
static void runLeakCheckerForFullGCexcludeUnmarkedNewSpaceObjsclassIndicesShouldBeValid(sqInt fullGCFlag, sqInt excludeUnmarkedNewSpaceObjs, sqInt classIndicesShouldBeValid) NoDbgRegParms;
static void scavengingGCTenuringIf(sqInt tenuringCriterion) NoDbgRegParms;
-static usqInt shortentoIndexableSize(sqInt objOop, sqInt indexableSize) NoDbgRegParms;
+static sqInt shortentoIndexableSize(sqInt objOop, sqInt indexableSize) NoDbgRegParms;
void shortPrintObjectsFromto(sqInt startAddress, sqInt endAddress);
sqInt shouldRemapObj(sqInt objOop);
sqInt shouldRemapOop(sqInt oop);
@@ -2319,7 +2320,7 @@
/*540*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,
/*560*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, 0, 0, 0,-1,-1
};
-const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.841]";
+const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.843]";
sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */;
volatile int sendTrace;
@@ -51598,7 +51599,7 @@
zero if no change
was possible. */
-static usqInt
+static sqInt
shortentoIndexableSize(sqInt objOop, sqInt indexableSize)
{
usqInt bytesAfter;
@@ -64577,7 +64578,7 @@
index = longAt(GIV(stackPointer) + (1 * BytesPerWord));
aContext = longAt(GIV(stackPointer) + (2 * BytesPerWord));
if (!((index & 1))) {
- GIV(primFailCode) = PrimErrBadArgument;
+ (GIV(primFailCode) = PrimErrBadArgument);
return;
}
hdr = long64At(aContext);
@@ -64823,7 +64824,7 @@
stSize = (sp1 >> 1);
l2: /* end fetchStackPointerOf: */;
if (!(((index >= 1) && (index <= stSize)))) {
- GIV(primFailCode) = PrimErrBadIndex;
+ (GIV(primFailCode) = PrimErrBadIndex);
return;
}
/* begin subscript:with:storing:format: */
@@ -64879,7 +64880,7 @@
assert((senderOop & 1));
spouseFP = pointerForOop(senderOop - 1);
if (!(((index >= 1) && (index <= (stackPointerIndexForFrame(spouseFP)))))) {
- GIV(primFailCode) = PrimErrBadIndex;
+ (GIV(primFailCode) = PrimErrBadIndex);
return;
}
if ((((usqInt)(longAt(spouseFP + FoxMethod)))) < (startOfMemory())) {
Modified: branches/Cog/spursistasrc/vm/interp.h
===================================================================
--- branches/Cog/spursistasrc/vm/interp.h 2014-08-05 02:15:28 UTC (rev 3058)
+++ branches/Cog/spursistasrc/vm/interp.h 2014-08-05 17:16:14 UTC (rev 3059)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.841 uuid: 6b9e05e0-8058-4d62-9349-faff621ab0e6
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.843 uuid: 5b054eac-e59e-46bd-a440-cc5ce9f9622b
*/
#define VM_PROXY_MAJOR 1
Modified: branches/Cog/spursistasrc/vm/vmCallback.h
===================================================================
--- branches/Cog/spursistasrc/vm/vmCallback.h 2014-08-05 02:15:28 UTC (rev 3058)
+++ branches/Cog/spursistasrc/vm/vmCallback.h 2014-08-05 17:16:14 UTC (rev 3059)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.841 uuid: 6b9e05e0-8058-4d62-9349-faff621ab0e6
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.843 uuid: 5b054eac-e59e-46bd-a440-cc5ce9f9622b
*/
#define VM_CALLBACK_INC 1
Modified: branches/Cog/spursrc/vm/cointerp.c
===================================================================
--- branches/Cog/spursrc/vm/cointerp.c 2014-08-05 02:15:28 UTC (rev 3058)
+++ branches/Cog/spursrc/vm/cointerp.c 2014-08-05 17:16:14 UTC (rev 3059)
@@ -1,9 +1,9 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.841 uuid: 6b9e05e0-8058-4d62-9349-faff621ab0e6
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.843 uuid: 5b054eac-e59e-46bd-a440-cc5ce9f9622b
from
- CoInterpreter VMMaker.oscog-eem.841 uuid: 6b9e05e0-8058-4d62-9349-faff621ab0e6
+ CoInterpreter VMMaker.oscog-eem.843 uuid: 5b054eac-e59e-46bd-a440-cc5ce9f9622b
*/
-static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.841 uuid: 6b9e05e0-8058-4d62-9349-faff621ab0e6 " __DATE__ ;
+static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.843 uuid: 5b054eac-e59e-46bd-a440-cc5ce9f9622b " __DATE__ ;
char *__interpBuildInfo = __buildInfo;
@@ -35,9 +35,10 @@
/* StackInterpreter class>>preambleCCode */
/* Disable Intel compiler inlining of warning which is used for breakpoints */
#pragma auto_inline off
-sqInt warnpid;
+sqInt warnpid, erroronwarn;
void
-warning(char *s) { /* Print an error message but don't exit. */
+warning(char *s) { /* Print an error message but don't necessarily exit. */
+ if (erroronwarn) error(s);
if (warnpid)
printf("\n%s pid %ld\n", s, (long)warnpid);
else
@@ -2308,7 +2309,7 @@
/*540*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,
/*560*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, 0, 0, 0,-1,-1
};
-const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.841]";
+const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.843]";
sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */;
volatile int sendTrace;
Modified: branches/Cog/spursrc/vm/cointerp.h
===================================================================
--- branches/Cog/spursrc/vm/cointerp.h 2014-08-05 02:15:28 UTC (rev 3058)
+++ branches/Cog/spursrc/vm/cointerp.h 2014-08-05 17:16:14 UTC (rev 3059)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.841 uuid: 6b9e05e0-8058-4d62-9349-faff621ab0e6
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.843 uuid: 5b054eac-e59e-46bd-a440-cc5ce9f9622b
*/
Modified: branches/Cog/spursrc/vm/gcc3x-cointerp.c
===================================================================
--- branches/Cog/spursrc/vm/gcc3x-cointerp.c 2014-08-05 02:15:28 UTC (rev 3058)
+++ branches/Cog/spursrc/vm/gcc3x-cointerp.c 2014-08-05 17:16:14 UTC (rev 3059)
@@ -2,11 +2,11 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.841 uuid: 6b9e05e0-8058-4d62-9349-faff621ab0e6
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.843 uuid: 5b054eac-e59e-46bd-a440-cc5ce9f9622b
from
- CoInterpreter VMMaker.oscog-eem.841 uuid: 6b9e05e0-8058-4d62-9349-faff621ab0e6
+ CoInterpreter VMMaker.oscog-eem.843 uuid: 5b054eac-e59e-46bd-a440-cc5ce9f9622b
*/
-static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.841 uuid: 6b9e05e0-8058-4d62-9349-faff621ab0e6 " __DATE__ ;
+static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.843 uuid: 5b054eac-e59e-46bd-a440-cc5ce9f9622b " __DATE__ ;
char *__interpBuildInfo = __buildInfo;
@@ -38,9 +38,10 @@
/* StackInterpreter class>>preambleCCode */
/* Disable Intel compiler inlining of warning which is used for breakpoints */
#pragma auto_inline off
-sqInt warnpid;
+sqInt warnpid, erroronwarn;
void
-warning(char *s) { /* Print an error message but don't exit. */
+warning(char *s) { /* Print an error message but don't necessarily exit. */
+ if (erroronwarn) error(s);
if (warnpid)
printf("\n%s pid %ld\n", s, (long)warnpid);
else
@@ -2311,7 +2312,7 @@
/*540*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,
/*560*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, 0, 0, 0,-1,-1
};
-const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.841]";
+const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.843]";
sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */;
volatile int sendTrace;
Modified: branches/Cog/spursrc/vm/interp.h
===================================================================
--- branches/Cog/spursrc/vm/interp.h 2014-08-05 02:15:28 UTC (rev 3058)
+++ branches/Cog/spursrc/vm/interp.h 2014-08-05 17:16:14 UTC (rev 3059)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.841 uuid: 6b9e05e0-8058-4d62-9349-faff621ab0e6
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.843 uuid: 5b054eac-e59e-46bd-a440-cc5ce9f9622b
*/
#define VM_PROXY_MAJOR 1
Modified: branches/Cog/spursrc/vm/vmCallback.h
===================================================================
--- branches/Cog/spursrc/vm/vmCallback.h 2014-08-05 02:15:28 UTC (rev 3058)
+++ branches/Cog/spursrc/vm/vmCallback.h 2014-08-05 17:16:14 UTC (rev 3059)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.841 uuid: 6b9e05e0-8058-4d62-9349-faff621ab0e6
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.843 uuid: 5b054eac-e59e-46bd-a440-cc5ce9f9622b
*/
#define VM_CALLBACK_INC 1
Modified: branches/Cog/spurstacksrc/vm/gcc3x-interp.c
===================================================================
--- branches/Cog/spurstacksrc/vm/gcc3x-interp.c 2014-08-05 02:15:28 UTC (rev 3058)
+++ branches/Cog/spurstacksrc/vm/gcc3x-interp.c 2014-08-05 17:16:14 UTC (rev 3059)
@@ -2,11 +2,11 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.841 uuid: 6b9e05e0-8058-4d62-9349-faff621ab0e6
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.843 uuid: 5b054eac-e59e-46bd-a440-cc5ce9f9622b
from
- StackInterpreter VMMaker.oscog-eem.841 uuid: 6b9e05e0-8058-4d62-9349-faff621ab0e6
+ StackInterpreter VMMaker.oscog-eem.843 uuid: 5b054eac-e59e-46bd-a440-cc5ce9f9622b
*/
-static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.841 uuid: 6b9e05e0-8058-4d62-9349-faff621ab0e6 " __DATE__ ;
+static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.843 uuid: 5b054eac-e59e-46bd-a440-cc5ce9f9622b " __DATE__ ;
char *__interpBuildInfo = __buildInfo;
@@ -34,9 +34,10 @@
/* StackInterpreter class>>preambleCCode */
/* Disable Intel compiler inlining of warning which is used for breakpoints */
#pragma auto_inline off
-sqInt warnpid;
+sqInt warnpid, erroronwarn;
void
-warning(char *s) { /* Print an error message but don't exit. */
+warning(char *s) { /* Print an error message but don't necessarily exit. */
+ if (erroronwarn) error(s);
if (warnpid)
printf("\n%s pid %ld\n", s, (long)warnpid);
else
@@ -2062,7 +2063,7 @@
0 };
char * breakSelector;
sqInt breakSelectorLength = -1;
-const char *interpreterVersion = "Croquet Closure Stack VM [StackInterpreter VMMaker.oscog-eem.841]";
+const char *interpreterVersion = "Croquet Closure Stack VM [StackInterpreter VMMaker.oscog-eem.843]";
volatile int sendTrace;
sqInt suppressHeartbeatFlag;
Modified: branches/Cog/spurstacksrc/vm/interp.c
===================================================================
--- branches/Cog/spurstacksrc/vm/interp.c 2014-08-05 02:15:28 UTC (rev 3058)
+++ branches/Cog/spurstacksrc/vm/interp.c 2014-08-05 17:16:14 UTC (rev 3059)
@@ -1,9 +1,9 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.841 uuid: 6b9e05e0-8058-4d62-9349-faff621ab0e6
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.843 uuid: 5b054eac-e59e-46bd-a440-cc5ce9f9622b
from
- StackInterpreter VMMaker.oscog-eem.841 uuid: 6b9e05e0-8058-4d62-9349-faff621ab0e6
+ StackInterpreter VMMaker.oscog-eem.843 uuid: 5b054eac-e59e-46bd-a440-cc5ce9f9622b
*/
-static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.841 uuid: 6b9e05e0-8058-4d62-9349-faff621ab0e6 " __DATE__ ;
+static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.843 uuid: 5b054eac-e59e-46bd-a440-cc5ce9f9622b " __DATE__ ;
char *__interpBuildInfo = __buildInfo;
@@ -31,9 +31,10 @@
/* StackInterpreter class>>preambleCCode */
/* Disable Intel compiler inlining of warning which is used for breakpoints */
#pragma auto_inline off
-sqInt warnpid;
+sqInt warnpid, erroronwarn;
void
-warning(char *s) { /* Print an error message but don't exit. */
+warning(char *s) { /* Print an error message but don't necessarily exit. */
+ if (erroronwarn) error(s);
if (warnpid)
printf("\n%s pid %ld\n", s, (long)warnpid);
else
@@ -2059,7 +2060,7 @@
0 };
char * breakSelector;
sqInt breakSelectorLength = -1;
-const char *interpreterVersion = "Croquet Closure Stack VM [StackInterpreter VMMaker.oscog-eem.841]";
+const char *interpreterVersion = "Croquet Closure Stack VM [StackInterpreter VMMaker.oscog-eem.843]";
volatile int sendTrace;
sqInt suppressHeartbeatFlag;
Modified: branches/Cog/spurstacksrc/vm/interp.h
===================================================================
--- branches/Cog/spurstacksrc/vm/interp.h 2014-08-05 02:15:28 UTC (rev 3058)
+++ branches/Cog/spurstacksrc/vm/interp.h 2014-08-05 17:16:14 UTC (rev 3059)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.841 uuid: 6b9e05e0-8058-4d62-9349-faff621ab0e6
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.843 uuid: 5b054eac-e59e-46bd-a440-cc5ce9f9622b
*/
#define VM_PROXY_MAJOR 1
Modified: branches/Cog/spurstacksrc/vm/vmCallback.h
===================================================================
--- branches/Cog/spurstacksrc/vm/vmCallback.h 2014-08-05 02:15:28 UTC (rev 3058)
+++ branches/Cog/spurstacksrc/vm/vmCallback.h 2014-08-05 17:16:14 UTC (rev 3059)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.841 uuid: 6b9e05e0-8058-4d62-9349-faff621ab0e6
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.843 uuid: 5b054eac-e59e-46bd-a440-cc5ce9f9622b
*/
#define VM_CALLBACK_INC 1
Modified: branches/Cog/src/vm/cointerp.c
===================================================================
--- branches/Cog/src/vm/cointerp.c 2014-08-05 02:15:28 UTC (rev 3058)
+++ branches/Cog/src/vm/cointerp.c 2014-08-05 17:16:14 UTC (rev 3059)
@@ -1,9 +1,9 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.841 uuid: 6b9e05e0-8058-4d62-9349-faff621ab0e6
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.843 uuid: 5b054eac-e59e-46bd-a440-cc5ce9f9622b
from
- CoInterpreter VMMaker.oscog-eem.841 uuid: 6b9e05e0-8058-4d62-9349-faff621ab0e6
+ CoInterpreter VMMaker.oscog-eem.843 uuid: 5b054eac-e59e-46bd-a440-cc5ce9f9622b
*/
-static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.841 uuid: 6b9e05e0-8058-4d62-9349-faff621ab0e6 " __DATE__ ;
+static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.843 uuid: 5b054eac-e59e-46bd-a440-cc5ce9f9622b " __DATE__ ;
char *__interpBuildInfo = __buildInfo;
@@ -35,9 +35,10 @@
/* StackInterpreter class>>preambleCCode */
/* Disable Intel compiler inlining of warning which is used for breakpoints */
#pragma auto_inline off
-sqInt warnpid;
+sqInt warnpid, erroronwarn;
void
-warning(char *s) { /* Print an error message but don't exit. */
+warning(char *s) { /* Print an error message but don't necessarily exit. */
+ if (erroronwarn) error(s);
if (warnpid)
printf("\n%s pid %ld\n", s, (long)warnpid);
else
@@ -2071,7 +2072,7 @@
/* 574 */ (void (*)(void))0,
/* 575 */ (void (*)(void))0,
0 };
-const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.841]";
+const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.843]";
sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */;
volatile int sendTrace;
@@ -47896,7 +47897,7 @@
index = longAt(GIV(stackPointer));
if (!((index & 1))) {
- (GIV(primFailCode) = PrimErrBadArgument);
+ GIV(primFailCode) = PrimErrBadArgument;
return;
}
index = (index >> 1);
@@ -48061,7 +48062,7 @@
stSize = (sp1 >> 1);
l2: /* end fetchStackPointerOf: */;
@@ Diff output truncated at 50000 characters. @@
More information about the Vm-dev
mailing list