Revision: 3170 Author: eliot Date: 2014-12-10 16:32:13 -0800 (Wed, 10 Dec 2014) Log Message: ----------- CogVM source as per VMMaker.oscog-eem.975 Fix 64-bit issues in BitBlt Drop MIDI and RE plugins. Modified Paths: -------------- branches/Cog/nscogsrc/plugins/BitBltPlugin/BitBltPlugin.c branches/Cog/nscogsrc/plugins/DropPlugin/DropPlugin.c branches/Cog/nscogsrc/plugins/RePlugin/RePlugin.c branches/Cog/platforms/unix/plugins/DropPlugin/sqUnixDragDrop.c branches/Cog/platforms/unix/plugins/FileCopyPlugin/sqUnixFileCopyPlugin.c branches/Cog/platforms/win32/vm/sqWin32PluginSupport.c branches/Cog/src/plugins/BitBltPlugin/BitBltPlugin.c branches/Cog/src/plugins/DropPlugin/DropPlugin.c branches/Cog/src/plugins/MIDIPlugin/MIDIPlugin.c branches/Cog/src/plugins/RePlugin/RePlugin.c Property Changed: ---------------- branches/Cog/platforms/Cross/vm/sqSCCSVersion.h Modified: branches/Cog/nscogsrc/plugins/BitBltPlugin/BitBltPlugin.c =================================================================== --- branches/Cog/nscogsrc/plugins/BitBltPlugin/BitBltPlugin.c 2014-12-10 23:25:38 UTC (rev 3169) +++ branches/Cog/nscogsrc/plugins/BitBltPlugin/BitBltPlugin.c 2014-12-11 00:32:13 UTC (rev 3170) @@ -1,9 +1,9 @@ /* Automatically generated by - SmartSyntaxPluginCodeGenerator VMMaker.oscog-tpr.949 uuid: f88be574-4771-44fb-a08e-f1312faaec73 + SmartSyntaxPluginCodeGenerator VMMaker.oscog-eem.975 uuid: de22d941-0268-4e60-a8be-89a3a88aa567 from - BitBltSimulation VMMaker.oscog-tpr.949 uuid: f88be574-4771-44fb-a08e-f1312faaec73 + BitBltSimulation VMMaker.oscog-eem.975 uuid: de22d941-0268-4e60-a8be-89a3a88aa567 */ -static char __buildInfo[] = "BitBltSimulation VMMaker.oscog-tpr.949 uuid: f88be574-4771-44fb-a08e-f1312faaec73 " __DATE__ ; +static char __buildInfo[] = "BitBltSimulation VMMaker.oscog-eem.975 uuid: de22d941-0268-4e60-a8be-89a3a88aa567 " __DATE__ ; @@ -345,9 +345,9 @@ }; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "BitBltPlugin VMMaker.oscog-tpr.949 (i)" + "BitBltPlugin VMMaker.oscog-eem.975 (i)" #else - "BitBltPlugin VMMaker.oscog-tpr.949 (e)" + "BitBltPlugin VMMaker.oscog-eem.975 (e)" #endif ; static sqInt noHalftone; @@ -5881,14 +5881,14 @@ static sqInt rgbComponentAlpha32(void) { - register int deltaX; + register long deltaX; sqInt deltaY; sqInt destWord; - register int dstIndex; + register long dstIndex; sqInt dstY; - register int sourceWord; + register long sourceWord; sqInt srcAlpha; - register int srcIndex; + register long srcIndex; sqInt srcY; Modified: branches/Cog/nscogsrc/plugins/DropPlugin/DropPlugin.c =================================================================== --- branches/Cog/nscogsrc/plugins/DropPlugin/DropPlugin.c 2014-12-10 23:25:38 UTC (rev 3169) +++ branches/Cog/nscogsrc/plugins/DropPlugin/DropPlugin.c 2014-12-11 00:32:13 UTC (rev 3170) @@ -1,9 +1,9 @@ /* Automatically generated by - VMPluginCodeGenerator VMMaker.oscog-eem.580 uuid: 751b08d4-d92e-440a-b3f6-cb2c76f52514 + VMPluginCodeGenerator VMMaker.oscog-eem.975 uuid: de22d941-0268-4e60-a8be-89a3a88aa567 from - DropPlugin VMMaker.oscog-eem.580 uuid: 751b08d4-d92e-440a-b3f6-cb2c76f52514 + DropPlugin VMMaker.oscog-eem.975 uuid: de22d941-0268-4e60-a8be-89a3a88aa567 */ -static char __buildInfo[] = "DropPlugin VMMaker.oscog-eem.580 uuid: 751b08d4-d92e-440a-b3f6-cb2c76f52514 " __DATE__ ; +static char __buildInfo[] = "DropPlugin VMMaker.oscog-eem.975 uuid: de22d941-0268-4e60-a8be-89a3a88aa567 " __DATE__ ; @@ -48,7 +48,7 @@ static sqInt msg(char *s); EXPORT(sqInt) primitiveDropRequestFileHandle(void); EXPORT(sqInt) primitiveDropRequestFileName(void); -EXPORT(sqInt) setFileAccessCallback(int address); +EXPORT(sqInt) setFileAccessCallback(sqInt address); EXPORT(sqInt) setInterpreter(struct VirtualMachine*anInterpreter); EXPORT(sqInt) shutdownModule(void); @@ -80,9 +80,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "DropPlugin VMMaker.oscog-eem.580 (i)" + "DropPlugin VMMaker.oscog-eem.975 (i)" #else - "DropPlugin VMMaker.oscog-eem.580 (e)" + "DropPlugin VMMaker.oscog-eem.975 (e)" #endif ; @@ -190,9 +190,9 @@ } EXPORT(sqInt) -setFileAccessCallback(int address) +setFileAccessCallback(sqInt address) { - return sqSecFileAccessCallback((void *) address); + return sqSecFileAccessCallback(((void *)address)); } Modified: branches/Cog/nscogsrc/plugins/RePlugin/RePlugin.c =================================================================== --- branches/Cog/nscogsrc/plugins/RePlugin/RePlugin.c 2014-12-10 23:25:38 UTC (rev 3169) +++ branches/Cog/nscogsrc/plugins/RePlugin/RePlugin.c 2014-12-11 00:32:13 UTC (rev 3170) @@ -1,9 +1,9 @@ /* Automatically generated by - SmartSyntaxPluginCodeGenerator VMMaker.oscog-eem.787 uuid: 4b38ebc1-339f-4523-a9fc-047923108211 + SmartSyntaxPluginCodeGenerator VMMaker.oscog-eem.975 uuid: de22d941-0268-4e60-a8be-89a3a88aa567 from - RePlugin VMMaker.oscog-eem.787 uuid: 4b38ebc1-339f-4523-a9fc-047923108211 + RePlugin VMMaker.oscog-eem.975 uuid: de22d941-0268-4e60-a8be-89a3a88aa567 */ -static char __buildInfo[] = "RePlugin VMMaker.oscog-eem.787 uuid: 4b38ebc1-339f-4523-a9fc-047923108211 " __DATE__ ; +static char __buildInfo[] = "RePlugin VMMaker.oscog-eem.975 uuid: de22d941-0268-4e60-a8be-89a3a88aa567 " __DATE__ ; @@ -126,9 +126,9 @@ static sqInt matchFlags; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "RePlugin VMMaker.oscog-eem.787 (i)" + "RePlugin VMMaker.oscog-eem.975 (i)" #else - "RePlugin VMMaker.oscog-eem.787 (e)" + "RePlugin VMMaker.oscog-eem.975 (e)" #endif ; static int netMemory = 0; @@ -301,22 +301,21 @@ if (failed()) { return null; } - pcrePtr = (int) pcre_compile(patternStrPtr, compileFlags, - &errorStrBuffer, &errorOffset, NULL); + pcrePtr = (sqInt) pcre_compile(patternStrPtr, compileFlags, &errorStrBuffer, &errorOffset, NULL); if (pcrePtr) { allocateByteArrayAndSetRcvrPCREPtrFromPCRE(pcrePtr); - extraPtr = (int) pcre_study((pcre *)pcrePtr, compileFlags, &errorStrBuffer); + extraPtr = (sqInt) pcre_study((pcre *)pcrePtr, compileFlags, &errorStrBuffer); allocateByteArrayAndSetRcvrExtraPtrFrom(extraPtr); /* begin rePluginFree: */ numFrees += 1; - if ((((void *) pcrePtr)) != null) { - free(((void *) pcrePtr)); + if ((((void *)pcrePtr)) != null) { + free(((void *)pcrePtr)); } if (extraPtr) { /* begin rePluginFree: */ numFrees += 1; - if ((((void *) extraPtr)) != null) { - free(((void *) extraPtr)); + if ((((void *)extraPtr)) != null) { + free(((void *)extraPtr)); } } if (failed()) { @@ -365,10 +364,10 @@ length = byteSizeOf(searchObject); /* begin loadRcvrFromStackAt: */ rcvr = stackObjectValue(1); - pcrePtr = ((int) (fetchArrayofObject(2, rcvr))); + pcrePtr = ((sqInt) (fetchArrayofObject(2, rcvr))); /* begin rcvrExtraPtr */ extraObj = fetchPointerofObject(3, rcvr); - extraPtr = ((int) ((!(extraObj == (nilObject())) + extraPtr = ((sqInt) ((!(extraObj == (nilObject())) ? arrayValueOf(extraObj) : 0))); matchFlags = fetchIntegerofObject(6, rcvr); @@ -436,10 +435,10 @@ /* Load Instance Variables */ searchBuffer += fromInteger; - pcrePtr = ((int) (fetchArrayofObject(2, rcvr))); + pcrePtr = ((sqInt) (fetchArrayofObject(2, rcvr))); /* begin rcvrExtraPtr */ extraObj = fetchPointerofObject(3, rcvr); - extraPtr = ((int) ((!(extraObj == (nilObject())) + extraPtr = ((sqInt) ((!(extraObj == (nilObject())) ? arrayValueOf(extraObj) : 0))); matchFlags = fetchIntegerofObject(6, rcvr); @@ -475,7 +474,7 @@ /* begin loadRcvrFromStackAt: */ rcvr = stackObjectValue(0); - pcrePtr = ((int) (fetchArrayofObject(2, rcvr))); + pcrePtr = ((sqInt) (fetchArrayofObject(2, rcvr))); pcre_fullinfo((const pcre *)pcrePtr, NULL, PCRE_INFO_CAPTURECOUNT, &ncap); pop(1); pushInteger(ncap); @@ -505,7 +504,7 @@ sqInt extraObj; extraObj = fetchPointerofObject(3, rcvr); - return ((int) ((!(extraObj == (nilObject())) + return ((sqInt) ((!(extraObj == (nilObject())) ? arrayValueOf(extraObj) : 0))); } @@ -549,7 +548,7 @@ static sqInt rcvrPCREBufferPtr(void) { - return ((int) (fetchArrayofObject(2, rcvr))); + return ((sqInt) (fetchArrayofObject(2, rcvr))); } Property changes on: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h ___________________________________________________________________ Modified: checkindate - Wed Dec 10 15:24:58 PST 2014 + Wed Dec 10 16:32:25 PST 2014 Modified: branches/Cog/platforms/unix/plugins/DropPlugin/sqUnixDragDrop.c =================================================================== --- branches/Cog/platforms/unix/plugins/DropPlugin/sqUnixDragDrop.c 2014-12-10 23:25:38 UTC (rev 3169) +++ branches/Cog/platforms/unix/plugins/DropPlugin/sqUnixDragDrop.c 2014-12-11 00:32:13 UTC (rev 3170) @@ -68,7 +68,7 @@ if (path) { // you cannot be serious? sqInt handle = instantiateClassindexableSize(classByteArray(), fileRecordSize()); - sqFileOpen((SQFile *)fileValueOf(handle), (int)path, strlen(path), 0); + sqFileOpen(fileValueOf(handle), path, strlen(path), 0); return handle; } return interpreterProxy->nilObject(); Modified: branches/Cog/platforms/unix/plugins/FileCopyPlugin/sqUnixFileCopyPlugin.c =================================================================== --- branches/Cog/platforms/unix/plugins/FileCopyPlugin/sqUnixFileCopyPlugin.c 2014-12-10 23:25:38 UTC (rev 3169) +++ branches/Cog/platforms/unix/plugins/FileCopyPlugin/sqUnixFileCopyPlugin.c 2014-12-11 00:32:13 UTC (rev 3170) @@ -122,7 +122,7 @@ int status= 0; char *from= (char *)alloca(srcNameSize + 1); char *to= (char *)alloca(dstNameSize + 1); - sqFilenameFromString(from, (int)srcName, srcNameSize); - sqFilenameFromString(to, (int)dstName, dstNameSize); + sqFilenameFromString(from, (sqInt)srcName, srcNameSize); + sqFilenameFromString(to, (sqInt)dstName, dstNameSize); return copy(from, to); } Modified: branches/Cog/platforms/win32/vm/sqWin32PluginSupport.c =================================================================== --- branches/Cog/platforms/win32/vm/sqWin32PluginSupport.c 2014-12-10 23:25:38 UTC (rev 3169) +++ branches/Cog/platforms/win32/vm/sqWin32PluginSupport.c 2014-12-11 00:32:13 UTC (rev 3170) @@ -19,22 +19,22 @@ DWORD g_WM_CLIENT_PIPE = 0; /* Client pipe */ -int stackObjectValue(int); -int stackIntegerValue(int); -int isBytes(int); -int byteSizeOf(int); -void *firstIndexableField(int); -int push(int); -int pop(int); -int positive32BitIntegerFor(int); -int nilObject(void); -int instantiateClassindexableSize(int, int); -int classByteArray(void); -int fileRecordSize(void); -SQFile *fileValueOf(int); -int failed(void); -int pushBool(int); -int getFullScreenFlag(void); +sqInt stackObjectValue(sqInt); +sqInt stacksqIntegerValue(sqInt); +sqInt isBytes(sqInt); +sqInt byteSizeOf(sqInt); +void *firstIndexableField(sqInt); +sqInt push(sqInt); +sqInt pop(sqInt); +sqInt positive32BitsqIntegerFor(sqInt); +sqInt nilObject(void); +sqInt instantiateClassindexableSize(sqInt, sqInt); +sqInt classByteArray(void); +sqInt fileRecordSize(void); +SQFile *fileValueOf(sqsqInt); +sqInt failed(void); +sqInt pushBool(sqInt); +sqInt getFullScreenFlag(void); void pluginGetURLRequest(int id, void* urlIndex, int urlSize, void* targetIndex, int targetSize); Modified: branches/Cog/src/plugins/BitBltPlugin/BitBltPlugin.c =================================================================== --- branches/Cog/src/plugins/BitBltPlugin/BitBltPlugin.c 2014-12-10 23:25:38 UTC (rev 3169) +++ branches/Cog/src/plugins/BitBltPlugin/BitBltPlugin.c 2014-12-11 00:32:13 UTC (rev 3170) @@ -1,9 +1,9 @@ /* Automatically generated by - SmartSyntaxPluginCodeGenerator VMMaker.oscog-tpr.949 uuid: f88be574-4771-44fb-a08e-f1312faaec73 + SmartSyntaxPluginCodeGenerator VMMaker.oscog-eem.975 uuid: de22d941-0268-4e60-a8be-89a3a88aa567 from - BitBltSimulation VMMaker.oscog-tpr.949 uuid: f88be574-4771-44fb-a08e-f1312faaec73 + BitBltSimulation VMMaker.oscog-eem.975 uuid: de22d941-0268-4e60-a8be-89a3a88aa567 */ -static char __buildInfo[] = "BitBltSimulation VMMaker.oscog-tpr.949 uuid: f88be574-4771-44fb-a08e-f1312faaec73 " __DATE__ ; +static char __buildInfo[] = "BitBltSimulation VMMaker.oscog-eem.975 uuid: de22d941-0268-4e60-a8be-89a3a88aa567 " __DATE__ ; @@ -345,9 +345,9 @@ }; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "BitBltPlugin VMMaker.oscog-tpr.949 (i)" + "BitBltPlugin VMMaker.oscog-eem.975 (i)" #else - "BitBltPlugin VMMaker.oscog-tpr.949 (e)" + "BitBltPlugin VMMaker.oscog-eem.975 (e)" #endif ; static sqInt noHalftone; @@ -5881,14 +5881,14 @@ static sqInt rgbComponentAlpha32(void) { - register int deltaX; + register long deltaX; sqInt deltaY; sqInt destWord; - register int dstIndex; + register long dstIndex; sqInt dstY; - register int sourceWord; + register long sourceWord; sqInt srcAlpha; - register int srcIndex; + register long srcIndex; sqInt srcY; Modified: branches/Cog/src/plugins/DropPlugin/DropPlugin.c =================================================================== --- branches/Cog/src/plugins/DropPlugin/DropPlugin.c 2014-12-10 23:25:38 UTC (rev 3169) +++ branches/Cog/src/plugins/DropPlugin/DropPlugin.c 2014-12-11 00:32:13 UTC (rev 3170) @@ -1,9 +1,9 @@ /* Automatically generated by - VMPluginCodeGenerator VMMaker.oscog-eem.580 uuid: 751b08d4-d92e-440a-b3f6-cb2c76f52514 + VMPluginCodeGenerator VMMaker.oscog-eem.975 uuid: de22d941-0268-4e60-a8be-89a3a88aa567 from - DropPlugin VMMaker.oscog-eem.580 uuid: 751b08d4-d92e-440a-b3f6-cb2c76f52514 + DropPlugin VMMaker.oscog-eem.975 uuid: de22d941-0268-4e60-a8be-89a3a88aa567 */ -static char __buildInfo[] = "DropPlugin VMMaker.oscog-eem.580 uuid: 751b08d4-d92e-440a-b3f6-cb2c76f52514 " __DATE__ ; +static char __buildInfo[] = "DropPlugin VMMaker.oscog-eem.975 uuid: de22d941-0268-4e60-a8be-89a3a88aa567 " __DATE__ ; @@ -48,7 +48,7 @@ static sqInt msg(char *s); EXPORT(sqInt) primitiveDropRequestFileHandle(void); EXPORT(sqInt) primitiveDropRequestFileName(void); -EXPORT(sqInt) setFileAccessCallback(int address); +EXPORT(sqInt) setFileAccessCallback(sqInt address); EXPORT(sqInt) setInterpreter(struct VirtualMachine*anInterpreter); EXPORT(sqInt) shutdownModule(void); @@ -80,9 +80,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "DropPlugin VMMaker.oscog-eem.580 (i)" + "DropPlugin VMMaker.oscog-eem.975 (i)" #else - "DropPlugin VMMaker.oscog-eem.580 (e)" + "DropPlugin VMMaker.oscog-eem.975 (e)" #endif ; @@ -190,9 +190,9 @@ } EXPORT(sqInt) -setFileAccessCallback(int address) +setFileAccessCallback(sqInt address) { - return sqSecFileAccessCallback((void *) address); + return sqSecFileAccessCallback(((void *)address)); } Modified: branches/Cog/src/plugins/MIDIPlugin/MIDIPlugin.c =================================================================== --- branches/Cog/src/plugins/MIDIPlugin/MIDIPlugin.c 2014-12-10 23:25:38 UTC (rev 3169) +++ branches/Cog/src/plugins/MIDIPlugin/MIDIPlugin.c 2014-12-11 00:32:13 UTC (rev 3170) @@ -1,9 +1,9 @@ /* Automatically generated by - SmartSyntaxPluginCodeGenerator VMMaker.oscog-eem.580 uuid: 751b08d4-d92e-440a-b3f6-cb2c76f52514 + SmartSyntaxPluginCodeGenerator VMMaker.oscog-eem.975 uuid: de22d941-0268-4e60-a8be-89a3a88aa567 from - MIDIPlugin VMMaker.oscog-eem.580 uuid: 751b08d4-d92e-440a-b3f6-cb2c76f52514 + MIDIPlugin VMMaker.oscog-eem.975 uuid: de22d941-0268-4e60-a8be-89a3a88aa567 */ -static char __buildInfo[] = "MIDIPlugin VMMaker.oscog-eem.580 uuid: 751b08d4-d92e-440a-b3f6-cb2c76f52514 " __DATE__ ; +static char __buildInfo[] = "MIDIPlugin VMMaker.oscog-eem.975 uuid: de22d941-0268-4e60-a8be-89a3a88aa567 " __DATE__ ; @@ -97,9 +97,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "MIDIPlugin VMMaker.oscog-eem.580 (i)" + "MIDIPlugin VMMaker.oscog-eem.975 (i)" #else - "MIDIPlugin VMMaker.oscog-eem.580 (e)" + "MIDIPlugin VMMaker.oscog-eem.975 (e)" #endif ; @@ -223,7 +223,6 @@ primitiveMIDIGetPortName(void) { sqInt nameObj; - char * namePtr; char portName[256]; sqInt portNum; sqInt sz; @@ -232,13 +231,12 @@ if (failed()) { return null; } - sz = sqMIDIGetPortName(portNum, (int) &portName, 255); + sz = sqMIDIGetPortName(portNum, portName, 0xFF); nameObj = instantiateClassindexableSize(classString(), sz); if (failed()) { return null; } - namePtr = ((char *)firstIndexableField(nameObj)); - memcpy(namePtr, portName, sz); + memcpy(((char *)firstIndexableField(nameObj)), portName, sz); if (failed()) { return null; } Modified: branches/Cog/src/plugins/RePlugin/RePlugin.c =================================================================== --- branches/Cog/src/plugins/RePlugin/RePlugin.c 2014-12-10 23:25:38 UTC (rev 3169) +++ branches/Cog/src/plugins/RePlugin/RePlugin.c 2014-12-11 00:32:13 UTC (rev 3170) @@ -1,9 +1,9 @@ /* Automatically generated by - SmartSyntaxPluginCodeGenerator VMMaker.oscog-eem.787 uuid: 4b38ebc1-339f-4523-a9fc-047923108211 + SmartSyntaxPluginCodeGenerator VMMaker.oscog-eem.975 uuid: de22d941-0268-4e60-a8be-89a3a88aa567 from - RePlugin VMMaker.oscog-eem.787 uuid: 4b38ebc1-339f-4523-a9fc-047923108211 + RePlugin VMMaker.oscog-eem.975 uuid: de22d941-0268-4e60-a8be-89a3a88aa567 */ -static char __buildInfo[] = "RePlugin VMMaker.oscog-eem.787 uuid: 4b38ebc1-339f-4523-a9fc-047923108211 " __DATE__ ; +static char __buildInfo[] = "RePlugin VMMaker.oscog-eem.975 uuid: de22d941-0268-4e60-a8be-89a3a88aa567 " __DATE__ ; @@ -126,9 +126,9 @@ static sqInt matchFlags; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "RePlugin VMMaker.oscog-eem.787 (i)" + "RePlugin VMMaker.oscog-eem.975 (i)" #else - "RePlugin VMMaker.oscog-eem.787 (e)" + "RePlugin VMMaker.oscog-eem.975 (e)" #endif ; static int netMemory = 0; @@ -301,22 +301,21 @@ if (failed()) { return null; } - pcrePtr = (int) pcre_compile(patternStrPtr, compileFlags, - &errorStrBuffer, &errorOffset, NULL); + pcrePtr = (sqInt) pcre_compile(patternStrPtr, compileFlags, &errorStrBuffer, &errorOffset, NULL); if (pcrePtr) { allocateByteArrayAndSetRcvrPCREPtrFromPCRE(pcrePtr); - extraPtr = (int) pcre_study((pcre *)pcrePtr, compileFlags, &errorStrBuffer); + extraPtr = (sqInt) pcre_study((pcre *)pcrePtr, compileFlags, &errorStrBuffer); allocateByteArrayAndSetRcvrExtraPtrFrom(extraPtr); /* begin rePluginFree: */ numFrees += 1; - if ((((void *) pcrePtr)) != null) { - free(((void *) pcrePtr)); + if ((((void *)pcrePtr)) != null) { + free(((void *)pcrePtr)); } if (extraPtr) { /* begin rePluginFree: */ numFrees += 1; - if ((((void *) extraPtr)) != null) { - free(((void *) extraPtr)); + if ((((void *)extraPtr)) != null) { + free(((void *)extraPtr)); } } if (failed()) { @@ -365,10 +364,10 @@ length = byteSizeOf(searchObject); /* begin loadRcvrFromStackAt: */ rcvr = stackObjectValue(1); - pcrePtr = ((int) (fetchArrayofObject(2, rcvr))); + pcrePtr = ((sqInt) (fetchArrayofObject(2, rcvr))); /* begin rcvrExtraPtr */ extraObj = fetchPointerofObject(3, rcvr); - extraPtr = ((int) ((!(extraObj == (nilObject())) + extraPtr = ((sqInt) ((!(extraObj == (nilObject())) ? arrayValueOf(extraObj) : 0))); matchFlags = fetchIntegerofObject(6, rcvr); @@ -436,10 +435,10 @@ /* Load Instance Variables */ searchBuffer += fromInteger; - pcrePtr = ((int) (fetchArrayofObject(2, rcvr))); + pcrePtr = ((sqInt) (fetchArrayofObject(2, rcvr))); /* begin rcvrExtraPtr */ extraObj = fetchPointerofObject(3, rcvr); - extraPtr = ((int) ((!(extraObj == (nilObject())) + extraPtr = ((sqInt) ((!(extraObj == (nilObject())) ? arrayValueOf(extraObj) : 0))); matchFlags = fetchIntegerofObject(6, rcvr); @@ -475,7 +474,7 @@ /* begin loadRcvrFromStackAt: */ rcvr = stackObjectValue(0); - pcrePtr = ((int) (fetchArrayofObject(2, rcvr))); + pcrePtr = ((sqInt) (fetchArrayofObject(2, rcvr))); pcre_fullinfo((const pcre *)pcrePtr, NULL, PCRE_INFO_CAPTURECOUNT, &ncap); pop(1); pushInteger(ncap); @@ -505,7 +504,7 @@ sqInt extraObj; extraObj = fetchPointerofObject(3, rcvr); - return ((int) ((!(extraObj == (nilObject())) + return ((sqInt) ((!(extraObj == (nilObject())) ? arrayValueOf(extraObj) : 0))); } @@ -549,7 +548,7 @@ static sqInt rcvrPCREBufferPtr(void) { - return ((int) (fetchArrayofObject(2, rcvr))); + return ((sqInt) (fetchArrayofObject(2, rcvr))); } |
Free forum by Nabble | Edit this page |