Vm-dev September 2011

vm-dev@lists.squeakfoundation.org

35 participants
70 discussions

[commit] r2496 - CogVM source as per VMMaker.oscog-eem.128
by commits＠squeakvm.org 28 Sep '11

28 Sep '11

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

1 0

VM Maker: VMMaker.oscog-eem.128.mcz
by commits＠source.squeak.org 28 Sep '11

28 Sep '11

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.128.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.128 Author: eem Time: 27 September 2011, 5:43:54.942 pm UUID: 314823f6-cd6c-468f-9183-843b558f630b Ancestors: VMMaker.oscog-eem.127 Fix regression in object-as-method/cannot-interpret for single and polymorphic inline cache misses (lookup:for:methodAndErrorSelectorInto:). Fix formatting bugette in context printing. =============== Diff against VMMaker.oscog-eem.127 =============== Item was changed: ----- Method: Cogit>>lookup:for:methodAndErrorSelectorInto: (in category 'in-line cacheing') ----- lookup: selector for: receiver methodAndErrorSelectorInto: binaryBlock "Lookup selector in the class of receiver. If found, evaluate binaryBlock with + the method, cogged if appropriate.. If not found, due to MNU, lookup the DNU + selector and evaluate binaryBlock with the MNU method, cogged if appropriate.. - the method, cogged if appopriate.. If not found, due to MNU, lookup the DNU - selector and evaluate binaryBlock with the MNU method, cogged if appopriate.. If not found due to cannot interpret, evaluate binaryBlock with the error selector and a nil method." | methodOrSelectorIndex | <inline: true> methodOrSelectorIndex := coInterpreter lookup: selector receiver: receiver. methodOrSelectorIndex asUnsignedInteger > objectMemory startOfMemory ifTrue: + [(objectMemory isOopCompiledMethod: methodOrSelectorIndex) ifFalse: + [^binaryBlock value: methodOrSelectorIndex value: SelectorCannotInterpret]. - [self assert: (objectMemory isOopCompiledMethod: methodOrSelectorIndex). ((coInterpreter methodHasCogMethod: methodOrSelectorIndex) not and: [coInterpreter methodShouldBeCogged: methodOrSelectorIndex]) ifTrue: ["We assume cog:selector: will *not* reclaim the method zone" self cog: methodOrSelectorIndex selector: selector]. + ^binaryBlock value: methodOrSelectorIndex value: nil]. - ^binaryBlock value: methodOrSelectorIndex value: 0]. methodOrSelectorIndex = SelectorDoesNotUnderstand ifTrue: [methodOrSelectorIndex := coInterpreter lookup: (objectMemory splObj: SelectorDoesNotUnderstand) receiver: receiver. methodOrSelectorIndex asUnsignedInteger > objectMemory startOfMemory ifTrue: [self assert: (objectMemory isOopCompiledMethod: methodOrSelectorIndex). ((coInterpreter methodHasCogMethod: methodOrSelectorIndex) not and: [coInterpreter methodShouldBeCogged: methodOrSelectorIndex]) ifTrue: ["We assume cog:selector: will *not* reclaim the method zone" self cog: methodOrSelectorIndex selector: selector]. ^binaryBlock value: methodOrSelectorIndex value: SelectorDoesNotUnderstand]]. ^binaryBlock value: methodOrSelectorIndex value: nil! Item was changed: ----- Method: NewspeakInterpreter>>printContext: (in category 'debug printing') ----- printContext: aContext | sender ip sp na spc | <api> <inline: false> self shortPrintContext: aContext. sender := self fetchPointer: SenderIndex ofObject: aContext. ip := self fetchPointer: InstructionPointerIndex ofObject: aContext. self print: 'sender '; shortPrintOop: sender. + self print: 'ip '; printNum: ip; print: ' ('; printNum: (self integerValueOf: ip); space; printHex: (self integerValueOf: ip); printChar: $); cr. - self print: 'ip '; printNum: ip; print: ' ('; printNum: (self integerValueOf: ip); printHex: (self integerValueOf: ip); printChar: $); cr. sp := self fetchPointer: StackPointerIndex ofObject: aContext. self print: 'sp '; printNum: sp; print: ' ('; printNum: (self integerValueOf: sp); printChar: $); cr. (self isMethodContext: aContext) ifTrue: [self print: 'method '; shortPrintOop: (self fetchPointer: MethodIndex ofObject: aContext). self print: 'closure '; shortPrintOop: (self fetchPointer: ClosureIndex ofObject: aContext). self print: 'receiver '; shortPrintOop: (self fetchPointer: ReceiverIndex ofObject: aContext)] ifFalse: [na := self fetchPointer: BlockArgumentCountIndex ofObject: aContext. self print: 'numargs '; printNum: na; print: ' ('; printNum: (self integerValueOf: na); printChar: $); cr. spc := self fetchPointer: InitialIPIndex ofObject: aContext. self print: 'startpc '; printNum: spc; print: ' ('; printNum: (self integerValueOf: spc); printChar: $); cr. self print: 'home '; shortPrintOop: (self fetchPointer: HomeIndex ofObject: aContext)]. sp := self integerValueOf: sp. sp := sp min: (self lengthOf: aContext) - ReceiverIndex. 1 to: sp do: [:i| self print: ' '; printNum: i; space; shortPrintOop: (self fetchPointer: ReceiverIndex + i ofObject: aContext)]! Item was changed: ----- Method: NewspeakInterpreter>>printContext:WithSP: (in category 'debug printing') ----- printContext: aContext WithSP: theSP | sender ip na spc sp | <api> <inline: false> self shortPrintContext: aContext. sender := self fetchPointer: SenderIndex ofObject: aContext. ip := self fetchPointer: InstructionPointerIndex ofObject: aContext. sp := self integerObjectOf: (self stackPointerIndexFor: theSP context: aContext) - ReceiverIndex. self print: 'sender '; shortPrintOop: sender. + self print: 'ip '; printNum: ip; print: ' ('; printNum: (self integerValueOf: ip); space; printHex: (self integerValueOf: ip); printChar: $); cr. - self print: 'ip '; printNum: ip; print: ' ('; printNum: (self integerValueOf: ip); printHex: (self integerValueOf: ip); printChar: $); cr. self print: 'sp '; printNum: sp; print: ' ('; printNum: (self integerValueOf: sp); printChar: $); cr. (self isMethodContext: aContext) ifTrue: [self print: 'method '; shortPrintOop: (self fetchPointer: MethodIndex ofObject: aContext). self print: 'closure '; shortPrintOop: (self fetchPointer: ClosureIndex ofObject: aContext). self print: 'receiver '; shortPrintOop: (self fetchPointer: ReceiverIndex ofObject: aContext)] ifFalse: [na := self fetchPointer: BlockArgumentCountIndex ofObject: aContext. self print: 'numargs '; printNum: na; print: ' ('; printNum: (self integerValueOf: na); printChar: $); cr. spc := self fetchPointer: InitialIPIndex ofObject: aContext. self print: 'startpc '; printNum: spc; print: ' ('; printNum: (self integerValueOf: spc); printChar: $); cr. self print: 'home '; shortPrintOop: (self fetchPointer: HomeIndex ofObject: aContext)]. sp := self integerValueOf: sp. sp := sp min: (self lengthOf: aContext) - ReceiverIndex. 1 to: sp do: [:i| self print: ' '; printNum: i; space; shortPrintOop: (self fetchPointer: ReceiverIndex + i ofObject: aContext)]! Item was changed: ----- Method: StackInterpreter>>printContext: (in category 'debug printing') ----- printContext: aContext | sender ip sp | <inline: false> self shortPrintContext: aContext. sender := objectMemory fetchPointer: SenderIndex ofObject: aContext. ip := objectMemory fetchPointer: InstructionPointerIndex ofObject: aContext. (objectMemory isIntegerObject: sender) ifTrue: [(self checkIsStillMarriedContext: aContext currentFP: framePointer) ifTrue: [self print: 'married (assuming framePointer valid)'; cr] ifFalse: [self print: 'widdowed (assuming framePointer valid)'; cr]. self print: 'sender '; printNum: sender; print: ' ('; printHexPtr: (self withoutSmallIntegerTags: sender); printChar: $); cr. self print: 'ip '; printNum: ip; print: ' ('; printHexPtr: (self withoutSmallIntegerTags: ip); printChar: $); cr] ifFalse: [self print: 'sender '; shortPrintOop: sender. + self print: 'ip '; printNum: ip; print: ' ('; printNum: (objectMemory integerValueOf: ip); space; printHex: (objectMemory integerValueOf: ip); printChar: $); cr]. - self print: 'ip '; printNum: ip; print: ' ('; printNum: (objectMemory integerValueOf: ip); printHex: (objectMemory integerValueOf: ip); printChar: $); cr]. sp := objectMemory fetchPointer: StackPointerIndex ofObject: aContext. sp := sp min: (objectMemory lengthOf: aContext) - ReceiverIndex. self print: 'sp '; printNum: sp; print: ' ('; printNum: (objectMemory integerValueOf: sp); printChar: $); cr. self print: 'method '; shortPrintOop: (objectMemory fetchPointer: MethodIndex ofObject: aContext). self print: 'closure '; shortPrintOop: (objectMemory fetchPointer: ClosureIndex ofObject: aContext). self print: 'receiver '; shortPrintOop: (objectMemory fetchPointer: ReceiverIndex ofObject: aContext). sp := objectMemory integerValueOf: sp. 1 to: sp do: [:i| self print: ' '; printNum: i; space; shortPrintOop: (objectMemory fetchPointer: ReceiverIndex + i ofObject: aContext)]!

