Revision: 3420 Author: eliot Date: 2015-08-11 12:42:12 -0700 (Tue, 11 Aug 2015) Log Message: ----------- CogVM source as per VMMaker.oscog-eem.1430
Get the fix for Integer receiver, float arg comparison right.
Fix some C compilation warnings.
Fix C99 code in SqueakSSL plugin (restrict keyword and for statement local iteration variable declaration) to compile under C89 as well.
Modified Paths: -------------- branches/Cog/nsspursrc/vm/cogit.h branches/Cog/nsspursrc/vm/cogitARMv5.c branches/Cog/nsspursrc/vm/cogitIA32.c branches/Cog/nsspursrc/vm/cointerp.c branches/Cog/nsspursrc/vm/cointerp.h branches/Cog/nsspursrc/vm/gcc3x-cointerp.c branches/Cog/nsspurstack64src/vm/gcc3x-interp.c branches/Cog/nsspurstack64src/vm/interp.c branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c branches/Cog/nsspurstacksrc/vm/interp.c branches/Cog/platforms/Mac OS/plugins/SqueakSSL/sqMacSSL.c branches/Cog/platforms/Mac OS/vm/sqMacMain.c branches/Cog/platforms/Mac OS/vm/sqPlatformSpecific.h branches/Cog/spursistasrc/vm/cogit.h branches/Cog/spursistasrc/vm/cogitARMv5.c branches/Cog/spursistasrc/vm/cogitIA32.c branches/Cog/spursistasrc/vm/cointerp.c branches/Cog/spursistasrc/vm/cointerp.h branches/Cog/spursistasrc/vm/gcc3x-cointerp.c branches/Cog/spursrc/vm/cogit.h branches/Cog/spursrc/vm/cogitARMv5.c branches/Cog/spursrc/vm/cogitIA32.c branches/Cog/spursrc/vm/cointerp.c branches/Cog/spursrc/vm/cointerp.h branches/Cog/spursrc/vm/gcc3x-cointerp.c branches/Cog/spurstack64src/vm/gcc3x-interp.c branches/Cog/spurstack64src/vm/interp.c branches/Cog/spurstacksrc/vm/gcc3x-interp.c branches/Cog/spurstacksrc/vm/interp.c branches/Cog/src/vm/cogit.h branches/Cog/src/vm/cogitARMv5.c branches/Cog/src/vm/cogitIA32.c branches/Cog/src/vm/cointerp.c branches/Cog/src/vm/cointerp.h branches/Cog/src/vm/cointerpmt.c branches/Cog/src/vm/cointerpmt.h branches/Cog/src/vm/gcc3x-cointerp.c branches/Cog/src/vm/gcc3x-cointerpmt.c branches/Cog/stacksrc/vm/gcc3x-interp.c branches/Cog/stacksrc/vm/interp.c
Property Changed: ---------------- branches/Cog/platforms/Cross/vm/sqSCCSVersion.h
Modified: branches/Cog/nsspursrc/vm/cogit.h =================================================================== --- branches/Cog/nsspursrc/vm/cogit.h 2015-08-11 17:44:21 UTC (rev 3419) +++ branches/Cog/nsspursrc/vm/cogit.h 2015-08-11 19:42:12 UTC (rev 3420) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.1429 uuid: 446c2481-93c9-43bc-86ac-0743223bfa0c + CCodeGenerator VMMaker.oscog-eem.1430 uuid: 3d5ca520-ac41-40be-8a8b-95a18d1cb027 */
Modified: branches/Cog/nsspursrc/vm/cogitARMv5.c =================================================================== --- branches/Cog/nsspursrc/vm/cogitARMv5.c 2015-08-11 17:44:21 UTC (rev 3419) +++ branches/Cog/nsspursrc/vm/cogitARMv5.c 2015-08-11 19:42:12 UTC (rev 3420) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.1429 uuid: 446c2481-93c9-43bc-86ac-0743223bfa0c + CCodeGenerator VMMaker.oscog-eem.1430 uuid: 3d5ca520-ac41-40be-8a8b-95a18d1cb027 from - StackToRegisterMappingCogit VMMaker.oscog-eem.1429 uuid: 446c2481-93c9-43bc-86ac-0743223bfa0c + StackToRegisterMappingCogit VMMaker.oscog-eem.1430 uuid: 3d5ca520-ac41-40be-8a8b-95a18d1cb027 */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1429 uuid: 446c2481-93c9-43bc-86ac-0743223bfa0c " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1430 uuid: 3d5ca520-ac41-40be-8a8b-95a18d1cb027 " __DATE__ ; char *__cogitBuildInfo = __buildInfo;
@@ -9893,7 +9893,7 @@ { sqInt classIndex; sqInt i; - sqInt pc; + usqInt pc;
pc = (((((usqInt)cPIC)) + firstCPICCaseOffset) + cPICCaseSize) - (jumpLongConditionalByteSize(backEnd)); for (i = 2; i <= ((cPIC->cPICNumCases)); i += 1) { @@ -10869,12 +10869,12 @@ generateMapAtstart(sqInt addressOrNull, sqInt startAddress) { unsigned char annotation; - sqInt delta; + usqInt delta; sqInt i; AbstractInstruction *instruction; sqInt length; - sqInt location; - sqInt mapEntry; + usqInt location; + usqInt mapEntry; sqInt maxDelta; usqInt mcpc;
@@ -20973,7 +20973,7 @@ /* begin JumpFullRT: */ /* begin JumpFull: */ /* begin gen:literal: */ - checkLiteralforInstruction(((sqInt)primitiveRoutine), genoperand(JumpFull, ((sqInt)primitiveRoutine))); + checkLiteralforInstruction(((sqInt)(((sqInt)primitiveRoutine))), genoperand(JumpFull, ((sqInt)(((sqInt)primitiveRoutine)))));
/* begin Label */ primInvokeLabel = genoperandoperand(Label, (labelCounter += 1), bytecodePC); @@ -22126,14 +22126,14 @@ static sqInt genPrimitiveLessOrEqual(void) { - return genSmallIntegerComparisonorDoubleComparisoninvert(JumpLessOrEqual, gJumpFPGreater, 1); + return genSmallIntegerComparisonorDoubleComparisoninvert(JumpLessOrEqual, gJumpFPGreaterOrEqual, 1); }
/* SimpleStackBasedCogit>>#genPrimitiveLessThan */ static sqInt genPrimitiveLessThan(void) { - return genSmallIntegerComparisonorDoubleComparisoninvert(JumpLess, gJumpFPGreaterOrEqual, 1); + return genSmallIntegerComparisonorDoubleComparisoninvert(JumpLess, gJumpFPGreater, 1); }
/* SimpleStackBasedCogit>>#genPrimitiveNotEqual */
Modified: branches/Cog/nsspursrc/vm/cogitIA32.c =================================================================== --- branches/Cog/nsspursrc/vm/cogitIA32.c 2015-08-11 17:44:21 UTC (rev 3419) +++ branches/Cog/nsspursrc/vm/cogitIA32.c 2015-08-11 19:42:12 UTC (rev 3420) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.1429 uuid: 446c2481-93c9-43bc-86ac-0743223bfa0c + CCodeGenerator VMMaker.oscog-eem.1430 uuid: 3d5ca520-ac41-40be-8a8b-95a18d1cb027 from - StackToRegisterMappingCogit VMMaker.oscog-eem.1429 uuid: 446c2481-93c9-43bc-86ac-0743223bfa0c + StackToRegisterMappingCogit VMMaker.oscog-eem.1430 uuid: 3d5ca520-ac41-40be-8a8b-95a18d1cb027 */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1429 uuid: 446c2481-93c9-43bc-86ac-0743223bfa0c " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1430 uuid: 3d5ca520-ac41-40be-8a8b-95a18d1cb027 " __DATE__ ; char *__cogitBuildInfo = __buildInfo;
@@ -20135,6 +20135,8 @@ AbstractInstruction *jmpSampleNonPrim; AbstractInstruction *jmpSamplePrim; void *jumpTarget; + sqInt literal; + sqInt literal1; sqInt offset; sqInt offset1; sqInt offset2; @@ -20264,7 +20266,8 @@ jumpTarget = ((void *) (((sqInt)primitiveRoutine))); /* begin gen:literal: */ /* begin checkLiteral:forInstruction: */ - anInstruction11 = genoperand(JumpFull, jumpTarget); + literal = ((sqInt)jumpTarget); + anInstruction11 = genoperand(JumpFull, ((sqInt)jumpTarget)); abstractInstruction = anInstruction11; (abstractInstruction->annotation = IsRelativeCall); abstractInstruction; @@ -21557,14 +21560,14 @@ static sqInt genPrimitiveLessOrEqual(void) { - return genSmallIntegerComparisonorDoubleComparisoninvert(JumpLessOrEqual, gJumpFPGreater, 1); + return genSmallIntegerComparisonorDoubleComparisoninvert(JumpLessOrEqual, gJumpFPGreaterOrEqual, 1); }
/* SimpleStackBasedCogit>>#genPrimitiveLessThan */ static sqInt genPrimitiveLessThan(void) { - return genSmallIntegerComparisonorDoubleComparisoninvert(JumpLess, gJumpFPGreaterOrEqual, 1); + return genSmallIntegerComparisonorDoubleComparisoninvert(JumpLess, gJumpFPGreater, 1); }
/* SimpleStackBasedCogit>>#genPrimitiveNotEqual */
Modified: branches/Cog/nsspursrc/vm/cointerp.c =================================================================== --- branches/Cog/nsspursrc/vm/cointerp.c 2015-08-11 17:44:21 UTC (rev 3419) +++ branches/Cog/nsspursrc/vm/cointerp.c 2015-08-11 19:42:12 UTC (rev 3420) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1429 uuid: 446c2481-93c9-43bc-86ac-0743223bfa0c + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1430 uuid: 3d5ca520-ac41-40be-8a8b-95a18d1cb027 from - CoInterpreter VMMaker.oscog-eem.1429 uuid: 446c2481-93c9-43bc-86ac-0743223bfa0c + CoInterpreter VMMaker.oscog-eem.1430 uuid: 3d5ca520-ac41-40be-8a8b-95a18d1cb027 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1429 uuid: 446c2481-93c9-43bc-86ac-0743223bfa0c " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1430 uuid: 3d5ca520-ac41-40be-8a8b-95a18d1cb027 " __DATE__ ; char *__interpBuildInfo = __buildInfo;
@@ -2411,7 +2411,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.1429"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.1430"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace;
@@ -60414,7 +60414,7 @@ usqInt prevFree; usqInt prevFreeChunk; usqInt prevPrevFree; - sqInt prevPrevFreeChunk; + usqInt prevPrevFreeChunk; sqInt slotBytes; sqInt slotBytes1; usqInt there; @@ -65201,7 +65201,7 @@ sqInt largeChild; sqInt newEndOfMemory; sqInt next; - usqInt node; + sqInt node; SpurSegmentInfo *seg; sqInt smallChild; sqInt treeNode; @@ -65305,7 +65305,7 @@ static sqInt readHeapFromImageFiledataBytes(sqImageFile f, sqInt numBytes) { DECL_MAYBE_SQ_GLOBAL_STRUCT - usqInt bridge; + sqInt bridge; usqInt bridgehead; usqInt bridgeSpan; sqInt bytesRead; @@ -75535,7 +75535,7 @@ printStackPages(void) { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt i; - sqInt page; + StackPage *page;
for (i = 0; i < GIV(numStackPages); i += 1) { /* begin printStackPage: */
Modified: branches/Cog/nsspursrc/vm/cointerp.h =================================================================== --- branches/Cog/nsspursrc/vm/cointerp.h 2015-08-11 17:44:21 UTC (rev 3419) +++ branches/Cog/nsspursrc/vm/cointerp.h 2015-08-11 19:42:12 UTC (rev 3420) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1429 uuid: 446c2481-93c9-43bc-86ac-0743223bfa0c + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1430 uuid: 3d5ca520-ac41-40be-8a8b-95a18d1cb027 */
Modified: branches/Cog/nsspursrc/vm/gcc3x-cointerp.c =================================================================== --- branches/Cog/nsspursrc/vm/gcc3x-cointerp.c 2015-08-11 17:44:21 UTC (rev 3419) +++ branches/Cog/nsspursrc/vm/gcc3x-cointerp.c 2015-08-11 19:42:12 UTC (rev 3420) @@ -2,11 +2,11 @@
/* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1429 uuid: 446c2481-93c9-43bc-86ac-0743223bfa0c + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1430 uuid: 3d5ca520-ac41-40be-8a8b-95a18d1cb027 from - CoInterpreter VMMaker.oscog-eem.1429 uuid: 446c2481-93c9-43bc-86ac-0743223bfa0c + CoInterpreter VMMaker.oscog-eem.1430 uuid: 3d5ca520-ac41-40be-8a8b-95a18d1cb027 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1429 uuid: 446c2481-93c9-43bc-86ac-0743223bfa0c " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1430 uuid: 3d5ca520-ac41-40be-8a8b-95a18d1cb027 " __DATE__ ; char *__interpBuildInfo = __buildInfo;
@@ -2414,7 +2414,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.1429"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.1430"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace;
@@ -60423,7 +60423,7 @@ usqInt prevFree; usqInt prevFreeChunk; usqInt prevPrevFree; - sqInt prevPrevFreeChunk; + usqInt prevPrevFreeChunk; sqInt slotBytes; sqInt slotBytes1; usqInt there; @@ -65210,7 +65210,7 @@ sqInt largeChild; sqInt newEndOfMemory; sqInt next; - usqInt node; + sqInt node; SpurSegmentInfo *seg; sqInt smallChild; sqInt treeNode; @@ -65314,7 +65314,7 @@ static sqInt readHeapFromImageFiledataBytes(sqImageFile f, sqInt numBytes) { DECL_MAYBE_SQ_GLOBAL_STRUCT - usqInt bridge; + sqInt bridge; usqInt bridgehead; usqInt bridgeSpan; sqInt bytesRead; @@ -75544,7 +75544,7 @@ printStackPages(void) { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt i; - sqInt page; + StackPage *page;
for (i = 0; i < GIV(numStackPages); i += 1) { /* begin printStackPage: */
Modified: branches/Cog/nsspurstack64src/vm/gcc3x-interp.c =================================================================== --- branches/Cog/nsspurstack64src/vm/gcc3x-interp.c 2015-08-11 17:44:21 UTC (rev 3419) +++ branches/Cog/nsspurstack64src/vm/gcc3x-interp.c 2015-08-11 19:42:12 UTC (rev 3420) @@ -2,11 +2,11 @@
/* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1429 uuid: 446c2481-93c9-43bc-86ac-0743223bfa0c + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1430 uuid: 3d5ca520-ac41-40be-8a8b-95a18d1cb027 from - StackInterpreter VMMaker.oscog-eem.1429 uuid: 446c2481-93c9-43bc-86ac-0743223bfa0c + StackInterpreter VMMaker.oscog-eem.1430 uuid: 3d5ca520-ac41-40be-8a8b-95a18d1cb027 */ -static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1429 uuid: 446c2481-93c9-43bc-86ac-0743223bfa0c " __DATE__ ; +static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1430 uuid: 3d5ca520-ac41-40be-8a8b-95a18d1cb027 " __DATE__ ; char *__interpBuildInfo = __buildInfo;
@@ -2173,7 +2173,7 @@ /* 575 */ (void (*)(void))0, 0 }; char expensiveAsserts = 0; -const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscog-eem.1429"; +const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscog-eem.1430"; volatile int sendTrace; sqInt suppressHeartbeatFlag;
@@ -66741,7 +66741,7 @@ printStackPages(void) { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt i; - sqInt page; + StackPage *page;
for (i = 0; i < GIV(numStackPages); i += 1) { /* begin printStackPage: */
Modified: branches/Cog/nsspurstack64src/vm/interp.c =================================================================== --- branches/Cog/nsspurstack64src/vm/interp.c 2015-08-11 17:44:21 UTC (rev 3419) +++ branches/Cog/nsspurstack64src/vm/interp.c 2015-08-11 19:42:12 UTC (rev 3420) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1429 uuid: 446c2481-93c9-43bc-86ac-0743223bfa0c + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1430 uuid: 3d5ca520-ac41-40be-8a8b-95a18d1cb027 from - StackInterpreter VMMaker.oscog-eem.1429 uuid: 446c2481-93c9-43bc-86ac-0743223bfa0c + StackInterpreter VMMaker.oscog-eem.1430 uuid: 3d5ca520-ac41-40be-8a8b-95a18d1cb027 */ -static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1429 uuid: 446c2481-93c9-43bc-86ac-0743223bfa0c " __DATE__ ; +static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1430 uuid: 3d5ca520-ac41-40be-8a8b-95a18d1cb027 " __DATE__ ; char *__interpBuildInfo = __buildInfo;
@@ -2170,7 +2170,7 @@ /* 575 */ (void (*)(void))0, 0 }; char expensiveAsserts = 0; -const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscog-eem.1429"; +const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscog-eem.1430"; volatile int sendTrace; sqInt suppressHeartbeatFlag;
@@ -66732,7 +66732,7 @@ printStackPages(void) { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt i; - sqInt page; + StackPage *page;
for (i = 0; i < GIV(numStackPages); i += 1) { /* begin printStackPage: */
Modified: branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c =================================================================== --- branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c 2015-08-11 17:44:21 UTC (rev 3419) +++ branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c 2015-08-11 19:42:12 UTC (rev 3420) @@ -2,11 +2,11 @@
/* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1429 uuid: 446c2481-93c9-43bc-86ac-0743223bfa0c + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1430 uuid: 3d5ca520-ac41-40be-8a8b-95a18d1cb027 from - StackInterpreter VMMaker.oscog-eem.1429 uuid: 446c2481-93c9-43bc-86ac-0743223bfa0c + StackInterpreter VMMaker.oscog-eem.1430 uuid: 3d5ca520-ac41-40be-8a8b-95a18d1cb027 */ -static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1429 uuid: 446c2481-93c9-43bc-86ac-0743223bfa0c " __DATE__ ; +static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1430 uuid: 3d5ca520-ac41-40be-8a8b-95a18d1cb027 " __DATE__ ; char *__interpBuildInfo = __buildInfo;
@@ -2144,7 +2144,7 @@ /* 575 */ (void (*)(void))0, 0 }; char expensiveAsserts = 0; -const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscog-eem.1429"; +const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscog-eem.1430"; volatile int sendTrace; sqInt suppressHeartbeatFlag;
@@ -62097,7 +62097,7 @@ printStackPages(void) { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt i; - sqInt page; + StackPage *page;
for (i = 0; i < GIV(numStackPages); i += 1) { /* begin printStackPage: */
Modified: branches/Cog/nsspurstacksrc/vm/interp.c =================================================================== --- branches/Cog/nsspurstacksrc/vm/interp.c 2015-08-11 17:44:21 UTC (rev 3419) +++ branches/Cog/nsspurstacksrc/vm/interp.c 2015-08-11 19:42:12 UTC (rev 3420) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1429 uuid: 446c2481-93c9-43bc-86ac-0743223bfa0c + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1430 uuid: 3d5ca520-ac41-40be-8a8b-95a18d1cb027 from - StackInterpreter VMMaker.oscog-eem.1429 uuid: 446c2481-93c9-43bc-86ac-0743223bfa0c + StackInterpreter VMMaker.oscog-eem.1430 uuid: 3d5ca520-ac41-40be-8a8b-95a18d1cb027 */ -static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1429 uuid: 446c2481-93c9-43bc-86ac-0743223bfa0c " __DATE__ ; +static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1430 uuid: 3d5ca520-ac41-40be-8a8b-95a18d1cb027 " __DATE__ ; char *__interpBuildInfo = __buildInfo;
@@ -2141,7 +2141,7 @@ /* 575 */ (void (*)(void))0, 0 }; char expensiveAsserts = 0; -const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscog-eem.1429"; +const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscog-eem.1430"; volatile int sendTrace; sqInt suppressHeartbeatFlag;
@@ -62088,7 +62088,7 @@ printStackPages(void) { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt i; - sqInt page; + StackPage *page;
for (i = 0; i < GIV(numStackPages); i += 1) { /* begin printStackPage: */
Property changes on: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h ___________________________________________________________________ Modified: checkindate - Mon Aug 10 10:46:42 PDT 2015 + Tue Aug 11 12:41:02 PDT 2015
Modified: branches/Cog/platforms/Mac OS/plugins/SqueakSSL/sqMacSSL.c =================================================================== --- branches/Cog/platforms/Mac OS/plugins/SqueakSSL/sqMacSSL.c 2015-08-11 17:44:21 UTC (rev 3419) +++ branches/Cog/platforms/Mac OS/plugins/SqueakSSL/sqMacSSL.c 2015-08-11 19:42:12 UTC (rev 3420) @@ -288,13 +288,13 @@ }
if (handle >= handleMax) { - int delta = 100; + const int delta = 100; + int i; /* Resize the handle buffer */ handleBuf = (sqSSL**)realloc(handleBuf, (handleMax + delta) * sizeof(sqSSL*)); - for (int i = handleMax; i < handleMax + delta; i++) { + for (i = handleMax; i < handleMax + delta; i++) handleBuf[i] = NULL; - } handleMax += delta; } handleBuf[handle] = ssl;
Modified: branches/Cog/platforms/Mac OS/vm/sqMacMain.c =================================================================== --- branches/Cog/platforms/Mac OS/vm/sqMacMain.c 2015-08-11 17:44:21 UTC (rev 3419) +++ branches/Cog/platforms/Mac OS/vm/sqMacMain.c 2015-08-11 19:42:12 UTC (rev 3420) @@ -266,7 +266,7 @@ regs->__eax, regs->__ebx, regs->__ecx, regs->__edx, regs->__edi, regs->__edi, regs->__ebp, regs->__esp, regs->__eip); - return regs->__eip; + return (void *)(regs->__eip); #elif __APPLE__ && __MACH__ && __i386__ _STRUCT_X86_THREAD_STATE32 *regs = &uap->uc_mcontext->ss; printf( "\teax 0x%08x ebx 0x%08x ecx 0x%08x edx 0x%08x\n" @@ -275,7 +275,7 @@ regs->eax, regs->ebx, regs->ecx, regs->edx, regs->edi, regs->edi, regs->ebp, regs->esp, regs->eip); - return regs->eip; + return (void *)(regs->eip); #else printf("don't know how to derive register state from a ucontext_t on this platform\n"); return 0;
Modified: branches/Cog/platforms/Mac OS/vm/sqPlatformSpecific.h =================================================================== --- branches/Cog/platforms/Mac OS/vm/sqPlatformSpecific.h 2015-08-11 17:44:21 UTC (rev 3419) +++ branches/Cog/platforms/Mac OS/vm/sqPlatformSpecific.h 2015-08-11 19:42:12 UTC (rev 3420) @@ -116,6 +116,17 @@ void CopyCStringToPascal(const char* src, Str255 dst); #endif
+ +/* C99 vs C89 restrict or not */ +#if __STDC_VERSION__ < 199901L +# if __GNUC__ +# define restrict __restrict +# else +# define restrict /*nada*/ +# endif +#endif + + /* Macro for inlined functions. As of 1.7, clang elides the original, even though global. gcc & icc don't elide the original
Modified: branches/Cog/spursistasrc/vm/cogit.h =================================================================== --- branches/Cog/spursistasrc/vm/cogit.h 2015-08-11 17:44:21 UTC (rev 3419) +++ branches/Cog/spursistasrc/vm/cogit.h 2015-08-11 19:42:12 UTC (rev 3420) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.1429 uuid: 446c2481-93c9-43bc-86ac-0743223bfa0c + CCodeGenerator VMMaker.oscog-eem.1430 uuid: 3d5ca520-ac41-40be-8a8b-95a18d1cb027 */
Modified: branches/Cog/spursistasrc/vm/cogitARMv5.c =================================================================== --- branches/Cog/spursistasrc/vm/cogitARMv5.c 2015-08-11 17:44:21 UTC (rev 3419) +++ branches/Cog/spursistasrc/vm/cogitARMv5.c 2015-08-11 19:42:12 UTC (rev 3420) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.1429 uuid: 446c2481-93c9-43bc-86ac-0743223bfa0c + CCodeGenerator VMMaker.oscog-eem.1430 uuid: 3d5ca520-ac41-40be-8a8b-95a18d1cb027 from - SistaStackToRegisterMappingCogit VMMaker.oscog-eem.1429 uuid: 446c2481-93c9-43bc-86ac-0743223bfa0c + SistaStackToRegisterMappingCogit VMMaker.oscog-eem.1430 uuid: 3d5ca520-ac41-40be-8a8b-95a18d1cb027 */ -static char __buildInfo[] = "SistaStackToRegisterMappingCogit VMMaker.oscog-eem.1429 uuid: 446c2481-93c9-43bc-86ac-0743223bfa0c " __DATE__ ; +static char __buildInfo[] = "SistaStackToRegisterMappingCogit VMMaker.oscog-eem.1430 uuid: 3d5ca520-ac41-40be-8a8b-95a18d1cb027 " __DATE__ ; char *__cogitBuildInfo = __buildInfo;
@@ -10736,12 +10736,12 @@ generateMapAtstart(sqInt addressOrNull, sqInt startAddress) { unsigned char annotation; - sqInt delta; + usqInt delta; sqInt i; AbstractInstruction *instruction; sqInt length; - sqInt location; - sqInt mapEntry; + usqInt location; + usqInt mapEntry; sqInt maxDelta; usqInt mcpc;
@@ -20063,7 +20063,7 @@ /* begin JumpFullRT: */ /* begin JumpFull: */ /* begin gen:literal: */ - checkLiteralforInstruction(((sqInt)primitiveRoutine), genoperand(JumpFull, ((sqInt)primitiveRoutine))); + checkLiteralforInstruction(((sqInt)(((sqInt)primitiveRoutine))), genoperand(JumpFull, ((sqInt)(((sqInt)primitiveRoutine)))));
/* begin Label */ primInvokeLabel = genoperandoperand(Label, (labelCounter += 1), bytecodePC); @@ -21108,14 +21108,14 @@ static sqInt genPrimitiveLessOrEqual(void) { - return genSmallIntegerComparisonorDoubleComparisoninvert(JumpLessOrEqual, gJumpFPGreater, 1); + return genSmallIntegerComparisonorDoubleComparisoninvert(JumpLessOrEqual, gJumpFPGreaterOrEqual, 1); }
/* SimpleStackBasedCogit>>#genPrimitiveLessThan */ static sqInt genPrimitiveLessThan(void) { - return genSmallIntegerComparisonorDoubleComparisoninvert(JumpLess, gJumpFPGreaterOrEqual, 1); + return genSmallIntegerComparisonorDoubleComparisoninvert(JumpLess, gJumpFPGreater, 1); }
/* SimpleStackBasedCogit>>#genPrimitiveNotEqual */
Modified: branches/Cog/spursistasrc/vm/cogitIA32.c =================================================================== --- branches/Cog/spursistasrc/vm/cogitIA32.c 2015-08-11 17:44:21 UTC (rev 3419) +++ branches/Cog/spursistasrc/vm/cogitIA32.c 2015-08-11 19:42:12 UTC (rev 3420) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.1429 uuid: 446c2481-93c9-43bc-86ac-0743223bfa0c + CCodeGenerator VMMaker.oscog-eem.1430 uuid: 3d5ca520-ac41-40be-8a8b-95a18d1cb027 from - SistaStackToRegisterMappingCogit VMMaker.oscog-eem.1429 uuid: 446c2481-93c9-43bc-86ac-0743223bfa0c + SistaStackToRegisterMappingCogit VMMaker.oscog-eem.1430 uuid: 3d5ca520-ac41-40be-8a8b-95a18d1cb027 */ -static char __buildInfo[] = "SistaStackToRegisterMappingCogit VMMaker.oscog-eem.1429 uuid: 446c2481-93c9-43bc-86ac-0743223bfa0c " __DATE__ ; +static char __buildInfo[] = "SistaStackToRegisterMappingCogit VMMaker.oscog-eem.1430 uuid: 3d5ca520-ac41-40be-8a8b-95a18d1cb027 " __DATE__ ; char *__cogitBuildInfo = __buildInfo;
@@ -19080,6 +19080,8 @@ AbstractInstruction *jmpSampleNonPrim; AbstractInstruction *jmpSamplePrim; void *jumpTarget; + sqInt literal; + sqInt literal1; sqInt offset; sqInt offset1; sqInt offset2; @@ -19209,7 +19211,8 @@ jumpTarget = ((void *) (((sqInt)primitiveRoutine))); /* begin gen:literal: */ /* begin checkLiteral:forInstruction: */ - anInstruction11 = genoperand(JumpFull, jumpTarget); + literal = ((sqInt)jumpTarget); + anInstruction11 = genoperand(JumpFull, ((sqInt)jumpTarget)); abstractInstruction = anInstruction11; (abstractInstruction->annotation = IsRelativeCall); abstractInstruction; @@ -20390,14 +20393,14 @@ static sqInt genPrimitiveLessOrEqual(void) { - return genSmallIntegerComparisonorDoubleComparisoninvert(JumpLessOrEqual, gJumpFPGreater, 1); + return genSmallIntegerComparisonorDoubleComparisoninvert(JumpLessOrEqual, gJumpFPGreaterOrEqual, 1); }
/* SimpleStackBasedCogit>>#genPrimitiveLessThan */ static sqInt genPrimitiveLessThan(void) { - return genSmallIntegerComparisonorDoubleComparisoninvert(JumpLess, gJumpFPGreaterOrEqual, 1); + return genSmallIntegerComparisonorDoubleComparisoninvert(JumpLess, gJumpFPGreater, 1); }
/* SimpleStackBasedCogit>>#genPrimitiveNotEqual */
Modified: branches/Cog/spursistasrc/vm/cointerp.c =================================================================== --- branches/Cog/spursistasrc/vm/cointerp.c 2015-08-11 17:44:21 UTC (rev 3419) +++ branches/Cog/spursistasrc/vm/cointerp.c 2015-08-11 19:42:12 UTC (rev 3420) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1429 uuid: 446c2481-93c9-43bc-86ac-0743223bfa0c + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1430 uuid: 3d5ca520-ac41-40be-8a8b-95a18d1cb027 from - CoInterpreter VMMaker.oscog-eem.1429 uuid: 446c2481-93c9-43bc-86ac-0743223bfa0c + CoInterpreter VMMaker.oscog-eem.1430 uuid: 3d5ca520-ac41-40be-8a8b-95a18d1cb027 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1429 uuid: 446c2481-93c9-43bc-86ac-0743223bfa0c " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1430 uuid: 3d5ca520-ac41-40be-8a8b-95a18d1cb027 " __DATE__ ; char *__interpBuildInfo = __buildInfo;
@@ -2385,7 +2385,7 @@ /*560*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, 0, 0, 0,-1,-1 }; char expensiveAsserts = 0; -const char *interpreterVersion = "Croquet Closure Cog[Spur] VM [CoInterpreterPrimitives VMMaker.oscog-eem.1429]"; +const char *interpreterVersion = "Croquet Closure Cog[Spur] VM [CoInterpreterPrimitives VMMaker.oscog-eem.1430]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace;
@@ -63766,7 +63766,7 @@ sqInt largeChild; sqInt newEndOfMemory; sqInt next; - sqInt node; + usqInt node; SpurSegmentInfo *seg; sqInt smallChild; sqInt treeNode; @@ -64086,7 +64086,7 @@ usqLong firstSavedBridgeWord; sqInt nWritten; usqInt pier1; - usqInt pier2; + sqInt pier2; usqLong secondSavedBridgeWord;
pier1 = (((segment->segSize)) + ((segment->segStart))) - (2 * BaseHeaderSize); @@ -73046,7 +73046,7 @@ printStackPages(void) { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt i; - sqInt page; + StackPage *page;
for (i = 0; i < GIV(numStackPages); i += 1) { /* begin printStackPage: */
Modified: branches/Cog/spursistasrc/vm/cointerp.h =================================================================== --- branches/Cog/spursistasrc/vm/cointerp.h 2015-08-11 17:44:21 UTC (rev 3419) +++ branches/Cog/spursistasrc/vm/cointerp.h 2015-08-11 19:42:12 UTC (rev 3420) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1429 uuid: 446c2481-93c9-43bc-86ac-0743223bfa0c + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1430 uuid: 3d5ca520-ac41-40be-8a8b-95a18d1cb027 */
Modified: branches/Cog/spursistasrc/vm/gcc3x-cointerp.c =================================================================== --- branches/Cog/spursistasrc/vm/gcc3x-cointerp.c 2015-08-11 17:44:21 UTC (rev 3419) +++ branches/Cog/spursistasrc/vm/gcc3x-cointerp.c 2015-08-11 19:42:12 UTC (rev 3420) @@ -2,11 +2,11 @@
/* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1429 uuid: 446c2481-93c9-43bc-86ac-0743223bfa0c + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1430 uuid: 3d5ca520-ac41-40be-8a8b-95a18d1cb027 from - CoInterpreter VMMaker.oscog-eem.1429 uuid: 446c2481-93c9-43bc-86ac-0743223bfa0c + CoInterpreter VMMaker.oscog-eem.1430 uuid: 3d5ca520-ac41-40be-8a8b-95a18d1cb027 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1429 uuid: 446c2481-93c9-43bc-86ac-0743223bfa0c " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1430 uuid: 3d5ca520-ac41-40be-8a8b-95a18d1cb027 " __DATE__ ; char *__interpBuildInfo = __buildInfo;
@@ -2388,7 +2388,7 @@ /*560*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, 0, 0, 0,-1,-1 }; char expensiveAsserts = 0; -const char *interpreterVersion = "Croquet Closure Cog[Spur] VM [CoInterpreterPrimitives VMMaker.oscog-eem.1429]"; +const char *interpreterVersion = "Croquet Closure Cog[Spur] VM [CoInterpreterPrimitives VMMaker.oscog-eem.1430]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace;
@@ -63775,7 +63775,7 @@ sqInt largeChild; sqInt newEndOfMemory; sqInt next; - sqInt node; + usqInt node; SpurSegmentInfo *seg; sqInt smallChild; sqInt treeNode; @@ -64095,7 +64095,7 @@ usqLong firstSavedBridgeWord; sqInt nWritten; usqInt pier1; - usqInt pier2; + sqInt pier2; usqLong secondSavedBridgeWord;
pier1 = (((segment->segSize)) + ((segment->segStart))) - (2 * BaseHeaderSize); @@ -73055,7 +73055,7 @@ printStackPages(void) { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt i; - sqInt page; + StackPage *page;
for (i = 0; i < GIV(numStackPages); i += 1) { /* begin printStackPage: */
Modified: branches/Cog/spursrc/vm/cogit.h =================================================================== --- branches/Cog/spursrc/vm/cogit.h 2015-08-11 17:44:21 UTC (rev 3419) +++ branches/Cog/spursrc/vm/cogit.h 2015-08-11 19:42:12 UTC (rev 3420) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.1429 uuid: 446c2481-93c9-43bc-86ac-0743223bfa0c + CCodeGenerator VMMaker.oscog-eem.1430 uuid: 3d5ca520-ac41-40be-8a8b-95a18d1cb027 */
Modified: branches/Cog/spursrc/vm/cogitARMv5.c =================================================================== --- branches/Cog/spursrc/vm/cogitARMv5.c 2015-08-11 17:44:21 UTC (rev 3419) +++ branches/Cog/spursrc/vm/cogitARMv5.c 2015-08-11 19:42:12 UTC (rev 3420) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.1429 uuid: 446c2481-93c9-43bc-86ac-0743223bfa0c + CCodeGenerator VMMaker.oscog-eem.1430 uuid: 3d5ca520-ac41-40be-8a8b-95a18d1cb027 from - StackToRegisterMappingCogit VMMaker.oscog-eem.1429 uuid: 446c2481-93c9-43bc-86ac-0743223bfa0c + StackToRegisterMappingCogit VMMaker.oscog-eem.1430 uuid: 3d5ca520-ac41-40be-8a8b-95a18d1cb027 */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1429 uuid: 446c2481-93c9-43bc-86ac-0743223bfa0c " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1430 uuid: 3d5ca520-ac41-40be-8a8b-95a18d1cb027 " __DATE__ ; char *__cogitBuildInfo = __buildInfo;
@@ -9438,7 +9438,7 @@ { sqInt classIndex; sqInt i; - usqInt pc; + sqInt pc;
pc = (((((usqInt)cPIC)) + firstCPICCaseOffset) + cPICCaseSize) - (jumpLongConditionalByteSize(backEnd)); for (i = 2; i <= ((cPIC->cPICNumCases)); i += 1) { @@ -19368,7 +19368,7 @@ /* begin JumpFullRT: */ /* begin JumpFull: */ /* begin gen:literal: */ - checkLiteralforInstruction(((sqInt)primitiveRoutine), genoperand(JumpFull, ((sqInt)primitiveRoutine))); + checkLiteralforInstruction(((sqInt)(((sqInt)primitiveRoutine))), genoperand(JumpFull, ((sqInt)(((sqInt)primitiveRoutine)))));
/* begin Label */ primInvokeLabel = genoperandoperand(Label, (labelCounter += 1), bytecodePC); @@ -20096,14 +20096,14 @@ static sqInt genPrimitiveLessOrEqual(void) { - return genSmallIntegerComparisonorDoubleComparisoninvert(JumpLessOrEqual, gJumpFPGreater, 1); + return genSmallIntegerComparisonorDoubleComparisoninvert(JumpLessOrEqual, gJumpFPGreaterOrEqual, 1); }
/* SimpleStackBasedCogit>>#genPrimitiveLessThan */ static sqInt genPrimitiveLessThan(void) { - return genSmallIntegerComparisonorDoubleComparisoninvert(JumpLess, gJumpFPGreaterOrEqual, 1); + return genSmallIntegerComparisonorDoubleComparisoninvert(JumpLess, gJumpFPGreater, 1); }
/* SimpleStackBasedCogit>>#genPrimitiveNotEqual */
Modified: branches/Cog/spursrc/vm/cogitIA32.c =================================================================== --- branches/Cog/spursrc/vm/cogitIA32.c 2015-08-11 17:44:21 UTC (rev 3419) +++ branches/Cog/spursrc/vm/cogitIA32.c 2015-08-11 19:42:12 UTC (rev 3420) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.1429 uuid: 446c2481-93c9-43bc-86ac-0743223bfa0c + CCodeGenerator VMMaker.oscog-eem.1430 uuid: 3d5ca520-ac41-40be-8a8b-95a18d1cb027 from - StackToRegisterMappingCogit VMMaker.oscog-eem.1429 uuid: 446c2481-93c9-43bc-86ac-0743223bfa0c + StackToRegisterMappingCogit VMMaker.oscog-eem.1430 uuid: 3d5ca520-ac41-40be-8a8b-95a18d1cb027 */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1429 uuid: 446c2481-93c9-43bc-86ac-0743223bfa0c " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1430 uuid: 3d5ca520-ac41-40be-8a8b-95a18d1cb027 " __DATE__ ; char *__cogitBuildInfo = __buildInfo;
@@ -9495,12 +9495,12 @@ generateMapAtstart(sqInt addressOrNull, sqInt startAddress) { unsigned char annotation; - sqInt delta; + usqInt delta; sqInt i; AbstractInstruction *instruction; sqInt length; - sqInt location; - sqInt mapEntry; + usqInt location; + usqInt mapEntry; sqInt maxDelta; usqInt mcpc;
@@ -18351,6 +18351,8 @@ AbstractInstruction *jmpSampleNonPrim; AbstractInstruction *jmpSamplePrim; void *jumpTarget; + sqInt literal; + sqInt literal1; sqInt offset; sqInt offset1; sqInt offset2; @@ -18480,7 +18482,8 @@ jumpTarget = ((void *) (((sqInt)primitiveRoutine))); /* begin gen:literal: */ /* begin checkLiteral:forInstruction: */ - anInstruction11 = genoperand(JumpFull, jumpTarget); + literal = ((sqInt)jumpTarget); + anInstruction11 = genoperand(JumpFull, ((sqInt)jumpTarget)); abstractInstruction = anInstruction11; (abstractInstruction->annotation = IsRelativeCall); abstractInstruction; @@ -19348,14 +19351,14 @@ static sqInt genPrimitiveLessOrEqual(void) { - return genSmallIntegerComparisonorDoubleComparisoninvert(JumpLessOrEqual, gJumpFPGreater, 1); + return genSmallIntegerComparisonorDoubleComparisoninvert(JumpLessOrEqual, gJumpFPGreaterOrEqual, 1); }
/* SimpleStackBasedCogit>>#genPrimitiveLessThan */ static sqInt genPrimitiveLessThan(void) { - return genSmallIntegerComparisonorDoubleComparisoninvert(JumpLess, gJumpFPGreaterOrEqual, 1); + return genSmallIntegerComparisonorDoubleComparisoninvert(JumpLess, gJumpFPGreater, 1); }
/* SimpleStackBasedCogit>>#genPrimitiveNotEqual */
Modified: branches/Cog/spursrc/vm/cointerp.c =================================================================== --- branches/Cog/spursrc/vm/cointerp.c 2015-08-11 17:44:21 UTC (rev 3419) +++ branches/Cog/spursrc/vm/cointerp.c 2015-08-11 19:42:12 UTC (rev 3420) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1429 uuid: 446c2481-93c9-43bc-86ac-0743223bfa0c + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1430 uuid: 3d5ca520-ac41-40be-8a8b-95a18d1cb027 from - CoInterpreter VMMaker.oscog-eem.1429 uuid: 446c2481-93c9-43bc-86ac-0743223bfa0c + CoInterpreter VMMaker.oscog-eem.1430 uuid: 3d5ca520-ac41-40be-8a8b-95a18d1cb027 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1429 uuid: 446c2481-93c9-43bc-86ac-0743223bfa0c " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1430 uuid: 3d5ca520-ac41-40be-8a8b-95a18d1cb027 " __DATE__ ; char *__interpBuildInfo = __buildInfo;
@@ -2372,7 +2372,7 @@ /*560*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, 0, 0, 0,-1,-1 }; char expensiveAsserts = 0; -const char *interpreterVersion = "Croquet Closure Cog[Spur] VM [CoInterpreterPrimitives VMMaker.oscog-eem.1429]"; +const char *interpreterVersion = "Croquet Closure Cog[Spur] VM [CoInterpreterPrimitives VMMaker.oscog-eem.1430]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace;
@@ -53903,7 +53903,7 @@ usqInt prevFree; usqInt prevFreeChunk; usqInt prevPrevFree; - sqInt prevPrevFreeChunk; + usqInt prevPrevFreeChunk; sqInt slotBytes; sqInt slotBytes1; usqInt there; @@ -58775,7 +58775,7 @@ static sqInt readHeapFromImageFiledataBytes(sqImageFile f, sqInt numBytes) { DECL_MAYBE_SQ_GLOBAL_STRUCT - sqInt bridge; + usqInt bridge; usqInt bridgehead; usqInt bridgeSpan; sqInt bytesRead; @@ -58991,7 +58991,7 @@ usqLong firstSavedBridgeWord; sqInt nWritten; usqInt pier1; - sqInt pier2; + usqInt pier2; usqLong secondSavedBridgeWord;
pier1 = (((segment->segSize)) + ((segment->segStart))) - (2 * BaseHeaderSize); @@ -67924,7 +67924,7 @@ printStackPages(void) { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt i; - sqInt page; + StackPage *page;
for (i = 0; i < GIV(numStackPages); i += 1) { /* begin printStackPage: */
Modified: branches/Cog/spursrc/vm/cointerp.h =================================================================== --- branches/Cog/spursrc/vm/cointerp.h 2015-08-11 17:44:21 UTC (rev 3419) +++ branches/Cog/spursrc/vm/cointerp.h 2015-08-11 19:42:12 UTC (rev 3420) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1429 uuid: 446c2481-93c9-43bc-86ac-0743223bfa0c + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1430 uuid: 3d5ca520-ac41-40be-8a8b-95a18d1cb027 */
Modified: branches/Cog/spursrc/vm/gcc3x-cointerp.c =================================================================== --- branches/Cog/spursrc/vm/gcc3x-cointerp.c 2015-08-11 17:44:21 UTC (rev 3419) +++ branches/Cog/spursrc/vm/gcc3x-cointerp.c 2015-08-11 19:42:12 UTC (rev 3420) @@ -2,11 +2,11 @@
/* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1429 uuid: 446c2481-93c9-43bc-86ac-0743223bfa0c + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1430 uuid: 3d5ca520-ac41-40be-8a8b-95a18d1cb027 from - CoInterpreter VMMaker.oscog-eem.1429 uuid: 446c2481-93c9-43bc-86ac-0743223bfa0c + CoInterpreter VMMaker.oscog-eem.1430 uuid: 3d5ca520-ac41-40be-8a8b-95a18d1cb027 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1429 uuid: 446c2481-93c9-43bc-86ac-0743223bfa0c " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1430 uuid: 3d5ca520-ac41-40be-8a8b-95a18d1cb027 " __DATE__ ; char *__interpBuildInfo = __buildInfo;
@@ -2375,7 +2375,7 @@ /*560*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, 0, 0, 0,-1,-1 }; char expensiveAsserts = 0; -const char *interpreterVersion = "Croquet Closure Cog[Spur] VM [CoInterpreterPrimitives VMMaker.oscog-eem.1429]"; +const char *interpreterVersion = "Croquet Closure Cog[Spur] VM [CoInterpreterPrimitives VMMaker.oscog-eem.1430]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace;
@@ -53912,7 +53912,7 @@ usqInt prevFree; usqInt prevFreeChunk; usqInt prevPrevFree; - sqInt prevPrevFreeChunk; + usqInt prevPrevFreeChunk; sqInt slotBytes; sqInt slotBytes1; usqInt there; @@ -58784,7 +58784,7 @@ static sqInt readHeapFromImageFiledataBytes(sqImageFile f, sqInt numBytes) { DECL_MAYBE_SQ_GLOBAL_STRUCT - sqInt bridge; + usqInt bridge; usqInt bridgehead; usqInt bridgeSpan; sqInt bytesRead; @@ -59000,7 +59000,7 @@ usqLong firstSavedBridgeWord; sqInt nWritten; usqInt pier1; - sqInt pier2; + usqInt pier2; usqLong secondSavedBridgeWord;
pier1 = (((segment->segSize)) + ((segment->segStart))) - (2 * BaseHeaderSize); @@ -67933,7 +67933,7 @@ printStackPages(void) { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt i; - sqInt page; + StackPage *page;
for (i = 0; i < GIV(numStackPages); i += 1) { /* begin printStackPage: */
Modified: branches/Cog/spurstack64src/vm/gcc3x-interp.c =================================================================== --- branches/Cog/spurstack64src/vm/gcc3x-interp.c 2015-08-11 17:44:21 UTC (rev 3419) +++ branches/Cog/spurstack64src/vm/gcc3x-interp.c 2015-08-11 19:42:12 UTC (rev 3420) @@ -2,11 +2,11 @@
/* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1429 uuid: 446c2481-93c9-43bc-86ac-0743223bfa0c + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1430 uuid: 3d5ca520-ac41-40be-8a8b-95a18d1cb027 from - StackInterpreter VMMaker.oscog-eem.1429 uuid: 446c2481-93c9-43bc-86ac-0743223bfa0c + StackInterpreter VMMaker.oscog-eem.1430 uuid: 3d5ca520-ac41-40be-8a8b-95a18d1cb027 */ -static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1429 uuid: 446c2481-93c9-43bc-86ac-0743223bfa0c " __DATE__ ; +static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1430 uuid: 3d5ca520-ac41-40be-8a8b-95a18d1cb027 " __DATE__ ; char *__interpBuildInfo = __buildInfo;
@@ -2137,7 +2137,7 @@ /* 575 */ (void (*)(void))0, 0 }; char expensiveAsserts = 0; -const char *interpreterVersion = "Croquet Closure Stack VM [StackInterpreterPrimitives VMMaker.oscog-eem.1429]"; +const char *interpreterVersion = "Croquet Closure Stack VM [StackInterpreterPrimitives VMMaker.oscog-eem.1430]"; volatile int sendTrace; sqInt suppressHeartbeatFlag;
@@ -60299,7 +60299,7 @@ printStackPages(void) { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt i; - sqInt page; + StackPage *page;
for (i = 0; i < GIV(numStackPages); i += 1) { /* begin printStackPage: */
Modified: branches/Cog/spurstack64src/vm/interp.c =================================================================== --- branches/Cog/spurstack64src/vm/interp.c 2015-08-11 17:44:21 UTC (rev 3419) +++ branches/Cog/spurstack64src/vm/interp.c 2015-08-11 19:42:12 UTC (rev 3420) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1429 uuid: 446c2481-93c9-43bc-86ac-0743223bfa0c + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1430 uuid: 3d5ca520-ac41-40be-8a8b-95a18d1cb027 from - StackInterpreter VMMaker.oscog-eem.1429 uuid: 446c2481-93c9-43bc-86ac-0743223bfa0c + StackInterpreter VMMaker.oscog-eem.1430 uuid: 3d5ca520-ac41-40be-8a8b-95a18d1cb027 */ -static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1429 uuid: 446c2481-93c9-43bc-86ac-0743223bfa0c " __DATE__ ; +static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1430 uuid: 3d5ca520-ac41-40be-8a8b-95a18d1cb027 " __DATE__ ; char *__interpBuildInfo = __buildInfo;
@@ -2134,7 +2134,7 @@ /* 575 */ (void (*)(void))0, 0 }; char expensiveAsserts = 0; -const char *interpreterVersion = "Croquet Closure Stack VM [StackInterpreterPrimitives VMMaker.oscog-eem.1429]"; +const char *interpreterVersion = "Croquet Closure Stack VM [StackInterpreterPrimitives VMMaker.oscog-eem.1430]"; volatile int sendTrace; sqInt suppressHeartbeatFlag;
@@ -60290,7 +60290,7 @@ printStackPages(void) { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt i; - sqInt page; + StackPage *page;
for (i = 0; i < GIV(numStackPages); i += 1) { /* begin printStackPage: */
Modified: branches/Cog/spurstacksrc/vm/gcc3x-interp.c =================================================================== --- branches/Cog/spurstacksrc/vm/gcc3x-interp.c 2015-08-11 17:44:21 UTC (rev 3419) +++ branches/Cog/spurstacksrc/vm/gcc3x-interp.c 2015-08-11 19:42:12 UTC (rev 3420) @@ -2,11 +2,11 @@
/* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1429 uuid: 446c2481-93c9-43bc-86ac-0743223bfa0c + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1430 uuid: 3d5ca520-ac41-40be-8a8b-95a18d1cb027 from - StackInterpreter VMMaker.oscog-eem.1429 uuid: 446c2481-93c9-43bc-86ac-0743223bfa0c + StackInterpreter VMMaker.oscog-eem.1430 uuid: 3d5ca520-ac41-40be-8a8b-95a18d1cb027 */ -static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1429 uuid: 446c2481-93c9-43bc-86ac-0743223bfa0c " __DATE__ ; +static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1430 uuid: 3d5ca520-ac41-40be-8a8b-95a18d1cb027 " __DATE__ ; char *__interpBuildInfo = __buildInfo;
@@ -2108,7 +2108,7 @@ /* 575 */ (void (*)(void))0, 0 }; char expensiveAsserts = 0; -const char *interpreterVersion = "Croquet Closure Stack VM [StackInterpreterPrimitives VMMaker.oscog-eem.1429]"; +const char *interpreterVersion = "Croquet Closure Stack VM [StackInterpreterPrimitives VMMaker.oscog-eem.1430]"; volatile int sendTrace; sqInt suppressHeartbeatFlag;
@@ -55958,7 +55958,7 @@ printStackPages(void) { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt i; - sqInt page; + StackPage *page;
for (i = 0; i < GIV(numStackPages); i += 1) { /* begin printStackPage: */
Modified: branches/Cog/spurstacksrc/vm/interp.c =================================================================== --- branches/Cog/spurstacksrc/vm/interp.c 2015-08-11 17:44:21 UTC (rev 3419) +++ branches/Cog/spurstacksrc/vm/interp.c 2015-08-11 19:42:12 UTC (rev 3420) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1429 uuid: 446c2481-93c9-43bc-86ac-0743223bfa0c + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1430 uuid: 3d5ca520-ac41-40be-8a8b-95a18d1cb027 from - StackInterpreter VMMaker.oscog-eem.1429 uuid: 446c2481-93c9-43bc-86ac-0743223bfa0c + StackInterpreter VMMaker.oscog-eem.1430 uuid: 3d5ca520-ac41-40be-8a8b-95a18d1cb027 */ -static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1429 uuid: 446c2481-93c9-43bc-86ac-0743223bfa0c " __DATE__ ; +static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1430 uuid: 3d5ca520-ac41-40be-8a8b-95a18d1cb027 " __DATE__ ; char *__interpBuildInfo = __buildInfo;
@@ -2105,7 +2105,7 @@ /* 575 */ (void (*)(void))0, 0 }; char expensiveAsserts = 0; -const char *interpreterVersion = "Croquet Closure Stack VM [StackInterpreterPrimitives VMMaker.oscog-eem.1429]"; +const char *interpreterVersion = "Croquet Closure Stack VM [StackInterpreterPrimitives VMMaker.oscog-eem.1430]"; volatile int sendTrace; sqInt suppressHeartbeatFlag;
@@ -55949,7 +55949,7 @@ printStackPages(void) { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt i; - sqInt page; + StackPage *page;
for (i = 0; i < GIV(numStackPages); i += 1) { /* begin printStackPage: */
Modified: branches/Cog/src/vm/cogit.h =================================================================== --- branches/Cog/src/vm/cogit.h 2015-08-11 17:44:21 UTC (rev 3419) +++ branches/Cog/src/vm/cogit.h 2015-08-11 19:42:12 UTC (rev 3420) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.1429 uuid: 446c2481-93c9-43bc-86ac-0743223bfa0c + CCodeGenerator VMMaker.oscog-eem.1430 uuid: 3d5ca520-ac41-40be-8a8b-95a18d1cb027 */
Modified: branches/Cog/src/vm/cogitARMv5.c =================================================================== --- branches/Cog/src/vm/cogitARMv5.c 2015-08-11 17:44:21 UTC (rev 3419) +++ branches/Cog/src/vm/cogitARMv5.c 2015-08-11 19:42:12 UTC (rev 3420) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.1429 uuid: 446c2481-93c9-43bc-86ac-0743223bfa0c + CCodeGenerator VMMaker.oscog-eem.1430 uuid: 3d5ca520-ac41-40be-8a8b-95a18d1cb027 from - StackToRegisterMappingCogit VMMaker.oscog-eem.1429 uuid: 446c2481-93c9-43bc-86ac-0743223bfa0c + StackToRegisterMappingCogit VMMaker.oscog-eem.1430 uuid: 3d5ca520-ac41-40be-8a8b-95a18d1cb027 */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1429 uuid: 446c2481-93c9-43bc-86ac-0743223bfa0c " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1430 uuid: 3d5ca520-ac41-40be-8a8b-95a18d1cb027 " __DATE__ ; char *__cogitBuildInfo = __buildInfo;
@@ -17366,7 +17366,7 @@ /* begin JumpFullRT: */ /* begin JumpFull: */ /* begin gen:literal: */ - checkLiteralforInstruction(((sqInt)primitiveRoutine), genoperand(JumpFull, ((sqInt)primitiveRoutine))); + checkLiteralforInstruction(((sqInt)(((sqInt)primitiveRoutine))), genoperand(JumpFull, ((sqInt)(((sqInt)primitiveRoutine)))));
/* begin Label */ primInvokeLabel = genoperandoperand(Label, (labelCounter += 1), bytecodePC); @@ -18105,14 +18105,14 @@ static sqInt genPrimitiveLessOrEqual(void) { - return genSmallIntegerComparisonorDoubleComparisoninvert(JumpLessOrEqual, gJumpFPGreater, 1); + return genSmallIntegerComparisonorDoubleComparisoninvert(JumpLessOrEqual, gJumpFPGreaterOrEqual, 1); }
/* SimpleStackBasedCogit>>#genPrimitiveLessThan */ static sqInt genPrimitiveLessThan(void) { - return genSmallIntegerComparisonorDoubleComparisoninvert(JumpLess, gJumpFPGreaterOrEqual, 1); + return genSmallIntegerComparisonorDoubleComparisoninvert(JumpLess, gJumpFPGreater, 1); }
/* SimpleStackBasedCogit>>#genPrimitiveNotEqual */
Modified: branches/Cog/src/vm/cogitIA32.c =================================================================== --- branches/Cog/src/vm/cogitIA32.c 2015-08-11 17:44:21 UTC (rev 3419) +++ branches/Cog/src/vm/cogitIA32.c 2015-08-11 19:42:12 UTC (rev 3420) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.1429 uuid: 446c2481-93c9-43bc-86ac-0743223bfa0c + CCodeGenerator VMMaker.oscog-eem.1430 uuid: 3d5ca520-ac41-40be-8a8b-95a18d1cb027 from - StackToRegisterMappingCogit VMMaker.oscog-eem.1429 uuid: 446c2481-93c9-43bc-86ac-0743223bfa0c + StackToRegisterMappingCogit VMMaker.oscog-eem.1430 uuid: 3d5ca520-ac41-40be-8a8b-95a18d1cb027 */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1429 uuid: 446c2481-93c9-43bc-86ac-0743223bfa0c " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1430 uuid: 3d5ca520-ac41-40be-8a8b-95a18d1cb027 " __DATE__ ; char *__cogitBuildInfo = __buildInfo;
@@ -9290,12 +9290,12 @@ generateMapAtstart(sqInt addressOrNull, sqInt startAddress) { unsigned char annotation; - sqInt delta; + usqInt delta; sqInt i; AbstractInstruction *instruction; sqInt length; - sqInt location; - sqInt mapEntry; + usqInt location; + usqInt mapEntry; sqInt maxDelta; usqInt mcpc;
@@ -16020,6 +16020,8 @@ AbstractInstruction *jmpSampleNonPrim; AbstractInstruction *jmpSamplePrim; void *jumpTarget; + sqInt literal; + sqInt literal1; sqInt offset; sqInt offset1; sqInt offset2; @@ -16149,7 +16151,8 @@ jumpTarget = ((void *) (((sqInt)primitiveRoutine))); /* begin gen:literal: */ /* begin checkLiteral:forInstruction: */ - anInstruction11 = genoperand(JumpFull, jumpTarget); + literal = ((sqInt)jumpTarget); + anInstruction11 = genoperand(JumpFull, ((sqInt)jumpTarget)); abstractInstruction = anInstruction11;
@@ Diff output truncated at 50000 characters. @@
vm-dev@lists.squeakfoundation.org