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 {