1 0

I don't understand the GC root table
by Mariano Martinez Peck 27 Sep '11

27 Sep '11

Hi guys. I usually thought that the root table of the GC was the #specialObjectsArray. Now, checking a little bit the VM and image side, it seems I am totally wrong. "Smalltalk rootTable" answers an array that I cannot understand how such array can be the root. Where are the references to all the system from such an array? there is no reference to specialObjectsArray for example. Even more, the table seems to be full of weird stuff, such as "an OController", a lot of "a Text" instances about my workspaces stuff, Colors, Morhpic, etc.... Smalltalk isRoot: Smalltalk specialObjectsArray -> false Smalltalk isRoot: true -> false Smalltalk isRoot: false -> false Smalltalk isRoot: nil -> false so...I am lost. Thanks in advance for any help. -- Mariano http://marianopeck.wordpress.com

3 4

GCC optimization levels [was new Cog VMs available [please read]]
by Eliot Miranda 27 Sep '11

27 Sep '11

Hi All, responding to Andrew here because this is generally of interest to the vm-list. On Mon, Sep 26, 2011 at 11:06 AM, Andrew Gaylard <apg(a)4dst.com> wrote: > Hmmm. Thanks for the advice -- we now build with -O3, and all's well. > I've run the VM at full load (mostly compiling) for 30 hours without a > hiccup. Interesting that -O2 is problematic, but -O3 isn't; I assumed > that higher optimisations would make things less stable, not more so. > And we get a 17% speed increase. > > My GCC is: > $ gcc --version > gcc (Ubuntu 4.4.3-4ubuntu5) 4.4.3 > So this really surprises me since we see exactly the same thing with gcc version 3.4.6 20060404 (Red Hat 3.4.6-3). If we compile with -O1 or -O3 we get functional Cog VMs, but -O2 crashes on start-up or soon there-after. I'm surprised that two very different versions of gcc show the same behaviour but I guess I shouldn't be. Some time some of us (me included) could really do to put the effort into understanding what the issue is. It could be a gcc bug or it could be that we're generating C code with ill-defined behaviour. I have to say that I suspect the latter given how different gcc 3.4.x and gcc 4.4.x are (BTW Andrew also sees the same issue with gcc 4.1.x). > - Andrew > > On 2011.09.25 23:12:50 -0700, Eliot Miranda <eliot.miranda(a)gmail.com> > wrote: > > On Sat, Sep 24, 2011 at 9:02 AM, Andrew Gaylard <apg(a)4dst.com> wrote: > > > > > Actually, it looks like I was wrong. After rebuiding everything from > > > scratch, I've been unable to reproduce these crashes, except for the > > > one with unix-4.4.7.image. > > > > > > Sorry for the false alarm. r2495 looks pretty good, at both -O0 and > > > -O1. It still crashes at -O2, but that's not a huge concern. > > > > > > > Which gcc are you using? Here at Cadence on a much older 32-bit machine > > using gcc 3.4.x we see crashes at -O2 but no crashes at -O0 -O1 & -O3 :) > > > > > > > > > > > > > On 2011.09.24 08:07:47 +0200, Andrew Gaylard <apg(a)4dst.com> wrote: > > > > On 2011.09.23 13:26:06 -0700, Eliot Miranda <eliot.miranda(a)gmail.com > > > > > wrote: > > > > > Thank you, Andrew, you nailed it. I've found the bug via your > stack > > > trace > > > > > below. Huge relief. Thanks! New VMs and explanation to the list > > > soon. > > > > > > > > Alas, we spoke too soon. -2495 exhibits the same symptoms; traces > and > > > > gdb transcripts are attached. > > > > > > > > - vm-*-2495.0.txt are from our basic.image, running the test-runner. > > > > - vm-*-2495.1.txt are from Squeak4.2-10966.image, running the > > > test-runner. > > > > - vm-*-2495.2.txt are from unix-4.4.7.image, having just started up > the > > > VM. > > > > > > > > The first two of these appear to be the same problem I encountered > > > > with -2493. The backtraces certainly look very similar. > > > > > > > > The third one is rather different. Looking at the stack trace, the > > > > 'rcvr' variable in ceSendsupertonumArgs is 17039140, which is > > > > de-referenced in line 10733, causing a SEGV; the handler duly > confirms > > > > the faulting address as si_addr = 0x103ff24: > > > > > > > > $ perl -e 'print 0x103ff24' > > > > 17039140 > -- best, Eliot

