Revision: 2905 Author: eliot Date: 2014-04-28 12:25:13 -0700 (Mon, 28 Apr 2014) Log Message: ----------- CogVM source as per VMMaker.oscog-eem.686.
Fix the module name in ThreadedFFIPlugin. It needs to answer the generic name (SqueakFFIPrims), not the specific platform name (e.g. IA32FFIPlugin) under which each plugin is generated.
Modified Paths: -------------- branches/Cog/src/plugins/SqueakFFIPrims/ARM32FFIPlugin.c branches/Cog/src/plugins/SqueakFFIPrims/IA32FFIPlugin.c
Property Changed: ---------------- branches/Cog/platforms/Cross/vm/sqSCCSVersion.h
Property changes on: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h ___________________________________________________________________ Modified: checkindate - Thu Apr 24 14:27:32 PDT 2014 + Mon Apr 28 12:20:13 PDT 2014
Modified: branches/Cog/src/plugins/SqueakFFIPrims/ARM32FFIPlugin.c =================================================================== --- branches/Cog/src/plugins/SqueakFFIPrims/ARM32FFIPlugin.c 2014-04-24 21:29:08 UTC (rev 2904) +++ branches/Cog/src/plugins/SqueakFFIPrims/ARM32FFIPlugin.c 2014-04-28 19:25:13 UTC (rev 2905) @@ -1,9 +1,9 @@ /* Automatically generated by - VMPluginCodeGenerator VMMaker.oscog-eem.685 uuid: 07bc1e83-6566-4de0-af79-d6c7874ffcdd + VMPluginCodeGenerator VMMaker.oscog-eem.686 uuid: ac4e60d6-a8f2-4bf4-bb5d-e21f243310fa from - ThreadedARMFFIPlugin VMMaker.oscog-eem.685 uuid: 07bc1e83-6566-4de0-af79-d6c7874ffcdd + ThreadedARMFFIPlugin VMMaker.oscog-eem.686 uuid: ac4e60d6-a8f2-4bf4-bb5d-e21f243310fa */ -static char __buildInfo[] = "ThreadedARMFFIPlugin VMMaker.oscog-eem.685 uuid: 07bc1e83-6566-4de0-af79-d6c7874ffcdd " __DATE__ ; +static char __buildInfo[] = "ThreadedARMFFIPlugin VMMaker.oscog-eem.686 uuid: ac4e60d6-a8f2-4bf4-bb5d-e21f243310fa " __DATE__ ;
@@ -255,7 +255,7 @@ static sqInt ffiSupportsCallingConvention(sqInt aCallingConvention); static sqInt ffiValidateExternalDataAtomicType(sqInt oop, sqInt atomicType); static VirtualMachine * getInterpreter(void); -EXPORT(const char*) getModuleName(void); +EXPORT(const char *) getModuleName(void); static sqInt halt(void); EXPORT(sqInt) initialiseModule(void); static sqInt isAlien(sqInt anOop); @@ -452,9 +452,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "ARM32FFIPlugin VMMaker.oscog-eem.685 (i)" + "ARM32FFIPlugin VMMaker.oscog-eem.686 (i)" #else - "ARM32FFIPlugin VMMaker.oscog-eem.685 (e)" + "ARM32FFIPlugin VMMaker.oscog-eem.686 (e)" #endif ;
@@ -3405,10 +3405,10 @@ it is loaded to check if it does really contain the module we're thinking it contains. This is important! */
-EXPORT(const char*) +EXPORT(const char *) getModuleName(void) { - return moduleName; + return "SqueakFFIPrims"; }
static sqInt @@ -3456,7 +3456,7 @@ static sqInt msg(char *s) { - fprintf(stderr, "\n%s: %s", moduleName, s); + fprintf(stderr, "\n%s: %s", getModuleName(), s); return 0; }
Modified: branches/Cog/src/plugins/SqueakFFIPrims/IA32FFIPlugin.c =================================================================== --- branches/Cog/src/plugins/SqueakFFIPrims/IA32FFIPlugin.c 2014-04-24 21:29:08 UTC (rev 2904) +++ branches/Cog/src/plugins/SqueakFFIPrims/IA32FFIPlugin.c 2014-04-28 19:25:13 UTC (rev 2905) @@ -1,9 +1,9 @@ /* Automatically generated by - VMPluginCodeGenerator VMMaker.oscog-eem.685 uuid: 07bc1e83-6566-4de0-af79-d6c7874ffcdd + VMPluginCodeGenerator VMMaker.oscog-eem.686 uuid: ac4e60d6-a8f2-4bf4-bb5d-e21f243310fa from - ThreadedIA32FFIPlugin VMMaker.oscog-eem.685 uuid: 07bc1e83-6566-4de0-af79-d6c7874ffcdd + ThreadedIA32FFIPlugin VMMaker.oscog-eem.686 uuid: ac4e60d6-a8f2-4bf4-bb5d-e21f243310fa */ -static char __buildInfo[] = "ThreadedIA32FFIPlugin VMMaker.oscog-eem.685 uuid: 07bc1e83-6566-4de0-af79-d6c7874ffcdd " __DATE__ ; +static char __buildInfo[] = "ThreadedIA32FFIPlugin VMMaker.oscog-eem.686 uuid: ac4e60d6-a8f2-4bf4-bb5d-e21f243310fa " __DATE__ ;
@@ -247,7 +247,7 @@ static sqInt ffiSupportsCallingConvention(sqInt aCallingConvention); static sqInt ffiValidateExternalDataAtomicType(sqInt oop, sqInt atomicType); static VirtualMachine * getInterpreter(void); -EXPORT(const char*) getModuleName(void); +EXPORT(const char *) getModuleName(void); static sqInt halt(void); EXPORT(sqInt) initialiseModule(void); static sqInt isAlien(sqInt anOop); @@ -443,9 +443,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "IA32FFIPlugin VMMaker.oscog-eem.685 (i)" + "IA32FFIPlugin VMMaker.oscog-eem.686 (i)" #else - "IA32FFIPlugin VMMaker.oscog-eem.685 (e)" + "IA32FFIPlugin VMMaker.oscog-eem.686 (e)" #endif ;
@@ -3006,10 +3006,10 @@ it is loaded to check if it does really contain the module we're thinking it contains. This is important! */
-EXPORT(const char*) +EXPORT(const char *) getModuleName(void) { - return moduleName; + return "SqueakFFIPrims"; }
static sqInt @@ -3057,7 +3057,7 @@ static sqInt msg(char *s) { - fprintf(stderr, "\n%s: %s", moduleName, s); + fprintf(stderr, "\n%s: %s", getModuleName(), s); return 0; }