Vm-dev February 2016

vm-dev@lists.squeakfoundation.org

27 participants
141 discussions

[commit][3623] Get sqFFI. h to not declare the old FFI API if ThreadedFFIPlugin is defined as
by commits＠squeakvm.org 21 Feb '16

21 Feb '16

Revision: 3623 Author: eliot Date: 2016-02-20 20:23:34 -0800 (Sat, 20 Feb 2016) Log Message: ----------- Get sqFFI.h to not declare the old FFI API if ThreadedFFIPlugin is defined as non-zero. Modified Paths: -------------- trunk/platforms/Cross/plugins/SqueakFFIPrims/sqFFI.h Property Changed: ---------------- trunk/platforms/Cross/plugins/sqPluginsSCCSVersion.h Modified: trunk/platforms/Cross/plugins/SqueakFFIPrims/sqFFI.h =================================================================== --- trunk/platforms/Cross/plugins/SqueakFFIPrims/sqFFI.h 2016-02-21 04:01:41 UTC (rev 3622) +++ trunk/platforms/Cross/plugins/SqueakFFIPrims/sqFFI.h 2016-02-21 04:23:34 UTC (rev 3623) @@ -14,6 +14,11 @@ #ifndef SQ_FFI_H #define SQ_FFI_H +/* What follows is the old FFI API when spread across several marshalling files. + * With the ThreadedFFIPlugin all marshalling is in a single generated plugin + * and so the following API is not wanted. + */ +#if !ThreadedFFIPlugin /* Calling conventions */ #define FFICallTypeCDecl 0 #define FFICallTypeApi 1 @@ -128,27 +133,32 @@ /* return the float value from a previous call */ double ffiReturnFloatValue(void); +#endif /* !ThreadedFFIPlugin */ /* Set the log file name for logging call-outs */ int ffiLogFileNameOfLength(void *nameIndex, int nameLength); int ffiLogCallOfLength(void *nameIndex, int nameLength); -/* The following are for creating, manipulating, and detroying "manual surfaces". - These are surfaces that are managed by Squeak code, which has manual control - over the memory location where the image data is stored (the pointer used may - be obtained via FFI calls, or other means). - - Upon creation, no memory is allocated for the surface. Squeak code is - responsible for passing in a pointer to the memory to use. It is OK to set - the pointer to different values, or to NULL. If the pointer is NULL, then - BitBlt calls to ioLockSurface() will fail. - - createManualFunction() returns a non-negative surface ID if successful, and - -1 otherwise. The other return true for success, and false for failure. -*/ +/* The following are for creating, manipulating, and destroying + * "manual surfaces". These are surfaces that are managed by Squeak code, + * which has manual control over the memory location where the image data is + * stored (the pointer used may be obtained via FFI calls, or other means). + * + * Upon creation, no memory is allocated for the surface. Squeak code is + * responsible for passing in a pointer to the memory to use. It is OK to set + * the pointer to different values, or to NULL. If the pointer is NULL, then + * BitBlt calls to ioLockSurface() will fail. + * + * createManualFunction() returns a non-negative surface ID if successful, and + * -1 otherwise. The other return true for success, and false for failure. + */ #include "../SurfacePlugin/SurfacePlugin.h" -void initManualSurfaceFunctionPolongers(fn_ioRegisterSurface reg, fn_ioUnregisterSurface unreg, fn_ioFindSurface find); -long createManualSurface(long width, long height, long rowPitch, long depth, long isMSB); + +void initSurfacePluginFunctionPointers(); +void initManualSurfaceFunctionPointers + (fn_ioRegisterSurface, fn_ioUnregisterSurface, fn_ioFindSurface); +long createManualSurface + (long width, long height, long rowPitch, long depth, long isMSB); long destroyManualSurface(long surfaceID); long setManualSurfacePointer(long surfaceID, void* ptr); Property changes on: trunk/platforms/Cross/plugins/sqPluginsSCCSVersion.h ___________________________________________________________________ Modified: checkindate - Sat Feb 20 20:00:57 PST 2016 + Sat Feb 20 20:22:47 PST 2016

1 0

[commit][3622] Change line endings in cross-platform sqManualSurface. c to unix from dos.
by commits＠squeakvm.org 21 Feb '16

21 Feb '16

Revision: 3622 Author: eliot Date: 2016-02-20 20:01:41 -0800 (Sat, 20 Feb 2016) Log Message: ----------- Change line endings in cross-platform sqManualSurface.c to unix from dos. Modified Paths: -------------- trunk/platforms/Cross/plugins/SqueakFFIPrims/sqManualSurface.c Property Changed: ---------------- trunk/platforms/Cross/plugins/sqPluginsSCCSVersion.h Modified: trunk/platforms/Cross/plugins/SqueakFFIPrims/sqManualSurface.c =================================================================== --- trunk/platforms/Cross/plugins/SqueakFFIPrims/sqManualSurface.c 2016-02-21 03:17:14 UTC (rev 3621) +++ trunk/platforms/Cross/plugins/SqueakFFIPrims/sqManualSurface.c 2016-02-21 04:01:41 UTC (rev 3622) @@ -1,161 +1,161 @@ -#include "sqFFI.h" -#include "sq.h" - -#include "sqVirtualMachine.h" -extern struct VirtualMachine* interpreterProxy; - -/* Need separate cases for GNU C and MSVC. */ -#ifdef DEBUG -#warning "DEBUG printing enabled" -#define DPRINTF(x) warnPrintf x -#elif defined(_DEBUG) -#pragma message ( "DEBUG printing enabled" ) -#define DPRINTF(x) warnPrintf x -#else -#define DPRINTF(x) -#endif - -#ifndef NULL -#define NULL 0 -#endif -#ifndef FALSE -#define FALSE 0 -#endif -#ifndef TRUE -#define TRUE 1 -#endif - -/* Don't want to mess with EXPORT status of functions in SurfacePlugin.c, - we use function-pointers here. */ -static fn_ioRegisterSurface registerSurface = NULL; -static fn_ioUnregisterSurface unregisterSurface = NULL; -static fn_ioFindSurface findSurface = NULL; -void initSurfacePluginFunctionPointers() -{ - registerSurface = (fn_ioRegisterSurface) interpreterProxy->ioLoadFunctionFrom("ioRegisterSurface","SurfacePlugin"); - unregisterSurface = (fn_ioUnregisterSurface) interpreterProxy->ioLoadFunctionFrom("ioUnregisterSurface","SurfacePlugin"); - findSurface = (fn_ioFindSurface) interpreterProxy->ioLoadFunctionFrom("ioFindSurface","SurfacePlugin"); -} - -/* This is the structure that represents a "manual surface". These are - created/destroyed by new primitives in this plugin. During its life-time, - it may be touched directly from Squeak code to set/clear "ptr", and also - treated as a generic surface via BitBlt's use of the SurfacePlugin. */ -typedef struct { - int width; - int height; - int rowPitch; - int depth; - int isMSB; - void* ptr; - int isLocked; -} ManualSurface; - -/* Create the dispatch-table that SurfacePlugin will use to interact with - instances of "struct ManualSurface" */ -static long manualSurfaceGetFormat(ManualSurface* surface, long* width, long* height, long* depth, long* isMSB); -static void* manualSurfaceLock(ManualSurface* surface, long *pitch, long x, long y, long w, long h); -static long manualSurfaceUnlock(ManualSurface* surface, long x, long y, long w, long h); -static long manualSurfaceShow(ManualSurface* surface, long x, long y, long w, long h); -static sqSurfaceDispatch manualSurfaceDispatch = { - 1, - 0, - (fn_getSurfaceFormat) manualSurfaceGetFormat, - (fn_lockSurface) manualSurfaceLock, - (fn_unlockSurface) manualSurfaceUnlock, - (fn_showSurface) manualSurfaceShow -}; - -/* sqSurfaceDispatch functions *****************************************************************************/ - -long manualSurfaceGetFormat(ManualSurface* surface, long* width, long* height, long* depth, long* isMSB) { - *width = surface->width; - *height = surface->height; - *depth = surface->depth; - *isMSB = surface->isMSB; - DPRINTF(("Getting Surface Format: %lx %ld %ld %ld %ld\n", (long) surface, *width, *height, *depth, *isMSB)); - return 1; -} - -void* manualSurfaceLock(ManualSurface* surface, long *pitch, long x, long y, long w, long h) { - /* Ideally, would be atomic. But it doens't matter for the forseeable future, - since it is only called via BitBlt primitives. */ - int wasLocked = surface->isLocked; - surface->isLocked = 1; - - /* Can't lock if it was already locked. */ - if (wasLocked) return NULL; - - /* If there is no pointer, the lock-attempt fails. */ - if (!surface->ptr) { - surface->isLocked = 0; - return NULL; - } - - /* Success! Return the pointer. */ - *pitch = surface->rowPitch; - DPRINTF(("Locked Surface: %lx Input Rect: %ld %ld %ld %ld Row Pitch: %ld\n", (long) surface, x, y, w, h, *pitch)); - return surface->ptr; -} - -long manualSurfaceUnlock(ManualSurface* surface, long x, long y, long w, long h) { - surface->isLocked = 0; - DPRINTF(("Unlocked Surface: %lx Rect: %ld %ld %ld %ld\n", (long) surface, x, y, w, h)); - return 1; -} - -long manualSurfaceShow(ManualSurface* surface, long x, long y, long w, long h) { - /* Unsupported */ - return 0; -} - -/* primitive interface functions (i.e. called from Squeak) *********************************************/ - -/* Answer non-negative surfaceID if successful, and -1 for failure. */ -long createManualSurface(long width, long height, long rowPitch, long depth, long isMSB) { - ManualSurface* newSurface; - long surfaceID, result; - - if (width < 0) return -1; - if (height < 0) return -1; - if (rowPitch < (width*depth)/8) return -1; - if (depth < 1 || depth > 32) return -1; - if (!registerSurface) return -1; /* failure... couldn't init function-pointer */ - - newSurface = (ManualSurface*)malloc(sizeof(ManualSurface)); - if (!newSurface) return -1; - newSurface->width = width; - newSurface->height = height; - newSurface->rowPitch = rowPitch; - newSurface->depth = depth; - newSurface->isMSB = isMSB; - newSurface->ptr = NULL; - newSurface->isLocked = FALSE; - - result = registerSurface((long)newSurface, &manualSurfaceDispatch, &surfaceID); - if (!result) { - /* Failed to register surface. */ - free(newSurface); - return -1; - } - return surfaceID; -} - -long destroyManualSurface(long surfaceID) { - if (!unregisterSurface) return 0; /* failure... couldn't init function-pointer */ - else return unregisterSurface(surfaceID); -} - -long setManualSurfacePointer(long surfaceID, void* ptr) { - long surfaceHandle; - ManualSurface *surface; - long result; - if (!findSurface) return FALSE; /* failure... couldn't init function-pointer */ - result = findSurface(surfaceID, NULL, &surfaceHandle); - if (!result) return FALSE; /* failed to find surface */ - surface = (ManualSurface*)surfaceHandle; - if (surface->isLocked) return FALSE; /* can't set pointer while surface is locked */ - surface->ptr = ptr; - DPRINTF(("Set Surface: %lx Polonger: %lx\n", surfaceID, (long)ptr)); - return TRUE; -} +#include "sqFFI.h" +#include "sq.h" + +#include "sqVirtualMachine.h" +extern struct VirtualMachine* interpreterProxy; + +/* Need separate cases for GNU C and MSVC. */ +#ifdef DEBUG +#warning "DEBUG printing enabled" +#define DPRINTF(x) warnPrintf x +#elif defined(_DEBUG) +#pragma message ( "DEBUG printing enabled" ) +#define DPRINTF(x) warnPrintf x +#else +#define DPRINTF(x) +#endif + +#ifndef NULL +#define NULL 0 +#endif +#ifndef FALSE +#define FALSE 0 +#endif +#ifndef TRUE +#define TRUE 1 +#endif + +/* Don't want to mess with EXPORT status of functions in SurfacePlugin.c, + we use function-pointers here. */ +static fn_ioRegisterSurface registerSurface = NULL; +static fn_ioUnregisterSurface unregisterSurface = NULL; +static fn_ioFindSurface findSurface = NULL; +void initSurfacePluginFunctionPointers() +{ + registerSurface = (fn_ioRegisterSurface) interpreterProxy->ioLoadFunctionFrom("ioRegisterSurface","SurfacePlugin"); + unregisterSurface = (fn_ioUnregisterSurface) interpreterProxy->ioLoadFunctionFrom("ioUnregisterSurface","SurfacePlugin"); + findSurface = (fn_ioFindSurface) interpreterProxy->ioLoadFunctionFrom("ioFindSurface","SurfacePlugin"); +} + +/* This is the structure that represents a "manual surface". These are + created/destroyed by new primitives in this plugin. During its life-time, + it may be touched directly from Squeak code to set/clear "ptr", and also + treated as a generic surface via BitBlt's use of the SurfacePlugin. */ +typedef struct { + int width; + int height; + int rowPitch; + int depth; + int isMSB; + void* ptr; + int isLocked; +} ManualSurface; + +/* Create the dispatch-table that SurfacePlugin will use to interact with + instances of "struct ManualSurface" */ +static long manualSurfaceGetFormat(ManualSurface* surface, long* width, long* height, long* depth, long* isMSB); +static void* manualSurfaceLock(ManualSurface* surface, long *pitch, long x, long y, long w, long h); +static long manualSurfaceUnlock(ManualSurface* surface, long x, long y, long w, long h); +static long manualSurfaceShow(ManualSurface* surface, long x, long y, long w, long h); +static sqSurfaceDispatch manualSurfaceDispatch = { + 1, + 0, + (fn_getSurfaceFormat) manualSurfaceGetFormat, + (fn_lockSurface) manualSurfaceLock, + (fn_unlockSurface) manualSurfaceUnlock, + (fn_showSurface) manualSurfaceShow +}; + +/* sqSurfaceDispatch functions *****************************************************************************/ + +long manualSurfaceGetFormat(ManualSurface* surface, long* width, long* height, long* depth, long* isMSB) { + *width = surface->width; + *height = surface->height; + *depth = surface->depth; + *isMSB = surface->isMSB; + DPRINTF(("Getting Surface Format: %lx %ld %ld %ld %ld\n", (long) surface, *width, *height, *depth, *isMSB)); + return 1; +} + +void* manualSurfaceLock(ManualSurface* surface, long *pitch, long x, long y, long w, long h) { + /* Ideally, would be atomic. But it doens't matter for the forseeable future, + since it is only called via BitBlt primitives. */ + int wasLocked = surface->isLocked; + surface->isLocked = 1; + + /* Can't lock if it was already locked. */ + if (wasLocked) return NULL; + + /* If there is no pointer, the lock-attempt fails. */ + if (!surface->ptr) { + surface->isLocked = 0; + return NULL; + } + + /* Success! Return the pointer. */ + *pitch = surface->rowPitch; + DPRINTF(("Locked Surface: %lx Input Rect: %ld %ld %ld %ld Row Pitch: %ld\n", (long) surface, x, y, w, h, *pitch)); + return surface->ptr; +} + +long manualSurfaceUnlock(ManualSurface* surface, long x, long y, long w, long h) { + surface->isLocked = 0; + DPRINTF(("Unlocked Surface: %lx Rect: %ld %ld %ld %ld\n", (long) surface, x, y, w, h)); + return 1; +} + +long manualSurfaceShow(ManualSurface* surface, long x, long y, long w, long h) { + /* Unsupported */ + return 0; +} + +/* primitive interface functions (i.e. called from Squeak) *********************************************/ + +/* Answer non-negative surfaceID if successful, and -1 for failure. */ +long createManualSurface(long width, long height, long rowPitch, long depth, long isMSB) { + ManualSurface* newSurface; + long surfaceID, result; + + if (width < 0) return -1; + if (height < 0) return -1; + if (rowPitch < (width*depth)/8) return -1; + if (depth < 1 || depth > 32) return -1; + if (!registerSurface) return -1; /* failure... couldn't init function-pointer */ + + newSurface = (ManualSurface*)malloc(sizeof(ManualSurface)); + if (!newSurface) return -1; + newSurface->width = width; + newSurface->height = height; + newSurface->rowPitch = rowPitch; + newSurface->depth = depth; + newSurface->isMSB = isMSB; + newSurface->ptr = NULL; + newSurface->isLocked = FALSE; + + result = registerSurface((long)newSurface, &manualSurfaceDispatch, &surfaceID); + if (!result) { + /* Failed to register surface. */ + free(newSurface); + return -1; + } + return surfaceID; +} + +long destroyManualSurface(long surfaceID) { + if (!unregisterSurface) return 0; /* failure... couldn't init function-pointer */ + else return unregisterSurface(surfaceID); +} + +long setManualSurfacePointer(long surfaceID, void* ptr) { + long surfaceHandle; + ManualSurface *surface; + long result; + if (!findSurface) return FALSE; /* failure... couldn't init function-pointer */ + result = findSurface(surfaceID, NULL, &surfaceHandle); + if (!result) return FALSE; /* failed to find surface */ + surface = (ManualSurface*)surfaceHandle; + if (surface->isLocked) return FALSE; /* can't set pointer while surface is locked */ + surface->ptr = ptr; + DPRINTF(("Set Surface: %lx Polonger: %lx\n", surfaceID, (long)ptr)); + return TRUE; +} Property changes on: trunk/platforms/Cross/plugins/sqPluginsSCCSVersion.h ___________________________________________________________________ Modified: checkindate - Sat Feb 20 12:48:09 PST 2016 + Sat Feb 20 20:00:57 PST 2016

1 0

[commit][3621] CogVM source as per VMMaker.oscog-eem.1688
by commits＠squeakvm.org 21 Feb '16

21 Feb '16

