Revision: 2641 Author: eliot Date: 2012-12-20 16:45:13 -0800 (Thu, 20 Dec 2012) Log Message: ----------- Correct the const declarations in the Cogit.
Comment the MULTIPLE_BYTECODE_SETS vm parameter #65.
Modified Paths: -------------- branches/Cog/nscogsrc/vm/cogit.c branches/Cog/nscogsrc/vm/cogit.h branches/Cog/nscogsrc/vm/cogmethod.h 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/src/vm/cogit.c branches/Cog/src/vm/cogit.h branches/Cog/src/vm/cogmethod.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
Property Changed: ---------------- branches/Cog/platforms/Cross/vm/sqSCCSVersion.h
Modified: branches/Cog/nscogsrc/vm/cogit.c =================================================================== --- branches/Cog/nscogsrc/vm/cogit.c 2012-12-20 20:39:20 UTC (rev 2640) +++ branches/Cog/nscogsrc/vm/cogit.c 2012-12-21 00:45:13 UTC (rev 2641) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.240 uuid: f72e2cd1-8b0e-45af-acd7-06ba9bbc2a50 + CCodeGenerator VMMaker.oscog-eem.241 uuid: 8ddbe9c0-6584-4c40-82c8-8e48a1dcf02a from - StackToRegisterMappingCogit VMMaker.oscog-eem.240 uuid: f72e2cd1-8b0e-45af-acd7-06ba9bbc2a50 + StackToRegisterMappingCogit VMMaker.oscog-eem.241 uuid: 8ddbe9c0-6584-4c40-82c8-8e48a1dcf02a */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.240 uuid: f72e2cd1-8b0e-45af-acd7-06ba9bbc2a50 " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.241 uuid: 8ddbe9c0-6584-4c40-82c8-8e48a1dcf02a " __DATE__ ; char *__cogitBuildInfo = __buildInfo;
@@ -1048,7 +1048,7 @@ static AbstractInstruction aMethodLabel; static sqInt annotationIndex; static InstructionAnnotation * annotations; -static const AbstractInstruction *backEnd = &aMethodLabel; +static AbstractInstruction * const backEnd = &aMethodLabel; static usqInt baseAddress; static sqInt blockCount; static AbstractInstruction * blockEntryLabel; @@ -1662,7 +1662,7 @@ static sqInt methodAbortTrampolines[4]; static sqInt methodBytesFreedSinceLastCompaction; static sqInt methodCount; -static AbstractInstruction *methodLabel = &aMethodLabel; +static AbstractInstruction * const methodLabel = &aMethodLabel; static sqInt methodObj; static sqInt methodOrBlockNumArgs; static sqInt methodOrBlockNumTemps; @@ -3818,7 +3818,7 @@ sqInt initialAnnotationIndex; sqInt initialOpcodeIndex; sqInt initialStackPtr; - const sqInt (*pushNilSizeFunction)(sqInt) = v3or4PushNilSize; + sqInt (* const pushNilSizeFunction)(sqInt) = v3or4PushNilSize; sqInt result; sqInt savedNeedsFrame; sqInt savedNumArgs; @@ -16952,7 +16952,7 @@ { BytecodeDescriptor *descriptor; sqInt end; - const sqInt (*isPushNilFunction)(struct _BytecodeDescriptor *,sqInt,sqInt,sqInt) = v3or4IsPushNil; + sqInt (* const isPushNilFunction)(struct _BytecodeDescriptor *,sqInt,sqInt,sqInt) = v3or4IsPushNil; sqInt nExts; sqInt pc; sqInt pushingNils;
Modified: branches/Cog/nscogsrc/vm/cogit.h =================================================================== --- branches/Cog/nscogsrc/vm/cogit.h 2012-12-20 20:39:20 UTC (rev 2640) +++ branches/Cog/nscogsrc/vm/cogit.h 2012-12-21 00:45:13 UTC (rev 2641) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.240 uuid: f72e2cd1-8b0e-45af-acd7-06ba9bbc2a50 + CCodeGenerator VMMaker.oscog-eem.241 uuid: 8ddbe9c0-6584-4c40-82c8-8e48a1dcf02a */
Modified: branches/Cog/nscogsrc/vm/cogmethod.h =================================================================== --- branches/Cog/nscogsrc/vm/cogmethod.h 2012-12-20 20:39:20 UTC (rev 2640) +++ branches/Cog/nscogsrc/vm/cogmethod.h 2012-12-21 00:45:13 UTC (rev 2641) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.240 uuid: f72e2cd1-8b0e-45af-acd7-06ba9bbc2a50 + CCodeGenerator VMMaker.oscog-eem.241 uuid: 8ddbe9c0-6584-4c40-82c8-8e48a1dcf02a */
typedef struct {
Modified: branches/Cog/nscogsrc/vm/cointerp.c =================================================================== --- branches/Cog/nscogsrc/vm/cointerp.c 2012-12-20 20:39:20 UTC (rev 2640) +++ branches/Cog/nscogsrc/vm/cointerp.c 2012-12-21 00:45:13 UTC (rev 2641) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.240 uuid: f72e2cd1-8b0e-45af-acd7-06ba9bbc2a50 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.241 uuid: 8ddbe9c0-6584-4c40-82c8-8e48a1dcf02a from - CoInterpreter VMMaker.oscog-eem.240 uuid: f72e2cd1-8b0e-45af-acd7-06ba9bbc2a50 + CoInterpreter VMMaker.oscog-eem.241 uuid: 8ddbe9c0-6584-4c40-82c8-8e48a1dcf02a */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.240 uuid: f72e2cd1-8b0e-45af-acd7-06ba9bbc2a50 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.241 uuid: 8ddbe9c0-6584-4c40-82c8-8e48a1dcf02a " __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.240"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.241"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace;
@@ -42740,7 +42740,8 @@ nil) 63 total milliseconds in compiled code compactions since startup (read-only; Cog only; otherwise nil) 64 the number of methods that currently have jitted machine-code - 65 - 69 reserved for more Cog-related info + 65 whether the VM supports MULTIPLE_BYTECODE_SETS or not. + 66 - 69 reserved for more Cog-related info 70 the vmProxyMajorVersion (the interpreterProxy VM_MAJOR_VERSION) 71 the vmProxyMinorVersion (the interpreterProxy VM_MINOR_VERSION) Note: Thanks to Ian Piumarta for this primitive. */
Modified: branches/Cog/nscogsrc/vm/cointerp.h =================================================================== --- branches/Cog/nscogsrc/vm/cointerp.h 2012-12-20 20:39:20 UTC (rev 2640) +++ branches/Cog/nscogsrc/vm/cointerp.h 2012-12-21 00:45:13 UTC (rev 2641) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.240 uuid: f72e2cd1-8b0e-45af-acd7-06ba9bbc2a50 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.241 uuid: 8ddbe9c0-6584-4c40-82c8-8e48a1dcf02a */
Modified: branches/Cog/nscogsrc/vm/gcc3x-cointerp.c =================================================================== --- branches/Cog/nscogsrc/vm/gcc3x-cointerp.c 2012-12-20 20:39:20 UTC (rev 2640) +++ branches/Cog/nscogsrc/vm/gcc3x-cointerp.c 2012-12-21 00:45:13 UTC (rev 2641) @@ -2,11 +2,11 @@
/* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.240 uuid: f72e2cd1-8b0e-45af-acd7-06ba9bbc2a50 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.241 uuid: 8ddbe9c0-6584-4c40-82c8-8e48a1dcf02a from - CoInterpreter VMMaker.oscog-eem.240 uuid: f72e2cd1-8b0e-45af-acd7-06ba9bbc2a50 + CoInterpreter VMMaker.oscog-eem.241 uuid: 8ddbe9c0-6584-4c40-82c8-8e48a1dcf02a */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.240 uuid: f72e2cd1-8b0e-45af-acd7-06ba9bbc2a50 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.241 uuid: 8ddbe9c0-6584-4c40-82c8-8e48a1dcf02a " __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.240"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.241"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace;
@@ -42749,7 +42749,8 @@ nil) 63 total milliseconds in compiled code compactions since startup (read-only; Cog only; otherwise nil) 64 the number of methods that currently have jitted machine-code - 65 - 69 reserved for more Cog-related info + 65 whether the VM supports MULTIPLE_BYTECODE_SETS or not. + 66 - 69 reserved for more Cog-related info 70 the vmProxyMajorVersion (the interpreterProxy VM_MAJOR_VERSION) 71 the vmProxyMinorVersion (the interpreterProxy VM_MINOR_VERSION) Note: Thanks to Ian Piumarta for this primitive. */
Modified: branches/Cog/nscogsrc/vm/interp.h =================================================================== --- branches/Cog/nscogsrc/vm/interp.h 2012-12-20 20:39:20 UTC (rev 2640) +++ branches/Cog/nscogsrc/vm/interp.h 2012-12-21 00:45:13 UTC (rev 2641) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.240 uuid: f72e2cd1-8b0e-45af-acd7-06ba9bbc2a50 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.241 uuid: 8ddbe9c0-6584-4c40-82c8-8e48a1dcf02a */
#define VM_PROXY_MAJOR 1
Modified: branches/Cog/nscogsrc/vm/vmCallback.h =================================================================== --- branches/Cog/nscogsrc/vm/vmCallback.h 2012-12-20 20:39:20 UTC (rev 2640) +++ branches/Cog/nscogsrc/vm/vmCallback.h 2012-12-21 00:45:13 UTC (rev 2641) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.240 uuid: f72e2cd1-8b0e-45af-acd7-06ba9bbc2a50 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.241 uuid: 8ddbe9c0-6584-4c40-82c8-8e48a1dcf02a */
#define VM_CALLBACK_INC 1
Property changes on: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h ___________________________________________________________________ Modified: checkindate - Thu Dec 20 12:36:08 PST 2012 + Thu Dec 20 16:44:39 PST 2012
Modified: branches/Cog/src/vm/cogit.c =================================================================== --- branches/Cog/src/vm/cogit.c 2012-12-20 20:39:20 UTC (rev 2640) +++ branches/Cog/src/vm/cogit.c 2012-12-21 00:45:13 UTC (rev 2641) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.240 uuid: f72e2cd1-8b0e-45af-acd7-06ba9bbc2a50 + CCodeGenerator VMMaker.oscog-eem.241 uuid: 8ddbe9c0-6584-4c40-82c8-8e48a1dcf02a from - StackToRegisterMappingCogit VMMaker.oscog-eem.240 uuid: f72e2cd1-8b0e-45af-acd7-06ba9bbc2a50 + StackToRegisterMappingCogit VMMaker.oscog-eem.241 uuid: 8ddbe9c0-6584-4c40-82c8-8e48a1dcf02a */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.240 uuid: f72e2cd1-8b0e-45af-acd7-06ba9bbc2a50 " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.241 uuid: 8ddbe9c0-6584-4c40-82c8-8e48a1dcf02a " __DATE__ ; char *__cogitBuildInfo = __buildInfo;
@@ -1002,7 +1002,7 @@ static AbstractInstruction aMethodLabel; static sqInt annotationIndex; static InstructionAnnotation * annotations; -static const AbstractInstruction *backEnd = &aMethodLabel; +static AbstractInstruction * const backEnd = &aMethodLabel; static usqInt baseAddress; static sqInt blockCount; static AbstractInstruction * blockEntryLabel; @@ -1354,7 +1354,7 @@ static sqInt methodAbortTrampolines[4]; static sqInt methodBytesFreedSinceLastCompaction; static sqInt methodCount; -static AbstractInstruction *methodLabel = &aMethodLabel; +static AbstractInstruction * const methodLabel = &aMethodLabel; static sqInt methodObj; static sqInt methodOrBlockNumArgs; static sqInt methodOrBlockNumTemps; @@ -3406,7 +3406,7 @@ sqInt initialAnnotationIndex; sqInt initialOpcodeIndex; sqInt initialStackPtr; - const sqInt (*pushNilSizeFunction)(sqInt) = v3PushNilSize; + sqInt (* const pushNilSizeFunction)(sqInt) = v3PushNilSize; sqInt result; sqInt savedNeedsFrame; sqInt savedNumArgs; @@ -15642,7 +15642,7 @@ { BytecodeDescriptor *descriptor; sqInt end; - const sqInt (*isPushNilFunction)(struct _BytecodeDescriptor *,sqInt,sqInt,sqInt) = v3IsPushNil; + sqInt (* const isPushNilFunction)(struct _BytecodeDescriptor *,sqInt,sqInt,sqInt) = v3IsPushNil; sqInt nExts; sqInt pc; sqInt pushingNils;
Modified: branches/Cog/src/vm/cogit.h =================================================================== --- branches/Cog/src/vm/cogit.h 2012-12-20 20:39:20 UTC (rev 2640) +++ branches/Cog/src/vm/cogit.h 2012-12-21 00:45:13 UTC (rev 2641) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.240 uuid: f72e2cd1-8b0e-45af-acd7-06ba9bbc2a50 + CCodeGenerator VMMaker.oscog-eem.241 uuid: 8ddbe9c0-6584-4c40-82c8-8e48a1dcf02a */
Modified: branches/Cog/src/vm/cogmethod.h =================================================================== --- branches/Cog/src/vm/cogmethod.h 2012-12-20 20:39:20 UTC (rev 2640) +++ branches/Cog/src/vm/cogmethod.h 2012-12-21 00:45:13 UTC (rev 2641) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.240 uuid: f72e2cd1-8b0e-45af-acd7-06ba9bbc2a50 + CCodeGenerator VMMaker.oscog-eem.241 uuid: 8ddbe9c0-6584-4c40-82c8-8e48a1dcf02a */
typedef struct {
Modified: branches/Cog/src/vm/cointerp.c =================================================================== --- branches/Cog/src/vm/cointerp.c 2012-12-20 20:39:20 UTC (rev 2640) +++ branches/Cog/src/vm/cointerp.c 2012-12-21 00:45:13 UTC (rev 2641) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.240 uuid: f72e2cd1-8b0e-45af-acd7-06ba9bbc2a50 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.241 uuid: 8ddbe9c0-6584-4c40-82c8-8e48a1dcf02a from - CoInterpreter VMMaker.oscog-eem.240 uuid: f72e2cd1-8b0e-45af-acd7-06ba9bbc2a50 + CoInterpreter VMMaker.oscog-eem.241 uuid: 8ddbe9c0-6584-4c40-82c8-8e48a1dcf02a */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.240 uuid: f72e2cd1-8b0e-45af-acd7-06ba9bbc2a50 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.241 uuid: 8ddbe9c0-6584-4c40-82c8-8e48a1dcf02a " __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.240]"; +const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.241]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace;
@@ -38231,7 +38231,8 @@ nil) 63 total milliseconds in compiled code compactions since startup (read-only; Cog only; otherwise nil) 64 the number of methods that currently have jitted machine-code - 65 - 69 reserved for more Cog-related info + 65 whether the VM supports MULTIPLE_BYTECODE_SETS or not. + 66 - 69 reserved for more Cog-related info 70 the vmProxyMajorVersion (the interpreterProxy VM_MAJOR_VERSION) 71 the vmProxyMinorVersion (the interpreterProxy VM_MINOR_VERSION) Note: Thanks to Ian Piumarta for this primitive. */
Modified: branches/Cog/src/vm/cointerp.h =================================================================== --- branches/Cog/src/vm/cointerp.h 2012-12-20 20:39:20 UTC (rev 2640) +++ branches/Cog/src/vm/cointerp.h 2012-12-21 00:45:13 UTC (rev 2641) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.240 uuid: f72e2cd1-8b0e-45af-acd7-06ba9bbc2a50 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.241 uuid: 8ddbe9c0-6584-4c40-82c8-8e48a1dcf02a */
Modified: branches/Cog/src/vm/cointerpmt.c =================================================================== --- branches/Cog/src/vm/cointerpmt.c 2012-12-20 20:39:20 UTC (rev 2640) +++ branches/Cog/src/vm/cointerpmt.c 2012-12-21 00:45:13 UTC (rev 2641) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.240 uuid: f72e2cd1-8b0e-45af-acd7-06ba9bbc2a50 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.241 uuid: 8ddbe9c0-6584-4c40-82c8-8e48a1dcf02a from - CoInterpreterMT VMMaker.oscog-eem.240 uuid: f72e2cd1-8b0e-45af-acd7-06ba9bbc2a50 + CoInterpreterMT VMMaker.oscog-eem.241 uuid: 8ddbe9c0-6584-4c40-82c8-8e48a1dcf02a */ -static char __buildInfo[] = "CoInterpreterMT VMMaker.oscog-eem.240 uuid: f72e2cd1-8b0e-45af-acd7-06ba9bbc2a50 " __DATE__ ; +static char __buildInfo[] = "CoInterpreterMT VMMaker.oscog-eem.241 uuid: 8ddbe9c0-6584-4c40-82c8-8e48a1dcf02a " __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.240]"; +const char *interpreterVersion = "Croquet Closure Cog MT VM [CoInterpreterMT VMMaker.oscog-eem.241]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; sqInt willNotThreadWarnCount; @@ -39580,7 +39580,8 @@ nil) 63 total milliseconds in compiled code compactions since startup (read-only; Cog only; otherwise nil) 64 the number of methods that currently have jitted machine-code - 65 - 69 reserved for more Cog-related info + 65 whether the VM supports MULTIPLE_BYTECODE_SETS or not. + 66 - 69 reserved for more Cog-related info 70 the vmProxyMajorVersion (the interpreterProxy VM_MAJOR_VERSION) 71 the vmProxyMinorVersion (the interpreterProxy VM_MINOR_VERSION) Note: Thanks to Ian Piumarta for this primitive. */
Modified: branches/Cog/src/vm/cointerpmt.h =================================================================== --- branches/Cog/src/vm/cointerpmt.h 2012-12-20 20:39:20 UTC (rev 2640) +++ branches/Cog/src/vm/cointerpmt.h 2012-12-21 00:45:13 UTC (rev 2641) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.240 uuid: f72e2cd1-8b0e-45af-acd7-06ba9bbc2a50 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.241 uuid: 8ddbe9c0-6584-4c40-82c8-8e48a1dcf02a */
Modified: branches/Cog/src/vm/gcc3x-cointerp.c =================================================================== --- branches/Cog/src/vm/gcc3x-cointerp.c 2012-12-20 20:39:20 UTC (rev 2640) +++ branches/Cog/src/vm/gcc3x-cointerp.c 2012-12-21 00:45:13 UTC (rev 2641) @@ -2,11 +2,11 @@
/* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.240 uuid: f72e2cd1-8b0e-45af-acd7-06ba9bbc2a50 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.241 uuid: 8ddbe9c0-6584-4c40-82c8-8e48a1dcf02a from - CoInterpreter VMMaker.oscog-eem.240 uuid: f72e2cd1-8b0e-45af-acd7-06ba9bbc2a50 + CoInterpreter VMMaker.oscog-eem.241 uuid: 8ddbe9c0-6584-4c40-82c8-8e48a1dcf02a */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.240 uuid: f72e2cd1-8b0e-45af-acd7-06ba9bbc2a50 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.241 uuid: 8ddbe9c0-6584-4c40-82c8-8e48a1dcf02a " __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.240]"; +const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.241]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace;
@@ -38240,7 +38240,8 @@ nil) 63 total milliseconds in compiled code compactions since startup (read-only; Cog only; otherwise nil) 64 the number of methods that currently have jitted machine-code - 65 - 69 reserved for more Cog-related info + 65 whether the VM supports MULTIPLE_BYTECODE_SETS or not. + 66 - 69 reserved for more Cog-related info 70 the vmProxyMajorVersion (the interpreterProxy VM_MAJOR_VERSION) 71 the vmProxyMinorVersion (the interpreterProxy VM_MINOR_VERSION) Note: Thanks to Ian Piumarta for this primitive. */
Modified: branches/Cog/src/vm/gcc3x-cointerpmt.c =================================================================== --- branches/Cog/src/vm/gcc3x-cointerpmt.c 2012-12-20 20:39:20 UTC (rev 2640) +++ branches/Cog/src/vm/gcc3x-cointerpmt.c 2012-12-21 00:45:13 UTC (rev 2641) @@ -2,11 +2,11 @@
/* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.240 uuid: f72e2cd1-8b0e-45af-acd7-06ba9bbc2a50 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.241 uuid: 8ddbe9c0-6584-4c40-82c8-8e48a1dcf02a from - CoInterpreterMT VMMaker.oscog-eem.240 uuid: f72e2cd1-8b0e-45af-acd7-06ba9bbc2a50 + CoInterpreterMT VMMaker.oscog-eem.241 uuid: 8ddbe9c0-6584-4c40-82c8-8e48a1dcf02a */ -static char __buildInfo[] = "CoInterpreterMT VMMaker.oscog-eem.240 uuid: f72e2cd1-8b0e-45af-acd7-06ba9bbc2a50 " __DATE__ ; +static char __buildInfo[] = "CoInterpreterMT VMMaker.oscog-eem.241 uuid: 8ddbe9c0-6584-4c40-82c8-8e48a1dcf02a " __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.240]"; +const char *interpreterVersion = "Croquet Closure Cog MT VM [CoInterpreterMT VMMaker.oscog-eem.241]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; sqInt willNotThreadWarnCount; @@ -39589,7 +39589,8 @@ nil) 63 total milliseconds in compiled code compactions since startup (read-only; Cog only; otherwise nil) 64 the number of methods that currently have jitted machine-code - 65 - 69 reserved for more Cog-related info + 65 whether the VM supports MULTIPLE_BYTECODE_SETS or not. + 66 - 69 reserved for more Cog-related info 70 the vmProxyMajorVersion (the interpreterProxy VM_MAJOR_VERSION) 71 the vmProxyMinorVersion (the interpreterProxy VM_MINOR_VERSION) Note: Thanks to Ian Piumarta for this primitive. */
Modified: branches/Cog/src/vm/interp.h =================================================================== --- branches/Cog/src/vm/interp.h 2012-12-20 20:39:20 UTC (rev 2640) +++ branches/Cog/src/vm/interp.h 2012-12-21 00:45:13 UTC (rev 2641) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.240 uuid: f72e2cd1-8b0e-45af-acd7-06ba9bbc2a50 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.241 uuid: 8ddbe9c0-6584-4c40-82c8-8e48a1dcf02a */
#define VM_PROXY_MAJOR 1
Modified: branches/Cog/src/vm/vmCallback.h =================================================================== --- branches/Cog/src/vm/vmCallback.h 2012-12-20 20:39:20 UTC (rev 2640) +++ branches/Cog/src/vm/vmCallback.h 2012-12-21 00:45:13 UTC (rev 2641) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.240 uuid: f72e2cd1-8b0e-45af-acd7-06ba9bbc2a50 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.241 uuid: 8ddbe9c0-6584-4c40-82c8-8e48a1dcf02a */
#define VM_CALLBACK_INC 1
vm-dev@lists.squeakfoundation.org