[Vm-dev] [commit][3147] CogVM source as per VMMaker.oscog-eem.954
commits at squeakvm.org
commits at squeakvm.org
Mon Nov 24 19:12:53 UTC 2014
Revision: 3147
Author: eliot
Date: 2014-11-24 11:12:43 -0800 (Mon, 24 Nov 2014)
Log Message:
-----------
CogVM source as per VMMaker.oscog-eem.954
Fix some warnings and some 64-bit issues with the ThreadedFFIPlugin.
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
- Fri Nov 21 18:27:16 PST 2014
+ Mon Nov 24 11:12:24 PST 2014
Modified: branches/Cog/src/plugins/SqueakFFIPrims/ARM32FFIPlugin.c
===================================================================
--- branches/Cog/src/plugins/SqueakFFIPrims/ARM32FFIPlugin.c 2014-11-24 02:12:04 UTC (rev 3146)
+++ branches/Cog/src/plugins/SqueakFFIPrims/ARM32FFIPlugin.c 2014-11-24 19:12:43 UTC (rev 3147)
@@ -1,9 +1,9 @@
/* Automatically generated by
- VMPluginCodeGenerator VMMaker.oscog-eem.804 uuid: 8f232d31-fa50-4134-8556-da8fc12ab32d
+ VMPluginCodeGenerator VMMaker.oscog-eem.954 uuid: b7f58c9d-3ec9-4d7f-b41e-45aac820f622
from
- ThreadedARMFFIPlugin VMMaker.oscog-eem.804 uuid: 8f232d31-fa50-4134-8556-da8fc12ab32d
+ ThreadedARMFFIPlugin VMMaker.oscog-eem.954 uuid: b7f58c9d-3ec9-4d7f-b41e-45aac820f622
*/
-static char __buildInfo[] = "ThreadedARMFFIPlugin VMMaker.oscog-eem.804 uuid: 8f232d31-fa50-4134-8556-da8fc12ab32d " __DATE__ ;
+static char __buildInfo[] = "ThreadedARMFFIPlugin VMMaker.oscog-eem.954 uuid: b7f58c9d-3ec9-4d7f-b41e-45aac820f622 " __DATE__ ;
@@ -455,9 +455,9 @@
struct VirtualMachine* interpreterProxy;
static const char *moduleName =
#ifdef SQUEAK_BUILTIN_PLUGIN
- "ARM32FFIPlugin VMMaker.oscog-eem.804 (i)"
+ "ARM32FFIPlugin VMMaker.oscog-eem.954 (i)"
#else
- "ARM32FFIPlugin VMMaker.oscog-eem.804 (e)"
+ "ARM32FFIPlugin VMMaker.oscog-eem.954 (e)"
#endif
;
@@ -1794,7 +1794,7 @@
addressPtr = fetchPointerofObject(0, externalFunction);
/* begin ffiContentsOfHandle:errCode: */
if (!((isBytes(addressPtr))
- && ((byteSizeOf(addressPtr)) == 4))) {
+ && ((byteSizeOf(addressPtr)) == (sizeof(sqInt))))) {
address1 = ffiFail(FFIErrorBadAddress);
goto l3;
}
@@ -2152,7 +2152,7 @@
ffiContentsOfHandleerrCode(sqInt oop, sqInt errCode)
{
if (!((isBytes(oop))
- && ((byteSizeOf(oop)) == 4))) {
+ && ((byteSizeOf(oop)) == (sizeof(sqInt))))) {
return ffiFail(errCode);
}
return fetchPointerofObject(0, oop);
@@ -2324,7 +2324,7 @@
ffiModuleName = module;
moduleLength = byteSizeOf(ffiModuleName);
- moduleHandle1 = ioLoadModuleOfLength(((int) (firstIndexableField(ffiModuleName))), moduleLength);
+ moduleHandle1 = ((sqInt)(ioLoadModuleOfLength(((sqInt)(firstIndexableField(ffiModuleName))), moduleLength)));
if ((failed())
|| (moduleHandle1 == 0)) {
moduleHandle = ffiFail(FFIErrorModuleNotFound);
@@ -2341,7 +2341,7 @@
moduleHandlePtr = fetchPointerofObject(0, rcvr);
/* begin ffiContentsOfHandle:errCode: */
if (!((isBytes(moduleHandlePtr))
- && ((byteSizeOf(moduleHandlePtr)) == 4))) {
+ && ((byteSizeOf(moduleHandlePtr)) == (sizeof(sqInt))))) {
moduleHandle1 = ffiFail(FFIErrorBadExternalLibrary);
goto l1;
}
@@ -2361,7 +2361,7 @@
goto l2;
}
moduleLength = byteSizeOf(ffiModuleName);
- moduleHandle1 = ioLoadModuleOfLength(((int) (firstIndexableField(ffiModuleName))), moduleLength);
+ moduleHandle1 = ((sqInt)(ioLoadModuleOfLength(((sqInt)(firstIndexableField(ffiModuleName))), moduleLength)));
if ((failed())
|| (moduleHandle1 == 0)) {
moduleHandle = ffiFail(FFIErrorModuleNotFound);
@@ -2407,7 +2407,7 @@
addressPtr = fetchPointerofObject(0, lit);
/* begin ffiContentsOfHandle:errCode: */
if (!((isBytes(addressPtr))
- && ((byteSizeOf(addressPtr)) == 4))) {
+ && ((byteSizeOf(addressPtr)) == (sizeof(sqInt))))) {
address = ffiFail(FFIErrorBadAddress);
goto l1;
}
@@ -2455,7 +2455,7 @@
ffiModuleName = module;
moduleLength = byteSizeOf(ffiModuleName);
- moduleHandle = ioLoadModuleOfLength(((int) (firstIndexableField(ffiModuleName))), moduleLength);
+ moduleHandle = ((sqInt)(ioLoadModuleOfLength(((sqInt)(firstIndexableField(ffiModuleName))), moduleLength)));
if ((failed())
|| (moduleHandle == 0)) {
return ffiFail(FFIErrorModuleNotFound);
@@ -2469,7 +2469,7 @@
moduleHandlePtr = fetchPointerofObject(0, rcvr);
/* begin ffiContentsOfHandle:errCode: */
if (!((isBytes(moduleHandlePtr))
- && ((byteSizeOf(moduleHandlePtr)) == 4))) {
+ && ((byteSizeOf(moduleHandlePtr)) == (sizeof(sqInt))))) {
moduleHandle = ffiFail(FFIErrorBadExternalLibrary);
goto l1;
}
@@ -2487,7 +2487,7 @@
return ffiFail(FFIErrorBadExternalLibrary);
}
moduleLength = byteSizeOf(ffiModuleName);
- moduleHandle = ioLoadModuleOfLength(((int) (firstIndexableField(ffiModuleName))), moduleLength);
+ moduleHandle = ((sqInt)(ioLoadModuleOfLength(((sqInt)(firstIndexableField(ffiModuleName))), moduleLength)));
if ((failed())
|| (moduleHandle == 0)) {
return ffiFail(FFIErrorModuleNotFound);
@@ -3643,7 +3643,7 @@
addressPtr = fetchPointerofObject(0, externalFunction);
/* begin ffiContentsOfHandle:errCode: */
if (!((isBytes(addressPtr))
- && ((byteSizeOf(addressPtr)) == 4))) {
+ && ((byteSizeOf(addressPtr)) == (sizeof(sqInt))))) {
address2 = ffiFail(FFIErrorBadAddress);
goto l7;
}
@@ -3995,7 +3995,7 @@
addressPtr1 = fetchPointerofObject(0, externalFunction);
/* begin ffiContentsOfHandle:errCode: */
if (!((isBytes(addressPtr1))
- && ((byteSizeOf(addressPtr1)) == 4))) {
+ && ((byteSizeOf(addressPtr1)) == (sizeof(sqInt))))) {
address3 = ffiFail(FFIErrorBadAddress);
goto l9;
}
@@ -4468,7 +4468,7 @@
addressPtr = fetchPointerofObject(0, externalFunction);
/* begin ffiContentsOfHandle:errCode: */
if (!((isBytes(addressPtr))
- && ((byteSizeOf(addressPtr)) == 4))) {
+ && ((byteSizeOf(addressPtr)) == (sizeof(sqInt))))) {
address2 = ffiFail(FFIErrorBadAddress);
goto l7;
}
@@ -4826,7 +4826,7 @@
addressPtr1 = fetchPointerofObject(0, externalFunction);
/* begin ffiContentsOfHandle:errCode: */
if (!((isBytes(addressPtr1))
- && ((byteSizeOf(addressPtr1)) == 4))) {
+ && ((byteSizeOf(addressPtr1)) == (sizeof(sqInt))))) {
address3 = ffiFail(FFIErrorBadAddress);
goto l9;
}
@@ -5556,7 +5556,7 @@
sqInt ffiModuleName;
sqInt moduleHandle;
sqInt moduleHandlePtr;
- int *ptr;
+ sqInt *ptr;
sqInt rcvr;
if (!((methodArgumentCount()) == 0)) {
@@ -5569,7 +5569,7 @@
moduleHandlePtr = fetchPointerofObject(0, rcvr);
/* begin ffiContentsOfHandle:errCode: */
if (!((isBytes(moduleHandlePtr))
- && ((byteSizeOf(moduleHandlePtr)) == 4))) {
+ && ((byteSizeOf(moduleHandlePtr)) == (sizeof(sqInt))))) {
moduleHandle = ffiFail(FFIErrorBadExternalLibrary);
goto l1;
}
@@ -5582,7 +5582,7 @@
if (!(isBytes(ffiModuleName))) {
return ffiFail(FFIErrorBadExternalLibrary);
}
- moduleHandle = ioLoadModuleOfLength(((int) (firstIndexableField(ffiModuleName))), byteSizeOf(ffiModuleName));
+ moduleHandle = ((sqInt)(ioLoadModuleOfLength(((sqInt)(firstIndexableField(ffiModuleName))), byteSizeOf(ffiModuleName))));
if (failed()) {
return ffiFail(FFIErrorModuleNotFound);
}
Modified: branches/Cog/src/plugins/SqueakFFIPrims/IA32FFIPlugin.c
===================================================================
--- branches/Cog/src/plugins/SqueakFFIPrims/IA32FFIPlugin.c 2014-11-24 02:12:04 UTC (rev 3146)
+++ branches/Cog/src/plugins/SqueakFFIPrims/IA32FFIPlugin.c 2014-11-24 19:12:43 UTC (rev 3147)
@@ -1,9 +1,9 @@
/* Automatically generated by
- VMPluginCodeGenerator VMMaker.oscog-eem.804 uuid: 8f232d31-fa50-4134-8556-da8fc12ab32d
+ VMPluginCodeGenerator VMMaker.oscog-eem.954 uuid: b7f58c9d-3ec9-4d7f-b41e-45aac820f622
from
- ThreadedIA32FFIPlugin VMMaker.oscog-eem.804 uuid: 8f232d31-fa50-4134-8556-da8fc12ab32d
+ ThreadedIA32FFIPlugin VMMaker.oscog-eem.954 uuid: b7f58c9d-3ec9-4d7f-b41e-45aac820f622
*/
-static char __buildInfo[] = "ThreadedIA32FFIPlugin VMMaker.oscog-eem.804 uuid: 8f232d31-fa50-4134-8556-da8fc12ab32d " __DATE__ ;
+static char __buildInfo[] = "ThreadedIA32FFIPlugin VMMaker.oscog-eem.954 uuid: b7f58c9d-3ec9-4d7f-b41e-45aac820f622 " __DATE__ ;
@@ -447,9 +447,9 @@
struct VirtualMachine* interpreterProxy;
static const char *moduleName =
#ifdef SQUEAK_BUILTIN_PLUGIN
- "IA32FFIPlugin VMMaker.oscog-eem.804 (i)"
+ "IA32FFIPlugin VMMaker.oscog-eem.954 (i)"
#else
- "IA32FFIPlugin VMMaker.oscog-eem.804 (e)"
+ "IA32FFIPlugin VMMaker.oscog-eem.954 (e)"
#endif
;
@@ -1613,7 +1613,7 @@
addressPtr = fetchPointerofObject(0, externalFunction);
/* begin ffiContentsOfHandle:errCode: */
if (!((isBytes(addressPtr))
- && ((byteSizeOf(addressPtr)) == 4))) {
+ && ((byteSizeOf(addressPtr)) == (sizeof(sqInt))))) {
address1 = ffiFail(FFIErrorBadAddress);
goto l3;
}
@@ -1960,7 +1960,7 @@
ffiContentsOfHandleerrCode(sqInt oop, sqInt errCode)
{
if (!((isBytes(oop))
- && ((byteSizeOf(oop)) == 4))) {
+ && ((byteSizeOf(oop)) == (sizeof(sqInt))))) {
return ffiFail(errCode);
}
return fetchPointerofObject(0, oop);
@@ -2132,7 +2132,7 @@
ffiModuleName = module;
moduleLength = byteSizeOf(ffiModuleName);
- moduleHandle1 = ioLoadModuleOfLength(((int) (firstIndexableField(ffiModuleName))), moduleLength);
+ moduleHandle1 = ((sqInt)(ioLoadModuleOfLength(((sqInt)(firstIndexableField(ffiModuleName))), moduleLength)));
if ((failed())
|| (moduleHandle1 == 0)) {
moduleHandle = ffiFail(FFIErrorModuleNotFound);
@@ -2149,7 +2149,7 @@
moduleHandlePtr = fetchPointerofObject(0, rcvr);
/* begin ffiContentsOfHandle:errCode: */
if (!((isBytes(moduleHandlePtr))
- && ((byteSizeOf(moduleHandlePtr)) == 4))) {
+ && ((byteSizeOf(moduleHandlePtr)) == (sizeof(sqInt))))) {
moduleHandle1 = ffiFail(FFIErrorBadExternalLibrary);
goto l1;
}
@@ -2169,7 +2169,7 @@
goto l2;
}
moduleLength = byteSizeOf(ffiModuleName);
- moduleHandle1 = ioLoadModuleOfLength(((int) (firstIndexableField(ffiModuleName))), moduleLength);
+ moduleHandle1 = ((sqInt)(ioLoadModuleOfLength(((sqInt)(firstIndexableField(ffiModuleName))), moduleLength)));
if ((failed())
|| (moduleHandle1 == 0)) {
moduleHandle = ffiFail(FFIErrorModuleNotFound);
@@ -2215,7 +2215,7 @@
addressPtr = fetchPointerofObject(0, lit);
/* begin ffiContentsOfHandle:errCode: */
if (!((isBytes(addressPtr))
- && ((byteSizeOf(addressPtr)) == 4))) {
+ && ((byteSizeOf(addressPtr)) == (sizeof(sqInt))))) {
address = ffiFail(FFIErrorBadAddress);
goto l1;
}
@@ -2263,7 +2263,7 @@
ffiModuleName = module;
moduleLength = byteSizeOf(ffiModuleName);
- moduleHandle = ioLoadModuleOfLength(((int) (firstIndexableField(ffiModuleName))), moduleLength);
+ moduleHandle = ((sqInt)(ioLoadModuleOfLength(((sqInt)(firstIndexableField(ffiModuleName))), moduleLength)));
if ((failed())
|| (moduleHandle == 0)) {
return ffiFail(FFIErrorModuleNotFound);
@@ -2277,7 +2277,7 @@
moduleHandlePtr = fetchPointerofObject(0, rcvr);
/* begin ffiContentsOfHandle:errCode: */
if (!((isBytes(moduleHandlePtr))
- && ((byteSizeOf(moduleHandlePtr)) == 4))) {
+ && ((byteSizeOf(moduleHandlePtr)) == (sizeof(sqInt))))) {
moduleHandle = ffiFail(FFIErrorBadExternalLibrary);
goto l1;
}
@@ -2295,7 +2295,7 @@
return ffiFail(FFIErrorBadExternalLibrary);
}
moduleLength = byteSizeOf(ffiModuleName);
- moduleHandle = ioLoadModuleOfLength(((int) (firstIndexableField(ffiModuleName))), moduleLength);
+ moduleHandle = ((sqInt)(ioLoadModuleOfLength(((sqInt)(firstIndexableField(ffiModuleName))), moduleLength)));
if ((failed())
|| (moduleHandle == 0)) {
return ffiFail(FFIErrorModuleNotFound);
@@ -3216,7 +3216,7 @@
addressPtr = fetchPointerofObject(0, externalFunction);
/* begin ffiContentsOfHandle:errCode: */
if (!((isBytes(addressPtr))
- && ((byteSizeOf(addressPtr)) == 4))) {
+ && ((byteSizeOf(addressPtr)) == (sizeof(sqInt))))) {
address2 = ffiFail(FFIErrorBadAddress);
goto l7;
}
@@ -3557,7 +3557,7 @@
addressPtr1 = fetchPointerofObject(0, externalFunction);
/* begin ffiContentsOfHandle:errCode: */
if (!((isBytes(addressPtr1))
- && ((byteSizeOf(addressPtr1)) == 4))) {
+ && ((byteSizeOf(addressPtr1)) == (sizeof(sqInt))))) {
address3 = ffiFail(FFIErrorBadAddress);
goto l9;
}
@@ -4017,7 +4017,7 @@
addressPtr = fetchPointerofObject(0, externalFunction);
/* begin ffiContentsOfHandle:errCode: */
if (!((isBytes(addressPtr))
- && ((byteSizeOf(addressPtr)) == 4))) {
+ && ((byteSizeOf(addressPtr)) == (sizeof(sqInt))))) {
address2 = ffiFail(FFIErrorBadAddress);
goto l7;
}
@@ -4364,7 +4364,7 @@
addressPtr1 = fetchPointerofObject(0, externalFunction);
/* begin ffiContentsOfHandle:errCode: */
if (!((isBytes(addressPtr1))
- && ((byteSizeOf(addressPtr1)) == 4))) {
+ && ((byteSizeOf(addressPtr1)) == (sizeof(sqInt))))) {
address3 = ffiFail(FFIErrorBadAddress);
goto l9;
}
@@ -5083,7 +5083,7 @@
sqInt ffiModuleName;
sqInt moduleHandle;
sqInt moduleHandlePtr;
- int *ptr;
+ sqInt *ptr;
sqInt rcvr;
if (!((methodArgumentCount()) == 0)) {
@@ -5096,7 +5096,7 @@
moduleHandlePtr = fetchPointerofObject(0, rcvr);
/* begin ffiContentsOfHandle:errCode: */
if (!((isBytes(moduleHandlePtr))
- && ((byteSizeOf(moduleHandlePtr)) == 4))) {
+ && ((byteSizeOf(moduleHandlePtr)) == (sizeof(sqInt))))) {
moduleHandle = ffiFail(FFIErrorBadExternalLibrary);
goto l1;
}
@@ -5109,7 +5109,7 @@
if (!(isBytes(ffiModuleName))) {
return ffiFail(FFIErrorBadExternalLibrary);
}
- moduleHandle = ioLoadModuleOfLength(((int) (firstIndexableField(ffiModuleName))), byteSizeOf(ffiModuleName));
+ moduleHandle = ((sqInt)(ioLoadModuleOfLength(((sqInt)(firstIndexableField(ffiModuleName))), byteSizeOf(ffiModuleName))));
if (failed()) {
return ffiFail(FFIErrorModuleNotFound);
}
More information about the Vm-dev
mailing list