Revision: 3621 Author: eliot Date: 2016-02-20 19:17:14 -0800 (Sat, 20 Feb 2016) Log Message: ----------- CogVM source as per VMMaker.oscog-eem.1688 X64 Cogit: Make sure that literal32BeforeFollowingAddress: answrs unsigned. Otherwise 16rBABE1F1(5H) causes an assert faul in expectedClosedPICPrototype at startup. Introduce an abstraction for unlinked inline cache tags holding selector indices (when will I ever learn??). Unix makefiles: Add dependencies for cogit.c on the included cogitFoo.c's. Update a script. Modified Paths: -------------- branches/Cog/nsspur64src/vm/cogit.h branches/Cog/nsspur64src/vm/cogitX64.c branches/Cog/nsspursrc/vm/cogit.h branches/Cog/nsspursrc/vm/cogitARMv5.c branches/Cog/nsspursrc/vm/cogitIA32.c branches/Cog/nsspursrc/vm/cogitMIPSEL.c branches/Cog/platforms/unix/vm/Makefile.in branches/Cog/scripts/findUnofficialFiles branches/Cog/spur64src/vm/cogit.h branches/Cog/spur64src/vm/cogitX64.c branches/Cog/spursistasrc/vm/cogit.h branches/Cog/spursistasrc/vm/cogitARMv5.c branches/Cog/spursistasrc/vm/cogitIA32.c branches/Cog/spursistasrc/vm/cogitMIPSEL.c branches/Cog/spursrc/vm/cogit.h branches/Cog/spursrc/vm/cogitARMv5.c branches/Cog/spursrc/vm/cogitIA32.c branches/Cog/spursrc/vm/cogitMIPSEL.c branches/Cog/src/vm/cogit.h branches/Cog/src/vm/cogitARMv5.c branches/Cog/src/vm/cogitIA32.c branches/Cog/src/vm/cogitMIPSEL.c Property Changed: ---------------- branches/Cog/platforms/Cross/vm/sqSCCSVersion.h Modified: branches/Cog/nsspur64src/vm/cogit.h =================================================================== --- branches/Cog/nsspur64src/vm/cogit.h 2016-02-21 01:35:03 UTC (rev 3620) +++ branches/Cog/nsspur64src/vm/cogit.h 2016-02-21 03:17:14 UTC (rev 3621) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.1685 uuid: 59633283-8843-4826-a68a-b23ea22d1fa8 + CCodeGenerator VMMaker.oscog-eem.1688 uuid: 1216c2a8-fd06-474f-9f5b-33d14918ca23 */ Modified: branches/Cog/nsspur64src/vm/cogitX64.c =================================================================== --- branches/Cog/nsspur64src/vm/cogitX64.c 2016-02-21 01:35:03 UTC (rev 3620) +++ branches/Cog/nsspur64src/vm/cogitX64.c 2016-02-21 03:17:14 UTC (rev 3621) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.1685 uuid: 59633283-8843-4826-a68a-b23ea22d1fa8 + CCodeGenerator VMMaker.oscog-eem.1688 uuid: 1216c2a8-fd06-474f-9f5b-33d14918ca23 from - StackToRegisterMappingCogit VMMaker.oscog-eem.1685 uuid: 59633283-8843-4826-a68a-b23ea22d1fa8 + StackToRegisterMappingCogit VMMaker.oscog-eem.1688 uuid: 1216c2a8-fd06-474f-9f5b-33d14918ca23 */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1685 uuid: 59633283-8843-4826-a68a-b23ea22d1fa8 " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1688 uuid: 1216c2a8-fd06-474f-9f5b-33d14918ca23 " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -423,9 +423,9 @@ static sqInt NoDbgRegParms computeSizeOfArithCwR(AbstractInstruction * self_in_computeSizeOfArithCwR); static usqInt NoDbgRegParms concretizeArithCwR(AbstractInstruction * self_in_concretizeArithCwR, sqInt x64opcode); static usqInt NoDbgRegParms concretizeMoveCwR(AbstractInstruction * self_in_concretizeMoveCwR); -static sqInt NoDbgRegParms inlineCacheTagAt(AbstractInstruction * self_in_inlineCacheTagAt, sqInt callSiteReturnAddress); +static usqInt NoDbgRegParms inlineCacheTagAt(AbstractInstruction * self_in_inlineCacheTagAt, sqInt callSiteReturnAddress); static sqInt NoDbgRegParms isPCDependent(AbstractInstruction * self_in_isPCDependent); -static sqInt NoDbgRegParms literal32BeforeFollowingAddress(AbstractInstruction * self_in_literal32BeforeFollowingAddress, sqInt followingAddress); +static usqInt NoDbgRegParms literal32BeforeFollowingAddress(AbstractInstruction * self_in_literal32BeforeFollowingAddress, sqInt followingAddress); static sqInt NoDbgRegParms literalBeforeFollowingAddress(AbstractInstruction * self_in_literalBeforeFollowingAddress, sqInt followingAddress); static sqInt NoDbgRegParms loadLiteralByteSize(AbstractInstruction * self_in_loadLiteralByteSize); static usqInt NoDbgRegParms sizePCDependentInstructionAt(AbstractInstruction * self_in_sizePCDependentInstructionAt, sqInt eventualAbsoluteAddress); @@ -2323,7 +2323,7 @@ /* Answer the inline cache tag for the return address of a send. */ /* CogInLineLiteralsX64Compiler>>#inlineCacheTagAt: */ -static sqInt NoDbgRegParms +static usqInt NoDbgRegParms inlineCacheTagAt(AbstractInstruction * self_in_inlineCacheTagAt, sqInt callSiteReturnAddress) { return literal32BeforeFollowingAddress(self_in_inlineCacheTagAt, callSiteReturnAddress - 5); @@ -2346,10 +2346,10 @@ */ /* CogInLineLiteralsX64Compiler>>#literal32BeforeFollowingAddress: */ -static sqInt NoDbgRegParms +static usqInt NoDbgRegParms literal32BeforeFollowingAddress(AbstractInstruction * self_in_literal32BeforeFollowingAddress, sqInt followingAddress) { - return unalignedLong32At(self_in_literal32BeforeFollowingAddress, followingAddress - 4); + return ((unsigned int) (unalignedLong32At(self_in_literal32BeforeFollowingAddress, followingAddress - 4))); } @@ -3296,7 +3296,7 @@ { usqInt cacheAddress; sqInt cacheTag; - sqInt cacheTag1; + usqInt cacheTag1; sqInt classTag; sqInt enclosingObject; sqInt entryPoint; @@ -3370,10 +3370,7 @@ Note that selectors can be immediate so there is no guarantee that they are markable/remappable objects. */ entryPoint2 = callTargetFromReturnAddress(backEnd, ((sqInt)mcpc)); - tagCouldBeObj = (entryPoint2 < methodZoneBase) - || (((entryPoint2 & entryPointMask) == uncheckedEntryAlignment) - || (((entryPoint2 & entryPointMask) == checkedEntryAlignment) - && ((((((CogMethod *) (entryPoint2 - cmEntryOffset)))->cmType)) == CMOpenPIC))); + tagCouldBeObj = 0; if (tagCouldBeObj) { if (couldBeObject(cacheTag1)) { if (!(asserta(checkValidOopReference(cacheTag1)))) { @@ -3454,7 +3451,7 @@ sqInt off; sqInt offset; sqInt offset1; - sqInt selectorOrCacheTag; + usqInt selectorOrCacheTag; sqInt *sendTable; sqInt table; @@ -3703,7 +3700,7 @@ closedPICRefersToUnmarkedObject(CogMethod *cPIC) { sqInt i; - sqInt object; + usqInt object; sqInt pc; if (!((isImmediate((cPIC->selector))) @@ -4823,7 +4820,7 @@ static sqInt NoDbgRegParms cPICHasForwardedClass(CogMethod *cPIC) { - sqInt classIndex; + usqInt classIndex; sqInt i; sqInt pc; @@ -5025,7 +5022,7 @@ static sqInt NoDbgRegParms expectedClosedPICPrototype(CogMethod *cPIC) { - sqInt classTag; + usqInt classTag; usqInt classTagPC; sqInt entryPoint; sqInt errors; @@ -5886,12 +5883,12 @@ generateMapAtstart(sqInt addressOrNull, sqInt startAddress) { unsigned char annotation; - usqInt delta; + sqInt delta; sqInt i; AbstractInstruction *instruction; sqInt length; - usqInt location; - usqInt mapEntry; + sqInt location; + sqInt mapEntry; sqInt maxDelta; usqInt mcpc; @@ -7820,7 +7817,7 @@ { usqInt cacheAddress; sqInt cacheTag; - sqInt cacheTag1; + usqInt cacheTag1; sqInt cacheTagMarked; sqInt entryPoint; sqInt entryPoint1; @@ -7900,10 +7897,7 @@ Note that selectors can be immediate so there is no guarantee that they are markable/remappable objects. */ entryPoint2 = callTargetFromReturnAddress(backEnd, ((sqInt)mcpc)); - tagCouldBeObj1 = (entryPoint2 < methodZoneBase) - || (((entryPoint2 & entryPointMask) == uncheckedEntryAlignment) - || (((entryPoint2 & entryPointMask) == checkedEntryAlignment) - && ((((((CogMethod *) (entryPoint2 - cmEntryOffset)))->cmType)) == CMOpenPIC))); + tagCouldBeObj1 = 0; cacheTagMarked = tagCouldBeObj1 && (cacheTagIsMarked(cacheTag1)); if (entryPoint2 > methodZoneBase) { @@ -7964,7 +7958,7 @@ { usqInt cacheAddress; sqInt cacheTag; - sqInt cacheTag1; + usqInt cacheTag1; sqInt entryPoint; sqInt entryPoint1; sqInt entryPoint2; @@ -8024,10 +8018,7 @@ Note that selectors can be immediate so there is no guarantee that they are markable/remappable objects. */ entryPoint2 = callTargetFromReturnAddress(backEnd, ((sqInt)mcpc)); - tagCouldBeObj1 = (entryPoint2 < methodZoneBase) - || (((entryPoint2 & entryPointMask) == uncheckedEntryAlignment) - || (((entryPoint2 & entryPointMask) == checkedEntryAlignment) - && ((((((CogMethod *) (entryPoint2 - cmEntryOffset)))->cmType)) == CMOpenPIC))); + tagCouldBeObj1 = 0; if (tagCouldBeObj1) { } @@ -8914,7 +8905,7 @@ { usqInt cacheAddress; sqInt cacheTag; - sqInt cacheTag1; + usqInt cacheTag1; sqInt entryPoint; sqInt entryPoint1; sqInt entryPoint2; @@ -8987,10 +8978,7 @@ Note that selectors can be immediate so there is no guarantee that they are markable/remappable objects. */ entryPoint2 = callTargetFromReturnAddress(backEnd, ((sqInt)mcpc)); - tagCouldBeObj1 = (entryPoint2 < methodZoneBase) - || (((entryPoint2 & entryPointMask) == uncheckedEntryAlignment) - || (((entryPoint2 & entryPointMask) == checkedEntryAlignment) - && ((((((CogMethod *) (entryPoint2 - cmEntryOffset)))->cmType)) == CMOpenPIC))); + tagCouldBeObj1 = 0; if (tagCouldBeObj1 && (couldBeObject(cacheTag1))) { mappedCacheTag = remapObject(cacheTag1); @@ -16101,6 +16089,7 @@ static sqInt NoDbgRegParms remapObject(sqInt objOop) { + assert(addressCouldBeObj(objOop)); return (shouldRemapObj(objOop) ? remapObj(objOop) : objOop); @@ -16390,7 +16379,7 @@ static sqInt NoDbgRegParms callTargetFromReturnAddress(AbstractInstruction * self_in_callTargetFromReturnAddress, sqInt callSiteReturnAddress) { - sqInt callDistance; + usqInt callDistance; callDistance = literal32BeforeFollowingAddress(self_in_callTargetFromReturnAddress, callSiteReturnAddress); return callSiteReturnAddress + (((int) callDistance)); Modified: branches/Cog/nsspursrc/vm/cogit.h =================================================================== --- branches/Cog/nsspursrc/vm/cogit.h 2016-02-21 01:35:03 UTC (rev 3620) +++ branches/Cog/nsspursrc/vm/cogit.h 2016-02-21 03:17:14 UTC (rev 3621) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.1685 uuid: 59633283-8843-4826-a68a-b23ea22d1fa8 + CCodeGenerator VMMaker.oscog-eem.1688 uuid: 1216c2a8-fd06-474f-9f5b-33d14918ca23 */ Modified: branches/Cog/nsspursrc/vm/cogitARMv5.c =================================================================== --- branches/Cog/nsspursrc/vm/cogitARMv5.c 2016-02-21 01:35:03 UTC (rev 3620) +++ branches/Cog/nsspursrc/vm/cogitARMv5.c 2016-02-21 03:17:14 UTC (rev 3621) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.1685 uuid: 59633283-8843-4826-a68a-b23ea22d1fa8 + CCodeGenerator VMMaker.oscog-eem.1688 uuid: 1216c2a8-fd06-474f-9f5b-33d14918ca23 from - StackToRegisterMappingCogit VMMaker.oscog-eem.1685 uuid: 59633283-8843-4826-a68a-b23ea22d1fa8 + StackToRegisterMappingCogit VMMaker.oscog-eem.1688 uuid: 1216c2a8-fd06-474f-9f5b-33d14918ca23 */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1685 uuid: 59633283-8843-4826-a68a-b23ea22d1fa8 " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1688 uuid: 1216c2a8-fd06-474f-9f5b-33d14918ca23 " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -21383,6 +21383,7 @@ static sqInt NoDbgRegParms remapObject(sqInt objOop) { + assert(addressCouldBeObj(objOop)); return (shouldRemapObj(objOop) ? remapObj(objOop) : objOop); Modified: branches/Cog/nsspursrc/vm/cogitIA32.c =================================================================== --- branches/Cog/nsspursrc/vm/cogitIA32.c 2016-02-21 01:35:03 UTC (rev 3620) +++ branches/Cog/nsspursrc/vm/cogitIA32.c 2016-02-21 03:17:14 UTC (rev 3621) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.1685 uuid: 59633283-8843-4826-a68a-b23ea22d1fa8 + CCodeGenerator VMMaker.oscog-eem.1688 uuid: 1216c2a8-fd06-474f-9f5b-33d14918ca23 from - StackToRegisterMappingCogit VMMaker.oscog-eem.1685 uuid: 59633283-8843-4826-a68a-b23ea22d1fa8 + StackToRegisterMappingCogit VMMaker.oscog-eem.1688 uuid: 1216c2a8-fd06-474f-9f5b-33d14918ca23 */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1685 uuid: 59633283-8843-4826-a68a-b23ea22d1fa8 " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1688 uuid: 1216c2a8-fd06-474f-9f5b-33d14918ca23 " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -19491,6 +19491,7 @@ static sqInt NoDbgRegParms remapObject(sqInt objOop) { + assert(addressCouldBeObj(objOop)); return (shouldRemapObj(objOop) ? remapObj(objOop) : objOop); Modified: branches/Cog/nsspursrc/vm/cogitMIPSEL.c =================================================================== --- branches/Cog/nsspursrc/vm/cogitMIPSEL.c 2016-02-21 01:35:03 UTC (rev 3620) +++ branches/Cog/nsspursrc/vm/cogitMIPSEL.c 2016-02-21 03:17:14 UTC (rev 3621) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.1685 uuid: 59633283-8843-4826-a68a-b23ea22d1fa8 + CCodeGenerator VMMaker.oscog-eem.1688 uuid: 1216c2a8-fd06-474f-9f5b-33d14918ca23 from - StackToRegisterMappingCogit VMMaker.oscog-eem.1685 uuid: 59633283-8843-4826-a68a-b23ea22d1fa8 + StackToRegisterMappingCogit VMMaker.oscog-eem.1688 uuid: 1216c2a8-fd06-474f-9f5b-33d14918ca23 */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1685 uuid: 59633283-8843-4826-a68a-b23ea22d1fa8 " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1688 uuid: 1216c2a8-fd06-474f-9f5b-33d14918ca23 " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -4693,7 +4693,7 @@ static sqInt NoDbgRegParms cPICHasFreedTargets(CogMethod *cPIC) { - usqInt entryPoint; + sqInt entryPoint; sqInt i; sqInt pc; CogMethod *targetMethod; @@ -5738,12 +5738,12 @@ generateMapAtstart(sqInt addressOrNull, sqInt startAddress) { unsigned char annotation; - usqInt delta; + sqInt delta; sqInt i; AbstractInstruction *instruction; sqInt length; - usqInt location; - usqInt mapEntry; + sqInt location; + sqInt mapEntry; sqInt maxDelta; usqInt mcpc; @@ -19724,6 +19724,7 @@ static sqInt NoDbgRegParms remapObject(sqInt objOop) { + assert(addressCouldBeObj(objOop)); return (shouldRemapObj(objOop) ? remapObj(objOop) : objOop); Property changes on: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h ___________________________________________________________________ Modified: checkindate - Sat Feb 20 13:24:43 PST 2016 + Sat Feb 20 19:15:29 PST 2016 Modified: branches/Cog/platforms/unix/vm/Makefile.in =================================================================== --- branches/Cog/platforms/unix/vm/Makefile.in 2016-02-21 01:35:03 UTC (rev 3620) +++ branches/Cog/platforms/unix/vm/Makefile.in 2016-02-21 03:17:14 UTC (rev 3621) @@ -73,7 +73,7 @@ # cogit.c merely includes specific a specific cogitPROCESSOR.c # e.g. cogitARMv5.c cogitIA32.c cogitMIPSEL.c cogitX64.c -cogit$o : $(srcdir)/vm/cogit.c +cogit$o : $(srcdir)/vm/cogit.c $(wildcard $(srcdir)/vm/cogit[A-Z]*.c) # sqUnixHeartbeat.c includes sqSCCSVersion.h sqUnixHeartbeat$o : $(topdir)/platforms/Cross/vm/sqSCCSVersion.h Modified: branches/Cog/scripts/findUnofficialFiles =================================================================== --- branches/Cog/scripts/findUnofficialFiles 2016-02-21 01:35:03 UTC (rev 3620) +++ branches/Cog/scripts/findUnofficialFiles 2016-02-21 03:17:14 UTC (rev 3621) @@ -1,4 +1,4 @@ #!/bin/sh # List any files with an un-checked-in package version comment "* VMMaker-..." -find ${@-src stacksrc spursrc spurstacksrc spurstack64src nsspursrc nsspurstacksrc spursistasrc} -name .svn -prune -o $ -type f -a -name '*.[ch]' $ \ +find ${@-src stacksrc spursrc spurstacksrc spurstack64src spur64src nsspursrc nsspur64src nsspurstacksrc spursistasrc} -name .svn -prune -o $ -type f -a -name '*.[ch]' $ \ -exec egrep -l '\* VMMaker|\* VMConstruction|\* Freetype-Plugin|\* Cog-' {} \; Modified: branches/Cog/spur64src/vm/cogit.h =================================================================== --- branches/Cog/spur64src/vm/cogit.h 2016-02-21 01:35:03 UTC (rev 3620) +++ branches/Cog/spur64src/vm/cogit.h 2016-02-21 03:17:14 UTC (rev 3621) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.1685 uuid: 59633283-8843-4826-a68a-b23ea22d1fa8 + CCodeGenerator VMMaker.oscog-eem.1688 uuid: 1216c2a8-fd06-474f-9f5b-33d14918ca23 */ Modified: branches/Cog/spur64src/vm/cogitX64.c =================================================================== --- branches/Cog/spur64src/vm/cogitX64.c 2016-02-21 01:35:03 UTC (rev 3620) +++ branches/Cog/spur64src/vm/cogitX64.c 2016-02-21 03:17:14 UTC (rev 3621) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.1685 uuid: 59633283-8843-4826-a68a-b23ea22d1fa8 + CCodeGenerator VMMaker.oscog-eem.1688 uuid: 1216c2a8-fd06-474f-9f5b-33d14918ca23 from - StackToRegisterMappingCogit VMMaker.oscog-eem.1685 uuid: 59633283-8843-4826-a68a-b23ea22d1fa8 + StackToRegisterMappingCogit VMMaker.oscog-eem.1688 uuid: 1216c2a8-fd06-474f-9f5b-33d14918ca23 */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1685 uuid: 59633283-8843-4826-a68a-b23ea22d1fa8 " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1688 uuid: 1216c2a8-fd06-474f-9f5b-33d14918ca23 " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -414,9 +414,9 @@ static sqInt NoDbgRegParms computeSizeOfArithCwR(AbstractInstruction * self_in_computeSizeOfArithCwR); static usqInt NoDbgRegParms concretizeArithCwR(AbstractInstruction * self_in_concretizeArithCwR, sqInt x64opcode); static usqInt NoDbgRegParms concretizeMoveCwR(AbstractInstruction * self_in_concretizeMoveCwR); -static sqInt NoDbgRegParms inlineCacheTagAt(AbstractInstruction * self_in_inlineCacheTagAt, sqInt callSiteReturnAddress); +static usqInt NoDbgRegParms inlineCacheTagAt(AbstractInstruction * self_in_inlineCacheTagAt, sqInt callSiteReturnAddress); static sqInt NoDbgRegParms isPCDependent(AbstractInstruction * self_in_isPCDependent); -static sqInt NoDbgRegParms literal32BeforeFollowingAddress(AbstractInstruction * self_in_literal32BeforeFollowingAddress, sqInt followingAddress); +static usqInt NoDbgRegParms literal32BeforeFollowingAddress(AbstractInstruction * self_in_literal32BeforeFollowingAddress, sqInt followingAddress); static sqInt NoDbgRegParms literalBeforeFollowingAddress(AbstractInstruction * self_in_literalBeforeFollowingAddress, sqInt followingAddress); static sqInt NoDbgRegParms loadLiteralByteSize(AbstractInstruction * self_in_loadLiteralByteSize); static usqInt NoDbgRegParms sizePCDependentInstructionAt(AbstractInstruction * self_in_sizePCDependentInstructionAt, sqInt eventualAbsoluteAddress); @@ -1993,7 +1993,7 @@ /* Answer the inline cache tag for the return address of a send. */ /* CogInLineLiteralsX64Compiler>>#inlineCacheTagAt: */ -static sqInt NoDbgRegParms +static usqInt NoDbgRegParms inlineCacheTagAt(AbstractInstruction * self_in_inlineCacheTagAt, sqInt callSiteReturnAddress) { return literal32BeforeFollowingAddress(self_in_inlineCacheTagAt, callSiteReturnAddress - 5); @@ -2016,10 +2016,10 @@ */ /* CogInLineLiteralsX64Compiler>>#literal32BeforeFollowingAddress: */ -static sqInt NoDbgRegParms +static usqInt NoDbgRegParms literal32BeforeFollowingAddress(AbstractInstruction * self_in_literal32BeforeFollowingAddress, sqInt followingAddress) { - return unalignedLong32At(self_in_literal32BeforeFollowingAddress, followingAddress - 4); + return ((unsigned int) (unalignedLong32At(self_in_literal32BeforeFollowingAddress, followingAddress - 4))); } @@ -2971,7 +2971,7 @@ checkIfValidOopRefAndTargetpccogMethod(sqInt annotation, char *mcpc, sqInt cogMethod) { sqInt cacheTag; - sqInt cacheTag1; + usqInt cacheTag1; sqInt entryPoint; sqInt entryPoint1; sqInt literal; @@ -3009,10 +3009,7 @@ Note that selectors can be immediate so there is no guarantee that they are markable/remappable objects. */ entryPoint1 = callTargetFromReturnAddress(backEnd, ((sqInt)mcpc)); - tagCouldBeObj = (entryPoint1 < methodZoneBase) - || (((entryPoint1 & entryPointMask) == uncheckedEntryAlignment) - || (((entryPoint1 & entryPointMask) == checkedEntryAlignment) - && ((((((CogMethod *) (entryPoint1 - cmEntryOffset)))->cmType)) == CMOpenPIC))); + tagCouldBeObj = 0; if (tagCouldBeObj) { if (couldBeObject(cacheTag1)) { if (!(asserta(checkValidOopReference(cacheTag1)))) { @@ -3078,7 +3075,7 @@ sqInt off; sqInt offset; sqInt offset1; - sqInt selectorOrCacheTag; + usqInt selectorOrCacheTag; sqInt *sendTable; sqInt table; @@ -3289,7 +3286,7 @@ closedPICRefersToUnmarkedObject(CogMethod *cPIC) { sqInt i; - sqInt object; + usqInt object; sqInt pc; if (!((isImmediate((cPIC->selector))) @@ -4388,7 +4385,7 @@ static sqInt NoDbgRegParms cPICHasForwardedClass(CogMethod *cPIC) { - sqInt classIndex; + usqInt classIndex; sqInt i; sqInt pc; @@ -4596,7 +4593,7 @@ static sqInt NoDbgRegParms expectedClosedPICPrototype(CogMethod *cPIC) { - sqInt classTag; + usqInt classTag; usqInt classTagPC; sqInt entryPoint; sqInt errors; @@ -7197,7 +7194,7 @@ markLiteralsAndUnlinkIfUnmarkedSendpcmethod(sqInt annotation, char *mcpc, sqInt cogMethod) { sqInt cacheTag; - sqInt cacheTag1; + usqInt cacheTag1; sqInt cacheTagMarked; sqInt entryPoint; sqInt entryPoint1; @@ -7230,10 +7227,7 @@ Note that selectors can be immediate so there is no guarantee that they are markable/remappable objects. */ entryPoint1 = callTargetFromReturnAddress(backEnd, ((sqInt)mcpc)); - tagCouldBeObj1 = (entryPoint1 < methodZoneBase) - || (((entryPoint1 & entryPointMask) == uncheckedEntryAlignment) - || (((entryPoint1 & entryPointMask) == checkedEntryAlignment) - && ((((((CogMethod *) (entryPoint1 - cmEntryOffset)))->cmType)) == CMOpenPIC))); + tagCouldBeObj1 = 0; cacheTagMarked = tagCouldBeObj1 && (cacheTagIsMarked(cacheTag1)); if (entryPoint1 > methodZoneBase) { @@ -7283,7 +7277,7 @@ markLiteralspcmethod(sqInt annotation, char *mcpc, sqInt cogMethod) { sqInt cacheTag; - sqInt cacheTag1; + usqInt cacheTag1; sqInt entryPoint; sqInt entryPoint1; sqInt literal; @@ -7308,10 +7302,7 @@ Note that selectors can be immediate so there is no guarantee that they are markable/remappable objects. */ entryPoint1 = callTargetFromReturnAddress(backEnd, ((sqInt)mcpc)); - tagCouldBeObj1 = (entryPoint1 < methodZoneBase) - || (((entryPoint1 & entryPointMask) == uncheckedEntryAlignment) - || (((entryPoint1 & entryPointMask) == checkedEntryAlignment) - && ((((((CogMethod *) (entryPoint1 - cmEntryOffset)))->cmType)) == CMOpenPIC))); + tagCouldBeObj1 = 0; if (tagCouldBeObj1) { } @@ -8139,7 +8130,7 @@ remapIfObjectRefpchasYoung(sqInt annotation, char *mcpc, sqInt hasYoungPtr) { sqInt cacheTag; - sqInt cacheTag1; + usqInt cacheTag1; sqInt entryPoint; sqInt entryPoint1; sqInt ignored; @@ -8178,10 +8169,7 @@ Note that selectors can be immediate so there is no guarantee that they are markable/remappable objects. */ entryPoint1 = callTargetFromReturnAddress(backEnd, ((sqInt)mcpc)); - tagCouldBeObj1 = (entryPoint1 < methodZoneBase) - || (((entryPoint1 & entryPointMask) == uncheckedEntryAlignment) - || (((entryPoint1 & entryPointMask) == checkedEntryAlignment) - && ((((((CogMethod *) (entryPoint1 - cmEntryOffset)))->cmType)) == CMOpenPIC))); + tagCouldBeObj1 = 0; if (tagCouldBeObj1 && (couldBeObject(cacheTag1))) { mappedCacheTag = remapObject(cacheTag1); @@ -14495,6 +14483,7 @@ static sqInt NoDbgRegParms remapObject(sqInt objOop) { + assert(addressCouldBeObj(objOop)); return (shouldRemapObj(objOop) ? remapObj(objOop) : objOop); @@ -14784,7 +14773,7 @@ static sqInt NoDbgRegParms callTargetFromReturnAddress(AbstractInstruction * self_in_callTargetFromReturnAddress, sqInt callSiteReturnAddress) { - sqInt callDistance; + usqInt callDistance; callDistance = literal32BeforeFollowingAddress(self_in_callTargetFromReturnAddress, callSiteReturnAddress); return callSiteReturnAddress + (((int) callDistance)); Modified: branches/Cog/spursistasrc/vm/cogit.h =================================================================== --- branches/Cog/spursistasrc/vm/cogit.h 2016-02-21 01:35:03 UTC (rev 3620) +++ branches/Cog/spursistasrc/vm/cogit.h 2016-02-21 03:17:14 UTC (rev 3621) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.1685 uuid: 59633283-8843-4826-a68a-b23ea22d1fa8 + CCodeGenerator VMMaker.oscog-eem.1688 uuid: 1216c2a8-fd06-474f-9f5b-33d14918ca23 */ Modified: branches/Cog/spursistasrc/vm/cogitARMv5.c =================================================================== --- branches/Cog/spursistasrc/vm/cogitARMv5.c 2016-02-21 01:35:03 UTC (rev 3620) +++ branches/Cog/spursistasrc/vm/cogitARMv5.c 2016-02-21 03:17:14 UTC (rev 3621) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.1685 uuid: 59633283-8843-4826-a68a-b23ea22d1fa8 + CCodeGenerator VMMaker.oscog-eem.1688 uuid: 1216c2a8-fd06-474f-9f5b-33d14918ca23 from - SistaStackToRegisterMappingCogit VMMaker.oscog-eem.1685 uuid: 59633283-8843-4826-a68a-b23ea22d1fa8 + SistaStackToRegisterMappingCogit VMMaker.oscog-eem.1688 uuid: 1216c2a8-fd06-474f-9f5b-33d14918ca23 */ -static char __buildInfo[] = "SistaStackToRegisterMappingCogit VMMaker.oscog-eem.1685 uuid: 59633283-8843-4826-a68a-b23ea22d1fa8 " __DATE__ ; +static char __buildInfo[] = "SistaStackToRegisterMappingCogit VMMaker.oscog-eem.1688 uuid: 1216c2a8-fd06-474f-9f5b-33d14918ca23 " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -10421,12 +10421,12 @@ generateMapAtstart(sqInt addressOrNull, sqInt startAddress) { unsigned char annotation; - usqInt delta; + sqInt delta; sqInt i; AbstractInstruction *instruction; sqInt length; - usqInt location; - usqInt mapEntry; + sqInt location; + sqInt mapEntry; sqInt maxDelta; usqInt mcpc; @@ -20255,6 +20255,7 @@ static sqInt NoDbgRegParms remapObject(sqInt objOop) { + assert(addressCouldBeObj(objOop)); return (shouldRemapObj(objOop) ? remapObj(objOop) : objOop); Modified: branches/Cog/spursistasrc/vm/cogitIA32.c =================================================================== --- branches/Cog/spursistasrc/vm/cogitIA32.c 2016-02-21 01:35:03 UTC (rev 3620) +++ branches/Cog/spursistasrc/vm/cogitIA32.c 2016-02-21 03:17:14 UTC (rev 3621) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.1685 uuid: 59633283-8843-4826-a68a-b23ea22d1fa8 + CCodeGenerator VMMaker.oscog-eem.1688 uuid: 1216c2a8-fd06-474f-9f5b-33d14918ca23 from - SistaStackToRegisterMappingCogit VMMaker.oscog-eem.1685 uuid: 59633283-8843-4826-a68a-b23ea22d1fa8 + SistaStackToRegisterMappingCogit VMMaker.oscog-eem.1688 uuid: 1216c2a8-fd06-474f-9f5b-33d14918ca23 */ -static char __buildInfo[] = "SistaStackToRegisterMappingCogit VMMaker.oscog-eem.1685 uuid: 59633283-8843-4826-a68a-b23ea22d1fa8 " __DATE__ ; +static char __buildInfo[] = "SistaStackToRegisterMappingCogit VMMaker.oscog-eem.1688 uuid: 1216c2a8-fd06-474f-9f5b-33d14918ca23 " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -18465,6 +18465,7 @@ static sqInt NoDbgRegParms remapObject(sqInt objOop) { + assert(addressCouldBeObj(objOop)); return (shouldRemapObj(objOop) ? remapObj(objOop) : objOop); Modified: branches/Cog/spursistasrc/vm/cogitMIPSEL.c =================================================================== --- branches/Cog/spursistasrc/vm/cogitMIPSEL.c 2016-02-21 01:35:03 UTC (rev 3620) +++ branches/Cog/spursistasrc/vm/cogitMIPSEL.c 2016-02-21 03:17:14 UTC (rev 3621) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.1685 uuid: 59633283-8843-4826-a68a-b23ea22d1fa8 + CCodeGenerator VMMaker.oscog-eem.1688 uuid: 1216c2a8-fd06-474f-9f5b-33d14918ca23 from - SistaStackToRegisterMappingCogit VMMaker.oscog-eem.1685 uuid: 59633283-8843-4826-a68a-b23ea22d1fa8 + SistaStackToRegisterMappingCogit VMMaker.oscog-eem.1688 uuid: 1216c2a8-fd06-474f-9f5b-33d14918ca23 */ -static char __buildInfo[] = "SistaStackToRegisterMappingCogit VMMaker.oscog-eem.1685 uuid: 59633283-8843-4826-a68a-b23ea22d1fa8 " __DATE__ ; +static char __buildInfo[] = "SistaStackToRegisterMappingCogit VMMaker.oscog-eem.1688 uuid: 1216c2a8-fd06-474f-9f5b-33d14918ca23 " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -5602,12 +5602,12 @@ generateMapAtstart(sqInt addressOrNull, sqInt startAddress) { unsigned char annotation; - usqInt delta; + sqInt delta; sqInt i; AbstractInstruction *instruction; sqInt length; - usqInt location; - usqInt mapEntry; + sqInt location; + sqInt mapEntry; sqInt maxDelta; usqInt mcpc; @@ -18705,6 +18705,7 @@ static sqInt NoDbgRegParms remapObject(sqInt objOop) { + assert(addressCouldBeObj(objOop)); return (shouldRemapObj(objOop) ? remapObj(objOop) : objOop); Modified: branches/Cog/spursrc/vm/cogit.h =================================================================== --- branches/Cog/spursrc/vm/cogit.h 2016-02-21 01:35:03 UTC (rev 3620) +++ branches/Cog/spursrc/vm/cogit.h 2016-02-21 03:17:14 UTC (rev 3621) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.1685 uuid: 59633283-8843-4826-a68a-b23ea22d1fa8 + CCodeGenerator VMMaker.oscog-eem.1688 uuid: 1216c2a8-fd06-474f-9f5b-33d14918ca23 */ Modified: branches/Cog/spursrc/vm/cogitARMv5.c =================================================================== --- branches/Cog/spursrc/vm/cogitARMv5.c 2016-02-21 01:35:03 UTC (rev 3620) +++ branches/Cog/spursrc/vm/cogitARMv5.c 2016-02-21 03:17:14 UTC (rev 3621) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.1685 uuid: 59633283-8843-4826-a68a-b23ea22d1fa8 + CCodeGenerator VMMaker.oscog-eem.1688 uuid: 1216c2a8-fd06-474f-9f5b-33d14918ca23 from - StackToRegisterMappingCogit VMMaker.oscog-eem.1685 uuid: 59633283-8843-4826-a68a-b23ea22d1fa8 + StackToRegisterMappingCogit VMMaker.oscog-eem.1688 uuid: 1216c2a8-fd06-474f-9f5b-33d14918ca23 */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1685 uuid: 59633283-8843-4826-a68a-b23ea22d1fa8 " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1688 uuid: 1216c2a8-fd06-474f-9f5b-33d14918ca23 " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -19618,6 +19618,7 @@ static sqInt NoDbgRegParms remapObject(sqInt objOop) { + assert(addressCouldBeObj(objOop)); return (shouldRemapObj(objOop) ? remapObj(objOop) : objOop); Modified: branches/Cog/spursrc/vm/cogitIA32.c =================================================================== --- branches/Cog/spursrc/vm/cogitIA32.c 2016-02-21 01:35:03 UTC (rev 3620) +++ branches/Cog/spursrc/vm/cogitIA32.c 2016-02-21 03:17:14 UTC (rev 3621) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.1685 uuid: 59633283-8843-4826-a68a-b23ea22d1fa8 + CCodeGenerator VMMaker.oscog-eem.1688 uuid: 1216c2a8-fd06-474f-9f5b-33d14918ca23 from - StackToRegisterMappingCogit VMMaker.oscog-eem.1685 uuid: 59633283-8843-4826-a68a-b23ea22d1fa8 + StackToRegisterMappingCogit VMMaker.oscog-eem.1688 uuid: 1216c2a8-fd06-474f-9f5b-33d14918ca23 */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1685 uuid: 59633283-8843-4826-a68a-b23ea22d1fa8 " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1688 uuid: 1216c2a8-fd06-474f-9f5b-33d14918ca23 " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -17851,6 +17851,7 @@ static sqInt NoDbgRegParms remapObject(sqInt objOop) { + assert(addressCouldBeObj(objOop)); return (shouldRemapObj(objOop) ? remapObj(objOop) : objOop); Modified: branches/Cog/spursrc/vm/cogitMIPSEL.c =================================================================== --- branches/Cog/spursrc/vm/cogitMIPSEL.c 2016-02-21 01:35:03 UTC (rev 3620) +++ branches/Cog/spursrc/vm/cogitMIPSEL.c 2016-02-21 03:17:14 UTC (rev 3621) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.1685 uuid: 59633283-8843-4826-a68a-b23ea22d1fa8 + CCodeGenerator VMMaker.oscog-eem.1688 uuid: 1216c2a8-fd06-474f-9f5b-33d14918ca23 from - StackToRegisterMappingCogit VMMaker.oscog-eem.1685 uuid: 59633283-8843-4826-a68a-b23ea22d1fa8 + StackToRegisterMappingCogit VMMaker.oscog-eem.1688 uuid: 1216c2a8-fd06-474f-9f5b-33d14918ca23 */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1685 uuid: 59633283-8843-4826-a68a-b23ea22d1fa8 " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1688 uuid: 1216c2a8-fd06-474f-9f5b-33d14918ca23 " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -18074,6 +18074,7 @@ static sqInt NoDbgRegParms remapObject(sqInt objOop) { + assert(addressCouldBeObj(objOop)); return (shouldRemapObj(objOop) ? remapObj(objOop) : objOop); Modified: branches/Cog/src/vm/cogit.h =================================================================== --- branches/Cog/src/vm/cogit.h 2016-02-21 01:35:03 UTC (rev 3620) +++ branches/Cog/src/vm/cogit.h 2016-02-21 03:17:14 UTC (rev 3621) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.1685 uuid: 59633283-8843-4826-a68a-b23ea22d1fa8 + CCodeGenerator VMMaker.oscog-eem.1688 uuid: 1216c2a8-fd06-474f-9f5b-33d14918ca23 */ Modified: branches/Cog/src/vm/cogitARMv5.c =================================================================== --- branches/Cog/src/vm/cogitARMv5.c 2016-02-21 01:35:03 UTC (rev 3620) +++ branches/Cog/src/vm/cogitARMv5.c 2016-02-21 03:17:14 UTC (rev 3621) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.1685 uuid: 59633283-8843-4826-a68a-b23ea22d1fa8 + CCodeGenerator VMMaker.oscog-eem.1688 uuid: 1216c2a8-fd06-474f-9f5b-33d14918ca23 from - StackToRegisterMappingCogit VMMaker.oscog-eem.1685 uuid: 59633283-8843-4826-a68a-b23ea22d1fa8 + StackToRegisterMappingCogit VMMaker.oscog-eem.1688 uuid: 1216c2a8-fd06-474f-9f5b-33d14918ca23 */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1685 uuid: 59633283-8843-4826-a68a-b23ea22d1fa8 " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1688 uuid: 1216c2a8-fd06-474f-9f5b-33d14918ca23 " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -869,7 +869,7 @@ static void NoDbgRegParms markAndTraceLiteral(sqInt literal); extern sqInt numRegArgs(void); static sqInt numSmallIntegerBits(void); -static sqInt NoDbgRegParms remapObject(sqInt oop); +static sqInt NoDbgRegParms remapObject(sqInt objOop); static sqInt NoDbgRegParms remapOop(sqInt oop); static sqInt NoDbgRegParms shouldAnnotateObjectReference(sqInt anOop); static sqInt NoDbgRegParms slotOffsetOfInstVarIndex(sqInt index); @@ -9817,12 +9817,12 @@ generateMapAtstart(sqInt addressOrNull, sqInt startAddress) { unsigned char annotation; - usqInt delta; + sqInt delta; sqInt i; AbstractInstruction *instruction; sqInt length; - usqInt location; - usqInt mapEntry; + sqInt location; + sqInt mapEntry; sqInt maxDelta; usqInt mcpc; @@ -16800,9 +16800,10 @@ /* CogObjectRepresentationForSqueakV3>>#remapObject: */ static sqInt NoDbgRegParms -remapObject(sqInt oop) +remapObject(sqInt objOop) { - return remap(oop); + assert(addressCouldBeObj(objOop)); + return remap(objOop); } /* CogObjectRepresentationForSqueakV3>>#remapOop: */ Modified: branches/Cog/src/vm/cogitIA32.c =================================================================== --- branches/Cog/src/vm/cogitIA32.c 2016-02-21 01:35:03 UTC (rev 3620) +++ branches/Cog/src/vm/cogitIA32.c 2016-02-21 03:17:14 UTC (rev 3621) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.1685 uuid: 59633283-8843-4826-a68a-b23ea22d1fa8 + CCodeGenerator VMMaker.oscog-eem.1688 uuid: 1216c2a8-fd06-474f-9f5b-33d14918ca23 from - StackToRegisterMappingCogit VMMaker.oscog-eem.1685 uuid: 59633283-8843-4826-a68a-b23ea22d1fa8 + StackToRegisterMappingCogit VMMaker.oscog-eem.1688 uuid: 1216c2a8-fd06-474f-9f5b-33d14918ca23 */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1685 uuid: 59633283-8843-4826-a68a-b23ea22d1fa8 " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1688 uuid: 1216c2a8-fd06-474f-9f5b-33d14918ca23 " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -818,7 +818,7 @@ static void NoDbgRegParms markAndTraceLiteral(sqInt literal); extern sqInt numRegArgs(void); static sqInt numSmallIntegerBits(void); -static sqInt NoDbgRegParms remapObject(sqInt oop); +static sqInt NoDbgRegParms remapObject(sqInt objOop); static sqInt NoDbgRegParms remapOop(sqInt oop); static sqInt NoDbgRegParms shouldAnnotateObjectReference(sqInt anOop); static sqInt NoDbgRegParms slotOffsetOfInstVarIndex(sqInt index); @@ -8891,12 +8891,12 @@ generateMapAtstart(sqInt addressOrNull, sqInt startAddress) { unsigned char annotation; - sqInt delta; + usqInt delta; sqInt i; AbstractInstruction *instruction; sqInt length; - sqInt location; - sqInt mapEntry; + usqInt location; + usqInt mapEntry; sqInt maxDelta; usqInt mcpc; @@ -15514,9 +15514,10 @@ /* CogObjectRepresentationForSqueakV3>>#remapObject: */ static sqInt NoDbgRegParms -remapObject(sqInt oop) +remapObject(sqInt objOop) { - return remap(oop); + assert(addressCouldBeObj(objOop)); + return remap(objOop); } /* CogObjectRepresentationForSqueakV3>>#remapOop: */ Modified: branches/Cog/src/vm/cogitMIPSEL.c =================================================================== --- branches/Cog/src/vm/cogitMIPSEL.c 2016-02-21 01:35:03 UTC (rev 3620) +++ branches/Cog/src/vm/cogitMIPSEL.c 2016-02-21 03:17:14 UTC (rev 3621) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.1685 uuid: 59633283-8843-4826-a68a-b23ea22d1fa8 + CCodeGenerator VMMaker.oscog-eem.1688 uuid: 1216c2a8-fd06-474f-9f5b-33d14918ca23 from - StackToRegisterMappingCogit VMMaker.oscog-eem.1685 uuid: 59633283-8843-4826-a68a-b23ea22d1fa8 + StackToRegisterMappingCogit VMMaker.oscog-eem.1688 uuid: 1216c2a8-fd06-474f-9f5b-33d14918ca23 */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1685 uuid: 59633283-8843-4826-a68a-b23ea22d1fa8 " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1688 uuid: 1216c2a8-fd06-474f-9f5b-33d14918ca23 " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -1015,7 +1015,7 @@ static void NoDbgRegParms markAndTraceLiteral(sqInt literal); extern sqInt numRegArgs(void); static sqInt numSmallIntegerBits(void); -static sqInt NoDbgRegParms remapObject(sqInt oop); +static sqInt NoDbgRegParms remapObject(sqInt objOop); static sqInt NoDbgRegParms remapOop(sqInt oop); static sqInt NoDbgRegParms shouldAnnotateObjectReference(sqInt anOop); static sqInt NoDbgRegParms slotOffsetOfInstVarIndex(sqInt index); @@ -4160,7 +4160,7 @@ static sqInt NoDbgRegParms cPICHasFreedTargets(CogMethod *cPIC) { - sqInt entryPoint; + usqInt entryPoint; sqInt i; sqInt pc; CogMethod *targetMethod; @@ -4349,7 +4349,7 @@ { sqInt classTag; usqInt classTagPC; - sqInt entryPoint; + usqInt entryPoint; sqInt errors; sqInt i; usqInt methodObjPC; @@ -7577,7 +7577,7 @@ relocateCallsInClosedPIC(CogMethod *cPIC) { sqInt callDelta; - sqInt entryPoint; + usqInt entryPoint; sqInt i; sqInt pc; sqInt refDelta; @@ -15724,9 +15724,10 @@ /* CogObjectRepresentationForSqueakV3>>#remapObject: */ static sqInt NoDbgRegParms -remapObject(sqInt oop) +remapObject(sqInt objOop) { - return remap(oop); + assert(addressCouldBeObj(objOop)); + return remap(objOop); } /* CogObjectRepresentationForSqueakV3>>#remapOop: */

