Revision: 2647 Author: eliot Date: 2013-01-02 11:49:06 -0800 (Wed, 02 Jan 2013) Log Message: ----------- CogVM source as per VMMaker.oscog-eem.243. Integrate issue 112. Add ULL suffix to > 32 bit integer literals. May help fix large integer arithmetic on 64-bit values with dumb C compilers.
Integrate issue 115. Fix FFIPlugin/ThreadedFFIPlugin unsignedShortAt:.
Modified Paths: -------------- branches/Cog/nscogsrc/vm/cointerp.c branches/Cog/nscogsrc/vm/cointerp.h branches/Cog/nscogsrc/vm/exampleSqNamedPrims.h branches/Cog/nscogsrc/vm/gcc3x-cointerp.c branches/Cog/nscogsrc/vm/interp.h branches/Cog/nscogsrc/vm/vmCallback.h branches/Cog/src/plugins/SqueakFFIPrims/SqueakFFIPrims.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/exampleSqNamedPrims.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
Property Changed: ---------------- branches/Cog/platforms/Cross/vm/sqSCCSVersion.h
Modified: branches/Cog/nscogsrc/vm/cointerp.c =================================================================== --- branches/Cog/nscogsrc/vm/cointerp.c 2013-01-01 23:46:54 UTC (rev 2646) +++ branches/Cog/nscogsrc/vm/cointerp.c 2013-01-02 19:49:06 UTC (rev 2647) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.241 uuid: 8ddbe9c0-6584-4c40-82c8-8e48a1dcf02a + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.243 uuid: 72a4a123-e10e-4d32-90dd-0b74014f02d3 from - CoInterpreter VMMaker.oscog-eem.241 uuid: 8ddbe9c0-6584-4c40-82c8-8e48a1dcf02a + CoInterpreter VMMaker.oscog-eem.243 uuid: 72a4a123-e10e-4d32-90dd-0b74014f02d3 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.241 uuid: 8ddbe9c0-6584-4c40-82c8-8e48a1dcf02a " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.243 uuid: 72a4a123-e10e-4d32-90dd-0b74014f02d3 " __DATE__ ; char *__interpBuildInfo = __buildInfo;
@@ -1928,7 +1928,7 @@ 0 }; static void (*externalPrimitiveTable[MaxExternalPrimitiveTableSize + 1 /* 4097 */])(void); static usqInt heapBase; -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.241"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.243"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace;
@@ -29264,7 +29264,7 @@
/* Protect against overflow */
- if (a > (18446744073709551615UL - b)) { + if (a > (18446744073709551615ULL - b)) { /* begin primitiveFail */ if (!GIV(primFailCode)) { GIV(primFailCode) = 1; @@ -30162,7 +30162,7 @@
/* This is to avoid undue (usqInt) cast */
- result = 18446744073709551615UL; + result = 18446744073709551615ULL; if ((shift >= 64) || (a > (result >> shift))) { /* begin primitiveFail */ @@ -38136,7 +38136,7 @@ } if ((a > 1) && ((b > 1) - && (a > (18446744073709551615UL / b)))) { + && (a > (18446744073709551615ULL / b)))) { /* begin primitiveFail */ if (!GIV(primFailCode)) { GIV(primFailCode) = 1; @@ -41799,7 +41799,7 @@
/* Protect against overflow */
- if (a > (18446744073709551615UL - b)) { + if (a > (18446744073709551615ULL - b)) { /* begin primitiveFail */ if (!GIV(primFailCode)) { GIV(primFailCode) = 1;
Modified: branches/Cog/nscogsrc/vm/cointerp.h =================================================================== --- branches/Cog/nscogsrc/vm/cointerp.h 2013-01-01 23:46:54 UTC (rev 2646) +++ branches/Cog/nscogsrc/vm/cointerp.h 2013-01-02 19:49:06 UTC (rev 2647) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.241 uuid: 8ddbe9c0-6584-4c40-82c8-8e48a1dcf02a + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.243 uuid: 72a4a123-e10e-4d32-90dd-0b74014f02d3 */
Modified: branches/Cog/nscogsrc/vm/exampleSqNamedPrims.h =================================================================== --- branches/Cog/nscogsrc/vm/exampleSqNamedPrims.h 2013-01-01 23:46:54 UTC (rev 2646) +++ branches/Cog/nscogsrc/vm/exampleSqNamedPrims.h 2013-01-02 19:49:06 UTC (rev 2647) @@ -1,5 +1,5 @@ /* This is an automatically generated table of all builtin modules in the VM - CoInterpreterPrimitives VMMaker.oscog-eem.233 + CoInterpreterPrimitives VMMaker.oscog-eem.243 */
extern sqExport vm_exports[];
Modified: branches/Cog/nscogsrc/vm/gcc3x-cointerp.c =================================================================== --- branches/Cog/nscogsrc/vm/gcc3x-cointerp.c 2013-01-01 23:46:54 UTC (rev 2646) +++ branches/Cog/nscogsrc/vm/gcc3x-cointerp.c 2013-01-02 19:49:06 UTC (rev 2647) @@ -2,11 +2,11 @@
/* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.241 uuid: 8ddbe9c0-6584-4c40-82c8-8e48a1dcf02a + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.243 uuid: 72a4a123-e10e-4d32-90dd-0b74014f02d3 from - CoInterpreter VMMaker.oscog-eem.241 uuid: 8ddbe9c0-6584-4c40-82c8-8e48a1dcf02a + CoInterpreter VMMaker.oscog-eem.243 uuid: 72a4a123-e10e-4d32-90dd-0b74014f02d3 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.241 uuid: 8ddbe9c0-6584-4c40-82c8-8e48a1dcf02a " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.243 uuid: 72a4a123-e10e-4d32-90dd-0b74014f02d3 " __DATE__ ; char *__interpBuildInfo = __buildInfo;
@@ -1931,7 +1931,7 @@ 0 }; static void (*externalPrimitiveTable[MaxExternalPrimitiveTableSize + 1 /* 4097 */])(void); static usqInt heapBase; -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.241"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.243"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace;
@@ -29273,7 +29273,7 @@
/* Protect against overflow */
- if (a > (18446744073709551615UL - b)) { + if (a > (18446744073709551615ULL - b)) { /* begin primitiveFail */ if (!GIV(primFailCode)) { GIV(primFailCode) = 1; @@ -30171,7 +30171,7 @@
/* This is to avoid undue (usqInt) cast */
- result = 18446744073709551615UL; + result = 18446744073709551615ULL; if ((shift >= 64) || (a > (result >> shift))) { /* begin primitiveFail */ @@ -38145,7 +38145,7 @@ } if ((a > 1) && ((b > 1) - && (a > (18446744073709551615UL / b)))) { + && (a > (18446744073709551615ULL / b)))) { /* begin primitiveFail */ if (!GIV(primFailCode)) { GIV(primFailCode) = 1; @@ -41808,7 +41808,7 @@
/* Protect against overflow */
- if (a > (18446744073709551615UL - b)) { + if (a > (18446744073709551615ULL - b)) { /* begin primitiveFail */ if (!GIV(primFailCode)) { GIV(primFailCode) = 1;
Modified: branches/Cog/nscogsrc/vm/interp.h =================================================================== --- branches/Cog/nscogsrc/vm/interp.h 2013-01-01 23:46:54 UTC (rev 2646) +++ branches/Cog/nscogsrc/vm/interp.h 2013-01-02 19:49:06 UTC (rev 2647) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.241 uuid: 8ddbe9c0-6584-4c40-82c8-8e48a1dcf02a + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.243 uuid: 72a4a123-e10e-4d32-90dd-0b74014f02d3 */
#define VM_PROXY_MAJOR 1
Modified: branches/Cog/nscogsrc/vm/vmCallback.h =================================================================== --- branches/Cog/nscogsrc/vm/vmCallback.h 2013-01-01 23:46:54 UTC (rev 2646) +++ branches/Cog/nscogsrc/vm/vmCallback.h 2013-01-02 19:49:06 UTC (rev 2647) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.241 uuid: 8ddbe9c0-6584-4c40-82c8-8e48a1dcf02a + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.243 uuid: 72a4a123-e10e-4d32-90dd-0b74014f02d3 */
#define VM_CALLBACK_INC 1
Property changes on: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h ___________________________________________________________________ Modified: checkindate - Thu Dec 20 16:44:39 PST 2012 + Wed Jan 2 11:44:47 PST 2013
Modified: branches/Cog/src/plugins/SqueakFFIPrims/SqueakFFIPrims.c =================================================================== --- branches/Cog/src/plugins/SqueakFFIPrims/SqueakFFIPrims.c 2013-01-01 23:46:54 UTC (rev 2646) +++ branches/Cog/src/plugins/SqueakFFIPrims/SqueakFFIPrims.c 2013-01-02 19:49:06 UTC (rev 2647) @@ -1,9 +1,9 @@ /* Automatically generated by - VMPluginCodeGenerator VMMaker.oscog-eem.238 uuid: a3d10eab-6079-4c91-99f6-3dcf58d1446f + VMPluginCodeGenerator VMMaker.oscog-eem.243 uuid: 72a4a123-e10e-4d32-90dd-0b74014f02d3 from - ThreadedIA32FFIPlugin VMMaker.oscog-eem.238 uuid: a3d10eab-6079-4c91-99f6-3dcf58d1446f + ThreadedIA32FFIPlugin VMMaker.oscog-eem.243 uuid: 72a4a123-e10e-4d32-90dd-0b74014f02d3 */ -static char __buildInfo[] = "ThreadedIA32FFIPlugin VMMaker.oscog-eem.238 uuid: a3d10eab-6079-4c91-99f6-3dcf58d1446f " __DATE__ ; +static char __buildInfo[] = "ThreadedIA32FFIPlugin VMMaker.oscog-eem.243 uuid: 72a4a123-e10e-4d32-90dd-0b74014f02d3 " __DATE__ ;
@@ -419,9 +419,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "SqueakFFIPrims VMMaker.oscog-eem.238 (i)" + "SqueakFFIPrims VMMaker.oscog-eem.243 (i)" #else - "SqueakFFIPrims VMMaker.oscog-eem.238 (e)" + "SqueakFFIPrims VMMaker.oscog-eem.243 (e)" #endif ;
@@ -5053,7 +5053,7 @@ value = byteAt(addr); } else { - value = *((short int *) addr); + value = *((unsigned short int *) addr); } if (isSigned) {
Modified: branches/Cog/src/vm/cointerp.c =================================================================== --- branches/Cog/src/vm/cointerp.c 2013-01-01 23:46:54 UTC (rev 2646) +++ branches/Cog/src/vm/cointerp.c 2013-01-02 19:49:06 UTC (rev 2647) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.241 uuid: 8ddbe9c0-6584-4c40-82c8-8e48a1dcf02a + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.243 uuid: 72a4a123-e10e-4d32-90dd-0b74014f02d3 from - CoInterpreter VMMaker.oscog-eem.241 uuid: 8ddbe9c0-6584-4c40-82c8-8e48a1dcf02a + CoInterpreter VMMaker.oscog-eem.243 uuid: 72a4a123-e10e-4d32-90dd-0b74014f02d3 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.241 uuid: 8ddbe9c0-6584-4c40-82c8-8e48a1dcf02a " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.243 uuid: 72a4a123-e10e-4d32-90dd-0b74014f02d3 " __DATE__ ; char *__interpBuildInfo = __buildInfo;
@@ -1918,7 +1918,7 @@ 0 }; static void (*externalPrimitiveTable[MaxExternalPrimitiveTableSize + 1 /* 4097 */])(void); static usqInt heapBase; -const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.241]"; +const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.243]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace;
@@ -24812,7 +24812,7 @@
/* Protect against overflow */
- if (a > (18446744073709551615UL - b)) { + if (a > (18446744073709551615ULL - b)) { /* begin primitiveFail */ if (!GIV(primFailCode)) { GIV(primFailCode) = 1; @@ -25710,7 +25710,7 @@
/* This is to avoid undue (usqInt) cast */
- result = 18446744073709551615UL; + result = 18446744073709551615ULL; if ((shift >= 64) || (a > (result >> shift))) { /* begin primitiveFail */ @@ -33637,7 +33637,7 @@ } if ((a > 1) && ((b > 1) - && (a > (18446744073709551615UL / b)))) { + && (a > (18446744073709551615ULL / b)))) { /* begin primitiveFail */ if (!GIV(primFailCode)) { GIV(primFailCode) = 1; @@ -37290,7 +37290,7 @@
/* Protect against overflow */
- if (a > (18446744073709551615UL - b)) { + if (a > (18446744073709551615ULL - b)) { /* begin primitiveFail */ if (!GIV(primFailCode)) { GIV(primFailCode) = 1;
Modified: branches/Cog/src/vm/cointerp.h =================================================================== --- branches/Cog/src/vm/cointerp.h 2013-01-01 23:46:54 UTC (rev 2646) +++ branches/Cog/src/vm/cointerp.h 2013-01-02 19:49:06 UTC (rev 2647) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.241 uuid: 8ddbe9c0-6584-4c40-82c8-8e48a1dcf02a + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.243 uuid: 72a4a123-e10e-4d32-90dd-0b74014f02d3 */
Modified: branches/Cog/src/vm/cointerpmt.c =================================================================== --- branches/Cog/src/vm/cointerpmt.c 2013-01-01 23:46:54 UTC (rev 2646) +++ branches/Cog/src/vm/cointerpmt.c 2013-01-02 19:49:06 UTC (rev 2647) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.241 uuid: 8ddbe9c0-6584-4c40-82c8-8e48a1dcf02a + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.243 uuid: 72a4a123-e10e-4d32-90dd-0b74014f02d3 from - CoInterpreterMT VMMaker.oscog-eem.241 uuid: 8ddbe9c0-6584-4c40-82c8-8e48a1dcf02a + CoInterpreterMT VMMaker.oscog-eem.243 uuid: 72a4a123-e10e-4d32-90dd-0b74014f02d3 */ -static char __buildInfo[] = "CoInterpreterMT VMMaker.oscog-eem.241 uuid: 8ddbe9c0-6584-4c40-82c8-8e48a1dcf02a " __DATE__ ; +static char __buildInfo[] = "CoInterpreterMT VMMaker.oscog-eem.243 uuid: 72a4a123-e10e-4d32-90dd-0b74014f02d3 " __DATE__ ; char *__interpBuildInfo = __buildInfo;
@@ -2017,7 +2017,7 @@ 0 }; static void (*externalPrimitiveTable[MaxExternalPrimitiveTableSize + 1 /* 4097 */])(void); static usqInt heapBase; -const char *interpreterVersion = "Croquet Closure Cog MT VM [CoInterpreterMT VMMaker.oscog-eem.241]"; +const char *interpreterVersion = "Croquet Closure Cog MT VM [CoInterpreterMT VMMaker.oscog-eem.243]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; sqInt willNotThreadWarnCount; @@ -26050,7 +26050,7 @@
/* Protect against overflow */
- if (a > (18446744073709551615UL - b)) { + if (a > (18446744073709551615ULL - b)) { /* begin primitiveFail */ if (!GIV(primFailCode)) { GIV(primFailCode) = 1; @@ -26948,7 +26948,7 @@
/* This is to avoid undue (usqInt) cast */
- result = 18446744073709551615UL; + result = 18446744073709551615ULL; if ((shift >= 64) || (a > (result >> shift))) { /* begin primitiveFail */ @@ -34875,7 +34875,7 @@ } if ((a > 1) && ((b > 1) - && (a > (18446744073709551615UL / b)))) { + && (a > (18446744073709551615ULL / b)))) { /* begin primitiveFail */ if (!GIV(primFailCode)) { GIV(primFailCode) = 1; @@ -38621,7 +38621,7 @@
/* Protect against overflow */
- if (a > (18446744073709551615UL - b)) { + if (a > (18446744073709551615ULL - b)) { /* begin primitiveFail */ if (!GIV(primFailCode)) { GIV(primFailCode) = 1;
Modified: branches/Cog/src/vm/cointerpmt.h =================================================================== --- branches/Cog/src/vm/cointerpmt.h 2013-01-01 23:46:54 UTC (rev 2646) +++ branches/Cog/src/vm/cointerpmt.h 2013-01-02 19:49:06 UTC (rev 2647) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.241 uuid: 8ddbe9c0-6584-4c40-82c8-8e48a1dcf02a + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.243 uuid: 72a4a123-e10e-4d32-90dd-0b74014f02d3 */
Modified: branches/Cog/src/vm/exampleSqNamedPrims.h =================================================================== --- branches/Cog/src/vm/exampleSqNamedPrims.h 2013-01-01 23:46:54 UTC (rev 2646) +++ branches/Cog/src/vm/exampleSqNamedPrims.h 2013-01-02 19:49:06 UTC (rev 2647) @@ -1,5 +1,5 @@ /* This is an automatically generated table of all builtin modules in the VM - CoInterpreterPrimitives VMMaker.oscog-eem.233 + CoInterpreterMT VMMaker.oscog-eem.243 */
extern sqExport vm_exports[];
Modified: branches/Cog/src/vm/gcc3x-cointerp.c =================================================================== --- branches/Cog/src/vm/gcc3x-cointerp.c 2013-01-01 23:46:54 UTC (rev 2646) +++ branches/Cog/src/vm/gcc3x-cointerp.c 2013-01-02 19:49:06 UTC (rev 2647) @@ -2,11 +2,11 @@
/* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.241 uuid: 8ddbe9c0-6584-4c40-82c8-8e48a1dcf02a + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.243 uuid: 72a4a123-e10e-4d32-90dd-0b74014f02d3 from - CoInterpreter VMMaker.oscog-eem.241 uuid: 8ddbe9c0-6584-4c40-82c8-8e48a1dcf02a + CoInterpreter VMMaker.oscog-eem.243 uuid: 72a4a123-e10e-4d32-90dd-0b74014f02d3 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.241 uuid: 8ddbe9c0-6584-4c40-82c8-8e48a1dcf02a " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.243 uuid: 72a4a123-e10e-4d32-90dd-0b74014f02d3 " __DATE__ ; char *__interpBuildInfo = __buildInfo;
@@ -1921,7 +1921,7 @@ 0 }; static void (*externalPrimitiveTable[MaxExternalPrimitiveTableSize + 1 /* 4097 */])(void); static usqInt heapBase; -const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.241]"; +const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.243]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace;
@@ -24821,7 +24821,7 @@
/* Protect against overflow */
- if (a > (18446744073709551615UL - b)) { + if (a > (18446744073709551615ULL - b)) { /* begin primitiveFail */ if (!GIV(primFailCode)) { GIV(primFailCode) = 1; @@ -25719,7 +25719,7 @@
/* This is to avoid undue (usqInt) cast */
- result = 18446744073709551615UL; + result = 18446744073709551615ULL; if ((shift >= 64) || (a > (result >> shift))) { /* begin primitiveFail */ @@ -33646,7 +33646,7 @@ } if ((a > 1) && ((b > 1) - && (a > (18446744073709551615UL / b)))) { + && (a > (18446744073709551615ULL / b)))) { /* begin primitiveFail */ if (!GIV(primFailCode)) { GIV(primFailCode) = 1; @@ -37299,7 +37299,7 @@
/* Protect against overflow */
- if (a > (18446744073709551615UL - b)) { + if (a > (18446744073709551615ULL - b)) { /* begin primitiveFail */ if (!GIV(primFailCode)) { GIV(primFailCode) = 1;
Modified: branches/Cog/src/vm/gcc3x-cointerpmt.c =================================================================== --- branches/Cog/src/vm/gcc3x-cointerpmt.c 2013-01-01 23:46:54 UTC (rev 2646) +++ branches/Cog/src/vm/gcc3x-cointerpmt.c 2013-01-02 19:49:06 UTC (rev 2647) @@ -2,11 +2,11 @@
/* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.241 uuid: 8ddbe9c0-6584-4c40-82c8-8e48a1dcf02a + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.243 uuid: 72a4a123-e10e-4d32-90dd-0b74014f02d3 from - CoInterpreterMT VMMaker.oscog-eem.241 uuid: 8ddbe9c0-6584-4c40-82c8-8e48a1dcf02a + CoInterpreterMT VMMaker.oscog-eem.243 uuid: 72a4a123-e10e-4d32-90dd-0b74014f02d3 */ -static char __buildInfo[] = "CoInterpreterMT VMMaker.oscog-eem.241 uuid: 8ddbe9c0-6584-4c40-82c8-8e48a1dcf02a " __DATE__ ; +static char __buildInfo[] = "CoInterpreterMT VMMaker.oscog-eem.243 uuid: 72a4a123-e10e-4d32-90dd-0b74014f02d3 " __DATE__ ; char *__interpBuildInfo = __buildInfo;
@@ -2020,7 +2020,7 @@ 0 }; static void (*externalPrimitiveTable[MaxExternalPrimitiveTableSize + 1 /* 4097 */])(void); static usqInt heapBase; -const char *interpreterVersion = "Croquet Closure Cog MT VM [CoInterpreterMT VMMaker.oscog-eem.241]"; +const char *interpreterVersion = "Croquet Closure Cog MT VM [CoInterpreterMT VMMaker.oscog-eem.243]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; sqInt willNotThreadWarnCount; @@ -26059,7 +26059,7 @@
/* Protect against overflow */
- if (a > (18446744073709551615UL - b)) { + if (a > (18446744073709551615ULL - b)) { /* begin primitiveFail */ if (!GIV(primFailCode)) { GIV(primFailCode) = 1; @@ -26957,7 +26957,7 @@
/* This is to avoid undue (usqInt) cast */
- result = 18446744073709551615UL; + result = 18446744073709551615ULL; if ((shift >= 64) || (a > (result >> shift))) { /* begin primitiveFail */ @@ -34884,7 +34884,7 @@ } if ((a > 1) && ((b > 1) - && (a > (18446744073709551615UL / b)))) { + && (a > (18446744073709551615ULL / b)))) { /* begin primitiveFail */ if (!GIV(primFailCode)) { GIV(primFailCode) = 1; @@ -38630,7 +38630,7 @@
/* Protect against overflow */
- if (a > (18446744073709551615UL - b)) { + if (a > (18446744073709551615ULL - b)) { /* begin primitiveFail */ if (!GIV(primFailCode)) { GIV(primFailCode) = 1;
Modified: branches/Cog/src/vm/interp.h =================================================================== --- branches/Cog/src/vm/interp.h 2013-01-01 23:46:54 UTC (rev 2646) +++ branches/Cog/src/vm/interp.h 2013-01-02 19:49:06 UTC (rev 2647) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.241 uuid: 8ddbe9c0-6584-4c40-82c8-8e48a1dcf02a + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.243 uuid: 72a4a123-e10e-4d32-90dd-0b74014f02d3 */
#define VM_PROXY_MAJOR 1
Modified: branches/Cog/src/vm/vmCallback.h =================================================================== --- branches/Cog/src/vm/vmCallback.h 2013-01-01 23:46:54 UTC (rev 2646) +++ branches/Cog/src/vm/vmCallback.h 2013-01-02 19:49:06 UTC (rev 2647) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.241 uuid: 8ddbe9c0-6584-4c40-82c8-8e48a1dcf02a + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.243 uuid: 72a4a123-e10e-4d32-90dd-0b74014f02d3 */
#define VM_CALLBACK_INC 1
vm-dev@lists.squeakfoundation.org