3 3

windows vm to open large images
by Tudor Girba 27 Sep '11

27 Sep '11

Hi, I am raising the issue regarding opening large images (400+ MB) on Windows. I currently have a Pharo 1.3 image and I cannot load it anymore once I save it. The behavior is rather odd now: it shows the window and then it crashes silently without leaving anything behind. Igor provided a fix some months ago, but it seems it is not in the released Cog VM (neither the one from the Pharo website 13307, nor the latest one of Elliot). So: - Igor, do you know what is the status of your fix? - Where can I actually get a Stack VM for Windows (I tried all places I could think of and did not find it)? Cheers, Doru -- www.tudorgirba.com "Yesterday is a fact. Tomorrow is a possibility. Today is a challenge."

2 3

Re: [squeak-dev] Oddities with #keyDown and Sensor
by Lawson English 25 Sep '11

25 Sep '11

Here's a simple bit of code + stored events that shows what I am getting on the Mac. I get the same i/o behavior (at the bottom of the page) with the latest Cog and CogMT VMs as well as the 4.2 all-in-one distribution from squeak.org. (Mac, Intel, Mac OS X 6.8): http://paste.lisp.org/display/124831 #(1 11688796 358 202 0 0 0 1) #(2 11688821 2 2 0 0 0 1) #(2 11689589 2 1 0 0 0 1) #(2 11689589 100 0 0 100 0 1) #(2 11690028 2 2 0 0 0 1) #(2 11690381 2 1 0 0 0 1) #(2 11690381 100 0 0 100 0 1) #(2 11690604 2 2 0 0 0 1) ... Note that with chording, the last key pressed will be the only key reported, so there's no reliable way to even fake chorded info. From reading various threads about event tracking on Squeak, I know that there are platform-specific issues that have never been resolved. However, the current behavior on the Mac (at least my Mac, Intel, Mac OS X 6.8) doesn't do even the minimal event handling that is complained about in the various threads, so I can't even try the workarounds that are suggested for games-style keyboard input. Lawson