1 0

VM Maker: VMMaker.oscog-eem.1688.mcz
by commits＠source.squeak.org 21 Feb '16

21 Feb '16

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.1688.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.1688 Author: eem Time: 20 February 2016, 7:07:45.253804 pm UUID: 1216c2a8-fd06-474f-9f5b-33d14918ca23 Ancestors: VMMaker.oscog-eem.1687 X64 Cogit: make sure that literal32BeforeFollowingAddress: answrs unsigned. Otherwise 16rBABE1F1(5H) causes an assert faul in expectedClosedPICPrototype at startup. Introduce an abstraction for unlinked inline cache tags holding selector indices (when will I ever learn??). =============== Diff against VMMaker.oscog-eem.1687 =============== Item was changed: ----- Method: CogInLineLiteralsX64Compiler>>literal32BeforeFollowingAddress: (in category 'inline cacheing') ----- literal32BeforeFollowingAddress: followingAddress "Answer the 32-bit literal embedded in the instruction immediately preceding followingAddress." + ^self + cCoerceSimple: (self unalignedLong32At: followingAddress - 4) + to: #'unsigned int'! - ^self unalignedLong32At: followingAddress - 4! Item was changed: ----- Method: CogObjectRepresentationForSpur>>remapObject: (in category 'garbage collection') ----- remapObject: objOop + self assert: (objectMemory addressCouldBeObj: objOop). ^(objectMemory shouldRemapObj: objOop) ifTrue: [objectMemory remapObj: objOop] ifFalse: [objOop]! Item was changed: ----- Method: CogObjectRepresentationForSqueakV3>>remapObject: (in category 'garbage collection') ----- + remapObject: objOop + self assert: (objectMemory addressCouldBeObj: objOop). + ^objectMemory remap: objOop! - remapObject: oop - ^objectMemory remap: oop! Item was changed: ----- Method: Cogit>>checkIfValidOopRef:pc:cogMethod: (in category 'garbage collection') ----- checkIfValidOopRef: annotation pc: mcpc cogMethod: cogMethod "Check for a valid object reference, if any, at a map entry. Answer a code unique to each error for debugging." <var: #mcpc type: #'char *'> <var: #nsSendCache type: #'NSSendCache *'> annotation = IsObjectReference ifTrue: [| literal | literal := literalsManager fetchLiteralAtAnnotatedAddress: mcpc asUnsignedInteger using: backEnd. (objectRepresentation checkValidOopReference: literal) ifFalse: [coInterpreter print: 'object ref leak in CM '; printHex: cogMethod asInteger; print: ' @ '; printHex: mcpc asInteger; cr. ^1]]. self cppIf: NewspeakVM ifTrue: [annotation = IsNSSendCall ifTrue: [| nsSendCache enclosingObject | nsSendCache := self nsSendCacheFromReturnAddress: mcpc asInteger. [(objectRepresentation checkValidOopReference: nsSendCache selector) ifFalse: [coInterpreter print: 'selector leak in CM '; printHex: cogMethod asInteger; print: ' @ '; printHex: mcpc asInteger; cr. ^1]]. (enclosingObject := nsSendCache enclosingObject) ~= 0 ifTrue: [[(objectRepresentation checkValidOopReference: enclosingObject) ifFalse: [coInterpreter print: 'enclosing object leak in CM '; printHex: cogMethod asInteger; print: ' @ '; printHex: mcpc asInteger; cr. ^1]]]]]. (self isPureSendAnnotation: annotation) ifTrue: [| entryPoint selectorOrCacheTag offset | entryPoint := backEnd callTargetFromReturnAddress: mcpc asInteger. entryPoint <= methodZoneBase ifTrue: [offset := entryPoint] ifFalse: [self offsetAndSendTableFor: entryPoint annotation: annotation into: [:off :table| offset := off]]. selectorOrCacheTag := backEnd inlineCacheTagAt: mcpc asInteger. (entryPoint > methodZoneBase and: [offset ~= cmNoCheckEntryOffset and: [(self cCoerceSimple: entryPoint - offset to: #'CogMethod *') cmType ~= CMOpenPIC]]) ifTrue: "linked non-super send, cacheTag is a cacheTag" [(objectRepresentation validInlineCacheTag: selectorOrCacheTag) ifFalse: [coInterpreter print: 'cache tag leak in CM '; printHex: cogMethod asInteger; print: ' @ '; printHex: mcpc asInteger; cr. ^1]] ifFalse: "unlinked send or super send; cacheTag is a selector unless 64-bit, in which case it is an index." + [(self inlineCacheTagsAreIndexes - [(objectMemory wordSize = 8 or: [objectRepresentation checkValidOopReference: selectorOrCacheTag]) ifFalse: [coInterpreter print: 'selector leak in CM '; printHex: cogMethod asInteger; print: ' @ '; printHex: mcpc asInteger; cr. ^1]]]. ^0 "keep scanning"! Item was changed: ----- Method: Cogit>>checkValidObjectReferencesInClosedPIC: (in category 'garbage collection') ----- checkValidObjectReferencesInClosedPIC: cPIC <var: #cPIC type: #'CogMethod *'> | ok pc | ok := true. pc := cPIC asInteger + firstCPICCaseOffset. "first we check the obj ref at the beginning of the CPIC" (self checkMaybeObjRefInClosedPIC: (backEnd literalBeforeFollowingAddress: pc - backEnd jumpLongByteSize)) ifFalse: [self print: 'object leak in CPIC '; printHex: cPIC asInteger; print: ' @ '; printHex: pc - backEnd jumpLongByteSize; cr. ok := false]. "Next we step over each case that is in use. We find the end address of the cPICNumCases'th case and can then just step forward by the case size thereafter" pc := self addressOfEndOfCase: cPIC cPICNumCases inCPIC: cPIC. "For each case we check any object reference at the end address - sizeof(conditional instruction) and then increment the end address by case size" 2 to: cPIC cPICNumCases do: [:i| + (self inlineCacheTagsAreIndexes not + and: [objectRepresentation inlineCacheTagsMayBeObjects]) ifTrue: - objectRepresentation inlineCacheTagsMayBeObjects ifTrue: [(self checkMaybeObjRefInClosedPIC: (backEnd literal32BeforeFollowingAddress: pc - backEnd jumpLongConditionalByteSize)) ifFalse: [self print: 'object leak in CPIC '; printHex: cPIC asInteger; print: ' @ '; printHex: pc - backEnd jumpLongConditionalByteSize - backEnd loadLiteralByteSize; cr. ok := false]]. (self checkMaybeObjRefInClosedPIC: (backEnd literalBeforeFollowingAddress: pc - backEnd jumpLongConditionalByteSize - backEnd cmpC32RTempByteSize)) ifFalse: [self print: 'object leak in CPIC '; printHex: cPIC asInteger; print: ' @ '; printHex: pc - backEnd jumpLongConditionalByteSize; cr. ok := false]. pc := pc + cPICCaseSize]. ^ok! Item was changed: ----- Method: Cogit>>closedPICRefersToUnmarkedObject: (in category 'garbage collection') ----- closedPICRefersToUnmarkedObject: cPIC "Answer if the ClosedPIC refers to any unmarked objects or freed/freeable target methods, applying markAndTraceOrFreeCogMethod:firstVisit: to those targets to determine if freed/freeable." <var: #cPIC type: #'CogMethod *'> | pc object | ((objectMemory isImmediate: cPIC selector) or: [objectMemory isMarked: cPIC selector]) ifFalse: [^true]. "First jump is unconditional; subsequent ones are conditional." "Check the potential method oop for the first case only. Inline cache tags for the 1st case are at the send site." pc := self addressOfEndOfCase: 1 inCPIC: cPIC. (objectRepresentation couldBeObject: (object := backEnd literalBeforeFollowingAddress: pc - backEnd jumpLongByteSize)) ifTrue: [(objectMemory isMarked: object) ifFalse: [^true]]. "Check the first target" (self markAndTraceOrFreePICTarget: (backEnd jumpLongTargetBeforeFollowingAddress: pc) in: cPIC) ifTrue: [^true]. 2 to: cPIC cPICNumCases do: [:i| pc := self addressOfEndOfCase: i inCPIC: cPIC. + (self inlineCacheTagsAreIndexes not + and: [objectRepresentation inlineCacheTagsMayBeObjects + and: [objectRepresentation couldBeObject: (object := literalsManager backEnd literal32BeforeFollowingAddress: pc - backEnd jumpLongConditionalByteSize)]]) ifTrue: - (objectRepresentation inlineCacheTagsMayBeObjects - and: [objectRepresentation couldBeObject: (object := literalsManager backEnd literal32BeforeFollowingAddress: pc - backEnd jumpLongConditionalByteSize)]) ifTrue: [(objectMemory isMarked: object) ifFalse: [^true]]. "Check the potential method oop for subsequent cases." (objectRepresentation couldBeObject: (object := backEnd literalBeforeFollowingAddress: pc - backEnd jumpLongConditionalByteSize - backEnd cmpC32RTempByteSize)) ifTrue: [(objectMemory isMarked: object) ifFalse: [^true]]. "Check subsequent targets" (self markAndTraceOrFreePICTarget: (backEnd jumpLongConditionalTargetBeforeFollowingAddress: pc) in: cPIC) ifTrue: [^true]]. ^false! Item was changed: ----- Method: Cogit>>genLoadInlineCacheWithSelector: (in category 'in-line cacheing') ----- genLoadInlineCacheWithSelector: selectorIndex "The in-line cache for a send is implemented as a constant load into ClassReg. We always use a 32-bit load, even in 64-bits. In the initial (unlinked) state the in-line cache is notionally loaded with the selector. But since in 64-bits an arbitrary selector oop won't fit in a 32-bit constant load, we instead load the cache with the selector's index, either into the literal frame of the current method, or into the special selector array. Negative values are 1-relative indices into the special selector array. When a send is linked, the load of the selector, or selector index, is overwritten with a load of the receiver's class, or class tag. Hence, the 64-bit VM is currently constrained to use class indices as cache tags. If out-of-line literals are used, distinct caches /must not/ share acche locations, for if they do, send cacheing will be confused by the sharing. Hence we use the MoveUniqueC32:R: instruction that will not share literal locations." | cacheValue | self assert: (selectorIndex < 0 ifTrue: [selectorIndex negated between: 1 and: self numSpecialSelectors] ifFalse: [selectorIndex between: 0 and: (objectMemory literalCountOf: methodObj) - 1]). + self inlineCacheTagsAreIndexes - objectMemory wordSize = 8 ifTrue: [cacheValue := selectorIndex] ifFalse: [| selector | selector := selectorIndex < 0 ifTrue: [(coInterpreter specialSelector: -1 - selectorIndex)] ifFalse: [self getLiteral: selectorIndex]. self assert: (objectMemory addressCouldBeOop: selector). (objectMemory isYoung: selector) ifTrue: [hasYoungReferent := true]. cacheValue := selector]. self MoveUniqueC32: cacheValue R: ClassReg! Item was added: + ----- Method: Cogit>>inlineCacheTagsAreIndexes (in category 'in-line cacheing') ----- + inlineCacheTagsAreIndexes + "The Cogit always generates 32-bit inline caches. This implies that in 64-bits there is no room + in an unlinked inline cache for a selector oop. Instead it contains a signed 32-bit index, positive + for selectors in a method's literal frame and negative for selectors in the specialSelectorsOop. + And it implies that linked inline cache entries contain class indices, not class oops." + <inline: true> + ^objectMemory wordSize = 8! Item was changed: ----- Method: Cogit>>inlineCacheValueForSelector:in:at: (in category 'in-line cacheing') ----- inlineCacheValueForSelector: selector in: aCogMethod at: mcpc "Answer the value to put in an inline-cache that is being loaded with the selector. Usually this is simply the selector, but in 64-bits the cache is only 32-bits wide and so the cache is loaded with the index of the selector." <inline: true> + ^self inlineCacheTagsAreIndexes + ifTrue: [self indexForSelector: selector in: aCogMethod at: mcpc] + ifFalse: [selector]! - ^objectMemory wordSize < 8 - ifTrue: [selector] - ifFalse: [self indexForSelector: selector in: aCogMethod at: mcpc]! Item was changed: ----- Method: Cogit>>mapFor:performUntil:arg: (in category 'method map') ----- mapFor: cogMethod performUntil: functionSymbol arg: arg "Unlinking/GC/Disassembly support" <var: #cogMethod type: #'CogMethod *'> <var: #functionSymbol declareC: 'sqInt (*functionSymbol)(sqInt annotation, char *mcpc, sqInt arg)'> <inline: true> | mcpc map mapByte annotation result | mcpc := cogMethod asInteger + cmNoCheckEntryOffset. map := self mapStartFor: cogMethod. + self inlineCacheTagsAreIndexes ifTrue: - objectMemory wordSize = 8 ifTrue: [enumeratingCogMethod := cogMethod]. [(mapByte := objectMemory byteAt: map) ~= MapEnd] whileTrue: [mapByte >= FirstAnnotation ifTrue: [mcpc := mcpc + ((mapByte bitAnd: DisplacementMask) * backEnd codeGranularity). "If this is an IsSendCall annotation, peek ahead for an IsAnnotationExtension, and consume it." ((annotation := mapByte >> AnnotationShift) = IsSendCall and: [(mapByte := objectMemory byteAt: map - 1) >> AnnotationShift = IsAnnotationExtension]) ifTrue: [annotation := annotation + (mapByte bitAnd: DisplacementMask). map := map - 1]. result := self perform: functionSymbol with: annotation with: (self cCoerceSimple: mcpc to: #'char *') with: arg. result ~= 0 ifTrue: [^result]] ifFalse: [mapByte < (IsAnnotationExtension << AnnotationShift) ifTrue: [mcpc := mcpc + ((mapByte - DisplacementX2N << AnnotationShift) * backEnd codeGranularity)]]. map := map - 1]. ^0! Item was changed: ----- Method: Cogit>>mapObjectReferencesInClosedPIC: (in category 'garbage collection') ----- mapObjectReferencesInClosedPIC: cPIC "Remap all object references in the closed PIC. Answer if any references are young. Set codeModified if any modifications are made." <var: #cPIC type: #'CogMethod *'> | pc refersToYoung | pc := self addressOfEndOfCase:1 inCPIC:cPIC. "first we check the potential method oop load at the beginning of the CPIC" refersToYoung := self remapMaybeObjRefInClosedPICAt: pc - backEnd jumpLongByteSize. "We find the end address of the cPICNumCases'th case and can then just step forward by the case size thereafter" pc := self addressOfEndOfCase: cPIC cPICNumCases inCPIC: cPIC. "Next we check the potential class ref in the compare instruction, and the potential method oop load for each case." 2 to: cPIC cPICNumCases do: [:i| + (self inlineCacheTagsAreIndexes not + and: [objectRepresentation inlineCacheTagsMayBeObjects]) ifTrue: - objectRepresentation inlineCacheTagsMayBeObjects ifTrue: [(self remapMaybeObjRefInClosedPICAt: pc - backEnd jumpLongConditionalByteSize) ifTrue: [refersToYoung := true]]. (self remapMaybeObjRefInClosedPICAt: pc - backEnd jumpLongConditionalByteSize - backEnd cmpC32RTempByteSize) ifTrue: [refersToYoung := true]. pc := pc + cPICCaseSize]. ^refersToYoung! Item was changed: ----- Method: Cogit>>offsetCacheTagAndCouldBeObjectAt:annotation:into: (in category 'in-line cacheing') ----- offsetCacheTagAndCouldBeObjectAt: mcpc annotation: annotation into: trinaryBlock "Evaluate trinaryBlock with the entry, inline cache tag and whether the cache tag could be an object, for the send at mcpc with annotation annotation." <inline: true> | cacheTag entryPoint tagCouldBeObj | cacheTag := backEnd inlineCacheTagAt: mcpc asInteger. entryPoint := backEnd callTargetFromReturnAddress: mcpc asInteger. "in-line cache tags are the selectors of sends if sends are unlinked, the selectors of super sends (entry offset = cmNoCheckEntryOffset), the selectors of open PIC sends (entry offset = cmEntryOffset, target is an Open PIC) or in-line cache tags (classes, class indices, immediate bit patterns, etc). Note that selectors can be immediate so there is no guarantee that they are markable/remappable objects." + tagCouldBeObj := self inlineCacheTagsAreIndexes not + and: [objectRepresentation inlineCacheTagsMayBeObjects + or: [entryPoint < methodZoneBase + or: [(entryPoint bitAnd: entryPointMask) = uncheckedEntryAlignment + or: [(entryPoint bitAnd: entryPointMask) = checkedEntryAlignment + and: [(self cCoerceSimple: entryPoint - cmEntryOffset to: #'CogMethod *') cmType = CMOpenPIC]]]]]. - tagCouldBeObj := objectRepresentation inlineCacheTagsMayBeObjects - or: [entryPoint < methodZoneBase - or: [(entryPoint bitAnd: entryPointMask) = uncheckedEntryAlignment - or: [(entryPoint bitAnd: entryPointMask) = checkedEntryAlignment - and: [(self cCoerceSimple: entryPoint - cmEntryOffset to: #'CogMethod *') cmType = CMOpenPIC]]]]. trinaryBlock value: entryPoint value: cacheTag value: tagCouldBeObj! Item was changed: ----- Method: Cogit>>selectorForSendAt:annotation:in: (in category 'simulation only') ----- selectorForSendAt: mcpc annotation: annotation in: aCompiledMethod <doNotGenerate> | entryPoint offset targetMethod selector | entryPoint := backEnd callTargetFromReturnAddress: mcpc asInteger. selector := entryPoint > methodZoneBase ifTrue: "It's a linked send." [self offsetAndSendTableFor: entryPoint annotation: annotation into: [:off :table| offset := off]. targetMethod := self cCoerceSimple: entryPoint - offset to: #'CogMethod *'. targetMethod selector] ifFalse: + [self inlineCacheTagsAreIndexes - [objectMemory wordSize = 8 ifTrue: [self selectorFromSelectorIndex: (backEnd inlineCacheTagAt: mcpc) signedIntFromLong in: aCompiledMethod] ifFalse: [backEnd inlineCacheTagAt: mcpc]]. ^(annotation ~= IsNSSendCall and: [coInterpreter isCurrentImageFacade]) ifTrue: [coInterpreter objectForOop: selector] ifFalse: [selector]! Item was changed: ----- Method: SistaStackToRegisterMappingCogit>>mapFor:bcpc:withAnnotationPerformUntil:arg: (in category 'method map') ----- mapFor: cogMethod bcpc: startbcpc withAnnotationPerformUntil: functionSymbol arg: arg "A version of mapFor:bcpc:performUntil:arg: that passes the annotation instead of the isBackwardBranch flag. Evaluate functionSymbol for each mcpc, bcpc pair in the map until the function returns non-zero, answering that result, or 0 if it fails to. This works only for frameful methods" <var: #cogMethod type: #'CogBlockMethod *'> <var: #functionSymbol declareC: 'sqInt (*functionSymbol)(BytecodeDescriptor *desc, sqInt annotation, char *mcpc, sqInt bcpc, void *arg)'> <var: #arg type: #'void *'> <inline: true> | isInBlock mcpc bcpc endbcpc map mapByte homeMethod aMethodObj result latestContinuation byte descriptor bsOffset nExts annotation | <var: #descriptor type: #'BytecodeDescriptor *'> <var: #homeMethod type: #'CogMethod *'> self assert: cogMethod stackCheckOffset > 0. "In both CMMethod and CMBlock cases find the start of the map and skip forward to the bytecode pc map entry for the stack check." cogMethod cmType = CMMethod ifTrue: [isInBlock := false. homeMethod := self cCoerceSimple: cogMethod to: #'CogMethod *'. self assert: startbcpc = (coInterpreter startPCOfMethodHeader: homeMethod methodHeader). map := self mapStartFor: homeMethod. annotation := (objectMemory byteAt: map) >> AnnotationShift. self assert: (annotation = IsAbsPCReference or: [annotation = IsObjectReference or: [annotation = IsRelativeCall or: [annotation = IsDisplacementX2N]]]). latestContinuation := startbcpc. aMethodObj := homeMethod methodObject. endbcpc := (objectMemory numBytesOf: aMethodObj) - 1. bsOffset := self bytecodeSetOffsetForHeader: homeMethod methodHeader] ifFalse: [isInBlock := true. homeMethod := cogMethod cmHomeMethod. map := self findMapLocationForMcpc: cogMethod asUnsignedInteger + (self sizeof: CogBlockMethod) inMethod: homeMethod. self assert: map ~= 0. annotation := (objectMemory byteAt: map) >> AnnotationShift. self assert: (annotation >> AnnotationShift = HasBytecodePC "fiducial" or: [annotation >> AnnotationShift = IsDisplacementX2N]). [(annotation := (objectMemory byteAt: map) >> AnnotationShift) ~= HasBytecodePC] whileTrue: [map := map - 1]. map := map - 1. "skip fiducial; i.e. the map entry for the pc immediately following the method header." aMethodObj := homeMethod methodObject. bcpc := startbcpc - (self blockCreationBytecodeSizeForHeader: homeMethod methodHeader). bsOffset := self bytecodeSetOffsetForHeader: homeMethod methodHeader. byte := (objectMemory fetchByte: bcpc ofObject: aMethodObj) + bsOffset. descriptor := self generatorAt: byte. endbcpc := self nextBytecodePCFor: descriptor at: bcpc exts: -1 in: aMethodObj]. bcpc := startbcpc. mcpc := cogMethod asUnsignedInteger + cogMethod stackCheckOffset. nExts := 0. + self inlineCacheTagsAreIndexes ifTrue: - objectMemory wordSize = 8 ifTrue: [enumeratingCogMethod := homeMethod]. "The stack check maps to the start of the first bytecode, the first bytecode being effectively after frame build." result := self perform: functionSymbol with: nil with: annotation with: (self cCoerceSimple: mcpc to: #'char *') with: startbcpc with: arg. result ~= 0 ifTrue: [^result]. "Now skip up through the bytecode pc map entry for the stack check." [(objectMemory byteAt: map) >> AnnotationShift ~= HasBytecodePC] whileTrue: [map := map - 1]. map := map - 1. [(mapByte := objectMemory byteAt: map) ~= MapEnd] whileTrue: "defensive; we exit on bcpc" [mapByte >= FirstAnnotation ifTrue: [| nextBcpc | annotation := mapByte >> AnnotationShift. mcpc := mcpc + ((mapByte bitAnd: DisplacementMask) * backEnd codeGranularity). (self isPCMappedAnnotation: annotation) ifTrue: [(annotation = IsSendCall and: [(mapByte := objectMemory byteAt: map - 1) >> AnnotationShift = IsAnnotationExtension]) ifTrue: [annotation := annotation + (mapByte bitAnd: DisplacementMask). map := map - 1]. [byte := (objectMemory fetchByte: bcpc ofObject: aMethodObj) + bsOffset. descriptor := self generatorAt: byte. isInBlock ifTrue: [bcpc >= endbcpc ifTrue: [^0]] ifFalse: [(descriptor isReturn and: [bcpc >= latestContinuation]) ifTrue: [^0]. (descriptor isBranch or: [descriptor isBlockCreation]) ifTrue: [| targetPC | targetPC := self latestContinuationPCFor: descriptor at: bcpc exts: nExts in: aMethodObj. latestContinuation := latestContinuation max: targetPC]]. nextBcpc := self nextBytecodePCFor: descriptor at: bcpc exts: nExts in: aMethodObj. descriptor isMapped or: [isInBlock and: [descriptor isMappedInBlock]]] whileFalse: [bcpc := nextBcpc. nExts := descriptor isExtension ifTrue: [nExts + 1] ifFalse: [0]]. result := self perform: functionSymbol with: descriptor with: annotation with: (self cCoerceSimple: mcpc to: #'char *') with: bcpc with: arg. result ~= 0 ifTrue: [^result]. bcpc := nextBcpc. nExts := descriptor isExtension ifTrue: [nExts + 1] ifFalse: [0]]] ifFalse: [self assert: (mapByte >> AnnotationShift = IsDisplacementX2N or: [mapByte >> AnnotationShift = IsAnnotationExtension]). mapByte < (IsAnnotationExtension << AnnotationShift) ifTrue: [mcpc := mcpc + ((mapByte - DisplacementX2N << AnnotationShift) * backEnd codeGranularity)]]. map := map - 1]. ^0!

