[Vm-dev] [commit] r2496 - CogVM source as per VMMaker.oscog-eem.128
commits at squeakvm.org
commits at squeakvm.org
Wed Sep 28 01:21:15 UTC 2011
Author: eliot
Date: 2011-09-27 18:21:14 -0700 (Tue, 27 Sep 2011)
New Revision: 2496
Modified:
branches/Cog/nscogbuild/macbuild/installer/
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/platforms/Cross/vm/sqSCCSVersion.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
Log:
CogVM source as per VMMaker.oscog-eem.128
Fix regression in object-as-method/cannot-interpret for single and polymorphic
inline cache misses (lookup:for:methodAndErrorSelectorInto:).
Fix formatting bugette in context printing.
Suitable svn:ignore props for Newspeak mac installer dir.
Property changes on: branches/Cog/nscogbuild/macbuild/installer
___________________________________________________________________
Added: svn:ignore
+ *.applescript
*.dmg
Modified: branches/Cog/nscogsrc/vm/cogit.c
===================================================================
--- branches/Cog/nscogsrc/vm/cogit.c 2011-09-23 20:51:32 UTC (rev 2495)
+++ branches/Cog/nscogsrc/vm/cogit.c 2011-09-28 01:21:14 UTC (rev 2496)
@@ -1,9 +1,9 @@
/* Automatically generated by
- CCodeGenerator VMMaker.oscog-eem.127 uuid: 35927684-7e1e-4ff8-ad9f-90ecec7bb9a0
+ CCodeGenerator VMMaker.oscog-eem.128 uuid: 314823f6-cd6c-468f-9183-843b558f630b
from
- StackToRegisterMappingCogit VMMaker.oscog-eem.127 uuid: 35927684-7e1e-4ff8-ad9f-90ecec7bb9a0
+ StackToRegisterMappingCogit VMMaker.oscog-eem.128 uuid: 314823f6-cd6c-468f-9183-843b558f630b
*/
-static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.127 uuid: 35927684-7e1e-4ff8-ad9f-90ecec7bb9a0 " __DATE__ ;
+static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.128 uuid: 314823f6-cd6c-468f-9183-843b558f630b " __DATE__ ;
char *__cogitBuildInfo = __buildInfo;
@@ -315,6 +315,7 @@
#define RetN 10
#define RootBit 0x40000000
#define RootBitDigitLength 4
+#define SelectorCannotInterpret 34
#define SelectorDoesNotUnderstand 20
#define SenderIndex 0
#define SendNumArgsReg -6
@@ -2228,13 +2229,18 @@
selector = (cPIC->selector);
methodOrSelectorIndex = lookupreceiver(selector, receiver);
if ((((usqInt)methodOrSelectorIndex)) > (startOfMemory())) {
- assert(isOopCompiledMethod(methodOrSelectorIndex));
+ if (!(isOopCompiledMethod(methodOrSelectorIndex))) {
+ newTargetMethodOrNil = methodOrSelectorIndex;
+ errorSelectorOrNil = SelectorCannotInterpret;
+
+ goto l1;
+ }
if ((!(methodHasCogMethod(methodOrSelectorIndex)))
&& (methodShouldBeCogged(methodOrSelectorIndex))) {
cogselector(methodOrSelectorIndex, selector);
}
newTargetMethodOrNil = methodOrSelectorIndex;
- errorSelectorOrNil = 0;
+ errorSelectorOrNil = null;
goto l1;
}
@@ -2380,13 +2386,18 @@
selector = (targetMethod->selector);
methodOrSelectorIndex = lookupreceiver(selector, receiver);
if ((((usqInt)methodOrSelectorIndex)) > (startOfMemory())) {
- assert(isOopCompiledMethod(methodOrSelectorIndex));
+ if (!(isOopCompiledMethod(methodOrSelectorIndex))) {
+ newTargetMethodOrNil = methodOrSelectorIndex;
+ errorSelectorOrNil = SelectorCannotInterpret;
+
+ goto l1;
+ }
if ((!(methodHasCogMethod(methodOrSelectorIndex)))
&& (methodShouldBeCogged(methodOrSelectorIndex))) {
cogselector(methodOrSelectorIndex, selector);
}
newTargetMethodOrNil = methodOrSelectorIndex;
- errorSelectorOrNil = 0;
+ errorSelectorOrNil = null;
goto l1;
}
Modified: branches/Cog/nscogsrc/vm/cogit.h
===================================================================
--- branches/Cog/nscogsrc/vm/cogit.h 2011-09-23 20:51:32 UTC (rev 2495)
+++ branches/Cog/nscogsrc/vm/cogit.h 2011-09-28 01:21:14 UTC (rev 2496)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGenerator VMMaker.oscog-eem.127 uuid: 35927684-7e1e-4ff8-ad9f-90ecec7bb9a0
+ CCodeGenerator VMMaker.oscog-eem.128 uuid: 314823f6-cd6c-468f-9183-843b558f630b
*/
Modified: branches/Cog/nscogsrc/vm/cogmethod.h
===================================================================
--- branches/Cog/nscogsrc/vm/cogmethod.h 2011-09-23 20:51:32 UTC (rev 2495)
+++ branches/Cog/nscogsrc/vm/cogmethod.h 2011-09-28 01:21:14 UTC (rev 2496)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGenerator VMMaker.oscog-eem.127 uuid: 35927684-7e1e-4ff8-ad9f-90ecec7bb9a0
+ CCodeGenerator VMMaker.oscog-eem.128 uuid: 314823f6-cd6c-468f-9183-843b558f630b
*/
typedef struct {
Modified: branches/Cog/nscogsrc/vm/cointerp.c
===================================================================
--- branches/Cog/nscogsrc/vm/cointerp.c 2011-09-23 20:51:32 UTC (rev 2495)
+++ branches/Cog/nscogsrc/vm/cointerp.c 2011-09-28 01:21:14 UTC (rev 2496)
@@ -1,9 +1,9 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.125 uuid: 539c10db-ab19-4fc7-ada1-4ffae6463ed1
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.128 uuid: 314823f6-cd6c-468f-9183-843b558f630b
from
- CoInterpreter VMMaker.oscog-eem.125 uuid: 539c10db-ab19-4fc7-ada1-4ffae6463ed1
+ CoInterpreter VMMaker.oscog-eem.128 uuid: 314823f6-cd6c-468f-9183-843b558f630b
*/
-static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.125 uuid: 539c10db-ab19-4fc7-ada1-4ffae6463ed1 " __DATE__ ;
+static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.128 uuid: 314823f6-cd6c-468f-9183-843b558f630b " __DATE__ ;
char *__interpBuildInfo = __buildInfo;
@@ -1893,7 +1893,7 @@
/* 575 */ (void (*)(void))0,
0 };
static void (*externalPrimitiveTable[MaxExternalPrimitiveTableSize + 1 /* 4097 */])(void);
-const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.125";
+const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.128";
sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */;
volatile int sendTrace;
@@ -38160,6 +38160,9 @@
printNum(ip);
print(" (");
printNum((ip >> 1));
+ /* begin space */
+ /* begin printChar: */
+ putchar(' ');
printHex((ip >> 1));
/* begin printChar: */
putchar(')');
Modified: branches/Cog/nscogsrc/vm/cointerp.h
===================================================================
--- branches/Cog/nscogsrc/vm/cointerp.h 2011-09-23 20:51:32 UTC (rev 2495)
+++ branches/Cog/nscogsrc/vm/cointerp.h 2011-09-28 01:21:14 UTC (rev 2496)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.125 uuid: 539c10db-ab19-4fc7-ada1-4ffae6463ed1
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.128 uuid: 314823f6-cd6c-468f-9183-843b558f630b
*/
Modified: branches/Cog/nscogsrc/vm/gcc3x-cointerp.c
===================================================================
--- branches/Cog/nscogsrc/vm/gcc3x-cointerp.c 2011-09-23 20:51:32 UTC (rev 2495)
+++ branches/Cog/nscogsrc/vm/gcc3x-cointerp.c 2011-09-28 01:21:14 UTC (rev 2496)
@@ -2,11 +2,11 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.125 uuid: 539c10db-ab19-4fc7-ada1-4ffae6463ed1
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.128 uuid: 314823f6-cd6c-468f-9183-843b558f630b
from
- CoInterpreter VMMaker.oscog-eem.125 uuid: 539c10db-ab19-4fc7-ada1-4ffae6463ed1
+ CoInterpreter VMMaker.oscog-eem.128 uuid: 314823f6-cd6c-468f-9183-843b558f630b
*/
-static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.125 uuid: 539c10db-ab19-4fc7-ada1-4ffae6463ed1 " __DATE__ ;
+static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.128 uuid: 314823f6-cd6c-468f-9183-843b558f630b " __DATE__ ;
char *__interpBuildInfo = __buildInfo;
@@ -1896,7 +1896,7 @@
/* 575 */ (void (*)(void))0,
0 };
static void (*externalPrimitiveTable[MaxExternalPrimitiveTableSize + 1 /* 4097 */])(void);
-const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.125";
+const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.128";
sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */;
volatile int sendTrace;
@@ -38164,6 +38164,9 @@
printNum(ip);
print(" (");
printNum((ip >> 1));
+ /* begin space */
+ /* begin printChar: */
+ putchar(' ');
printHex((ip >> 1));
/* begin printChar: */
putchar(')');
Modified: branches/Cog/nscogsrc/vm/interp.h
===================================================================
--- branches/Cog/nscogsrc/vm/interp.h 2011-09-23 20:51:32 UTC (rev 2495)
+++ branches/Cog/nscogsrc/vm/interp.h 2011-09-28 01:21:14 UTC (rev 2496)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.125 uuid: 539c10db-ab19-4fc7-ada1-4ffae6463ed1
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.128 uuid: 314823f6-cd6c-468f-9183-843b558f630b
*/
#define VM_PROXY_MAJOR 1
Modified: branches/Cog/nscogsrc/vm/vmCallback.h
===================================================================
--- branches/Cog/nscogsrc/vm/vmCallback.h 2011-09-23 20:51:32 UTC (rev 2495)
+++ branches/Cog/nscogsrc/vm/vmCallback.h 2011-09-28 01:21:14 UTC (rev 2496)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.125 uuid: 539c10db-ab19-4fc7-ada1-4ffae6463ed1
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.128 uuid: 314823f6-cd6c-468f-9183-843b558f630b
*/
#define VM_CALLBACK_INC 1
Property changes on: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h
___________________________________________________________________
Modified: checkindate
- Fri Sep 23 13:46:40 PDT 2011
+ Tue Sep 27 18:19:30 PDT 2011
Modified: branches/Cog/src/vm/cogit.c
===================================================================
--- branches/Cog/src/vm/cogit.c 2011-09-23 20:51:32 UTC (rev 2495)
+++ branches/Cog/src/vm/cogit.c 2011-09-28 01:21:14 UTC (rev 2496)
@@ -1,9 +1,9 @@
/* Automatically generated by
- CCodeGenerator VMMaker.oscog-eem.127 uuid: 35927684-7e1e-4ff8-ad9f-90ecec7bb9a0
+ CCodeGenerator VMMaker.oscog-eem.128 uuid: 314823f6-cd6c-468f-9183-843b558f630b
from
- StackToRegisterMappingCogit VMMaker.oscog-eem.127 uuid: 35927684-7e1e-4ff8-ad9f-90ecec7bb9a0
+ StackToRegisterMappingCogit VMMaker.oscog-eem.128 uuid: 314823f6-cd6c-468f-9183-843b558f630b
*/
-static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.127 uuid: 35927684-7e1e-4ff8-ad9f-90ecec7bb9a0 " __DATE__ ;
+static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.128 uuid: 314823f6-cd6c-468f-9183-843b558f630b " __DATE__ ;
char *__cogitBuildInfo = __buildInfo;
@@ -315,6 +315,7 @@
#define RetN 10
#define RootBit 0x40000000
#define RootBitDigitLength 4
+#define SelectorCannotInterpret 34
#define SelectorDoesNotUnderstand 20
#define SenderIndex 0
#define SendNumArgsReg -6
@@ -2200,13 +2201,18 @@
selector = (cPIC->selector);
methodOrSelectorIndex = lookupreceiver(selector, receiver);
if ((((usqInt)methodOrSelectorIndex)) > (startOfMemory())) {
- assert(isOopCompiledMethod(methodOrSelectorIndex));
+ if (!(isOopCompiledMethod(methodOrSelectorIndex))) {
+ newTargetMethodOrNil = methodOrSelectorIndex;
+ errorSelectorOrNil = SelectorCannotInterpret;
+
+ goto l1;
+ }
if ((!(methodHasCogMethod(methodOrSelectorIndex)))
&& (methodShouldBeCogged(methodOrSelectorIndex))) {
cogselector(methodOrSelectorIndex, selector);
}
newTargetMethodOrNil = methodOrSelectorIndex;
- errorSelectorOrNil = 0;
+ errorSelectorOrNil = null;
goto l1;
}
@@ -2303,13 +2309,18 @@
selector = (targetMethod->selector);
methodOrSelectorIndex = lookupreceiver(selector, receiver);
if ((((usqInt)methodOrSelectorIndex)) > (startOfMemory())) {
- assert(isOopCompiledMethod(methodOrSelectorIndex));
+ if (!(isOopCompiledMethod(methodOrSelectorIndex))) {
+ newTargetMethodOrNil = methodOrSelectorIndex;
+ errorSelectorOrNil = SelectorCannotInterpret;
+
+ goto l1;
+ }
if ((!(methodHasCogMethod(methodOrSelectorIndex)))
&& (methodShouldBeCogged(methodOrSelectorIndex))) {
cogselector(methodOrSelectorIndex, selector);
}
newTargetMethodOrNil = methodOrSelectorIndex;
- errorSelectorOrNil = 0;
+ errorSelectorOrNil = null;
goto l1;
}
Modified: branches/Cog/src/vm/cogit.h
===================================================================
--- branches/Cog/src/vm/cogit.h 2011-09-23 20:51:32 UTC (rev 2495)
+++ branches/Cog/src/vm/cogit.h 2011-09-28 01:21:14 UTC (rev 2496)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGenerator VMMaker.oscog-eem.127 uuid: 35927684-7e1e-4ff8-ad9f-90ecec7bb9a0
+ CCodeGenerator VMMaker.oscog-eem.128 uuid: 314823f6-cd6c-468f-9183-843b558f630b
*/
Modified: branches/Cog/src/vm/cogmethod.h
===================================================================
--- branches/Cog/src/vm/cogmethod.h 2011-09-23 20:51:32 UTC (rev 2495)
+++ branches/Cog/src/vm/cogmethod.h 2011-09-28 01:21:14 UTC (rev 2496)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGenerator VMMaker.oscog-eem.127 uuid: 35927684-7e1e-4ff8-ad9f-90ecec7bb9a0
+ CCodeGenerator VMMaker.oscog-eem.128 uuid: 314823f6-cd6c-468f-9183-843b558f630b
*/
typedef struct {
Modified: branches/Cog/src/vm/cointerp.c
===================================================================
--- branches/Cog/src/vm/cointerp.c 2011-09-23 20:51:32 UTC (rev 2495)
+++ branches/Cog/src/vm/cointerp.c 2011-09-28 01:21:14 UTC (rev 2496)
@@ -1,9 +1,9 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.125 uuid: 539c10db-ab19-4fc7-ada1-4ffae6463ed1
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.128 uuid: 314823f6-cd6c-468f-9183-843b558f630b
from
- CoInterpreter VMMaker.oscog-eem.125 uuid: 539c10db-ab19-4fc7-ada1-4ffae6463ed1
+ CoInterpreter VMMaker.oscog-eem.128 uuid: 314823f6-cd6c-468f-9183-843b558f630b
*/
-static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.125 uuid: 539c10db-ab19-4fc7-ada1-4ffae6463ed1 " __DATE__ ;
+static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.128 uuid: 314823f6-cd6c-468f-9183-843b558f630b " __DATE__ ;
char *__interpBuildInfo = __buildInfo;
@@ -1884,7 +1884,7 @@
/* 575 */ (void (*)(void))0,
0 };
static void (*externalPrimitiveTable[MaxExternalPrimitiveTableSize + 1 /* 4097 */])(void);
-const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.125]";
+const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.128]";
sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */;
volatile int sendTrace;
@@ -37478,6 +37478,9 @@
printNum(ip);
print(" (");
printNum((ip >> 1));
+ /* begin space */
+ /* begin printChar: */
+ putchar(' ');
printHex((ip >> 1));
/* begin printChar: */
putchar(')');
Modified: branches/Cog/src/vm/cointerp.h
===================================================================
--- branches/Cog/src/vm/cointerp.h 2011-09-23 20:51:32 UTC (rev 2495)
+++ branches/Cog/src/vm/cointerp.h 2011-09-28 01:21:14 UTC (rev 2496)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.125 uuid: 539c10db-ab19-4fc7-ada1-4ffae6463ed1
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.128 uuid: 314823f6-cd6c-468f-9183-843b558f630b
*/
Modified: branches/Cog/src/vm/cointerpmt.c
===================================================================
--- branches/Cog/src/vm/cointerpmt.c 2011-09-23 20:51:32 UTC (rev 2495)
+++ branches/Cog/src/vm/cointerpmt.c 2011-09-28 01:21:14 UTC (rev 2496)
@@ -1,9 +1,9 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.125 uuid: 539c10db-ab19-4fc7-ada1-4ffae6463ed1
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.128 uuid: 314823f6-cd6c-468f-9183-843b558f630b
from
- CoInterpreterMT VMMaker.oscog-eem.125 uuid: 539c10db-ab19-4fc7-ada1-4ffae6463ed1
+ CoInterpreterMT VMMaker.oscog-eem.128 uuid: 314823f6-cd6c-468f-9183-843b558f630b
*/
-static char __buildInfo[] = "CoInterpreterMT VMMaker.oscog-eem.125 uuid: 539c10db-ab19-4fc7-ada1-4ffae6463ed1 " __DATE__ ;
+static char __buildInfo[] = "CoInterpreterMT VMMaker.oscog-eem.128 uuid: 314823f6-cd6c-468f-9183-843b558f630b " __DATE__ ;
char *__interpBuildInfo = __buildInfo;
@@ -1984,7 +1984,7 @@
/* 575 */ (void (*)(void))0,
0 };
static void (*externalPrimitiveTable[MaxExternalPrimitiveTableSize + 1 /* 4097 */])(void);
-const char *interpreterVersion = "Croquet Closure Cog MT VM [CoInterpreterMT VMMaker.oscog-eem.125]";
+const char *interpreterVersion = "Croquet Closure Cog MT VM [CoInterpreterMT VMMaker.oscog-eem.128]";
sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */;
volatile int sendTrace;
sqInt willNotThreadWarnCount;
@@ -38805,6 +38805,9 @@
printNum(ip);
print(" (");
printNum((ip >> 1));
+ /* begin space */
+ /* begin printChar: */
+ putchar(' ');
printHex((ip >> 1));
/* begin printChar: */
putchar(')');
Modified: branches/Cog/src/vm/cointerpmt.h
===================================================================
--- branches/Cog/src/vm/cointerpmt.h 2011-09-23 20:51:32 UTC (rev 2495)
+++ branches/Cog/src/vm/cointerpmt.h 2011-09-28 01:21:14 UTC (rev 2496)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.125 uuid: 539c10db-ab19-4fc7-ada1-4ffae6463ed1
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.128 uuid: 314823f6-cd6c-468f-9183-843b558f630b
*/
Modified: branches/Cog/src/vm/gcc3x-cointerp.c
===================================================================
--- branches/Cog/src/vm/gcc3x-cointerp.c 2011-09-23 20:51:32 UTC (rev 2495)
+++ branches/Cog/src/vm/gcc3x-cointerp.c 2011-09-28 01:21:14 UTC (rev 2496)
@@ -2,11 +2,11 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.125 uuid: 539c10db-ab19-4fc7-ada1-4ffae6463ed1
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.128 uuid: 314823f6-cd6c-468f-9183-843b558f630b
from
- CoInterpreter VMMaker.oscog-eem.125 uuid: 539c10db-ab19-4fc7-ada1-4ffae6463ed1
+ CoInterpreter VMMaker.oscog-eem.128 uuid: 314823f6-cd6c-468f-9183-843b558f630b
*/
-static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.125 uuid: 539c10db-ab19-4fc7-ada1-4ffae6463ed1 " __DATE__ ;
+static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.128 uuid: 314823f6-cd6c-468f-9183-843b558f630b " __DATE__ ;
char *__interpBuildInfo = __buildInfo;
@@ -1887,7 +1887,7 @@
/* 575 */ (void (*)(void))0,
0 };
static void (*externalPrimitiveTable[MaxExternalPrimitiveTableSize + 1 /* 4097 */])(void);
-const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.125]";
+const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.128]";
sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */;
volatile int sendTrace;
@@ -37482,6 +37482,9 @@
printNum(ip);
print(" (");
printNum((ip >> 1));
+ /* begin space */
+ /* begin printChar: */
+ putchar(' ');
printHex((ip >> 1));
/* begin printChar: */
putchar(')');
Modified: branches/Cog/src/vm/gcc3x-cointerpmt.c
===================================================================
--- branches/Cog/src/vm/gcc3x-cointerpmt.c 2011-09-23 20:51:32 UTC (rev 2495)
+++ branches/Cog/src/vm/gcc3x-cointerpmt.c 2011-09-28 01:21:14 UTC (rev 2496)
@@ -2,11 +2,11 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.125 uuid: 539c10db-ab19-4fc7-ada1-4ffae6463ed1
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.128 uuid: 314823f6-cd6c-468f-9183-843b558f630b
from
- CoInterpreterMT VMMaker.oscog-eem.125 uuid: 539c10db-ab19-4fc7-ada1-4ffae6463ed1
+ CoInterpreterMT VMMaker.oscog-eem.128 uuid: 314823f6-cd6c-468f-9183-843b558f630b
*/
-static char __buildInfo[] = "CoInterpreterMT VMMaker.oscog-eem.125 uuid: 539c10db-ab19-4fc7-ada1-4ffae6463ed1 " __DATE__ ;
+static char __buildInfo[] = "CoInterpreterMT VMMaker.oscog-eem.128 uuid: 314823f6-cd6c-468f-9183-843b558f630b " __DATE__ ;
char *__interpBuildInfo = __buildInfo;
@@ -1987,7 +1987,7 @@
/* 575 */ (void (*)(void))0,
0 };
static void (*externalPrimitiveTable[MaxExternalPrimitiveTableSize + 1 /* 4097 */])(void);
-const char *interpreterVersion = "Croquet Closure Cog MT VM [CoInterpreterMT VMMaker.oscog-eem.125]";
+const char *interpreterVersion = "Croquet Closure Cog MT VM [CoInterpreterMT VMMaker.oscog-eem.128]";
sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */;
volatile int sendTrace;
sqInt willNotThreadWarnCount;
@@ -38809,6 +38809,9 @@
printNum(ip);
print(" (");
printNum((ip >> 1));
+ /* begin space */
+ /* begin printChar: */
+ putchar(' ');
printHex((ip >> 1));
/* begin printChar: */
putchar(')');
Modified: branches/Cog/src/vm/interp.h
===================================================================
--- branches/Cog/src/vm/interp.h 2011-09-23 20:51:32 UTC (rev 2495)
+++ branches/Cog/src/vm/interp.h 2011-09-28 01:21:14 UTC (rev 2496)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.125 uuid: 539c10db-ab19-4fc7-ada1-4ffae6463ed1
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.128 uuid: 314823f6-cd6c-468f-9183-843b558f630b
*/
#define VM_PROXY_MAJOR 1
Modified: branches/Cog/src/vm/vmCallback.h
===================================================================
--- branches/Cog/src/vm/vmCallback.h 2011-09-23 20:51:32 UTC (rev 2495)
+++ branches/Cog/src/vm/vmCallback.h 2011-09-28 01:21:14 UTC (rev 2496)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.125 uuid: 539c10db-ab19-4fc7-ada1-4ffae6463ed1
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.128 uuid: 314823f6-cd6c-468f-9183-843b558f630b
*/
#define VM_CALLBACK_INC 1
More information about the Vm-dev
mailing list