[Vm-dev] [commit][2839] VMMaker 4.12.12 (VMMaker-dtl.334)
commits at squeakvm.org
commits at squeakvm.org
Sat Jan 4 19:09:43 UTC 2014
Revision: 2839
Author: lewis
Date: 2014-01-04 11:09:42 -0800 (Sat, 04 Jan 2014)
Log Message:
-----------
VMMaker 4.12.12 (VMMaker-dtl.334)
Convert Scratch plugins to pragmas. Changes to generated code are cosmetic, e.g. variable names and ordering.
Modified Paths:
--------------
trunk/src/ckformat.c
trunk/src/plugins/ADPCMCodecPlugin/ADPCMCodecPlugin.c
trunk/src/plugins/AioPlugin/AioPlugin.c
trunk/src/plugins/AsynchFilePlugin/AsynchFilePlugin.c
trunk/src/plugins/B2DPlugin/B2DPlugin.c
trunk/src/plugins/B3DAcceleratorPlugin/B3DAcceleratorPlugin.c
trunk/src/plugins/BMPReadWriterPlugin/BMPReadWriterPlugin.c
trunk/src/plugins/BitBltPlugin/BitBltPlugin.c
trunk/src/plugins/CameraPlugin/CameraPlugin.c
trunk/src/plugins/ClipboardExtendedPlugin/ClipboardExtendedPlugin.c
trunk/src/plugins/CroquetPlugin/CroquetPlugin.c
trunk/src/plugins/DBusPlugin/DBusPlugin.c
trunk/src/plugins/DSAPrims/DSAPrims.c
trunk/src/plugins/DropPlugin/DropPlugin.c
trunk/src/plugins/FFTPlugin/FFTPlugin.c
trunk/src/plugins/FT2Plugin/FT2Plugin.c
trunk/src/plugins/FileCopyPlugin/FileCopyPlugin.c
trunk/src/plugins/FilePlugin/FilePlugin.c
trunk/src/plugins/FloatArrayPlugin/FloatArrayPlugin.c
trunk/src/plugins/FloatMathPlugin/FloatMathPlugin.c
trunk/src/plugins/GeniePlugin/GeniePlugin.c
trunk/src/plugins/HostWindowPlugin/HostWindowPlugin.c
trunk/src/plugins/JPEGReadWriter2Plugin/JPEGReadWriter2Plugin.c
trunk/src/plugins/JPEGReaderPlugin/JPEGReaderPlugin.c
trunk/src/plugins/JoystickTabletPlugin/JoystickTabletPlugin.c
trunk/src/plugins/Klatt/Klatt.c
trunk/src/plugins/LargeIntegers/LargeIntegers.c
trunk/src/plugins/LocalePlugin/LocalePlugin.c
trunk/src/plugins/MIDIPlugin/MIDIPlugin.c
trunk/src/plugins/Matrix2x3Plugin/Matrix2x3Plugin.c
trunk/src/plugins/MiscPrimitivePlugin/MiscPrimitivePlugin.c
trunk/src/plugins/Mpeg3Plugin/Mpeg3Plugin.c
trunk/src/plugins/RePlugin/RePlugin.c
trunk/src/plugins/RomePlugin/RomePlugin.c
trunk/src/plugins/ScratchPlugin/ScratchPlugin.c
trunk/src/plugins/SecurityPlugin/SecurityPlugin.c
trunk/src/plugins/SerialPlugin/SerialPlugin.c
trunk/src/plugins/SocketPlugin/SocketPlugin.c
trunk/src/plugins/SoundCodecPrims/SoundCodecPrims.c
trunk/src/plugins/SoundGenerationPlugin/SoundGenerationPlugin.c
trunk/src/plugins/SoundPlugin/SoundPlugin.c
trunk/src/plugins/Squeak3D/Squeak3D.c
trunk/src/plugins/SqueakFFIPrims/SqueakFFIPrims.c
trunk/src/plugins/SqueakSSL/SqueakSSL.c
trunk/src/plugins/StarSqueakPlugin/StarSqueakPlugin.c
trunk/src/plugins/UUIDPlugin/UUIDPlugin.c
trunk/src/plugins/UnicodePlugin/UnicodePlugin.c
trunk/src/plugins/UnixOSProcessPlugin/UnixOSProcessPlugin.c
trunk/src/plugins/WeDoPlugin/WeDoPlugin.c
trunk/src/plugins/XDisplayControlPlugin/XDisplayControlPlugin.c
trunk/src/plugins/ZipPlugin/ZipPlugin.c
trunk/src/vm/interp.c
trunk/src/vm/interp.h
trunk/src/vm/sqNamedPrims.h
Modified: trunk/src/ckformat.c
===================================================================
--- trunk/src/ckformat.c 2013-12-30 18:28:08 UTC (rev 2838)
+++ trunk/src/ckformat.c 2014-01-04 19:09:42 UTC (rev 2839)
@@ -5,7 +5,7 @@
/* Usage: ckformat imageFileName */
/* --- DO NOT EDIT THIS FILE --- */
-/* --- Automatically generated from class ImageFormat 2013-12-30T13:12:01.886+01:00--- */
+/* --- Automatically generated from class ImageFormat 2014-01-04T14:04:16.401+01:00--- */
/* --- Source code is in package ImageFormat in the VMMaker repository --- */
/* --- DO NOT EDIT THIS FILE --- */
Modified: trunk/src/plugins/ADPCMCodecPlugin/ADPCMCodecPlugin.c
===================================================================
--- trunk/src/plugins/ADPCMCodecPlugin/ADPCMCodecPlugin.c 2013-12-30 18:28:08 UTC (rev 2838)
+++ trunk/src/plugins/ADPCMCodecPlugin/ADPCMCodecPlugin.c 2014-01-04 19:09:42 UTC (rev 2839)
@@ -1,10 +1,10 @@
-/* Smalltalk from Squeak4.4 with VMMaker 4.12.11 translated as C source on 30 December 2013 1:11:34 pm */
+/* Smalltalk from Squeak4.4 with VMMaker 4.12.12 translated as C source on 4 January 2014 2:03:35 pm */
/* Automatically generated by
- VMPluginCodeGenerator VMMaker-dtl.333 uuid: 9ffe16dc-ba45-44c6-a894-ed3d96a8c916
+ VMPluginCodeGenerator VMMaker-dtl.334 uuid: 61416154-73bc-45d7-9f3a-739a51ae816f
from
- ADPCMCodecPlugin VMMaker-dtl.333 uuid: 9ffe16dc-ba45-44c6-a894-ed3d96a8c916
+ ADPCMCodecPlugin VMMaker-dtl.334 uuid: 61416154-73bc-45d7-9f3a-739a51ae816f
*/
-static char __buildInfo[] = "ADPCMCodecPlugin VMMaker-dtl.333 uuid: 9ffe16dc-ba45-44c6-a894-ed3d96a8c916 " __DATE__ ;
+static char __buildInfo[] = "ADPCMCodecPlugin VMMaker-dtl.334 uuid: 61416154-73bc-45d7-9f3a-739a51ae816f " __DATE__ ;
@@ -70,9 +70,9 @@
struct VirtualMachine* interpreterProxy;
static const char *moduleName =
#ifdef SQUEAK_BUILTIN_PLUGIN
- "ADPCMCodecPlugin 30 December 2013 (i)"
+ "ADPCMCodecPlugin 4 January 2014 (i)"
#else
- "ADPCMCodecPlugin 30 December 2013 (e)"
+ "ADPCMCodecPlugin 4 January 2014 (e)"
#endif
;
Modified: trunk/src/plugins/AioPlugin/AioPlugin.c
===================================================================
--- trunk/src/plugins/AioPlugin/AioPlugin.c 2013-12-30 18:28:08 UTC (rev 2838)
+++ trunk/src/plugins/AioPlugin/AioPlugin.c 2014-01-04 19:09:42 UTC (rev 2839)
@@ -1,6 +1,6 @@
-/* Smalltalk from Squeak4.4 with VMMaker 4.12.11 translated as C source on 30 December 2013 1:12 pm */
+/* Smalltalk from Squeak4.4 with VMMaker 4.12.12 translated as C source on 4 January 2014 2:04:14 pm */
/* Automatically generated by
- VMPluginCodeGenerator VMMaker-dtl.333 uuid: 9ffe16dc-ba45-44c6-a894-ed3d96a8c916
+ VMPluginCodeGenerator VMMaker-dtl.334 uuid: 61416154-73bc-45d7-9f3a-739a51ae816f
from
UnixAioPlugin VMConstruction-Plugins-AioPlugin-eem.15 uuid: 0029df1c-3720-4b61-8579-4851417d24a7
*/
@@ -88,9 +88,9 @@
struct VirtualMachine* interpreterProxy;
static const char *moduleName =
#ifdef SQUEAK_BUILTIN_PLUGIN
- "AioPlugin 30 December 2013 (i)"
+ "AioPlugin 4 January 2014 (i)"
#else
- "AioPlugin 30 December 2013 (e)"
+ "AioPlugin 4 January 2014 (e)"
#endif
;
Modified: trunk/src/plugins/AsynchFilePlugin/AsynchFilePlugin.c
===================================================================
--- trunk/src/plugins/AsynchFilePlugin/AsynchFilePlugin.c 2013-12-30 18:28:08 UTC (rev 2838)
+++ trunk/src/plugins/AsynchFilePlugin/AsynchFilePlugin.c 2014-01-04 19:09:42 UTC (rev 2839)
@@ -1,10 +1,10 @@
-/* Smalltalk from Squeak4.4 with VMMaker 4.12.11 translated as C source on 30 December 2013 1:11:35 pm */
+/* Smalltalk from Squeak4.4 with VMMaker 4.12.12 translated as C source on 4 January 2014 2:03:35 pm */
/* Automatically generated by
- SmartSyntaxPluginCodeGenerator VMMaker-dtl.333 uuid: 9ffe16dc-ba45-44c6-a894-ed3d96a8c916
+ SmartSyntaxPluginCodeGenerator VMMaker-dtl.334 uuid: 61416154-73bc-45d7-9f3a-739a51ae816f
from
- AsynchFilePlugin VMMaker-dtl.333 uuid: 9ffe16dc-ba45-44c6-a894-ed3d96a8c916
+ AsynchFilePlugin VMMaker-dtl.334 uuid: 61416154-73bc-45d7-9f3a-739a51ae816f
*/
-static char __buildInfo[] = "AsynchFilePlugin VMMaker-dtl.333 uuid: 9ffe16dc-ba45-44c6-a894-ed3d96a8c916 " __DATE__ ;
+static char __buildInfo[] = "AsynchFilePlugin VMMaker-dtl.334 uuid: 61416154-73bc-45d7-9f3a-739a51ae816f " __DATE__ ;
@@ -67,9 +67,9 @@
struct VirtualMachine* interpreterProxy;
static const char *moduleName =
#ifdef SQUEAK_BUILTIN_PLUGIN
- "AsynchFilePlugin 30 December 2013 (i)"
+ "AsynchFilePlugin 4 January 2014 (i)"
#else
- "AsynchFilePlugin 30 December 2013 (e)"
+ "AsynchFilePlugin 4 January 2014 (e)"
#endif
;
static void * sCOAFfn;
@@ -214,7 +214,7 @@
bufferSize = bufferSize * 4;
}
interpreterProxy->success((startIndex >= 1) && (((startIndex + count) - 1) <= bufferSize));
- bufferPtr = (((pointerForOop(buffer)) + (BASE_HEADER_SIZE)) + startIndex) - 1;
+ bufferPtr = ((((sqMemoryBase) + buffer) + (BASE_HEADER_SIZE)) + startIndex) - 1;
if (!(interpreterProxy->failed())) {
r = asyncFileReadResult(f, bufferPtr, count);
}
@@ -306,7 +306,7 @@
bufferSize = bufferSize * (BYTES_PER_WORD);
}
interpreterProxy->success((startIndex >= 1) && (((startIndex + count) - 1) <= bufferSize));
- bufferPtr = (((pointerForOop(buffer)) + (BASE_HEADER_SIZE)) + startIndex) - 1;
+ bufferPtr = ((((sqMemoryBase) + buffer) + (BASE_HEADER_SIZE)) + startIndex) - 1;
if (!(interpreterProxy->failed())) {
asyncFileWriteStart(f, fPosition, bufferPtr, count);
}
Modified: trunk/src/plugins/B2DPlugin/B2DPlugin.c
===================================================================
--- trunk/src/plugins/B2DPlugin/B2DPlugin.c 2013-12-30 18:28:08 UTC (rev 2838)
+++ trunk/src/plugins/B2DPlugin/B2DPlugin.c 2014-01-04 19:09:42 UTC (rev 2839)
@@ -1,10 +1,10 @@
-/* Smalltalk from Squeak4.4 with VMMaker 4.12.11 translated as C source on 30 December 2013 1:11:38 pm */
+/* Smalltalk from Squeak4.4 with VMMaker 4.12.12 translated as C source on 4 January 2014 2:03:39 pm */
/* Automatically generated by
- VMPluginCodeGenerator VMMaker-dtl.333 uuid: 9ffe16dc-ba45-44c6-a894-ed3d96a8c916
+ VMPluginCodeGenerator VMMaker-dtl.334 uuid: 61416154-73bc-45d7-9f3a-739a51ae816f
from
- BalloonEnginePlugin VMMaker-dtl.333 uuid: 9ffe16dc-ba45-44c6-a894-ed3d96a8c916
+ BalloonEnginePlugin VMMaker-dtl.334 uuid: 61416154-73bc-45d7-9f3a-739a51ae816f
*/
-static char __buildInfo[] = "BalloonEnginePlugin VMMaker-dtl.333 uuid: 9ffe16dc-ba45-44c6-a894-ed3d96a8c916 " __DATE__ ;
+static char __buildInfo[] = "BalloonEnginePlugin VMMaker-dtl.334 uuid: 61416154-73bc-45d7-9f3a-739a51ae816f " __DATE__ ;
@@ -447,9 +447,9 @@
static void * loadBBFn;
static const char *moduleName =
#ifdef SQUEAK_BUILTIN_PLUGIN
- "B2DPlugin 30 December 2013 (i)"
+ "B2DPlugin 4 January 2014 (i)"
#else
- "B2DPlugin 30 December 2013 (e)"
+ "B2DPlugin 4 January 2014 (e)"
#endif
;
static int* objBuffer;
Modified: trunk/src/plugins/B3DAcceleratorPlugin/B3DAcceleratorPlugin.c
===================================================================
--- trunk/src/plugins/B3DAcceleratorPlugin/B3DAcceleratorPlugin.c 2013-12-30 18:28:08 UTC (rev 2838)
+++ trunk/src/plugins/B3DAcceleratorPlugin/B3DAcceleratorPlugin.c 2014-01-04 19:09:42 UTC (rev 2839)
@@ -1,10 +1,10 @@
-/* Smalltalk from Squeak4.4 with VMMaker 4.12.11 translated as C source on 30 December 2013 1:11:49 pm */
+/* Smalltalk from Squeak4.4 with VMMaker 4.12.12 translated as C source on 4 January 2014 2:03:58 pm */
/* Automatically generated by
- VMPluginCodeGenerator VMMaker-dtl.333 uuid: 9ffe16dc-ba45-44c6-a894-ed3d96a8c916
+ VMPluginCodeGenerator VMMaker-dtl.334 uuid: 61416154-73bc-45d7-9f3a-739a51ae816f
from
- B3DAcceleratorPlugin VMMaker-dtl.333 uuid: 9ffe16dc-ba45-44c6-a894-ed3d96a8c916
+ B3DAcceleratorPlugin VMMaker-dtl.334 uuid: 61416154-73bc-45d7-9f3a-739a51ae816f
*/
-static char __buildInfo[] = "B3DAcceleratorPlugin VMMaker-dtl.333 uuid: 9ffe16dc-ba45-44c6-a894-ed3d96a8c916 " __DATE__ ;
+static char __buildInfo[] = "B3DAcceleratorPlugin VMMaker-dtl.334 uuid: 61416154-73bc-45d7-9f3a-739a51ae816f " __DATE__ ;
@@ -107,9 +107,9 @@
struct VirtualMachine* interpreterProxy;
static const char *moduleName =
#ifdef SQUEAK_BUILTIN_PLUGIN
- "B3DAcceleratorPlugin 30 December 2013 (i)"
+ "B3DAcceleratorPlugin 4 January 2014 (i)"
#else
- "B3DAcceleratorPlugin 30 December 2013 (e)"
+ "B3DAcceleratorPlugin 4 January 2014 (e)"
#endif
;
Modified: trunk/src/plugins/BMPReadWriterPlugin/BMPReadWriterPlugin.c
===================================================================
--- trunk/src/plugins/BMPReadWriterPlugin/BMPReadWriterPlugin.c 2013-12-30 18:28:08 UTC (rev 2838)
+++ trunk/src/plugins/BMPReadWriterPlugin/BMPReadWriterPlugin.c 2014-01-04 19:09:42 UTC (rev 2839)
@@ -1,10 +1,10 @@
-/* Smalltalk from Squeak4.4 with VMMaker 4.12.11 translated as C source on 30 December 2013 1:11:35 pm */
+/* Smalltalk from Squeak4.4 with VMMaker 4.12.12 translated as C source on 4 January 2014 2:03:36 pm */
/* Automatically generated by
- VMPluginCodeGenerator VMMaker-dtl.333 uuid: 9ffe16dc-ba45-44c6-a894-ed3d96a8c916
+ VMPluginCodeGenerator VMMaker-dtl.334 uuid: 61416154-73bc-45d7-9f3a-739a51ae816f
from
- BMPReadWriterPlugin VMMaker-dtl.333 uuid: 9ffe16dc-ba45-44c6-a894-ed3d96a8c916
+ BMPReadWriterPlugin VMMaker-dtl.334 uuid: 61416154-73bc-45d7-9f3a-739a51ae816f
*/
-static char __buildInfo[] = "BMPReadWriterPlugin VMMaker-dtl.333 uuid: 9ffe16dc-ba45-44c6-a894-ed3d96a8c916 " __DATE__ ;
+static char __buildInfo[] = "BMPReadWriterPlugin VMMaker-dtl.334 uuid: 61416154-73bc-45d7-9f3a-739a51ae816f " __DATE__ ;
@@ -58,9 +58,9 @@
struct VirtualMachine* interpreterProxy;
static const char *moduleName =
#ifdef SQUEAK_BUILTIN_PLUGIN
- "BMPReadWriterPlugin 30 December 2013 (i)"
+ "BMPReadWriterPlugin 4 January 2014 (i)"
#else
- "BMPReadWriterPlugin 30 December 2013 (e)"
+ "BMPReadWriterPlugin 4 January 2014 (e)"
#endif
;
Modified: trunk/src/plugins/BitBltPlugin/BitBltPlugin.c
===================================================================
--- trunk/src/plugins/BitBltPlugin/BitBltPlugin.c 2013-12-30 18:28:08 UTC (rev 2838)
+++ trunk/src/plugins/BitBltPlugin/BitBltPlugin.c 2014-01-04 19:09:42 UTC (rev 2839)
@@ -1,10 +1,10 @@
-/* Smalltalk from Squeak4.4 with VMMaker 4.12.11 translated as C source on 30 December 2013 1:11:39 pm */
+/* Smalltalk from Squeak4.4 with VMMaker 4.12.12 translated as C source on 4 January 2014 2:03:41 pm */
/* Automatically generated by
- SmartSyntaxPluginCodeGenerator VMMaker-dtl.333 uuid: 9ffe16dc-ba45-44c6-a894-ed3d96a8c916
+ SmartSyntaxPluginCodeGenerator VMMaker-dtl.334 uuid: 61416154-73bc-45d7-9f3a-739a51ae816f
from
- BitBltSimulation VMMaker-dtl.333 uuid: 9ffe16dc-ba45-44c6-a894-ed3d96a8c916
+ BitBltSimulation VMMaker-dtl.334 uuid: 61416154-73bc-45d7-9f3a-739a51ae816f
*/
-static char __buildInfo[] = "BitBltSimulation VMMaker-dtl.333 uuid: 9ffe16dc-ba45-44c6-a894-ed3d96a8c916 " __DATE__ ;
+static char __buildInfo[] = "BitBltSimulation VMMaker-dtl.334 uuid: 61416154-73bc-45d7-9f3a-739a51ae816f " __DATE__ ;
@@ -119,7 +119,6 @@
static sqInt copyLoopPixMap(void);
static unsigned int * default8To32Table(void);
static sqInt destinationWordwith(sqInt sourceWord, sqInt destinationWord);
-static sqInt dstLongAt(sqInt idx);
static sqInt fetchIntOrFloatofObject(sqInt fieldIndex, sqInt objectPointer);
static sqInt fetchIntOrFloatofObjectifNil(sqInt fieldIndex, sqInt objectPointer, sqInt defaultValue);
static sqInt fixAlphawith(sqInt sourceWord, sqInt destinationWord);
@@ -257,9 +256,9 @@
};
static const char *moduleName =
#ifdef SQUEAK_BUILTIN_PLUGIN
- "BitBltPlugin 30 December 2013 (i)"
+ "BitBltPlugin 4 January 2014 (i)"
#else
- "BitBltPlugin 30 December 2013 (e)"
+ "BitBltPlugin 4 January 2014 (e)"
#endif
;
static sqInt nWords;
@@ -729,8 +728,8 @@
sqInt dstY;
sqInt ditherIndex;
sqInt addThreshold;
- sqInt addThreshold1;
sqInt dstValue;
+ sqInt addThreshold1;
sqInt dstValue1;
@@ -770,7 +769,7 @@
}
while (((deltaX -= 1)) != 0) {
ditherThreshold = ditherMatrix4x4[ditherBase + ((ditherIndex = (ditherIndex + 1) & 3))];
- sourceWord = long32At(srcIndex);
+ sourceWord = ((sqInt) ((((unsigned int *) ((sqMemoryBase) + srcIndex)))[0]));
srcAlpha = ((usqInt) sourceWord) >> 24;
if (srcAlpha == 255) {
@@ -785,10 +784,10 @@
sourceWord = sourceWord << srcShift;
}
/* begin dstLongAt:put:mask: */
- dstValue = long32At(dstIndex);
+ dstValue = ((sqInt) ((((unsigned int *) ((sqMemoryBase) + dstIndex)))[0]));
dstValue = dstValue & dstMask;
dstValue = dstValue | sourceWord;
- long32Atput(dstIndex, dstValue);
+ ((sqInt) ((((unsigned int *) ((sqMemoryBase) + dstIndex)))[0] = dstValue));
} else {
/* srcAlpha ~= 255 */
@@ -798,7 +797,7 @@
/* 0 < srcAlpha < 255 */
/* If we have to mix colors then just copy a single word */
- destWord = long32At(dstIndex);
+ destWord = ((sqInt) ((((unsigned int *) ((sqMemoryBase) + dstIndex)))[0]));
destWord = destWord & (~dstMask);
/* Expand from 16 to 32 bit by adding zero bits */
@@ -821,10 +820,10 @@
sourceWord = sourceWord << srcShift;
}
/* begin dstLongAt:put:mask: */
- dstValue1 = long32At(dstIndex);
+ dstValue1 = ((sqInt) ((((unsigned int *) ((sqMemoryBase) + dstIndex)))[0]));
dstValue1 = dstValue1 & dstMask;
dstValue1 = dstValue1 | sourceWord;
- long32Atput(dstIndex, dstValue1);
+ ((sqInt) ((((unsigned int *) ((sqMemoryBase) + dstIndex)))[0] = dstValue1));
}
}
srcIndex += 4;
@@ -895,17 +894,17 @@
deltaX = bbW + 1;
while (((deltaX -= 1)) != 0) {
- sourceWord = long32At(srcIndex);
+ sourceWord = ((sqInt) ((((unsigned int *) ((sqMemoryBase) + srcIndex)))[0]));
srcAlpha = ((usqInt) sourceWord) >> 24;
if (srcAlpha == 255) {
- long32Atput(dstIndex, sourceWord);
+ ((sqInt) ((((unsigned int *) ((sqMemoryBase) + dstIndex)))[0] = sourceWord));
srcIndex += 4;
/* Now copy as many words as possible with alpha = 255 */
dstIndex += 4;
- while ((((deltaX -= 1)) != 0) && ((((usqInt) ((sourceWord = long32At(srcIndex)))) >> 24) == 255)) {
- long32Atput(dstIndex, sourceWord);
+ while ((((deltaX -= 1)) != 0) && ((((usqInt) ((sourceWord = ((sqInt) ((((unsigned int *) ((sqMemoryBase) + srcIndex)))[0]))))) >> 24) == 255)) {
+ ((sqInt) ((((unsigned int *) ((sqMemoryBase) + dstIndex)))[0] = sourceWord));
srcIndex += 4;
dstIndex += 4;
}
@@ -920,7 +919,7 @@
/* Now skip as many words as possible, */
dstIndex += 4;
- while ((((deltaX -= 1)) != 0) && ((((usqInt) ((sourceWord = long32At(srcIndex)))) >> 24) == 0)) {
+ while ((((deltaX -= 1)) != 0) && ((((usqInt) ((sourceWord = ((sqInt) ((((unsigned int *) ((sqMemoryBase) + srcIndex)))[0]))))) >> 24) == 0)) {
srcIndex += 4;
dstIndex += 4;
}
@@ -930,9 +929,9 @@
/* 0 < srcAlpha < 255 */
/* If we have to mix colors then just copy a single word */
- destWord = long32At(dstIndex);
+ destWord = ((sqInt) ((((unsigned int *) ((sqMemoryBase) + dstIndex)))[0]));
destWord = alphaBlendScaledwith(sourceWord, destWord);
- long32Atput(dstIndex, destWord);
+ ((sqInt) ((((unsigned int *) ((sqMemoryBase) + dstIndex)))[0] = destWord));
srcIndex += 4;
dstIndex += 4;
}
@@ -1006,7 +1005,7 @@
dstMask = mask2;
while (((deltaX -= 1)) != 0) {
- sourceWord = ((long32At(srcIndex)) & (~adjust)) + adjust;
+ sourceWord = ((((sqInt) ((((unsigned int *) ((sqMemoryBase) + srcIndex)))[0]))) & (~adjust)) + adjust;
srcAlpha = ((usqInt) sourceWord) >> 24;
if (srcAlpha > 31) {
@@ -1016,7 +1015,7 @@
/* Everything above 224 is opaque */
- destWord = long32At(dstIndex);
+ destWord = ((sqInt) ((((unsigned int *) ((sqMemoryBase) + dstIndex)))[0]));
destWord = destWord & (~dstMask);
destWord = ((usqInt) destWord) >> srcShift;
destWord = mappingTable[destWord];
@@ -1045,10 +1044,10 @@
sourceWord = sourceWord << srcShift;
/* begin dstLongAt:put:mask: */
- dstValue = long32At(dstIndex);
+ dstValue = ((sqInt) ((((unsigned int *) ((sqMemoryBase) + dstIndex)))[0]));
dstValue = dstValue & dstMask;
dstValue = dstValue | sourceWord;
- long32Atput(dstIndex, dstValue);
+ ((sqInt) ((((unsigned int *) ((sqMemoryBase) + dstIndex)))[0] = dstValue));
}
srcIndex += 4;
if (destMSB) {
@@ -1805,21 +1804,6 @@
sqInt i;
sqInt thisWord;
sqInt notSkewMask;
- sqInt idx;
- sqInt idx1;
- sqInt idx2;
- sqInt idx3;
- sqInt idx4;
- sqInt idx5;
- sqInt idx6;
- sqInt idx7;
- sqInt idx8;
- sqInt idx9;
- sqInt idx10;
- sqInt idx11;
- sqInt idx12;
- sqInt idx13;
- sqInt idx14;
mergeFnwith = ((sqInt (*)(sqInt, sqInt)) (opTable[combinationRule + 1]));
mergeFnwith;
@@ -1849,7 +1833,7 @@
halftoneWord = AllOnes;
halftoneHeight = 0;
} else {
- halftoneWord = long32At(halftoneBase + ((0 % halftoneHeight) * 4));
+ halftoneWord = ((sqInt) ((((unsigned int *) ((sqMemoryBase) + (halftoneBase + ((0 % halftoneHeight) * 4)))))[0]));
}
y = dy;
for (i = 1; i <= bbH; i += 1) {
@@ -1860,38 +1844,33 @@
/* Otherwise, its always the same */
- halftoneWord = long32At(halftoneBase + ((y % halftoneHeight) * 4));
+ halftoneWord = ((sqInt) ((((unsigned int *) ((sqMemoryBase) + (halftoneBase + ((y % halftoneHeight) * 4)))))[0]));
y += vDir;
}
if (preload) {
/* load the 64-bit shifter */
- /* begin srcLongAt: */
- idx = sourceIndex;
- prevWord = long32At(idx);
+ prevWord = ((sqInt) ((((unsigned int *) ((sqMemoryBase) + sourceIndex)))[0]));
sourceIndex += hInc;
} else {
prevWord = 0;
}
destMask = mask1;
- /* begin srcLongAt: */
- idx12 = sourceIndex;
- thisWord = long32At(idx12);
+
+ /* pick up next word */
+
+ thisWord = ((sqInt) ((((unsigned int *) ((sqMemoryBase) + sourceIndex)))[0]));
sourceIndex += hInc;
/* 32-bit rotate */
skewWord = (((unskew < 0) ? ((usqInt) (prevWord & notSkewMask) >> -unskew) : ((usqInt) (prevWord & notSkewMask) << unskew))) | (((skew < 0) ? ((usqInt) (thisWord & skewMask) >> -skew) : ((usqInt) (thisWord & skewMask) << skew)));
prevWord = thisWord;
- /* begin dstLongAt: */
- idx13 = destIndex;
- destWord = long32At(idx13);
+ destWord = ((sqInt) ((((unsigned int *) ((sqMemoryBase) + destIndex)))[0]));
mergeWord = mergeFnwith(skewWord & halftoneWord, destWord);
destWord = (destMask & mergeWord) | (destWord & (~destMask));
- /* begin dstLongAt:put: */
- idx14 = destIndex;
- long32Atput(idx14, destWord);
+ ((sqInt) ((((unsigned int *) ((sqMemoryBase) + destIndex)))[0] = destWord));
/* This central horizontal loop requires no store masking */
@@ -1907,13 +1886,9 @@
/* Woeful patch: revert to older code for hDir = -1 */
for (word = 2; word <= (nWords - 1); word += 1) {
- /* begin srcLongAt: */
- idx1 = sourceIndex;
- thisWord = long32At(idx1);
+ thisWord = ((sqInt) ((((unsigned int *) ((sqMemoryBase) + sourceIndex)))[0]));
sourceIndex += hInc;
- /* begin dstLongAt:put: */
- idx2 = destIndex;
- long32Atput(idx2, thisWord);
+ ((sqInt) ((((unsigned int *) ((sqMemoryBase) + destIndex)))[0] = thisWord));
destIndex += hInc;
}
} else {
@@ -1921,13 +1896,9 @@
/* Note loop starts with prevWord loaded (due to preload) */
- /* begin dstLongAt:put: */
- idx3 = destIndex;
- long32Atput(idx3, prevWord);
+ ((sqInt) ((((unsigned int *) ((sqMemoryBase) + destIndex)))[0] = prevWord));
destIndex += hInc;
- /* begin srcLongAt: */
- idx4 = sourceIndex;
- prevWord = long32At(idx4);
+ prevWord = ((sqInt) ((((unsigned int *) ((sqMemoryBase) + sourceIndex)))[0]));
sourceIndex += hInc;
}
}
@@ -1936,18 +1907,14 @@
/* Special inner loop for STORE mode -- no need to call merge */
for (word = 2; word <= (nWords - 1); word += 1) {
- /* begin srcLongAt: */
- idx5 = sourceIndex;
- thisWord = long32At(idx5);
+ thisWord = ((sqInt) ((((unsigned int *) ((sqMemoryBase) + sourceIndex)))[0]));
sourceIndex += hInc;
/* 32-bit rotate */
skewWord = (((unskew < 0) ? ((usqInt) (prevWord & notSkewMask) >> -unskew) : ((usqInt) (prevWord & notSkewMask) << unskew))) | (((skew < 0) ? ((usqInt) (thisWord & skewMask) >> -skew) : ((usqInt) (thisWord & skewMask) << skew)));
prevWord = thisWord;
- /* begin dstLongAt:put: */
- idx6 = destIndex;
- long32Atput(idx6, skewWord & halftoneWord);
+ ((sqInt) ((((unsigned int *) ((sqMemoryBase) + destIndex)))[0] = (skewWord & halftoneWord)));
destIndex += hInc;
}
}
@@ -1956,40 +1923,36 @@
/* Normal inner loop does merge: */
- /* begin srcLongAt: */
- idx7 = sourceIndex;
- thisWord = long32At(idx7);
+
+ /* pick up next word */
+
+ thisWord = ((sqInt) ((((unsigned int *) ((sqMemoryBase) + sourceIndex)))[0]));
sourceIndex += hInc;
/* 32-bit rotate */
skewWord = (((unskew < 0) ? ((usqInt) (prevWord & notSkewMask) >> -unskew) : ((usqInt) (prevWord & notSkewMask) << unskew))) | (((skew < 0) ? ((usqInt) (thisWord & skewMask) >> -skew) : ((usqInt) (thisWord & skewMask) << skew)));
prevWord = thisWord;
- mergeWord = mergeFnwith(skewWord & halftoneWord, dstLongAt(destIndex));
- /* begin dstLongAt:put: */
- idx8 = destIndex;
- long32Atput(idx8, mergeWord);
+ mergeWord = mergeFnwith(skewWord & halftoneWord, ((sqInt) ((((unsigned int *) ((sqMemoryBase) + destIndex)))[0])));
+ ((sqInt) ((((unsigned int *) ((sqMemoryBase) + destIndex)))[0] = mergeWord));
destIndex += hInc;
}
}
if (nWords > 1) {
destMask = mask2;
- /* begin srcLongAt: */
- idx9 = sourceIndex;
- thisWord = long32At(idx9);
+
+ /* pick up next word */
+
+ thisWord = ((sqInt) ((((unsigned int *) ((sqMemoryBase) + sourceIndex)))[0]));
sourceIndex += hInc;
/* 32-bit rotate */
skewWord = (((unskew < 0) ? ((usqInt) (prevWord & notSkewMask) >> -unskew) : ((usqInt) (prevWord & notSkewMask) << unskew))) | (((skew < 0) ? ((usqInt) (thisWord & skewMask) >> -skew) : ((usqInt) (thisWord & skewMask) << skew)));
- /* begin dstLongAt: */
- idx10 = destIndex;
- destWord = long32At(idx10);
+ destWord = ((sqInt) ((((unsigned int *) ((sqMemoryBase) + destIndex)))[0]));
mergeWord = mergeFnwith(skewWord & halftoneWord, destWord);
destWord = (destMask & mergeWord) | (destWord & (~destMask));
- /* begin dstLongAt:put: */
- idx11 = destIndex;
- long32Atput(idx11, destWord);
+ ((sqInt) ((((unsigned int *) ((sqMemoryBase) + destIndex)))[0] = destWord));
destIndex += hInc;
}
sourceIndex += sourceDelta;
@@ -2009,13 +1972,6 @@
sqInt word;
sqInt i;
sqInt idx;
- sqInt idx1;
- sqInt idx2;
- sqInt idx3;
- sqInt idx4;
- sqInt idx5;
- sqInt idx6;
- sqInt idx7;
mergeFnwith = ((sqInt (*)(sqInt, sqInt)) (opTable[combinationRule + 1]));
mergeFnwith;
@@ -2028,17 +1984,13 @@
} else {
/* begin halftoneAt: */
idx = (dy + i) - 1;
- halftoneWord = long32At(halftoneBase + ((idx % halftoneHeight) * 4));
+ halftoneWord = ((sqInt) ((((unsigned int *) ((sqMemoryBase) + (halftoneBase + ((idx % halftoneHeight) * 4)))))[0]));
}
destMask = mask1;
- /* begin dstLongAt: */
- idx6 = destIndex;
- destWord = long32At(idx6);
+ destWord = ((sqInt) ((((unsigned int *) ((sqMemoryBase) + destIndex)))[0]));
mergeWord = mergeFnwith(halftoneWord, destWord);
destWord = (destMask & mergeWord) | (destWord & (~destMask));
- /* begin dstLongAt:put: */
- idx7 = destIndex;
- long32Atput(idx7, destWord);
+ ((sqInt) ((((unsigned int *) ((sqMemoryBase) + destIndex)))[0] = destWord));
/* This central horizontal loop requires no store masking */
@@ -2050,9 +2002,7 @@
destWord = halftoneWord;
for (word = 2; word <= (nWords - 1); word += 1) {
- /* begin dstLongAt:put: */
- idx1 = destIndex;
- long32Atput(idx1, destWord);
+ ((sqInt) ((((unsigned int *) ((sqMemoryBase) + destIndex)))[0] = destWord));
destIndex += 4;
}
} else {
@@ -2063,26 +2013,18 @@
/* Normal inner loop does merge */
- /* begin dstLongAt: */
- idx2 = destIndex;
- destWord = long32At(idx2);
+ destWord = ((sqInt) ((((unsigned int *) ((sqMemoryBase) + destIndex)))[0]));
mergeWord = mergeFnwith(halftoneWord, destWord);
- /* begin dstLongAt:put: */
- idx3 = destIndex;
- long32Atput(idx3, mergeWord);
+ ((sqInt) ((((unsigned int *) ((sqMemoryBase) + destIndex)))[0] = mergeWord));
destIndex += 4;
}
}
if (nWords > 1) {
destMask = mask2;
- /* begin dstLongAt: */
- idx4 = destIndex;
- destWord = long32At(idx4);
+ destWord = ((sqInt) ((((unsigned int *) ((sqMemoryBase) + destIndex)))[0]));
mergeWord = mergeFnwith(halftoneWord, destWord);
destWord = (destMask & mergeWord) | (destWord & (~destMask));
- /* begin dstLongAt:put: */
- idx5 = destIndex;
- long32Atput(idx5, destWord);
+ ((sqInt) ((((unsigned int *) ((sqMemoryBase) + destIndex)))[0] = destWord));
destIndex += 4;
}
destIndex += destDelta;
@@ -2124,10 +2066,6 @@
sqInt nPix;
sqInt scrStartBits;
sqInt idx;
- sqInt idx1;
- sqInt value;
- sqInt idx2;
- sqInt idx3;
sqInt sourcePix;
sqInt srcShift1;
sqInt sourceWord;
@@ -2136,10 +2074,9 @@
sqInt nPix1;
sqInt destWord1;
sqInt pv;
- sqInt idx4;
sqInt val;
- sqInt idx11;
- sqInt idx21;
+ sqInt idx1;
+ sqInt idx2;
mergeFnwith = ((sqInt (*)(sqInt, sqInt)) (opTable[combinationRule + 1]));
mergeFnwith;
@@ -2187,7 +2124,7 @@
} else {
/* begin halftoneAt: */
idx = (dy + i) - 1;
- halftoneWord = long32At(halftoneBase + ((idx % halftoneHeight) * 4));
+ halftoneWord = ((sqInt) ((((unsigned int *) ((sqMemoryBase) + (halftoneBase + ((idx % halftoneHeight) * 4)))))[0]));
}
srcBitShift = srcShift;
dstBitShift = dstShift;
@@ -2202,9 +2139,7 @@
/* pick up the word */
/* begin pickSourcePixels:flags:srcMask:destMask:srcShiftInc:dstShiftInc: */
- /* begin srcLongAt: */
- idx21 = sourceIndex;
- sourceWord = long32At(idx21);
+ sourceWord = ((sqInt) ((((unsigned int *) ((sqMemoryBase) + sourceIndex)))[0]));
destWord1 = 0;
srcShift1 = srcBitShift;
dstShift1 = dstBitShift;
@@ -2222,8 +2157,8 @@
srcShift1 -= 32;
}
/* begin srcLongAt: */
- idx4 = (sourceIndex += 4);
- sourceWord = long32At(idx4);
+ idx1 = (sourceIndex += 4);
+ sourceWord = ((sqInt) ((((unsigned int *) ((sqMemoryBase) + idx1)))[0]));
}
} while(!(((nPix1 -= 1)) == 0));
} else {
@@ -2256,8 +2191,8 @@
srcShift1 -= 32;
}
/* begin srcLongAt: */
- idx11 = (sourceIndex += 4);
- sourceWord = long32At(idx11);
+ idx2 = (sourceIndex += 4);
+ sourceWord = ((sqInt) ((((unsigned int *) ((sqMemoryBase) + idx2)))[0]));
}
} while(!(((nPix1 -= 1)) == 0));
}
@@ -2268,23 +2203,16 @@
/* avoid read-modify-write */
- mergeWord = mergeFnwith(skewWord & halftoneWord, dstLongAt(destIndex));
- /* begin dstLongAt:put: */
- idx1 = destIndex;
- value = destMask & mergeWord;
- long32Atput(idx1, value);
+ mergeWord = mergeFnwith(skewWord & halftoneWord, ((sqInt) ((((unsigned int *) ((sqMemoryBase) + destIndex)))[0])));
+ ((sqInt) ((((unsigned int *) ((sqMemoryBase) + destIndex)))[0] = (destMask & mergeWord)));
} else {
/* General version using dest masking */
- /* begin dstLongAt: */
- idx2 = destIndex;
- destWord = long32At(idx2);
+ destWord = ((sqInt) ((((unsigned int *) ((sqMemoryBase) + destIndex)))[0]));
mergeWord = mergeFnwith(skewWord & halftoneWord, destWord & destMask);
destWord = (destMask & mergeWord) | (destWord & (~destMask));
- /* begin dstLongAt:put: */
- idx3 = destIndex;
- long32Atput(idx3, destWord);
+ ((sqInt) ((((unsigned int *) ((sqMemoryBase) + destIndex)))[0] = destWord));
}
destIndex += 4;
if (words == 2) {
@@ -2366,11 +2294,7 @@
return destinationWord;
}
-static sqInt dstLongAt(sqInt idx) {
- return long32At(idx);
-}
-
/* Return the integer value of the given field of the given object. If the field contains a Float, truncate it and return its integral part. Fail if the given field does not contain a small integer or Float, or if the truncated Float is out of the range of small integers. */
static sqInt fetchIntOrFloatofObject(sqInt fieldIndex, sqInt objectPointer) {
@@ -2570,14 +2494,17 @@
sqInt formPointer;
sqInt formPointer1;
sqInt destBitsSize;
+ char *ptr;
sqInt sourceBitsSize;
sqInt oop;
sqInt cmOop;
sqInt cmSize;
sqInt oldStyle;
sqInt halftoneBits;
+ char *ptr1;
sqInt mapOop;
sqInt mapOop1;
+ char *ptr2;
bitBltOop = bbObj;
isWarping = aBool;
@@ -2670,7 +2597,9 @@
ok = 0;
goto l3;
}
- destBits = oopForPointer(interpreterProxy->firstIndexableField(destBits));
+ /* begin bits_oopForPointer: */
+ ptr = interpreterProxy->firstIndexableField(destBits);
+ destBits = ((usqInt) (ptr - (sqMemoryBase)));
}
ok = 1;
l3: /* end loadBitBltDestForm */;
@@ -2718,7 +2647,9 @@
ok = 0;
goto l4;
}
- sourceBits = oopForPointer(interpreterProxy->firstIndexableField(sourceBits));
+ /* begin bits_oopForPointer: */
+ ptr1 = interpreterProxy->firstIndexableField(sourceBits);
+ sourceBits = ((usqInt) (ptr1 - (sqMemoryBase)));
}
ok = 1;
l4: /* end loadBitBltSourceForm */;
@@ -2858,7 +2789,9 @@
halftoneBits = halftoneForm;
halftoneHeight = interpreterProxy->slotSizeOf(halftoneBits);
}
- halftoneBase = oopForPointer(interpreterProxy->firstIndexableField(halftoneBits));
+ /* begin bits_oopForPointer: */
+ ptr2 = interpreterProxy->firstIndexableField(halftoneBits);
+ halftoneBase = ((usqInt) (ptr2 - (sqMemoryBase)));
ok = 1;
l6: /* end loadHalftoneForm */;
if (!(ok)) {
@@ -3389,7 +3322,7 @@
left = destX;
sourcePtr = interpreterProxy->firstIndexableField(sourceString);
for (charIndex = startIndex; charIndex <= stopIndex; charIndex += 1) {
- ascii = byteAtPointer((sourcePtr + charIndex) - 1);
+ ascii = ((sqInt) ((((unsigned char *) ((sourcePtr + charIndex) - 1)))[0]));
glyphIndex = interpreterProxy->fetchIntegerofObject(ascii, glyphMap);
if ((glyphIndex < 0) || (glyphIndex > maxGlyph)) {
return interpreterProxy->primitiveFail();
@@ -3885,14 +3818,14 @@
}
while (((deltaX -= 1)) != 0) {
ditherThreshold = ditherMatrix4x4[ditherBase + ((ditherIndex = (ditherIndex + 1) & 3))];
- sourceWord = long32At(srcIndex);
+ sourceWord = ((sqInt) ((((unsigned int *) ((sqMemoryBase) + srcIndex)))[0]));
srcAlpha = sourceWord & 16777215;
if (!(srcAlpha == 0)) {
/* 0 < srcAlpha */
/* If we have to mix colors then just copy a single word */
- destWord = long32At(dstIndex);
+ destWord = ((sqInt) ((((unsigned int *) ((sqMemoryBase) + dstIndex)))[0]));
destWord = destWord & (~dstMask);
/* Expand from 16 to 32 bit by adding zero bits */
@@ -3915,10 +3848,10 @@
sourceWord = sourceWord << srcShift;
}
/* begin dstLongAt:put:mask: */
- dstValue = long32At(dstIndex);
+ dstValue = ((sqInt) ((((unsigned int *) ((sqMemoryBase) + dstIndex)))[0]));
dstValue = dstValue & dstMask;
dstValue = dstValue | sourceWord;
- long32Atput(dstIndex, dstValue);
+ ((sqInt) ((((unsigned int *) ((sqMemoryBase) + dstIndex)))[0] = dstValue));
}
srcIndex += 4;
if (destMSB) {
@@ -3988,7 +3921,7 @@
deltaX = bbW + 1;
while (((deltaX -= 1)) != 0) {
- sourceWord = long32At(srcIndex);
+ sourceWord = ((sqInt) ((((unsigned int *) ((sqMemoryBase) + srcIndex)))[0]));
srcAlpha = sourceWord & 16777215;
if (srcAlpha == 0) {
srcIndex += 4;
@@ -3996,7 +3929,7 @@
/* Now skip as many words as possible, */
dstIndex += 4;
- while ((((deltaX -= 1)) != 0) && ((((sourceWord = long32At(srcIndex))) & 16777215) == 0)) {
+ while ((((deltaX -= 1)) != 0) && ((((sourceWord = ((sqInt) ((((unsigned int *) ((sqMemoryBase) + srcIndex)))[0])))) & 16777215) == 0)) {
srcIndex += 4;
dstIndex += 4;
}
@@ -4006,9 +3939,9 @@
/* 0 < srcAlpha */
/* If we have to mix colors then just copy a single word */
- destWord = long32At(dstIndex);
+ destWord = ((sqInt) ((((unsigned int *) ((sqMemoryBase) + dstIndex)))[0]));
destWord = rgbComponentAlpha32with(sourceWord, destWord);
- long32Atput(dstIndex, destWord);
+ ((sqInt) ((((unsigned int *) ((sqMemoryBase) + dstIndex)))[0] = destWord));
srcIndex += 4;
dstIndex += 4;
}
@@ -4194,7 +4127,7 @@
dstMask = mask2;
while (((deltaX -= 1)) != 0) {
- sourceWord = ((long32At(srcIndex)) & (~adjust)) + adjust;
+ sourceWord = ((((sqInt) ((((unsigned int *) ((sqMemoryBase) + srcIndex)))[0]))) & (~adjust)) + adjust;
/* set srcAlpha to the average of the 3 separate aR,Ag,AB values */
@@ -4210,7 +4143,7 @@
sourceWord = 4294967295U;
}
- destWord = long32At(dstIndex);
+ destWord = ((sqInt) ((((unsigned int *) ((sqMemoryBase) + dstIndex)))[0]));
destWord = destWord & (~dstMask);
destWord = ((usqInt) destWord) >> srcShift;
destWord = mappingTable[destWord];
@@ -4238,10 +4171,10 @@
sourceWord = sourceWord << srcShift;
/* begin dstLongAt:put:mask: */
- dstValue = long32At(dstIndex);
+ dstValue = ((sqInt) ((((unsigned int *) ((sqMemoryBase) + dstIndex)))[0]));
dstValue = dstValue & dstMask;
dstValue = dstValue | sourceWord;
- long32Atput(dstIndex, dstValue);
+ ((sqInt) ((((unsigned int *) ((sqMemoryBase) + dstIndex)))[0] = dstValue));
}
srcIndex += 4;
if (destMSB) {
@@ -4896,7 +4829,7 @@
sqInt pAy;
sqInt dstShiftInc;
sqInt pBx;
- sqInt sourceMapOop;
+ usqInt sourceMapOop;
sqInt xDelta;
sqInt pAx;
sqInt deltaP12y;
@@ -4905,10 +4838,7 @@
sqInt deltaP12x;
sqInt smoothingCount;
sqInt idx;
- sqInt idx1;
- sqInt value;
- sqInt idx2;
- sqInt idx3;
+ char *ptr;
sqInt i1;
sqInt words1;
sqInt sourcePix;
@@ -4917,16 +4847,12 @@
sqInt dstMask;
sqInt destWord1;
sqInt pv;
- sqInt xx;
- sqInt yy;
+ sqInt val;
sqInt sourcePix1;
sqInt sourceWord;
sqInt srcIndex;
sqInt x;
sqInt y;
- sqInt val;
- sqInt xx1;
- sqInt yy1;
sqInt sourcePix2;
sqInt sourceWord1;
sqInt srcIndex1;
@@ -5034,7 +4960,9 @@
return interpreterProxy->primitiveFail();
}
- sourceMapOop = oopForPointer(interpreterProxy->firstIndexableField(sourceMapOop));
+ /* begin bits_oopForPointer: */
+ ptr = interpreterProxy->firstIndexableField(sourceMapOop);
+ sourceMapOop = ((usqInt) (ptr - (sqMemoryBase)));
}
} else {
smoothingCount = 1;
@@ -5149,7 +5077,7 @@
} else {
/* begin halftoneAt: */
idx = (dy + i) - 1;
- halftoneWord = long32At(halftoneBase + ((idx % halftoneHeight) * 4));
+ halftoneWord = ((sqInt) ((((unsigned int *) ((sqMemoryBase) + (halftoneBase + ((idx % halftoneHeight) * 4)))))[0]));
}
destMask = mask1;
@@ -5172,14 +5100,12 @@
if (mapperFlags == (ColorMapPresent | ColorMapIndexedPart)) {
do {
/* begin pickWarpPixelAtX:y: */
- xx = sx;
- yy = sy;
- if ((xx < 0) || ((yy < 0) || ((((x = ((usqInt) xx) >> BinaryPoint)) >= sourceWidth) || (((y = ((usqInt) yy) >> BinaryPoint)) >= sourceHeight)))) {
+ if ((sx < 0) || ((sy < 0) || ((((x = ((usqInt) sx) >> BinaryPoint)) >= sourceWidth) || (((y = ((usqInt) sy) >> BinaryPoint)) >= sourceHeight)))) {
sourcePix = 0;
goto l7;
}
srcIndex = (sourceBits + (y * sourcePitch)) + ((((usqInt) x) >> warpAlignShift) * 4);
- sourceWord = long32At(srcIndex);
+ sourceWord = ((sqInt) ((((unsigned int *) ((sqMemoryBase) + srcIndex)))[0]));
srcBitShift = warpBitShiftTable[x & warpAlignMask];
sourcePix1 = (((usqInt) sourceWord) >> srcBitShift) & warpSrcMask;
sourcePix = sourcePix1;
@@ -5193,14 +5119,12 @@
} else {
do {
/* begin pickWarpPixelAtX:y: */
- xx1 = sx;
- yy1 = sy;
- if ((xx1 < 0) || ((yy1 < 0) || ((((x1 = ((usqInt) xx1) >> BinaryPoint)) >= sourceWidth) || (((y1 = ((usqInt) yy1) >> BinaryPoint)) >= sourceHeight)))) {
+ if ((sx < 0) || ((sy < 0) || ((((x1 = ((usqInt) sx) >> BinaryPoint)) >= sourceWidth) || (((y1 = ((usqInt) sy) >> BinaryPoint)) >= sourceHeight)))) {
sourcePix = 0;
goto l8;
}
srcIndex1 = (sourceBits + (y1 * sourcePitch)) + ((((usqInt) x1) >> warpAlignShift) * 4);
- sourceWord1 = long32At(srcIndex1);
+ sourceWord1 = ((sqInt) ((((unsigned int *) ((sqMemoryBase) + srcIndex1)))[0]));
srcBitShift = warpBitShiftTable[x1 & warpAlignMask];
sourcePix2 = (((usqInt) sourceWord1) >> srcBitShift) & warpSrcMask;
sourcePix = sourcePix2;
@@ -5241,23 +5165,16 @@
/* avoid read-modify-write */
- mergeWord = mergeFnwith(skewWord & halftoneWord, dstLongAt(destIndex));
- /* begin dstLongAt:put: */
- idx1 = destIndex;
- value = destMask & mergeWord;
- long32Atput(idx1, value);
+ mergeWord = mergeFnwith(skewWord & halftoneWord, ((sqInt) ((((unsigned int *) ((sqMemoryBase) + destIndex)))[0])));
+ ((sqInt) ((((unsigned int *) ((sqMemoryBase) + destIndex)))[0] = (destMask & mergeWord)));
} else {
/* General version using dest masking */
- /* begin dstLongAt: */
- idx2 = destIndex;
- destWord = long32At(idx2);
+ destWord = ((sqInt) ((((unsigned int *) ((sqMemoryBase) + destIndex)))[0]));
mergeWord = mergeFnwith(skewWord & halftoneWord, destWord & destMask);
destWord = (destMask & mergeWord) | (destWord & (~destMask));
- /* begin dstLongAt:put: */
- idx3 = destIndex;
- long32Atput(idx3, destWord);
+ ((sqInt) ((((unsigned int *) ((sqMemoryBase) + destIndex)))[0] = destWord));
}
destIndex += 4;
if (words == 2) {
@@ -5362,7 +5279,7 @@
goto l1;
}
srcIndex = (sourceBits + (y1 * sourcePitch)) + ((((usqInt) x1) >> warpAlignShift) * 4);
- sourceWord = long32At(srcIndex);
+ sourceWord = ((sqInt) ((((unsigned int *) ((sqMemoryBase) + srcIndex)))[0]));
srcBitShift = warpBitShiftTable[x1 & warpAlignMask];
sourcePix = (((usqInt) sourceWord) >> srcBitShift) & warpSrcMask;
rgb = sourcePix;
@@ -5376,7 +5293,7 @@
/* Get RGBA values from sourcemap table */
- rgb = long32At(sourceMap + (rgb << 2));
+ rgb = ((sqInt) ((((unsigned int *) ((sqMemoryBase) + (sourceMap + (rgb << 2)))))[0]));
} else {
/* Already in RGB format */
Modified: trunk/src/plugins/CameraPlugin/CameraPlugin.c
===================================================================
--- trunk/src/plugins/CameraPlugin/CameraPlugin.c 2013-12-30 18:28:08 UTC (rev 2838)
+++ trunk/src/plugins/CameraPlugin/CameraPlugin.c 2014-01-04 19:09:42 UTC (rev 2839)
@@ -1,10 +1,10 @@
-/* Smalltalk from Squeak4.4 with VMMaker 4.12.11 translated as C source on 30 December 2013 1:11:51 pm */
+/* Smalltalk from Squeak4.4 with VMMaker 4.12.12 translated as C source on 4 January 2014 2:03:59 pm */
/* Automatically generated by
- VMPluginCodeGenerator VMMaker-dtl.333 uuid: 9ffe16dc-ba45-44c6-a894-ed3d96a8c916
+ VMPluginCodeGenerator VMMaker-dtl.334 uuid: 61416154-73bc-45d7-9f3a-739a51ae816f
from
- CameraPlugin VMMaker-dtl.333 uuid: 9ffe16dc-ba45-44c6-a894-ed3d96a8c916
+ CameraPlugin VMMaker-dtl.334 uuid: 61416154-73bc-45d7-9f3a-739a51ae816f
*/
-static char __buildInfo[] = "CameraPlugin VMMaker-dtl.333 uuid: 9ffe16dc-ba45-44c6-a894-ed3d96a8c916 " __DATE__ ;
+static char __buildInfo[] = "CameraPlugin VMMaker-dtl.334 uuid: 61416154-73bc-45d7-9f3a-739a51ae816f " __DATE__ ;
@@ -64,9 +64,9 @@
struct VirtualMachine* interpreterProxy;
static const char *moduleName =
#ifdef SQUEAK_BUILTIN_PLUGIN
- "CameraPlugin 30 December 2013 (i)"
+ "CameraPlugin 4 January 2014 (i)"
#else
- "CameraPlugin 30 December 2013 (e)"
+ "CameraPlugin 4 January 2014 (e)"
#endif
;
Modified: trunk/src/plugins/ClipboardExtendedPlugin/ClipboardExtendedPlugin.c
===================================================================
--- trunk/src/plugins/ClipboardExtendedPlugin/ClipboardExtendedPlugin.c 2013-12-30 18:28:08 UTC (rev 2838)
+++ trunk/src/plugins/ClipboardExtendedPlugin/ClipboardExtendedPlugin.c 2014-01-04 19:09:42 UTC (rev 2839)
@@ -1,10 +1,10 @@
-/* Smalltalk from Squeak4.4 with VMMaker 4.12.11 translated as C source on 30 December 2013 1:11:51 pm */
+/* Smalltalk from Squeak4.4 with VMMaker 4.12.12 translated as C source on 4 January 2014 2:04 pm */
/* Automatically generated by
- SmartSyntaxPluginCodeGenerator VMMaker-dtl.333 uuid: 9ffe16dc-ba45-44c6-a894-ed3d96a8c916
+ SmartSyntaxPluginCodeGenerator VMMaker-dtl.334 uuid: 61416154-73bc-45d7-9f3a-739a51ae816f
from
- ClipboardExtendedPlugin VMMaker-dtl.333 uuid: 9ffe16dc-ba45-44c6-a894-ed3d96a8c916
+ ClipboardExtendedPlugin VMMaker-dtl.334 uuid: 61416154-73bc-45d7-9f3a-739a51ae816f
*/
-static char __buildInfo[] = "ClipboardExtendedPlugin VMMaker-dtl.333 uuid: 9ffe16dc-ba45-44c6-a894-ed3d96a8c916 " __DATE__ ;
+static char __buildInfo[] = "ClipboardExtendedPlugin VMMaker-dtl.334 uuid: 61416154-73bc-45d7-9f3a-739a51ae816f " __DATE__ ;
@@ -61,9 +61,9 @@
struct VirtualMachine* interpreterProxy;
static const char *moduleName =
#ifdef SQUEAK_BUILTIN_PLUGIN
- "ClipboardExtendedPlugin 30 December 2013 (i)"
+ "ClipboardExtendedPlugin 4 January 2014 (i)"
#else
- "ClipboardExtendedPlugin 30 December 2013 (e)"
+ "ClipboardExtendedPlugin 4 January 2014 (e)"
#endif
;
@@ -215,8 +215,8 @@
{"ClipboardExtendedPlugin", "setInterpreter", (void*)setInterpreter},
{"ClipboardExtendedPlugin", "ioGetClipboardFormat", (void*)ioGetClipboardFormat},
{"ClipboardExtendedPlugin", "ioCreateClipboard", (void*)ioCreateClipboard},
+ {"ClipboardExtendedPlugin", "ioAddClipboardData", (void*)ioAddClipboardData},
{"ClipboardExtendedPlugin", "ioReadClipboardData", (void*)ioReadClipboardData},
- {"ClipboardExtendedPlugin", "ioAddClipboardData", (void*)ioAddClipboardData},
{NULL, NULL, NULL}
};
Modified: trunk/src/plugins/CroquetPlugin/CroquetPlugin.c
===================================================================
--- trunk/src/plugins/CroquetPlugin/CroquetPlugin.c 2013-12-30 18:28:08 UTC (rev 2838)
+++ trunk/src/plugins/CroquetPlugin/CroquetPlugin.c 2014-01-04 19:09:42 UTC (rev 2839)
@@ -1,10 +1,10 @@
-/* Smalltalk from Squeak4.4 with VMMaker 4.12.11 translated as C source on 30 December 2013 1:11:39 pm */
+/* Smalltalk from Squeak4.4 with VMMaker 4.12.12 translated as C source on 4 January 2014 2:03:42 pm */
/* Automatically generated by
- VMPluginCodeGenerator VMMaker-dtl.333 uuid: 9ffe16dc-ba45-44c6-a894-ed3d96a8c916
+ VMPluginCodeGenerator VMMaker-dtl.334 uuid: 61416154-73bc-45d7-9f3a-739a51ae816f
from
- CroquetPlugin VMMaker-dtl.333 uuid: 9ffe16dc-ba45-44c6-a894-ed3d96a8c916
+ CroquetPlugin VMMaker-dtl.334 uuid: 61416154-73bc-45d7-9f3a-739a51ae816f
*/
-static char __buildInfo[] = "CroquetPlugin VMMaker-dtl.333 uuid: 9ffe16dc-ba45-44c6-a894-ed3d96a8c916 " __DATE__ ;
+static char __buildInfo[] = "CroquetPlugin VMMaker-dtl.334 uuid: 61416154-73bc-45d7-9f3a-739a51ae816f " __DATE__ ;
@@ -73,9 +73,9 @@
struct VirtualMachine* interpreterProxy;
static const char *moduleName =
#ifdef SQUEAK_BUILTIN_PLUGIN
- "CroquetPlugin 30 December 2013 (i)"
+ "CroquetPlugin 4 January 2014 (i)"
#else
- "CroquetPlugin 30 December 2013 (e)"
+ "CroquetPlugin 4 January 2014 (e)"
#endif
;
Modified: trunk/src/plugins/DBusPlugin/DBusPlugin.c
===================================================================
--- trunk/src/plugins/DBusPlugin/DBusPlugin.c 2013-12-30 18:28:08 UTC (rev 2838)
+++ trunk/src/plugins/DBusPlugin/DBusPlugin.c 2014-01-04 19:09:42 UTC (rev 2839)
@@ -1,6 +1,6 @@
-/* Smalltalk from Squeak4.4 with VMMaker 4.12.11 translated as C source on 30 December 2013 1:11:51 pm */
+/* Smalltalk from Squeak4.4 with VMMaker 4.12.12 translated as C source on 4 January 2014 2:04:01 pm */
/* Automatically generated by
- SmartSyntaxPluginCodeGenerator VMMaker-dtl.333 uuid: 9ffe16dc-ba45-44c6-a894-ed3d96a8c916
+ SmartSyntaxPluginCodeGenerator VMMaker-dtl.334 uuid: 61416154-73bc-45d7-9f3a-739a51ae816f
from
DBusPlugin DBus-Plugin-dtl.35 uuid: 2ae30f08-4793-4acb-876b-c443a5f5e665
*/
@@ -143,9 +143,9 @@
static DBusMessageIter messageIter[DBUS_MAXIMUM_TYPE_RECURSION_DEPTH];
static const char *moduleName =
#ifdef SQUEAK_BUILTIN_PLUGIN
- "DBusPlugin 30 December 2013 (i)"
+ "DBusPlugin 4 January 2014 (i)"
#else
- "DBusPlugin 30 December 2013 (e)"
+ "DBusPlugin 4 January 2014 (e)"
#endif
;
static DBusMessage* writeMessage;
Modified: trunk/src/plugins/DSAPrims/DSAPrims.c
===================================================================
--- trunk/src/plugins/DSAPrims/DSAPrims.c 2013-12-30 18:28:08 UTC (rev 2838)
+++ trunk/src/plugins/DSAPrims/DSAPrims.c 2014-01-04 19:09:42 UTC (rev 2839)
@@ -1,10 +1,10 @@
-/* Smalltalk from Squeak4.4 with VMMaker 4.12.11 translated as C source on 30 December 2013 1:11:40 pm */
+/* Smalltalk from Squeak4.4 with VMMaker 4.12.12 translated as C source on 4 January 2014 2:03:42 pm */
/* Automatically generated by
- VMPluginCodeGenerator VMMaker-dtl.333 uuid: 9ffe16dc-ba45-44c6-a894-ed3d96a8c916
+ VMPluginCodeGenerator VMMaker-dtl.334 uuid: 61416154-73bc-45d7-9f3a-739a51ae816f
from
- DSAPlugin VMMaker-dtl.333 uuid: 9ffe16dc-ba45-44c6-a894-ed3d96a8c916
+ DSAPlugin VMMaker-dtl.334 uuid: 61416154-73bc-45d7-9f3a-739a51ae816f
*/
-static char __buildInfo[] = "DSAPlugin VMMaker-dtl.333 uuid: 9ffe16dc-ba45-44c6-a894-ed3d96a8c916 " __DATE__ ;
+static char __buildInfo[] = "DSAPlugin VMMaker-dtl.334 uuid: 61416154-73bc-45d7-9f3a-739a51ae816f " __DATE__ ;
@@ -67,9 +67,9 @@
struct VirtualMachine* interpreterProxy;
static const char *moduleName =
#ifdef SQUEAK_BUILTIN_PLUGIN
- "DSAPrims 30 December 2013 (i)"
+ "DSAPrims 4 January 2014 (i)"
#else
- "DSAPrims 30 December 2013 (e)"
+ "DSAPrims 4 January 2014 (e)"
#endif
;
static sqInt remainderDigitCount;
Modified: trunk/src/plugins/DropPlugin/DropPlugin.c
===================================================================
--- trunk/src/plugins/DropPlugin/DropPlugin.c 2013-12-30 18:28:08 UTC (rev 2838)
+++ trunk/src/plugins/DropPlugin/DropPlugin.c 2014-01-04 19:09:42 UTC (rev 2839)
@@ -1,10 +1,10 @@
-/* Smalltalk from Squeak4.4 with VMMaker 4.12.11 translated as C source on 30 December 2013 1:11:40 pm */
+/* Smalltalk from Squeak4.4 with VMMaker 4.12.12 translated as C source on 4 January 2014 2:03:44 pm */
/* Automatically generated by
- VMPluginCodeGenerator VMMaker-dtl.333 uuid: 9ffe16dc-ba45-44c6-a894-ed3d96a8c916
+ VMPluginCodeGenerator VMMaker-dtl.334 uuid: 61416154-73bc-45d7-9f3a-739a51ae816f
from
- DropPlugin VMMaker-dtl.333 uuid: 9ffe16dc-ba45-44c6-a894-ed3d96a8c916
+ DropPlugin VMMaker-dtl.334 uuid: 61416154-73bc-45d7-9f3a-739a51ae816f
*/
-static char __buildInfo[] = "DropPlugin VMMaker-dtl.333 uuid: 9ffe16dc-ba45-44c6-a894-ed3d96a8c916 " __DATE__ ;
+static char __buildInfo[] = "DropPlugin VMMaker-dtl.334 uuid: 61416154-73bc-45d7-9f3a-739a51ae816f " __DATE__ ;
@@ -62,9 +62,9 @@
struct VirtualMachine* interpreterProxy;
static const char *moduleName =
#ifdef SQUEAK_BUILTIN_PLUGIN
- "DropPlugin 30 December 2013 (i)"
+ "DropPlugin 4 January 2014 (i)"
#else
- "DropPlugin 30 December 2013 (e)"
+ "DropPlugin 4 January 2014 (e)"
#endif
;
Modified: trunk/src/plugins/FFTPlugin/FFTPlugin.c
===================================================================
--- trunk/src/plugins/FFTPlugin/FFTPlugin.c 2013-12-30 18:28:08 UTC (rev 2838)
+++ trunk/src/plugins/FFTPlugin/FFTPlugin.c 2014-01-04 19:09:42 UTC (rev 2839)
@@ -1,10 +1,10 @@
-/* Smalltalk from Squeak4.4 with VMMaker 4.12.11 translated as C source on 30 December 2013 1:11:41 pm */
+/* Smalltalk from Squeak4.4 with VMMaker 4.12.12 translated as C source on 4 January 2014 2:03:44 pm */
/* Automatically generated by
- VMPluginCodeGenerator VMMaker-dtl.333 uuid: 9ffe16dc-ba45-44c6-a894-ed3d96a8c916
+ VMPluginCodeGenerator VMMaker-dtl.334 uuid: 61416154-73bc-45d7-9f3a-739a51ae816f
from
- FFTPlugin VMMaker-dtl.333 uuid: 9ffe16dc-ba45-44c6-a894-ed3d96a8c916
+ FFTPlugin VMMaker-dtl.334 uuid: 61416154-73bc-45d7-9f3a-739a51ae816f
*/
-static char __buildInfo[] = "FFTPlugin VMMaker-dtl.333 uuid: 9ffe16dc-ba45-44c6-a894-ed3d96a8c916 " __DATE__ ;
+static char __buildInfo[] = "FFTPlugin VMMaker-dtl.334 uuid: 61416154-73bc-45d7-9f3a-739a51ae816f " __DATE__ ;
@@ -68,9 +68,9 @@
struct VirtualMachine* interpreterProxy;
static const char *moduleName =
#ifdef SQUEAK_BUILTIN_PLUGIN
- "FFTPlugin 30 December 2013 (i)"
+ "FFTPlugin 4 January 2014 (i)"
#else
- "FFTPlugin 30 December 2013 (e)"
+ "FFTPlugin 4 January 2014 (e)"
#endif
;
static sqInt nu;
Modified: trunk/src/plugins/FT2Plugin/FT2Plugin.c
===================================================================
--- trunk/src/plugins/FT2Plugin/FT2Plugin.c 2013-12-30 18:28:08 UTC (rev 2838)
+++ trunk/src/plugins/FT2Plugin/FT2Plugin.c 2014-01-04 19:09:42 UTC (rev 2839)
@@ -1,4 +1,4 @@
-/* Smalltalk from Squeak4.4 with VMMaker 4.12.11 translated as C source on 30 December 2013 1:11:41 pm */
+/* Smalltalk from Squeak4.4 with VMMaker 4.12.12 translated as C source on 4 January 2014 2:03:45 pm */
/* Automatically generated by
FT2PluginCodeGenerator * FreeType-nice.442 uuid: 9895a884-7d42-4783-9fb8-1a71ef244e16
from
@@ -121,9 +121,9 @@
static FT_Library library;
static const char *moduleName =
#ifdef SQUEAK_BUILTIN_PLUGIN
- "FT2Plugin 30 December 2013 (i)"
+ "FT2Plugin 4 January 2014 (i)"
#else
- "FT2Plugin 30 December 2013 (e)"
+ "FT2Plugin 4 January 2014 (e)"
#endif
;
Modified: trunk/src/plugins/FileCopyPlugin/FileCopyPlugin.c
===================================================================
--- trunk/src/plugins/FileCopyPlugin/FileCopyPlugin.c 2013-12-30 18:28:08 UTC (rev 2838)
+++ trunk/src/plugins/FileCopyPlugin/FileCopyPlugin.c 2014-01-04 19:09:42 UTC (rev 2839)
@@ -1,10 +1,10 @@
-/* Smalltalk from Squeak4.4 with VMMaker 4.12.11 translated as C source on 30 December 2013 1:11:53 pm */
+/* Smalltalk from Squeak4.4 with VMMaker 4.12.12 translated as C source on 4 January 2014 2:04:03 pm */
/* Automatically generated by
- SmartSyntaxPluginCodeGenerator VMMaker-dtl.333 uuid: 9ffe16dc-ba45-44c6-a894-ed3d96a8c916
+ SmartSyntaxPluginCodeGenerator VMMaker-dtl.334 uuid: 61416154-73bc-45d7-9f3a-739a51ae816f
from
- FileCopyPlugin VMMaker-dtl.333 uuid: 9ffe16dc-ba45-44c6-a894-ed3d96a8c916
+ FileCopyPlugin VMMaker-dtl.334 uuid: 61416154-73bc-45d7-9f3a-739a51ae816f
*/
-static char __buildInfo[] = "FileCopyPlugin VMMaker-dtl.333 uuid: 9ffe16dc-ba45-44c6-a894-ed3d96a8c916 " __DATE__ ;
+static char __buildInfo[] = "FileCopyPlugin VMMaker-dtl.334 uuid: 61416154-73bc-45d7-9f3a-739a51ae816f " __DATE__ ;
@@ -57,9 +57,9 @@
struct VirtualMachine* interpreterProxy;
static const char *moduleName =
#ifdef SQUEAK_BUILTIN_PLUGIN
- "FileCopyPlugin 30 December 2013 (i)"
+ "FileCopyPlugin 4 January 2014 (i)"
#else
- "FileCopyPlugin 30 December 2013 (e)"
+ "FileCopyPlugin 4 January 2014 (e)"
#endif
;
@@ -125,8 +125,8 @@
@@ Diff output truncated at 50000 characters. @@
More information about the Vm-dev
mailing list