1 0

[commit][3620] Add a script that runs the tests of a single test class in a new TestRunner .
by commits＠squeakvm.org 21 Feb '16

21 Feb '16

Revision: 3620 Author: eliot Date: 2016-02-20 17:35:03 -0800 (Sat, 20 Feb 2016) Log Message: ----------- Add a script that runs the tests of a single test class in a new TestRunner. Added Paths: ----------- branches/Cog/image/RunATestClass.st Added: branches/Cog/image/RunATestClass.st =================================================================== --- branches/Cog/image/RunATestClass.st (rev 0) +++ branches/Cog/image/RunATestClass.st 2016-02-21 01:35:03 UTC (rev 3620) @@ -0,0 +1,16 @@ +"Run a single test class in a TestRunner. + Usage: myvm myimage.image RunATestClass.st TheTestClass + A confirmer will appear after the tests have run. Click to exit or not." +| testRunner testClass | +testRunner := TestRunner open model. +testClass := Smalltalk getSystemAttribute: 3. +testRunner + selectNoClasses; + classAt: ((1 to: testRunner classList size) detect: + [:i| (testRunner classList at: i) string endsWith: testClass]) + put: true; + runAll. +(UIManager default confirm: 'Quit?') ifTrue: + [[Smalltalk quit] + on: MessageNotUnderstood + do: [:ex| Smalltalk quitPrimitive]]

1 0

[commit][3619] Include the FFI plugin in the 64-bit linux VMs.
by commits＠squeakvm.org 20 Feb '16

20 Feb '16

Revision: 3619 Author: eliot Date: 2016-02-20 13:25:18 -0800 (Sat, 20 Feb 2016) Log Message: ----------- Include the FFI plugin in the 64-bit linux VMs. Modified Paths: -------------- branches/Cog/build.linux64x64/squeak.cog.spur/plugins.ext branches/Cog/build.linux64x64/squeak.stack.spur/plugins.ext Property Changed: ---------------- branches/Cog/platforms/Cross/vm/sqSCCSVersion.h Modified: branches/Cog/build.linux64x64/squeak.cog.spur/plugins.ext =================================================================== --- branches/Cog/build.linux64x64/squeak.cog.spur/plugins.ext 2016-02-20 20:49:01 UTC (rev 3618) +++ branches/Cog/build.linux64x64/squeak.cog.spur/plugins.ext 2016-02-20 21:25:18 UTC (rev 3619) @@ -2,6 +2,7 @@ # SqueakFFIPrims needs implementing EXTERNAL_PLUGINS = \ B3DAcceleratorPlugin \ +SqueakFFI \ SqueakSSL \ LocalePlugin \ UnicodePlugin \ Modified: branches/Cog/build.linux64x64/squeak.stack.spur/plugins.ext =================================================================== --- branches/Cog/build.linux64x64/squeak.stack.spur/plugins.ext 2016-02-20 20:49:01 UTC (rev 3618) +++ branches/Cog/build.linux64x64/squeak.stack.spur/plugins.ext 2016-02-20 21:25:18 UTC (rev 3619) @@ -2,6 +2,7 @@ # SqueakFFIPrims needs implementing EXTERNAL_PLUGINS = \ B3DAcceleratorPlugin \ +SqueakFFI \ SqueakSSL \ LocalePlugin \ UnicodePlugin \ Property changes on: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h ___________________________________________________________________ Modified: checkindate - Sat Feb 20 12:17:58 PST 2016 + Sat Feb 20 13:24:43 PST 2016

1 0

