Vm-dev December 2012

vm-dev@lists.squeakfoundation.org

22 participants
93 discussions

[commit][2637] CogVM source as per VMMaker.oscog-eem.238
by commits＠squeakvm.org 17 Dec '12

17 Dec '12

Revision: 2637 Author: eliot Date: 2012-12-17 11:51:15 -0800 (Mon, 17 Dec 2012) Log Message: ----------- CogVM source as per VMMaker.oscog-eem.238 Restore ThreadedFFIPlugin wanting COGMTVM to be determined on command line. Probably broke in VMMaker.oscog-eem.218 Fix bug in changeClass:from: so that if receiver has long header and class is compact, receiver still gets compact class field set, not cleared. No matter what header an instance has, if its class is compact it should have the compact class index set. Modified Paths: -------------- 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/plugins/SqueakFFIPrims/SqueakFFIPrims.c branches/Cog/src/vm/cointerp.c branches/Cog/src/vm/cointerp.h branches/Cog/src/vm/cointerpmt.c branches/Cog/src/vm/cointerpmt.h branches/Cog/src/vm/gcc3x-cointerp.c branches/Cog/src/vm/gcc3x-cointerpmt.c branches/Cog/src/vm/interp.h branches/Cog/src/vm/vmCallback.h Removed Paths: ------------- branches/Cog/nscogbuild/cygwinbuild/sqNamedPrims.h Property Changed: ---------------- branches/Cog/platforms/Cross/vm/sqSCCSVersion.h Deleted: branches/Cog/nscogbuild/cygwinbuild/sqNamedPrims.h =================================================================== --- branches/Cog/nscogbuild/cygwinbuild/sqNamedPrims.h 2012-12-15 00:44:59 UTC (rev 2636) +++ branches/Cog/nscogbuild/cygwinbuild/sqNamedPrims.h 2012-12-17 19:51:15 UTC (rev 2637) @@ -1,54 +0,0 @@ -/* Automatically generated on Dec 13 2012, 17:08:01 */ - -extern sqExport vm_exports[]; -extern sqExport os_exports[]; -extern sqExport AsynchFilePlugin_exports[]; -extern sqExport BMPReadWriterPlugin_exports[]; -extern sqExport B2DPlugin_exports[]; -extern sqExport BitBltPlugin_exports[]; -extern sqExport DSAPrims_exports[]; -extern sqExport DropPlugin_exports[]; -extern sqExport FilePlugin_exports[]; -extern sqExport FloatArrayPlugin_exports[]; -extern sqExport FloatMathPlugin_exports[]; -extern sqExport ZipPlugin_exports[]; -extern sqExport JPEGReadWriter2Plugin_exports[]; -extern sqExport JPEGReaderPlugin_exports[]; -extern sqExport LargeIntegers_exports[]; -extern sqExport Matrix2x3Plugin_exports[]; -extern sqExport MiscPrimitivePlugin_exports[]; -extern sqExport IA32ABI_exports[]; -extern sqExport RePlugin_exports[]; -extern sqExport SecurityPlugin_exports[]; -extern sqExport SocketPlugin_exports[]; -extern sqExport SurfacePlugin_exports[]; -extern sqExport UUIDPlugin_exports[]; -extern sqExport Win32OSProcessPlugin_exports[]; - -sqExport *pluginExports[] = { - vm_exports, - os_exports, - AsynchFilePlugin_exports, - BMPReadWriterPlugin_exports, - B2DPlugin_exports, - BitBltPlugin_exports, - DSAPrims_exports, - DropPlugin_exports, - FilePlugin_exports, - FloatArrayPlugin_exports, - FloatMathPlugin_exports, - ZipPlugin_exports, - JPEGReadWriter2Plugin_exports, - JPEGReaderPlugin_exports, - LargeIntegers_exports, - Matrix2x3Plugin_exports, - MiscPrimitivePlugin_exports, - IA32ABI_exports, - RePlugin_exports, - SecurityPlugin_exports, - SocketPlugin_exports, - SurfacePlugin_exports, - UUIDPlugin_exports, - Win32OSProcessPlugin_exports, - NULL -}; \ No newline at end of file Modified: branches/Cog/nscogsrc/vm/cointerp.c =================================================================== --- branches/Cog/nscogsrc/vm/cointerp.c 2012-12-15 00:44:59 UTC (rev 2636) +++ branches/Cog/nscogsrc/vm/cointerp.c 2012-12-17 19:51:15 UTC (rev 2637) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.234 uuid: 66acafd1-cad0-4f20-b786-ab8f48201d82 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.238 uuid: a3d10eab-6079-4c91-99f6-3dcf58d1446f from - CoInterpreter VMMaker.oscog-eem.234 uuid: 66acafd1-cad0-4f20-b786-ab8f48201d82 + CoInterpreter VMMaker.oscog-eem.238 uuid: a3d10eab-6079-4c91-99f6-3dcf58d1446f */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.234 uuid: 66acafd1-cad0-4f20-b786-ab8f48201d82 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.238 uuid: a3d10eab-6079-4c91-99f6-3dcf58d1446f " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -1932,7 +1932,7 @@ 0 }; static void (*externalPrimitiveTable[MaxExternalPrimitiveTableSize + 1 /* 4097 */])(void); static usqInt heapBase; -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.234"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.238"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; @@ -15519,11 +15519,11 @@ } } } + ccIndex = classHdr & CompactClassMask; if ((rcvrHdr & TypeMask) == HeaderTypeShort) { /* Compact classes. Check if the arg's class is compact and exchange ccIndex */ - ccIndex = classHdr & CompactClassMask; if (ccIndex == 0) { return PrimErrInappropriate; } @@ -15539,7 +15539,7 @@ } else { - /* Exchange the class pointer, which could make rcvr a root for argClass */ + /* Exchange the class pointer, which could make rcvr a root for argClass. Don't forget to set ccIndex. */ # if IMMUTABILITY @@ -15550,7 +15550,7 @@ # endif /* IMMUTABILITY */ if (((((usqInt) (longAt(rcvr))) >> 12) & 31) != 0) { - longAtput(rcvr, (((longAt(rcvr)) | CompactClassMask) - CompactClassMask)); + longAtput(rcvr, ((((longAt(rcvr)) | CompactClassMask) - CompactClassMask)) | ccIndex); } longAtput(rcvr - BaseHeaderSize, argClass | ((longAt(rcvr)) & TypeMask)); if ((((usqInt) rcvr)) < (((usqInt) GIV(youngStart)))) { Modified: branches/Cog/nscogsrc/vm/cointerp.h =================================================================== --- branches/Cog/nscogsrc/vm/cointerp.h 2012-12-15 00:44:59 UTC (rev 2636) +++ branches/Cog/nscogsrc/vm/cointerp.h 2012-12-17 19:51:15 UTC (rev 2637) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.234 uuid: 66acafd1-cad0-4f20-b786-ab8f48201d82 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.238 uuid: a3d10eab-6079-4c91-99f6-3dcf58d1446f */ Modified: branches/Cog/nscogsrc/vm/gcc3x-cointerp.c =================================================================== --- branches/Cog/nscogsrc/vm/gcc3x-cointerp.c 2012-12-15 00:44:59 UTC (rev 2636) +++ branches/Cog/nscogsrc/vm/gcc3x-cointerp.c 2012-12-17 19:51:15 UTC (rev 2637) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.234 uuid: 66acafd1-cad0-4f20-b786-ab8f48201d82 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.238 uuid: a3d10eab-6079-4c91-99f6-3dcf58d1446f from - CoInterpreter VMMaker.oscog-eem.234 uuid: 66acafd1-cad0-4f20-b786-ab8f48201d82 + CoInterpreter VMMaker.oscog-eem.238 uuid: a3d10eab-6079-4c91-99f6-3dcf58d1446f */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.234 uuid: 66acafd1-cad0-4f20-b786-ab8f48201d82 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.238 uuid: a3d10eab-6079-4c91-99f6-3dcf58d1446f " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -1935,7 +1935,7 @@ 0 }; static void (*externalPrimitiveTable[MaxExternalPrimitiveTableSize + 1 /* 4097 */])(void); static usqInt heapBase; -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.234"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.238"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; @@ -15528,11 +15528,11 @@ } } } + ccIndex = classHdr & CompactClassMask; if ((rcvrHdr & TypeMask) == HeaderTypeShort) { /* Compact classes. Check if the arg's class is compact and exchange ccIndex */ - ccIndex = classHdr & CompactClassMask; if (ccIndex == 0) { return PrimErrInappropriate; } @@ -15548,7 +15548,7 @@ } else { - /* Exchange the class pointer, which could make rcvr a root for argClass */ + /* Exchange the class pointer, which could make rcvr a root for argClass. Don't forget to set ccIndex. */ # if IMMUTABILITY @@ -15559,7 +15559,7 @@ # endif /* IMMUTABILITY */ if (((((usqInt) (longAt(rcvr))) >> 12) & 31) != 0) { - longAtput(rcvr, (((longAt(rcvr)) | CompactClassMask) - CompactClassMask)); + longAtput(rcvr, ((((longAt(rcvr)) | CompactClassMask) - CompactClassMask)) | ccIndex); } longAtput(rcvr - BaseHeaderSize, argClass | ((longAt(rcvr)) & TypeMask)); if ((((usqInt) rcvr)) < (((usqInt) GIV(youngStart)))) { Modified: branches/Cog/nscogsrc/vm/interp.h =================================================================== --- branches/Cog/nscogsrc/vm/interp.h 2012-12-15 00:44:59 UTC (rev 2636) +++ branches/Cog/nscogsrc/vm/interp.h 2012-12-17 19:51:15 UTC (rev 2637) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.234 uuid: 66acafd1-cad0-4f20-b786-ab8f48201d82 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.238 uuid: a3d10eab-6079-4c91-99f6-3dcf58d1446f */ #define VM_PROXY_MAJOR 1 Modified: branches/Cog/nscogsrc/vm/vmCallback.h =================================================================== --- branches/Cog/nscogsrc/vm/vmCallback.h 2012-12-15 00:44:59 UTC (rev 2636) +++ branches/Cog/nscogsrc/vm/vmCallback.h 2012-12-17 19:51:15 UTC (rev 2637) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.234 uuid: 66acafd1-cad0-4f20-b786-ab8f48201d82 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.238 uuid: a3d10eab-6079-4c91-99f6-3dcf58d1446f */ #define VM_CALLBACK_INC 1 Property changes on: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h ___________________________________________________________________ Modified: checkindate - Fri Dec 14 16:44:39 PST 2012 + Mon Dec 17 11:50:28 PST 2012 Modified: branches/Cog/src/plugins/SqueakFFIPrims/SqueakFFIPrims.c =================================================================== --- branches/Cog/src/plugins/SqueakFFIPrims/SqueakFFIPrims.c 2012-12-15 00:44:59 UTC (rev 2636) +++ branches/Cog/src/plugins/SqueakFFIPrims/SqueakFFIPrims.c 2012-12-17 19:51:15 UTC (rev 2637) @@ -1,9 +1,9 @@ /* Automatically generated by - VMPluginCodeGenerator VMMaker.oscog-eem.235 uuid: 954df856-3f83-498c-9735-6cd3777ba9c7 + VMPluginCodeGenerator VMMaker.oscog-eem.238 uuid: a3d10eab-6079-4c91-99f6-3dcf58d1446f from - ThreadedIA32FFIPlugin VMMaker.oscog-eem.235 uuid: 954df856-3f83-498c-9735-6cd3777ba9c7 + ThreadedIA32FFIPlugin VMMaker.oscog-eem.238 uuid: a3d10eab-6079-4c91-99f6-3dcf58d1446f */ -static char __buildInfo[] = "ThreadedIA32FFIPlugin VMMaker.oscog-eem.235 uuid: 954df856-3f83-498c-9735-6cd3777ba9c7 " __DATE__ ; +static char __buildInfo[] = "ThreadedIA32FFIPlugin VMMaker.oscog-eem.238 uuid: a3d10eab-6079-4c91-99f6-3dcf58d1446f " __DATE__ ; @@ -134,7 +134,6 @@ #define BaseHeaderSize 4 #define BytesPerOop 4 #define BytesPerWord 4 -#define COGMTVM 0 #define DefaultMaxStackSize 16384 #define ExternalFunctionArgTypesIndex 2 #define ExternalFunctionFlagsIndex 1 @@ -420,9 +419,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "SqueakFFIPrims VMMaker.oscog-eem.235 (i)" + "SqueakFFIPrims VMMaker.oscog-eem.238 (i)" #else - "SqueakFFIPrims VMMaker.oscog-eem.235 (e)" + "SqueakFFIPrims VMMaker.oscog-eem.238 (e)" #endif ; @@ -3315,12 +3314,26 @@ result = ffiFail(FFIErrorBadArgs); goto l3; } + +# if COGMTVM if (!(((flags & FFICallTypesMask) == FFICallTypeCDecl) || ((flags & FFICallTypesMask) == FFICallTypeApi))) { result = ffiFail(FFIErrorCallType); goto l3; } +# else /* COGMTVM */ + + /* not masking causes threaded calls to fail, which is as they should if the plugin is not threaded. */ + + if (!((flags == FFICallTypeCDecl) + || (flags == FFICallTypeApi))) { + result = ffiFail(FFIErrorCallType); + goto l3; + } + +# endif /* COGMTVM */ + requiredStackSize = (externalFunctionInstSize > ExternalFunctionStackSizeIndex ? fetchIntegerofObject(ExternalFunctionStackSizeIndex, externalFunction) : -1); @@ -3372,11 +3385,15 @@ while (((calloutState->stringArgIndex)) > 0) { free(((calloutState->stringArgs))[(calloutState->stringArgIndex = ((calloutState->stringArgIndex)) - 1)]); } + +# if COGMTVM if (err == (-PrimErrObjectMayMove)) { result = PrimErrObjectMayMove; goto l3; } +# endif /* COGMTVM */ + result = ffiFail(err); goto l3; } @@ -3394,11 +3411,15 @@ while (((calloutState->stringArgIndex)) > 0) { free(((calloutState->stringArgs))[(calloutState->stringArgIndex = ((calloutState->stringArgIndex)) - 1)]); } + +# if COGMTVM if (err == (-PrimErrObjectMayMove)) { result = PrimErrObjectMayMove; goto l3; } +# endif /* COGMTVM */ + result = ffiFail(err); goto l3; } @@ -3420,10 +3441,14 @@ storeIntegerofObjectwithValue(ExternalFunctionStackSizeIndex, externalFunction, stackSize); } /* begin ffiCalloutTo:SpecOnStack:in: */ + +# if COGMTVM if (((calloutState->callFlags)) & FFICallFlagThreaded) { myThreadIndex = disownVM(0); } +# endif /* COGMTVM */ + if ((0 + (cStackAlignment())) > 0) { setsp((calloutState->argVector)); } @@ -3440,10 +3465,14 @@ if (isCalleePopsConvention((calloutState->callFlags))) { setsp((calloutState->argVector)); } + +# if COGMTVM if (((calloutState->callFlags)) & FFICallFlagThreaded) { ownVM(myThreadIndex); } +# endif /* COGMTVM */ + if (((calloutState->ffiRetHeader)) & FFIFlagPointer) { /* begin ffiReturnPointer:ofType:in: */ /* begin ffiReturnType: */ @@ -3634,6 +3663,15 @@ goto l6; } +# if COGMTVM + if (!(((flags1 & FFICallTypesMask) == FFICallTypeCDecl) + || ((flags1 & FFICallTypesMask) == FFICallTypeApi))) { + ffiFail(FFIErrorCallType); + goto l6; + } + +# else /* COGMTVM */ + /* not masking causes threaded calls to fail, which is as they should if the plugin is not threaded. */ if (!((flags1 == FFICallTypeCDecl) @@ -3642,6 +3680,8 @@ goto l6; } +# endif /* COGMTVM */ + requiredStackSize1 = (externalFunctionInstSize > ExternalFunctionStackSizeIndex ? fetchIntegerofObject(ExternalFunctionStackSizeIndex, externalFunction) : -1); @@ -3694,6 +3734,14 @@ free(((calloutState1->stringArgs))[(calloutState1->stringArgIndex = ((calloutState1->stringArgIndex)) - 1)]); } +# if COGMTVM + if (err1 == (-PrimErrObjectMayMove)) { + PrimErrObjectMayMove; + goto l6; + } + +# endif /* COGMTVM */ + ffiFail(err1); goto l6; } @@ -3712,6 +3760,14 @@ free(((calloutState1->stringArgs))[(calloutState1->stringArgIndex = ((calloutState1->stringArgIndex)) - 1)]); } +# if COGMTVM + if (err1 == (-PrimErrObjectMayMove)) { + PrimErrObjectMayMove; + goto l6; + } + +# endif /* COGMTVM */ + ffiFail(err1); goto l6; } @@ -3734,6 +3790,13 @@ } /* begin ffiCalloutTo:SpecOnStack:in: */ +# if COGMTVM + if (((calloutState1->callFlags)) & FFICallFlagThreaded) { + myThreadIndex1 = disownVM(0); + } + +# endif /* COGMTVM */ + if ((0 + (cStackAlignment())) > 0) { setsp((calloutState1->argVector)); } @@ -3751,6 +3814,13 @@ setsp((calloutState1->argVector)); } +# if COGMTVM + if (((calloutState1->callFlags)) & FFICallFlagThreaded) { + ownVM(myThreadIndex1); + } + +# endif /* COGMTVM */ + if (((calloutState1->ffiRetHeader)) & FFIFlagPointer) { /* begin ffiReturnPointer:ofType:in: */ /* begin ffiReturnType: */ @@ -4057,12 +4127,26 @@ result = ffiFail(FFIErrorBadArgs); goto l3; } + +# if COGMTVM if (!(((flags & FFICallTypesMask) == FFICallTypeCDecl) || ((flags & FFICallTypesMask) == FFICallTypeApi))) { result = ffiFail(FFIErrorCallType); goto l3; } +# else /* COGMTVM */ + + /* not masking causes threaded calls to fail, which is as they should if the plugin is not threaded. */ + + if (!((flags == FFICallTypeCDecl) + || (flags == FFICallTypeApi))) { + result = ffiFail(FFIErrorCallType); + goto l3; + } + +# endif /* COGMTVM */ + requiredStackSize = (externalFunctionInstSize > ExternalFunctionStackSizeIndex ? fetchIntegerofObject(ExternalFunctionStackSizeIndex, externalFunction) : -1); @@ -4114,11 +4198,15 @@ while (((calloutState->stringArgIndex)) > 0) { free(((calloutState->stringArgs))[(calloutState->stringArgIndex = ((calloutState->stringArgIndex)) - 1)]); } + +# if COGMTVM if (err == (-PrimErrObjectMayMove)) { result = PrimErrObjectMayMove; goto l3; } +# endif /* COGMTVM */ + result = ffiFail(err); goto l3; } @@ -4136,11 +4224,15 @@ while (((calloutState->stringArgIndex)) > 0) { free(((calloutState->stringArgs))[(calloutState->stringArgIndex = ((calloutState->stringArgIndex)) - 1)]); } + +# if COGMTVM if (err == (-PrimErrObjectMayMove)) { result = PrimErrObjectMayMove; goto l3; } +# endif /* COGMTVM */ + result = ffiFail(err); goto l3; } @@ -4162,10 +4254,14 @@ storeIntegerofObjectwithValue(ExternalFunctionStackSizeIndex, externalFunction, stackSize); } /* begin ffiCalloutTo:SpecOnStack:in: */ + +# if COGMTVM if (((calloutState->callFlags)) & FFICallFlagThreaded) { myThreadIndex = disownVM(0); } +# endif /* COGMTVM */ + if ((0 + (cStackAlignment())) > 0) { setsp((calloutState->argVector)); } @@ -4182,10 +4278,14 @@ if (isCalleePopsConvention((calloutState->callFlags))) { setsp((calloutState->argVector)); } + +# if COGMTVM if (((calloutState->callFlags)) & FFICallFlagThreaded) { ownVM(myThreadIndex); } +# endif /* COGMTVM */ + if (((calloutState->ffiRetHeader)) & FFIFlagPointer) { /* begin ffiReturnPointer:ofType:in: */ /* begin ffiReturnType: */ @@ -4381,6 +4481,15 @@ goto l6; } +# if COGMTVM + if (!(((flags1 & FFICallTypesMask) == FFICallTypeCDecl) + || ((flags1 & FFICallTypesMask) == FFICallTypeApi))) { + ffiFail(FFIErrorCallType); + goto l6; + } + +# else /* COGMTVM */ + /* not masking causes threaded calls to fail, which is as they should if the plugin is not threaded. */ if (!((flags1 == FFICallTypeCDecl) @@ -4389,6 +4498,8 @@ goto l6; } +# endif /* COGMTVM */ + requiredStackSize1 = (externalFunctionInstSize > ExternalFunctionStackSizeIndex ? fetchIntegerofObject(ExternalFunctionStackSizeIndex, externalFunction) : -1); @@ -4441,6 +4552,14 @@ free(((calloutState1->stringArgs))[(calloutState1->stringArgIndex = ((calloutState1->stringArgIndex)) - 1)]); } +# if COGMTVM + if (err1 == (-PrimErrObjectMayMove)) { + PrimErrObjectMayMove; + goto l6; + } + +# endif /* COGMTVM */ + ffiFail(err1); goto l6; } @@ -4459,6 +4578,14 @@ free(((calloutState1->stringArgs))[(calloutState1->stringArgIndex = ((calloutState1->stringArgIndex)) - 1)]); } +# if COGMTVM + if (err1 == (-PrimErrObjectMayMove)) { + PrimErrObjectMayMove; + goto l6; + } + +# endif /* COGMTVM */ + ffiFail(err1); goto l6; } @@ -4481,6 +4608,13 @@ } /* begin ffiCalloutTo:SpecOnStack:in: */ +# if COGMTVM + if (((calloutState1->callFlags)) & FFICallFlagThreaded) { + myThreadIndex1 = disownVM(0); + } + +# endif /* COGMTVM */ + if ((0 + (cStackAlignment())) > 0) { setsp((calloutState1->argVector)); } @@ -4498,6 +4632,13 @@ setsp((calloutState1->argVector)); } +# if COGMTVM + if (((calloutState1->callFlags)) & FFICallFlagThreaded) { + ownVM(myThreadIndex1); + } + +# endif /* COGMTVM */ + if (((calloutState1->ffiRetHeader)) & FFIFlagPointer) { /* begin ffiReturnPointer:ofType:in: */ /* begin ffiReturnType: */ Modified: branches/Cog/src/vm/cointerp.c =================================================================== --- branches/Cog/src/vm/cointerp.c 2012-12-15 00:44:59 UTC (rev 2636) +++ branches/Cog/src/vm/cointerp.c 2012-12-17 19:51:15 UTC (rev 2637) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.234 uuid: 66acafd1-cad0-4f20-b786-ab8f48201d82 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.238 uuid: a3d10eab-6079-4c91-99f6-3dcf58d1446f from - CoInterpreter VMMaker.oscog-eem.234 uuid: 66acafd1-cad0-4f20-b786-ab8f48201d82 + CoInterpreter VMMaker.oscog-eem.238 uuid: a3d10eab-6079-4c91-99f6-3dcf58d1446f */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.234 uuid: 66acafd1-cad0-4f20-b786-ab8f48201d82 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.238 uuid: a3d10eab-6079-4c91-99f6-3dcf58d1446f " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -1922,7 +1922,7 @@ 0 }; static void (*externalPrimitiveTable[MaxExternalPrimitiveTableSize + 1 /* 4097 */])(void); static usqInt heapBase; -const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.234]"; +const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.238]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; @@ -11420,11 +11420,11 @@ } } } + ccIndex = classHdr & CompactClassMask; if ((rcvrHdr & TypeMask) == HeaderTypeShort) { /* Compact classes. Check if the arg's class is compact and exchange ccIndex */ - ccIndex = classHdr & CompactClassMask; if (ccIndex == 0) { return PrimErrInappropriate; } @@ -11440,7 +11440,7 @@ } else { - /* Exchange the class pointer, which could make rcvr a root for argClass */ + /* Exchange the class pointer, which could make rcvr a root for argClass. Don't forget to set ccIndex. */ # if IMMUTABILITY @@ -11451,7 +11451,7 @@ # endif /* IMMUTABILITY */ if (((((usqInt) (longAt(rcvr))) >> 12) & 31) != 0) { - longAtput(rcvr, (((longAt(rcvr)) | CompactClassMask) - CompactClassMask)); + longAtput(rcvr, ((((longAt(rcvr)) | CompactClassMask) - CompactClassMask)) | ccIndex); } longAtput(rcvr - BaseHeaderSize, argClass | ((longAt(rcvr)) & TypeMask)); if ((((usqInt) rcvr)) < (((usqInt) GIV(youngStart)))) { Modified: branches/Cog/src/vm/cointerp.h =================================================================== --- branches/Cog/src/vm/cointerp.h 2012-12-15 00:44:59 UTC (rev 2636) +++ branches/Cog/src/vm/cointerp.h 2012-12-17 19:51:15 UTC (rev 2637) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.234 uuid: 66acafd1-cad0-4f20-b786-ab8f48201d82 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.238 uuid: a3d10eab-6079-4c91-99f6-3dcf58d1446f */ Modified: branches/Cog/src/vm/cointerpmt.c =================================================================== --- branches/Cog/src/vm/cointerpmt.c 2012-12-15 00:44:59 UTC (rev 2636) +++ branches/Cog/src/vm/cointerpmt.c 2012-12-17 19:51:15 UTC (rev 2637) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.234 uuid: 66acafd1-cad0-4f20-b786-ab8f48201d82 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.238 uuid: a3d10eab-6079-4c91-99f6-3dcf58d1446f from - CoInterpreterMT VMMaker.oscog-eem.234 uuid: 66acafd1-cad0-4f20-b786-ab8f48201d82 + CoInterpreterMT VMMaker.oscog-eem.238 uuid: a3d10eab-6079-4c91-99f6-3dcf58d1446f */ -static char __buildInfo[] = "CoInterpreterMT VMMaker.oscog-eem.234 uuid: 66acafd1-cad0-4f20-b786-ab8f48201d82 " __DATE__ ; +static char __buildInfo[] = "CoInterpreterMT VMMaker.oscog-eem.238 uuid: a3d10eab-6079-4c91-99f6-3dcf58d1446f " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2021,7 +2021,7 @@ 0 }; static void (*externalPrimitiveTable[MaxExternalPrimitiveTableSize + 1 /* 4097 */])(void); static usqInt heapBase; -const char *interpreterVersion = "Croquet Closure Cog MT VM [CoInterpreterMT VMMaker.oscog-eem.234]"; +const char *interpreterVersion = "Croquet Closure Cog MT VM [CoInterpreterMT VMMaker.oscog-eem.238]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; sqInt willNotThreadWarnCount; @@ -11773,11 +11773,11 @@ } } } + ccIndex = classHdr & CompactClassMask; if ((rcvrHdr & TypeMask) == HeaderTypeShort) { /* Compact classes. Check if the arg's class is compact and exchange ccIndex */ - ccIndex = classHdr & CompactClassMask; if (ccIndex == 0) { return PrimErrInappropriate; } @@ -11793,7 +11793,7 @@ } else { - /* Exchange the class pointer, which could make rcvr a root for argClass */ + /* Exchange the class pointer, which could make rcvr a root for argClass. Don't forget to set ccIndex. */ # if IMMUTABILITY @@ -11804,7 +11804,7 @@ # endif /* IMMUTABILITY */ if (((((usqInt) (longAt(rcvr))) >> 12) & 31) != 0) { - longAtput(rcvr, (((longAt(rcvr)) | CompactClassMask) - CompactClassMask)); + longAtput(rcvr, ((((longAt(rcvr)) | CompactClassMask) - CompactClassMask)) | ccIndex); } longAtput(rcvr - BaseHeaderSize, argClass | ((longAt(rcvr)) & TypeMask)); if ((((usqInt) rcvr)) < (((usqInt) GIV(youngStart)))) { Modified: branches/Cog/src/vm/cointerpmt.h =================================================================== --- branches/Cog/src/vm/cointerpmt.h 2012-12-15 00:44:59 UTC (rev 2636) +++ branches/Cog/src/vm/cointerpmt.h 2012-12-17 19:51:15 UTC (rev 2637) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.234 uuid: 66acafd1-cad0-4f20-b786-ab8f48201d82 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.238 uuid: a3d10eab-6079-4c91-99f6-3dcf58d1446f */ Modified: branches/Cog/src/vm/gcc3x-cointerp.c =================================================================== --- branches/Cog/src/vm/gcc3x-cointerp.c 2012-12-15 00:44:59 UTC (rev 2636) +++ branches/Cog/src/vm/gcc3x-cointerp.c 2012-12-17 19:51:15 UTC (rev 2637) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.234 uuid: 66acafd1-cad0-4f20-b786-ab8f48201d82 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.238 uuid: a3d10eab-6079-4c91-99f6-3dcf58d1446f from - CoInterpreter VMMaker.oscog-eem.234 uuid: 66acafd1-cad0-4f20-b786-ab8f48201d82 + CoInterpreter VMMaker.oscog-eem.238 uuid: a3d10eab-6079-4c91-99f6-3dcf58d1446f */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.234 uuid: 66acafd1-cad0-4f20-b786-ab8f48201d82 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.238 uuid: a3d10eab-6079-4c91-99f6-3dcf58d1446f " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -1925,7 +1925,7 @@ 0 }; static void (*externalPrimitiveTable[MaxExternalPrimitiveTableSize + 1 /* 4097 */])(void); static usqInt heapBase; -const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.234]"; +const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.238]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; @@ -11429,11 +11429,11 @@ } } } + ccIndex = classHdr & CompactClassMask; if ((rcvrHdr & TypeMask) == HeaderTypeShort) { /* Compact classes. Check if the arg's class is compact and exchange ccIndex */ - ccIndex = classHdr & CompactClassMask; if (ccIndex == 0) { return PrimErrInappropriate; } @@ -11449,7 +11449,7 @@ } else { - /* Exchange the class pointer, which could make rcvr a root for argClass */ + /* Exchange the class pointer, which could make rcvr a root for argClass. Don't forget to set ccIndex. */ # if IMMUTABILITY @@ -11460,7 +11460,7 @@ # endif /* IMMUTABILITY */ if (((((usqInt) (longAt(rcvr))) >> 12) & 31) != 0) { - longAtput(rcvr, (((longAt(rcvr)) | CompactClassMask) - CompactClassMask)); + longAtput(rcvr, ((((longAt(rcvr)) | CompactClassMask) - CompactClassMask)) | ccIndex); } longAtput(rcvr - BaseHeaderSize, argClass | ((longAt(rcvr)) & TypeMask)); if ((((usqInt) rcvr)) < (((usqInt) GIV(youngStart)))) { Modified: branches/Cog/src/vm/gcc3x-cointerpmt.c =================================================================== --- branches/Cog/src/vm/gcc3x-cointerpmt.c 2012-12-15 00:44:59 UTC (rev 2636) +++ branches/Cog/src/vm/gcc3x-cointerpmt.c 2012-12-17 19:51:15 UTC (rev 2637) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.234 uuid: 66acafd1-cad0-4f20-b786-ab8f48201d82 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.238 uuid: a3d10eab-6079-4c91-99f6-3dcf58d1446f from - CoInterpreterMT VMMaker.oscog-eem.234 uuid: 66acafd1-cad0-4f20-b786-ab8f48201d82 + CoInterpreterMT VMMaker.oscog-eem.238 uuid: a3d10eab-6079-4c91-99f6-3dcf58d1446f */ -static char __buildInfo[] = "CoInterpreterMT VMMaker.oscog-eem.234 uuid: 66acafd1-cad0-4f20-b786-ab8f48201d82 " __DATE__ ; +static char __buildInfo[] = "CoInterpreterMT VMMaker.oscog-eem.238 uuid: a3d10eab-6079-4c91-99f6-3dcf58d1446f " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2024,7 +2024,7 @@ 0 }; static void (*externalPrimitiveTable[MaxExternalPrimitiveTableSize + 1 /* 4097 */])(void); static usqInt heapBase; -const char *interpreterVersion = "Croquet Closure Cog MT VM [CoInterpreterMT VMMaker.oscog-eem.234]"; +const char *interpreterVersion = "Croquet Closure Cog MT VM [CoInterpreterMT VMMaker.oscog-eem.238]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; sqInt willNotThreadWarnCount; @@ -11782,11 +11782,11 @@ } } } + ccIndex = classHdr & CompactClassMask; if ((rcvrHdr & TypeMask) == HeaderTypeShort) { /* Compact classes. Check if the arg's class is compact and exchange ccIndex */ - ccIndex = classHdr & CompactClassMask; if (ccIndex == 0) { return PrimErrInappropriate; } @@ -11802,7 +11802,7 @@ } else { - /* Exchange the class pointer, which could make rcvr a root for argClass */ + /* Exchange the class pointer, which could make rcvr a root for argClass. Don't forget to set ccIndex. */ # if IMMUTABILITY @@ -11813,7 +11813,7 @@ # endif /* IMMUTABILITY */ if (((((usqInt) (longAt(rcvr))) >> 12) & 31) != 0) { - longAtput(rcvr, (((longAt(rcvr)) | CompactClassMask) - CompactClassMask)); + longAtput(rcvr, ((((longAt(rcvr)) | CompactClassMask) - CompactClassMask)) | ccIndex); } longAtput(rcvr - BaseHeaderSize, argClass | ((longAt(rcvr)) & TypeMask)); if ((((usqInt) rcvr)) < (((usqInt) GIV(youngStart)))) { Modified: branches/Cog/src/vm/interp.h =================================================================== --- branches/Cog/src/vm/interp.h 2012-12-15 00:44:59 UTC (rev 2636) +++ branches/Cog/src/vm/interp.h 2012-12-17 19:51:15 UTC (rev 2637) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.234 uuid: 66acafd1-cad0-4f20-b786-ab8f48201d82 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.238 uuid: a3d10eab-6079-4c91-99f6-3dcf58d1446f */ #define VM_PROXY_MAJOR 1 Modified: branches/Cog/src/vm/vmCallback.h =================================================================== --- branches/Cog/src/vm/vmCallback.h 2012-12-15 00:44:59 UTC (rev 2636) +++ branches/Cog/src/vm/vmCallback.h 2012-12-17 19:51:15 UTC (rev 2637) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.234 uuid: 66acafd1-cad0-4f20-b786-ab8f48201d82 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.238 uuid: a3d10eab-6079-4c91-99f6-3dcf58d1446f */ #define VM_CALLBACK_INC 1

1 0

VM Maker: VMMaker.oscog-eem.238.mcz
by commits＠source.squeak.org 17 Dec '12

17 Dec '12

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.238.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.238 Author: eem Time: 17 December 2012, 11:33:38.555 am UUID: a3d10eab-6079-4c91-99f6-3dcf58d1446f Ancestors: VMMaker.oscog-eem.237 Restore ThreadedFFIPlugin wanting COGMTVM to be determined on command line. Probably broke in VMMaker.oscog-eem.218 =============== Diff against VMMaker.oscog-eem.237 =============== Item was added: + ----- Method: ThreadedFFIPlugin class>>declareCVarsIn: (in category 'translation') ----- + declareCVarsIn: cg + super declareCVarsIn: cg. + cg removeConstant: #COGMTVM "this should be defined at compile time"!

1 0

VM Maker: VMMaker.oscog-eem.237.mcz
by commits＠source.squeak.org 17 Dec '12

17 Dec '12

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.237.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.237 Author: eem Time: 17 December 2012, 10:38:49.275 am UUID: 208e5eb6-429e-447b-9caa-dbf379192cf8 Ancestors: VMMaker.oscog-eem.236 Once again fix bug in changeClass:from: so that if receiver has long header and class is compact, receiver still gets compact class field set, not cleared. No matter what header an instance has, if its class is compact it should have the compact class index set. =============== Diff against VMMaker.oscog-eem.236 =============== Item was changed: ----- Method: ObjectMemory>>changeClassOf:to: (in category 'interpreter access') ----- changeClassOf: rcvr to: argClass "Attempt to change the class of the receiver into the class of the the argument given that the format of the receiver matches the format of the argument. If successful answer 0, otherwise answer an error code indicating the reason for failure. Fail if receiver or argument are SmallIntegers, or the receiver is an instance of a compact class and the argument isn't, or when the format of the receiver is different from the format of the argument's class, or when the arguments class is fixed and the receiver's size differs from the size that an instance of the argument's class should have." | classHdr sizeHiBits byteSize argFormat rcvrFormat rcvrHdr ccIndex | "Check what the format of the class says" classHdr := self formatOfClass: argClass. "Low 2 bits are 0" "Compute the size of instances of the class (used for fixed field classes only)" sizeHiBits := (classHdr bitAnd: 16r60000) >> 9. classHdr := classHdr bitAnd: 16r1FFFF. byteSize := (classHdr bitAnd: SizeMask) + sizeHiBits. "size in bytes -- low 2 bits are 0" "Check the receiver's format against that of the class" argFormat := self formatOfHeader: classHdr. rcvrHdr := self baseHeader: rcvr. rcvrFormat := self formatOfHeader: rcvrHdr. "If the receiver is a byte object we need to clear the number of odd bytes from the format." rcvrFormat > 8 ifTrue: [rcvrFormat := rcvrFormat bitAnd: 16rC]. argFormat = rcvrFormat ifFalse: [^PrimErrInappropriate]. "no way" "For fixed field classes, the sizes must match. Note: byteSize-4 because base header is included in class size." argFormat < 2 ifTrue: [(byteSize - BaseHeaderSize) ~= (self byteSizeOf: rcvr) ifTrue: [^PrimErrBadReceiver]] ifFalse: [argFormat = 3 ifTrue: "For indexable plus fixed fields the receiver must be at least big enough." [(byteSize - BaseHeaderSize) > (self byteSizeOf: rcvr) ifTrue: [^PrimErrBadReceiver]]]. + ccIndex := classHdr bitAnd: CompactClassMask. (self headerTypeOfHeader: rcvrHdr) = HeaderTypeShort ifTrue: "Compact classes. Check if the arg's class is compact and exchange ccIndex" + [ccIndex = 0 ifTrue: - [ccIndex := classHdr bitAnd: CompactClassMask. - ccIndex = 0 ifTrue: [^PrimErrInappropriate]. "class is not compact" self cppIf: IMMUTABILITY ifTrue: [(rcvrHdr bitAnd: ImmutabilityBit) ~= 0 ifTrue: [^PrimErrNoModification]]. self baseHeader: rcvr put: (((self longAt: rcvr) bitClear: CompactClassMask) bitOr: ccIndex)] + ifFalse: "Exchange the class pointer, which could make rcvr a root for argClass. Don't forget to set ccIndex." - ifFalse: "Exchange the class pointer, which could make rcvr a root for argClass" [self cppIf: IMMUTABILITY ifTrue: [(rcvrHdr bitAnd: ImmutabilityBit) ~= 0 ifTrue: [^PrimErrNoModification]]. (self compactClassIndexOf: rcvr) ~= 0 ifTrue: [self baseHeader: rcvr put: (((self baseHeader: rcvr) bitClear: CompactClassMask) bitOr: ccIndex)]. self longAt: rcvr-BaseHeaderSize put: (argClass bitOr: (self headerType: rcvr)). (self oop: rcvr isLessThan: youngStart) ifTrue: [self possibleRootStoreInto: rcvr value: argClass]]. "ok" ^0!

1 0

VM Maker: VMMaker.oscog-eem.236.mcz
by commits＠source.squeak.org 17 Dec '12

17 Dec '12

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.236.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.236 Author: eem Time: 17 December 2012, 10:16:49.557 am UUID: 009ced90-5c50-461c-8550-f7eca297fa09 Ancestors: VMMaker.oscog-eem.235 Fix bug in changeClass:from: so that if receiver has long header and class is compact, receiver still gets compact class field set, not cleared. No matter what header an instance has, if its class is compact it should have the compact class index set. =============== Diff against VMMaker.oscog-eem.235 =============== Item was changed: ----- Method: ObjectMemory>>changeClassOf:to: (in category 'interpreter access') ----- changeClassOf: rcvr to: argClass "Attempt to change the class of the receiver into the class of the the argument given that the format of the receiver matches the format of the argument. If successful answer 0, otherwise answer an error code indicating the reason for failure. Fail if receiver or argument are SmallIntegers, or the receiver is an instance of a compact class and the argument isn't, or when the format of the receiver is different from the format of the argument's class, or when the arguments class is fixed and the receiver's size differs from the size that an instance of the argument's class should have." | classHdr sizeHiBits byteSize argFormat rcvrFormat rcvrHdr ccIndex | "Check what the format of the class says" classHdr := self formatOfClass: argClass. "Low 2 bits are 0" "Compute the size of instances of the class (used for fixed field classes only)" sizeHiBits := (classHdr bitAnd: 16r60000) >> 9. classHdr := classHdr bitAnd: 16r1FFFF. byteSize := (classHdr bitAnd: SizeMask) + sizeHiBits. "size in bytes -- low 2 bits are 0" "Check the receiver's format against that of the class" argFormat := self formatOfHeader: classHdr. rcvrHdr := self baseHeader: rcvr. rcvrFormat := self formatOfHeader: rcvrHdr. "If the receiver is a byte object we need to clear the number of odd bytes from the format." rcvrFormat > 8 ifTrue: [rcvrFormat := rcvrFormat bitAnd: 16rC]. argFormat = rcvrFormat ifFalse: [^PrimErrInappropriate]. "no way" "For fixed field classes, the sizes must match. Note: byteSize-4 because base header is included in class size." argFormat < 2 ifTrue: [(byteSize - BaseHeaderSize) ~= (self byteSizeOf: rcvr) ifTrue: [^PrimErrBadReceiver]] ifFalse: [argFormat = 3 ifTrue: "For indexable plus fixed fields the receiver must be at least big enough." [(byteSize - BaseHeaderSize) > (self byteSizeOf: rcvr) ifTrue: [^PrimErrBadReceiver]]]. (self headerTypeOfHeader: rcvrHdr) = HeaderTypeShort ifTrue: "Compact classes. Check if the arg's class is compact and exchange ccIndex" [ccIndex := classHdr bitAnd: CompactClassMask. ccIndex = 0 ifTrue: [^PrimErrInappropriate]. "class is not compact" self cppIf: IMMUTABILITY ifTrue: [(rcvrHdr bitAnd: ImmutabilityBit) ~= 0 ifTrue: [^PrimErrNoModification]]. self baseHeader: rcvr put: (((self longAt: rcvr) bitClear: CompactClassMask) bitOr: ccIndex)] ifFalse: "Exchange the class pointer, which could make rcvr a root for argClass" [self cppIf: IMMUTABILITY ifTrue: [(rcvrHdr bitAnd: ImmutabilityBit) ~= 0 ifTrue: [^PrimErrNoModification]]. (self compactClassIndexOf: rcvr) ~= 0 ifTrue: [self baseHeader: rcvr + put: (((self baseHeader: rcvr) bitClear: CompactClassMask) bitOr: ccIndex)]. - put: ((self baseHeader: rcvr) bitClear: CompactClassMask)]. self longAt: rcvr-BaseHeaderSize put: (argClass bitOr: (self headerType: rcvr)). (self oop: rcvr isLessThan: youngStart) ifTrue: [self possibleRootStoreInto: rcvr value: argClass]]. "ok" ^0!

1 0

[Vm-dev] OSProcessPlugin: VMConstruction-Plugins-OSProcessPlugin-dtl.36.mcz
by squeak-dev-noreply＠lists.squeakfoundation.org 17 Dec '12

17 Dec '12

Dave Lewis uploaded a new version of VMConstruction-Plugins-OSProcessPlugin to project OSProcessPlugin: http://www.squeaksource.com/OSProcessPlugin/VMConstruction-Plugins-OSProces… ==================== Summary ==================== Name: VMConstruction-Plugins-OSProcessPlugin-dtl.36 Author: dtl Time: 16 December 2012, 5:15:09 am UUID: 302fb270-ff80-4566-bcdd-66d29f666b42 Ancestors: VMConstruction-Plugins-OSProcessPlugin-dtl.35 OSProcessPlugin 4.4.12 Fix signal number assignments. These affect the following primitives (all currently unreferenced by OSProcess/CommandShell): primitiveSendSigabrtTo: primitiveSendSigalrmTo: primitiveSendSigcontTo: primitiveSendSigstopTo: Also fix some typos in comments.

1 0

new Cog VMs available
by Eliot Miranda 16 Dec '12

16 Dec '12

Hi All, new Cog VMs available at http://www.mirandabanda.org/files/Cog/VM/VM.r2636/. The main change here is to do with corrected headroom and safer signal handling which should hopefully improve stability on linux. Cog VM binaries as per VMMaker.oscog-eem.234/r2636/r2638. Use the -z now link flag on the linux builds. This causes the dynamic linker to resolve unresolved symbols on load instead of lazily. This affects reliability in signal handlers, because if the dynamic linker can run at any time it can therefore run in a signal handler and cause a deep call chain which could corrupt a stack page in the JIT. So this aplies three fixes to this issue: a) correct the stack headroom determination b) use sigaltstack for signal handlers in the UnixOSProcessPlugin c) link using -z now on linux. Use SA_ONSTACK/sigaltstack for signal handlers installed by the UnixOSProcessPlugin to avoid running signal handlers on the JIT's stack. (r2638: Check for needing sigaltstack properly in setSignalNumber:handler:). ==== VMMaker.oscog-eem.233/r2632 Rename misnamed internalIsMutable: and internalIsImmutable: to isOopMutable: and isOopImmutable:. Affects sqVirtualMachine.c, but only part of api used in Newspeak VMs. Merge LargeInteger primitive fixes from VMMaker-dtl.286 and tests from VMMaker-dtl.289. UnixOSProcessPlugin: Merge with VMConstruction-Plugins-OSProcessPlugin-dtl.35. In particular restore missing code to forwardSignal:toSemaphoreAt: Get plugin to use SA_ONSTACK/sigaltstack for signal handlers if loaded in the JIT. ==== VMMaker.oscog-eem.230/r2631 Fix stackPage headroom calculation in CoInterpreter. Was getting things backward. This increases the stack page headroom by 62% from 1564 bytes to 2532 bytes. Shootout benchmarks unchanged, so reduction in frames per page is not an issue for typical code. This should result in fewer crashes on linux where the dynamic linker, if it kicked in during a signal handler, could cause a deep call chain at interrupt time and trample the start of the adjoining stack page. Merge LargeInteger primitive fixes from VMMaker-dtl.286. Change generation of plugin code so that internal plugins call VM routines directly and external plugins call through their own local copies of the function pointers in InterpreterProxy. External plugins copy the InterpreterProxy functions to their local copies in setInterpreter:. Change implementations of stObject:at:put: to return their value, to match the declaration in InterpreterProxy. Streamline ObjectMemory>>instantiateClass:indexableSize: (hdrSize and header3 change together). Optimize the debug VM by making startOfMemory a macro that answers heapBase instead of a method. Improve stack page printing, and make stack trace printing more robust (findClass/SelectorOfMethod:forReceiver:). Make temporary:in:put: et al answer their values. For stObject:at:put:. Make jumpTable size err message more explanatory. Rename misnamed internameIsMutable: and internalIsImmutable: to isOopMutable: and isOopImmutable:. Affects sqVirtualMachine.c, but only part of api used in Newspeak VMs.-- best, Eliot

1 0

[Vm-dev] OSProcessPlugin: VMConstruction-Plugins-OSProcessPlugin.oscog-eem.41.mcz
by squeak-dev-noreply＠lists.squeakfoundation.org 15 Dec '12

15 Dec '12

Eliot Miranda uploaded a new version of VMConstruction-Plugins-OSProcessPlugin to project OSProcessPlugin: http://www.squeaksource.com/OSProcessPlugin/VMConstruction-Plugins-OSProces… ==================== Summary ==================== Name: VMConstruction-Plugins-OSProcessPlugin.oscog-eem.41 Author: eem Time: 14 December 2012, 4:42:40 am UUID: 0406d3fc-7b8b-4b72-b20a-f254eeb1b893 Ancestors: VMConstruction-Plugins-OSProcessPlugin.oscog-eem.40 Check for needing sigaltstack properly in setSignalNumber:handler:

1 0

[commit][2636] Check for needing sigaltstack properly in setSignalNumber: handler:.
by commits＠squeakvm.org 15 Dec '12

15 Dec '12

Revision: 2636 Author: eliot Date: 2012-12-14 16:44:59 -0800 (Fri, 14 Dec 2012) Log Message: ----------- Check for needing sigaltstack properly in setSignalNumber:handler:. Modified Paths: -------------- branches/Cog/nscogsrc/plugins/UnixOSProcessPlugin/UnixOSProcessPlugin.c branches/Cog/src/plugins/UnixOSProcessPlugin/UnixOSProcessPlugin.c Property Changed: ---------------- branches/Cog/platforms/Cross/vm/sqSCCSVersion.h Modified: branches/Cog/nscogsrc/plugins/UnixOSProcessPlugin/UnixOSProcessPlugin.c =================================================================== --- branches/Cog/nscogsrc/plugins/UnixOSProcessPlugin/UnixOSProcessPlugin.c 2012-12-14 22:07:30 UTC (rev 2635) +++ branches/Cog/nscogsrc/plugins/UnixOSProcessPlugin/UnixOSProcessPlugin.c 2012-12-15 00:44:59 UTC (rev 2636) @@ -1,9 +1,9 @@ /* Automatically generated by VMPluginCodeGenerator VMMaker.oscog-eem.235 uuid: 954df856-3f83-498c-9735-6cd3777ba9c7 from - UnixOSProcessPlugin VMConstruction-Plugins-OSProcessPlugin.oscog-eem.40 uuid: 5f1cbe1c-127c-4582-a629-86dab8269efb + UnixOSProcessPlugin VMConstruction-Plugins-OSProcessPlugin.oscog-eem.41 uuid: 0406d3fc-7b8b-4b72-b20a-f254eeb1b893 */ -static char __buildInfo[] = "UnixOSProcessPlugin VMConstruction-Plugins-OSProcessPlugin.oscog-eem.40 uuid: 5f1cbe1c-127c-4582-a629-86dab8269efb " __DATE__ ; +static char __buildInfo[] = "UnixOSProcessPlugin VMConstruction-Plugins-OSProcessPlugin.oscog-eem.41 uuid: 0406d3fc-7b8b-4b72-b20a-f254eeb1b893 " __DATE__ ; /* D T Lewis - UnixOSProcessPlugin.c translated from class UnixOSProcessPlugin of OSProcessPlugin version 4.3.3 Cog */ @@ -315,9 +315,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "UnixOSProcessPlugin VMConstruction-Plugins-OSProcessPlugin.oscog-eem.40 (i)" + "UnixOSProcessPlugin VMConstruction-Plugins-OSProcessPlugin.oscog-eem.41 (i)" #else - "UnixOSProcessPlugin VMConstruction-Plugins-OSProcessPlugin.oscog-eem.40 (e)" + "UnixOSProcessPlugin VMConstruction-Plugins-OSProcessPlugin.oscog-eem.41 (e)" #endif ; static void *originalSigHandlers[NSIG]; @@ -4227,7 +4227,7 @@ struct sigaction oldHandlerAction; struct sigaction sigHandlerAction; - if (!useSignalStack) { + if (!(needSigaltstack())) { return signal(signalNumber, signalHandlerAddress); } sigHandlerAction.sa_sigaction = signalHandlerAddress; Property changes on: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h ___________________________________________________________________ Modified: checkindate - Fri Dec 14 14:06:21 PST 2012 + Fri Dec 14 16:44:39 PST 2012 Modified: branches/Cog/src/plugins/UnixOSProcessPlugin/UnixOSProcessPlugin.c =================================================================== --- branches/Cog/src/plugins/UnixOSProcessPlugin/UnixOSProcessPlugin.c 2012-12-14 22:07:30 UTC (rev 2635) +++ branches/Cog/src/plugins/UnixOSProcessPlugin/UnixOSProcessPlugin.c 2012-12-15 00:44:59 UTC (rev 2636) @@ -1,9 +1,9 @@ /* Automatically generated by VMPluginCodeGenerator VMMaker.oscog-eem.235 uuid: 954df856-3f83-498c-9735-6cd3777ba9c7 from - UnixOSProcessPlugin VMConstruction-Plugins-OSProcessPlugin.oscog-eem.40 uuid: 5f1cbe1c-127c-4582-a629-86dab8269efb + UnixOSProcessPlugin VMConstruction-Plugins-OSProcessPlugin.oscog-eem.41 uuid: 0406d3fc-7b8b-4b72-b20a-f254eeb1b893 */ -static char __buildInfo[] = "UnixOSProcessPlugin VMConstruction-Plugins-OSProcessPlugin.oscog-eem.40 uuid: 5f1cbe1c-127c-4582-a629-86dab8269efb " __DATE__ ; +static char __buildInfo[] = "UnixOSProcessPlugin VMConstruction-Plugins-OSProcessPlugin.oscog-eem.41 uuid: 0406d3fc-7b8b-4b72-b20a-f254eeb1b893 " __DATE__ ; /* D T Lewis - UnixOSProcessPlugin.c translated from class UnixOSProcessPlugin of OSProcessPlugin version 4.3.3 Cog */ @@ -315,9 +315,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "UnixOSProcessPlugin VMConstruction-Plugins-OSProcessPlugin.oscog-eem.40 (i)" + "UnixOSProcessPlugin VMConstruction-Plugins-OSProcessPlugin.oscog-eem.41 (i)" #else - "UnixOSProcessPlugin VMConstruction-Plugins-OSProcessPlugin.oscog-eem.40 (e)" + "UnixOSProcessPlugin VMConstruction-Plugins-OSProcessPlugin.oscog-eem.41 (e)" #endif ; static void *originalSigHandlers[NSIG]; @@ -4227,7 +4227,7 @@ struct sigaction oldHandlerAction; struct sigaction sigHandlerAction; - if (!useSignalStack) { + if (!(needSigaltstack())) { return signal(signalNumber, signalHandlerAddress); } sigHandlerAction.sa_sigaction = signalHandlerAddress;

1 0

[Vm-dev] OSProcessPlugin: VMConstruction-Plugins-OSProcessPlugin.oscog-eem.40.mcz
by squeak-dev-noreply＠lists.squeakfoundation.org 15 Dec '12

15 Dec '12

Eliot Miranda uploaded a new version of VMConstruction-Plugins-OSProcessPlugin to project OSProcessPlugin: http://www.squeaksource.com/OSProcessPlugin/VMConstruction-Plugins-OSProces… ==================== Summary ==================== Name: VMConstruction-Plugins-OSProcessPlugin.oscog-eem.40 Author: eem Time: 14 December 2012, 2:00:49 am UUID: 5f1cbe1c-127c-4582-a629-86dab8269efb Ancestors: VMConstruction-Plugins-OSProcessPlugin.oscog-eem.39 Put the dang method in the right place...

1 0

[commit][2635] Fix plugins.
by commits＠squeakvm.org 14 Dec '12

14 Dec '12

Revision: 2635 Author: eliot Date: 2012-12-14 14:07:30 -0800 (Fri, 14 Dec 2012) Log Message: ----------- Fix plugins. Code from previous check-in had "cosmetic" weaknesses, doubled include files and a semicolon trailing a #endif. Modified Paths: -------------- branches/Cog/nscogbuild/cygwinbuild/sqNamedPrims.h branches/Cog/nscogsrc/plugins/AsynchFilePlugin/AsynchFilePlugin.c branches/Cog/nscogsrc/plugins/B2DPlugin/B2DPlugin.c branches/Cog/nscogsrc/plugins/BMPReadWriterPlugin/BMPReadWriterPlugin.c branches/Cog/nscogsrc/plugins/BitBltPlugin/BitBltPlugin.c branches/Cog/nscogsrc/plugins/DSAPrims/DSAPrims.c branches/Cog/nscogsrc/plugins/DropPlugin/DropPlugin.c branches/Cog/nscogsrc/plugins/FileCopyPlugin/FileCopyPlugin.c branches/Cog/nscogsrc/plugins/FilePlugin/FilePlugin.c branches/Cog/nscogsrc/plugins/FloatArrayPlugin/FloatArrayPlugin.c branches/Cog/nscogsrc/plugins/FloatMathPlugin/FloatMathPlugin.c branches/Cog/nscogsrc/plugins/IA32ABI/IA32ABI.c branches/Cog/nscogsrc/plugins/JPEGReadWriter2Plugin/JPEGReadWriter2Plugin.c branches/Cog/nscogsrc/plugins/JPEGReaderPlugin/JPEGReaderPlugin.c branches/Cog/nscogsrc/plugins/LargeIntegers/LargeIntegers.c branches/Cog/nscogsrc/plugins/Matrix2x3Plugin/Matrix2x3Plugin.c branches/Cog/nscogsrc/plugins/MiscPrimitivePlugin/MiscPrimitivePlugin.c branches/Cog/nscogsrc/plugins/RePlugin/RePlugin.c branches/Cog/nscogsrc/plugins/SecurityPlugin/SecurityPlugin.c branches/Cog/nscogsrc/plugins/SocketPlugin/SocketPlugin.c branches/Cog/nscogsrc/plugins/SoundPlugin/SoundPlugin.c branches/Cog/nscogsrc/plugins/UUIDPlugin/UUIDPlugin.c branches/Cog/nscogsrc/plugins/UnixOSProcessPlugin/UnixOSProcessPlugin.c branches/Cog/nscogsrc/plugins/VMProfileMacSupportPlugin/VMProfileMacSupportPlugin.c branches/Cog/nscogsrc/plugins/Win32OSProcessPlugin/Win32OSProcessPlugin.c branches/Cog/nscogsrc/plugins/ZipPlugin/ZipPlugin.c branches/Cog/src/plugins/ADPCMCodecPlugin/ADPCMCodecPlugin.c branches/Cog/src/plugins/AsynchFilePlugin/AsynchFilePlugin.c branches/Cog/src/plugins/B2DPlugin/B2DPlugin.c branches/Cog/src/plugins/B3DAcceleratorPlugin/B3DAcceleratorPlugin.c branches/Cog/src/plugins/BMPReadWriterPlugin/BMPReadWriterPlugin.c branches/Cog/src/plugins/BitBltPlugin/BitBltPlugin.c branches/Cog/src/plugins/BochsIA32Plugin/BochsIA32Plugin.c branches/Cog/src/plugins/CroquetPlugin/CroquetPlugin.c branches/Cog/src/plugins/DSAPrims/DSAPrims.c branches/Cog/src/plugins/DropPlugin/DropPlugin.c branches/Cog/src/plugins/FFTPlugin/FFTPlugin.c branches/Cog/src/plugins/FT2Plugin/FT2Plugin.c branches/Cog/src/plugins/FileCopyPlugin/FileCopyPlugin.c branches/Cog/src/plugins/FilePlugin/FilePlugin.c branches/Cog/src/plugins/FloatArrayPlugin/FloatArrayPlugin.c branches/Cog/src/plugins/FloatMathPlugin/FloatMathPlugin.c branches/Cog/src/plugins/GeniePlugin/GeniePlugin.c branches/Cog/src/plugins/HostWindowPlugin/HostWindowPlugin.c branches/Cog/src/plugins/IA32ABI/IA32ABI.c branches/Cog/src/plugins/InternetConfigPlugin/InternetConfigPlugin.c branches/Cog/src/plugins/JPEGReadWriter2Plugin/JPEGReadWriter2Plugin.c branches/Cog/src/plugins/JPEGReaderPlugin/JPEGReaderPlugin.c branches/Cog/src/plugins/JoystickTabletPlugin/JoystickTabletPlugin.c branches/Cog/src/plugins/Klatt/Klatt.c branches/Cog/src/plugins/LargeIntegers/LargeIntegers.c branches/Cog/src/plugins/LocalePlugin/LocalePlugin.c branches/Cog/src/plugins/MIDIPlugin/MIDIPlugin.c branches/Cog/src/plugins/MacMenubarPlugin/MacMenubarPlugin.c branches/Cog/src/plugins/Matrix2x3Plugin/Matrix2x3Plugin.c branches/Cog/src/plugins/MiscPrimitivePlugin/MiscPrimitivePlugin.c branches/Cog/src/plugins/Mpeg3Plugin/Mpeg3Plugin.c branches/Cog/src/plugins/QuicktimePlugin/QuicktimePlugin.c branches/Cog/src/plugins/RePlugin/RePlugin.c branches/Cog/src/plugins/SecurityPlugin/SecurityPlugin.c branches/Cog/src/plugins/SerialPlugin/SerialPlugin.c branches/Cog/src/plugins/SocketPlugin/SocketPlugin.c branches/Cog/src/plugins/SoundCodecPrims/SoundCodecPrims.c branches/Cog/src/plugins/SoundGenerationPlugin/SoundGenerationPlugin.c branches/Cog/src/plugins/SoundPlugin/SoundPlugin.c branches/Cog/src/plugins/SqueakFFIPrims/SqueakFFIPrims.c branches/Cog/src/plugins/StarSqueakPlugin/StarSqueakPlugin.c branches/Cog/src/plugins/UUIDPlugin/UUIDPlugin.c branches/Cog/src/plugins/UnixOSProcessPlugin/UnixOSProcessPlugin.c branches/Cog/src/plugins/VMProfileMacSupportPlugin/VMProfileMacSupportPlugin.c branches/Cog/src/plugins/Win32OSProcessPlugin/Win32OSProcessPlugin.c branches/Cog/src/plugins/ZipPlugin/ZipPlugin.c Property Changed: ---------------- branches/Cog/platforms/Cross/vm/sqSCCSVersion.h Modified: branches/Cog/nscogbuild/cygwinbuild/sqNamedPrims.h =================================================================== --- branches/Cog/nscogbuild/cygwinbuild/sqNamedPrims.h 2012-12-14 00:58:29 UTC (rev 2634) +++ branches/Cog/nscogbuild/cygwinbuild/sqNamedPrims.h 2012-12-14 22:07:30 UTC (rev 2635) @@ -1,4 +1,4 @@ -/* Automatically generated on Dec 13 2012, 16:51:04 */ +/* Automatically generated on Dec 13 2012, 17:08:01 */ extern sqExport vm_exports[]; extern sqExport os_exports[]; Modified: branches/Cog/nscogsrc/plugins/AsynchFilePlugin/AsynchFilePlugin.c =================================================================== --- branches/Cog/nscogsrc/plugins/AsynchFilePlugin/AsynchFilePlugin.c 2012-12-14 00:58:29 UTC (rev 2634) +++ branches/Cog/nscogsrc/plugins/AsynchFilePlugin/AsynchFilePlugin.c 2012-12-14 22:07:30 UTC (rev 2635) @@ -1,9 +1,9 @@ /* Automatically generated by - SmartSyntaxPluginCodeGenerator VMMaker.oscog-eem.234 uuid: 66acafd1-cad0-4f20-b786-ab8f48201d82 + SmartSyntaxPluginCodeGenerator VMMaker.oscog-eem.235 uuid: 954df856-3f83-498c-9735-6cd3777ba9c7 from - AsynchFilePlugin VMMaker.oscog-eem.234 uuid: 66acafd1-cad0-4f20-b786-ab8f48201d82 + AsynchFilePlugin VMMaker.oscog-eem.235 uuid: 954df856-3f83-498c-9735-6cd3777ba9c7 */ -static char __buildInfo[] = "AsynchFilePlugin VMMaker.oscog-eem.234 uuid: 66acafd1-cad0-4f20-b786-ab8f48201d82 " __DATE__ ; +static char __buildInfo[] = "AsynchFilePlugin VMMaker.oscog-eem.235 uuid: 954df856-3f83-498c-9735-6cd3777ba9c7 " __DATE__ ; @@ -12,11 +12,6 @@ #include <stdlib.h> #include <string.h> #include <time.h> -#include <math.h> -#include <stdio.h> -#include <stdlib.h> -#include <string.h> -#include <time.h> /* Default EXPORT macro that does nothing (see comment in sq.h): */ #define EXPORT(returnType) returnType @@ -40,7 +35,6 @@ #include "AsynchFilePlugin.h" #include "sqMemoryAccess.h" -#include "sqMemoryAccess.h" /*** Constants ***/ @@ -110,9 +104,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "AsynchFilePlugin VMMaker.oscog-eem.234 (i)" + "AsynchFilePlugin VMMaker.oscog-eem.235 (i)" #else - "AsynchFilePlugin VMMaker.oscog-eem.234 (e)" + "AsynchFilePlugin VMMaker.oscog-eem.235 (e)" #endif ; static void * sCOAFfn; Modified: branches/Cog/nscogsrc/plugins/B2DPlugin/B2DPlugin.c =================================================================== --- branches/Cog/nscogsrc/plugins/B2DPlugin/B2DPlugin.c 2012-12-14 00:58:29 UTC (rev 2634) +++ branches/Cog/nscogsrc/plugins/B2DPlugin/B2DPlugin.c 2012-12-14 22:07:30 UTC (rev 2635) @@ -1,9 +1,9 @@ /* Automatically generated by - VMPluginCodeGenerator VMMaker.oscog-eem.234 uuid: 66acafd1-cad0-4f20-b786-ab8f48201d82 + VMPluginCodeGenerator VMMaker.oscog-eem.235 uuid: 954df856-3f83-498c-9735-6cd3777ba9c7 from - BalloonEnginePlugin VMMaker.oscog-eem.234 uuid: 66acafd1-cad0-4f20-b786-ab8f48201d82 + BalloonEnginePlugin VMMaker.oscog-eem.235 uuid: 954df856-3f83-498c-9735-6cd3777ba9c7 */ -static char __buildInfo[] = "BalloonEnginePlugin VMMaker.oscog-eem.234 uuid: 66acafd1-cad0-4f20-b786-ab8f48201d82 " __DATE__ ; +static char __buildInfo[] = "BalloonEnginePlugin VMMaker.oscog-eem.235 uuid: 954df856-3f83-498c-9735-6cd3777ba9c7 " __DATE__ ; @@ -12,11 +12,6 @@ #include <stdlib.h> #include <string.h> #include <time.h> -#include <math.h> -#include <stdio.h> -#include <stdlib.h> -#include <string.h> -#include <time.h> /* Default EXPORT macro that does nothing (see comment in sq.h): */ #define EXPORT(returnType) returnType @@ -39,7 +34,6 @@ #endif #include "sqMemoryAccess.h" -#include "sqMemoryAccess.h" /*** Constants ***/ @@ -841,9 +835,9 @@ static void * loadBBFn; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "B2DPlugin VMMaker.oscog-eem.234 (i)" + "B2DPlugin VMMaker.oscog-eem.235 (i)" #else - "B2DPlugin VMMaker.oscog-eem.234 (e)" + "B2DPlugin VMMaker.oscog-eem.235 (e)" #endif ; static int* objBuffer; Modified: branches/Cog/nscogsrc/plugins/BMPReadWriterPlugin/BMPReadWriterPlugin.c =================================================================== --- branches/Cog/nscogsrc/plugins/BMPReadWriterPlugin/BMPReadWriterPlugin.c 2012-12-14 00:58:29 UTC (rev 2634) +++ branches/Cog/nscogsrc/plugins/BMPReadWriterPlugin/BMPReadWriterPlugin.c 2012-12-14 22:07:30 UTC (rev 2635) @@ -1,9 +1,9 @@ /* Automatically generated by - VMPluginCodeGenerator VMMaker.oscog-eem.234 uuid: 66acafd1-cad0-4f20-b786-ab8f48201d82 + VMPluginCodeGenerator VMMaker.oscog-eem.235 uuid: 954df856-3f83-498c-9735-6cd3777ba9c7 from - BMPReadWriterPlugin VMMaker.oscog-eem.234 uuid: 66acafd1-cad0-4f20-b786-ab8f48201d82 + BMPReadWriterPlugin VMMaker.oscog-eem.235 uuid: 954df856-3f83-498c-9735-6cd3777ba9c7 */ -static char __buildInfo[] = "BMPReadWriterPlugin VMMaker.oscog-eem.234 uuid: 66acafd1-cad0-4f20-b786-ab8f48201d82 " __DATE__ ; +static char __buildInfo[] = "BMPReadWriterPlugin VMMaker.oscog-eem.235 uuid: 954df856-3f83-498c-9735-6cd3777ba9c7 " __DATE__ ; @@ -12,11 +12,6 @@ #include <stdlib.h> #include <string.h> #include <time.h> -#include <math.h> -#include <stdio.h> -#include <stdlib.h> -#include <string.h> -#include <time.h> /* Default EXPORT macro that does nothing (see comment in sq.h): */ #define EXPORT(returnType) returnType @@ -39,7 +34,6 @@ #endif #include "sqMemoryAccess.h" -#include "sqMemoryAccess.h" /*** Constants ***/ @@ -86,9 +80,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "BMPReadWriterPlugin VMMaker.oscog-eem.234 (i)" + "BMPReadWriterPlugin VMMaker.oscog-eem.235 (i)" #else - "BMPReadWriterPlugin VMMaker.oscog-eem.234 (e)" + "BMPReadWriterPlugin VMMaker.oscog-eem.235 (e)" #endif ; Modified: branches/Cog/nscogsrc/plugins/BitBltPlugin/BitBltPlugin.c =================================================================== --- branches/Cog/nscogsrc/plugins/BitBltPlugin/BitBltPlugin.c 2012-12-14 00:58:29 UTC (rev 2634) +++ branches/Cog/nscogsrc/plugins/BitBltPlugin/BitBltPlugin.c 2012-12-14 22:07:30 UTC (rev 2635) @@ -1,9 +1,9 @@ /* Automatically generated by - VMPluginCodeGenerator VMMaker.oscog-eem.234 uuid: 66acafd1-cad0-4f20-b786-ab8f48201d82 + VMPluginCodeGenerator VMMaker.oscog-eem.235 uuid: 954df856-3f83-498c-9735-6cd3777ba9c7 from - BitBltSimulation VMMaker.oscog-eem.234 uuid: 66acafd1-cad0-4f20-b786-ab8f48201d82 + BitBltSimulation VMMaker.oscog-eem.235 uuid: 954df856-3f83-498c-9735-6cd3777ba9c7 */ -static char __buildInfo[] = "BitBltSimulation VMMaker.oscog-eem.234 uuid: 66acafd1-cad0-4f20-b786-ab8f48201d82 " __DATE__ ; +static char __buildInfo[] = "BitBltSimulation VMMaker.oscog-eem.235 uuid: 954df856-3f83-498c-9735-6cd3777ba9c7 " __DATE__ ; @@ -12,11 +12,6 @@ #include <stdlib.h> #include <string.h> #include <time.h> -#include <math.h> -#include <stdio.h> -#include <stdlib.h> -#include <string.h> -#include <time.h> /* Default EXPORT macro that does nothing (see comment in sq.h): */ #define EXPORT(returnType) returnType @@ -39,7 +34,6 @@ #endif #include "sqMemoryAccess.h" -#include "sqMemoryAccess.h" /*** Constants ***/ @@ -333,9 +327,9 @@ }; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "BitBltPlugin VMMaker.oscog-eem.234 (i)" + "BitBltPlugin VMMaker.oscog-eem.235 (i)" #else - "BitBltPlugin VMMaker.oscog-eem.234 (e)" + "BitBltPlugin VMMaker.oscog-eem.235 (e)" #endif ; static sqInt noHalftone; Modified: branches/Cog/nscogsrc/plugins/DSAPrims/DSAPrims.c =================================================================== --- branches/Cog/nscogsrc/plugins/DSAPrims/DSAPrims.c 2012-12-14 00:58:29 UTC (rev 2634) +++ branches/Cog/nscogsrc/plugins/DSAPrims/DSAPrims.c 2012-12-14 22:07:30 UTC (rev 2635) @@ -1,9 +1,9 @@ /* Automatically generated by - VMPluginCodeGenerator VMMaker.oscog-eem.234 uuid: 66acafd1-cad0-4f20-b786-ab8f48201d82 + VMPluginCodeGenerator VMMaker.oscog-eem.235 uuid: 954df856-3f83-498c-9735-6cd3777ba9c7 from - DSAPlugin VMMaker.oscog-eem.234 uuid: 66acafd1-cad0-4f20-b786-ab8f48201d82 + DSAPlugin VMMaker.oscog-eem.235 uuid: 954df856-3f83-498c-9735-6cd3777ba9c7 */ -static char __buildInfo[] = "DSAPlugin VMMaker.oscog-eem.234 uuid: 66acafd1-cad0-4f20-b786-ab8f48201d82 " __DATE__ ; +static char __buildInfo[] = "DSAPlugin VMMaker.oscog-eem.235 uuid: 954df856-3f83-498c-9735-6cd3777ba9c7 " __DATE__ ; @@ -12,11 +12,6 @@ #include <stdlib.h> #include <string.h> #include <time.h> -#include <math.h> -#include <stdio.h> -#include <stdlib.h> -#include <string.h> -#include <time.h> /* Default EXPORT macro that does nothing (see comment in sq.h): */ #define EXPORT(returnType) returnType @@ -39,7 +34,6 @@ #endif #include "sqMemoryAccess.h" -#include "sqMemoryAccess.h" /*** Constants ***/ @@ -102,9 +96,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "DSAPrims VMMaker.oscog-eem.234 (i)" + "DSAPrims VMMaker.oscog-eem.235 (i)" #else - "DSAPrims VMMaker.oscog-eem.234 (e)" + "DSAPrims VMMaker.oscog-eem.235 (e)" #endif ; static sqInt remainderDigitCount; Modified: branches/Cog/nscogsrc/plugins/DropPlugin/DropPlugin.c =================================================================== --- branches/Cog/nscogsrc/plugins/DropPlugin/DropPlugin.c 2012-12-14 00:58:29 UTC (rev 2634) +++ branches/Cog/nscogsrc/plugins/DropPlugin/DropPlugin.c 2012-12-14 22:07:30 UTC (rev 2635) @@ -1,9 +1,9 @@ /* Automatically generated by - VMPluginCodeGenerator VMMaker.oscog-eem.234 uuid: 66acafd1-cad0-4f20-b786-ab8f48201d82 + VMPluginCodeGenerator VMMaker.oscog-eem.235 uuid: 954df856-3f83-498c-9735-6cd3777ba9c7 from - DropPlugin VMMaker.oscog-eem.234 uuid: 66acafd1-cad0-4f20-b786-ab8f48201d82 + DropPlugin VMMaker.oscog-eem.235 uuid: 954df856-3f83-498c-9735-6cd3777ba9c7 */ -static char __buildInfo[] = "DropPlugin VMMaker.oscog-eem.234 uuid: 66acafd1-cad0-4f20-b786-ab8f48201d82 " __DATE__ ; +static char __buildInfo[] = "DropPlugin VMMaker.oscog-eem.235 uuid: 954df856-3f83-498c-9735-6cd3777ba9c7 " __DATE__ ; @@ -12,11 +12,6 @@ #include <stdlib.h> #include <string.h> #include <time.h> -#include <math.h> -#include <stdio.h> -#include <stdlib.h> -#include <string.h> -#include <time.h> /* Default EXPORT macro that does nothing (see comment in sq.h): */ #define EXPORT(returnType) returnType @@ -40,7 +35,6 @@ #include "DropPlugin.h" #include "sqMemoryAccess.h" -#include "sqMemoryAccess.h" /*** Constants ***/ @@ -88,9 +82,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "DropPlugin VMMaker.oscog-eem.234 (i)" + "DropPlugin VMMaker.oscog-eem.235 (i)" #else - "DropPlugin VMMaker.oscog-eem.234 (e)" + "DropPlugin VMMaker.oscog-eem.235 (e)" #endif ; Modified: branches/Cog/nscogsrc/plugins/FileCopyPlugin/FileCopyPlugin.c =================================================================== --- branches/Cog/nscogsrc/plugins/FileCopyPlugin/FileCopyPlugin.c 2012-12-14 00:58:29 UTC (rev 2634) +++ branches/Cog/nscogsrc/plugins/FileCopyPlugin/FileCopyPlugin.c 2012-12-14 22:07:30 UTC (rev 2635) @@ -1,9 +1,9 @@ /* Automatically generated by - SmartSyntaxPluginCodeGenerator VMMaker.oscog-eem.234 uuid: 66acafd1-cad0-4f20-b786-ab8f48201d82 + SmartSyntaxPluginCodeGenerator VMMaker.oscog-eem.235 uuid: 954df856-3f83-498c-9735-6cd3777ba9c7 from - FileCopyPlugin VMMaker.oscog-eem.234 uuid: 66acafd1-cad0-4f20-b786-ab8f48201d82 + FileCopyPlugin VMMaker.oscog-eem.235 uuid: 954df856-3f83-498c-9735-6cd3777ba9c7 */ -static char __buildInfo[] = "FileCopyPlugin VMMaker.oscog-eem.234 uuid: 66acafd1-cad0-4f20-b786-ab8f48201d82 " __DATE__ ; +static char __buildInfo[] = "FileCopyPlugin VMMaker.oscog-eem.235 uuid: 954df856-3f83-498c-9735-6cd3777ba9c7 " __DATE__ ; @@ -12,11 +12,6 @@ #include <stdlib.h> #include <string.h> #include <time.h> -#include <math.h> -#include <stdio.h> -#include <stdlib.h> -#include <string.h> -#include <time.h> /* Default EXPORT macro that does nothing (see comment in sq.h): */ #define EXPORT(returnType) returnType @@ -39,7 +34,6 @@ #endif #include "sqMemoryAccess.h" -#include "sqMemoryAccess.h" /*** Constants ***/ @@ -82,9 +76,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "FileCopyPlugin VMMaker.oscog-eem.234 (i)" + "FileCopyPlugin VMMaker.oscog-eem.235 (i)" #else - "FileCopyPlugin VMMaker.oscog-eem.234 (e)" + "FileCopyPlugin VMMaker.oscog-eem.235 (e)" #endif ; Modified: branches/Cog/nscogsrc/plugins/FilePlugin/FilePlugin.c =================================================================== --- branches/Cog/nscogsrc/plugins/FilePlugin/FilePlugin.c 2012-12-14 00:58:29 UTC (rev 2634) +++ branches/Cog/nscogsrc/plugins/FilePlugin/FilePlugin.c 2012-12-14 22:07:30 UTC (rev 2635) @@ -1,9 +1,9 @@ /* Automatically generated by - VMPluginCodeGenerator VMMaker.oscog-eem.234 uuid: 66acafd1-cad0-4f20-b786-ab8f48201d82 + VMPluginCodeGenerator VMMaker.oscog-eem.235 uuid: 954df856-3f83-498c-9735-6cd3777ba9c7 from - FilePlugin VMMaker.oscog-eem.234 uuid: 66acafd1-cad0-4f20-b786-ab8f48201d82 + FilePlugin VMMaker.oscog-eem.235 uuid: 954df856-3f83-498c-9735-6cd3777ba9c7 */ -static char __buildInfo[] = "FilePlugin VMMaker.oscog-eem.234 uuid: 66acafd1-cad0-4f20-b786-ab8f48201d82 " __DATE__ ; +static char __buildInfo[] = "FilePlugin VMMaker.oscog-eem.235 uuid: 954df856-3f83-498c-9735-6cd3777ba9c7 " __DATE__ ; @@ -12,11 +12,6 @@ #include <stdlib.h> #include <string.h> #include <time.h> -#include <math.h> -#include <stdio.h> -#include <stdlib.h> -#include <string.h> -#include <time.h> /* Default EXPORT macro that does nothing (see comment in sq.h): */ #define EXPORT(returnType) returnType @@ -40,7 +35,6 @@ #include "FilePlugin.h" #include "sqMemoryAccess.h" -#include "sqMemoryAccess.h" /*** Constants ***/ @@ -182,9 +176,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "FilePlugin VMMaker.oscog-eem.234 (i)" + "FilePlugin VMMaker.oscog-eem.235 (i)" #else - "FilePlugin VMMaker.oscog-eem.234 (e)" + "FilePlugin VMMaker.oscog-eem.235 (e)" #endif ; static void * sCCPfn; Modified: branches/Cog/nscogsrc/plugins/FloatArrayPlugin/FloatArrayPlugin.c =================================================================== --- branches/Cog/nscogsrc/plugins/FloatArrayPlugin/FloatArrayPlugin.c 2012-12-14 00:58:29 UTC (rev 2634) +++ branches/Cog/nscogsrc/plugins/FloatArrayPlugin/FloatArrayPlugin.c 2012-12-14 22:07:30 UTC (rev 2635) @@ -1,9 +1,9 @@ /* Automatically generated by - VMPluginCodeGenerator VMMaker.oscog-eem.234 uuid: 66acafd1-cad0-4f20-b786-ab8f48201d82 + VMPluginCodeGenerator VMMaker.oscog-eem.235 uuid: 954df856-3f83-498c-9735-6cd3777ba9c7 from - FloatArrayPlugin VMMaker.oscog-eem.234 uuid: 66acafd1-cad0-4f20-b786-ab8f48201d82 + FloatArrayPlugin VMMaker.oscog-eem.235 uuid: 954df856-3f83-498c-9735-6cd3777ba9c7 */ -static char __buildInfo[] = "FloatArrayPlugin VMMaker.oscog-eem.234 uuid: 66acafd1-cad0-4f20-b786-ab8f48201d82 " __DATE__ ; +static char __buildInfo[] = "FloatArrayPlugin VMMaker.oscog-eem.235 uuid: 954df856-3f83-498c-9735-6cd3777ba9c7 " __DATE__ ; @@ -12,11 +12,6 @@ #include <stdlib.h> #include <string.h> #include <time.h> -#include <math.h> -#include <stdio.h> -#include <stdlib.h> -#include <string.h> -#include <time.h> /* Default EXPORT macro that does nothing (see comment in sq.h): */ #define EXPORT(returnType) returnType @@ -39,7 +34,6 @@ #endif #include "sqMemoryAccess.h" -#include "sqMemoryAccess.h" /*** Constants ***/ @@ -120,9 +114,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "FloatArrayPlugin VMMaker.oscog-eem.234 (i)" + "FloatArrayPlugin VMMaker.oscog-eem.235 (i)" #else - "FloatArrayPlugin VMMaker.oscog-eem.234 (e)" + "FloatArrayPlugin VMMaker.oscog-eem.235 (e)" #endif ; Modified: branches/Cog/nscogsrc/plugins/FloatMathPlugin/FloatMathPlugin.c =================================================================== --- branches/Cog/nscogsrc/plugins/FloatMathPlugin/FloatMathPlugin.c 2012-12-14 00:58:29 UTC (rev 2634) +++ branches/Cog/nscogsrc/plugins/FloatMathPlugin/FloatMathPlugin.c 2012-12-14 22:07:30 UTC (rev 2635) @@ -1,9 +1,9 @@ /* Automatically generated by - VMPluginCodeGenerator VMMaker.oscog-eem.234 uuid: 66acafd1-cad0-4f20-b786-ab8f48201d82 + VMPluginCodeGenerator VMMaker.oscog-eem.235 uuid: 954df856-3f83-498c-9735-6cd3777ba9c7 from - FloatMathPlugin VMMaker.oscog-eem.234 uuid: 66acafd1-cad0-4f20-b786-ab8f48201d82 + FloatMathPlugin VMMaker.oscog-eem.235 uuid: 954df856-3f83-498c-9735-6cd3777ba9c7 */ -static char __buildInfo[] = "FloatMathPlugin VMMaker.oscog-eem.234 uuid: 66acafd1-cad0-4f20-b786-ab8f48201d82 " __DATE__ ; +static char __buildInfo[] = "FloatMathPlugin VMMaker.oscog-eem.235 uuid: 954df856-3f83-498c-9735-6cd3777ba9c7 " __DATE__ ; @@ -12,11 +12,6 @@ #include <stdlib.h> #include <string.h> #include <time.h> -#include <math.h> -#include <stdio.h> -#include <stdlib.h> -#include <string.h> -#include <time.h> /* Default EXPORT macro that does nothing (see comment in sq.h): */ #define EXPORT(returnType) returnType @@ -40,7 +35,6 @@ #include "FloatMathPlugin.h" #include "sqMemoryAccess.h" -#include "sqMemoryAccess.h" /*** Constants ***/ @@ -101,9 +95,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "FloatMathPlugin VMMaker.oscog-eem.234 (i)" + "FloatMathPlugin VMMaker.oscog-eem.235 (i)" #else - "FloatMathPlugin VMMaker.oscog-eem.234 (e)" + "FloatMathPlugin VMMaker.oscog-eem.235 (e)" #endif ; Modified: branches/Cog/nscogsrc/plugins/IA32ABI/IA32ABI.c =================================================================== --- branches/Cog/nscogsrc/plugins/IA32ABI/IA32ABI.c 2012-12-14 00:58:29 UTC (rev 2634) +++ branches/Cog/nscogsrc/plugins/IA32ABI/IA32ABI.c 2012-12-14 22:07:30 UTC (rev 2635) @@ -1,9 +1,9 @@ /* Automatically generated by - VMPluginCodeGenerator VMMaker.oscog-eem.234 uuid: 66acafd1-cad0-4f20-b786-ab8f48201d82 + VMPluginCodeGenerator VMMaker.oscog-eem.235 uuid: 954df856-3f83-498c-9735-6cd3777ba9c7 from - NewsqueakIA32ABIPlugin VMMaker.oscog-eem.234 uuid: 66acafd1-cad0-4f20-b786-ab8f48201d82 + NewsqueakIA32ABIPlugin VMMaker.oscog-eem.235 uuid: 954df856-3f83-498c-9735-6cd3777ba9c7 */ -static char __buildInfo[] = "NewsqueakIA32ABIPlugin VMMaker.oscog-eem.234 uuid: 66acafd1-cad0-4f20-b786-ab8f48201d82 " __DATE__ ; +static char __buildInfo[] = "NewsqueakIA32ABIPlugin VMMaker.oscog-eem.235 uuid: 954df856-3f83-498c-9735-6cd3777ba9c7 " __DATE__ ; @@ -12,11 +12,6 @@ #include <stdlib.h> #include <string.h> #include <time.h> -#include <math.h> -#include <stdio.h> -#include <stdlib.h> -#include <string.h> -#include <time.h> #include <setjmp.h> /* Default EXPORT macro that does nothing (see comment in sq.h): */ @@ -42,7 +37,6 @@ #include "vmCallback.h" #include "ia32abi.h" #include "sqMemoryAccess.h" -#include "sqMemoryAccess.h" typedef struct { int type; @@ -228,9 +222,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "IA32ABI VMMaker.oscog-eem.234 (i)" + "IA32ABI VMMaker.oscog-eem.235 (i)" #else - "IA32ABI VMMaker.oscog-eem.234 (e)" + "IA32ABI VMMaker.oscog-eem.235 (e)" #endif ; Modified: branches/Cog/nscogsrc/plugins/JPEGReadWriter2Plugin/JPEGReadWriter2Plugin.c =================================================================== --- branches/Cog/nscogsrc/plugins/JPEGReadWriter2Plugin/JPEGReadWriter2Plugin.c 2012-12-14 00:58:29 UTC (rev 2634) +++ branches/Cog/nscogsrc/plugins/JPEGReadWriter2Plugin/JPEGReadWriter2Plugin.c 2012-12-14 22:07:30 UTC (rev 2635) @@ -1,9 +1,9 @@ /* Automatically generated by - SmartSyntaxPluginCodeGenerator VMMaker.oscog-eem.234 uuid: 66acafd1-cad0-4f20-b786-ab8f48201d82 + SmartSyntaxPluginCodeGenerator VMMaker.oscog-eem.235 uuid: 954df856-3f83-498c-9735-6cd3777ba9c7 from - JPEGReadWriter2Plugin VMMaker.oscog-eem.234 uuid: 66acafd1-cad0-4f20-b786-ab8f48201d82 + JPEGReadWriter2Plugin VMMaker.oscog-eem.235 uuid: 954df856-3f83-498c-9735-6cd3777ba9c7 */ -static char __buildInfo[] = "JPEGReadWriter2Plugin VMMaker.oscog-eem.234 uuid: 66acafd1-cad0-4f20-b786-ab8f48201d82 " __DATE__ ; +static char __buildInfo[] = "JPEGReadWriter2Plugin VMMaker.oscog-eem.235 uuid: 954df856-3f83-498c-9735-6cd3777ba9c7 " __DATE__ ; @@ -12,11 +12,6 @@ #include <stdlib.h> #include <string.h> #include <time.h> -#include <math.h> -#include <stdio.h> -#include <stdlib.h> -#include <string.h> -#include <time.h> /* Default EXPORT macro that does nothing (see comment in sq.h): */ #define EXPORT(returnType) returnType @@ -40,7 +35,6 @@ #include "JPEGReadWriter2Plugin.h" #include "sqMemoryAccess.h" -#include "sqMemoryAccess.h" /*** Constants ***/ @@ -111,9 +105,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "JPEGReadWriter2Plugin VMMaker.oscog-eem.234 (i)" + "JPEGReadWriter2Plugin VMMaker.oscog-eem.235 (i)" #else - "JPEGReadWriter2Plugin VMMaker.oscog-eem.234 (e)" + "JPEGReadWriter2Plugin VMMaker.oscog-eem.235 (e)" #endif ; Modified: branches/Cog/nscogsrc/plugins/JPEGReaderPlugin/JPEGReaderPlugin.c =================================================================== --- branches/Cog/nscogsrc/plugins/JPEGReaderPlugin/JPEGReaderPlugin.c 2012-12-14 00:58:29 UTC (rev 2634) +++ branches/Cog/nscogsrc/plugins/JPEGReaderPlugin/JPEGReaderPlugin.c 2012-12-14 22:07:30 UTC (rev 2635) @@ -1,9 +1,9 @@ /* Automatically generated by - VMPluginCodeGenerator VMMaker.oscog-eem.234 uuid: 66acafd1-cad0-4f20-b786-ab8f48201d82 + VMPluginCodeGenerator VMMaker.oscog-eem.235 uuid: 954df856-3f83-498c-9735-6cd3777ba9c7 from - JPEGReaderPlugin VMMaker.oscog-eem.234 uuid: 66acafd1-cad0-4f20-b786-ab8f48201d82 + JPEGReaderPlugin VMMaker.oscog-eem.235 uuid: 954df856-3f83-498c-9735-6cd3777ba9c7 */ -static char __buildInfo[] = "JPEGReaderPlugin VMMaker.oscog-eem.234 uuid: 66acafd1-cad0-4f20-b786-ab8f48201d82 " __DATE__ ; +static char __buildInfo[] = "JPEGReaderPlugin VMMaker.oscog-eem.235 uuid: 954df856-3f83-498c-9735-6cd3777ba9c7 " __DATE__ ; @@ -12,11 +12,6 @@ #include <stdlib.h> #include <string.h> #include <time.h> -#include <math.h> -#include <stdio.h> -#include <stdlib.h> -#include <string.h> -#include <time.h> /* Default EXPORT macro that does nothing (see comment in sq.h): */ #define EXPORT(returnType) returnType @@ -39,7 +34,6 @@ #endif #include "sqMemoryAccess.h" -#include "sqMemoryAccess.h" /*** Constants ***/ @@ -188,9 +182,9 @@ static sqInt jsReadLimit; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "JPEGReaderPlugin VMMaker.oscog-eem.234 (i)" + "JPEGReaderPlugin VMMaker.oscog-eem.235 (i)" #else - "JPEGReaderPlugin VMMaker.oscog-eem.234 (e)" + "JPEGReaderPlugin VMMaker.oscog-eem.235 (e)" #endif ; static int *residuals; Modified: branches/Cog/nscogsrc/plugins/LargeIntegers/LargeIntegers.c =================================================================== --- branches/Cog/nscogsrc/plugins/LargeIntegers/LargeIntegers.c 2012-12-14 00:58:29 UTC (rev 2634) +++ branches/Cog/nscogsrc/plugins/LargeIntegers/LargeIntegers.c 2012-12-14 22:07:30 UTC (rev 2635) @@ -1,9 +1,9 @@ /* Automatically generated by - SmartSyntaxPluginCodeGenerator VMMaker.oscog-eem.234 uuid: 66acafd1-cad0-4f20-b786-ab8f48201d82 + SmartSyntaxPluginCodeGenerator VMMaker.oscog-eem.235 uuid: 954df856-3f83-498c-9735-6cd3777ba9c7 from - LargeIntegersPlugin VMMaker.oscog-eem.234 uuid: 66acafd1-cad0-4f20-b786-ab8f48201d82 + LargeIntegersPlugin VMMaker.oscog-eem.235 uuid: 954df856-3f83-498c-9735-6cd3777ba9c7 */ -static char __buildInfo[] = "LargeIntegersPlugin VMMaker.oscog-eem.234 uuid: 66acafd1-cad0-4f20-b786-ab8f48201d82 " __DATE__ ; +static char __buildInfo[] = "LargeIntegersPlugin VMMaker.oscog-eem.235 uuid: 954df856-3f83-498c-9735-6cd3777ba9c7 " __DATE__ ; @@ -12,11 +12,6 @@ #include <stdlib.h> #include <string.h> #include <time.h> -#include <math.h> -#include <stdio.h> -#include <stdlib.h> -#include <string.h> -#include <time.h> /* Default EXPORT macro that does nothing (see comment in sq.h): */ #define EXPORT(returnType) returnType @@ -39,7 +34,6 @@ #endif #include "sqMemoryAccess.h" -#include "sqMemoryAccess.h" /*** Constants ***/ @@ -181,9 +175,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "LargeIntegers v1.5 VMMaker.oscog-eem.234 (i)" + "LargeIntegers v1.5 VMMaker.oscog-eem.235 (i)" #else - "LargeIntegers v1.5 VMMaker.oscog-eem.234 (e)" + "LargeIntegers v1.5 VMMaker.oscog-eem.235 (e)" #endif ; static const int orOpIndex = 1; Modified: branches/Cog/nscogsrc/plugins/Matrix2x3Plugin/Matrix2x3Plugin.c =================================================================== --- branches/Cog/nscogsrc/plugins/Matrix2x3Plugin/Matrix2x3Plugin.c 2012-12-14 00:58:29 UTC (rev 2634) +++ branches/Cog/nscogsrc/plugins/Matrix2x3Plugin/Matrix2x3Plugin.c 2012-12-14 22:07:30 UTC (rev 2635) @@ -1,9 +1,9 @@ /* Automatically generated by - VMPluginCodeGenerator VMMaker.oscog-eem.234 uuid: 66acafd1-cad0-4f20-b786-ab8f48201d82 + VMPluginCodeGenerator VMMaker.oscog-eem.235 uuid: 954df856-3f83-498c-9735-6cd3777ba9c7 from - Matrix2x3Plugin VMMaker.oscog-eem.234 uuid: 66acafd1-cad0-4f20-b786-ab8f48201d82 + Matrix2x3Plugin VMMaker.oscog-eem.235 uuid: 954df856-3f83-498c-9735-6cd3777ba9c7 */ -static char __buildInfo[] = "Matrix2x3Plugin VMMaker.oscog-eem.234 uuid: 66acafd1-cad0-4f20-b786-ab8f48201d82 " __DATE__ ; +static char __buildInfo[] = "Matrix2x3Plugin VMMaker.oscog-eem.235 uuid: 954df856-3f83-498c-9735-6cd3777ba9c7 " __DATE__ ; @@ -12,11 +12,6 @@ #include <stdlib.h> #include <string.h> #include <time.h> -#include <math.h> -#include <stdio.h> -#include <stdlib.h> -#include <string.h> -#include <time.h> /* Default EXPORT macro that does nothing (see comment in sq.h): */ #define EXPORT(returnType) returnType @@ -39,7 +34,6 @@ #endif #include "sqMemoryAccess.h" -#include "sqMemoryAccess.h" /*** Constants ***/ @@ -125,9 +119,9 @@ static double m23ResultY; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "Matrix2x3Plugin VMMaker.oscog-eem.234 (i)" + "Matrix2x3Plugin VMMaker.oscog-eem.235 (i)" #else - "Matrix2x3Plugin VMMaker.oscog-eem.234 (e)" + "Matrix2x3Plugin VMMaker.oscog-eem.235 (e)" #endif ; Modified: branches/Cog/nscogsrc/plugins/MiscPrimitivePlugin/MiscPrimitivePlugin.c =================================================================== --- branches/Cog/nscogsrc/plugins/MiscPrimitivePlugin/MiscPrimitivePlugin.c 2012-12-14 00:58:29 UTC (rev 2634) +++ branches/Cog/nscogsrc/plugins/MiscPrimitivePlugin/MiscPrimitivePlugin.c 2012-12-14 22:07:30 UTC (rev 2635) @@ -1,9 +1,9 @@ /* Automatically generated by - VMPluginCodeGenerator VMMaker.oscog-eem.234 uuid: 66acafd1-cad0-4f20-b786-ab8f48201d82 + VMPluginCodeGenerator VMMaker.oscog-eem.235 uuid: 954df856-3f83-498c-9735-6cd3777ba9c7 from - MiscPrimitivePlugin VMMaker.oscog-eem.234 uuid: 66acafd1-cad0-4f20-b786-ab8f48201d82 + MiscPrimitivePlugin VMMaker.oscog-eem.235 uuid: 954df856-3f83-498c-9735-6cd3777ba9c7 */ -static char __buildInfo[] = "MiscPrimitivePlugin VMMaker.oscog-eem.234 uuid: 66acafd1-cad0-4f20-b786-ab8f48201d82 " __DATE__ ; +static char __buildInfo[] = "MiscPrimitivePlugin VMMaker.oscog-eem.235 uuid: 954df856-3f83-498c-9735-6cd3777ba9c7 " __DATE__ ; @@ -87,9 +87,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "MiscPrimitivePlugin VMMaker.oscog-eem.234 (i)" + "MiscPrimitivePlugin VMMaker.oscog-eem.235 (i)" #else - "MiscPrimitivePlugin VMMaker.oscog-eem.234 (e)" + "MiscPrimitivePlugin VMMaker.oscog-eem.235 (e)" #endif ; Modified: branches/Cog/nscogsrc/plugins/RePlugin/RePlugin.c =================================================================== --- branches/Cog/nscogsrc/plugins/RePlugin/RePlugin.c 2012-12-14 00:58:29 UTC (rev 2634) +++ branches/Cog/nscogsrc/plugins/RePlugin/RePlugin.c 2012-12-14 22:07:30 UTC (rev 2635) @@ -1,9 +1,9 @@ /* Automatically generated by - SmartSyntaxPluginCodeGenerator VMMaker.oscog-eem.234 uuid: 66acafd1-cad0-4f20-b786-ab8f48201d82 + SmartSyntaxPluginCodeGenerator VMMaker.oscog-eem.235 uuid: 954df856-3f83-498c-9735-6cd3777ba9c7 from - RePlugin VMMaker.oscog-eem.234 uuid: 66acafd1-cad0-4f20-b786-ab8f48201d82 + RePlugin VMMaker.oscog-eem.235 uuid: 954df856-3f83-498c-9735-6cd3777ba9c7 */ -static char __buildInfo[] = "RePlugin VMMaker.oscog-eem.234 uuid: 66acafd1-cad0-4f20-b786-ab8f48201d82 " __DATE__ ; +static char __buildInfo[] = "RePlugin VMMaker.oscog-eem.235 uuid: 954df856-3f83-498c-9735-6cd3777ba9c7 " __DATE__ ; @@ -12,11 +12,6 @@ #include <stdlib.h> #include <string.h> #include <time.h> -#include <math.h> -#include <stdio.h> -#include <stdlib.h> -#include <string.h> -#include <time.h> /* Default EXPORT macro that does nothing (see comment in sq.h): */ #define EXPORT(returnType) returnType @@ -40,7 +35,6 @@ #include "rePlugin.h" #include "sqMemoryAccess.h" -#include "sqMemoryAccess.h" /*** Constants ***/ @@ -134,9 +128,9 @@ static sqInt matchFlags; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "RePlugin VMMaker.oscog-eem.234 (i)" + "RePlugin VMMaker.oscog-eem.235 (i)" #else - "RePlugin VMMaker.oscog-eem.234 (e)" + "RePlugin VMMaker.oscog-eem.235 (e)" #endif ; static int netMemory = 0; Modified: branches/Cog/nscogsrc/plugins/SecurityPlugin/SecurityPlugin.c =================================================================== --- branches/Cog/nscogsrc/plugins/SecurityPlugin/SecurityPlugin.c 2012-12-14 00:58:29 UTC (rev 2634) +++ branches/Cog/nscogsrc/plugins/SecurityPlugin/SecurityPlugin.c 2012-12-14 22:07:30 UTC (rev 2635) @@ -1,9 +1,9 @@ /* Automatically generated by - VMPluginCodeGenerator VMMaker.oscog-eem.234 uuid: 66acafd1-cad0-4f20-b786-ab8f48201d82 + VMPluginCodeGenerator VMMaker.oscog-eem.235 uuid: 954df856-3f83-498c-9735-6cd3777ba9c7 from - SecurityPlugin VMMaker.oscog-eem.234 uuid: 66acafd1-cad0-4f20-b786-ab8f48201d82 + SecurityPlugin VMMaker.oscog-eem.235 uuid: 954df856-3f83-498c-9735-6cd3777ba9c7 */ -static char __buildInfo[] = "SecurityPlugin VMMaker.oscog-eem.234 uuid: 66acafd1-cad0-4f20-b786-ab8f48201d82 " __DATE__ ; +static char __buildInfo[] = "SecurityPlugin VMMaker.oscog-eem.235 uuid: 954df856-3f83-498c-9735-6cd3777ba9c7 " __DATE__ ; @@ -12,11 +12,6 @@ #include <stdlib.h> #include <string.h> #include <time.h> -#include <math.h> -#include <stdio.h> -#include <stdlib.h> -#include <string.h> -#include <time.h> /* Default EXPORT macro that does nothing (see comment in sq.h): */ #define EXPORT(returnType) returnType @@ -40,7 +35,6 @@ #include "SecurityPlugin.h" #include "sqMemoryAccess.h" -#include "sqMemoryAccess.h" /*** Constants ***/ @@ -104,9 +98,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "SecurityPlugin VMMaker.oscog-eem.234 (i)" + "SecurityPlugin VMMaker.oscog-eem.235 (i)" #else - "SecurityPlugin VMMaker.oscog-eem.234 (e)" + "SecurityPlugin VMMaker.oscog-eem.235 (e)" #endif ; Modified: branches/Cog/nscogsrc/plugins/SocketPlugin/SocketPlugin.c =================================================================== --- branches/Cog/nscogsrc/plugins/SocketPlugin/SocketPlugin.c 2012-12-14 00:58:29 UTC (rev 2634) +++ branches/Cog/nscogsrc/plugins/SocketPlugin/SocketPlugin.c 2012-12-14 22:07:30 UTC (rev 2635) @@ -1,9 +1,9 @@ /* Automatically generated by - SmartSyntaxPluginCodeGenerator VMMaker.oscog-eem.234 uuid: 66acafd1-cad0-4f20-b786-ab8f48201d82 + SmartSyntaxPluginCodeGenerator VMMaker.oscog-eem.235 uuid: 954df856-3f83-498c-9735-6cd3777ba9c7 from - SocketPlugin VMMaker.oscog-eem.234 uuid: 66acafd1-cad0-4f20-b786-ab8f48201d82 + SocketPlugin VMMaker.oscog-eem.235 uuid: 954df856-3f83-498c-9735-6cd3777ba9c7 */ -static char __buildInfo[] = "SocketPlugin VMMaker.oscog-eem.234 uuid: 66acafd1-cad0-4f20-b786-ab8f48201d82 " __DATE__ ; +static char __buildInfo[] = "SocketPlugin VMMaker.oscog-eem.235 uuid: 954df856-3f83-498c-9735-6cd3777ba9c7 " __DATE__ ; @@ -12,11 +12,6 @@ #include <stdlib.h> #include <string.h> #include <time.h> -#include <math.h> -#include <stdio.h> -#include <stdlib.h> -#include <string.h> -#include <time.h> /* Default EXPORT macro that does nothing (see comment in sq.h): */ #define EXPORT(returnType) returnType @@ -40,7 +35,6 @@ #include "SocketPlugin.h" #include "sqMemoryAccess.h" -#include "sqMemoryAccess.h" /*** Constants ***/ @@ -187,9 +181,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "SocketPlugin VMMaker.oscog-eem.234 (i)" + "SocketPlugin VMMaker.oscog-eem.235 (i)" #else - "SocketPlugin VMMaker.oscog-eem.234 (e)" + "SocketPlugin VMMaker.oscog-eem.235 (e)" #endif ; static void * sCCLOPfn; Modified: branches/Cog/nscogsrc/plugins/SoundPlugin/SoundPlugin.c =================================================================== --- branches/Cog/nscogsrc/plugins/SoundPlugin/SoundPlugin.c 2012-12-14 00:58:29 UTC (rev 2634) +++ branches/Cog/nscogsrc/plugins/SoundPlugin/SoundPlugin.c 2012-12-14 22:07:30 UTC (rev 2635) @@ -1,9 +1,9 @@ /* Automatically generated by - SmartSyntaxPluginCodeGenerator VMMaker.oscog-eem.234 uuid: 66acafd1-cad0-4f20-b786-ab8f48201d82 + SmartSyntaxPluginCodeGenerator VMMaker.oscog-eem.235 uuid: 954df856-3f83-498c-9735-6cd3777ba9c7 from - SoundPlugin VMMaker.oscog-eem.234 uuid: 66acafd1-cad0-4f20-b786-ab8f48201d82 + SoundPlugin VMMaker.oscog-eem.235 uuid: 954df856-3f83-498c-9735-6cd3777ba9c7 */ -static char __buildInfo[] = "SoundPlugin VMMaker.oscog-eem.234 uuid: 66acafd1-cad0-4f20-b786-ab8f48201d82 " __DATE__ ; +static char __buildInfo[] = "SoundPlugin VMMaker.oscog-eem.235 uuid: 954df856-3f83-498c-9735-6cd3777ba9c7 " __DATE__ ; @@ -12,11 +12,6 @@ #include <stdlib.h> #include <string.h> #include <time.h> -#include <math.h> -#include <stdio.h> -#include <stdlib.h> -#include <string.h> -#include <time.h> /* Default EXPORT macro that does nothing (see comment in sq.h): */ #define EXPORT(returnType) returnType @@ -40,7 +35,6 @@ #include "SoundPlugin.h" #include "sqMemoryAccess.h" -#include "sqMemoryAccess.h" /*** Constants ***/ @@ -118,9 +112,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "SoundPlugin VMMaker.oscog-eem.234 (i)" + "SoundPlugin VMMaker.oscog-eem.235 (i)" #else - "SoundPlugin VMMaker.oscog-eem.234 (e)" + "SoundPlugin VMMaker.oscog-eem.235 (e)" #endif ; Modified: branches/Cog/nscogsrc/plugins/UUIDPlugin/UUIDPlugin.c =================================================================== --- branches/Cog/nscogsrc/plugins/UUIDPlugin/UUIDPlugin.c 2012-12-14 00:58:29 UTC (rev 2634) +++ branches/Cog/nscogsrc/plugins/UUIDPlugin/UUIDPlugin.c 2012-12-14 22:07:30 UTC (rev 2635) @@ -1,9 +1,9 @@ /* Automatically generated by - SmartSyntaxPluginCodeGenerator VMMaker.oscog-eem.234 uuid: 66acafd1-cad0-4f20-b786-ab8f48201d82 + SmartSyntaxPluginCodeGenerator VMMaker.oscog-eem.235 uuid: 954df856-3f83-498c-9735-6cd3777ba9c7 from - UUIDPlugin VMMaker.oscog-eem.234 uuid: 66acafd1-cad0-4f20-b786-ab8f48201d82 + UUIDPlugin VMMaker.oscog-eem.235 uuid: 954df856-3f83-498c-9735-6cd3777ba9c7 */ -static char __buildInfo[] = "UUIDPlugin VMMaker.oscog-eem.234 uuid: 66acafd1-cad0-4f20-b786-ab8f48201d82 " __DATE__ ; +static char __buildInfo[] = "UUIDPlugin VMMaker.oscog-eem.235 uuid: 954df856-3f83-498c-9735-6cd3777ba9c7 " __DATE__ ; @@ -12,11 +12,6 @@ #include <stdlib.h> #include <string.h> #include <time.h> -#include <math.h> -#include <stdio.h> -#include <stdlib.h> -#include <string.h> -#include <time.h> /* Default EXPORT macro that does nothing (see comment in sq.h): */ #define EXPORT(returnType) returnType @@ -40,7 +35,6 @@ #include "UUIDPlugin.h" #include "sqMemoryAccess.h" -#include "sqMemoryAccess.h" /*** Constants ***/ @@ -83,9 +77,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "UUIDPlugin VMMaker.oscog-eem.234 (i)" + "UUIDPlugin VMMaker.oscog-eem.235 (i)" #else - "UUIDPlugin VMMaker.oscog-eem.234 (e)" + "UUIDPlugin VMMaker.oscog-eem.235 (e)" #endif ; Modified: branches/Cog/nscogsrc/plugins/UnixOSProcessPlugin/UnixOSProcessPlugin.c =================================================================== --- branches/Cog/nscogsrc/plugins/UnixOSProcessPlugin/UnixOSProcessPlugin.c 2012-12-14 00:58:29 UTC (rev 2634) +++ branches/Cog/nscogsrc/plugins/UnixOSProcessPlugin/UnixOSProcessPlugin.c 2012-12-14 22:07:30 UTC (rev 2635) @@ -1,9 +1,11 @@ /* Automatically generated by - VMPluginCodeGenerator VMMaker.oscog-eem.234 uuid: 66acafd1-cad0-4f20-b786-ab8f48201d82 + VMPluginCodeGenerator VMMaker.oscog-eem.235 uuid: 954df856-3f83-498c-9735-6cd3777ba9c7 from - UnixOSProcessPlugin VMConstruction-Plugins-OSProcessPlugin.oscog-eem.38 uuid: 79420af3-4595-4d68-8de0-e27fdd576dd4 + UnixOSProcessPlugin VMConstruction-Plugins-OSProcessPlugin.oscog-eem.40 uuid: 5f1cbe1c-127c-4582-a629-86dab8269efb */ -static char __buildInfo[] = "UnixOSProcessPlugin VMConstruction-Plugins-OSProcessPlugin.oscog-eem.38 uuid: 79420af3-4595-4d68-8de0-e27fdd576dd4 " __DATE__ ; +static char __buildInfo[] = "UnixOSProcessPlugin VMConstruction-Plugins-OSProcessPlugin.oscog-eem.40 uuid: 5f1cbe1c-127c-4582-a629-86dab8269efb " __DATE__ ; +/* D T Lewis - UnixOSProcessPlugin.c translated from class + UnixOSProcessPlugin of OSProcessPlugin version 4.3.3 Cog */ @@ -12,23 +14,14 @@ #include <stdlib.h> #include <string.h> #include <time.h> -#include <math.h> -#include <stdio.h> -#include <stdlib.h> -#include <string.h> -#include <time.h> #include <sys/types.h> -/* D T Lewis - UnixOSProcessPlugin.c translated from class - UnixOSProcessPlugin of OSProcessPlugin version 4.3.3 Cog */ #include <sys/time.h> +#include <sys/stat.h> #include <sys/wait.h> #include <signal.h> #include <unistd.h> -#include <stdlib.h> #include <fcntl.h> -#include <signal.h> #include <pthread.h> -#include <sys/stat.h> #include <errno.h> /* Default EXPORT macro that does nothing (see comment in sq.h): */ @@ -53,18 +46,17 @@ #include "FilePlugin.h" #include "SocketPlugin.h" -#define SESSIONIDENTIFIERTYPE int #include "config.h" -#define FILEHANDLETYPE FILE * /* the type of low level stream to be used in a struct SQFile */ #include "sqaio.h" #include "sqMemoryAccess.h" -#include "sqMemoryAccess.h" /*** Constants ***/ #define BytesPerWord 4 +#define FILEHANDLETYPE FILE * /* the type of low level stream to be used in a struct SQFile */ #define PrimErrNoMemory 9 #define PrimErrUnsupported 7 +#define SESSIONIDENTIFIERTYPE int /*** Function Prototypes ***/ @@ -323,9 +315,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "UnixOSProcessPlugin VMConstruction-Plugins-OSProcessPlugin.oscog-eem.38 (i)" + "UnixOSProcessPlugin VMConstruction-Plugins-OSProcessPlugin.oscog-eem.40 (i)" #else - "UnixOSProcessPlugin VMConstruction-Plugins-OSProcessPlugin.oscog-eem.38 (e)" + "UnixOSProcessPlugin VMConstruction-Plugins-OSProcessPlugin.oscog-eem.40 (e)" #endif ; static void *originalSigHandlers[NSIG]; Modified: branches/Cog/nscogsrc/plugins/VMProfileMacSupportPlugin/VMProfileMacSupportPlugin.c =================================================================== --- branches/Cog/nscogsrc/plugins/VMProfileMacSupportPlugin/VMProfileMacSupportPlugin.c 2012-12-14 00:58:29 UTC (rev 2634) +++ branches/Cog/nscogsrc/plugins/VMProfileMacSupportPlugin/VMProfileMacSupportPlugin.c 2012-12-14 22:07:30 UTC (rev 2635) @@ -1,9 +1,9 @@ /* Automatically generated by - VMPluginCodeGenerator VMMaker.oscog-eem.234 uuid: 66acafd1-cad0-4f20-b786-ab8f48201d82 + VMPluginCodeGenerator VMMaker.oscog-eem.235 uuid: 954df856-3f83-498c-9735-6cd3777ba9c7 from - VMProfileMacSupportPlugin VMMaker.oscog-eem.234 uuid: 66acafd1-cad0-4f20-b786-ab8f48201d82 + VMProfileMacSupportPlugin VMMaker.oscog-eem.235 uuid: 954df856-3f83-498c-9735-6cd3777ba9c7 */ -static char __buildInfo[] = "VMProfileMacSupportPlugin VMMaker.oscog-eem.234 uuid: 66acafd1-cad0-4f20-b786-ab8f48201d82 " __DATE__ ; +static char __buildInfo[] = "VMProfileMacSupportPlugin VMMaker.oscog-eem.235 uuid: 954df856-3f83-498c-9735-6cd3777ba9c7 " __DATE__ ; @@ -12,12 +12,6 @@ #include <stdlib.h> #include <string.h> #include <time.h> -#include <math.h> -#include <stdio.h> -#include <stdlib.h> -#include <string.h> -#include <time.h> -#include <stdlib.h> #include <dlfcn.h> #include <mach-o/dyld.h> #include <mach-o/getsect.h> @@ -43,7 +37,6 @@ #endif #include "sqMemoryAccess.h" -#include "sqMemoryAccess.h" /*** Constants ***/ @@ -111,9 +104,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "VMProfileMacSupportPlugin VMMaker.oscog-eem.234 (i)" + "VMProfileMacSupportPlugin VMMaker.oscog-eem.235 (i)" #else - "VMProfileMacSupportPlugin VMMaker.oscog-eem.234 (e)" + "VMProfileMacSupportPlugin VMMaker.oscog-eem.235 (e)" #endif ; Modified: branches/Cog/nscogsrc/plugins/Win32OSProcessPlugin/Win32OSProcessPlugin.c =================================================================== --- branches/Cog/nscogsrc/plugins/Win32OSProcessPlugin/Win32OSProcessPlugin.c 2012-12-14 00:58:29 UTC (rev 2634) +++ branches/Cog/nscogsrc/plugins/Win32OSProcessPlugin/Win32OSProcessPlugin.c 2012-12-14 22:07:30 UTC (rev 2635) @@ -1,9 +1,11 @@ /* Automatically generated by - VMPluginCodeGenerator VMMaker.oscog-eem.234 uuid: 66acafd1-cad0-4f20-b786-ab8f48201d82 + VMPluginCodeGenerator VMMaker.oscog-eem.235 uuid: 954df856-3f83-498c-9735-6cd3777ba9c7 from - Win32OSProcessPlugin VMConstruction-Plugins-OSProcessPlugin.oscog-eem.38 uuid: 79420af3-4595-4d68-8de0-e27fdd576dd4 + Win32OSProcessPlugin VMConstruction-Plugins-OSProcessPlugin.oscog-eem.40 uuid: 5f1cbe1c-127c-4582-a629-86dab8269efb */ -static char __buildInfo[] = "Win32OSProcessPlugin VMConstruction-Plugins-OSProcessPlugin.oscog-eem.38 uuid: 79420af3-4595-4d68-8de0-e27fdd576dd4 " __DATE__ ; +static char __buildInfo[] = "Win32OSProcessPlugin VMConstruction-Plugins-OSProcessPlugin.oscog-eem.40 uuid: 5f1cbe1c-127c-4582-a629-86dab8269efb " __DATE__ ; +/* D T Lewis - Win32OSProcessPlugin.c translated from class + Win32OSProcessPlugin of OSProcessPlugin version 4.3.3 Cog */ @@ -12,14 +14,7 @@ #include <stdlib.h> #include <string.h> #include <time.h> -#include <math.h> -#include <stdio.h> -#include <stdlib.h> -#include <string.h> -#include <time.h> #include <sys/types.h> -/* D T Lewis - Win32OSProcessPlugin.c translated from class - Win32OSProcessPlugin of OSProcessPlugin version 4.3.3 Cog */ #include <windows.h> #include <process.h> @@ -45,17 +40,16 @@ #include "FilePlugin.h" #include "SocketPlugin.h" -#define SESSIONIDENTIFIERTYPE int #include "sqWin32.h" -#define FILEHANDLETYPE HANDLE /* The type of low level stream to be used in a struct SQFile */ -#define READCHARARRAYSIZE 512 /* Corresponds to expected max size of external semaphore table */ - /* Table expands dynamically, so just use a big number */ #include "sqMemoryAccess.h" -#include "sqMemoryAccess.h" /*** Constants ***/ #define BytesPerWord 4 +#define FILEHANDLETYPE FILE * /* the type of low level stream to be used in a struct SQFile */ +#define READCHARARRAYSIZE 512 /* Corresponds to expected max size of external semaphore table */ + /* Table expands dynamically, so just use a big number */ +#define SESSIONIDENTIFIERTYPE int /*** Function Prototypes ***/ @@ -228,9 +222,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "Win32OSProcessPlugin VMConstruction-Plugins-OSProcessPlugin.oscog-eem.38 (i)" + "Win32OSProcessPlugin VMConstruction-Plugins-OSProcessPlugin.oscog-eem.40 (i)" #else - "Win32OSProcessPlugin VMConstruction-Plugins-OSProcessPlugin.oscog-eem.38 (e)" + "Win32OSProcessPlugin VMConstruction-Plugins-OSProcessPlugin.oscog-eem.40 (e)" #endif ; static int osprocessSandboxSecurity; Modified: branches/Cog/nscogsrc/plugins/ZipPlugin/ZipPlugin.c =================================================================== --- branches/Cog/nscogsrc/plugins/ZipPlugin/ZipPlugin.c 2012-12-14 00:58:29 UTC (rev 2634) +++ branches/Cog/nscogsrc/plugins/ZipPlugin/ZipPlugin.c 2012-12-14 22:07:30 UTC (rev 2635) @@ -1,9 +1,9 @@ /* Automatically generated by - VMPluginCodeGenerator VMMaker.oscog-eem.234 uuid: 66acafd1-cad0-4f20-b786-ab8f48201d82 + VMPluginCodeGenerator VMMaker.oscog-eem.235 uuid: 954df856-3f83-498c-9735-6cd3777ba9c7 from - InflatePlugin VMMaker.oscog-eem.234 uuid: 66acafd1-cad0-4f20-b786-ab8f48201d82 + InflatePlugin VMMaker.oscog-eem.235 uuid: 954df856-3f83-498c-9735-6cd3777ba9c7 */ -static char __buildInfo[] = "InflatePlugin VMMaker.oscog-eem.234 uuid: 66acafd1-cad0-4f20-b786-ab8f48201d82 " __DATE__ ; +static char __buildInfo[] = "InflatePlugin VMMaker.oscog-eem.235 uuid: 954df856-3f83-498c-9735-6cd3777ba9c7 " __DATE__ ; @@ -12,11 +12,6 @@ #include <stdlib.h> #include <string.h> #include <time.h> -#include <math.h> -#include <stdio.h> -#include <stdlib.h> -#include <string.h> -#include <time.h> /* Default EXPORT macro that does nothing (see comment in sq.h): */ #define EXPORT(returnType) returnType @@ -39,7 +34,6 @@ #endif #include "sqMemoryAccess.h" -#include "sqMemoryAccess.h" /*** Constants ***/ @@ -100,9 +94,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "ZipPlugin VMMaker.oscog-eem.234 (i)" + "ZipPlugin VMMaker.oscog-eem.235 (i)" #else - "ZipPlugin VMMaker.oscog-eem.234 (e)" + "ZipPlugin VMMaker.oscog-eem.235 (e)" #endif ; static sqInt zipBitBuf; Property changes on: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h ___________________________________________________________________ Modified: checkindate - Thu Dec 13 16:58:00 PST 2012 + Fri Dec 14 14:06:21 PST 2012 Modified: branches/Cog/src/plugins/ADPCMCodecPlugin/ADPCMCodecPlugin.c =================================================================== --- branches/Cog/src/plugins/ADPCMCodecPlugin/ADPCMCodecPlugin.c 2012-12-14 00:58:29 UTC (rev 2634) +++ branches/Cog/src/plugins/ADPCMCodecPlugin/ADPCMCodecPlugin.c 2012-12-14 22:07:30 UTC (rev 2635) @@ -1,9 +1,9 @@ /* Automatically generated by - VMPluginCodeGenerator VMMaker.oscog-eem.234 uuid: 66acafd1-cad0-4f20-b786-ab8f48201d82 + VMPluginCodeGenerator VMMaker.oscog-eem.235 uuid: 954df856-3f83-498c-9735-6cd3777ba9c7 from - ADPCMCodecPlugin VMMaker.oscog-eem.234 uuid: 66acafd1-cad0-4f20-b786-ab8f48201d82 + ADPCMCodecPlugin VMMaker.oscog-eem.235 uuid: 954df856-3f83-498c-9735-6cd3777ba9c7 */ -static char __buildInfo[] = "ADPCMCodecPlugin VMMaker.oscog-eem.234 uuid: 66acafd1-cad0-4f20-b786-ab8f48201d82 " __DATE__ ; +static char __buildInfo[] = "ADPCMCodecPlugin VMMaker.oscog-eem.235 uuid: 954df856-3f83-498c-9735-6cd3777ba9c7 " __DATE__ ; @@ -87,9 +87,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "ADPCMCodecPlugin VMMaker.oscog-eem.234 (i)" + "ADPCMCodecPlugin VMMaker.oscog-eem.235 (i)" #else - "ADPCMCodecPlugin VMMaker.oscog-eem.234 (e)" + "ADPCMCodecPlugin VMMaker.oscog-eem.235 (e)" #endif ; Modified: branches/Cog/src/plugins/AsynchFilePlugin/AsynchFilePlugin.c =================================================================== --- branches/Cog/src/plugins/AsynchFilePlugin/AsynchFilePlugin.c 2012-12-14 00:58:29 UTC (rev 2634) +++ branches/Cog/src/plugins/AsynchFilePlugin/AsynchFilePlugin.c 2012-12-14 22:07:30 UTC (rev 2635) @@ -1,9 +1,9 @@ /* Automatically generated by - SmartSyntaxPluginCodeGenerator VMMaker.oscog-eem.234 uuid: 66acafd1-cad0-4f20-b786-ab8f48201d82 + SmartSyntaxPluginCodeGenerator VMMaker.oscog-eem.235 uuid: 954df856-3f83-498c-9735-6cd3777ba9c7 from - AsynchFilePlugin VMMaker.oscog-eem.234 uuid: 66acafd1-cad0-4f20-b786-ab8f48201d82 + AsynchFilePlugin VMMaker.oscog-eem.235 uuid: 954df856-3f83-498c-9735-6cd3777ba9c7 */ -static char __buildInfo[] = "AsynchFilePlugin VMMaker.oscog-eem.234 uuid: 66acafd1-cad0-4f20-b786-ab8f48201d82 " __DATE__ ; +static char __buildInfo[] = "AsynchFilePlugin VMMaker.oscog-eem.235 uuid: 954df856-3f83-498c-9735-6cd3777ba9c7 " __DATE__ ; @@ -12,11 +12,6 @@ #include <stdlib.h> #include <string.h> #include <time.h> -#include <math.h> -#include <stdio.h> -#include <stdlib.h> -#include <string.h> -#include <time.h> /* Default EXPORT macro that does nothing (see comment in sq.h): */ #define EXPORT(returnType) returnType @@ -40,7 +35,6 @@ #include "AsynchFilePlugin.h" #include "sqMemoryAccess.h" -#include "sqMemoryAccess.h" /*** Constants ***/ @@ -110,9 +104,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "AsynchFilePlugin VMMaker.oscog-eem.234 (i)" + "AsynchFilePlugin VMMaker.oscog-eem.235 (i)" #else - "AsynchFilePlugin VMMaker.oscog-eem.234 (e)" + "AsynchFilePlugin VMMaker.oscog-eem.235 (e)" #endif ; static void * sCOAFfn; Modified: branches/Cog/src/plugins/B2DPlugin/B2DPlugin.c =================================================================== --- branches/Cog/src/plugins/B2DPlugin/B2DPlugin.c 2012-12-14 00:58:29 UTC (rev 2634) +++ branches/Cog/src/plugins/B2DPlugin/B2DPlugin.c 2012-12-14 22:07:30 UTC (rev 2635) @@ -1,9 +1,9 @@ /* Automatically generated by - VMPluginCodeGenerator VMMaker.oscog-eem.234 uuid: 66acafd1-cad0-4f20-b786-ab8f48201d82 + VMPluginCodeGenerator VMMaker.oscog-eem.235 uuid: 954df856-3f83-498c-9735-6cd3777ba9c7 from - BalloonEnginePlugin VMMaker.oscog-eem.234 uuid: 66acafd1-cad0-4f20-b786-ab8f48201d82 + BalloonEnginePlugin VMMaker.oscog-eem.235 uuid: 954df856-3f83-498c-9735-6cd3777ba9c7 */ -static char __buildInfo[] = "BalloonEnginePlugin VMMaker.oscog-eem.234 uuid: 66acafd1-cad0-4f20-b786-ab8f48201d82 " __DATE__ ; +static char __buildInfo[] = "BalloonEnginePlugin VMMaker.oscog-eem.235 uuid: 954df856-3f83-498c-9735-6cd3777ba9c7 " __DATE__ ; @@ -12,11 +12,6 @@ #include <stdlib.h> #include <string.h> #include <time.h> -#include <math.h> -#include <stdio.h> -#include <stdlib.h> -#include <string.h> -#include <time.h> /* Default EXPORT macro that does nothing (see comment in sq.h): */ #define EXPORT(returnType) returnType @@ -39,7 +34,6 @@ #endif #include "sqMemoryAccess.h" -#include "sqMemoryAccess.h" /*** Constants ***/ @@ -841,9 +835,9 @@ static void * loadBBFn; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "B2DPlugin VMMaker.oscog-eem.234 (i)" + "B2DPlugin VMMaker.oscog-eem.235 (i)" #else - "B2DPlugin VMMaker.oscog-eem.234 (e)" + "B2DPlugin VMMaker.oscog-eem.235 (e)" #endif ; static int* objBuffer; Modified: branches/Cog/src/plugins/B3DAcceleratorPlugin/B3DAcceleratorPlugin.c @@ Diff output truncated at 50000 characters. @@

1 0

← Newer
1
2
3
4
5
6
7
8
9
10
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

Vm-dev December 2012