1 0

Re: [Pharo-project] jenkins cog - slow monticello on osx
by Igor Stasenko 25 Sep '11

25 Sep '11

On 26 August 2011 13:30, Tudor Girba <tudor(a)tudorgirba.com> wrote: > Hi, > > Since a couple of weeks I am working with the Cog VM built on Jenkins: > https://ci.lille.inria.fr/pharo/view/Cog/job/Cog-Mac-Cocoa/ > > Here is a little feedback. It worked quite well, the only problem is that Monticello is really slow in the Moose image. This means that even opening the Monticello Browser takes several seconds. > > I thought that this might be induced by something in the Moose image, but if I try with the Elliot's VM (2489), it works blazingly fast. > Thanks for the information, Tudor. Apparently the difference between Eliot's VM and Cog-Mac-Cocoa that they are using different frameworks (Carbon vs Cocoa) and i don't know too much details about the difference there. John or Esteban may have better insights how to fix that. > Cheers, > Doru > > > -- > www.tudorgirba.com > > "The coherence of a trip is given by the clearness of the goal." > > > > > > -- Best regards, Igor Stasenko AKA sig.

5 8

Oddities with #keyDown and Sensor
by Lawson English 24 Sep '11

24 Sep '11

I've been playing with creating a simple 2D asteroids type game in Squeak, and when it came time to try to monitor how long the accelerator key for the rocket (up arrow in this case) had been pressed, I ran into all sorts of oddities. On an intel Mac OS X 10.6.8 box, running various Cog VMs, I found that the event passed to #keyDown: contained zero as the value, regardless of which key was pressed. On Linux, this problem seems not to exist. Again on the Mac, this test class http://paste.lisp.org/display/124816 doesn't seem to work. I was trying to grab the raw Sensor event buffer, but I can't seem to get more than a handful of events. #step is where the meat of the code is. It tries to grab events from Sensor and if they are keyboard events, put them into a buffer for examination. You evoke the test morph thusly: myMorph := MyMorph new. myMorph openInWorld. Transcript show: myMorph aCounter. Transcript show: myMorph eventBuffer. Obviously, I'm doing something fundamentally wrong (or the MacOS X bug for #keyDown manifests directly with Sensor). Help? THanks Lawson.

2 2

new Cog VMs available...
by Eliot Miranda 23 Sep '11

23 Sep '11

...in http://www.mirandabanda.org/files/Cog/VM/VM.r2495/. These fix the regression introduced in r2487 in introducing faster MNu processing. The bug was the leaking up of an error code that was misinterpreted as a valid target machine code method. Thanks /very/ much to those of you who tested the 2493 & 2494 VMs. With your help this bug was found quickly. I now have reason to hope that these VMs will be quite stable. Here's the readme: CogVM binaries as per VMMaker.oscog-eem.127/r2495. Fix MNU PIC creation not to answer an error code to the interpreter. This is the call 0x00000013 bug. again thanks -- best, Eliot

1 0

[commit] r2495 - CogVM source as per VMMaker.oscog-eem.127. Fix MNU PIC creation not to answer
by commits＠squeakvm.org 23 Sep '11

23 Sep '11

Author: eliot Date: 2011-09-23 13:51:32 -0700 (Fri, 23 Sep 2011) New Revision: 2495 Modified: branches/Cog/nscogsrc/vm/cogit.c branches/Cog/nscogsrc/vm/cogit.h branches/Cog/nscogsrc/vm/cogmethod.h branches/Cog/platforms/Cross/vm/sqSCCSVersion.h branches/Cog/src/plugins/Win32OSProcessPlugin/Win32OSProcessPlugin.c branches/Cog/src/vm/cogit.c branches/Cog/src/vm/cogit.h branches/Cog/src/vm/cogmethod.h Log: CogVM source as per VMMaker.oscog-eem.127. Fix MNU PIC creation not to answer an error code to the interpreter. This is the call 0x00000013 bug. Regenerate Win32OSProcessPlugin to get an official source stamp. Modified: branches/Cog/nscogsrc/vm/cogit.c =================================================================== --- branches/Cog/nscogsrc/vm/cogit.c 2011-09-23 01:24:09 UTC (rev 2494) +++ branches/Cog/nscogsrc/vm/cogit.c 2011-09-23 20:51:32 UTC (rev 2495) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.126 uuid: 6af3249f-6c5c-4e1b-8a69-f59e542154c5 + CCodeGenerator VMMaker.oscog-eem.127 uuid: 35927684-7e1e-4ff8-ad9f-90ecec7bb9a0 from - StackToRegisterMappingCogit VMMaker.oscog-eem.126 uuid: 6af3249f-6c5c-4e1b-8a69-f59e542154c5 + StackToRegisterMappingCogit VMMaker.oscog-eem.127 uuid: 35927684-7e1e-4ff8-ad9f-90ecec7bb9a0 */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.126 uuid: 6af3249f-6c5c-4e1b-8a69-f59e542154c5 " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.127 uuid: 35927684-7e1e-4ff8-ad9f-90ecec7bb9a0 " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -3110,12 +3110,11 @@ sqInt startAddress; compilationBreakpoint(selector, lengthOf(selector)); - if (endCPICCase0 == null) { - return ((CogMethod *) NotFullyInitialized); - } + assert(endCPICCase0 != null); startAddress = allocate(closedPICSize); if (startAddress == 0) { - return ((CogMethod *) InsufficientCodeSpace); + callForCogCompiledCodeCompaction(); + return 0; } (methodLabel->address = startAddress); (methodLabel->dependent = null); Modified: branches/Cog/nscogsrc/vm/cogit.h =================================================================== --- branches/Cog/nscogsrc/vm/cogit.h 2011-09-23 01:24:09 UTC (rev 2494) +++ branches/Cog/nscogsrc/vm/cogit.h 2011-09-23 20:51:32 UTC (rev 2495) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.126 uuid: 6af3249f-6c5c-4e1b-8a69-f59e542154c5 + CCodeGenerator VMMaker.oscog-eem.127 uuid: 35927684-7e1e-4ff8-ad9f-90ecec7bb9a0 */ Modified: branches/Cog/nscogsrc/vm/cogmethod.h =================================================================== --- branches/Cog/nscogsrc/vm/cogmethod.h 2011-09-23 01:24:09 UTC (rev 2494) +++ branches/Cog/nscogsrc/vm/cogmethod.h 2011-09-23 20:51:32 UTC (rev 2495) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.126 uuid: 6af3249f-6c5c-4e1b-8a69-f59e542154c5 + CCodeGenerator VMMaker.oscog-eem.127 uuid: 35927684-7e1e-4ff8-ad9f-90ecec7bb9a0 */ typedef struct { Property changes on: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h ___________________________________________________________________ Modified: checkindate - Thu Sep 22 18:21:48 PDT 2011 + Fri Sep 23 13:46:40 PDT 2011 Modified: branches/Cog/src/plugins/Win32OSProcessPlugin/Win32OSProcessPlugin.c =================================================================== --- branches/Cog/src/plugins/Win32OSProcessPlugin/Win32OSProcessPlugin.c 2011-09-23 01:24:09 UTC (rev 2494) +++ branches/Cog/src/plugins/Win32OSProcessPlugin/Win32OSProcessPlugin.c 2011-09-23 20:51:32 UTC (rev 2495) @@ -1,5 +1,5 @@ /* Automatically generated by - VMPluginCodeGenerator * VMMaker.oscog-eem.123 uuid: 9c524903-b0c7-46a8-a37a-5dfda6fcd1f3 + VMPluginCodeGenerator VMMaker.oscog-eem.127 uuid: 35927684-7e1e-4ff8-ad9f-90ecec7bb9a0 from Win32OSProcessPlugin VMConstruction-Plugins-OSProcessPlugin.oscog-eem.32 uuid: 7395e1c3-1315-4e31-ba5d-cced5f3f9565 */ Modified: branches/Cog/src/vm/cogit.c =================================================================== --- branches/Cog/src/vm/cogit.c 2011-09-23 01:24:09 UTC (rev 2494) +++ branches/Cog/src/vm/cogit.c 2011-09-23 20:51:32 UTC (rev 2495) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.126 uuid: 6af3249f-6c5c-4e1b-8a69-f59e542154c5 + CCodeGenerator VMMaker.oscog-eem.127 uuid: 35927684-7e1e-4ff8-ad9f-90ecec7bb9a0 from - StackToRegisterMappingCogit VMMaker.oscog-eem.126 uuid: 6af3249f-6c5c-4e1b-8a69-f59e542154c5 + StackToRegisterMappingCogit VMMaker.oscog-eem.127 uuid: 35927684-7e1e-4ff8-ad9f-90ecec7bb9a0 */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.126 uuid: 6af3249f-6c5c-4e1b-8a69-f59e542154c5 " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.127 uuid: 35927684-7e1e-4ff8-ad9f-90ecec7bb9a0 " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -3033,12 +3033,11 @@ sqInt startAddress; compilationBreakpoint(selector, lengthOf(selector)); - if (endCPICCase0 == null) { - return ((CogMethod *) NotFullyInitialized); - } + assert(endCPICCase0 != null); startAddress = allocate(closedPICSize); if (startAddress == 0) { - return ((CogMethod *) InsufficientCodeSpace); + callForCogCompiledCodeCompaction(); + return 0; } (methodLabel->address = startAddress); (methodLabel->dependent = null); Modified: branches/Cog/src/vm/cogit.h =================================================================== --- branches/Cog/src/vm/cogit.h 2011-09-23 01:24:09 UTC (rev 2494) +++ branches/Cog/src/vm/cogit.h 2011-09-23 20:51:32 UTC (rev 2495) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.126 uuid: 6af3249f-6c5c-4e1b-8a69-f59e542154c5 + CCodeGenerator VMMaker.oscog-eem.127 uuid: 35927684-7e1e-4ff8-ad9f-90ecec7bb9a0 */ Modified: branches/Cog/src/vm/cogmethod.h =================================================================== --- branches/Cog/src/vm/cogmethod.h 2011-09-23 01:24:09 UTC (rev 2494) +++ branches/Cog/src/vm/cogmethod.h 2011-09-23 20:51:32 UTC (rev 2495) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.126 uuid: 6af3249f-6c5c-4e1b-8a69-f59e542154c5 + CCodeGenerator VMMaker.oscog-eem.127 uuid: 35927684-7e1e-4ff8-ad9f-90ecec7bb9a0 */ typedef struct {

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

Vm-dev September 2011