[commit][3618] Convery int to long in parameter passing in the SurfacePlugin ( nd its client the
by commits＠squeakvm.org 20 Feb '16

20 Feb '16

Revision: 3618 Author: eliot Date: 2016-02-20 12:49:01 -0800 (Sat, 20 Feb 2016) Log Message: ----------- Convery int to long in parameter passing in the SurfacePlugin (nd its client the FFI plugin) to fix issues on 64-bits. Modified Paths: -------------- trunk/platforms/Cross/plugins/SqueakFFIPrims/sqFFI.h trunk/platforms/Cross/plugins/SqueakFFIPrims/sqManualSurface.c trunk/platforms/Cross/plugins/SurfacePlugin/SurfacePlugin.c trunk/platforms/Cross/plugins/SurfacePlugin/SurfacePlugin.h Property Changed: ---------------- trunk/platforms/Cross/plugins/sqPluginsSCCSVersion.h Modified: trunk/platforms/Cross/plugins/SqueakFFIPrims/sqFFI.h =================================================================== --- trunk/platforms/Cross/plugins/SqueakFFIPrims/sqFFI.h 2016-02-20 20:20:49 UTC (rev 3617) +++ trunk/platforms/Cross/plugins/SqueakFFIPrims/sqFFI.h 2016-02-20 20:49:01 UTC (rev 3618) @@ -147,9 +147,9 @@ -1 otherwise. The other return true for success, and false for failure. */ #include "../SurfacePlugin/SurfacePlugin.h" -void initManualSurfaceFunctionPointers(fn_ioRegisterSurface reg, fn_ioUnregisterSurface unreg, fn_ioFindSurface find); -int createManualSurface(int width, int height, int rowPitch, int depth, int isMSB); -int destroyManualSurface(int surfaceID); -int setManualSurfacePointer(int surfaceID, void* ptr); +void initManualSurfaceFunctionPolongers(fn_ioRegisterSurface reg, fn_ioUnregisterSurface unreg, fn_ioFindSurface find); +long createManualSurface(long width, long height, long rowPitch, long depth, long isMSB); +long destroyManualSurface(long surfaceID); +long setManualSurfacePointer(long surfaceID, void* ptr); #endif /* SQ_FFI_H */ Modified: trunk/platforms/Cross/plugins/SqueakFFIPrims/sqManualSurface.c =================================================================== --- trunk/platforms/Cross/plugins/SqueakFFIPrims/sqManualSurface.c 2016-02-20 20:20:49 UTC (rev 3617) +++ trunk/platforms/Cross/plugins/SqueakFFIPrims/sqManualSurface.c 2016-02-20 20:49:01 UTC (rev 3618) @@ -53,10 +53,10 @@ /* Create the dispatch-table that SurfacePlugin will use to interact with instances of "struct ManualSurface" */ -static int manualSurfaceGetFormat(ManualSurface* surface, int* width, int* height, int* depth, int* isMSB); -static void* manualSurfaceLock(ManualSurface* surface, int *pitch, int x, int y, int w, int h); -static int manualSurfaceUnlock(ManualSurface* surface, int x, int y, int w, int h); -static int manualSurfaceShow(ManualSurface* surface, int x, int y, int w, int h); +static long manualSurfaceGetFormat(ManualSurface* surface, long* width, long* height, long* depth, long* isMSB); +static void* manualSurfaceLock(ManualSurface* surface, long *pitch, long x, long y, long w, long h); +static long manualSurfaceUnlock(ManualSurface* surface, long x, long y, long w, long h); +static long manualSurfaceShow(ManualSurface* surface, long x, long y, long w, long h); static sqSurfaceDispatch manualSurfaceDispatch = { 1, 0, @@ -68,16 +68,16 @@ /* sqSurfaceDispatch functions *****************************************************************************/ -int manualSurfaceGetFormat(ManualSurface* surface, int* width, int* height, int* depth, int* isMSB) { +long manualSurfaceGetFormat(ManualSurface* surface, long* width, long* height, long* depth, long* isMSB) { *width = surface->width; *height = surface->height; *depth = surface->depth; *isMSB = surface->isMSB; - DPRINTF(("Getting Surface Format: %lx %d %d %d %d\n", ((int) surface), *width, *height, *depth, *isMSB)); + DPRINTF(("Getting Surface Format: %lx %ld %ld %ld %ld\n", (long) surface, *width, *height, *depth, *isMSB)); return 1; } -void* manualSurfaceLock(ManualSurface* surface, int *pitch, int x, int y, int w, int h) { +void* manualSurfaceLock(ManualSurface* surface, long *pitch, long x, long y, long w, long h) { /* Ideally, would be atomic. But it doens't matter for the forseeable future, since it is only called via BitBlt primitives. */ int wasLocked = surface->isLocked; @@ -94,17 +94,17 @@ /* Success! Return the pointer. */ *pitch = surface->rowPitch; - DPRINTF(("Locked Surface: %lx Input Rect: %d %d %d %d Row Pitch: %d\n", ((int) surface), x, y, w, h, *pitch)); + DPRINTF(("Locked Surface: %lx Input Rect: %ld %ld %ld %ld Row Pitch: %ld\n", (long) surface, x, y, w, h, *pitch)); return surface->ptr; } -int manualSurfaceUnlock(ManualSurface* surface, int x, int y, int w, int h) { +long manualSurfaceUnlock(ManualSurface* surface, long x, long y, long w, long h) { surface->isLocked = 0; - DPRINTF(("Unlocked Surface: %lx Rect: %d %d %d %d\n", ((int) surface), x, y, w, h)); + DPRINTF(("Unlocked Surface: %lx Rect: %ld %ld %ld %ld\n", (long) surface, x, y, w, h)); return 1; } -int manualSurfaceShow(ManualSurface* surface, int x, int y, int w, int h) { +long manualSurfaceShow(ManualSurface* surface, long x, long y, long w, long h) { /* Unsupported */ return 0; } @@ -112,10 +112,9 @@ /* primitive interface functions (i.e. called from Squeak) *********************************************/ /* Answer non-negative surfaceID if successful, and -1 for failure. */ -int createManualSurface(int width, int height, int rowPitch, int depth, int isMSB) { +long createManualSurface(long width, long height, long rowPitch, long depth, long isMSB) { ManualSurface* newSurface; - int surfaceID; - int result; + long surfaceID, result; if (width < 0) return -1; if (height < 0) return -1; @@ -133,32 +132,30 @@ newSurface->ptr = NULL; newSurface->isLocked = FALSE; - result = registerSurface((int)newSurface, &manualSurfaceDispatch, &surfaceID); + result = registerSurface((long)newSurface, &manualSurfaceDispatch, &surfaceID); if (!result) { /* Failed to register surface. */ free(newSurface); return -1; } - else { - return surfaceID; - } + return surfaceID; } -int destroyManualSurface(int surfaceID) { +long destroyManualSurface(long surfaceID) { if (!unregisterSurface) return 0; /* failure... couldn't init function-pointer */ else return unregisterSurface(surfaceID); } -int setManualSurfacePointer(int surfaceID, void* ptr) { - int surfaceHandle; +long setManualSurfacePointer(long surfaceID, void* ptr) { + long surfaceHandle; ManualSurface *surface; - int result; + long result; if (!findSurface) return FALSE; /* failure... couldn't init function-pointer */ result = findSurface(surfaceID, NULL, &surfaceHandle); if (!result) return FALSE; /* failed to find surface */ surface = (ManualSurface*)surfaceHandle; if (surface->isLocked) return FALSE; /* can't set pointer while surface is locked */ surface->ptr = ptr; - DPRINTF(("Set Surface: %lx Pointer: %lx\n", surfaceID, ((int)ptr) )); + DPRINTF(("Set Surface: %lx Polonger: %lx\n", surfaceID, (long)ptr)); return TRUE; } Modified: trunk/platforms/Cross/plugins/SurfacePlugin/SurfacePlugin.c =================================================================== --- trunk/platforms/Cross/plugins/SurfacePlugin/SurfacePlugin.c 2016-02-20 20:20:49 UTC (rev 3617) +++ trunk/platforms/Cross/plugins/SurfacePlugin/SurfacePlugin.c 2016-02-20 20:49:01 UTC (rev 3618) @@ -32,13 +32,13 @@ #endif typedef struct SqueakSurface { - int handle; /* client supplied handle */ + long handle; /* client supplied handle */ sqSurfaceDispatch *dispatch; } SqueakSurface; static SqueakSurface *surfaceArray = NULL; -static int numSurfaces = 0; -static int maxSurfaces = 0; +static long numSurfaces = 0; +static long maxSurfaces = 0; #ifdef SQUEAK_BUILTIN_PLUGIN static const char *moduleName = "SurfacePlugin "__DATE__" (i)"; @@ -51,29 +51,29 @@ #pragma export on /* module initialization/shutdown */ -EXPORT(int) setInterpreter(struct VirtualMachine *interpreterProxy); +EXPORT(long) setInterpreter(struct VirtualMachine *interpreterProxy); EXPORT(const char*) getModuleName(void); -EXPORT(int) initialiseModule(void); -EXPORT(int) shutdownModule(void); +EXPORT(long) initialiseModule(void); +EXPORT(long) shutdownModule(void); /* critical FXBlt entry points */ -EXPORT(int) ioGetSurfaceFormat (int surfaceID, int* width, int* height, int* depth, int* isMSB); -EXPORT(int) ioLockSurface (int surfaceID, int *pitch, int x, int y, int w, int h); -EXPORT(int) ioUnlockSurface(int surfaceID, int x, int y, int w, int h); +EXPORT(long) ioGetSurfaceFormat (long surfaceID, long* width, long* height, long* depth, long* isMSB); +EXPORT(long) ioLockSurface (long surfaceID, long *pitch, long x, long y, long w, long h); +EXPORT(long) ioUnlockSurface(long surfaceID, long x, long y, long w, long h); /* interpreter entry point */ -EXPORT(int) ioShowSurface(int surfaceID, int x, int y, int w, int h); +EXPORT(long) ioShowSurface(long surfaceID, long x, long y, long w, long h); /* client entry points */ -EXPORT(int) ioRegisterSurface(int surfaceHandle, sqSurfaceDispatch *fn, int *surfaceID); -EXPORT(int) ioUnregisterSurface(int surfaceID); -EXPORT(int) ioFindSurface(int surfaceID, sqSurfaceDispatch *fn, int *surfaceHandle); +EXPORT(long) ioRegisterSurface(long surfaceHandle, sqSurfaceDispatch *fn, long *surfaceID); +EXPORT(long) ioUnregisterSurface(long surfaceID); +EXPORT(long) ioFindSurface(long surfaceID, sqSurfaceDispatch *fn, long *surfaceHandle); #pragma export off /* ioGetSurfaceFormat: Return information describing the given surface. Return true if successful, false otherwise. */ -EXPORT(int) ioGetSurfaceFormat (int surfaceID, int* width, int* height, int* depth, int* isMSB) +EXPORT(long) ioGetSurfaceFormat (long surfaceID, long* width, long* height, long* depth, long* isMSB) { SqueakSurface *surface; if(surfaceID < 0 || surfaceID >= maxSurfaces) FAIL; @@ -87,7 +87,7 @@ Lock the bits of the surface. Return a pointer to the actual surface bits, or NULL on failure. */ -EXPORT(int) ioLockSurface (int surfaceID, int *pitch, int x, int y, int w, int h) +EXPORT(long) ioLockSurface (long surfaceID, long *pitch, long x, long y, long w, long h) { SqueakSurface *surface; if(surfaceID < 0 || surfaceID >= maxSurfaces) FAIL; @@ -100,7 +100,7 @@ /* ioUnlockSurface: Unlock the bits of the surface. The return value is ignored. */ -EXPORT(int) ioUnlockSurface(int surfaceID, int x, int y, int w, int h) +EXPORT(long) ioUnlockSurface(long surfaceID, long x, long y, long w, long h) { SqueakSurface *surface; if(surfaceID < 0 || surfaceID >= maxSurfaces) FAIL; @@ -112,7 +112,7 @@ /* ioShowSurface: Transfer the bits of a surface to the screen. */ -EXPORT(int) ioShowSurface(int surfaceID, int x, int y, int w, int h) +EXPORT(long) ioShowSurface(long surfaceID, long x, long y, long w, long h) { SqueakSurface *surface; if(surfaceID < 0 || surfaceID >= maxSurfaces) FAIL; @@ -127,9 +127,9 @@ the set of surface functions. The new ID is returned in surfaceID. Returns true if successful, false otherwise. */ -EXPORT(int) ioRegisterSurface(int surfaceHandle, sqSurfaceDispatch *fn, int *surfaceID) +EXPORT(long) ioRegisterSurface(long surfaceHandle, sqSurfaceDispatch *fn, long *surfaceID) { - int index; + long index; if(!fn) return 0; if(fn->majorVersion != 1 && fn->minorVersion != 0) return 0; @@ -157,7 +157,7 @@ /* ioUnregisterSurface: Unregister the surface with the given handle. Returns true if successful, false otherwise. */ -EXPORT(int) ioUnregisterSurface(int surfaceID) +EXPORT(long) ioUnregisterSurface(long surfaceID) { SqueakSurface *surface; if(surfaceID < 0 || surfaceID >= maxSurfaces) return 0; @@ -174,7 +174,7 @@ the given set of surface functions. The registered handle is returned in surfaceHandle. Return true if successful (e.g., the surface has been found), false otherwise. */ -EXPORT(int) ioFindSurface(int surfaceID, sqSurfaceDispatch *fn, int *surfaceHandle) +EXPORT(long) ioFindSurface(long surfaceID, sqSurfaceDispatch *fn, long *surfaceHandle) { SqueakSurface *surface; if(surfaceID < 0 || surfaceID >= maxSurfaces) return 0; @@ -185,8 +185,8 @@ return 1; } -EXPORT(int) setInterpreter(struct VirtualMachine* anInterpreter) { - int ok; +EXPORT(long) setInterpreter(struct VirtualMachine* anInterpreter) { + long ok; interpreterProxy = anInterpreter; ok = interpreterProxy->majorVersion() == VM_PROXY_MAJOR; @@ -200,14 +200,14 @@ return moduleName; } -EXPORT(int) initialiseModule() { +EXPORT(long) initialiseModule() { surfaceArray = NULL; numSurfaces = 0; maxSurfaces = 0; return 1; } -EXPORT(int) shutdownModule() { +EXPORT(long) shutdownModule() { /* This module can only be shut down if no surfaces are registered */ if(numSurfaces != 0) return 0; free(surfaceArray); @@ -230,4 +230,3 @@ {NULL, NULL, NULL} }; #endif /* ifdef SQ_BUILTIN_PLUGIN */ - Modified: trunk/platforms/Cross/plugins/SurfacePlugin/SurfacePlugin.h =================================================================== --- trunk/platforms/Cross/plugins/SurfacePlugin/SurfacePlugin.h 2016-02-20 20:20:49 UTC (rev 3617) +++ trunk/platforms/Cross/plugins/SurfacePlugin/SurfacePlugin.h 2016-02-20 20:49:01 UTC (rev 3618) @@ -6,17 +6,17 @@ /* Plugins creating their own surfaces must register these using the following set of functions. The typedefs are for easier casts. */ -typedef int (*fn_getSurfaceFormat)(int surfaceHandle, int* width, int* height, int* depth, int* isMSB); -typedef int (*fn_lockSurface)(int surfaceHandle, int *pitch, int x, int y, int w, int h); -typedef int (*fn_unlockSurface)(int surfaceHandle, int x, int y, int w, int h); -typedef int (*fn_showSurface)(int surfaceHandle, int x, int y, int w, int h); +typedef long (*fn_getSurfaceFormat)(long surfaceHandle, long* width, long* height, long* depth, long* isMSB); +typedef long (*fn_lockSurface)(long surfaceHandle, long *pitch, long x, long y, long w, long h); +typedef long (*fn_unlockSurface)(long surfaceHandle, long x, long y, long w, long h); +typedef long (*fn_showSurface)(long surfaceHandle, long x, long y, long w, long h); typedef struct sqSurfaceDispatch { /* Version information. Must be provided by the client so the surface manager can check if certain operations are supported. */ - int majorVersion; - int minorVersion; + long majorVersion; + long minorVersion; /* Version 1.0 */ fn_getSurfaceFormat getSurfaceFormat; @@ -27,14 +27,14 @@ /* The functions for sqSurfaceDispatch are: - int getSurfaceFormat(int handle, int* width, int* height, int* depth, int* isMSB); + long getSurfaceFormat(long handle, long* width, long* height, long* depth, long* isMSB); Return general information about the OS drawing surface. Return true if successful, false otherwise. The returned values describe the basic properties such as width, height, depth and LSB vs. MSB pixels. - int lockSurface(int handle, int *pitch, int x, int y, int w, int h); + long lockSurface(long handle, long *pitch, long x, long y, long w, long h); Lock the bits of the surface. Return a pointer to the actual surface bits, or NULL on failure. If successful, store the pitch of the surface (e.g., the bytes @@ -65,14 +65,14 @@ be inside the source and dest boundingBox) but it is not aligned to word boundaries yet. It is up to the support code to compute accurate alignment if necessary. - int unlockSurface(int handle, int x, int y, int w, int h); + long unlockSurface(long handle, long x, long y, long w, long h); Unlock the bits of a (possibly modified) surface after BitBlt completed. The return value is ignored. The arguments provided specify the dirty region of the surface. If the surface is unmodified all arguments are set to zero. - int showSurface(int handle, int x, int y, int w, int h); + long showSurface(long handle, long x, long y, long w, long h); Display the contents of the surface on the actual screen. If ioShowSurface() is called the surface in question represents @@ -81,9 +81,9 @@ FXBlt uses a variant of the above functions which are exported from the surface plugin: - int ioGetSurfaceFormat(int surfaceID, int* width, int* height, int* depth, int* isMSB); - int ioLockSurface(int surfaceID, int *pitch, int x, int y, int w, int h); - int ioUnlockSurface(int surfaceID, int x, int y, int w, int h); + long ioGetSurfaceFormat(long surfaceID, long* width, long* height, long* depth, long* isMSB); + long ioLockSurface(long surfaceID, long *pitch, long x, long y, long w, long h); + long ioUnlockSurface(long surfaceID, long x, long y, long w, long h); These functions are looked up in the registered surfaces and invoked as appropriate. The meaning of all values is exactly the same as for @@ -93,7 +93,7 @@ Interpreter itself uses a separate entry point for updating the display - int ioShowSurface(int surfaceID, int x, int y, int w, int h); + long ioShowSurface(long surfaceID, long x, long y, long w, long h); since the management of deferred updates is currently an intrinsic property of the VM (which is bad - deferred updates should be a @@ -104,17 +104,17 @@ /* The following are the entry points for the surface manager: - int ioRegisterSurface(int surfaceHandle, sqSurfaceDispatch *fn, int *surfaceID); + long ioRegisterSurface(long surfaceHandle, sqSurfaceDispatch *fn, long *surfaceID); Register a new surface with the given handle and the set of surface functions. The new ID is returned in surfaceID. Returns true if successful, false otherwise. - int ioUnregisterSurface(int surfaceID); + long ioUnregisterSurface(long surfaceID); Unregister the surface with the given handle. Returns true if successful, false otherwise. - int ioFindSurface(int surfaceID, sqSurfaceDispatch *fn, int *surfaceHandle); + long ioFindSurface(long surfaceID, sqSurfaceDispatch *fn, long *surfaceHandle); Find the surface with the given ID, and, optionally, the given set of surface functions. The registered handle is returned in surfaceHandle. Return true if successful @@ -124,8 +124,8 @@ interpreterProxy->ioLoadFunctionFrom("ioRegisterSurface","SurfacePlugin"); The typedefs below are for easier casts. */ -typedef int (*fn_ioRegisterSurface)(int surfaceHandle, sqSurfaceDispatch *fn, int *surfaceID); -typedef int (*fn_ioUnregisterSurface)(int surfaceID); -typedef int (*fn_ioFindSurface)(int surfaceID, sqSurfaceDispatch *fn, int *surfaceHandle); +typedef long (*fn_ioRegisterSurface)(long surfaceHandle, sqSurfaceDispatch *fn, long *surfaceID); +typedef long (*fn_ioUnregisterSurface)(long surfaceID); +typedef long (*fn_ioFindSurface)(long surfaceID, sqSurfaceDispatch *fn, long *surfaceHandle); #endif /* __SQ_DRAW_SURFACE_H */ Property changes on: trunk/platforms/Cross/plugins/sqPluginsSCCSVersion.h ___________________________________________________________________ Modified: checkindate - Fri Feb 19 16:18:52 PST 2016 + Sat Feb 20 12:48:09 PST 2016

1 0

[commit][3617] CogVM source as per VMMaker.oscog-eem.1687
by commits＠squeakvm.org 20 Feb '16

20 Feb '16

Revision: 3617 Author: eliot Date: 2016-02-20 12:20:49 -0800 (Sat, 20 Feb 2016) Log Message: ----------- CogVM source as per VMMaker.oscog-eem.1687 Spur: Fix bug in markAndTraceWeaklingsFrom:. Fields of weaklings may be immediate so must use followOopField:ofObject: not followObjField:ofObject:. Slang: Emit constants before types to allow constant names to be used when defining types, e.g. for array extents. Threaded FFI plugin: Use above facility for neater declarations. First cut (untested) of FFI support for x86-64 on System V and WIN64, as X64SysVFFIPlugin.c & X64Win64FFIPlugin.c. Surface Plugin: Change int to long throughout parameter passing (but not the Surface struct itself) to solve issues on 64-bits. Mac OS: remember localizable strings versions for Pharo and Newspeak. Change some (int) casts to (long) or non casts in OpenGL and event code, again to avoid issues on 64-bits. Modified Paths: -------------- branches/Cog/build.macos64x64/pharo.cog.spur/plugins.ext branches/Cog/build.macos64x64/squeak.cog.spur/plugins.ext branches/Cog/build.macos64x64/squeak.sista.spur/plugins.ext branches/Cog/build.macos64x64/squeak.stack.spur/plugins.ext branches/Cog/nsspur64src/vm/cogit.h branches/Cog/nsspur64src/vm/cogitX64.c branches/Cog/nsspur64src/vm/cointerp.c branches/Cog/nsspur64src/vm/cointerp.h branches/Cog/nsspur64src/vm/gcc3x-cointerp.c branches/Cog/nsspursrc/vm/cogit.h branches/Cog/nsspursrc/vm/cogitARMv5.c branches/Cog/nsspursrc/vm/cogitIA32.c branches/Cog/nsspursrc/vm/cogitMIPSEL.c branches/Cog/nsspursrc/vm/cointerp.c branches/Cog/nsspursrc/vm/cointerp.h branches/Cog/nsspursrc/vm/gcc3x-cointerp.c branches/Cog/nsspurstack64src/vm/gcc3x-interp.c branches/Cog/nsspurstack64src/vm/interp.c branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c branches/Cog/nsspurstacksrc/vm/interp.c branches/Cog/platforms/iOS/vm/OSX/sqSqueakOSXApplication+events.m branches/Cog/platforms/iOS/vm/OSX/sqSqueakOSXOpenGLView.m branches/Cog/scripts/uploadvms branches/Cog/spur64src/vm/cogit.h branches/Cog/spur64src/vm/cogitX64.c branches/Cog/spur64src/vm/cointerp.c branches/Cog/spur64src/vm/cointerp.h branches/Cog/spur64src/vm/gcc3x-cointerp.c branches/Cog/spursistasrc/vm/cogit.h branches/Cog/spursistasrc/vm/cogitARMv5.c branches/Cog/spursistasrc/vm/cogitIA32.c branches/Cog/spursistasrc/vm/cogitMIPSEL.c branches/Cog/spursistasrc/vm/cointerp.c branches/Cog/spursistasrc/vm/cointerp.h branches/Cog/spursistasrc/vm/gcc3x-cointerp.c branches/Cog/spursrc/vm/cogit.h branches/Cog/spursrc/vm/cogitARMv5.c branches/Cog/spursrc/vm/cogitIA32.c branches/Cog/spursrc/vm/cogitMIPSEL.c branches/Cog/spursrc/vm/cointerp.c branches/Cog/spursrc/vm/cointerp.h branches/Cog/spursrc/vm/gcc3x-cointerp.c branches/Cog/spurstack64src/vm/gcc3x-interp.c branches/Cog/spurstack64src/vm/interp.c branches/Cog/spurstacksrc/vm/gcc3x-interp.c branches/Cog/spurstacksrc/vm/interp.c branches/Cog/src/plugins/IA32ABI/IA32ABI.c branches/Cog/src/plugins/SqueakFFIPrims/ARM32FFIPlugin.c branches/Cog/src/plugins/SqueakFFIPrims/IA32FFIPlugin.c branches/Cog/src/plugins/SqueakFFIPrims/SqueakFFIPrims.c branches/Cog/src/vm/cogit.h branches/Cog/src/vm/cogitARMv5.c branches/Cog/src/vm/cogitIA32.c branches/Cog/src/vm/cogitMIPSEL.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/stacksrc/vm/gcc3x-interp.c branches/Cog/stacksrc/vm/interp.c Added Paths: ----------- branches/Cog/platforms/iOS/vm/Common/English.lproj/Newspeak-Localizable.strings branches/Cog/platforms/iOS/vm/Common/English.lproj/Pharo-Localizable.strings branches/Cog/src/plugins/SqueakFFIPrims/X64SysVFFIPlugin.c branches/Cog/src/plugins/SqueakFFIPrims/X64Win64FFIPlugin.c Property Changed: ---------------- branches/Cog/platforms/Cross/vm/sqSCCSVersion.h Modified: branches/Cog/build.macos64x64/pharo.cog.spur/plugins.ext =================================================================== --- branches/Cog/build.macos64x64/pharo.cog.spur/plugins.ext 2016-02-20 00:19:08 UTC (rev 3616) +++ branches/Cog/build.macos64x64/pharo.cog.spur/plugins.ext 2016-02-20 20:20:49 UTC (rev 3617) @@ -4,6 +4,6 @@ FloatArrayPlugin \ FloatMathPlugin \ Mpeg3Plugin \ +SqueakFFIPrims \ SqueakSSL \ -UnixOSProcessPlugin \ -# SqueakFFIPrims +UnixOSProcessPlugin Modified: branches/Cog/build.macos64x64/squeak.cog.spur/plugins.ext =================================================================== --- branches/Cog/build.macos64x64/squeak.cog.spur/plugins.ext 2016-02-20 00:19:08 UTC (rev 3616) +++ branches/Cog/build.macos64x64/squeak.cog.spur/plugins.ext 2016-02-20 20:20:49 UTC (rev 3617) @@ -5,6 +5,6 @@ FloatArrayPlugin \ FloatMathPlugin \ Mpeg3Plugin \ +SqueakFFIPrims \ SqueakSSL \ -UnixOSProcessPlugin \ -# SqueakFFIPrims +UnixOSProcessPlugin Modified: branches/Cog/build.macos64x64/squeak.sista.spur/plugins.ext =================================================================== --- branches/Cog/build.macos64x64/squeak.sista.spur/plugins.ext 2016-02-20 00:19:08 UTC (rev 3616) +++ branches/Cog/build.macos64x64/squeak.sista.spur/plugins.ext 2016-02-20 20:20:49 UTC (rev 3617) @@ -5,6 +5,6 @@ FloatArrayPlugin \ FloatMathPlugin \ Mpeg3Plugin \ +SqueakFFIPrims \ SqueakSSL \ -UnixOSProcessPlugin \ -# SqueakFFIPrims +UnixOSProcessPlugin Modified: branches/Cog/build.macos64x64/squeak.stack.spur/plugins.ext =================================================================== --- branches/Cog/build.macos64x64/squeak.stack.spur/plugins.ext 2016-02-20 00:19:08 UTC (rev 3616) +++ branches/Cog/build.macos64x64/squeak.stack.spur/plugins.ext 2016-02-20 20:20:49 UTC (rev 3617) @@ -5,6 +5,6 @@ FloatArrayPlugin \ FloatMathPlugin \ Mpeg3Plugin \ +SqueakFFIPrims \ SqueakSSL \ -UnixOSProcessPlugin \ -# SqueakFFIPrims +UnixOSProcessPlugin Modified: branches/Cog/nsspur64src/vm/cogit.h =================================================================== --- branches/Cog/nsspur64src/vm/cogit.h 2016-02-20 00:19:08 UTC (rev 3616) +++ branches/Cog/nsspur64src/vm/cogit.h 2016-02-20 20:20:49 UTC (rev 3617) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.1680 uuid: 6fe34e1e-a5e0-4966-a2cd-3f21ccb0bde9 + CCodeGenerator VMMaker.oscog-eem.1685 uuid: 59633283-8843-4826-a68a-b23ea22d1fa8 */ Modified: branches/Cog/nsspur64src/vm/cogitX64.c =================================================================== --- branches/Cog/nsspur64src/vm/cogitX64.c 2016-02-20 00:19:08 UTC (rev 3616) +++ branches/Cog/nsspur64src/vm/cogitX64.c 2016-02-20 20:20:49 UTC (rev 3617) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.1677 uuid: 7056bb77-6aa0-4cb6-aa6c-cd921c231d37 + CCodeGenerator VMMaker.oscog-eem.1685 uuid: 59633283-8843-4826-a68a-b23ea22d1fa8 from - StackToRegisterMappingCogit VMMaker.oscog-eem.1677 uuid: 7056bb77-6aa0-4cb6-aa6c-cd921c231d37 + StackToRegisterMappingCogit VMMaker.oscog-eem.1685 uuid: 59633283-8843-4826-a68a-b23ea22d1fa8 */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1677 uuid: 7056bb77-6aa0-4cb6-aa6c-cd921c231d37 " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1685 uuid: 59633283-8843-4826-a68a-b23ea22d1fa8 " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -21,95 +21,7 @@ #endif #include "cogit.h" -typedef struct _AbstractInstruction { - unsigned char opcode; - unsigned char machineCodeSize; - unsigned char maxSize; - unsigned char annotation; - unsigned long operands [3]; - unsigned long address; - struct _AbstractInstruction *dependent; - unsigned char machineCode [14]; - } AbstractInstruction; -#define CogInLineLiteralsX64Compiler AbstractInstruction -#define CogX64Compiler AbstractInstruction -#define CogAbstractInstruction AbstractInstruction - - -typedef struct { - AbstractInstruction *fakeHeader; - AbstractInstruction *fillInstruction; - sqInt numArgs; - sqInt numCopied; - sqInt numInitialNils; - sqInt startpc; - AbstractInstruction *entryLabel; - AbstractInstruction *stackCheckLabel; - sqInt span; - sqInt hasInstVarRef; - } BlockStart; - -#define CogBlockStart BlockStart - - -typedef struct _BytecodeDescriptor { - sqInt (*generator )(void); - sqInt (*spanFunction )(struct _BytecodeDescriptor *,sqInt,sqInt,sqInt); - sqInt (*needsFrameFunction )(sqInt); - signed char stackDelta; - unsigned char opcode; - unsigned char numBytes; - unsigned isBranchTrue : 1; - unsigned isBranchFalse : 1; - unsigned isReturn : 1; - unsigned isBlockCreation : 1; - unsigned isMapped : 1; - unsigned isMappedInBlock : 1; - unsigned isExtension : 1; - unsigned isInstVarRef : 1; - unsigned hasIRC : 1; - } BytecodeDescriptor; - -#define CogBytecodeDescriptor BytecodeDescriptor - - -typedef struct { - sqInt (*primitiveGenerator )(void); - sqInt primNumArgs; - } PrimitiveDescriptor; - -#define CogPrimitiveDescriptor PrimitiveDescriptor - - -typedef struct { - AbstractInstruction *targetInstruction; - sqInt instructionIndex; - sqInt simStackPtr; - } BytecodeFixup; - -#define CogSSBytecodeFixup BytecodeFixup -#define CogBytecodeFixup BytecodeFixup - - -typedef struct { - char type; - char spilled; - char annotateUse; - sqInt registerr; - sqInt offset; - sqInt constant; - sqInt bcptr; - } CogSimStackEntry; - - -typedef struct { - sqInt isReceiverResultRegLive; - CogSimStackEntry *ssEntry; - } CogSSOptStatus; - - - /*** Constants ***/ #define ABI SysV #define AddCqR 95 @@ -379,7 +291,95 @@ #define XorRR 93 #define YoungSelectorInPIC -5 +typedef struct _AbstractInstruction { + unsigned char opcode; + unsigned char machineCodeSize; + unsigned char maxSize; + unsigned char annotation; + unsigned long operands [3]; + unsigned long address; + struct _AbstractInstruction *dependent; + unsigned char machineCode [14]; + } AbstractInstruction; +#define CogInLineLiteralsX64Compiler AbstractInstruction +#define CogX64Compiler AbstractInstruction +#define CogAbstractInstruction AbstractInstruction + + +typedef struct { + AbstractInstruction *fakeHeader; + AbstractInstruction *fillInstruction; + sqInt numArgs; + sqInt numCopied; + sqInt numInitialNils; + sqInt startpc; + AbstractInstruction *entryLabel; + AbstractInstruction *stackCheckLabel; + sqInt span; + sqInt hasInstVarRef; + } BlockStart; + +#define CogBlockStart BlockStart + + +typedef struct _BytecodeDescriptor { + sqInt (*generator )(void); + sqInt (*spanFunction )(struct _BytecodeDescriptor *,sqInt,sqInt,sqInt); + sqInt (*needsFrameFunction )(sqInt); + signed char stackDelta; + unsigned char opcode; + unsigned char numBytes; + unsigned isBranchTrue : 1; + unsigned isBranchFalse : 1; + unsigned isReturn : 1; + unsigned isBlockCreation : 1; + unsigned isMapped : 1; + unsigned isMappedInBlock : 1; + unsigned isExtension : 1; + unsigned isInstVarRef : 1; + unsigned hasIRC : 1; + } BytecodeDescriptor; + +#define CogBytecodeDescriptor BytecodeDescriptor + + +typedef struct { + sqInt (*primitiveGenerator )(void); + sqInt primNumArgs; + } PrimitiveDescriptor; + +#define CogPrimitiveDescriptor PrimitiveDescriptor + + +typedef struct { + AbstractInstruction *targetInstruction; + sqInt instructionIndex; + sqInt simStackPtr; + } BytecodeFixup; + +#define CogSSBytecodeFixup BytecodeFixup +#define CogBytecodeFixup BytecodeFixup + + +typedef struct { + char type; + char spilled; + char annotateUse; + sqInt registerr; + sqInt offset; + sqInt constant; + sqInt bcptr; + } CogSimStackEntry; + + +typedef struct { + sqInt isReceiverResultRegLive; + CogSimStackEntry *ssEntry; + } CogSSOptStatus; + + + /*** Function Prototypes ***/ Modified: branches/Cog/nsspur64src/vm/cointerp.c =================================================================== --- branches/Cog/nsspur64src/vm/cointerp.c 2016-02-20 00:19:08 UTC (rev 3616) +++ branches/Cog/nsspur64src/vm/cointerp.c 2016-02-20 20:20:49 UTC (rev 3617) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1680 uuid: 6fe34e1e-a5e0-4966-a2cd-3f21ccb0bde9 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1685 uuid: 59633283-8843-4826-a68a-b23ea22d1fa8 from - CoInterpreter VMMaker.oscog-eem.1680 uuid: 6fe34e1e-a5e0-4966-a2cd-3f21ccb0bde9 + CoInterpreter VMMaker.oscog-eem.1685 uuid: 59633283-8843-4826-a68a-b23ea22d1fa8 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1680 uuid: 6fe34e1e-a5e0-4966-a2cd-3f21ccb0bde9 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1685 uuid: 59633283-8843-4826-a68a-b23ea22d1fa8 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -77,55 +77,7 @@ /* end StackInterpreter class>>preambleCCode */ -typedef struct { - usqInt segStart; - usqInt segSize; - sqInt swizzle; - usqInt containsPinned; - usqInt savedSegSize; - usqInt lastFreeObject; - } SpurSegmentInfo; - -typedef struct { - usqInt start; - usqInt limit; - } SpurNewSpaceSpace; - - -typedef struct { - usqInt start; - usqInt limit; - usqInt first; - usqInt last; - } SpurCircularBuffer; - - -typedef struct { - usqInt start; - usqInt limit; - usqInt top; - } SpurContiguousObjStack; - - -typedef struct _StackPage { - char *stackLimit; - char *headSP; - char *headFP; - char *baseFP; - char *baseAddress; - char *realStackLimit; - char *lastAddress; - int trace; - int padToWord; - struct _StackPage *nextPage; - struct _StackPage *prevPage; - } StackPage; - -#define CogStackPage StackPage - - - /*** Constants ***/ #define AccessModifierPrivate 1 #define AccessModifierProtected 2 @@ -411,7 +363,55 @@ #define XIndex 0 #define YIndex 1 +typedef struct { + usqInt segStart; + usqInt segSize; + sqInt swizzle; + usqInt containsPinned; + usqInt savedSegSize; + usqInt lastFreeObject; + } SpurSegmentInfo; + +typedef struct { + usqInt start; + usqInt limit; + } SpurNewSpaceSpace; + + +typedef struct { + usqInt start; + usqInt limit; + usqInt first; + usqInt last; + } SpurCircularBuffer; + + +typedef struct { + usqInt start; + usqInt limit; + usqInt top; + } SpurContiguousObjStack; + + +typedef struct _StackPage { + char *stackLimit; + char *headSP; + char *headFP; + char *baseFP; + char *baseAddress; + char *realStackLimit; + char *lastAddress; + int trace; + int padToWord; + struct _StackPage *nextPage; + struct _StackPage *prevPage; + } StackPage; + +#define CogStackPage StackPage + + + /*** Function Prototypes ***/ @@ -2442,7 +2442,7 @@ /*560*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, 0, 0, 0,-1,-1 }; char expensiveAsserts = 0; -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.1680"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.1685"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -17850,7 +17850,7 @@ static sqInt checkForAndFollowForwardedPrimitiveState(void) { DECL_MAYBE_SQ_GLOBAL_STRUCT - sqInt accessorDepth; + signed char accessorDepth; sqInt firstBytecode; sqInt found; sqInt found1; @@ -60616,12 +60616,12 @@ sqInt objOop1; sqInt objOop11; sqInt objOop12; - sqInt objOop13; sqInt objStackPage; sqInt objToScan; sqInt objToScan1; sqInt objToScan2; sqInt oop; + sqInt oop1; sqInt p; usqInt ptr; sqInt scanLargeObject; @@ -60664,13 +60664,13 @@ assert(!((isForwarded(weakling)))); markAndTraceClassOf(weakling); for (i = 0, iLimiT = ((numStrongSlotsOfWeakling(weakling)) - 1); i <= iLimiT; i += 1) { - /* begin followObjField:ofObject: */ - objOop = longAt((weakling + BaseHeaderSize) + (((long)i) << (shiftForWord()))); - assert(isNonImmediate(objOop)); - if (((longAt(objOop)) & ((classIndexMask()) - (isForwardedObjectClassIndexPun()))) == 0) { - objOop = fixFollowedFieldofObjectwithInitialValue(i, weakling, objOop); + /* begin followOopField:ofObject: */ + oop = longAt((weakling + BaseHeaderSize) + (((long)i) << (shiftForWord()))); + if (((oop & (tagMask())) == 0) + && (((longAt(oop)) & (classIndexMask())) == (isForwardedObjectClassIndexPun()))) { + oop = fixFollowedFieldofObjectwithInitialValue(i, weakling, oop); } - field = objOop; + field = oop; if (!(((field & (tagMask())) != 0) || (((((usqInt) (longAt(field))) >> 55) & 1) != 0))) { /* begin markAndTrace: */ @@ -60755,9 +60755,9 @@ } if (fmt == (weakArrayFormat())) { /* begin fixedFieldsOfClass: */ - objOop11 = fetchClassOfNonImm(objToScan); + objOop1 = fetchClassOfNonImm(objToScan); /* begin fixedFieldsOfClassFormat: */ - numStrongSlots = (((longAt((objOop11 + BaseHeaderSize) + (((long)InstanceSpecificationIndex) << (shiftForWord())))) >> 3)) & ((1LL << (fixedFieldsFieldWidth())) - 1); + numStrongSlots = (((longAt((objOop1 + BaseHeaderSize) + (((long)InstanceSpecificationIndex) << (shiftForWord())))) >> 3)) & ((1LL << (fixedFieldsFieldWidth())) - 1); goto l20; } } @@ -60954,16 +60954,16 @@ ptr = ((GIV(unscannedEphemerons).top)) - BytesPerWord; while (ptr >= ((GIV(unscannedEphemerons).start))) { /* begin followedKeyOfEphemeron: */ - objOop1 = (ephemeron = longAt(ptr)); - assert((isNonImmediate(objOop1)) - && (isEphemeron(objOop1))); + objOop = (ephemeron = longAt(ptr)); + assert((isNonImmediate(objOop)) + && (isEphemeron(objOop))); /* begin followOopField:ofObject: */ - oop = longAt((objOop1 + BaseHeaderSize) + (0LL << (shiftForWord()))); - if (((oop & (tagMask())) == 0) - && (((longAt(oop)) & (classIndexMask())) == (isForwardedObjectClassIndexPun()))) { - oop = fixFollowedFieldofObjectwithInitialValue(0, objOop1, oop); + oop1 = longAt((objOop + BaseHeaderSize) + (0LL << (shiftForWord()))); + if (((oop1 & (tagMask())) == 0) + && (((longAt(oop1)) & (classIndexMask())) == (isForwardedObjectClassIndexPun()))) { + oop1 = fixFollowedFieldofObjectwithInitialValue(0, objOop, oop1); } - key = oop; + key = oop1; /* begin markAndTrace: */ /* inline markAndShouldScan: */ @@ -61046,9 +61046,9 @@ } if (fmt1 == (weakArrayFormat())) { /* begin fixedFieldsOfClass: */ - objOop12 = fetchClassOfNonImm(objToScan1); + objOop11 = fetchClassOfNonImm(objToScan1); /* begin fixedFieldsOfClassFormat: */ - numStrongSlots1 = (((longAt((objOop12 + BaseHeaderSize) + (((long)InstanceSpecificationIndex) << (shiftForWord())))) >> 3)) & ((1LL << (fixedFieldsFieldWidth())) - 1); + numStrongSlots1 = (((longAt((objOop11 + BaseHeaderSize) + (((long)InstanceSpecificationIndex) << (shiftForWord())))) >> 3)) & ((1LL << (fixedFieldsFieldWidth())) - 1); goto l13; } } @@ -61292,9 +61292,9 @@ } if (fmt2 == (weakArrayFormat())) { /* begin fixedFieldsOfClass: */ - objOop13 = fetchClassOfNonImm(objToScan2); + objOop12 = fetchClassOfNonImm(objToScan2); /* begin fixedFieldsOfClassFormat: */ - numStrongSlots2 = (((longAt((objOop13 + BaseHeaderSize) + (((long)InstanceSpecificationIndex) << (shiftForWord())))) >> 3)) & ((1LL << (fixedFieldsFieldWidth())) - 1); + numStrongSlots2 = (((longAt((objOop12 + BaseHeaderSize) + (((long)InstanceSpecificationIndex) << (shiftForWord())))) >> 3)) & ((1LL << (fixedFieldsFieldWidth())) - 1); goto l15; } } @@ -61536,7 +61536,7 @@ usqInt prevFree; usqInt prevFreeChunk; usqInt prevPrevFree; - sqInt prevPrevFreeChunk; + usqInt prevPrevFreeChunk; sqInt slotBytes; sqInt slotBytes1; usqInt there; @@ -66901,7 +66901,7 @@ bridgeFromto(SpurSegmentInfo *aSegment, SpurSegmentInfo *nextSegmentOrNil) { usqInt bridgeSpan; - sqInt clifton; + usqInt clifton; usqInt segEnd; segEnd = ((aSegment->segSize)) + ((aSegment->segStart)); @@ -67144,7 +67144,7 @@ sqInt limit; sqInt newEndOfMemory; sqInt next; - sqInt node; + usqInt node; usqInt numSlots; usqInt numSlots1; SpurSegmentInfo *seg; @@ -67273,7 +67273,7 @@ static sqInt NoDbgRegParms readHeapFromImageFiledataBytes(sqImageFile f, sqInt numBytes) { DECL_MAYBE_SQ_GLOBAL_STRUCT - usqInt bridge; + sqInt bridge; usqInt bridgehead; usqLong bridgeSpan; sqInt bytesRead; Modified: branches/Cog/nsspur64src/vm/cointerp.h =================================================================== --- branches/Cog/nsspur64src/vm/cointerp.h 2016-02-20 00:19:08 UTC (rev 3616) +++ branches/Cog/nsspur64src/vm/cointerp.h 2016-02-20 20:20:49 UTC (rev 3617) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1680 uuid: 6fe34e1e-a5e0-4966-a2cd-3f21ccb0bde9 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1685 uuid: 59633283-8843-4826-a68a-b23ea22d1fa8 */ Modified: branches/Cog/nsspur64src/vm/gcc3x-cointerp.c =================================================================== --- branches/Cog/nsspur64src/vm/gcc3x-cointerp.c 2016-02-20 00:19:08 UTC (rev 3616) +++ branches/Cog/nsspur64src/vm/gcc3x-cointerp.c 2016-02-20 20:20:49 UTC (rev 3617) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1680 uuid: 6fe34e1e-a5e0-4966-a2cd-3f21ccb0bde9 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1685 uuid: 59633283-8843-4826-a68a-b23ea22d1fa8 from - CoInterpreter VMMaker.oscog-eem.1680 uuid: 6fe34e1e-a5e0-4966-a2cd-3f21ccb0bde9 + CoInterpreter VMMaker.oscog-eem.1685 uuid: 59633283-8843-4826-a68a-b23ea22d1fa8 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1680 uuid: 6fe34e1e-a5e0-4966-a2cd-3f21ccb0bde9 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1685 uuid: 59633283-8843-4826-a68a-b23ea22d1fa8 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -80,55 +80,7 @@ /* end StackInterpreter class>>preambleCCode */ -typedef struct { - usqInt segStart; - usqInt segSize; - sqInt swizzle; - usqInt containsPinned; - usqInt savedSegSize; - usqInt lastFreeObject; - } SpurSegmentInfo; - -typedef struct { - usqInt start; - usqInt limit; - } SpurNewSpaceSpace; - - -typedef struct { - usqInt start; - usqInt limit; - usqInt first; - usqInt last; - } SpurCircularBuffer; - - -typedef struct { - usqInt start; - usqInt limit; - usqInt top; - } SpurContiguousObjStack; - - -typedef struct _StackPage { - char *stackLimit; - char *headSP; - char *headFP; - char *baseFP; - char *baseAddress; - char *realStackLimit; - char *lastAddress; - int trace; - int padToWord; - struct _StackPage *nextPage; - struct _StackPage *prevPage; - } StackPage; - -#define CogStackPage StackPage - - - /*** Constants ***/ #define AccessModifierPrivate 1 #define AccessModifierProtected 2 @@ -414,7 +366,55 @@ #define XIndex 0 #define YIndex 1 +typedef struct { + usqInt segStart; + usqInt segSize; + sqInt swizzle; + usqInt containsPinned; + usqInt savedSegSize; + usqInt lastFreeObject; + } SpurSegmentInfo; + +typedef struct { + usqInt start; + usqInt limit; + } SpurNewSpaceSpace; + + +typedef struct { + usqInt start; + usqInt limit; + usqInt first; + usqInt last; + } SpurCircularBuffer; + + +typedef struct { + usqInt start; + usqInt limit; + usqInt top; + } SpurContiguousObjStack; + + +typedef struct _StackPage { + char *stackLimit; + char *headSP; + char *headFP; + char *baseFP; + char *baseAddress; + char *realStackLimit; + char *lastAddress; + int trace; + int padToWord; + struct _StackPage *nextPage; + struct _StackPage *prevPage; + } StackPage; + +#define CogStackPage StackPage + + + /*** Function Prototypes ***/ @@ -2445,7 +2445,7 @@ /*560*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, 0, 0, 0,-1,-1 }; char expensiveAsserts = 0; -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.1680"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.1685"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -17859,7 +17859,7 @@ static sqInt checkForAndFollowForwardedPrimitiveState(void) { DECL_MAYBE_SQ_GLOBAL_STRUCT - sqInt accessorDepth; + signed char accessorDepth; sqInt firstBytecode; sqInt found; sqInt found1; @@ -60625,12 +60625,12 @@ sqInt objOop1; sqInt objOop11; sqInt objOop12; - sqInt objOop13; sqInt objStackPage; sqInt objToScan; sqInt objToScan1; sqInt objToScan2; sqInt oop; + sqInt oop1; sqInt p; usqInt ptr; sqInt scanLargeObject; @@ -60673,13 +60673,13 @@ assert(!((isForwarded(weakling)))); markAndTraceClassOf(weakling); for (i = 0, iLimiT = ((numStrongSlotsOfWeakling(weakling)) - 1); i <= iLimiT; i += 1) { - /* begin followObjField:ofObject: */ - objOop = longAt((weakling + BaseHeaderSize) + (((long)i) << (shiftForWord()))); - assert(isNonImmediate(objOop)); - if (((longAt(objOop)) & ((classIndexMask()) - (isForwardedObjectClassIndexPun()))) == 0) { - objOop = fixFollowedFieldofObjectwithInitialValue(i, weakling, objOop); + /* begin followOopField:ofObject: */ + oop = longAt((weakling + BaseHeaderSize) + (((long)i) << (shiftForWord()))); + if (((oop & (tagMask())) == 0) + && (((longAt(oop)) & (classIndexMask())) == (isForwardedObjectClassIndexPun()))) { + oop = fixFollowedFieldofObjectwithInitialValue(i, weakling, oop); } - field = objOop; + field = oop; if (!(((field & (tagMask())) != 0) || (((((usqInt) (longAt(field))) >> 55) & 1) != 0))) { /* begin markAndTrace: */ @@ -60764,9 +60764,9 @@ } if (fmt == (weakArrayFormat())) { /* begin fixedFieldsOfClass: */ - objOop11 = fetchClassOfNonImm(objToScan); + objOop1 = fetchClassOfNonImm(objToScan); /* begin fixedFieldsOfClassFormat: */ - numStrongSlots = (((longAt((objOop11 + BaseHeaderSize) + (((long)InstanceSpecificationIndex) << (shiftForWord())))) >> 3)) & ((1LL << (fixedFieldsFieldWidth())) - 1); + numStrongSlots = (((longAt((objOop1 + BaseHeaderSize) + (((long)InstanceSpecificationIndex) << (shiftForWord())))) >> 3)) & ((1LL << (fixedFieldsFieldWidth())) - 1); goto l20; } } @@ -60963,16 +60963,16 @@ ptr = ((GIV(unscannedEphemerons).top)) - BytesPerWord; while (ptr >= ((GIV(unscannedEphemerons).start))) { /* begin followedKeyOfEphemeron: */ - objOop1 = (ephemeron = longAt(ptr)); - assert((isNonImmediate(objOop1)) - && (isEphemeron(objOop1))); + objOop = (ephemeron = longAt(ptr)); + assert((isNonImmediate(objOop)) + && (isEphemeron(objOop))); /* begin followOopField:ofObject: */ - oop = longAt((objOop1 + BaseHeaderSize) + (0LL << (shiftForWord()))); - if (((oop & (tagMask())) == 0) - && (((longAt(oop)) & (classIndexMask())) == (isForwardedObjectClassIndexPun()))) { - oop = fixFollowedFieldofObjectwithInitialValue(0, objOop1, oop); + oop1 = longAt((objOop + BaseHeaderSize) + (0LL << (shiftForWord()))); + if (((oop1 & (tagMask())) == 0) + && (((longAt(oop1)) & (classIndexMask())) == (isForwardedObjectClassIndexPun()))) { + oop1 = fixFollowedFieldofObjectwithInitialValue(0, objOop, oop1); } - key = oop; + key = oop1; /* begin markAndTrace: */ /* inline markAndShouldScan: */ @@ -61055,9 +61055,9 @@ } if (fmt1 == (weakArrayFormat())) { /* begin fixedFieldsOfClass: */ - objOop12 = fetchClassOfNonImm(objToScan1); + objOop11 = fetchClassOfNonImm(objToScan1); /* begin fixedFieldsOfClassFormat: */ - numStrongSlots1 = (((longAt((objOop12 + BaseHeaderSize) + (((long)InstanceSpecificationIndex) << (shiftForWord())))) >> 3)) & ((1LL << (fixedFieldsFieldWidth())) - 1); + numStrongSlots1 = (((longAt((objOop11 + BaseHeaderSize) + (((long)InstanceSpecificationIndex) << (shiftForWord())))) >> 3)) & ((1LL << (fixedFieldsFieldWidth())) - 1); goto l13; } } @@ -61301,9 +61301,9 @@ } if (fmt2 == (weakArrayFormat())) { /* begin fixedFieldsOfClass: */ - objOop13 = fetchClassOfNonImm(objToScan2); + objOop12 = fetchClassOfNonImm(objToScan2); /* begin fixedFieldsOfClassFormat: */ - numStrongSlots2 = (((longAt((objOop13 + BaseHeaderSize) + (((long)InstanceSpecificationIndex) << (shiftForWord())))) >> 3)) & ((1LL << (fixedFieldsFieldWidth())) - 1); + numStrongSlots2 = (((longAt((objOop12 + BaseHeaderSize) + (((long)InstanceSpecificationIndex) << (shiftForWord())))) >> 3)) & ((1LL << (fixedFieldsFieldWidth())) - 1); goto l15; } } @@ -61545,7 +61545,7 @@ usqInt prevFree; usqInt prevFreeChunk; usqInt prevPrevFree; - sqInt prevPrevFreeChunk; + usqInt prevPrevFreeChunk; sqInt slotBytes; sqInt slotBytes1; usqInt there; @@ -66910,7 +66910,7 @@ bridgeFromto(SpurSegmentInfo *aSegment, SpurSegmentInfo *nextSegmentOrNil) { usqInt bridgeSpan; - sqInt clifton; + usqInt clifton; usqInt segEnd; segEnd = ((aSegment->segSize)) + ((aSegment->segStart)); @@ -67153,7 +67153,7 @@ sqInt limit; sqInt newEndOfMemory; sqInt next; - sqInt node; + usqInt node; usqInt numSlots; usqInt numSlots1; SpurSegmentInfo *seg; @@ -67282,7 +67282,7 @@ static sqInt NoDbgRegParms readHeapFromImageFiledataBytes(sqImageFile f, sqInt numBytes) { DECL_MAYBE_SQ_GLOBAL_STRUCT - usqInt bridge; + sqInt bridge; usqInt bridgehead; usqLong bridgeSpan; sqInt bytesRead; Modified: branches/Cog/nsspursrc/vm/cogit.h =================================================================== --- branches/Cog/nsspursrc/vm/cogit.h 2016-02-20 00:19:08 UTC (rev 3616) +++ branches/Cog/nsspursrc/vm/cogit.h 2016-02-20 20:20:49 UTC (rev 3617) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.1680 uuid: 6fe34e1e-a5e0-4966-a2cd-3f21ccb0bde9 + CCodeGenerator VMMaker.oscog-eem.1685 uuid: 59633283-8843-4826-a68a-b23ea22d1fa8 */ Modified: branches/Cog/nsspursrc/vm/cogitARMv5.c =================================================================== --- branches/Cog/nsspursrc/vm/cogitARMv5.c 2016-02-20 00:19:08 UTC (rev 3616) +++ branches/Cog/nsspursrc/vm/cogitARMv5.c 2016-02-20 20:20:49 UTC (rev 3617) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.1677 uuid: 7056bb77-6aa0-4cb6-aa6c-cd921c231d37 + CCodeGenerator VMMaker.oscog-eem.1685 uuid: 59633283-8843-4826-a68a-b23ea22d1fa8 from - StackToRegisterMappingCogit VMMaker.oscog-eem.1677 uuid: 7056bb77-6aa0-4cb6-aa6c-cd921c231d37 + StackToRegisterMappingCogit VMMaker.oscog-eem.1685 uuid: 59633283-8843-4826-a68a-b23ea22d1fa8 */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1677 uuid: 7056bb77-6aa0-4cb6-aa6c-cd921c231d37 " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1685 uuid: 59633283-8843-4826-a68a-b23ea22d1fa8 " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -21,96 +21,7 @@ #endif #include "cogit.h" -typedef struct _AbstractInstruction { - unsigned char opcode; - unsigned char machineCodeSize; - unsigned char maxSize; - unsigned char annotation; - unsigned char conditionOrNil; - unsigned long operands [3]; - unsigned long address; - struct _AbstractInstruction *dependent; - unsigned long machineCode [5]; - } AbstractInstruction; -#define CogOutOfLineLiteralsARMCompiler AbstractInstruction -#define CogARMCompiler AbstractInstruction -#define CogAbstractInstruction AbstractInstruction - - -typedef struct { - AbstractInstruction *fakeHeader; - AbstractInstruction *fillInstruction; - sqInt numArgs; - sqInt numCopied; - sqInt numInitialNils; - sqInt startpc; - AbstractInstruction *entryLabel; - AbstractInstruction *stackCheckLabel; - sqInt span; - sqInt hasInstVarRef; - } BlockStart; - -#define CogBlockStart BlockStart - - -typedef struct _BytecodeDescriptor { - sqInt (*generator )(void); - sqInt (*spanFunction )(struct _BytecodeDescriptor *,sqInt,sqInt,sqInt); - sqInt (*needsFrameFunction )(sqInt); - signed char stackDelta; - unsigned char opcode; - unsigned char numBytes; - unsigned isBranchTrue : 1; - unsigned isBranchFalse : 1; - unsigned isReturn : 1; - unsigned isBlockCreation : 1; - unsigned isMapped : 1; - unsigned isMappedInBlock : 1; - unsigned isExtension : 1; - unsigned isInstVarRef : 1; - unsigned hasIRC : 1; - } BytecodeDescriptor; - -#define CogBytecodeDescriptor BytecodeDescriptor - - -typedef struct { - sqInt (*primitiveGenerator )(void); - sqInt primNumArgs; - } PrimitiveDescriptor; - -#define CogPrimitiveDescriptor PrimitiveDescriptor - - -typedef struct { - AbstractInstruction *targetInstruction; - sqInt instructionIndex; - sqInt simStackPtr; - } BytecodeFixup; - -#define CogSSBytecodeFixup BytecodeFixup -#define CogBytecodeFixup BytecodeFixup - - -typedef struct { - char type; - char spilled; - char annotateUse; - sqInt registerr; - sqInt offset; - sqInt constant; - sqInt bcptr; - } CogSimStackEntry; - - -typedef struct { - sqInt isReceiverResultRegLive; - CogSimStackEntry *ssEntry; - } CogSSOptStatus; - - - /*** Constants ***/ #define AddCqR 95 #define AddCwR 103 @@ -385,7 +296,96 @@ #define XorRR 93 #define YoungSelectorInPIC -5 +typedef struct _AbstractInstruction { + unsigned char opcode; + unsigned char machineCodeSize; + unsigned char maxSize; + unsigned char annotation; + unsigned char conditionOrNil; + unsigned long operands [3]; + unsigned long address; + struct _AbstractInstruction *dependent; + unsigned long machineCode [5]; + } AbstractInstruction; +#define CogOutOfLineLiteralsARMCompiler AbstractInstruction +#define CogARMCompiler AbstractInstruction +#define CogAbstractInstruction AbstractInstruction + + +typedef struct { + AbstractInstruction *fakeHeader; + AbstractInstruction *fillInstruction; + sqInt numArgs; + sqInt numCopied; + sqInt numInitialNils; + sqInt startpc; + AbstractInstruction *entryLabel; + AbstractInstruction *stackCheckLabel; + sqInt span; + sqInt hasInstVarRef; + } BlockStart; + +#define CogBlockStart BlockStart + + +typedef struct _BytecodeDescriptor { + sqInt (*generator )(void); + sqInt (*spanFunction )(struct _BytecodeDescriptor *,sqInt,sqInt,sqInt); + sqInt (*needsFrameFunction )(sqInt); + signed char stackDelta; + unsigned char opcode; + unsigned char numBytes; + unsigned isBranchTrue : 1; + unsigned isBranchFalse : 1; + unsigned isReturn : 1; + unsigned isBlockCreation : 1; + unsigned isMapped : 1; + unsigned isMappedInBlock : 1; + unsigned isExtension : 1; + unsigned isInstVarRef : 1; + unsigned hasIRC : 1; + } BytecodeDescriptor; + +#define CogBytecodeDescriptor BytecodeDescriptor + + +typedef struct { + sqInt (*primitiveGenerator )(void); + sqInt primNumArgs; + } PrimitiveDescriptor; + +#define CogPrimitiveDescriptor PrimitiveDescriptor + + +typedef struct { + AbstractInstruction *targetInstruction; + sqInt instructionIndex; + sqInt simStackPtr; + } BytecodeFixup; + +#define CogSSBytecodeFixup BytecodeFixup +#define CogBytecodeFixup BytecodeFixup + + +typedef struct { + char type; + char spilled; + char annotateUse; + sqInt registerr; + sqInt offset; + sqInt constant; + sqInt bcptr; + } CogSimStackEntry; + + +typedef struct { + sqInt isReceiverResultRegLive; + CogSimStackEntry *ssEntry; + } CogSSOptStatus; + + + /*** Function Prototypes ***/ @@ -10558,12 +10558,12 @@ generateMapAtstart(sqInt addressOrNull, sqInt startAddress) { unsigned char annotation; - usqInt delta; + sqInt delta; sqInt i; AbstractInstruction *instruction; sqInt length; - usqInt location; - usqInt mapEntry; + sqInt location; + sqInt mapEntry; sqInt maxDelta; usqInt mcpc; Modified: branches/Cog/nsspursrc/vm/cogitIA32.c =================================================================== --- branches/Cog/nsspursrc/vm/cogitIA32.c 2016-02-20 00:19:08 UTC (rev 3616) +++ branches/Cog/nsspursrc/vm/cogitIA32.c 2016-02-20 20:20:49 UTC (rev 3617) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.1677 uuid: 7056bb77-6aa0-4cb6-aa6c-cd921c231d37 + CCodeGenerator VMMaker.oscog-eem.1685 uuid: 59633283-8843-4826-a68a-b23ea22d1fa8 from - StackToRegisterMappingCogit VMMaker.oscog-eem.1677 uuid: 7056bb77-6aa0-4cb6-aa6c-cd921c231d37 + StackToRegisterMappingCogit VMMaker.oscog-eem.1685 uuid: 59633283-8843-4826-a68a-b23ea22d1fa8 */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1677 uuid: 7056bb77-6aa0-4cb6-aa6c-cd921c231d37 " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1685 uuid: 59633283-8843-4826-a68a-b23ea22d1fa8 " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -21,94 +21,7 @@ #endif #include "cogit.h" -typedef struct _AbstractInstruction { - unsigned char opcode; - unsigned char machineCodeSize; - unsigned char maxSize; - unsigned char annotation; - unsigned long operands [3]; - unsigned long address; - struct _AbstractInstruction *dependent; - unsigned char machineCode [10]; - } AbstractInstruction; -#define CogIA32Compiler AbstractInstruction -#define CogAbstractInstruction AbstractInstruction - - -typedef struct { - AbstractInstruction *fakeHeader; - AbstractInstruction *fillInstruction; - sqInt numArgs; - sqInt numCopied; - sqInt numInitialNils; - sqInt startpc; - AbstractInstruction *entryLabel; - AbstractInstruction *stackCheckLabel; - sqInt span; - sqInt hasInstVarRef; - } BlockStart; - -#define CogBlockStart BlockStart - - -typedef struct _BytecodeDescriptor { - sqInt (*generator )(void); - sqInt (*spanFunction )(struct _BytecodeDescriptor *,sqInt,sqInt,sqInt); - sqInt (*needsFrameFunction )(sqInt); - signed char stackDelta; - unsigned char opcode; - unsigned char numBytes; - unsigned isBranchTrue : 1; - unsigned isBranchFalse : 1; - unsigned isReturn : 1; - unsigned isBlockCreation : 1; - unsigned isMapped : 1; - unsigned isMappedInBlock : 1; - unsigned isExtension : 1; - unsigned isInstVarRef : 1; - unsigned hasIRC : 1; - } BytecodeDescriptor; - -#define CogBytecodeDescriptor BytecodeDescriptor - - -typedef struct { - sqInt (*primitiveGenerator )(void); - sqInt primNumArgs; - } PrimitiveDescriptor; - -#define CogPrimitiveDescriptor PrimitiveDescriptor - - -typedef struct { - AbstractInstruction *targetInstruction; - sqInt instructionIndex; - sqInt simStackPtr; - } BytecodeFixup; - -#define CogSSBytecodeFixup BytecodeFixup -#define CogBytecodeFixup BytecodeFixup - - -typedef struct { - char type; - char spilled; - char annotateUse; - sqInt registerr; - sqInt offset; - sqInt constant; - sqInt bcptr; - } CogSimStackEntry; - - -typedef struct { - sqInt isReceiverResultRegLive; - CogSimStackEntry *ssEntry; - } CogSSOptStatus; - - - /*** Constants ***/ #define AddCqR 95 #define AddCwR 103 @@ -369,7 +282,94 @@ #define XorRR 93 #define YoungSelectorInPIC -5 +typedef struct _AbstractInstruction { + unsigned char opcode; + unsigned char machineCodeSize; + unsigned char maxSize; + unsigned char annotation; + unsigned long operands [3]; + unsigned long address; + struct _AbstractInstruction *dependent; + unsigned char machineCode [10]; + } AbstractInstruction; +#define CogIA32Compiler AbstractInstruction +#define CogAbstractInstruction AbstractInstruction + + +typedef struct { + AbstractInstruction *fakeHeader; + AbstractInstruction *fillInstruction; + sqInt numArgs; + sqInt numCopied; + sqInt numInitialNils; + sqInt startpc; + AbstractInstruction *entryLabel; + AbstractInstruction *stackCheckLabel; + sqInt span; + sqInt hasInstVarRef; + } BlockStart; + +#define CogBlockStart BlockStart + + +typedef struct _BytecodeDescriptor { + sqInt (*generator )(void); + sqInt (*spanFunction )(struct _BytecodeDescriptor *,sqInt,sqInt,sqInt); + sqInt (*needsFrameFunction )(sqInt); + signed char stackDelta; + unsigned char opcode; + unsigned char numBytes; + unsigned isBranchTrue : 1; + unsigned isBranchFalse : 1; + unsigned isReturn : 1; + unsigned isBlockCreation : 1; + unsigned isMapped : 1; + unsigned isMappedInBlock : 1; + unsigned isExtension : 1; + unsigned isInstVarRef : 1; + unsigned hasIRC : 1; + } BytecodeDescriptor; + +#define CogBytecodeDescriptor BytecodeDescriptor + + +typedef struct { + sqInt (*primitiveGenerator )(void); + sqInt primNumArgs; + } PrimitiveDescriptor; + +#define CogPrimitiveDescriptor PrimitiveDescriptor + + +typedef struct { + AbstractInstruction *targetInstruction; + sqInt instructionIndex; + sqInt simStackPtr; + } BytecodeFixup; + +#define CogSSBytecodeFixup BytecodeFixup +#define CogBytecodeFixup BytecodeFixup + + +typedef struct { + char type; + char spilled; + char annotateUse; + sqInt registerr; + sqInt offset; + sqInt constant; + sqInt bcptr; + } CogSimStackEntry; + + +typedef struct { + sqInt isReceiverResultRegLive; + CogSimStackEntry *ssEntry; + } CogSSOptStatus; + + + /*** Function Prototypes ***/ @@ -9626,12 +9626,12 @@ generateMapAtstart(sqInt addressOrNull, sqInt startAddress) { unsigned char annotation; - usqInt delta; + sqInt delta; sqInt i; AbstractInstruction *instruction; sqInt length; - usqInt location; - usqInt mapEntry; + sqInt location; + sqInt mapEntry; sqInt maxDelta; usqInt mcpc; Modified: branches/Cog/nsspursrc/vm/cogitMIPSEL.c =================================================================== --- branches/Cog/nsspursrc/vm/cogitMIPSEL.c 2016-02-20 00:19:08 UTC (rev 3616) +++ branches/Cog/nsspursrc/vm/cogitMIPSEL.c 2016-02-20 20:20:49 UTC (rev 3617) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.1677 uuid: 7056bb77-6aa0-4cb6-aa6c-cd921c231d37 + CCodeGenerator VMMaker.oscog-eem.1685 uuid: 59633283-8843-4826-a68a-b23ea22d1fa8 from - StackToRegisterMappingCogit VMMaker.oscog-eem.1677 uuid: 7056bb77-6aa0-4cb6-aa6c-cd921c231d37 + StackToRegisterMappingCogit VMMaker.oscog-eem.1685 uuid: 59633283-8843-4826-a68a-b23ea22d1fa8 */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1677 uuid: 7056bb77-6aa0-4cb6-aa6c-cd921c231d37 " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1685 uuid: 59633283-8843-4826-a68a-b23ea22d1fa8 " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -22,94 +22,7 @@ #endif #include "cogit.h" -typedef struct _AbstractInstruction { - unsigned char opcode; - unsigned char machineCodeSize; - unsigned char maxSize; - unsigned char annotation; - unsigned long operands [3]; - unsigned long address; - struct _AbstractInstruction *dependent; - unsigned long machineCode [7]; - } AbstractInstruction; -#define CogMIPSELCompiler AbstractInstruction -#define CogAbstractInstruction AbstractInstruction - - -typedef struct { - AbstractInstruction *fakeHeader; - AbstractInstruction *fillInstruction; - sqInt numArgs; - sqInt numCopied; - sqInt numInitialNils; - sqInt startpc; - AbstractInstruction *entryLabel; - AbstractInstruction *stackCheckLabel; - sqInt span; - sqInt hasInstVarRef; - } BlockStart; - -#define CogBlockStart BlockStart - - -typedef struct _BytecodeDescriptor { - sqInt (*generator )(void); - sqInt (*spanFunction )(struct _BytecodeDescriptor *,sqInt,sqInt,sqInt); - sqInt (*needsFrameFunction )(sqInt); - signed char stackDelta; - unsigned char opcode; - unsigned char numBytes; - unsigned isBranchTrue : 1; - unsigned isBranchFalse : 1; - unsigned isReturn : 1; - unsigned isBlockCreation : 1; - unsigned isMapped : 1; - unsigned isMappedInBlock : 1; - unsigned isExtension : 1; - unsigned isInstVarRef : 1; - unsigned hasIRC : 1; - } BytecodeDescriptor; - -#define CogBytecodeDescriptor BytecodeDescriptor - - -typedef struct { - sqInt (*primitiveGenerator )(void); - sqInt primNumArgs; - } PrimitiveDescriptor; - -#define CogPrimitiveDescriptor PrimitiveDescriptor - - -typedef struct { - AbstractInstruction *targetInstruction; - sqInt instructionIndex; - sqInt simStackPtr; - } BytecodeFixup; - -#define CogSSBytecodeFixup BytecodeFixup -#define CogBytecodeFixup BytecodeFixup - - -typedef struct { - char type; - char spilled; - char annotateUse; - sqInt registerr; - sqInt offset; - sqInt constant; - sqInt bcptr; - } CogSimStackEntry; - - -typedef struct { - sqInt isReceiverResultRegLive; - CogSimStackEntry *ssEntry; - } CogSSOptStatus; - - - /*** Constants ***/ #define A0 4 #define A1 5 @@ -440,7 +353,94 @@ #define YoungSelectorInPIC -5 #define ZR 0 +typedef struct _AbstractInstruction { + unsigned char opcode; + unsigned char machineCodeSize; + unsigned char maxSize; + unsigned char annotation; + unsigned long operands [3]; + unsigned long address; + struct _AbstractInstruction *dependent; + unsigned long machineCode [7]; + } AbstractInstruction; +#define CogMIPSELCompiler AbstractInstruction +#define CogAbstractInstruction AbstractInstruction + + +typedef struct { + AbstractInstruction *fakeHeader; + AbstractInstruction *fillInstruction; + sqInt numArgs; + sqInt numCopied; + sqInt numInitialNils; + sqInt startpc; + AbstractInstruction *entryLabel; + AbstractInstruction *stackCheckLabel; + sqInt span; + sqInt hasInstVarRef; + } BlockStart; + +#define CogBlockStart BlockStart + + +typedef struct _BytecodeDescriptor { + sqInt (*generator )(void); + sqInt (*spanFunction )(struct _BytecodeDescriptor *,sqInt,sqInt,sqInt); + sqInt (*needsFrameFunction )(sqInt); + signed char stackDelta; + unsigned char opcode; + unsigned char numBytes; + unsigned isBranchTrue : 1; + unsigned isBranchFalse : 1; + unsigned isReturn : 1; + unsigned isBlockCreation : 1; + unsigned isMapped : 1; + unsigned isMappedInBlock : 1; + unsigned isExtension : 1; + unsigned isInstVarRef : 1; + unsigned hasIRC : 1; + } BytecodeDescriptor; + +#define CogBytecodeDescriptor BytecodeDescriptor + + +typedef struct { + sqInt (*primitiveGenerator )(void); + sqInt primNumArgs; + } PrimitiveDescriptor; + +#define CogPrimitiveDescriptor PrimitiveDescriptor + + +typedef struct { + AbstractInstruction *targetInstruction; + sqInt instructionIndex; + sqInt simStackPtr; + } BytecodeFixup; + +#define CogSSBytecodeFixup BytecodeFixup +#define CogBytecodeFixup BytecodeFixup + + +typedef struct { + char type; + char spilled; + char annotateUse; + sqInt registerr; + sqInt offset; + sqInt constant; + sqInt bcptr; + } CogSimStackEntry; + + +typedef struct { + sqInt isReceiverResultRegLive; + CogSimStackEntry *ssEntry; + } CogSSOptStatus; + + + /*** Function Prototypes ***/ @@ -5738,12 +5738,12 @@ generateMapAtstart(sqInt addressOrNull, sqInt startAddress) { unsigned char annotation; - sqInt delta; + usqInt delta; sqInt i; AbstractInstruction *instruction; sqInt length; - sqInt location; - sqInt mapEntry; + usqInt location; + usqInt mapEntry; sqInt maxDelta; usqInt mcpc; Modified: branches/Cog/nsspursrc/vm/cointerp.c =================================================================== --- branches/Cog/nsspursrc/vm/cointerp.c 2016-02-20 00:19:08 UTC (rev 3616) +++ branches/Cog/nsspursrc/vm/cointerp.c 2016-02-20 20:20:49 UTC (rev 3617) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1680 uuid: 6fe34e1e-a5e0-4966-a2cd-3f21ccb0bde9 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1685 uuid: 59633283-8843-4826-a68a-b23ea22d1fa8 from - CoInterpreter VMMaker.oscog-eem.1680 uuid: 6fe34e1e-a5e0-4966-a2cd-3f21ccb0bde9 + CoInterpreter VMMaker.oscog-eem.1685 uuid: 59633283-8843-4826-a68a-b23ea22d1fa8 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1680 uuid: 6fe34e1e-a5e0-4966-a2cd-3f21ccb0bde9 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1685 uuid: 59633283-8843-4826-a68a-b23ea22d1fa8 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -77,54 +77,7 @@ /* end StackInterpreter class>>preambleCCode */ -typedef struct { - usqInt segStart; - usqInt segSize; - sqInt swizzle; - usqInt containsPinned; - usqInt savedSegSize; - usqInt lastFreeObject; - } SpurSegmentInfo; - -typedef struct { - usqInt start; - usqInt limit; - } SpurNewSpaceSpace; - - -typedef struct { - usqInt start; - usqInt limit; - usqInt first; - usqInt last; - } SpurCircularBuffer; - - -typedef struct { - usqInt start; - usqInt limit; - usqInt top; - } SpurContiguousObjStack; - - -typedef struct _StackPage { - char *stackLimit; - char *headSP; - char *headFP; - char *baseFP; - char *baseAddress; - char *realStackLimit; - char *lastAddress; - int trace; - struct _StackPage *nextPage; - struct _StackPage *prevPage; - } StackPage; - -#define CogStackPage StackPage - - - /*** Constants ***/ #define AccessModifierPrivate 1 #define AccessModifierProtected 2 @@ -402,7 +355,54 @@ #define XIndex 0 #define YIndex 1 +typedef struct { + usqInt segStart; + usqInt segSize; + sqInt swizzle; + usqInt containsPinned; + usqInt savedSegSize; + usqInt lastFreeObject; + } SpurSegmentInfo; + +typedef struct { + usqInt start; + usqInt limit; + } SpurNewSpaceSpace; + + +typedef struct { + usqInt start; + usqInt limit; + usqInt first; + usqInt last; + } SpurCircularBuffer; + + +typedef struct { + usqInt start; + usqInt limit; + usqInt top; + } SpurContiguousObjStack; + + +typedef struct _StackPage { + char *stackLimit; + char *headSP; + char *headFP; + char *baseFP; + char *baseAddress; + char *realStackLimit; + char *lastAddress; + int trace; + struct _StackPage *nextPage; + struct _StackPage *prevPage; + } StackPage; + +#define CogStackPage StackPage + + + /*** Function Prototypes ***/ @@ -2411,7 +2411,7 @@ /*560*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, 0, 0, 0,-1,-1 }; char expensiveAsserts = 0; -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.1680"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.1685"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -59727,12 +59727,12 @@ sqInt objOop1; sqInt objOop11; sqInt objOop12; - sqInt objOop13; sqInt objStackPage; sqInt objToScan; sqInt objToScan1; sqInt objToScan2; sqInt oop; + sqInt oop1; sqInt p; usqInt ptr; sqInt scanLargeObject; @@ -59775,13 +59775,13 @@ assert(!((isForwarded(weakling)))); markAndTraceClassOf(weakling); for (i = 0, iLimiT = ((numStrongSlotsOfWeakling(weakling)) - 1); i <= iLimiT; i += 1) { - /* begin followObjField:ofObject: */ - objOop = longAt((weakling + BaseHeaderSize) + (i << (shiftForWord()))); - assert(isNonImmediate(objOop)); - if (((longAt(objOop)) & ((classIndexMask()) - (isForwardedObjectClassIndexPun()))) == 0) { - objOop = fixFollowedFieldofObjectwithInitialValue(i, weakling, objOop); + /* begin followOopField:ofObject: */ + oop = longAt((weakling + BaseHeaderSize) + (i << (shiftForWord()))); + if (((oop & (tagMask())) == 0) + && (((longAt(oop)) & (classIndexMask())) == (isForwardedObjectClassIndexPun()))) { + oop = fixFollowedFieldofObjectwithInitialValue(i, weakling, oop); } - field = objOop; + field = oop; if (!(((field & (tagMask())) != 0) || (((((usqInt) (longAt(field + 4))) >> 23) & 1) != 0))) { /* begin markAndTrace: */ @@ -59864,9 +59864,9 @@ } if (fmt == (weakArrayFormat())) { /* begin fixedFieldsOfClass: */ - objOop11 = fetchClassOfNonImm(objToScan); + objOop1 = fetchClassOfNonImm(objToScan); /* begin fixedFieldsOfClassFormat: */ - numStrongSlots = (((longAt((objOop11 + BaseHeaderSize) + (InstanceSpecificationIndex << (shiftForWord())))) >> 1)) & ((1 << (fixedFieldsFieldWidth())) - 1); + numStrongSlots = (((longAt((objOop1 + BaseHeaderSize) + (InstanceSpecificationIndex << (shiftForWord())))) >> 1)) & ((1 << (fixedFieldsFieldWidth())) - 1); goto l20; } } @@ -60059,16 +60059,16 @@ ptr = ((GIV(unscannedEphemerons).top)) - BytesPerWord; while (ptr >= ((GIV(unscannedEphemerons).start))) { /* begin followedKeyOfEphemeron: */ - objOop1 = (ephemeron = longAt(ptr)); - assert((isNonImmediate(objOop1)) - && (isEphemeron(objOop1))); + objOop = (ephemeron = longAt(ptr)); + assert((isNonImmediate(objOop)) + && (isEphemeron(objOop))); /* begin followOopField:ofObject: */ - oop = longAt((objOop1 + BaseHeaderSize) + (0 << (shiftForWord()))); - if (((oop & (tagMask())) == 0) - && (((longAt(oop)) & (classIndexMask())) == (isForwardedObjectClassIndexPun()))) { - oop = fixFollowedFieldofObjectwithInitialValue(0, objOop1, oop); + oop1 = longAt((objOop + BaseHeaderSize) + (0 << (shiftForWord()))); + if (((oop1 & (tagMask())) == 0) + && (((longAt(oop1)) & (classIndexMask())) == (isForwardedObjectClassIndexPun()))) { + oop1 = fixFollowedFieldofObjectwithInitialValue(0, objOop, oop1); } - key = oop; + key = oop1; /* begin markAndTrace: */ /* inline markAndShouldScan: */ @@ -60149,9 +60149,9 @@ } if (fmt1 == (weakArrayFormat())) { /* begin fixedFieldsOfClass: */ - objOop12 = fetchClassOfNonImm(objToScan1); + objOop11 = fetchClassOfNonImm(objToScan1); /* begin fixedFieldsOfClassFormat: */ - numStrongSlots1 = (((longAt((objOop12 + BaseHeaderSize) + (InstanceSpecificationIndex << (shiftForWord())))) >> 1)) & ((1 << (fixedFieldsFieldWidth())) - 1); + numStrongSlots1 = (((longAt((objOop11 + BaseHeaderSize) + (InstanceSpecificationIndex << (shiftForWord())))) >> 1)) & ((1 << (fixedFieldsFieldWidth())) - 1); goto l13; } } @@ -60389,9 +60389,9 @@ } if (fmt2 == (weakArrayFormat())) { /* begin fixedFieldsOfClass: */ - objOop13 = fetchClassOfNonImm(objToScan2); + objOop12 = fetchClassOfNonImm(objToScan2); /* begin fixedFieldsOfClassFormat: */ - numStrongSlots2 = (((longAt((objOop13 + BaseHeaderSize) + (InstanceSpecificationIndex << (shiftForWord())))) >> 1)) & ((1 << (fixedFieldsFieldWidth())) - 1); + numStrongSlots2 = (((longAt((objOop12 + BaseHeaderSize) + (InstanceSpecificationIndex << (shiftForWord())))) >> 1)) & ((1 << (fixedFieldsFieldWidth())) - 1); goto l15; } } @@ -66350,7 +66350,7 @@ static sqInt NoDbgRegParms readHeapFromImageFiledataBytes(sqImageFile f, sqInt numBytes) { DECL_MAYBE_SQ_GLOBAL_STRUCT - usqInt bridge; + sqInt bridge; usqInt bridgehead; usqInt bridgeSpan; sqInt bytesRead; @@ -66565,7 +66565,7 @@ usqLong firstSavedBridgeWord; sqInt nWritten; usqInt pier1; - usqInt pier2; + sqInt pier2; usqLong secondSavedBridgeWord; pier1 = (((segment->segSize)) + ((segment->segStart))) - (2 * BaseHeaderSize); Modified: branches/Cog/nsspursrc/vm/cointerp.h =================================================================== --- branches/Cog/nsspursrc/vm/cointerp.h 2016-02-20 00:19:08 UTC (rev 3616) +++ branches/Cog/nsspursrc/vm/cointerp.h 2016-02-20 20:20:49 UTC (rev 3617) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1680 uuid: 6fe34e1e-a5e0-4966-a2cd-3f21ccb0bde9 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1685 uuid: 59633283-8843-4826-a68a-b23ea22d1fa8 */ @@ Diff output truncated at 50000 characters. @@

1 0

VM Maker: VMMaker.oscog-eem.1687.mcz
by commits＠source.squeak.org 20 Feb '16

20 Feb '16

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.1687.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.1687 Author: eem Time: 20 February 2016, 12:07:16.278693 pm UUID: fde8cc46-be93-419f-8087-ef54c0b4f237 Ancestors: VMMaker.oscog-eem.1686 Fix the signature of characterbjectOf:. Fix slips in ThreadedFFICalloutStateForX64>>initialize. Fix 32-bit int vs 64-bit pointers issues in primitiveFFI[Allocate|Free]. Get X64SysVFFI plugin to deal with sixteen byte struct return. =============== Diff against VMMaker.oscog-eem.1686 =============== Item was changed: ----- Method: InterpreterProxy>>characterObjectOf: (in category 'object access') ----- characterObjectOf: characterCode <option: #(atLeastVMProxyMajor:minor: 1 13)> + <var: #cPtr type: #int> ^StackInterpreter objectMemoryClass characterObjectOf: characterCode! Item was changed: ----- Method: ThreadedFFICalloutStateForX64>>initialize (in category 'initialize-release') ----- initialize super initialize. + integerRegisterIndex := floatRegisterIndex := 0. - registerIndex := 0. integerRegisters := CArrayAccessor on: (Array new: self class pluginClass numRegArgs). floatRegisters := CArrayAccessor on: (Array new: self class pluginClass numFloatRegArgs)! Item was changed: ----- Method: ThreadedFFIPlugin>>ffiCheckReturn:With:in: (in category 'callout support') ----- ffiCheckReturn: retSpec With: retClass in: calloutState <var: #calloutState type: #'CalloutState *'> "Make sure we can return an object of the given type" <inline: true> + retClass = interpreterProxy nilObject ifFalse: + [(interpreterProxy + includesBehavior: retClass + ThatOf: interpreterProxy classExternalStructure) ifFalse: + [^FFIErrorBadReturn]]. - | ffiRetSpec | - retClass = interpreterProxy nilObject ifFalse:[ - (interpreterProxy includesBehavior: retClass - ThatOf: interpreterProxy classExternalStructure) - ifFalse:[^FFIErrorBadReturn]]. + ((interpreterProxy isWords: retSpec) + and: [(interpreterProxy slotSizeOf: retSpec) > 0]) ifFalse: + [^FFIErrorWrongType]. + + calloutState ffiRetHeader: (interpreterProxy fetchLong32: 0 ofObject: retSpec). + (self isAtomicType: calloutState ffiRetHeader) ifFalse: + [retClass = interpreterProxy nilObject ifTrue: + [^FFIErrorBadReturn]]. - (interpreterProxy isWords: retSpec) - ifFalse:[^FFIErrorWrongType]. - (interpreterProxy slotSizeOf: retSpec) = 0 ifTrue:[^FFIErrorWrongType]. - ffiRetSpec := self cCoerce: (interpreterProxy firstIndexableField: retSpec) to: #int. - calloutState ffiRetHeader: (interpreterProxy longAt: ffiRetSpec). - (self isAtomicType: calloutState ffiRetHeader) ifFalse:[ - (retClass = interpreterProxy nilObject) - ifTrue:[^FFIErrorBadReturn]]. (calloutState ffiRetHeader bitAnd: (FFIFlagPointer bitOr: FFIFlagStructure)) = FFIFlagStructure ifTrue: [calloutState structReturnSize: (calloutState ffiRetHeader bitAnd: FFIStructSizeMask)]. ^0! Item was changed: ----- Method: ThreadedFFIPlugin>>primitiveFFIAllocate (in category 'primitives') ----- primitiveFFIAllocate "Primitive. Allocate an object on the external heap." | byteSize addr oop ptr | <export: true> <inline: false> + <var: #ptr type: #'long *'> - <var: #ptr type:'int *'> byteSize := interpreterProxy stackIntegerValue: 0. + interpreterProxy failed ifTrue: + [^nil]. - interpreterProxy failed ifTrue:[^nil]. addr := self ffiAlloc: byteSize. + addr = 0 ifTrue: + [^interpreterProxy primitiveFail]. - addr = 0 ifTrue:[^interpreterProxy primitiveFail]. oop := interpreterProxy instantiateClass: interpreterProxy classExternalAddress + indexableSize: (self sizeof: #long). - indexableSize: 4. ptr := interpreterProxy firstIndexableField: oop. ptr at: 0 put: addr. ^interpreterProxy pop: 2 thenPush: oop! Item was changed: ----- Method: ThreadedFFIPlugin>>primitiveFFIFree (in category 'primitives') ----- primitiveFFIFree "Primitive. Free the object pointed to on the external heap." | addr oop ptr | <export: true> <inline: false> + <var: #ptr type: #'long *'> - <var: #ptr type:'int *'> oop := interpreterProxy stackObjectValue: 0. + ((interpreterProxy fetchClassOf: oop) = interpreterProxy classExternalAddress + and: [(interpreterProxy byteSizeOf: oop) = (self sizeof: #long)]) ifFalse: + [^interpreterProxy primitiveFail]. - interpreterProxy failed ifTrue:[^nil]. - (interpreterProxy fetchClassOf: oop) = (interpreterProxy classExternalAddress) - ifFalse:[^interpreterProxy primitiveFail]. - (interpreterProxy byteSizeOf: oop) = 4 - ifFalse:[^interpreterProxy primitiveFail]. ptr := interpreterProxy firstIndexableField: oop. addr := ptr at: 0. "Don't you dare to free Squeak's memory!!" + (addr = 0 + or: [(addr asUnsignedLong bitAnd: (self sizeof: #long) - 1) ~= 0 + or: [interpreterProxy isInMemory: addr]]) ifTrue: + [^interpreterProxy primitiveFail]. - (addr = 0 or:[interpreterProxy isInMemory: addr]) - ifTrue:[^interpreterProxy primitiveFail]. self ffiFree: addr. + ^ptr at: 0 put: 0 "cleanup"! - ^ptr at: 0 put: 0. "cleanup" - ! Item was changed: ----- Method: ThreadedFFIPlugin>>primitiveLoadSymbolFromModule (in category 'primitives') ----- primitiveLoadSymbolFromModule "Attempt to find the address of a symbol in a loaded library. loadSymbol: aSymbol fromModule: moduleName <primitive: 'primitiveLoadSymbolFromModule' error: errorCode module: 'SqueakFFIPrims'> " <export: true> | symbol module moduleHandle address oop ptr | <var: #address type: #'void *'> <var: #ptr type:'unsigned int *'> interpreterProxy methodArgumentCount = 2 ifFalse: [^interpreterProxy primitiveFailFor: PrimErrBadNumArgs]. module := interpreterProxy stackValue: 0. symbol := interpreterProxy stackValue: 1. moduleHandle := self ffiLoadCalloutModule: module. interpreterProxy failed ifTrue: [^interpreterProxy primitiveFailFor: PrimErrNotFound]. address := interpreterProxy ioLoadSymbol: (self cCoerce: (interpreterProxy firstIndexableField: symbol) to: #sqInt) OfLength: (interpreterProxy byteSizeOf: symbol) FromModule: moduleHandle. (interpreterProxy failed or: [address = 0]) ifTrue: [^interpreterProxy primitiveFailFor: PrimErrNotFound]. oop := interpreterProxy instantiateClass: interpreterProxy classExternalAddress indexableSize: 4. ptr := interpreterProxy firstIndexableField: oop. ptr at: 0 put: address. + ^interpreterProxy methodReturnValue: oop! - interpreterProxy methodReturnValue: oop! Item was changed: ----- Method: ThreadedFFIPlugin>>primitiveSetManualSurfacePointer (in category 'primitives - surfaces') ----- primitiveSetManualSurfacePointer "Create a 'manual surface' data-structure. See the ExternalForm class in the FFI package for example usage." "arguments: name(type, stack offset) surfaceID(Integer, 1) + ptr(uint32/uint64, 0)" - ptr(uint32, 0)" | surfaceID ptr result | <export: true> + <var: #ptr type: #'unsigned long'> - <var: #ptr type: #'unsigned int'> + interpreterProxy methodArgumentCount = 2 ifFalse: [^interpreterProxy primitiveFail]. - interpreterProxy methodArgumentCount == 2 ifFalse: [^interpreterProxy primitiveFail]. surfaceID := interpreterProxy stackIntegerValue: 1. + ptr := interpreterProxy positiveMachineIntegerValueOf: (interpreterProxy stackValue: 0). - ptr := interpreterProxy positive32BitValueOf: (interpreterProxy stackValue: 0). interpreterProxy failed ifTrue: [^nil]. self touch: surfaceID; touch: ptr. + result := self setManualSurface: surfaceID Pointer: ptr asVoidPointer. - result := self cCode: 'setManualSurfacePointer(surfaceID, (void*)ptr)'. result = 0 ifTrue: [^interpreterProxy primitiveFail]. ^interpreterProxy pop: 2 ! Item was added: + ----- Method: ThreadedFFIX64SixteenByteReturn class>>instVarNamesAndTypesForTranslationDo: (in category 'translation') ----- + instVarNamesAndTypesForTranslationDo: aBinaryBlock + "enumerate aBinaryBlock with the names and C type strings for the inst vars to include in a BlockStart struct." + + self instVarNames do: + [:ivn| + aBinaryBlock value: ivn value: #sqInt]! Item was added: + ----- Method: ThreadedFFIX64SixteenByteReturn>>a (in category 'accessing') ----- + a + + ^ a! Item was added: + ----- Method: ThreadedFFIX64SixteenByteReturn>>a: (in category 'accessing') ----- + a: anObject + + ^a := anObject! Item was added: + ----- Method: ThreadedFFIX64SixteenByteReturn>>b (in category 'accessing') ----- + b + + ^ b! Item was added: + ----- Method: ThreadedFFIX64SixteenByteReturn>>b: (in category 'accessing') ----- + b: anObject + + ^b := anObject! Item was added: + ----- Method: ThreadedX64SysVFFIPlugin class>>ancilliaryClasses: (in category 'translation') ----- + ancilliaryClasses: options + ^{ self calloutStateClass. ThreadedFFIX64SixteenByteReturn }! Item was changed: ----- Method: ThreadedX64SysVFFIPlugin>>ffiCalloutTo:SpecOnStack:in: (in category 'callout support') ----- ffiCalloutTo: procAddr SpecOnStack: specOnStack in: calloutState <var: #procAddr type: #'void *'> <var: #calloutState type: #'CalloutState *'> <var: #loadFloatRegs declareC: 'extern void loadFloatRegs(double, double, double, double, double, double, double, double)'> "Go out, call this guy and create the return value. This *must* be inlined because of the alloca of the outgoing stack frame in ffiCall:WithFlags:NumArgs:Args:AndTypes:" | myThreadIndex atomicType floatRet intRet loadFloatRegs oop | <var: #floatRet type: #double> <var: #intRet type: 'SixteenByteReturn'> <inline: true> self cCode: '' inSmalltalk: [loadFloatRegs := #used. loadFloatRegs class]. self cppIf: COGMTVM ifTrue: [(calloutState callFlags anyMask: FFICallFlagThreaded) ifTrue: [myThreadIndex := interpreterProxy disownVM: 0]]. self registerArgsSlop + self cStackAlignment > 0 ifTrue: [self setsp: calloutState argVector]. calloutState floatRegisterIndex > 0 ifTrue: [self load: (calloutState floatRegisters at: 0) Flo: (calloutState floatRegisters at: 1) a: (calloutState floatRegisters at: 2) t: (calloutState floatRegisters at: 3) R: (calloutState floatRegisters at: 4) e: (calloutState floatRegisters at: 5) g: (calloutState floatRegisters at: 6) s: (calloutState floatRegisters at: 7)]. atomicType := self atomicTypeOf: calloutState ffiRetHeader. (atomicType >> 1) = (FFITypeSingleFloat > 1) ifTrue: [atomicType = FFITypeSingleFloat ifTrue: [floatRet := self dispatchFunctionPointer: (self cCoerceSimple: procAddr to: 'float (*)(long, long, long, long, long, long)') with: (calloutState integerRegisters at: 0) with: (calloutState integerRegisters at: 1) with: (calloutState integerRegisters at: 2) with: (calloutState integerRegisters at: 3) with: (calloutState integerRegisters at: 4) with: (calloutState integerRegisters at: 5)] ifFalse: "atomicType = FFITypeDoubleFloat" [floatRet := self dispatchFunctionPointer: (self cCoerceSimple: procAddr to: 'double (*)(long, long, long, long, long, long)') with: (calloutState integerRegisters at: 0) with: (calloutState integerRegisters at: 1) with: (calloutState integerRegisters at: 2) with: (calloutState integerRegisters at: 3) with: (calloutState integerRegisters at: 4) with: (calloutState integerRegisters at: 5)]] ifFalse: [intRet := self dispatchFunctionPointer: (self cCoerceSimple: procAddr to: 'SixteenByteReturn (*)(long, long, long, long, long, long)') with: (calloutState integerRegisters at: 0) with: (calloutState integerRegisters at: 1) with: (calloutState integerRegisters at: 2) with: (calloutState integerRegisters at: 3) with: (calloutState integerRegisters at: 4) with: (calloutState integerRegisters at: 5)]. "undo any callee argument pops because it may confuse stack management with the alloca." (self isCalleePopsConvention: calloutState callFlags) ifTrue: [self setsp: calloutState argVector]. self cppIf: COGMTVM ifTrue: [(calloutState callFlags anyMask: FFICallFlagThreaded) ifTrue: [interpreterProxy ownVM: myThreadIndex]]. (calloutState ffiRetHeader anyMask: FFIFlagPointer+FFIFlagStructure) ifTrue: ["Note: Order is important here since FFIFlagPointer + FFIFlagStructure is used to represent 'typedef void* VoidPointer' and VoidPointer must be returned as pointer *not* as struct." (calloutState ffiRetHeader anyMask: FFIFlagPointer) ifTrue: + [oop := self ffiReturnPointer: intRet a ofType: (self ffiReturnType: specOnStack) in: calloutState] - [oop := self ffiReturnPointer: intRet ofType: (self ffiReturnType: specOnStack) in: calloutState] ifFalse: [oop := self ffiReturnStruct: intRet ofType: (self ffiReturnType: specOnStack) in: calloutState]. ^oop]. (atomicType >> 1) = (FFITypeSingleFloat > 1) ifTrue: [oop := interpreterProxy floatObjectOf: floatRet] ifFalse: + [oop := self ffiCreateIntegralResultOop: intRet a - [oop := self ffiCreateIntegralResultOop: intRet ofAtomicType: atomicType in: calloutState]. ^interpreterProxy methodReturnValue: oop! Item was changed: ----- Method: ThreadedX64SysVFFIPlugin>>ffiReturnStruct:ofType:in: (in category 'callout support') ----- ffiReturnStruct: sixteenByteRet ofType: ffiRetType in: calloutState <var: #sixteenByteRet type: 'SixteenByteReturn'> <var: #calloutState type: #'CalloutState *'> "Create a structure return value from an external function call. The value has been stored in alloca'ed space pointed to by the calloutState or in the return value." | retOop retClass oop | <inline: true> retClass := interpreterProxy fetchPointer: 1 ofObject: ffiRetType. retOop := interpreterProxy instantiateClass: retClass indexableSize: 0. self remapOop: retOop in: [oop := interpreterProxy instantiateClass: interpreterProxy classByteArray indexableSize: calloutState structReturnSize]. self mem: (interpreterProxy firstIndexableField: oop) cp: ((self returnStructInRegisters: calloutState structReturnSize) + ifTrue: [(self addressOf: sixteenByteRet) asVoidPointer] - ifTrue: [self addressOf: sixteenByteRet] ifFalse: [calloutState limit]) y: calloutState structReturnSize. interpreterProxy storePointer: 0 ofObject: retOop withValue: oop. ^interpreterProxy methodReturnValue: retOop!

1 0

VM Maker: VMMaker.oscog-eem.1686.mcz
by commits＠source.squeak.org 20 Feb '16

20 Feb '16

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.1686.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.1686 Author: eem Time: 20 February 2016, 10:50:20.57672 am UUID: 52f4115e-2108-421a-b31c-12d08603a073 Ancestors: VMMaker.oscog-eem.1685 Rename VMMaker-Plugins-Alien to VMMaker-Plugins-FFI and put all the FFI plugins there-in. Get ThreadedFFICalloutState's variable names right. Better define PLATFORM_API_USES_CALLEE_POPS_CONVENTION in ThreadedFFIPlugin's preambleCCode. Only WIN32 needs this as yet. Implement structure return for X64SysV and X64WIN64. =============== Diff against VMMaker.oscog-eem.1685 =============== Item was changed: SystemOrganization addCategory: #VMMaker! SystemOrganization addCategory: #'VMMaker-Building'! SystemOrganization addCategory: #'VMMaker-Interpreter'! SystemOrganization addCategory: #'VMMaker-InterpreterSimulation'! SystemOrganization addCategory: #'VMMaker-InterpreterSimulation-Morphic'! SystemOrganization addCategory: #'VMMaker-JIT'! SystemOrganization addCategory: #'VMMaker-JITSimulation'! SystemOrganization addCategory: #'VMMaker-Multithreading'! SystemOrganization addCategory: #'VMMaker-Plugins'! + SystemOrganization addCategory: #'VMMaker-Plugins-FFI'! - SystemOrganization addCategory: #'VMMaker-Plugins-Alien'! SystemOrganization addCategory: #'VMMaker-Plugins-IOS'! SystemOrganization addCategory: #'VMMaker-PostProcessing'! SystemOrganization addCategory: #'VMMaker-SmartSyntaxPlugins'! SystemOrganization addCategory: #'VMMaker-SpurMemoryManager'! SystemOrganization addCategory: #'VMMaker-SpurMemoryManagerSimulation'! SystemOrganization addCategory: #'VMMaker-Support'! SystemOrganization addCategory: #'VMMaker-Tests'! SystemOrganization addCategory: #'VMMaker-Translation to C'! Item was changed: InterpreterPlugin subclass: #FFIPlugin instanceVariableNames: 'ffiLastError ffiArgSpec ffiArgSpecSize ffiArgHeader ffiRetOop ffiRetClass ffiRetSpec ffiRetSpecSize ffiRetHeader ffiLogEnabled externalFunctionInstSize' classVariableNames: '' poolDictionaries: 'FFIConstants' + category: 'VMMaker-Plugins-FFI'! - category: 'VMMaker-Plugins'! !FFIPlugin commentStamp: 'eem 11/24/2014 11:00' prior: 0! This plugin provides access to foreign function interfaces on those platforms that provide such. For example Windows DLLs and unix .so's. It is obsolete, having been superceded by the ThreadedFFIPlugin.! Item was changed: InterpreterPlugin subclass: #IA32ABIPlugin instanceVariableNames: '' classVariableNames: '' poolDictionaries: 'VMBasicConstants' + category: 'VMMaker-Plugins-FFI'! - category: 'VMMaker-Plugins-Alien'! !IA32ABIPlugin commentStamp: 'eem 1/25/2016 11:59' prior: 0! This plugin implements the Alien foreign-function interface, a small elaboration on the Strongtalk FFI. Call-outs are performed by a small number of primitives, one each for the four different kinds of return linkage on x86. The primitives are var-args. Each primitive has a signature something like: primFFICall: functionAddress <Alien> result: result <Alien> with: firstArg <Alien> ... with: lastArg <Alien> <primitive: 'primCallOutIntegralReturn' module: 'IA32ABI'> which arranges to call-out supplying the arguments to the function pointed to by functionAddress, copying its return value into result. The call-out primitives are as follows: primCallOutIntegralReturn call a function which returns up to 8 bytes in %eax & %edx, taking up to the first 4 bytes from %eax. i.e. if the sizeof(result) is 4 or less only bytes from %eax will be returned, but if more then the first 4 bytes of result will be assigned with %eax and subsequent bytes with %edx, up to a total of 8 bytes. primCallOutPointerReturn call a function which returns a pointer in %eax. Assign sizeof(result) bytes from this pointer into the result. primCallOutFloatReturn call a function which returns a 4 byte single-precision float in %f0, assigning the 4 bytes of %f0 into result. primCallOutDoubleReturn call a function which returns an 8 byte double-precision float in %f0, assigning the 8 bytes of %f0 into result. ! Item was changed: IA32ABIPlugin subclass: #IA32ABIPluginSimulator instanceVariableNames: '' classVariableNames: '' poolDictionaries: '' + category: 'VMMaker-Plugins-FFI'! - category: 'VMMaker-Plugins-Alien'! Item was changed: ThreadedFFIPlugin subclass: #ThreadedARMFFIPlugin instanceVariableNames: '' classVariableNames: 'NumFloatRegArgs NumIntRegArgs' poolDictionaries: '' + category: 'VMMaker-Plugins-FFI'! - category: 'VMMaker-Plugins'! !ThreadedARMFFIPlugin commentStamp: '<historical>' prior: 0! This subclass is for the 32-bit ARM ABI. It typically has 4 integer registers.! Item was removed: - ----- Method: ThreadedARMFFIPlugin>>dispatchFunctionPointer:with:with:with:with: (in category 'callout support') ----- - dispatchFunctionPointer: aFunctionPointer with: int1 with: int2 with: int3 with: int4 - "In C aFunctionPointer is void (*aFunctionPointer)(int, int, int, int)" - <cmacro: '(aFunctionPointer, int1, int2, int3, int4) (aFunctionPointer)(int1, int2, int3, int4)'> - ^self - perform: aFunctionPointer - with: int1 - with: int2 - with: int3 - with: int4! Item was changed: ----- Method: ThreadedARMFFIPlugin>>ffiReturnStruct:ofType:in: (in category 'callout support') ----- ffiReturnStruct: longLongRet ofType: ffiRetType in: calloutState <var: #longLongRet type: #usqLong> <var: #calloutState type: #'CalloutState *'> + "Create a structure return value from an external function call. The value has been stored in + alloca'ed space pointed to by the calloutState or in the return value." - "Create a structure return value from an external function call. The value as been stored in - alloca'ed space pointed to by the calloutState." | retOop retClass oop | <inline: true> retClass := interpreterProxy fetchPointer: 1 ofObject: ffiRetType. retOop := interpreterProxy instantiateClass: retClass indexableSize: 0. self remapOop: retOop in: [oop := interpreterProxy instantiateClass: interpreterProxy classByteArray indexableSize: calloutState structReturnSize]. + self mem: (interpreterProxy firstIndexableField: oop) + cp: ((self returnStructInRegisters: calloutState structReturnSize) + ifTrue: [self addressOf: longLongRet] + ifFalse: [calloutState limit]) + y: calloutState structReturnSize. - (self returnStructInRegisters: calloutState structReturnSize) - ifTrue: - [self mem: (interpreterProxy firstIndexableField: oop) cp: (self addressOf: longLongRet) y: calloutState structReturnSize] - ifFalse: - [self mem: (interpreterProxy firstIndexableField: oop) cp: calloutState limit y: calloutState structReturnSize]. interpreterProxy storePointer: 0 ofObject: retOop withValue: oop. ^interpreterProxy methodReturnValue: retOop! Item was changed: VMStructType subclass: #ThreadedFFICalloutState instanceVariableNames: 'argVector currentArg limit structReturnSize callFlags ffiArgSpec ffiArgSpecSize ffiArgHeader ffiRetHeader stringArgIndex stringArgs' classVariableNames: '' poolDictionaries: '' + category: 'VMMaker-Plugins-FFI'! - category: 'VMMaker-Plugins'! !ThreadedFFICalloutState commentStamp: '<historical>' prior: 0! Instances of the receiver hold the per-thread state of a call-out. long *argVector pointer to the start of the alloca'ed argument marshalling area long *currentArg pointer to the position in argVector to write the current argument long *limit the limit of the argument marshalling area (for bounds checking) structReturnSize the size of the space allocated for the structure return, if any callFlags the value of the ExternalFunctionFlagsIndex field in the ExternalFunction being called ffiArgSpec et al type information for the current argument being marshalled stringArgIndex the count of temporary strings used for marshalling Smalltalk strings to character strings. stringArgs pointers to the temporary strings used for marshalling Smalltalk strings to character strings.! Item was changed: ThreadedFFICalloutState subclass: #ThreadedFFICalloutStateForARM instanceVariableNames: 'integerRegisterIndex integerRegisters floatRegisterIndex backfillFloatRegisterIndex floatRegisters' classVariableNames: '' poolDictionaries: '' + category: 'VMMaker-Plugins-FFI'! - category: 'VMMaker-Plugins'! Item was changed: ThreadedFFICalloutState subclass: #ThreadedFFICalloutStateForPPC instanceVariableNames: 'registerIndex integerRegisters floatRegisters' classVariableNames: '' poolDictionaries: '' + category: 'VMMaker-Plugins-FFI'! - category: 'VMMaker-Plugins'! Item was changed: ThreadedFFICalloutState subclass: #ThreadedFFICalloutStateForX64 + instanceVariableNames: 'integerRegisterIndex floatRegisterIndex integerRegisters floatRegisters' - instanceVariableNames: 'registerIndex integerRegisters floatRegisters' classVariableNames: '' poolDictionaries: '' + category: 'VMMaker-Plugins-FFI'! - category: 'VMMaker-Plugins'! !ThreadedFFICalloutStateForX64 commentStamp: 'eem 2/16/2016 19:13' prior: 0! A ThreadedFFICalloutStateForX64 is a holder for the callout state maintained while marshalling an FFI call on an X64 (x86-64) system.! Item was added: + ----- Method: ThreadedFFICalloutStateForX64>>floatRegisterIndex (in category 'accessing') ----- + floatRegisterIndex + + ^ floatRegisterIndex! Item was added: + ----- Method: ThreadedFFICalloutStateForX64>>floatRegisterIndex: (in category 'accessing') ----- + floatRegisterIndex: anObject + + ^floatRegisterIndex := anObject! Item was added: + ----- Method: ThreadedFFICalloutStateForX64>>integerRegisterIndex (in category 'accessing') ----- + integerRegisterIndex + + ^ integerRegisterIndex! Item was added: + ----- Method: ThreadedFFICalloutStateForX64>>integerRegisterIndex: (in category 'accessing') ----- + integerRegisterIndex: anObject + + ^integerRegisterIndex := anObject! Item was removed: - ----- Method: ThreadedFFICalloutStateForX64>>registerIndex (in category 'accessing') ----- - registerIndex - - ^ registerIndex! Item was removed: - ----- Method: ThreadedFFICalloutStateForX64>>registerIndex: (in category 'accessing') ----- - registerIndex: anObject - - ^registerIndex := anObject! Item was changed: ThreadedFFICalloutStateForX64 subclass: #ThreadedFFICalloutStateForX64SysV instanceVariableNames: '' classVariableNames: '' poolDictionaries: '' + category: 'VMMaker-Plugins-FFI'! - category: 'VMMaker-Plugins'! Item was changed: ThreadedFFICalloutStateForX64 subclass: #ThreadedFFICalloutStateForX64Win64 instanceVariableNames: '' classVariableNames: '' poolDictionaries: '' + category: 'VMMaker-Plugins-FFI'! - category: 'VMMaker-Plugins'! Item was changed: InterpreterPlugin subclass: #ThreadedFFIPlugin instanceVariableNames: 'ffiLogEnabled externalFunctionInstSize ffiLastError' classVariableNames: 'DefaultMaxStackSize ExternalFunctionAddressIndex ExternalFunctionArgTypesIndex ExternalFunctionFlagsIndex ExternalFunctionStackSizeIndex MaxNumArgs' poolDictionaries: 'FFIConstants' + category: 'VMMaker-Plugins-FFI'! - category: 'VMMaker-Plugins'! !ThreadedFFIPlugin commentStamp: 'eem 7/21/2011 11:38' prior: 0! This plugin provides access to foreign function interfaces on those platforms that provide such. For example Windows DLLs and unix .so's. This version is designed to support reentrancy and threading, and so uses alloca to stack allocate all memory needed for a given callout. Specific platforms are implemented by concrete subclasses. Threaded calls can only be provided within the context of the threaded VM; othewise calls must be blocking. So code specific to threading is guarded with a self cppIf: COGMTVM ifTrue: [...] form to arrange that it is only compiled in the threaded VM context.! Item was changed: ----- Method: ThreadedFFIPlugin class>>preambleCCode (in category 'translation') ----- preambleCCode "For a source of builtin defines grep for builtin_define in a gcc release config directory." ^' #include "sqAssert.h" /* for assert */ #ifdef _MSC_VER # define alloca _alloca #endif #if defined(__GNUC__) && (defined(_X86_) || defined(i386) || defined(__i386) || defined(__i386__)) # define setsp(sp) asm volatile ("movl %0,%%esp" : : "m"(sp)) # define getsp() ({ void *esp; asm volatile ("movl %%esp,%0" : "=r"(esp) : ); esp;}) # elif defined(__GNUC__) && (defined(__arm__)) # define setsp(sp) asm volatile ("ldr %%sp, %0" : : "m"(sp)) # define getsp() ({ void *sp; asm volatile ("mov %0, %%sp" : "=r"(sp) : ); sp;}) #endif #if !!defined(getsp) # define getsp() 0 #endif #if !!defined(setsp) # define setsp(ignored) 0 #endif #if !!defined(STACK_ALIGN_BYTES) # if __APPLE__ && __MACH__ && __i386__ # define STACK_ALIGN_BYTES 16 # elif __linux__ && __i386__ # define STACK_ALIGN_BYTES 16 # elif defined(__amd64__) || defined(__x86_64__) || defined(__amd64) || defined(__x86_64) # define STACK_ALIGN_BYTES 16 # elif defined(powerpc) || defined(__powerpc__) || defined(_POWER) || defined(__POWERPC__) || defined(__PPC__) # define STACK_ALIGN_BYTES 16 # elif defined(__sparc64__) || defined(__sparcv9__) || defined(__sparc_v9__) /* must precede 32-bit sparc defs */ # define STACK_ALIGN_BYTES 16 # elif defined(sparc) || defined(__sparc__) || defined(__sparclite__) # define STACK_ALIGN_BYTES 8 # elif defined(__arm__) # define STACK_ALIGN_BYTES 8 # else # define STACK_ALIGN_BYTES 0 # endif #endif /* !!defined(STACK_ALIGN_BYTES) */ #if !!defined(STACK_OFFSET_BYTES) # define STACK_OFFSET_BYTES 0 #endif #if defined(_X86_) || defined(i386) || defined(__i386) || defined(__i386__) /* Both Mac OS X x86 and Win32 x86 return structs of a power of two in size * less than or equal to eight bytes in length in registers. Linux never does so. */ # if __linux__ # define WIN32_X86_STRUCT_RETURN 0 # else # define WIN32_X86_STRUCT_RETURN 1 # endif # if WIN32 # define PLATFORM_API_USES_CALLEE_POPS_CONVENTION 1 - # else - # define PLATFORM_API_USES_CALLEE_POPS_CONVENTION 0 # endif #endif /* defined(_X86_) || defined(i386) || defined(__i386) || defined(__i386__) */ - #if defined(__arm__) - # define WIN32_X86_STRUCT_RETURN 0 - # define PLATFORM_API_USES_CALLEE_POPS_CONVENTION 0 - #endif /* defined(__arm__) */ - #if !!defined(ALLOCA_LIES_SO_USE_GETSP) # if defined(__MINGW32__) && (__GNUC__ >= 3) /* * cygwin -mno-cygwin (MinGW) gcc 3.4.x''s alloca is a library routine that answers * %esp + 4, so the outgoing stack is offset by one word if uncorrected. * Grab the actual stack pointer to correct. */ # define ALLOCA_LIES_SO_USE_GETSP 1 # else # define ALLOCA_LIES_SO_USE_GETSP 0 # endif #endif /* !!defined(ALLOCA_LIES_SO_USE_GETSP) */ + #if !!defined(PLATFORM_API_USES_CALLEE_POPS_CONVENTION) + # define PLATFORM_API_USES_CALLEE_POPS_CONVENTION 0 + #endif + /* The dispatchOn:in:with:with: generates an unwanted call on error. Just squash it. */ #define error(foo) 0 #ifndef SQUEAK_BUILTIN_PLUGIN /* but print assert failures. */ void warning(char *s) { /* Print an error message but don''t exit. */ printf("\n%s\n", s); } #endif /* sanitize */ #ifdef SQUEAK_BUILTIN_PLUGIN # define EXTERN #else # define EXTERN extern #endif int ffiLogCallOfLength(void *, int); /* sqFFIPlugin.c */ int ffiLogFileNameOfLength(void *, int); /* sqFFIPlugin.c */ EXTERN void initSurfacePluginFunctionPointers(); /* sqManualSurface.c */ EXTERN int createManualSurface(int, int, int, int, int); /* sqManualSurface.c */ EXTERN int destroyManualSurface(int); /* sqManualSurface.c */ EXTERN int setManualSurfacePointer(int, void*); /* sqManualSurface.c */ '! Item was added: + ----- Method: ThreadedFFIPlugin>>dispatchFunctionPointer:with:with:with:with: (in category 'callout support') ----- + dispatchFunctionPointer: aFunctionPointer with: int1 with: int2 with: int3 with: int4 + "In C aFunctionPointer is void (*aFunctionPointer)(int, int, int, int)" + <cmacro: '(aFunctionPointer, int1, int2, int3, int4) (aFunctionPointer)(int1, int2, int3, int4)'> + ^self + perform: aFunctionPointer + with: int1 + with: int2 + with: int3 + with: int4! Item was added: + ----- Method: ThreadedFFIPlugin>>dispatchFunctionPointer:with:with:with:with:with:with: (in category 'callout support') ----- + dispatchFunctionPointer: aFunctionPointer with: int1 with: int2 with: int3 with: int4 with: int5 with: int6 + "In C aFunctionPointer is void (*aFunctionPointer)(int, int, int, int)" + <cmacro: '(aFunctionPointer,a1,a2, a3, a4,a5,a6) (aFunctionPointer)(a1,a2, a3, a4,a5,a6)'> + ^self + perform: aFunctionPointer + with: int1 + with: int2 + with: int3 + with: int4 + with: int5 + with: int6! Item was added: + VMStructType subclass: #ThreadedFFIX64SixteenByteReturn + instanceVariableNames: 'a b' + classVariableNames: '' + poolDictionaries: '' + category: 'VMMaker-Plugins-FFI'! Item was added: + ----- Method: ThreadedFFIX64SixteenByteReturn class>>structTypeName (in category 'translation') ----- + structTypeName + ^'SixteenByteReturn'! Item was changed: ThreadedFFIPlugin subclass: #ThreadedIA32FFIPlugin instanceVariableNames: '' classVariableNames: '' poolDictionaries: '' + category: 'VMMaker-Plugins-FFI'! - category: 'VMMaker-Plugins'! !ThreadedIA32FFIPlugin commentStamp: '<historical>' prior: 0! This subclass is for the IA32/x86 ABI.! Item was changed: ThreadedFFIPlugin subclass: #ThreadedPPCBEFFIPlugin instanceVariableNames: '' classVariableNames: 'NumRegArgs' poolDictionaries: '' + category: 'VMMaker-Plugins-FFI'! - category: 'VMMaker-Plugins'! !ThreadedPPCBEFFIPlugin commentStamp: '<historical>' prior: 0! This subclass is for the PowerPC ABI in BigEndian mode. It typically uses 8 integer registers and 8 single-precision floating-point registers that shadow the top 8 words on the stack.! Item was changed: ThreadedFFIPlugin subclass: #ThreadedX64FFIPlugin instanceVariableNames: '' classVariableNames: 'NumFloatRegArgs NumIntRegArgs WordSize' poolDictionaries: '' + category: 'VMMaker-Plugins-FFI'! - category: 'VMMaker-Plugins'! !ThreadedX64FFIPlugin commentStamp: 'eem 2/19/2016 15:03' prior: 0! This is an abstract superclass for the System V and WIN64 x86-64 ABIs that share a lot of code other than for structure passing.! Item was changed: ThreadedX64FFIPlugin subclass: #ThreadedX64SysVFFIPlugin instanceVariableNames: '' classVariableNames: '' poolDictionaries: '' + category: 'VMMaker-Plugins-FFI'! - category: 'VMMaker-Plugins'! !ThreadedX64SysVFFIPlugin commentStamp: 'eem 2/17/2016 20:03' prior: 0! This subclass is for the System V x86-64 ABI. The System V ABI uses 6 integer registers and 8 double-precision floating-point registers. See http://www.x86-64.org/documentation/abi.pdf. It seems that Mac OS X and linux use draft version 0.90, http://people.freebsd.org/~obrien/amd64-elf-abi.pdf. Note that the System V x86-64 ABI decomposes structs of 2 eightbytes or smaller passed by value across available parameter registers. double fields will be passed in an xmm register.! Item was changed: ----- Method: ThreadedX64SysVFFIPlugin>>ffiCalloutTo:SpecOnStack:in: (in category 'callout support') ----- ffiCalloutTo: procAddr SpecOnStack: specOnStack in: calloutState <var: #procAddr type: #'void *'> <var: #calloutState type: #'CalloutState *'> <var: #loadFloatRegs declareC: 'extern void loadFloatRegs(double, double, double, double, double, double, double, double)'> "Go out, call this guy and create the return value. This *must* be inlined because of the alloca of the outgoing stack frame in ffiCall:WithFlags:NumArgs:Args:AndTypes:" | myThreadIndex atomicType floatRet intRet loadFloatRegs oop | <var: #floatRet type: #double> + <var: #intRet type: 'SixteenByteReturn'> - <var: #intRet type: #usqLong> <inline: true> self cCode: '' inSmalltalk: [loadFloatRegs := #used. loadFloatRegs class]. self cppIf: COGMTVM ifTrue: [(calloutState callFlags anyMask: FFICallFlagThreaded) ifTrue: [myThreadIndex := interpreterProxy disownVM: 0]]. self registerArgsSlop + self cStackAlignment > 0 ifTrue: [self setsp: calloutState argVector]. calloutState floatRegisterIndex > 0 ifTrue: [self + load: (calloutState floatRegisters at: 0) + Flo: (calloutState floatRegisters at: 1) + a: (calloutState floatRegisters at: 2) + t: (calloutState floatRegisters at: 3) + R: (calloutState floatRegisters at: 4) + e: (calloutState floatRegisters at: 5) + g: (calloutState floatRegisters at: 6) + s: (calloutState floatRegisters at: 7)]. - load: ((calloutState floatRegisters at: 0) at: 0) - Flo: ((calloutState floatRegisters at: 1) at: 0) - a: ((calloutState floatRegisters at: 2) at: 0) - t: ((calloutState floatRegisters at: 3) at: 0) - R: ((calloutState floatRegisters at: 4) at: 0) - e: ((calloutState floatRegisters at: 5) at: 0) - g: ((calloutState floatRegisters at: 6) at: 0) - s: ((calloutState floatRegisters at: 7) at: 0)]. atomicType := self atomicTypeOf: calloutState ffiRetHeader. (atomicType >> 1) = (FFITypeSingleFloat > 1) ifTrue: [atomicType = FFITypeSingleFloat ifTrue: [floatRet := self dispatchFunctionPointer: (self cCoerceSimple: procAddr to: 'float (*)(long, long, long, long, long, long)') with: (calloutState integerRegisters at: 0) with: (calloutState integerRegisters at: 1) with: (calloutState integerRegisters at: 2) with: (calloutState integerRegisters at: 3) with: (calloutState integerRegisters at: 4) with: (calloutState integerRegisters at: 5)] ifFalse: "atomicType = FFITypeDoubleFloat" [floatRet := self dispatchFunctionPointer: (self cCoerceSimple: procAddr to: 'double (*)(long, long, long, long, long, long)') with: (calloutState integerRegisters at: 0) with: (calloutState integerRegisters at: 1) with: (calloutState integerRegisters at: 2) with: (calloutState integerRegisters at: 3) with: (calloutState integerRegisters at: 4) with: (calloutState integerRegisters at: 5)]] ifFalse: [intRet := self + dispatchFunctionPointer: (self cCoerceSimple: procAddr to: 'SixteenByteReturn (*)(long, long, long, long, long, long)') - dispatchFunctionPointer: (self cCoerceSimple: procAddr to: 'usqLong (*)(long, long, long, long, long, long)') with: (calloutState integerRegisters at: 0) with: (calloutState integerRegisters at: 1) with: (calloutState integerRegisters at: 2) with: (calloutState integerRegisters at: 3) with: (calloutState integerRegisters at: 4) with: (calloutState integerRegisters at: 5)]. "undo any callee argument pops because it may confuse stack management with the alloca." (self isCalleePopsConvention: calloutState callFlags) ifTrue: [self setsp: calloutState argVector]. self cppIf: COGMTVM ifTrue: [(calloutState callFlags anyMask: FFICallFlagThreaded) ifTrue: [interpreterProxy ownVM: myThreadIndex]]. (calloutState ffiRetHeader anyMask: FFIFlagPointer+FFIFlagStructure) ifTrue: ["Note: Order is important here since FFIFlagPointer + FFIFlagStructure is used to represent 'typedef void* VoidPointer' and VoidPointer must be returned as pointer *not* as struct." (calloutState ffiRetHeader anyMask: FFIFlagPointer) ifTrue: [oop := self ffiReturnPointer: intRet ofType: (self ffiReturnType: specOnStack) in: calloutState] ifFalse: [oop := self ffiReturnStruct: intRet ofType: (self ffiReturnType: specOnStack) in: calloutState]. ^oop]. (atomicType >> 1) = (FFITypeSingleFloat > 1) ifTrue: [oop := interpreterProxy floatObjectOf: floatRet] ifFalse: [oop := self ffiCreateIntegralResultOop: intRet ofAtomicType: atomicType in: calloutState]. ^interpreterProxy methodReturnValue: oop! Item was added: + ----- Method: ThreadedX64SysVFFIPlugin>>ffiReturnStruct:ofType:in: (in category 'callout support') ----- + ffiReturnStruct: sixteenByteRet ofType: ffiRetType in: calloutState + <var: #sixteenByteRet type: 'SixteenByteReturn'> + <var: #calloutState type: #'CalloutState *'> + "Create a structure return value from an external function call. The value has been stored in + alloca'ed space pointed to by the calloutState or in the return value." + | retOop retClass oop | + <inline: true> + retClass := interpreterProxy fetchPointer: 1 ofObject: ffiRetType. + retOop := interpreterProxy instantiateClass: retClass indexableSize: 0. + self remapOop: retOop + in: [oop := interpreterProxy + instantiateClass: interpreterProxy classByteArray + indexableSize: calloutState structReturnSize]. + self mem: (interpreterProxy firstIndexableField: oop) + cp: ((self returnStructInRegisters: calloutState structReturnSize) + ifTrue: [self addressOf: sixteenByteRet] + ifFalse: [calloutState limit]) + y: calloutState structReturnSize. + interpreterProxy storePointer: 0 ofObject: retOop withValue: oop. + ^interpreterProxy methodReturnValue: retOop! Item was changed: ThreadedX64FFIPlugin subclass: #ThreadedX64Win64FFIPlugin instanceVariableNames: '' classVariableNames: '' poolDictionaries: '' + category: 'VMMaker-Plugins-FFI'! - category: 'VMMaker-Plugins'! !ThreadedX64Win64FFIPlugin commentStamp: 'eem 2/16/2016 19:39' prior: 0! This subclass is for the Win64 x86-64 ABI. The System V ABI uses 4 integer registers and 4 double-precision floating-point registers. See w.g. https://msdn.microsoft.com/en-us/library/ms235286.aspx, or google for "Overview of x64 Calling Conventions - MSDN - Microsoft". Note that unlike the System V x86-64 ABI, the Win64 ABI does /not/ decompose structs passed by value across available parameter registers.! Item was changed: ----- Method: ThreadedX64Win64FFIPlugin>>ffiCalloutTo:SpecOnStack:in: (in category 'callout support') ----- ffiCalloutTo: procAddr SpecOnStack: specOnStack in: calloutState <var: #procAddr type: #'void *'> <var: #calloutState type: #'CalloutState *'> <var: #loadFloatRegs declareC: 'extern void loadFloatRegs(double, double, double, double)'> "Go out, call this guy and create the return value. This *must* be inlined because of the alloca of the outgoing stack frame in ffiCall:WithFlags:NumArgs:Args:AndTypes:" | myThreadIndex atomicType floatRet intRet loadFloatRegs oop | <var: #floatRet type: #double> <var: #intRet type: #usqLong> <inline: true> self cCode: '' inSmalltalk: [loadFloatRegs := #used. loadFloatRegs class]. self cppIf: COGMTVM ifTrue: [(calloutState callFlags anyMask: FFICallFlagThreaded) ifTrue: [myThreadIndex := interpreterProxy disownVM: 0]]. self registerArgsSlop + self cStackAlignment > 0 ifTrue: [self setsp: calloutState argVector]. calloutState floatRegisterIndex > 0 ifTrue: [self + load: (calloutState floatRegisters at: 0) + Flo: (calloutState floatRegisters at: 1) + at: (calloutState floatRegisters at: 2) + Re: (calloutState floatRegisters at: 3) + gs: (calloutState floatRegisters at: 4)]. - load: ((calloutState floatRegisters at: 0) at: 0) - Flo: ((calloutState floatRegisters at: 1) at: 0) - at: ((calloutState floatRegisters at: 2) at: 0) - Re: ((calloutState floatRegisters at: 3) at: 0) - gs: ((calloutState floatRegisters at: 4) at: 0)]. atomicType := self atomicTypeOf: calloutState ffiRetHeader. (atomicType >> 1) = (FFITypeSingleFloat > 1) ifTrue: [atomicType = FFITypeSingleFloat ifTrue: [floatRet := self dispatchFunctionPointer: (self cCoerceSimple: procAddr to: 'float (*)(long, long, long, long)') with: (calloutState integerRegisters at: 0) with: (calloutState integerRegisters at: 1) with: (calloutState integerRegisters at: 2) with: (calloutState integerRegisters at: 3)] ifFalse: "atomicType = FFITypeDoubleFloat" [floatRet := self dispatchFunctionPointer: (self cCoerceSimple: procAddr to: 'double (*)(long, long, long, long)') with: (calloutState integerRegisters at: 0) with: (calloutState integerRegisters at: 1) with: (calloutState integerRegisters at: 2) with: (calloutState integerRegisters at: 3)]] ifFalse: [intRet := self dispatchFunctionPointer: (self cCoerceSimple: procAddr to: 'usqLong (*)(long, long, long, long)') with: (calloutState integerRegisters at: 0) with: (calloutState integerRegisters at: 1) with: (calloutState integerRegisters at: 2) with: (calloutState integerRegisters at: 3)]. "undo any callee argument pops because it may confuse stack management with the alloca." (self isCalleePopsConvention: calloutState callFlags) ifTrue: [self setsp: calloutState argVector]. self cppIf: COGMTVM ifTrue: [(calloutState callFlags anyMask: FFICallFlagThreaded) ifTrue: [interpreterProxy ownVM: myThreadIndex]]. (calloutState ffiRetHeader anyMask: FFIFlagPointer+FFIFlagStructure) ifTrue: ["Note: Order is important here since FFIFlagPointer + FFIFlagStructure is used to represent 'typedef void* VoidPointer' and VoidPointer must be returned as pointer *not* as struct." (calloutState ffiRetHeader anyMask: FFIFlagPointer) ifTrue: [oop := self ffiReturnPointer: intRet ofType: (self ffiReturnType: specOnStack) in: calloutState] ifFalse: [oop := self ffiReturnStruct: intRet ofType: (self ffiReturnType: specOnStack) in: calloutState]. ^oop]. (atomicType >> 1) = (FFITypeSingleFloat > 1) ifTrue: [oop := interpreterProxy floatObjectOf: floatRet] ifFalse: [oop := self ffiCreateIntegralResultOop: intRet ofAtomicType: atomicType in: calloutState]. ^interpreterProxy methodReturnValue: oop! Item was added: + ----- Method: ThreadedX64Win64FFIPlugin>>ffiReturnStruct:ofType:in: (in category 'callout support') ----- + ffiReturnStruct: intRet ofType: ffiRetType in: calloutState + <var: #intRet type: #usqLong> + <var: #calloutState type: #'CalloutState *'> + "Create a structure return value from an external function call. The value has been stored in + alloca'ed space pointed to by the calloutState or in the return value." + | retOop retClass oop | + <inline: true> + retClass := interpreterProxy fetchPointer: 1 ofObject: ffiRetType. + retOop := interpreterProxy instantiateClass: retClass indexableSize: 0. + self remapOop: retOop + in: [oop := interpreterProxy + instantiateClass: interpreterProxy classByteArray + indexableSize: calloutState structReturnSize]. + self mem: (interpreterProxy firstIndexableField: oop) + cp: ((self returnStructInRegisters: calloutState structReturnSize) + ifTrue: [self addressOf: intRet] + ifFalse: [calloutState limit]) + y: calloutState structReturnSize. + interpreterProxy storePointer: 0 ofObject: retOop withValue: oop. + ^interpreterProxy methodReturnValue: retOop! Item was changed: VMStructType subclass: #VMCallbackReturnValue instanceVariableNames: 'type pad crvrvs' classVariableNames: '' poolDictionaries: '' + category: 'VMMaker-Plugins-FFI'! - category: 'VMMaker-Plugins-Alien'! !VMCallbackReturnValue commentStamp: 'eem 10/14/2010 09:29' prior: 0! A VMCallbackReturnValue supports legacy Alien callbacks.!

1 0

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

Vm-dev February 2016