Vm-dev February 2015

vm-dev@lists.squeakfoundation.org

27 participants
101 discussions

Re: [Pharo-dev] Determine if a method is Jitted or not
by Eliot Miranda 23 Feb '15

23 Feb '15

Hi Thierry, there's an unadvertised primitive called Context>>#xRay (or ContextPart>>#xRay) that answers these questions for tests. I'm away from the system right now but I'll get you the source soon. Also, the limit on jutting methods, 60 literals, is a default. There's a command line option -maxcoglits (IIRC) that you can change. Eliot (phone) On Feb 23, 2015, at 5:05 AM, Thierry Goubier <thierry.goubier(a)gmail.com> wrote: > Hi All, > > anybody knows how to check if a method is jitted or not? > > I remember (maybe wrongly) that the Jit in Cog has a configurable limit on the number of bytecodes for a method to be jitted or not; I'm looking into the performance of generated code where I can, more or less, control the length of methods (SmaCC) and I'd like to find the optimum point. > > Thanks, > > Thierry

1 0

VM Maker: VMMaker.oscog-eem.1074.mcz
by commits＠source.squeak.org 23 Feb '15

23 Feb '15

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.1074.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.1074 Author: eem Time: 22 February 2015, 4:29:56.443 pm UUID: b88dbe30-1cfb-4a06-b6ad-89e63489893e Ancestors: VMMaker.oscog-eem.1073 Use printstringof;maybeselect for more reliable printing of selector in Newspeak privacy check. =============== Diff against VMMaker.oscog-eem.1073 =============== Item was changed: ----- Method: StackInterpreter>>lookupMethodInClass: (in category 'message sending') ----- lookupMethodInClass: class | currentClass dictionary found | <inline: false> self assert: (self addressCouldBeClassObj: class). currentClass := class. [currentClass ~= objectMemory nilObject] whileTrue: [dictionary := objectMemory followObjField: MethodDictionaryIndex ofObject: currentClass. dictionary = objectMemory nilObject ifTrue: ["MethodDict pointer is nil (hopefully due a swapped out stub) -- raise exception #cannotInterpret:." self createActualMessageTo: class. messageSelector := objectMemory splObj: SelectorCannotInterpret. self sendBreakpoint: messageSelector receiver: nil. ^self lookupMethodInClass: (self superclassOf: currentClass)]. found := self lookupMethodInDictionary: dictionary. (NewspeakVM and: [CheckPrivacyViolations and: [isPrivateSend not and: [messageSelector ~= (objectMemory splObj: SelectorDoesNotUnderstand) and: [(self accessModifierOfMethod: newMethod) ~= 0]]]]) ifTrue: [self print: (self nameOfClass: currentClass); space. self printStringOf: (messageSelector); print: ' from '. + self printStringOf: (self maybeSelectorOfMethod: method); cr]. - self printStringOf: (self fetchPointer: 0 ofObject: (self methodClassOf: method)); cr]. found ifTrue: [^currentClass]. currentClass := self superclassOf: currentClass]. "Could not find #doesNotUnderstand: -- unrecoverable error." messageSelector = (objectMemory splObj: SelectorDoesNotUnderstand) ifTrue: [self error: 'Recursive not understood error encountered']. "Cound not find a normal message -- raise exception #doesNotUnderstand:" self createActualMessageTo: class. messageSelector := objectMemory splObj: SelectorDoesNotUnderstand. self sendBreak: messageSelector + objectMemory baseHeaderSize point: (objectMemory lengthOf: messageSelector) receiver: nil. ^self lookupMethodInClass: class!

1 0

[commit][3262] CogVM source as per VMMaker.oscog-eem.1074
by commits＠squeakvm.org 23 Feb '15

23 Feb '15

Revision: 3262 Author: eliot Date: 2015-02-22 16:31:15 -0800 (Sun, 22 Feb 2015) Log Message: ----------- CogVM source as per VMMaker.oscog-eem.1074 Use maybeSelectorOfMethod: for more reliable printing of selector in Newspeak privacy check. Modified Paths: -------------- branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c branches/Cog/nsspurstacksrc/vm/interp.c Property Changed: ---------------- branches/Cog/platforms/Cross/vm/sqSCCSVersion.h Modified: branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c =================================================================== --- branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c 2015-02-22 23:10:08 UTC (rev 3261) +++ branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c 2015-02-23 00:31:15 UTC (rev 3262) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1073 uuid: f5e526a5-587e-4182-856d-519220e8efa9 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1074 uuid: b88dbe30-1cfb-4a06-b6ad-89e63489893e from - StackInterpreter VMMaker.oscog-eem.1073 uuid: f5e526a5-587e-4182-856d-519220e8efa9 + StackInterpreter VMMaker.oscog-eem.1074 uuid: b88dbe30-1cfb-4a06-b6ad-89e63489893e */ -static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1073 uuid: f5e526a5-587e-4182-856d-519220e8efa9 " __DATE__ ; +static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1074 uuid: b88dbe30-1cfb-4a06-b6ad-89e63489893e " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2114,7 +2114,7 @@ /* 575 */ (void (*)(void))0, 0 }; char expensiveAsserts = 0; -const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscog-eem.1073"; +const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscog-eem.1074"; volatile int sendTrace; sqInt suppressHeartbeatFlag; @@ -53841,7 +53841,7 @@ putchar(' '); printStringOf(GIV(messageSelector)); print(" from "); - printStringOf(fetchPointerofObject(0, methodClassOf(GIV(method)))); + printStringOf(maybeSelectorOfMethod(GIV(method))); /* begin cr */ printf("\n"); } Modified: branches/Cog/nsspurstacksrc/vm/interp.c =================================================================== --- branches/Cog/nsspurstacksrc/vm/interp.c 2015-02-22 23:10:08 UTC (rev 3261) +++ branches/Cog/nsspurstacksrc/vm/interp.c 2015-02-23 00:31:15 UTC (rev 3262) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1073 uuid: f5e526a5-587e-4182-856d-519220e8efa9 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1074 uuid: b88dbe30-1cfb-4a06-b6ad-89e63489893e from - StackInterpreter VMMaker.oscog-eem.1073 uuid: f5e526a5-587e-4182-856d-519220e8efa9 + StackInterpreter VMMaker.oscog-eem.1074 uuid: b88dbe30-1cfb-4a06-b6ad-89e63489893e */ -static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1073 uuid: f5e526a5-587e-4182-856d-519220e8efa9 " __DATE__ ; +static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1074 uuid: b88dbe30-1cfb-4a06-b6ad-89e63489893e " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2111,7 +2111,7 @@ /* 575 */ (void (*)(void))0, 0 }; char expensiveAsserts = 0; -const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscog-eem.1073"; +const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscog-eem.1074"; volatile int sendTrace; sqInt suppressHeartbeatFlag; @@ -53832,7 +53832,7 @@ putchar(' '); printStringOf(GIV(messageSelector)); print(" from "); - printStringOf(fetchPointerofObject(0, methodClassOf(GIV(method)))); + printStringOf(maybeSelectorOfMethod(GIV(method))); /* begin cr */ printf("\n"); } Property changes on: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h ___________________________________________________________________ Modified: checkindate - Sun Feb 22 15:09:48 PST 2015 + Sun Feb 22 16:31:20 PST 2015

1 0

[commit][3261] CogVM source as per VMMaker.oscog-eem.1073
by commits＠squeakvm.org 23 Feb '15

23 Feb '15

Revision: 3261 Author: eliot Date: 2015-02-22 15:10:08 -0800 (Sun, 22 Feb 2015) Log Message: ----------- CogVM source as per VMMaker.oscog-eem.1073 General: Add an option to control FailUnbalancedPrimitives and no longer burden the Stack VMs with the responsibility. Newspeak VM: Add an optional CheckPrivacyViolations option and obey it (thanks, Ryan). Modified Paths: -------------- branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c branches/Cog/nsspurstacksrc/vm/interp.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/stacksrc/vm/gcc3x-interp.c branches/Cog/stacksrc/vm/interp.c Property Changed: ---------------- branches/Cog/platforms/Cross/vm/sqSCCSVersion.h Modified: branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c =================================================================== --- branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c 2015-02-21 06:09:27 UTC (rev 3260) +++ branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c 2015-02-22 23:10:08 UTC (rev 3261) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1072 uuid: bd9d8dd5-dea0-49da-8be7-cb246f49f554 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1073 uuid: f5e526a5-587e-4182-856d-519220e8efa9 from - StackInterpreter VMMaker.oscog-eem.1072 uuid: bd9d8dd5-dea0-49da-8be7-cb246f49f554 + StackInterpreter VMMaker.oscog-eem.1073 uuid: f5e526a5-587e-4182-856d-519220e8efa9 */ -static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1072 uuid: bd9d8dd5-dea0-49da-8be7-cb246f49f554 " __DATE__ ; +static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1073 uuid: f5e526a5-587e-4182-856d-519220e8efa9 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -150,6 +150,7 @@ #define CacheProbeMax 3 #define CharacterTable null #define CharacterValueIndex 0 +#define CheckPrivacyViolations 1 #define ClassAlien 52 #define ClassArray 7 #define ClassArrayCompactIndex 51 @@ -202,7 +203,7 @@ #define ExcessSignalsIndex 2 #define ExternalObjectsArray 38 #define ExtraRootsSize 2048 -#define FailImbalancedPrimitives 1 +#define FailImbalancedPrimitives 0 #define FalseObject 1 #define FirstLinkIndex 0 #define FoxCallerContext 4 @@ -248,6 +249,7 @@ #define MethodCacheSize 4096 #define MethodDictionaryIndex 1 #define MethodHeaderArgCountShift 25 +#define MethodHeaderFlagBitPosition 29 #define MethodHeaderTempCountShift 19 #define MethodIndex 3 #define MillisecondClockMask 0x1FFFFFFF @@ -961,6 +963,7 @@ static usqInt totalBytesInSegments(void); static sqInt writeImageSegmentsToFile(sqImageFile aBinaryStream) NoDbgRegParms; static sqInt writeSegmentnextSegmenttoFile(SpurSegmentInfo *segment, SpurSegmentInfo *nextSegment, sqImageFile aBinaryStream) NoDbgRegParms; +static sqInt accessModifierOfMethod(sqInt methodObj) NoDbgRegParms; sqInt activeProcess(void); static void addLastLinktoList(sqInt proc, sqInt aList) NoDbgRegParms; static void addNewMethodToCache(sqInt classObj) NoDbgRegParms; @@ -1455,6 +1458,7 @@ _iss sqInt gcSemaphoreIndex; _iss sqInt globalSessionID; _iss sqInt imageFloatsBigEndian; +_iss sqInt isPrivateSend; _iss sqInt longRunningPrimitiveSignalUndelivered; _iss sqInt maxExtSemTabSizeSet; _iss sqInt rememberedSetRedZone; @@ -2110,7 +2114,7 @@ /* 575 */ (void (*)(void))0, 0 }; char expensiveAsserts = 0; -const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscog-eem.1072"; +const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscog-eem.1073"; volatile int sendTrace; sqInt suppressHeartbeatFlag; @@ -5671,7 +5675,7 @@ sendBreakpointreceiver(firstFixedFieldOfMaybeImmediate(GIV(messageSelector)), lengthOfMaybeImmediate(GIV(messageSelector)), longAtPointer(localSP + (GIV(argumentCount) * BytesPerOop))); /* begin internalFindNewMethod */ - + /* shift drops two low-order zeros from addresses */ hash1 = GIV(messageSelector) ^ lkupClassTag; @@ -5741,6 +5745,9 @@ localFP = pointerForOop(GIV(framePointer)); addNewMethodToCache(GIV(lkupClass)); l239: ; + + GIV(isPrivateSend) = 0; + l238: /* end internalFindNewMethod */; /* begin internalExecuteNewMethod */ if (primitiveFunctionPointer != 0) { @@ -5787,10 +5794,7 @@ /* begin slowPrimitiveResponse */ assert(!(isOopForwarded(stackValue(GIV(argumentCount))))); assert((remapBufferCount()) == 0); - nArgs = GIV(argumentCount); - savedStackPointer = GIV(stackPointer); - savedFramePointer = GIV(framePointer); - + /* begin initPrimCall */ GIV(primFailCode) = 0; dispatchFunctionPointer(primitiveFunctionPointer); @@ -5808,18 +5812,7 @@ GIV(primFailCode) = PrimErrWritePastObject; } } - if ((!GIV(primFailCode)) - && ((GIV(framePointer) == savedFramePointer) - && (!0))) { - - /* Don't fail if primitive has done something radical, e.g. perform: */ - - if (GIV(stackPointer) != (savedStackPointer + (nArgs * BytesPerWord))) { - flag("Would be nice to make this a message send of e.g. unbalancedPrimitive to the current process or context"); - GIV(stackPointer) = savedStackPointer; - failUnbalancedPrimitive(); - } - } + if (GIV(nextProfileTick) > 0) { checkProfileTick(GIV(newMethod)); } @@ -13177,6 +13170,8 @@ : tagBits) : (longAt(localAbsentReceiver)) & 0x3FFFFF); assert((classForClassTag(lkupClassTag)) != (nilObject())); + GIV(isPrivateSend) = 1; + goto commonSend; } } @@ -19951,10 +19946,7 @@ /* begin slowPrimitiveResponse */ assert(!(isOopForwarded(stackValue(GIV(argumentCount))))); assert((remapBufferCount()) == 0); - nArgs = GIV(argumentCount); - savedStackPointer = GIV(stackPointer); - savedFramePointer = GIV(framePointer); - + /* begin initPrimCall */ GIV(primFailCode) = 0; dispatchFunctionPointer(primitiveFunctionPointer); @@ -19972,18 +19964,7 @@ GIV(primFailCode) = PrimErrWritePastObject; } } - if ((!GIV(primFailCode)) - && ((GIV(framePointer) == savedFramePointer) - && (!0))) { - - /* Don't fail if primitive has done something radical, e.g. perform: */ - - if (GIV(stackPointer) != (savedStackPointer + (nArgs * BytesPerWord))) { - flag("Would be nice to make this a message send of e.g. unbalancedPrimitive to the current process or context"); - GIV(stackPointer) = savedStackPointer; - failUnbalancedPrimitive(); - } - } + if (GIV(nextProfileTick) > 0) { checkProfileTick(GIV(newMethod)); } @@ -22411,10 +22392,7 @@ /* begin slowPrimitiveResponse */ assert(!(isOopForwarded(stackValue(GIV(argumentCount))))); assert((remapBufferCount()) == 0); - nArgs = GIV(argumentCount); - savedStackPointer = GIV(stackPointer); - savedFramePointer = GIV(framePointer); - + /* begin initPrimCall */ GIV(primFailCode) = 0; dispatchFunctionPointer(primitiveFunctionPointer); @@ -22432,18 +22410,7 @@ GIV(primFailCode) = PrimErrWritePastObject; } } - if ((!GIV(primFailCode)) - && ((GIV(framePointer) == savedFramePointer) - && (!0))) { - - /* Don't fail if primitive has done something radical, e.g. perform: */ - - if (GIV(stackPointer) != (savedStackPointer + (nArgs * BytesPerWord))) { - flag("Would be nice to make this a message send of e.g. unbalancedPrimitive to the current process or context"); - GIV(stackPointer) = savedStackPointer; - failUnbalancedPrimitive(); - } - } + if (GIV(nextProfileTick) > 0) { checkProfileTick(GIV(newMethod)); } @@ -22663,10 +22630,7 @@ /* begin slowPrimitiveResponse */ assert(!(isOopForwarded(stackValue(GIV(argumentCount))))); assert((remapBufferCount()) == 0); - nArgs = GIV(argumentCount); - savedStackPointer = GIV(stackPointer); - savedFramePointer = GIV(framePointer); - + /* begin initPrimCall */ GIV(primFailCode) = 0; dispatchFunctionPointer(primitiveFunctionPointer); @@ -22684,18 +22648,7 @@ GIV(primFailCode) = PrimErrWritePastObject; } } - if ((!GIV(primFailCode)) - && ((GIV(framePointer) == savedFramePointer) - && (!0))) { - - /* Don't fail if primitive has done something radical, e.g. perform: */ - - if (GIV(stackPointer) != (savedStackPointer + (nArgs * BytesPerWord))) { - flag("Would be nice to make this a message send of e.g. unbalancedPrimitive to the current process or context"); - GIV(stackPointer) = savedStackPointer; - failUnbalancedPrimitive(); - } - } + if (GIV(nextProfileTick) > 0) { checkProfileTick(GIV(newMethod)); } @@ -48396,7 +48349,19 @@ return nWritten; } +static sqInt +accessModifierOfMethod(sqInt methodObj) +{ + sqInt header; + /* begin accessModifierOfMethodHeader: */ + /* begin methodHeaderOf: */ + assert(isCompiledMethod(methodObj)); + header = longAt((methodObj + BaseHeaderSize) + (HeaderIndex << (shiftForWord()))); + return (((usqInt) header) >> MethodHeaderFlagBitPosition) & 3; +} + + /* Answer the current activeProcess. */ /* useful for VM debugging */ @@ -53867,6 +53832,19 @@ } found = 0; l1: /* end lookupMethodInDictionary: */; + if ((!GIV(isPrivateSend)) + && ((GIV(messageSelector) != (longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (SelectorDoesNotUnderstand << (shiftForWord()))))) + && ((accessModifierOfMethod(GIV(newMethod))) != 0))) { + print(nameOfClass(currentClass)); + /* begin space */ + /* begin printChar: */ + putchar(' '); + printStringOf(GIV(messageSelector)); + print(" from "); + printStringOf(fetchPointerofObject(0, methodClassOf(GIV(method)))); + /* begin cr */ + printf("\n"); + } if (found) { return currentClass; } @@ -65759,10 +65737,7 @@ /* begin slowPrimitiveResponse */ assert(!(isOopForwarded(stackValue(GIV(argumentCount))))); assert((remapBufferCount()) == 0); - nArgs = GIV(argumentCount); - savedStackPointer = GIV(stackPointer); - savedFramePointer = GIV(framePointer); - + /* begin initPrimCall */ GIV(primFailCode) = 0; dispatchFunctionPointer(primitiveFunctionPointer); @@ -65780,18 +65755,7 @@ GIV(primFailCode) = PrimErrWritePastObject; } } - if ((!GIV(primFailCode)) - && ((GIV(framePointer) == savedFramePointer) - && (!0))) { - - /* Don't fail if primitive has done something radical, e.g. perform: */ - - if (GIV(stackPointer) != (savedStackPointer + (nArgs * BytesPerWord))) { - flag("Would be nice to make this a message send of e.g. unbalancedPrimitive to the current process or context"); - GIV(stackPointer) = savedStackPointer; - failUnbalancedPrimitive(); - } - } + if (GIV(nextProfileTick) > 0) { checkProfileTick(GIV(newMethod)); } @@ -65897,10 +65861,7 @@ /* begin slowPrimitiveResponse */ assert(!(isOopForwarded(stackValue(GIV(argumentCount))))); assert((remapBufferCount()) == 0); - nArgs = GIV(argumentCount); - savedStackPointer = GIV(stackPointer); - savedFramePointer = GIV(framePointer); - + /* begin initPrimCall */ GIV(primFailCode) = 0; dispatchFunctionPointer(primitiveFunctionPointer); @@ -65918,18 +65879,7 @@ GIV(primFailCode) = PrimErrWritePastObject; } } - if ((!GIV(primFailCode)) - && ((GIV(framePointer) == savedFramePointer) - && (!0))) { - - /* Don't fail if primitive has done something radical, e.g. perform: */ - - if (GIV(stackPointer) != (savedStackPointer + (nArgs * BytesPerWord))) { - flag("Would be nice to make this a message send of e.g. unbalancedPrimitive to the current process or context"); - GIV(stackPointer) = savedStackPointer; - failUnbalancedPrimitive(); - } - } + if (GIV(nextProfileTick) > 0) { checkProfileTick(GIV(newMethod)); } @@ -66128,10 +66078,7 @@ /* begin slowPrimitiveResponse */ assert(!(isOopForwarded(stackValue(GIV(argumentCount))))); assert((remapBufferCount()) == 0); - nArgs = GIV(argumentCount); - savedStackPointer = GIV(stackPointer); - savedFramePointer = GIV(framePointer); - + /* begin initPrimCall */ GIV(primFailCode) = 0; dispatchFunctionPointer(primitiveFunctionPointer); @@ -66149,18 +66096,7 @@ GIV(primFailCode) = PrimErrWritePastObject; } } - if ((!GIV(primFailCode)) - && ((GIV(framePointer) == savedFramePointer) - && (!0))) { - - /* Don't fail if primitive has done something radical, e.g. perform: */ - - if (GIV(stackPointer) != (savedStackPointer + (nArgs * BytesPerWord))) { - flag("Would be nice to make this a message send of e.g. unbalancedPrimitive to the current process or context"); - GIV(stackPointer) = savedStackPointer; - failUnbalancedPrimitive(); - } - } + if (GIV(nextProfileTick) > 0) { checkProfileTick(GIV(newMethod)); } @@ -67437,10 +67373,7 @@ /* begin slowPrimitiveResponse */ assert(!(isOopForwarded(stackValue(GIV(argumentCount))))); assert((remapBufferCount()) == 0); - nArgs = GIV(argumentCount); - savedStackPointer = GIV(stackPointer); - savedFramePointer = GIV(framePointer); - + /* begin initPrimCall */ GIV(primFailCode) = 0; dispatchFunctionPointer(primitiveFunctionPointer); @@ -67458,18 +67391,7 @@ GIV(primFailCode) = PrimErrWritePastObject; } } - if ((!GIV(primFailCode)) - && ((GIV(framePointer) == savedFramePointer) - && (!0))) { - - /* Don't fail if primitive has done something radical, e.g. perform: */ - - if (GIV(stackPointer) != (savedStackPointer + (nArgs * BytesPerWord))) { - flag("Would be nice to make this a message send of e.g. unbalancedPrimitive to the current process or context"); - GIV(stackPointer) = savedStackPointer; - failUnbalancedPrimitive(); - } - } + if (GIV(nextProfileTick) > 0) { checkProfileTick(GIV(newMethod)); } Modified: branches/Cog/nsspurstacksrc/vm/interp.c =================================================================== --- branches/Cog/nsspurstacksrc/vm/interp.c 2015-02-21 06:09:27 UTC (rev 3260) +++ branches/Cog/nsspurstacksrc/vm/interp.c 2015-02-22 23:10:08 UTC (rev 3261) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1072 uuid: bd9d8dd5-dea0-49da-8be7-cb246f49f554 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1073 uuid: f5e526a5-587e-4182-856d-519220e8efa9 from - StackInterpreter VMMaker.oscog-eem.1072 uuid: bd9d8dd5-dea0-49da-8be7-cb246f49f554 + StackInterpreter VMMaker.oscog-eem.1073 uuid: f5e526a5-587e-4182-856d-519220e8efa9 */ -static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1072 uuid: bd9d8dd5-dea0-49da-8be7-cb246f49f554 " __DATE__ ; +static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1073 uuid: f5e526a5-587e-4182-856d-519220e8efa9 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -147,6 +147,7 @@ #define CacheProbeMax 3 #define CharacterTable null #define CharacterValueIndex 0 +#define CheckPrivacyViolations 1 #define ClassAlien 52 #define ClassArray 7 #define ClassArrayCompactIndex 51 @@ -199,7 +200,7 @@ #define ExcessSignalsIndex 2 #define ExternalObjectsArray 38 #define ExtraRootsSize 2048 -#define FailImbalancedPrimitives 1 +#define FailImbalancedPrimitives 0 #define FalseObject 1 #define FirstLinkIndex 0 #define FoxCallerContext 4 @@ -245,6 +246,7 @@ #define MethodCacheSize 4096 #define MethodDictionaryIndex 1 #define MethodHeaderArgCountShift 25 +#define MethodHeaderFlagBitPosition 29 #define MethodHeaderTempCountShift 19 #define MethodIndex 3 #define MillisecondClockMask 0x1FFFFFFF @@ -958,6 +960,7 @@ static usqInt totalBytesInSegments(void); static sqInt writeImageSegmentsToFile(sqImageFile aBinaryStream) NoDbgRegParms; static sqInt writeSegmentnextSegmenttoFile(SpurSegmentInfo *segment, SpurSegmentInfo *nextSegment, sqImageFile aBinaryStream) NoDbgRegParms; +static sqInt accessModifierOfMethod(sqInt methodObj) NoDbgRegParms; sqInt activeProcess(void); static void addLastLinktoList(sqInt proc, sqInt aList) NoDbgRegParms; static void addNewMethodToCache(sqInt classObj) NoDbgRegParms; @@ -1452,6 +1455,7 @@ _iss sqInt gcSemaphoreIndex; _iss sqInt globalSessionID; _iss sqInt imageFloatsBigEndian; +_iss sqInt isPrivateSend; _iss sqInt longRunningPrimitiveSignalUndelivered; _iss sqInt maxExtSemTabSizeSet; _iss sqInt rememberedSetRedZone; @@ -2107,7 +2111,7 @@ /* 575 */ (void (*)(void))0, 0 }; char expensiveAsserts = 0; -const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscog-eem.1072"; +const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscog-eem.1073"; volatile int sendTrace; sqInt suppressHeartbeatFlag; @@ -5662,7 +5666,7 @@ sendBreakpointreceiver(firstFixedFieldOfMaybeImmediate(GIV(messageSelector)), lengthOfMaybeImmediate(GIV(messageSelector)), longAtPointer(localSP + (GIV(argumentCount) * BytesPerOop))); /* begin internalFindNewMethod */ - + /* shift drops two low-order zeros from addresses */ hash1 = GIV(messageSelector) ^ lkupClassTag; @@ -5732,6 +5736,9 @@ localFP = pointerForOop(GIV(framePointer)); addNewMethodToCache(GIV(lkupClass)); l239: ; + + GIV(isPrivateSend) = 0; + l238: /* end internalFindNewMethod */; /* begin internalExecuteNewMethod */ if (primitiveFunctionPointer != 0) { @@ -5778,10 +5785,7 @@ /* begin slowPrimitiveResponse */ assert(!(isOopForwarded(stackValue(GIV(argumentCount))))); assert((remapBufferCount()) == 0); - nArgs = GIV(argumentCount); - savedStackPointer = GIV(stackPointer); - savedFramePointer = GIV(framePointer); - + /* begin initPrimCall */ GIV(primFailCode) = 0; dispatchFunctionPointer(primitiveFunctionPointer); @@ -5799,18 +5803,7 @@ GIV(primFailCode) = PrimErrWritePastObject; } } - if ((!GIV(primFailCode)) - && ((GIV(framePointer) == savedFramePointer) - && (!0))) { - - /* Don't fail if primitive has done something radical, e.g. perform: */ - - if (GIV(stackPointer) != (savedStackPointer + (nArgs * BytesPerWord))) { - flag("Would be nice to make this a message send of e.g. unbalancedPrimitive to the current process or context"); - GIV(stackPointer) = savedStackPointer; - failUnbalancedPrimitive(); - } - } + if (GIV(nextProfileTick) > 0) { checkProfileTick(GIV(newMethod)); } @@ -13168,6 +13161,8 @@ : tagBits) : (longAt(localAbsentReceiver)) & 0x3FFFFF); assert((classForClassTag(lkupClassTag)) != (nilObject())); + GIV(isPrivateSend) = 1; + goto commonSend; } } @@ -19942,10 +19937,7 @@ /* begin slowPrimitiveResponse */ assert(!(isOopForwarded(stackValue(GIV(argumentCount))))); assert((remapBufferCount()) == 0); - nArgs = GIV(argumentCount); - savedStackPointer = GIV(stackPointer); - savedFramePointer = GIV(framePointer); - + /* begin initPrimCall */ GIV(primFailCode) = 0; dispatchFunctionPointer(primitiveFunctionPointer); @@ -19963,18 +19955,7 @@ GIV(primFailCode) = PrimErrWritePastObject; } } - if ((!GIV(primFailCode)) - && ((GIV(framePointer) == savedFramePointer) - && (!0))) { - - /* Don't fail if primitive has done something radical, e.g. perform: */ - - if (GIV(stackPointer) != (savedStackPointer + (nArgs * BytesPerWord))) { - flag("Would be nice to make this a message send of e.g. unbalancedPrimitive to the current process or context"); - GIV(stackPointer) = savedStackPointer; - failUnbalancedPrimitive(); - } - } + if (GIV(nextProfileTick) > 0) { checkProfileTick(GIV(newMethod)); } @@ -22402,10 +22383,7 @@ /* begin slowPrimitiveResponse */ assert(!(isOopForwarded(stackValue(GIV(argumentCount))))); assert((remapBufferCount()) == 0); - nArgs = GIV(argumentCount); - savedStackPointer = GIV(stackPointer); - savedFramePointer = GIV(framePointer); - + /* begin initPrimCall */ GIV(primFailCode) = 0; dispatchFunctionPointer(primitiveFunctionPointer); @@ -22423,18 +22401,7 @@ GIV(primFailCode) = PrimErrWritePastObject; } } - if ((!GIV(primFailCode)) - && ((GIV(framePointer) == savedFramePointer) - && (!0))) { - - /* Don't fail if primitive has done something radical, e.g. perform: */ - - if (GIV(stackPointer) != (savedStackPointer + (nArgs * BytesPerWord))) { - flag("Would be nice to make this a message send of e.g. unbalancedPrimitive to the current process or context"); - GIV(stackPointer) = savedStackPointer; - failUnbalancedPrimitive(); - } - } + if (GIV(nextProfileTick) > 0) { checkProfileTick(GIV(newMethod)); } @@ -22654,10 +22621,7 @@ /* begin slowPrimitiveResponse */ assert(!(isOopForwarded(stackValue(GIV(argumentCount))))); assert((remapBufferCount()) == 0); - nArgs = GIV(argumentCount); - savedStackPointer = GIV(stackPointer); - savedFramePointer = GIV(framePointer); - + /* begin initPrimCall */ GIV(primFailCode) = 0; dispatchFunctionPointer(primitiveFunctionPointer); @@ -22675,18 +22639,7 @@ GIV(primFailCode) = PrimErrWritePastObject; } } - if ((!GIV(primFailCode)) - && ((GIV(framePointer) == savedFramePointer) - && (!0))) { - - /* Don't fail if primitive has done something radical, e.g. perform: */ - - if (GIV(stackPointer) != (savedStackPointer + (nArgs * BytesPerWord))) { - flag("Would be nice to make this a message send of e.g. unbalancedPrimitive to the current process or context"); - GIV(stackPointer) = savedStackPointer; - failUnbalancedPrimitive(); - } - } + if (GIV(nextProfileTick) > 0) { checkProfileTick(GIV(newMethod)); } @@ -48387,7 +48340,19 @@ return nWritten; } +static sqInt +accessModifierOfMethod(sqInt methodObj) +{ + sqInt header; + /* begin accessModifierOfMethodHeader: */ + /* begin methodHeaderOf: */ + assert(isCompiledMethod(methodObj)); + header = longAt((methodObj + BaseHeaderSize) + (HeaderIndex << (shiftForWord()))); + return (((usqInt) header) >> MethodHeaderFlagBitPosition) & 3; +} + + /* Answer the current activeProcess. */ /* useful for VM debugging */ @@ -53858,6 +53823,19 @@ } found = 0; l1: /* end lookupMethodInDictionary: */; + if ((!GIV(isPrivateSend)) + && ((GIV(messageSelector) != (longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (SelectorDoesNotUnderstand << (shiftForWord()))))) + && ((accessModifierOfMethod(GIV(newMethod))) != 0))) { + print(nameOfClass(currentClass)); + /* begin space */ + /* begin printChar: */ + putchar(' '); + printStringOf(GIV(messageSelector)); + print(" from "); + printStringOf(fetchPointerofObject(0, methodClassOf(GIV(method)))); + /* begin cr */ + printf("\n"); + } if (found) { return currentClass; } @@ -65750,10 +65728,7 @@ /* begin slowPrimitiveResponse */ assert(!(isOopForwarded(stackValue(GIV(argumentCount))))); assert((remapBufferCount()) == 0); - nArgs = GIV(argumentCount); - savedStackPointer = GIV(stackPointer); - savedFramePointer = GIV(framePointer); - + /* begin initPrimCall */ GIV(primFailCode) = 0; dispatchFunctionPointer(primitiveFunctionPointer); @@ -65771,18 +65746,7 @@ GIV(primFailCode) = PrimErrWritePastObject; } } - if ((!GIV(primFailCode)) - && ((GIV(framePointer) == savedFramePointer) - && (!0))) { - - /* Don't fail if primitive has done something radical, e.g. perform: */ - - if (GIV(stackPointer) != (savedStackPointer + (nArgs * BytesPerWord))) { - flag("Would be nice to make this a message send of e.g. unbalancedPrimitive to the current process or context"); - GIV(stackPointer) = savedStackPointer; - failUnbalancedPrimitive(); - } - } + if (GIV(nextProfileTick) > 0) { checkProfileTick(GIV(newMethod)); } @@ -65888,10 +65852,7 @@ /* begin slowPrimitiveResponse */ assert(!(isOopForwarded(stackValue(GIV(argumentCount))))); assert((remapBufferCount()) == 0); - nArgs = GIV(argumentCount); - savedStackPointer = GIV(stackPointer); - savedFramePointer = GIV(framePointer); - + /* begin initPrimCall */ GIV(primFailCode) = 0; dispatchFunctionPointer(primitiveFunctionPointer); @@ -65909,18 +65870,7 @@ GIV(primFailCode) = PrimErrWritePastObject; } } - if ((!GIV(primFailCode)) - && ((GIV(framePointer) == savedFramePointer) - && (!0))) { - - /* Don't fail if primitive has done something radical, e.g. perform: */ - - if (GIV(stackPointer) != (savedStackPointer + (nArgs * BytesPerWord))) { - flag("Would be nice to make this a message send of e.g. unbalancedPrimitive to the current process or context"); - GIV(stackPointer) = savedStackPointer; - failUnbalancedPrimitive(); - } - } + if (GIV(nextProfileTick) > 0) { checkProfileTick(GIV(newMethod)); } @@ -66119,10 +66069,7 @@ /* begin slowPrimitiveResponse */ assert(!(isOopForwarded(stackValue(GIV(argumentCount))))); assert((remapBufferCount()) == 0); - nArgs = GIV(argumentCount); - savedStackPointer = GIV(stackPointer); - savedFramePointer = GIV(framePointer); - + /* begin initPrimCall */ GIV(primFailCode) = 0; dispatchFunctionPointer(primitiveFunctionPointer); @@ -66140,18 +66087,7 @@ GIV(primFailCode) = PrimErrWritePastObject; } } - if ((!GIV(primFailCode)) - && ((GIV(framePointer) == savedFramePointer) - && (!0))) { - - /* Don't fail if primitive has done something radical, e.g. perform: */ - - if (GIV(stackPointer) != (savedStackPointer + (nArgs * BytesPerWord))) { - flag("Would be nice to make this a message send of e.g. unbalancedPrimitive to the current process or context"); - GIV(stackPointer) = savedStackPointer; - failUnbalancedPrimitive(); - } - } + if (GIV(nextProfileTick) > 0) { checkProfileTick(GIV(newMethod)); } @@ -67428,10 +67364,7 @@ /* begin slowPrimitiveResponse */ assert(!(isOopForwarded(stackValue(GIV(argumentCount))))); assert((remapBufferCount()) == 0); - nArgs = GIV(argumentCount); - savedStackPointer = GIV(stackPointer); - savedFramePointer = GIV(framePointer); - + /* begin initPrimCall */ GIV(primFailCode) = 0; dispatchFunctionPointer(primitiveFunctionPointer); @@ -67449,18 +67382,7 @@ GIV(primFailCode) = PrimErrWritePastObject; } } - if ((!GIV(primFailCode)) - && ((GIV(framePointer) == savedFramePointer) - && (!0))) { - - /* Don't fail if primitive has done something radical, e.g. perform: */ - - if (GIV(stackPointer) != (savedStackPointer + (nArgs * BytesPerWord))) { - flag("Would be nice to make this a message send of e.g. unbalancedPrimitive to the current process or context"); - GIV(stackPointer) = savedStackPointer; - failUnbalancedPrimitive(); - } - } + if (GIV(nextProfileTick) > 0) { checkProfileTick(GIV(newMethod)); } Property changes on: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h ___________________________________________________________________ Modified: checkindate - Fri Feb 20 22:04:44 PST 2015 + Sun Feb 22 15:09:48 PST 2015 Modified: branches/Cog/spurstack64src/vm/gcc3x-interp.c =================================================================== --- branches/Cog/spurstack64src/vm/gcc3x-interp.c 2015-02-21 06:09:27 UTC (rev 3260) +++ branches/Cog/spurstack64src/vm/gcc3x-interp.c 2015-02-22 23:10:08 UTC (rev 3261) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1072 uuid: bd9d8dd5-dea0-49da-8be7-cb246f49f554 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1073 uuid: f5e526a5-587e-4182-856d-519220e8efa9 from - StackInterpreter VMMaker.oscog-eem.1072 uuid: bd9d8dd5-dea0-49da-8be7-cb246f49f554 + StackInterpreter VMMaker.oscog-eem.1073 uuid: f5e526a5-587e-4182-856d-519220e8efa9 */ -static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1072 uuid: bd9d8dd5-dea0-49da-8be7-cb246f49f554 " __DATE__ ; +static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1073 uuid: f5e526a5-587e-4182-856d-519220e8efa9 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -128,7 +128,7 @@ #define ActiveProcessIndex 1 #define AlternateHeaderHasPrimFlag 0x80000 #define AlternateHeaderNumLiteralsMask 0x7FFF -#define AltLongStoreBytecode 129 +#define AltLongStoreBytecode 234 #define AtCacheFixedFields 4 #define AtCacheFmt 3 #define AtCacheMask 0x1C @@ -158,6 +158,7 @@ #define CacheProbeMax 3 #define CharacterTable null #define CharacterValueIndex 0 +#define CheckPrivacyViolations 0 #define ClassAlien 52 #define ClassArray 7 #define ClassArrayCompactIndex 51 @@ -208,7 +209,7 @@ #define ExcessSignalsIndex 2 #define ExternalObjectsArray 38 #define ExtraRootsSize 2048 -#define FailImbalancedPrimitives 1 +#define FailImbalancedPrimitives 0 #define FalseObject 1 #define FirstLinkIndex 0 #define FoxCallerContext 8 @@ -2131,7 +2132,7 @@ /* 575 */ (void (*)(void))0, 0 }; char expensiveAsserts = 0; -const char *interpreterVersion = "Croquet Closure Stack VM [StackInterpreterPrimitives VMMaker.oscog-eem.1072]"; +const char *interpreterVersion = "Croquet Closure Stack VM [StackInterpreterPrimitives VMMaker.oscog-eem.1073]"; volatile int sendTrace; sqInt suppressHeartbeatFlag; @@ -5581,7 +5582,7 @@ sendBreakpointreceiver(firstFixedFieldOfMaybeImmediate(GIV(messageSelector)), lengthOfMaybeImmediate(GIV(messageSelector)), longAtPointer(localSP + (GIV(argumentCount) * BytesPerOop))); /* begin internalFindNewMethod */ - + /* shift drops two low-order zeros from addresses */ hash1 = GIV(messageSelector) ^ lkupClassTag; @@ -5651,6 +5652,8 @@ localFP = pointerForOop(GIV(framePointer)); addNewMethodToCache(GIV(lkupClass)); l105: ; + + l104: /* end internalFindNewMethod */; /* begin internalExecuteNewMethod */ if (primitiveFunctionPointer != 0) { @@ -5697,10 +5700,7 @@ /* begin slowPrimitiveResponse */ assert(!(isOopForwarded(stackValue(GIV(argumentCount))))); assert((remapBufferCount()) == 0); - nArgs = GIV(argumentCount); - savedStackPointer = GIV(stackPointer); - savedFramePointer = GIV(framePointer); - + /* begin initPrimCall */ GIV(primFailCode) = 0; dispatchFunctionPointer(primitiveFunctionPointer); @@ -5718,18 +5718,7 @@ GIV(primFailCode) = PrimErrWritePastObject; } } - if ((!GIV(primFailCode)) - && ((GIV(framePointer) == savedFramePointer) - && (!0))) { - - /* Don't fail if primitive has done something radical, e.g. perform: */ - - if (GIV(stackPointer) != (savedStackPointer + (nArgs * BytesPerWord))) { - flag("Would be nice to make this a message send of e.g. unbalancedPrimitive to the current process or context"); - GIV(stackPointer) = savedStackPointer; - failUnbalancedPrimitive(); - } - } + if (GIV(nextProfileTick) > 0) { checkProfileTick(GIV(newMethod)); } @@ -16352,10 +16341,7 @@ /* begin slowPrimitiveResponse */ assert(!(isOopForwarded(stackValue(GIV(argumentCount))))); assert((remapBufferCount()) == 0); - nArgs = GIV(argumentCount); - savedStackPointer = GIV(stackPointer); - savedFramePointer = GIV(framePointer); - + /* begin initPrimCall */ GIV(primFailCode) = 0; dispatchFunctionPointer(primitiveFunctionPointer); @@ -16373,18 +16359,7 @@ GIV(primFailCode) = PrimErrWritePastObject; } } - if ((!GIV(primFailCode)) - && ((GIV(framePointer) == savedFramePointer) - && (!0))) { - - /* Don't fail if primitive has done something radical, e.g. perform: */ - - if (GIV(stackPointer) != (savedStackPointer + (nArgs * BytesPerWord))) { - flag("Would be nice to make this a message send of e.g. unbalancedPrimitive to the current process or context"); - GIV(stackPointer) = savedStackPointer; - failUnbalancedPrimitive(); - } - } + if (GIV(nextProfileTick) > 0) { checkProfileTick(GIV(newMethod)); } @@ -18870,10 +18845,7 @@ /* begin slowPrimitiveResponse */ assert(!(isOopForwarded(stackValue(GIV(argumentCount))))); assert((remapBufferCount()) == 0); - nArgs = GIV(argumentCount); - savedStackPointer = GIV(stackPointer); - savedFramePointer = GIV(framePointer); - + /* begin initPrimCall */ GIV(primFailCode) = 0; dispatchFunctionPointer(primitiveFunctionPointer); @@ -18891,18 +18863,7 @@ GIV(primFailCode) = PrimErrWritePastObject; } } - if ((!GIV(primFailCode)) - && ((GIV(framePointer) == savedFramePointer) - && (!0))) { - - /* Don't fail if primitive has done something radical, e.g. perform: */ - - if (GIV(stackPointer) != (savedStackPointer + (nArgs * BytesPerWord))) { - flag("Would be nice to make this a message send of e.g. unbalancedPrimitive to the current process or context"); - GIV(stackPointer) = savedStackPointer; - failUnbalancedPrimitive(); - } - } + if (GIV(nextProfileTick) > 0) { checkProfileTick(GIV(newMethod)); } @@ -19115,10 +19076,7 @@ /* begin slowPrimitiveResponse */ assert(!(isOopForwarded(stackValue(GIV(argumentCount))))); assert((remapBufferCount()) == 0); - nArgs = GIV(argumentCount); - savedStackPointer = GIV(stackPointer); - savedFramePointer = GIV(framePointer); - + /* begin initPrimCall */ GIV(primFailCode) = 0; dispatchFunctionPointer(primitiveFunctionPointer); @@ -19136,18 +19094,7 @@ GIV(primFailCode) = PrimErrWritePastObject; } } - if ((!GIV(primFailCode)) - && ((GIV(framePointer) == savedFramePointer) - && (!0))) { - - /* Don't fail if primitive has done something radical, e.g. perform: */ - - if (GIV(stackPointer) != (savedStackPointer + (nArgs * BytesPerWord))) { - flag("Would be nice to make this a message send of e.g. unbalancedPrimitive to the current process or context"); - GIV(stackPointer) = savedStackPointer; - failUnbalancedPrimitive(); - } - } + if (GIV(nextProfileTick) > 0) { checkProfileTick(GIV(newMethod)); } @@ -54094,6 +54041,7 @@ } found = 0; l1: /* end lookupMethodInDictionary: */; + if (found) { return currentClass; } @@ -65546,10 +65494,7 @@ /* begin slowPrimitiveResponse */ assert(!(isOopForwarded(stackValue(GIV(argumentCount))))); assert((remapBufferCount()) == 0); - nArgs = GIV(argumentCount); - savedStackPointer = GIV(stackPointer); - savedFramePointer = GIV(framePointer); - + /* begin initPrimCall */ GIV(primFailCode) = 0; dispatchFunctionPointer(primitiveFunctionPointer); @@ -65567,18 +65512,7 @@ GIV(primFailCode) = PrimErrWritePastObject; } } - if ((!GIV(primFailCode)) - && ((GIV(framePointer) == savedFramePointer) - && (!0))) { - - /* Don't fail if primitive has done something radical, e.g. perform: */ - - if (GIV(stackPointer) != (savedStackPointer + (nArgs * BytesPerWord))) { - flag("Would be nice to make this a message send of e.g. unbalancedPrimitive to the current process or context"); - GIV(stackPointer) = savedStackPointer; - failUnbalancedPrimitive(); - } - } + if (GIV(nextProfileTick) > 0) { checkProfileTick(GIV(newMethod)); } @@ -65684,10 +65618,7 @@ /* begin slowPrimitiveResponse */ assert(!(isOopForwarded(stackValue(GIV(argumentCount))))); assert((remapBufferCount()) == 0); - nArgs = GIV(argumentCount); - savedStackPointer = GIV(stackPointer); - savedFramePointer = GIV(framePointer); - + /* begin initPrimCall */ GIV(primFailCode) = 0; dispatchFunctionPointer(primitiveFunctionPointer); @@ -65705,18 +65636,7 @@ GIV(primFailCode) = PrimErrWritePastObject; } } - if ((!GIV(primFailCode)) - && ((GIV(framePointer) == savedFramePointer) - && (!0))) { - - /* Don't fail if primitive has done something radical, e.g. perform: */ - - if (GIV(stackPointer) != (savedStackPointer + (nArgs * BytesPerWord))) { - flag("Would be nice to make this a message send of e.g. unbalancedPrimitive to the current process or context"); - GIV(stackPointer) = savedStackPointer; - failUnbalancedPrimitive(); - } - } + if (GIV(nextProfileTick) > 0) { checkProfileTick(GIV(newMethod)); } @@ -65910,10 +65830,7 @@ /* begin slowPrimitiveResponse */ assert(!(isOopForwarded(stackValue(GIV(argumentCount))))); assert((remapBufferCount()) == 0); - nArgs = GIV(argumentCount); - savedStackPointer = GIV(stackPointer); - savedFramePointer = GIV(framePointer); - + /* begin initPrimCall */ GIV(primFailCode) = 0; dispatchFunctionPointer(primitiveFunctionPointer); @@ -65931,18 +65848,7 @@ GIV(primFailCode) = PrimErrWritePastObject; } } - if ((!GIV(primFailCode)) - && ((GIV(framePointer) == savedFramePointer) - && (!0))) { - - /* Don't fail if primitive has done something radical, e.g. perform: */ - - if (GIV(stackPointer) != (savedStackPointer + (nArgs * BytesPerWord))) { - flag("Would be nice to make this a message send of e.g. unbalancedPrimitive to the current process or context"); - GIV(stackPointer) = savedStackPointer; - failUnbalancedPrimitive(); - } - } + if (GIV(nextProfileTick) > 0) { checkProfileTick(GIV(newMethod)); } @@ -67168,10 +67074,7 @@ /* begin slowPrimitiveResponse */ assert(!(isOopForwarded(stackValue(GIV(argumentCount))))); assert((remapBufferCount()) == 0); - nArgs = GIV(argumentCount); - savedStackPointer = GIV(stackPointer); - savedFramePointer = GIV(framePointer); - + /* begin initPrimCall */ GIV(primFailCode) = 0; dispatchFunctionPointer(primitiveFunctionPointer); @@ -67189,18 +67092,7 @@ GIV(primFailCode) = PrimErrWritePastObject; } } - if ((!GIV(primFailCode)) - && ((GIV(framePointer) == savedFramePointer) - && (!0))) { - - /* Don't fail if primitive has done something radical, e.g. perform: */ - - if (GIV(stackPointer) != (savedStackPointer + (nArgs * BytesPerWord))) { - flag("Would be nice to make this a message send of e.g. unbalancedPrimitive to the current process or context"); - GIV(stackPointer) = savedStackPointer; - failUnbalancedPrimitive(); - } - } + if (GIV(nextProfileTick) > 0) { checkProfileTick(GIV(newMethod)); } Modified: branches/Cog/spurstack64src/vm/interp.c =================================================================== --- branches/Cog/spurstack64src/vm/interp.c 2015-02-21 06:09:27 UTC (rev 3260) +++ branches/Cog/spurstack64src/vm/interp.c 2015-02-22 23:10:08 UTC (rev 3261) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1072 uuid: bd9d8dd5-dea0-49da-8be7-cb246f49f554 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1073 uuid: f5e526a5-587e-4182-856d-519220e8efa9 from - StackInterpreter VMMaker.oscog-eem.1072 uuid: bd9d8dd5-dea0-49da-8be7-cb246f49f554 + StackInterpreter VMMaker.oscog-eem.1073 uuid: f5e526a5-587e-4182-856d-519220e8efa9 */ -static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1072 uuid: bd9d8dd5-dea0-49da-8be7-cb246f49f554 " __DATE__ ; +static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1073 uuid: f5e526a5-587e-4182-856d-519220e8efa9 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -125,7 +125,7 @@ #define ActiveProcessIndex 1 #define AlternateHeaderHasPrimFlag 0x80000 #define AlternateHeaderNumLiteralsMask 0x7FFF -#define AltLongStoreBytecode 129 +#define AltLongStoreBytecode 234 #define AtCacheFixedFields 4 #define AtCacheFmt 3 #define AtCacheMask 0x1C @@ -155,6 +155,7 @@ #define CacheProbeMax 3 #define CharacterTable null #define CharacterValueIndex 0 +#define CheckPrivacyViolations 0 #define ClassAlien 52 #define ClassArray 7 #define ClassArrayCompactIndex 51 @@ -205,7 +206,7 @@ #define ExcessSignalsIndex 2 #define ExternalObjectsArray 38 #define ExtraRootsSize 2048 -#define FailImbalancedPrimitives 1 +#define FailImbalancedPrimitives 0 #define FalseObject 1 #define FirstLinkIndex 0 #define FoxCallerContext 8 @@ -2128,7 +2129,7 @@ /* 575 */ (void (*)(void))0, 0 }; char expensiveAsserts = 0; -const char *interpreterVersion = "Croquet Closure Stack VM [StackInterpreterPrimitives VMMaker.oscog-eem.1072]"; +const char *interpreterVersion = "Croquet Closure Stack VM [StackInterpreterPrimitives VMMaker.oscog-eem.1073]"; volatile int sendTrace; sqInt suppressHeartbeatFlag; @@ -5572,7 +5573,7 @@ sendBreakpointreceiver(firstFixedFieldOfMaybeImmediate(GIV(messageSelector)), lengthOfMaybeImmediate(GIV(messageSelector)), longAtPointer(localSP + (GIV(argumentCount) * BytesPerOop))); /* begin internalFindNewMethod */ - + /* shift drops two low-order zeros from addresses */ hash1 = GIV(messageSelector) ^ lkupClassTag; @@ -5642,6 +5643,8 @@ localFP = pointerForOop(GIV(framePointer)); addNewMethodToCache(GIV(lkupClass)); l105: ; + + l104: /* end internalFindNewMethod */; /* begin internalExecuteNewMethod */ if (primitiveFunctionPointer != 0) { @@ -5688,10 +5691,7 @@ /* begin slowPrimitiveResponse */ assert(!(isOopForwarded(stackValue(GIV(argumentCount))))); assert((remapBufferCount()) == 0); - nArgs = GIV(argumentCount); - savedStackPointer = GIV(stackPointer); - savedFramePointer = GIV(framePointer); - + /* begin initPrimCall */ GIV(primFailCode) = 0; dispatchFunctionPointer(primitiveFunctionPointer); @@ -5709,18 +5709,7 @@ GIV(primFailCode) = PrimErrWritePastObject; } } - if ((!GIV(primFailCode)) - && ((GIV(framePointer) == savedFramePointer) - && (!0))) { - - /* Don't fail if primitive has done something radical, e.g. perform: */ - - if (GIV(stackPointer) != (savedStackPointer + (nArgs * BytesPerWord))) { - flag("Would be nice to make this a message send of e.g. unbalancedPrimitive to the current process or context"); - GIV(stackPointer) = savedStackPointer; - failUnbalancedPrimitive(); - } - } + if (GIV(nextProfileTick) > 0) { checkProfileTick(GIV(newMethod)); } @@ -16343,10 +16332,7 @@ /* begin slowPrimitiveResponse */ assert(!(isOopForwarded(stackValue(GIV(argumentCount))))); assert((remapBufferCount()) == 0); - nArgs = GIV(argumentCount); - savedStackPointer = GIV(stackPointer); - savedFramePointer = GIV(framePointer); - + /* begin initPrimCall */ GIV(primFailCode) = 0; dispatchFunctionPointer(primitiveFunctionPointer); @@ -16364,18 +16350,7 @@ GIV(primFailCode) = PrimErrWritePastObject; } } - if ((!GIV(primFailCode)) - && ((GIV(framePointer) == savedFramePointer) - && (!0))) { - - /* Don't fail if primitive has done something radical, e.g. perform: */ - - if (GIV(stackPointer) != (savedStackPointer + (nArgs * BytesPerWord))) { - flag("Would be nice to make this a message send of e.g. unbalancedPrimitive to the current process or context"); - GIV(stackPointer) = savedStackPointer; - failUnbalancedPrimitive(); - } - } + if (GIV(nextProfileTick) > 0) { checkProfileTick(GIV(newMethod)); } @@ -18861,10 +18836,7 @@ /* begin slowPrimitiveResponse */ assert(!(isOopForwarded(stackValue(GIV(argumentCount))))); assert((remapBufferCount()) == 0); - nArgs = GIV(argumentCount); - savedStackPointer = GIV(stackPointer); - savedFramePointer = GIV(framePointer); - + /* begin initPrimCall */ GIV(primFailCode) = 0; dispatchFunctionPointer(primitiveFunctionPointer); @@ -18882,18 +18854,7 @@ GIV(primFailCode) = PrimErrWritePastObject; } } - if ((!GIV(primFailCode)) - && ((GIV(framePointer) == savedFramePointer) - && (!0))) { - - /* Don't fail if primitive has done something radical, e.g. perform: */ - - if (GIV(stackPointer) != (savedStackPointer + (nArgs * BytesPerWord))) { - flag("Would be nice to make this a message send of e.g. unbalancedPrimitive to the current process or context"); - GIV(stackPointer) = savedStackPointer; - failUnbalancedPrimitive(); - } - } + if (GIV(nextProfileTick) > 0) { checkProfileTick(GIV(newMethod)); } @@ -19106,10 +19067,7 @@ /* begin slowPrimitiveResponse */ assert(!(isOopForwarded(stackValue(GIV(argumentCount))))); assert((remapBufferCount()) == 0); - nArgs = GIV(argumentCount); - savedStackPointer = GIV(stackPointer); - savedFramePointer = GIV(framePointer); - + /* begin initPrimCall */ GIV(primFailCode) = 0; dispatchFunctionPointer(primitiveFunctionPointer); @@ -19127,18 +19085,7 @@ GIV(primFailCode) = PrimErrWritePastObject; } } - if ((!GIV(primFailCode)) - && ((GIV(framePointer) == savedFramePointer) - && (!0))) { - - /* Don't fail if primitive has done something radical, e.g. perform: */ - - if (GIV(stackPointer) != (savedStackPointer + (nArgs * BytesPerWord))) { - flag("Would be nice to make this a message send of e.g. unbalancedPrimitive to the current process or context"); - GIV(stackPointer) = savedStackPointer; - failUnbalancedPrimitive(); - } - } + if (GIV(nextProfileTick) > 0) { checkProfileTick(GIV(newMethod)); } @@ -54085,6 +54032,7 @@ } found = 0; l1: /* end lookupMethodInDictionary: */; + if (found) { return currentClass; } @@ -65537,10 +65485,7 @@ /* begin slowPrimitiveResponse */ assert(!(isOopForwarded(stackValue(GIV(argumentCount))))); assert((remapBufferCount()) == 0); - nArgs = GIV(argumentCount); - savedStackPointer = GIV(stackPointer); - savedFramePointer = GIV(framePointer); - + /* begin initPrimCall */ GIV(primFailCode) = 0; dispatchFunctionPointer(primitiveFunctionPointer); @@ -65558,18 +65503,7 @@ GIV(primFailCode) = PrimErrWritePastObject; } } - if ((!GIV(primFailCode)) - && ((GIV(framePointer) == savedFramePointer) - && (!0))) { - - /* Don't fail if primitive has done something radical, e.g. perform: */ - - if (GIV(stackPointer) != (savedStackPointer + (nArgs * BytesPerWord))) { - flag("Would be nice to make this a message send of e.g. unbalancedPrimitive to the current process or context"); - GIV(stackPointer) = savedStackPointer; - failUnbalancedPrimitive(); - } - } + if (GIV(nextProfileTick) > 0) { checkProfileTick(GIV(newMethod)); } @@ -65675,10 +65609,7 @@ /* begin slowPrimitiveResponse */ assert(!(isOopForwarded(stackValue(GIV(argumentCount))))); assert((remapBufferCount()) == 0); - nArgs = GIV(argumentCount); - savedStackPointer = GIV(stackPointer); - savedFramePointer = GIV(framePointer); - + /* begin initPrimCall */ GIV(primFailCode) = 0; dispatchFunctionPointer(primitiveFunctionPointer); @@ -65696,18 +65627,7 @@ GIV(primFailCode) = PrimErrWritePastObject; } } - if ((!GIV(primFailCode)) - && ((GIV(framePointer) == savedFramePointer) - && (!0))) { - - /* Don't fail if primitive has done something radical, e.g. perform: */ - - if (GIV(stackPointer) != (savedStackPointer + (nArgs * BytesPerWord))) { - flag("Would be nice to make this a message send of e.g. unbalancedPrimitive to the current process or context"); - GIV(stackPointer) = savedStackPointer; - failUnbalancedPrimitive(); - } - } + if (GIV(nextProfileTick) > 0) { checkProfileTick(GIV(newMethod)); } @@ -65901,10 +65821,7 @@ /* begin slowPrimitiveResponse */ assert(!(isOopForwarded(stackValue(GIV(argumentCount))))); assert((remapBufferCount()) == 0); - nArgs = GIV(argumentCount); - savedStackPointer = GIV(stackPointer); - savedFramePointer = GIV(framePointer); - + /* begin initPrimCall */ GIV(primFailCode) = 0; dispatchFunctionPointer(primitiveFunctionPointer); @@ -65922,18 +65839,7 @@ GIV(primFailCode) = PrimErrWritePastObject; } } - if ((!GIV(primFailCode)) - && ((GIV(framePointer) == savedFramePointer) - && (!0))) { - - /* Don't fail if primitive has done something radical, e.g. perform: */ - - if (GIV(stackPointer) != (savedStackPointer + (nArgs * BytesPerWord))) { - flag("Would be nice to make this a message send of e.g. unbalancedPrimitive to the current process or context"); - GIV(stackPointer) = savedStackPointer; - failUnbalancedPrimitive(); - } - } + if (GIV(nextProfileTick) > 0) { checkProfileTick(GIV(newMethod)); } @@ -67159,10 +67065,7 @@ /* begin slowPrimitiveResponse */ assert(!(isOopForwarded(stackValue(GIV(argumentCount))))); assert((remapBufferCount()) == 0); - nArgs = GIV(argumentCount); - savedStackPointer = GIV(stackPointer); - savedFramePointer = GIV(framePointer); - + /* begin initPrimCall */ GIV(primFailCode) = 0; dispatchFunctionPointer(primitiveFunctionPointer); @@ -67180,18 +67083,7 @@ GIV(primFailCode) = PrimErrWritePastObject; } } - if ((!GIV(primFailCode)) - && ((GIV(framePointer) == savedFramePointer) - && (!0))) { - - /* Don't fail if primitive has done something radical, e.g. perform: */ - - if (GIV(stackPointer) != (savedStackPointer + (nArgs * BytesPerWord))) { - flag("Would be nice to make this a message send of e.g. unbalancedPrimitive to the current process or context"); - GIV(stackPointer) = savedStackPointer; - failUnbalancedPrimitive(); - } - } + if (GIV(nextProfileTick) > 0) { checkProfileTick(GIV(newMethod)); } Modified: branches/Cog/spurstacksrc/vm/gcc3x-interp.c =================================================================== --- branches/Cog/spurstacksrc/vm/gcc3x-interp.c 2015-02-21 06:09:27 UTC (rev 3260) +++ branches/Cog/spurstacksrc/vm/gcc3x-interp.c 2015-02-22 23:10:08 UTC (rev 3261) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1072 uuid: bd9d8dd5-dea0-49da-8be7-cb246f49f554 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1073 uuid: f5e526a5-587e-4182-856d-519220e8efa9 from - StackInterpreter VMMaker.oscog-eem.1072 uuid: bd9d8dd5-dea0-49da-8be7-cb246f49f554 + StackInterpreter VMMaker.oscog-eem.1073 uuid: f5e526a5-587e-4182-856d-519220e8efa9 */ -static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1072 uuid: bd9d8dd5-dea0-49da-8be7-cb246f49f554 " __DATE__ ; +static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1073 uuid: f5e526a5-587e-4182-856d-519220e8efa9 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -150,6 +150,7 @@ #define CacheProbeMax 3 #define CharacterTable null #define CharacterValueIndex 0 +#define CheckPrivacyViolations 0 #define ClassAlien 52 #define ClassArray 7 #define ClassArrayCompactIndex 51 @@ -200,7 +201,7 @@ #define ExcessSignalsIndex 2 #define ExternalObjectsArray 38 #define ExtraRootsSize 2048 -#define FailImbalancedPrimitives 1 +#define FailImbalancedPrimitives 0 #define FalseObject 1 #define FirstLinkIndex 0 #define FoxCallerContext 4 @@ -2103,7 +2104,7 @@ /* 575 */ (void (*)(void))0, 0 }; char expensiveAsserts = 0; -const char *interpreterVersion = "Croquet Closure Stack VM [StackInterpreterPrimitives VMMaker.oscog-eem.1072]"; +const char *interpreterVersion = "Croquet Closure Stack VM [StackInterpreterPrimitives VMMaker.oscog-eem.1073]"; volatile int sendTrace; sqInt suppressHeartbeatFlag; @@ -5555,7 +5556,7 @@ sendBreakpointreceiver(firstFixedFieldOfMaybeImmediate(GIV(messageSelector)), lengthOfMaybeImmediate(GIV(messageSelector)), longAtPointer(localSP + (GIV(argumentCount) * BytesPerOop))); /* begin internalFindNewMethod */ - + /* shift drops two low-order zeros from addresses */ hash1 = GIV(messageSelector) ^ lkupClassTag; @@ -5625,6 +5626,8 @@ localFP = pointerForOop(GIV(framePointer)); addNewMethodToCache(GIV(lkupClass)); l128: ; + + l127: /* end internalFindNewMethod */; /* begin internalExecuteNewMethod */ if (primitiveFunctionPointer != 0) { @@ -5671,10 +5674,7 @@ /* begin slowPrimitiveResponse */ assert(!(isOopForwarded(stackValue(GIV(argumentCount))))); assert((remapBufferCount()) == 0); - nArgs = GIV(argumentCount); - savedStackPointer = GIV(stackPointer); - savedFramePointer = GIV(framePointer); - + /* begin initPrimCall */ @@ Diff output truncated at 50000 characters. @@

1 0

VM Maker: VMMaker.oscog-eem.1073.mcz
by commits＠source.squeak.org 23 Feb '15

23 Feb '15

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.1073.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.1073 Author: eem Time: 22 February 2015, 3:03:12.717 pm UUID: f5e526a5-587e-4182-856d-519220e8efa9 Ancestors: VMMaker.oscog-eem.1072 General: Add an option to control FailUnbalancedPrimitives and no longer burden the Stack VMs with the responsibility. Newspeak VM: Add an optional CheckPrivacyViolations option and obey it (thanks, Ryan). Nuke unused Newspeak configurations. Slang: Add code to cast untyped expressions inlined in place of typed vars, even though currently never triggered. =============== Diff against VMMaker.oscog-eem.1072 =============== Item was added: + ----- Method: CCodeGenerator>>nodeToCast:to: (in category 'inlining') ----- + nodeToCast: exprNode to: cType + ^TSendNode new + setSelector: #cCoerceSimple: + receiver: (TVariableNode new setName: 'self') + arguments: { exprNode. TConstantNode new setValue: cType } + isBuiltInOp: true! Item was changed: InterpreterPrimitives subclass: #StackInterpreter + instanceVariableNames: 'currentBytecode bytecodeSetSelector localFP localIP localSP stackLimit stackPage stackPages method instructionPointer stackPointer framePointer localReturnValue localAbsentReceiver extA extB primitiveFunctionPointer methodCache atCache isPrivateSend lkupClassTag lkupClass methodDictLinearSearchLimit highestRunnableProcessPriority nextWakeupUsecs nextPollUsecs inIOProcessEvents interruptKeycode interruptPending savedWindowSize imageHeaderFlags fullScreenFlag deferDisplayUpdates pendingFinalizationSignals extraVMMemory interpreterProxy showSurfaceFn primitiveTable primitiveAccessorDepthTable externalPrimitiveTable externalPrimitiveTableFirstFreeIndex overflowedPage extraFramesToMoveOnOverflow globalSessionID jmpBuf jmpDepth suspendedCallbacks suspendedMethods numStackPages desiredNumStackPages desiredEdenBytes classNameIndex thisClassIndex metaclassNumSlots interruptCheckChain suppressHeartbeatFlag breakSelector breakSelectorLength longRunningPrimitiveCheckMethod longRunningPrimitiveCheckSemaphore longRunningPrimitiveStartUsecs longRunningPrimitiveStopUsecs longRunningPrimitiveGCUsecs longRunningPrimitiveCheckSequenceNumber longRunningPrimitiveSignalUndelivered checkAllocFiller tempOop tempOop2 theUnknownShort the2ndUnknownShort imageFloatsBigEndian maxExtSemTabSizeSet lastMethodCacheProbeWrite gcSemaphoreIndex classByteArrayCompactIndex statForceInterruptCheck statStackOverflow statStackPageDivorce statCheckForEvents statProcessSwitch statIOProcessEvents statPendingFinalizationSignals' + classVariableNames: 'AltBytecodeEncoderClassName AltLongStoreBytecode AlternateHeaderHasPrimFlag AlternateHeaderIsOptimizedFlag AlternateHeaderNumLiteralsMask AtCacheEntries AtCacheFixedFields AtCacheFmt AtCacheMask AtCacheOop AtCacheSize AtCacheTotalSize AtPutBase BytecodeEncoderClassName BytecodeTable CacheProbeMax CheckPrivacyViolations DirBadPath DirEntryFound DirNoMoreEntries DumpStackOnLowSpace EnclosingMixinIndex EnclosingObjectIndex FailImbalancedPrimitives LongStoreBytecode MaxExternalPrimitiveTableSize MaxJumpBuf MaxPrimitiveIndex MaxQuickPrimitiveIndex MethodHeaderArgCountShift MethodHeaderFlagBitPosition MethodHeaderTempCountShift MixinIndex PrimitiveExternalCallIndex PrimitiveTable StackPageReachedButUntraced StackPageTraceInvalid StackPageTraced StackPageUnreached V3PrimitiveBitsMask' - instanceVariableNames: 'currentBytecode bytecodeSetSelector localFP localIP localSP stackLimit stackPage stackPages method instructionPointer stackPointer framePointer localReturnValue localAbsentReceiver extA extB primitiveFunctionPointer methodCache atCache lkupClassTag lkupClass methodDictLinearSearchLimit highestRunnableProcessPriority nextWakeupUsecs nextPollUsecs inIOProcessEvents interruptKeycode interruptPending savedWindowSize imageHeaderFlags fullScreenFlag deferDisplayUpdates pendingFinalizationSignals extraVMMemory interpreterProxy showSurfaceFn primitiveTable primitiveAccessorDepthTable externalPrimitiveTable externalPrimitiveTableFirstFreeIndex overflowedPage extraFramesToMoveOnOverflow globalSessionID jmpBuf jmpDepth suspendedCallbacks suspendedMethods numStackPages desiredNumStackPages desiredEdenBytes classNameIndex thisClassIndex metaclassNumSlots interruptCheckChain suppressHeartbeatFlag breakSelector breakSelectorLength longRunningPrimitiveCheckMethod longRunningPrimitiveCheckSemaphore longRunningPrimitiveStartUsecs longRunningPrimitiveStopUsecs longRunningPrimitiveGCUsecs longRunningPrimitiveCheckSequenceNumber longRunningPrimitiveSignalUndelivered checkAllocFiller tempOop tempOop2 theUnknownShort the2ndUnknownShort imageFloatsBigEndian maxExtSemTabSizeSet lastMethodCacheProbeWrite gcSemaphoreIndex classByteArrayCompactIndex statForceInterruptCheck statStackOverflow statStackPageDivorce statCheckForEvents statProcessSwitch statIOProcessEvents statPendingFinalizationSignals' - classVariableNames: 'AltBytecodeEncoderClassName AltLongStoreBytecode AlternateHeaderHasPrimFlag AlternateHeaderIsOptimizedFlag AlternateHeaderNumLiteralsMask AtCacheEntries AtCacheFixedFields AtCacheFmt AtCacheMask AtCacheOop AtCacheSize AtCacheTotalSize AtPutBase BytecodeEncoderClassName BytecodeTable CacheProbeMax DirBadPath DirEntryFound DirNoMoreEntries DumpStackOnLowSpace EnclosingMixinIndex EnclosingObjectIndex FailImbalancedPrimitives LongStoreBytecode MaxExternalPrimitiveTableSize MaxJumpBuf MaxPrimitiveIndex MaxQuickPrimitiveIndex MethodHeaderArgCountShift MethodHeaderFlagBitPosition MethodHeaderTempCountShift MixinIndex PrimitiveExternalCallIndex PrimitiveTable StackPageReachedButUntraced StackPageTraceInvalid StackPageTraced StackPageUnreached V3PrimitiveBitsMask' poolDictionaries: 'VMBasicConstants VMMethodCacheConstants VMObjectIndices VMSpurObjectRepresentationConstants VMSqueakClassIndices VMSqueakV3BytecodeConstants VMStackFrameOffsets' category: 'VMMaker-Interpreter'! !StackInterpreter commentStamp: 'eem 12/5/2014 11:32' prior: 0! This class is a complete implementation of the Smalltalk-80 virtual machine, derived originally from the Blue Book specification but quite different in some areas. This VM supports Closures but *not* old-style BlockContexts. It has been modernized with 32-bit pointers, better management of Contexts (see next item), and attention to variable use that allows the CCodeGenerator (qv) to keep, eg, the instruction pointer and stack pointer in registers as well as keeping most simple variables in a global array that seems to improve performance for most platforms. The VM does not use Contexts directly. Instead Contexts serve as proxies for a more conventional stack format that is invisible to the image. There is considerable explanation at http://www.mirandabanda.org/cogblog/2009/01/14/under-cover-contexts-and-the…. The VM maintains a fixed-size stack zone divided into pages, each page being capable of holding several method/block activations. A send establishes a new frame in the current stack page, a return returns to the previous frame. This eliminates allocation/deallocation of contexts and the moving of receiver and arguments from caller to callee on each send/return. Contexts are created lazily when an activation needs a context (creating a block, explicit use of thisContext, access to sender when sender is a frame, or linking of stack pages together). Contexts are either conventional and heap-resident ("single") or "married" and serve as proxies for their corresponding frame or "widowed", meaning that their spouse frame has been returned from (died). A married context is specially marked (more details in the code) and refers to its frame. Likewise a married frame is specially marked and refers to its context. In addition to SmallInteger arithmetic and Floats, the VM supports logic on 32-bit PositiveLargeIntegers, thus allowing it to simulate itself much more effectively than would otherwise be the case. StackInterpreter and subclasses support multiple memory managers. Currently there are two. NewMemoryManager is a slightly refined version of ObjectMemory, and is the memory manager and garbage collector for the original Squeak object representation as described in "Back to the Future The Story of Squeak, A Practical Smalltalk Written in Itself", see http://ftp.squeak.org/docs/OOPSLA.Squeak.html. Spur is a faster, more regular object representation that is designed for more performance and functionality, and to have a common header format for both 32-bit and 64-bit versions. You can read about it in SpurMemoryManager's class comment. There is also a video of a presentation at ESUG 2014 (https://www.youtube.com/watch?v=k0nBNS1aHZ4), along with slides (http://www.slideshare.net/esug/spur-a-new-object-representation-for-cog?rel…).! Item was changed: ----- Method: StackInterpreter class>>declareCVarsIn: (in category 'translation') ----- declareCVarsIn: aCCodeGenerator | vmClass | self class == thisContext methodClass ifFalse: [^self]. "Don't duplicate decls in subclasses" vmClass := aCCodeGenerator vmClass. "Generate primitiveTable etc based on vmClass, not just StackInterpreter" aCCodeGenerator addHeaderFile:'<stddef.h> /* for e.g. alloca */'; addHeaderFile:'<setjmp.h>'; addHeaderFile:'<wchar.h> /* for wint_t */'; addHeaderFile:'"vmCallback.h"'; addHeaderFile:'"sqMemoryFence.h"'; addHeaderFile:'"dispdbg.h"'. vmClass declareInterpreterVersionIn: aCCodeGenerator defaultName: 'Stack'. aCCodeGenerator var: #interpreterProxy type: #'struct VirtualMachine*'. aCCodeGenerator declareVar: #sendTrace type: 'volatile int'; declareVar: #byteCount type: 'unsigned long'. "These need to be pointers or unsigned." self declareC: #(instructionPointer method newMethod) as: #usqInt in: aCCodeGenerator. "These are all pointers; char * because Slang has no support for C pointer arithmetic." self declareC: #(localIP localSP localFP stackPointer framePointer stackLimit stackMemory breakSelector) as: #'char *' in: aCCodeGenerator. aCCodeGenerator var: #breakSelectorLength declareC: 'sqInt breakSelectorLength = MinSmallInteger'. self declareC: #(stackPage overflowedPage) as: #'StackPage *' in: aCCodeGenerator. aCCodeGenerator removeVariable: 'stackPages'. "this is an implicit receiver in the translated code." NewspeakVM ifFalse: [aCCodeGenerator removeVariable: 'localAbsentReceiver']. "This defines bytecodeSetSelector as 0 if MULTIPLEBYTECODESETS is not defined, for the benefit of the interpreter on slow machines." aCCodeGenerator addConstantForBinding: (self bindingOf: #MULTIPLEBYTECODESETS). MULTIPLEBYTECODESETS == false ifTrue: [aCCodeGenerator removeVariable: 'extA'; removeVariable: 'extB'; removeVariable: 'bytecodeSetSelector']. aCCodeGenerator var: #methodCache declareC: 'long methodCache[MethodCacheSize + 1 /* ', (MethodCacheSize + 1) printString, ' */]'. aCCodeGenerator var: #atCache declareC: 'sqInt atCache[AtCacheTotalSize + 1 /* ', (AtCacheTotalSize + 1) printString, ' */]'. aCCodeGenerator var: #primitiveTable declareC: 'void (*primitiveTable[MaxPrimitiveIndex + 2 /* ', (MaxPrimitiveIndex + 2) printString, ' */])(void) = ', vmClass primitiveTableString. vmClass primitiveTable do: [:symbolOrNot| (symbolOrNot isSymbol and: [symbolOrNot ~~ #primitiveFail]) ifTrue: [(aCCodeGenerator methodNamed: symbolOrNot) ifNotNil: [:tMethod| tMethod returnType: #void]]]. vmClass objectMemoryClass hasSpurMemoryManagerAPI ifTrue: [aCCodeGenerator var: #primitiveAccessorDepthTable type: 'signed char' sizeString: 'MaxPrimitiveIndex + 2 /* ', (MaxPrimitiveIndex + 2) printString, ' */' array: vmClass primitiveAccessorDepthTable] ifFalse: [aCCodeGenerator removeVariable: #primitiveAccessorDepthTable]. + (NewspeakVM and: [CheckPrivacyViolations]) ifFalse: + [aCCodeGenerator removeVariable: #isPrivateSend]. aCCodeGenerator var: #primitiveFunctionPointer declareC: 'void (*primitiveFunctionPointer)()'. aCCodeGenerator var: #externalPrimitiveTable declareC: 'void (*externalPrimitiveTable[MaxExternalPrimitiveTableSize + 1 /* ', (MaxExternalPrimitiveTableSize + 1) printString, ' */])(void)'. aCCodeGenerator var: #showSurfaceFn type: #'void *'. aCCodeGenerator var: #jmpBuf declareC: 'jmp_buf jmpBuf[MaxJumpBuf + 1 /* ', (MaxJumpBuf + 1) printString, ' */]'. aCCodeGenerator var: #suspendedCallbacks declareC: 'usqInt suspendedCallbacks[MaxJumpBuf + 1 /* ', (MaxJumpBuf + 1) printString, ' */]'. aCCodeGenerator var: #suspendedMethods declareC: 'usqInt suspendedMethods[MaxJumpBuf + 1 /* ', (MaxJumpBuf + 1) printString, ' */]'. aCCodeGenerator var: #interruptCheckChain declareC: 'void (*interruptCheckChain)(void) = 0'. self declareCAsUSqLong: #(nextPollUsecs nextWakeupUsecs longRunningPrimitiveGCUsecs longRunningPrimitiveStartUsecs longRunningPrimitiveStopUsecs "these are high-frequency enough that they're overflowing quite quickly on modern hardware" statProcessSwitch statIOProcessEvents statForceInterruptCheck statCheckForEvents statStackOverflow statStackPageDivorce) in: aCCodeGenerator. aCCodeGenerator var: #nextProfileTick type: #sqLong! Item was changed: ----- Method: StackInterpreter class>>initializeMiscConstants (in category 'initialization') ----- initializeMiscConstants super initializeMiscConstants. STACKVM := true. "These flags function to identify a GC operation, or to specify what operations the leak checker should be run for." GCModeFull := 1. "stop-the-world global GC" GCModeNewSpace := 2. "Spur's scavenge, or V3's incremental" GCModeIncremental := 4. "incremental global gc (Dijkstra tri-colour marking); as yet unimplemented" GCModeBecome := 8. "v3 post-become sweeping" GCModeImageSegment := 16. "just a flag for leak checking image segments" StackPageTraceInvalid := -1. StackPageUnreached := 0. StackPageReachedButUntraced := 1. StackPageTraced := 2. DumpStackOnLowSpace := 0. PrimitiveExternalCallIndex := 117. "Primitive index for #primitiveExternalCall" MillisecondClockMask := 16r1FFFFFFF. "Note: The external primitive table should actually be dynamically sized but for the sake of inferior platforms (e.g., Mac :-) who cannot allocate memory in any reasonable way, we keep it static (and cross our fingers...)" MaxExternalPrimitiveTableSize := 4096. "entries" MaxJumpBuf := 32. "max. callback depth" + FailImbalancedPrimitives := initializationOptions at: #FailImbalancedPrimitives ifAbsentPut: [true]. + + CheckPrivacyViolations := initializationOptions at: #CheckPrivacyViolations ifAbsentPut: [false]! - FailImbalancedPrimitives := true! Item was changed: ----- Method: StackInterpreter>>commonSendAbsent (in category 'send bytecodes') ----- commonSendAbsent "Send an absent receiver message, shuffling arguments and inserting the absent receiver for the send. Assume: messageSelector and argumentCount have been set, and that the arguments but not the receiver have been pushed onto the stack," "Note: This method is inlined into the interpreter dispatch loop." "160-175 1010 i i i i Send To Absent Implicit Receiver Literal Selector #iiii With 0 Arguments" "240 11110000 i i i i i j j j Send To Absent Implicit Receiver Literal Selector #iiiii (+ Extend A * 32) with jjj (+ Extend B * 8) Arguments" "245 11110101 i i i i i j j j Send To Self Literal Selector #iiiii (+ Extend A * 32) with jjj (+ Extend B * 8) Arguments" "254 11111110 i i i i i j j j kkkkkkkk Send To Enclosing Object at Depth kkkkkkkk Literal Selector #iiiii (+ Extend A * 32) with jjj (+ Extend B * 8) Arguments" <sharedCodeInCase: #extSendAbsentImplicitBytecode> self shuffleArgumentsAndStoreAbsentReceiver: localAbsentReceiver. lkupClassTag := objectMemory fetchClassTagOf: localAbsentReceiver. self assert: (objectMemory classForClassTag: lkupClassTag) ~= objectMemory nilObject. + CheckPrivacyViolations ifTrue: + [isPrivateSend := true]. self commonSend! Item was changed: ----- Method: StackInterpreter>>initialize (in category 'initialization') ----- initialize "Here we can initialize the variables C initializes to zero. #initialize methods do /not/ get translated." checkAllocFiller := false. "must preceed initializeObjectMemory:" primFailCode := 0. stackLimit := 0. "This is also the initialization flag for the stack system." stackPage := overflowedPage := 0. extraFramesToMoveOnOverflow := 0. bytecodeSetSelector := 0. highestRunnableProcessPriority := 0. nextProfileTick := 0. nextPollUsecs := 0. nextWakeupUsecs := 0. tempOop := tempOop2 := theUnknownShort := 0. interruptPending := false. inIOProcessEvents := 0. fullScreenFlag := 0. deferDisplayUpdates := false. pendingFinalizationSignals := statPendingFinalizationSignals := 0. globalSessionID := 0. jmpDepth := 0. longRunningPrimitiveStartUsecs := longRunningPrimitiveStopUsecs := 0. maxExtSemTabSizeSet := false. + isPrivateSend := false. statForceInterruptCheck := statStackOverflow := statCheckForEvents := statProcessSwitch := statIOProcessEvents := statStackPageDivorce := 0! Item was changed: ----- Method: StackInterpreter>>internalFindNewMethod (in category 'message sending') ----- internalFindNewMethod "Find the compiled method to be run when the current messageSelector is sent to the class 'lkupClass', setting the values of 'newMethod' and 'primitiveIndex'." <inline: true> (self inlineLookupInMethodCacheSel: messageSelector classTag: lkupClassTag) ifFalse: ["entry was not found in the cache; look it up the hard way" self externalizeIPandSP. ((objectMemory isOopForwarded: messageSelector) or: [objectMemory isForwardedClassTag: lkupClassTag]) ifTrue: [(objectMemory isOopForwarded: messageSelector) ifTrue: [messageSelector := self handleForwardedSelectorFaultFor: messageSelector]. (objectMemory isForwardedClassTag: lkupClassTag) ifTrue: [lkupClassTag := self handleForwardedSendFaultForTag: lkupClassTag]. (self lookupInMethodCacheSel: messageSelector classTag: lkupClassTag) ifTrue: [^nil]]. lkupClass := objectMemory classForClassTag: lkupClassTag. self lookupMethodInClass: lkupClass. self internalizeIPandSP. + self addNewMethodToCache: lkupClass]. + "Clear the flag set in commonSendAbsent and tested in lookupMethodInClass:" + (NewspeakVM and: [CheckPrivacyViolations]) ifTrue: + [isPrivateSend := false].! - self addNewMethodToCache: lkupClass]! Item was changed: ----- Method: StackInterpreter>>lookupMethodInClass: (in category 'message sending') ----- lookupMethodInClass: class | currentClass dictionary found | <inline: false> self assert: (self addressCouldBeClassObj: class). currentClass := class. [currentClass ~= objectMemory nilObject] whileTrue: [dictionary := objectMemory followObjField: MethodDictionaryIndex ofObject: currentClass. dictionary = objectMemory nilObject ifTrue: ["MethodDict pointer is nil (hopefully due a swapped out stub) -- raise exception #cannotInterpret:." self createActualMessageTo: class. messageSelector := objectMemory splObj: SelectorCannotInterpret. self sendBreakpoint: messageSelector receiver: nil. ^self lookupMethodInClass: (self superclassOf: currentClass)]. found := self lookupMethodInDictionary: dictionary. + (NewspeakVM + and: [CheckPrivacyViolations + and: [isPrivateSend not + and: [messageSelector ~= (objectMemory splObj: SelectorDoesNotUnderstand) + and: [(self accessModifierOfMethod: newMethod) ~= 0]]]]) ifTrue: + [self print: (self nameOfClass: currentClass); space. + self printStringOf: (messageSelector); print: ' from '. + self printStringOf: (self fetchPointer: 0 ofObject: (self methodClassOf: method)); cr]. found ifTrue: [^currentClass]. currentClass := self superclassOf: currentClass]. "Could not find #doesNotUnderstand: -- unrecoverable error." messageSelector = (objectMemory splObj: SelectorDoesNotUnderstand) ifTrue: [self error: 'Recursive not understood error encountered']. "Cound not find a normal message -- raise exception #doesNotUnderstand:" self createActualMessageTo: class. messageSelector := objectMemory splObj: SelectorDoesNotUnderstand. self sendBreak: messageSelector + objectMemory baseHeaderSize point: (objectMemory lengthOf: messageSelector) receiver: nil. ^self lookupMethodInClass: class! Item was changed: ----- Method: TMethod>>argAssignmentsFor:send:in: (in category 'inlining') ----- argAssignmentsFor: meth send: aSendNode in: aCodeGen "Return a collection of assignment nodes that assign the given argument expressions to the formal parameter variables of the given method." "Optimization: If the actual parameters are either constants or local variables in the target method (the receiver), substitute them directly into the body of meth. Note that global variables cannot be subsituted because the inlined method might depend on the exact ordering of side effects to the globals." | stmtList substitutionDict argList | stmtList := OrderedCollection new: 100. substitutionDict := Dictionary new: 100. argList := aSendNode args. meth args size > aSendNode args size ifTrue: [self assert: (meth args first beginsWith: 'self_in_'). argList := {aSendNode receiver}, aSendNode args]. meth args with: argList do: [ :argName :exprNode | (self isNode: exprNode substitutableFor: argName inMethod: meth in: aCodeGen) ifTrue: + [substitutionDict + at: argName + put: (((exprNode isSend or: [exprNode isVariable]) + and: [(self typeFor: argName in: aCodeGen) notNil + and: [(aCodeGen typeFor: exprNode in: self) isNil]]) + ifTrue: [aCodeGen nodeToCast: exprNode to: (self typeFor: argName in: aCodeGen)] + ifFalse: [exprNode]). - [substitutionDict at: argName put: exprNode. locals remove: argName] ifFalse: [stmtList add: (TAssignmentNode new setVariable: (TVariableNode new setName: argName) expression: exprNode copy)]]. meth parseTree: (meth parseTree bindVariablesIn: substitutionDict). ^stmtList! Item was changed: ----- Method: VMMaker class>>generateAllCogConfigurationsUnderVersionControl (in category 'configurations') ----- generateAllCogConfigurationsUnderVersionControl + self generateNewspeakSpurCogVM; - self generateNewspeakCogVM; - generateNewspeakSpurCogVM; generateSqueakCogVM; generateSqueakCogMTVM; generateSqueakSpurCogVM; generateSqueakCogSistaVM; generateSqueakSpurCogSistaVM! Item was changed: ----- Method: VMMaker class>>generateAllNewspeakConfigurationsUnderVersionControl (in category 'configurations') ----- generateAllNewspeakConfigurationsUnderVersionControl + self generateNewspeakSpurStackVM; - self generateNewspeakCogVM; - generateNewspeakSpurStackVM; generateNewspeakSpurCogVM! Item was changed: ----- Method: VMMaker class>>generateAllNonSpurConfigurationsUnderVersionControl (in category 'configurations') ----- generateAllNonSpurConfigurationsUnderVersionControl + self generateSqueakCogVM; - self generateNewspeakCogVM; - generateSqueakCogVM; generateSqueakCogMTVM; generateSqueakStackVM; generateSqueakCogSistaVM! Item was removed: - ----- Method: VMMaker class>>generateNewspeakCogVM (in category 'configurations') ----- - generateNewspeakCogVM - ^VMMaker - generate: CoInterpreter - and: StackToRegisterMappingCogit - with: #( NewspeakVM true - MULTIPLEBYTECODESETS true) - to: (FileDirectory default pathFromURI: self sourceTree, '/nscogsrc') - platformDir: (FileDirectory default pathFromURI: self sourceTree, '/platforms') - including:#( AsynchFilePlugin BMPReadWriterPlugin BalloonEnginePlugin BitBltSimulation - DeflatePlugin DSAPlugin DropPlugin FileCopyPlugin FilePlugin FloatArrayPlugin FloatMathPlugin - ImmX11Plugin JPEGReadWriter2Plugin JPEGReaderPlugin LargeIntegersPlugin - Matrix2x3Plugin MiscPrimitivePlugin NewsqueakIA32ABIPlugin RePlugin - SecurityPlugin SocketPlugin SoundPlugin SqueakSSLPlugin SurfacePlugin - UUIDPlugin UnixOSProcessPlugin UnixAioPlugin - VMProfileLinuxSupportPlugin VMProfileMacSupportPlugin Win32OSProcessPlugin)! Item was removed: - ----- Method: VMMaker class>>generateNewspeakInterpreterVM (in category 'configurations') ----- - generateNewspeakInterpreterVM - ^VMMaker - generate: NewspeakInterpreter - to: (FileDirectory default pathFromURI: self sourceTree, '/nssrc') - platformDir: (FileDirectory default pathFromURI: self sourceTree, '/platforms') - including:#( AsynchFilePlugin BMPReadWriterPlugin BalloonEnginePlugin BitBltSimulation DeflatePlugin DSAPlugin DropPlugin - FileCopyPlugin FilePlugin FloatArrayPlugin FloatMathPlugin ImmX11Plugin JPEGReadWriter2Plugin - JPEGReaderPlugin LargeIntegersPlugin Matrix2x3Plugin MiscPrimitivePlugin NewsqueakIA32ABIPlugin - RePlugin SecurityPlugin SocketPlugin SoundPlugin SqueakSSLPlugin SurfacePlugin - UUIDPlugin UnixOSProcessPlugin VMProfileLinuxSupportPlugin VMProfileMacSupportPlugin Win32OSProcessPlugin)! Item was changed: ----- Method: VMMaker class>>generateNewspeakSpurStackVM (in category 'configurations') ----- generateNewspeakSpurStackVM + "No primitives since we can use those from the Cog Newspeak VM" - "No primitives since we can use those for the Cog Newspeak VM" ^VMMaker generate: StackInterpreter with: #( ObjectMemory Spur32BitMemoryManager MULTIPLEBYTECODESETS true + NewspeakVM true + FailImbalancedPrimitives false + CheckPrivacyViolations true) - NewspeakVM true) to: (FileDirectory default directoryNamed: self sourceTree, '/nsspurstacksrc') fullName platformDir: (FileDirectory default directoryNamed: self sourceTree, '/platforms') fullName including: #()! Item was removed: - ----- Method: VMMaker class>>generateNewspeakStackVM (in category 'configurations') ----- - generateNewspeakStackVM - "No primitives since we can use those for the Cog Newspeak VM" - ^VMMaker - generate: StackInterpreter - with: #(NewspeakVM true MULTIPLEBYTECODESETS true) - to: (FileDirectory default pathFromURI: self sourceTree, '/nsstacksrc') - platformDir: (FileDirectory default pathFromURI: self sourceTree, '/platforms') - including: #()! Item was changed: ----- Method: VMMaker class>>generateSqueakSpurStack64VM (in category 'configurations') ----- generateSqueakSpurStack64VM + "No primitives since we can use those from the Cog VM" - "No primitives since we can use those for the Cog VM" ^VMMaker generate: StackInterpreter + with: #(ObjectMemory Spur64BitMemoryManager + FailImbalancedPrimitives false) - with: #(ObjectMemory Spur64BitMemoryManager) to: (FileDirectory default directoryNamed: self sourceTree, '/spurstack64src') fullName platformDir: (FileDirectory default directoryNamed: self sourceTree, '/platforms') fullName including: #()! Item was changed: ----- Method: VMMaker class>>generateSqueakSpurStackVM (in category 'configurations') ----- generateSqueakSpurStackVM + "No primitives since we can use those from the Cog VM" - "No primitives since we can use those for the Cog VM" ^VMMaker generate: StackInterpreter + with: #(ObjectMemory Spur32BitMemoryManager + FailImbalancedPrimitives false) - with: #(ObjectMemory Spur32BitMemoryManager) to: (FileDirectory default directoryNamed: self sourceTree, '/spurstacksrc') fullName platformDir: (FileDirectory default directoryNamed: self sourceTree, '/platforms') fullName including: #()! Item was changed: ----- Method: VMMaker class>>generateSqueakStackVM (in category 'configurations') ----- generateSqueakStackVM + "No primitives since we can use those from the Cog VM" - "No primitives since we can use those for the Cog VM" ^VMMaker generate: StackInterpreter + with: #(FailImbalancedPrimitives false) to: (FileDirectory default directoryNamed: self sourceTree, '/stacksrc') fullName platformDir: (FileDirectory default directoryNamed: self sourceTree, '/platforms') fullName including: #()!

1 0

[commit][3260] CogVM source as per VMMaker.oscog-eem.1072
by commits＠squeakvm.org 21 Feb '15

21 Feb '15

Revision: 3260 Author: eliot Date: 2015-02-20 22:09:27 -0800 (Fri, 20 Feb 2015) Log Message: ----------- CogVM source as per VMMaker.oscog-eem.1072 Fix typing multiple assignments to a variable - promote the type to the largest integral type of all assignments (primitiveDecompressFromByteArray) - do /not/ promote a variable typed with integral type to a floating point type (transformColor:) Provide size of short int. Do a much better job at typeForArithmetic:in:; answering the longest type for integral types. In inferTypesForImplicitlyTypedVariablesIn:, observe assignments from both sends and typed vars. Comment the method better so that alreadyExplicitlyTyped's usage is clear(er). On type compatibility of inlined expressions, insist on signed compatibility or accept an untyped actual. Provide a return type for asFloat (so inlining in primitiveAsFloat still occurs) Provide an exception in unsignedTypeForBitwiseSend:in: for currentBytecode to preserve the nice constant inlining of currentBytecode & N in the bytecode cases. Improve the type inferrence machinery further to support pointer subtraction. Eliminate code duplication (determineTypeFor:in: now uses returnTypeForSend:, etc). Eliminate the funky code generation scheme for translated primitive plugins (MiscPrimitives et al) and use the same inlining and code generation path as normal plugins. Finally implement a time stamp checker that looks at the source method timestamps. Type some InterpreterProxy methods to generate valid signatures. ...and add type inference support for at: to rescue inlining in the Klatt plugin. Add support for type inferrence of simple arithmetic (+,-,*,/) but *not* >> << et al, so that inlining is still done for e.g. pointer arithmetic expressions. Fix a bug in TMethod>>typeFor:in: which was causing the failure to find the types of global variables. Change the heuristic for inlining expressions to include a maximum usage count. Modified Paths: -------------- branches/Cog/nscogsrc/plugins/AioPlugin/AioPlugin.c branches/Cog/nscogsrc/plugins/B2DPlugin/B2DPlugin.c branches/Cog/nscogsrc/plugins/BitBltPlugin/BitBltPlugin.c branches/Cog/nscogsrc/plugins/DSAPrims/DSAPrims.c branches/Cog/nscogsrc/plugins/FilePlugin/FilePlugin.c branches/Cog/nscogsrc/plugins/IA32ABI/IA32ABI.c branches/Cog/nscogsrc/plugins/JPEGReaderPlugin/JPEGReaderPlugin.c branches/Cog/nscogsrc/plugins/LargeIntegers/LargeIntegers.c branches/Cog/nscogsrc/plugins/MiscPrimitivePlugin/MiscPrimitivePlugin.c branches/Cog/nscogsrc/plugins/RePlugin/RePlugin.c branches/Cog/nscogsrc/plugins/UnixOSProcessPlugin/UnixOSProcessPlugin.c branches/Cog/nscogsrc/plugins/VMProfileMacSupportPlugin/VMProfileMacSupportPlugin.c branches/Cog/nscogsrc/plugins/Win32OSProcessPlugin/Win32OSProcessPlugin.c branches/Cog/nscogsrc/plugins/ZipPlugin/ZipPlugin.c branches/Cog/nscogsrc/vm/cogit.c branches/Cog/nscogsrc/vm/cogit.h branches/Cog/nscogsrc/vm/cointerp.c branches/Cog/nscogsrc/vm/cointerp.h branches/Cog/nscogsrc/vm/gcc3x-cointerp.c branches/Cog/nsspursrc/vm/cogit.c branches/Cog/nsspursrc/vm/cogit.h branches/Cog/nsspursrc/vm/cointerp.c branches/Cog/nsspursrc/vm/cointerp.h branches/Cog/nsspursrc/vm/gcc3x-cointerp.c branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c branches/Cog/nsspurstacksrc/vm/interp.c branches/Cog/sistasrc/vm/cogit.c branches/Cog/sistasrc/vm/cogit.h branches/Cog/sistasrc/vm/cointerp.c branches/Cog/sistasrc/vm/cointerp.h branches/Cog/sistasrc/vm/gcc3x-cointerp.c branches/Cog/spursistasrc/vm/cogit.c branches/Cog/spursistasrc/vm/cogit.h branches/Cog/spursistasrc/vm/cointerp.c branches/Cog/spursistasrc/vm/cointerp.h branches/Cog/spursistasrc/vm/gcc3x-cointerp.c branches/Cog/spursrc/vm/cogit.c branches/Cog/spursrc/vm/cogit.h 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/ADPCMCodecPlugin/ADPCMCodecPlugin.c branches/Cog/src/plugins/AioPlugin/AioPlugin.c branches/Cog/src/plugins/B2DPlugin/B2DPlugin.c branches/Cog/src/plugins/B3DAcceleratorPlugin/B3DAcceleratorPlugin.c branches/Cog/src/plugins/BitBltPlugin/BitBltPlugin.c branches/Cog/src/plugins/BochsIA32Plugin/BochsIA32Plugin.c branches/Cog/src/plugins/CroquetPlugin/CroquetPlugin.c branches/Cog/src/plugins/DSAPrims/DSAPrims.c branches/Cog/src/plugins/FFTPlugin/FFTPlugin.c branches/Cog/src/plugins/FilePlugin/FilePlugin.c branches/Cog/src/plugins/GdbARMPlugin/GdbARMPlugin.c branches/Cog/src/plugins/GeniePlugin/GeniePlugin.c branches/Cog/src/plugins/IA32ABI/IA32ABI.c branches/Cog/src/plugins/JPEGReaderPlugin/JPEGReaderPlugin.c branches/Cog/src/plugins/LargeIntegers/LargeIntegers.c branches/Cog/src/plugins/MIDIPlugin/MIDIPlugin.c branches/Cog/src/plugins/MiscPrimitivePlugin/MiscPrimitivePlugin.c branches/Cog/src/plugins/RePlugin/RePlugin.c branches/Cog/src/plugins/ScratchPlugin/ScratchPlugin.c branches/Cog/src/plugins/SoundGenerationPlugin/SoundGenerationPlugin.c branches/Cog/src/plugins/SqueakFFIPrims/ARM32FFIPlugin.c branches/Cog/src/plugins/SqueakFFIPrims/IA32FFIPlugin.c branches/Cog/src/plugins/UnicodePlugin/UnicodePlugin.c branches/Cog/src/plugins/UnixOSProcessPlugin/UnixOSProcessPlugin.c branches/Cog/src/plugins/VMProfileMacSupportPlugin/VMProfileMacSupportPlugin.c branches/Cog/src/plugins/Win32OSProcessPlugin/Win32OSProcessPlugin.c branches/Cog/src/plugins/XDisplayControlPlugin/XDisplayControlPlugin.c branches/Cog/src/plugins/ZipPlugin/ZipPlugin.c branches/Cog/src/vm/cogit.c branches/Cog/src/vm/cogit.h 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 Property Changed: ---------------- branches/Cog/platforms/Cross/vm/sqSCCSVersion.h Modified: branches/Cog/nscogsrc/plugins/AioPlugin/AioPlugin.c =================================================================== --- branches/Cog/nscogsrc/plugins/AioPlugin/AioPlugin.c 2015-02-21 01:44:49 UTC (rev 3259) +++ branches/Cog/nscogsrc/plugins/AioPlugin/AioPlugin.c 2015-02-21 06:09:27 UTC (rev 3260) @@ -1,5 +1,5 @@ /* Automatically generated by - VMPluginCodeGenerator VMMaker.oscog-eem.983 uuid: 4cdca841-6318-4c49-95de-8c47d0d7e91d + VMPluginCodeGenerator VMMaker.oscog-eem.1072 uuid: bd9d8dd5-dea0-49da-8be7-cb246f49f554 from UnixAioPlugin VMConstruction-Plugins-AioPlugin-eem.17 uuid: a2b39cb2-e681-4bc3-a777-f03b2e3f2de0 */ @@ -60,7 +60,7 @@ static sqInt isSQFileObject(sqInt objectPointer); static sqInt isSQSocketObject(sqInt objectPointer); static sqInt isValidFileSession(sqInt objectPointer); -EXPORT(sqInt) moduleUnloaded(char *aModuleName); +EXPORT(void) moduleUnloaded(char *aModuleName); EXPORT(sqInt) primitiveAioDisable(void); EXPORT(sqInt) primitiveAioEnable(void); EXPORT(sqInt) primitiveAioHandle(void); @@ -71,7 +71,7 @@ EXPORT(sqInt) primitiveVersionString(void); static SESSIONIDENTIFIERTYPE sessionIdentifierFromSqFile(SQFile *sqFile); EXPORT(sqInt) setInterpreter(struct VirtualMachine*anInterpreter); -EXPORT(sqInt) shutdownModule(void); +EXPORT(void) shutdownModule(void); static int socketDescriptorFrom(sqInt sqSocketOop); static sqInt socketRecordSize(void); static SQSocket * socketValueOf(sqInt anSQSocketRecord); @@ -310,7 +310,7 @@ /* The module with the given name was just unloaded. Make sure we have no dangling references. */ -EXPORT(sqInt) +EXPORT(void) moduleUnloaded(char *aModuleName) { } @@ -394,7 +394,7 @@ { sqInt exceptionWatch; sqInt fd; - sqInt flags; + usqInt flags; sqInt readWatch; sqInt writeWatch; @@ -440,7 +440,7 @@ { sqInt exceptionWatch; sqInt fd; - sqInt flags; + usqInt flags; sqInt readWatch; sqInt writeWatch; @@ -590,7 +590,7 @@ return ok; } -EXPORT(sqInt) +EXPORT(void) shutdownModule(void) { } Modified: branches/Cog/nscogsrc/plugins/B2DPlugin/B2DPlugin.c =================================================================== --- branches/Cog/nscogsrc/plugins/B2DPlugin/B2DPlugin.c 2015-02-21 01:44:49 UTC (rev 3259) +++ branches/Cog/nscogsrc/plugins/B2DPlugin/B2DPlugin.c 2015-02-21 06:09:27 UTC (rev 3260) @@ -1,9 +1,9 @@ /* Automatically generated by - VMPluginCodeGenerator VMMaker.oscog-eem.1064 uuid: 9d9d2583-03e6-4b6b-9b24-51587933f8f3 + VMPluginCodeGenerator VMMaker.oscog-eem.1072 uuid: bd9d8dd5-dea0-49da-8be7-cb246f49f554 from - BalloonEnginePlugin VMMaker.oscog-eem.1064 uuid: 9d9d2583-03e6-4b6b-9b24-51587933f8f3 + BalloonEnginePlugin VMMaker.oscog-eem.1072 uuid: bd9d8dd5-dea0-49da-8be7-cb246f49f554 */ -static char __buildInfo[] = "BalloonEnginePlugin VMMaker.oscog-eem.1064 uuid: 9d9d2583-03e6-4b6b-9b24-51587933f8f3 " __DATE__ ; +static char __buildInfo[] = "BalloonEnginePlugin VMMaker.oscog-eem.1072 uuid: bd9d8dd5-dea0-49da-8be7-cb246f49f554 " __DATE__ ; @@ -836,9 +836,9 @@ static void * loadBBFn; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "B2DPlugin VMMaker.oscog-eem.1064 (i)" + "B2DPlugin VMMaker.oscog-eem.1072 (i)" #else - "B2DPlugin VMMaker.oscog-eem.1064 (e)" + "B2DPlugin VMMaker.oscog-eem.1072 (e)" #endif ; static int* objBuffer; @@ -877,7 +877,7 @@ static sqInt aaFirstPixelFromto(sqInt leftX, sqInt rightX) { - sqInt firstPixel; + usqInt firstPixel; firstPixel = ((leftX + (workBuffer[GWAALevel])) - 1) & ((unsigned int)~((workBuffer[GWAALevel]) - 1)); if (firstPixel > rightX) { @@ -952,8 +952,8 @@ static sqInt absoluteSquared8Dot24(sqInt value) { - sqInt word1; - sqInt word2; + usqInt word1; + usqInt word2; word1 = value & 0xFFFF; word2 = (((usqInt) value >> 16)) & 0xFF; @@ -1018,7 +1018,7 @@ { sqInt adjustMask; sqInt adjustShift; - sqInt pixelValue; + unsigned int pixelValue; sqInt x0; sqInt x1; @@ -1596,7 +1596,7 @@ sqInt r; sqInt rShift; sqInt someIntegerValue; - sqInt value; + int value; bmDepth = objBuffer[bmFill + GBBitmapDepth]; bmRaster = objBuffer[bmFill + GBBitmapRaster]; @@ -1644,7 +1644,7 @@ else { /* begin makeUnsignedFrom: */ someIntegerValue = (colormapOf(bmFill))[value]; - value = someIntegerValue; + value = ((sqInt) someIntegerValue); } } return uncheckedTransformColor(value); @@ -1768,7 +1768,7 @@ static sqInt checkCompressedFills(sqInt indexList) { - sqInt fillIndex; + int fillIndex; int *fillPtr; sqInt i; sqInt length; @@ -2819,7 +2819,7 @@ sqInt bmRaster1; sqInt bmRaster2; sqInt bmWidth; - sqInt cMask; + usqInt cMask; sqInt cMask1; sqInt cMask2; sqInt cMask3; @@ -2832,7 +2832,7 @@ sqInt dtX; sqInt fillValue; sqInt firstPixel; - sqInt firstPixel1; + usqInt firstPixel1; sqInt g; sqInt g1; sqInt g2; @@ -2854,9 +2854,9 @@ sqInt someIntegerValue1; sqInt someIntegerValue2; sqInt tileFlag; - sqInt value; - sqInt value1; - sqInt value2; + int value; + int value1; + int value2; sqInt x; sqInt xp; sqInt yp; @@ -3000,7 +3000,7 @@ else { /* begin makeUnsignedFrom: */ someIntegerValue = (colormapOf(bmFill))[value]; - value = someIntegerValue; + value = ((sqInt) someIntegerValue); } } fillValue = uncheckedTransformColor(value); @@ -3124,7 +3124,7 @@ else { /* begin makeUnsignedFrom: */ someIntegerValue1 = (colormapOf(bmFill))[value1]; - value1 = someIntegerValue1; + value1 = ((sqInt) someIntegerValue1); } } fillValue = uncheckedTransformColor(value1); @@ -3248,7 +3248,7 @@ else { /* begin makeUnsignedFrom: */ someIntegerValue2 = (colormapOf(bmFill))[value2]; - value2 = someIntegerValue2; + value2 = ((sqInt) someIntegerValue2); } } fillValue = uncheckedTransformColor(value2); @@ -3278,7 +3278,7 @@ sqInt bitX; sqInt colorMask; sqInt colorShift; - sqInt fillValue; + int fillValue; sqInt x; sqInt x0; sqInt x1; @@ -3347,7 +3347,7 @@ sqInt rShift; sqInt someIntegerValue; sqInt tileFlag; - sqInt value; + int value; sqInt x; sqInt x1; sqInt xp; @@ -3480,7 +3480,7 @@ else { /* begin makeUnsignedFrom: */ someIntegerValue = (colormapOf(bmFill))[value]; - value = someIntegerValue; + value = ((sqInt) someIntegerValue); } } fillValue = uncheckedTransformColor(value); @@ -3505,9 +3505,9 @@ { sqInt aaLevel; sqInt baseShift; - sqInt colorMask; + usqInt colorMask; sqInt firstPixel; - sqInt firstPixel1; + usqInt firstPixel1; sqInt idx; sqInt lastPixel; sqInt pv32; @@ -3635,11 +3635,11 @@ { sqInt aaLevel; sqInt baseShift; - sqInt colorMask; + usqInt colorMask; sqInt colorShift; sqInt ds; sqInt firstPixel; - sqInt firstPixel1; + usqInt firstPixel1; sqInt idx; sqInt lastPixel; sqInt rampIndex; @@ -3969,12 +3969,12 @@ { sqInt aaLevel; sqInt baseShift; - sqInt colorMask; + usqInt colorMask; sqInt colorShift; - sqInt ds; - sqInt dt; + int ds; + int dt; sqInt firstPixel; - sqInt firstPixel1; + usqInt firstPixel1; sqInt index; sqInt lastPixel; sqInt length2; @@ -4099,8 +4099,8 @@ static sqInt fillRadialDecreasingrampdeltaSTdsXdtXfromto(sqInt fill, sqInt ramp, sqInt deltaST, sqInt dsX, sqInt dtX, sqInt leftX, sqInt rightX) { - sqInt ds; - sqInt dt; + int ds; + int dt; sqInt length2; sqInt nextLength; sqInt rampIndex; @@ -4157,12 +4157,12 @@ sqInt deltaX; sqInt deltaY; sqInt ds; - sqInt ds1; - sqInt ds2; + int ds1; + int ds2; sqInt dsX; sqInt dt; - sqInt dt1; - sqInt dt2; + int dt1; + int dt2; sqInt dtX; sqInt lastLength; sqInt length2; @@ -4365,10 +4365,10 @@ sqInt baseShift; sqInt colorMask; sqInt colorShift; - sqInt ds; - sqInt dt; + int ds; + int dt; sqInt firstPixel; - sqInt firstPixel1; + usqInt firstPixel1; sqInt index; sqInt lastLength; sqInt lastPixel; @@ -4502,8 +4502,8 @@ static sqInt fillRadialIncreasingrampdeltaSTdsXdtXfromto(sqInt fill, sqInt ramp, sqInt deltaST, sqInt dsX, sqInt dtX, sqInt leftX, sqInt rightX) { - sqInt ds; - sqInt dt; + int ds; + int dt; sqInt lastLength; sqInt length2; sqInt nextLength; @@ -4680,7 +4680,7 @@ findNextAETEdgeFrom(sqInt leftEdge) { sqInt depth; - sqInt rightEdge; + int rightEdge; depth = objBuffer[leftEdge + GEZValue]; while ((workBuffer[GWAETStart]) < (workBuffer[GWAETUsed])) { @@ -4703,7 +4703,7 @@ static sqInt findNextExternalEntryFromGET(void) { - sqInt edge; + int edge; sqInt type; sqInt yValue; @@ -4767,7 +4767,7 @@ sqInt fill1; sqInt leftEdge; sqInt leftX; - sqInt rightEdge; + int rightEdge; sqInt rightX; sqInt someIntegerValue; sqInt someIntegerValue1; @@ -5008,7 +5008,7 @@ findNextExternalUpdateFromAET(void) { sqInt count; - sqInt edge; + int edge; sqInt type; while ((workBuffer[GWAETStart]) < (workBuffer[GWAETUsed])) { @@ -5740,8 +5740,8 @@ float *transform2; float *transform3; sqInt x; - sqInt x0; - sqInt x1; + int x0; + int x1; sqInt x2; sqInt x3; sqInt x4; @@ -5750,8 +5750,8 @@ double xValue2; double xValue3; sqInt y; - sqInt y0; - sqInt y1; + int y0; + int y1; sqInt y2; sqInt y3; sqInt y4; @@ -5912,7 +5912,7 @@ sqInt x; sqInt x0; sqInt x1; - sqInt x2; + int x2; sqInt x3; sqInt x4; sqInt x5; @@ -5923,7 +5923,7 @@ sqInt y; sqInt y0; sqInt y1; - sqInt y2; + int y2; sqInt y3; sqInt y4; sqInt y5; @@ -7132,16 +7132,16 @@ static sqInt loadFillOrientationfromalongnormalwidthheight(sqInt fill, int *point1, int *point2, int *point3, sqInt fillWidth, sqInt fillHeight) { - sqInt dirX; - sqInt dirY; - sqInt dsLength2; + int dirX; + int dirY; + int dsLength2; sqInt dsX; sqInt dsY; - sqInt dtLength2; + int dtLength2; sqInt dtX; sqInt dtY; - sqInt nrmX; - sqInt nrmY; + int nrmX; + int nrmY; float *transform; float *transform1; float *transform2; @@ -9155,12 +9155,9 @@ return primitiveFailFor(GEFBadPoint); } /* begin loadBitmapFill:colormap:tile:from:along:normal:xIndex: */ - if (tileFlag) { - tileFlag1 = 1; - } - else { - tileFlag1 = 0; - } + tileFlag1 = (tileFlag + ? 1 + : 0); /* begin point1Get */ point1 = ((int *) (workBuffer + GWPoint1)); /* begin point2Get */ @@ -9665,9 +9662,9 @@ float *transform6; float *transform7; sqInt x; - sqInt x0; + int x0; short x01; - sqInt x1; + int x1; short x11; sqInt x2; sqInt x3; @@ -9685,9 +9682,9 @@ double xValue6; double xValue7; sqInt y; - sqInt y0; + int y0; short y01; - sqInt y1; + int y1; short y11; sqInt y2; sqInt y3; @@ -10422,7 +10419,7 @@ primitiveDoProfileStats(void) { sqInt newValue; - sqInt oldValue; + int oldValue; oldValue = doProfileStats; newValue = stackObjectValue(0); @@ -10865,7 +10862,7 @@ EXPORT(sqInt) primitiveNextActiveEdgeEntry(void) { - sqInt edge; + int edge; sqInt edgeOop; sqInt failureCode; sqInt hasEdge; @@ -10981,7 +10978,7 @@ EXPORT(sqInt) primitiveNextGlobalEdgeEntry(void) { - sqInt edge; + int edge; sqInt edgeOop; sqInt failureCode; sqInt hasEdge; @@ -11733,15 +11730,15 @@ { sqInt again; sqInt before; - sqInt di; - sqInt dij; - sqInt dj; + int di; + int dij; + int dj; sqInt ij; sqInt k; sqInt l; sqInt n; - sqInt tmp; - sqInt tt; + int tmp; + int tt; /* The prefix d means the data at that index. */ @@ -11898,8 +11895,8 @@ static sqInt resortFirstAETEntry(void) { - sqInt edge; - sqInt leftEdge; + int edge; + int leftEdge; sqInt xValue; if ((workBuffer[GWAETStart]) == 0) { @@ -12263,15 +12260,15 @@ sqInt fwDDx; sqInt fwDDy; sqInt fwDx; - sqInt fwDx1; + int fwDx1; sqInt fwDy; - sqInt fwDy1; + int fwDy1; sqInt fwX1; sqInt fwX2; sqInt fwY1; sqInt fwY2; - sqInt lastX; - sqInt lastY; + int lastX; + int lastY; sqInt maxSteps; sqInt minY; sqInt scaledStepSize; @@ -12282,8 +12279,8 @@ int *updateData1; sqInt viaX; sqInt viaY; - sqInt word1; - sqInt word2; + usqInt word1; + usqInt word2; sqInt xValue; @@ -12685,10 +12682,10 @@ static sqInt stepToNextBezier(void) { - sqInt fwDx; - sqInt fwDy; - sqInt lastX; - sqInt lastY; + int fwDx; + int fwDy; + int lastX; + int lastY; sqInt minY; int *updateData; sqInt xValue; @@ -12732,10 +12729,10 @@ static sqInt stepToNextBezierForwardat(int *updateData, sqInt yValue) { - sqInt fwDx; - sqInt fwDy; - sqInt lastX; - sqInt lastY; + int fwDx; + int fwDy; + int lastX; + int lastY; sqInt minY; lastX = updateData[GBUpdateX]; @@ -12769,10 +12766,10 @@ static sqInt stepToNextBezierInat(sqInt bezier, sqInt yValue) { - sqInt fwDx; - sqInt fwDy; - sqInt lastX; - sqInt lastY; + int fwDx; + int fwDy; + int lastX; + int lastY; sqInt minY; int *updateData; sqInt xValue; @@ -12813,19 +12810,21 @@ stepToNextLine(void) { sqInt err; + sqInt line; sqInt x; sqInt yValue; /* begin stepToNextLineIn:at: */ + line = aetBuffer[workBuffer[GWAETStart]]; yValue = workBuffer[GWCurrentY]; - x = (objBuffer[(aetBuffer[workBuffer[GWAETStart]]) + GEXValue]) + (objBuffer[(aetBuffer[workBuffer[GWAETStart]]) + GLXIncrement]); - err = (objBuffer[(aetBuffer[workBuffer[GWAETStart]]) + GLError]) + (objBuffer[(aetBuffer[workBuffer[GWAETStart]]) + GLErrorAdjUp]); + x = (objBuffer[line + GEXValue]) + (objBuffer[line + GLXIncrement]); + err = (objBuffer[line + GLError]) + (objBuffer[line + GLErrorAdjUp]); if (err > 0) { - x += objBuffer[(aetBuffer[workBuffer[GWAETStart]]) + GLXDirection]; - err -= objBuffer[(aetBuffer[workBuffer[GWAETStart]]) + GLErrorAdjDown]; + x += objBuffer[line + GLXDirection]; + err -= objBuffer[line + GLErrorAdjDown]; } - objBuffer[(aetBuffer[workBuffer[GWAETStart]]) + GLError] = err; - objBuffer[(aetBuffer[workBuffer[GWAETStart]]) + GEXValue] = x; + objBuffer[line + GLError] = err; + objBuffer[line + GEXValue] = x; return null; } @@ -12865,14 +12864,14 @@ static sqInt stepToNextWideBezierInat(sqInt bezier, sqInt yValue) { - sqInt fwDx; - sqInt fwDx1; - sqInt fwDy; - sqInt fwDy1; - sqInt lastX; - sqInt lastX1; - sqInt lastY; - sqInt lastY1; + int fwDx; + int fwDx1; + int fwDy; + int fwDy1; + int lastX; + int lastX1; + int lastY; + int lastY1; sqInt lineOffset; sqInt lineWidth; sqInt minY; @@ -12968,6 +12967,7 @@ { sqInt err; sqInt lastX; + sqInt line; sqInt lineOffset; sqInt lineWidth; sqInt nextX; @@ -12977,39 +12977,40 @@ sqInt yValue; /* begin stepToNextWideLineIn:at: */ + line = aetBuffer[workBuffer[GWAETStart]]; yValue = workBuffer[GWCurrentY]; - yEntry = (objBuffer[(aetBuffer[workBuffer[GWAETStart]]) + GLWideEntry]) + 1; - yExit = (objBuffer[(aetBuffer[workBuffer[GWAETStart]]) + GLWideExit]) + 1; - objBuffer[(aetBuffer[workBuffer[GWAETStart]]) + GLWideEntry] = yEntry; - objBuffer[(aetBuffer[workBuffer[GWAETStart]]) + GLWideExit] = yExit; - lineWidth = objBuffer[(aetBuffer[workBuffer[GWAETStart]]) + GLWideExtent]; + yEntry = (objBuffer[line + GLWideEntry]) + 1; + yExit = (objBuffer[line + GLWideExit]) + 1; + objBuffer[line + GLWideEntry] = yEntry; + objBuffer[line + GLWideExit] = yExit; + lineWidth = objBuffer[line + GLWideExtent]; lineOffset = lineWidth / 2; if (yEntry >= lineOffset) { - objBuffer[(aetBuffer[workBuffer[GWAETStart]]) + GEObjectType] = (((objBuffer[(aetBuffer[workBuffer[GWAETStart]]) + GEObjectType]) & GEPrimitiveTypeMask) & ((unsigned int)~GEEdgeFillsInvalid)); + objBuffer[line + GEObjectType] = (((objBuffer[line + GEObjectType]) & GEPrimitiveTypeMask) & ((unsigned int)~GEEdgeFillsInvalid)); } if (yExit >= 0) { - objBuffer[(aetBuffer[workBuffer[GWAETStart]]) + GEObjectType] = (((objBuffer[(aetBuffer[workBuffer[GWAETStart]]) + GEObjectType]) & GEPrimitiveTypeMask) | GEEdgeFillsInvalid); + objBuffer[line + GEObjectType] = (((objBuffer[line + GEObjectType]) & GEPrimitiveTypeMask) | GEEdgeFillsInvalid); } - lastX = objBuffer[(aetBuffer[workBuffer[GWAETStart]]) + GEXValue]; + lastX = objBuffer[line + GEXValue]; /* begin stepToNextLineIn:at: */ - x = (objBuffer[(aetBuffer[workBuffer[GWAETStart]]) + GEXValue]) + (objBuffer[(aetBuffer[workBuffer[GWAETStart]]) + GLXIncrement]); - err = (objBuffer[(aetBuffer[workBuffer[GWAETStart]]) + GLError]) + (objBuffer[(aetBuffer[workBuffer[GWAETStart]]) + GLErrorAdjUp]); + x = (objBuffer[line + GEXValue]) + (objBuffer[line + GLXIncrement]); + err = (objBuffer[line + GLError]) + (objBuffer[line + GLErrorAdjUp]); if (err > 0) { - x += objBuffer[(aetBuffer[workBuffer[GWAETStart]]) + GLXDirection]; - err -= objBuffer[(aetBuffer[workBuffer[GWAETStart]]) + GLErrorAdjDown]; + x += objBuffer[line + GLXDirection]; + err -= objBuffer[line + GLErrorAdjDown]; } - objBuffer[(aetBuffer[workBuffer[GWAETStart]]) + GLError] = err; - objBuffer[(aetBuffer[workBuffer[GWAETStart]]) + GEXValue] = x; + objBuffer[line + GLError] = err; + objBuffer[line + GEXValue] = x; /* Check for special start/end adjustments */ - nextX = objBuffer[(aetBuffer[workBuffer[GWAETStart]]) + GEXValue]; + nextX = objBuffer[line + GEXValue]; if ((yEntry <= lineWidth) || ((yExit + lineOffset) >= 0)) { /* Yes, need an update */ - adjustWideLineafterSteppingFromto(aetBuffer[workBuffer[GWAETStart]], lastX, nextX); + adjustWideLineafterSteppingFromto(line, lastX, nextX); } return null; } @@ -13128,7 +13129,7 @@ static sqInt storeRenderingState(void) { - sqInt edge; + int edge; sqInt edgeOop; sqInt fillOop; sqInt reason; @@ -13166,7 +13167,7 @@ static sqInt storeStopStateIntoEdgefill(sqInt edgeOop, sqInt fillOop) { - sqInt edge; + int edge; sqInt reason; reason = workBuffer[GWStopReason]; @@ -13553,11 +13554,11 @@ static sqInt transformColor(sqInt fillIndex) { - sqInt a; + usqInt a; double alphaScale; - sqInt b; - sqInt g; - sqInt r; + usqInt b; + usqInt g; + usqInt r; float *transform; if (!((fillIndex == 0) @@ -13997,10 +13998,10 @@ static sqInt uncheckedTransformColor(sqInt fillIndex) { - sqInt a; - sqInt b; - sqInt g; - sqInt r; + usqInt a; + usqInt b; + usqInt g; + usqInt r; float *transform; if (!((workBuffer[GWHasColorTransform]) != 0)) { Modified: branches/Cog/nscogsrc/plugins/BitBltPlugin/BitBltPlugin.c =================================================================== --- branches/Cog/nscogsrc/plugins/BitBltPlugin/BitBltPlugin.c 2015-02-21 01:44:49 UTC (rev 3259) +++ branches/Cog/nscogsrc/plugins/BitBltPlugin/BitBltPlugin.c 2015-02-21 06:09:27 UTC (rev 3260) @@ -1,9 +1,9 @@ /* Automatically generated by - SmartSyntaxPluginCodeGenerator VMMaker.oscog-eem.1064 uuid: 9d9d2583-03e6-4b6b-9b24-51587933f8f3 + SmartSyntaxPluginCodeGenerator VMMaker.oscog-eem.1072 uuid: bd9d8dd5-dea0-49da-8be7-cb246f49f554 from - BitBltSimulation VMMaker.oscog-eem.1064 uuid: 9d9d2583-03e6-4b6b-9b24-51587933f8f3 + BitBltSimulation VMMaker.oscog-eem.1072 uuid: bd9d8dd5-dea0-49da-8be7-cb246f49f554 */ -static char __buildInfo[] = "BitBltSimulation VMMaker.oscog-eem.1064 uuid: 9d9d2583-03e6-4b6b-9b24-51587933f8f3 " __DATE__ ; +static char __buildInfo[] = "BitBltSimulation VMMaker.oscog-eem.1072 uuid: bd9d8dd5-dea0-49da-8be7-cb246f49f554 " __DATE__ ; @@ -344,9 +344,9 @@ }; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "BitBltPlugin VMMaker.oscog-eem.1064 (i)" + "BitBltPlugin VMMaker.oscog-eem.1072 (i)" #else - "BitBltPlugin VMMaker.oscog-eem.1064 (e)" + "BitBltPlugin VMMaker.oscog-eem.1072 (e)" #endif ; static sqInt noHalftone; @@ -439,21 +439,21 @@ alphaBlendConstwithpaintMode(unsigned int sourceWord, unsigned int destinationWord, sqInt paintMode) { sqInt bitsPerColor; - sqInt blend; + usqInt blend; unsigned int blendAG; unsigned int blendRB; - sqInt destPixVal; - sqInt destShifted; + unsigned int destPixVal; + unsigned int destShifted; sqInt i; sqInt j; sqInt maskShifted; - sqInt pixBlend; - sqInt pixMask; + usqInt pixBlend; + int pixMask; unsigned int result; sqInt rgbMask; sqInt shift; - sqInt sourcePixVal; - sqInt sourceShifted; + unsigned int sourcePixVal; + unsigned int sourceShifted; unsigned int unAlpha; if (destDepth < 16) { @@ -626,9 +626,9 @@ sqInt deltaX; sqInt deltaY; sqInt destWord; - sqInt ditherBase; - sqInt ditherIndex; - sqInt ditherThreshold; + usqInt ditherBase; + usqInt ditherIndex; + int ditherThreshold; sqInt dstIndex; sqInt dstMask; sqInt dstValue; @@ -637,7 +637,7 @@ sqInt sourceWord; sqInt srcAlpha; sqInt srcIndex; - sqInt srcShift; + usqInt srcShift; sqInt srcY; @@ -873,18 +873,18 @@ static sqInt alphaSourceBlendBits8(void) { - sqInt adjust; + usqInt adjust; sqInt deltaX; sqInt deltaY; sqInt destWord; sqInt dstIndex; - sqInt dstMask; + usqInt dstMask; sqInt dstValue; sqInt dstY; - sqInt mapperFlags; + usqInt mapperFlags; unsigned int *mappingTable; sqInt pv; - sqInt sourceWord; + usqInt sourceWord; sqInt srcAlpha; sqInt srcIndex; sqInt srcShift; @@ -995,7 +995,7 @@ pv = cmLookupTable[pv & cmMask]; } } - sourceWord = pv; + sourceWord = ((sqInt) pv); /* Store back */ @@ -1356,12 +1356,12 @@ { sqInt done; sqInt dWid; - sqInt dxLowBits; - sqInt endBits; + usqInt dxLowBits; + usqInt endBits; sqInt pixPerM1; sqInt pixPerM11; sqInt startBits; - sqInt sxLowBits; + usqInt sxLowBits; sqInt t; copyBitsRule41Test(); @@ -1693,12 +1693,12 @@ { sqInt done; sqInt dWid; - sqInt dxLowBits; - sqInt endBits; + usqInt dxLowBits; + usqInt endBits; sqInt pixPerM1; sqInt pixPerM11; sqInt startBits; - sqInt sxLowBits; + usqInt sxLowBits; sqInt t; @@ -1996,7 +1996,7 @@ sqInt notSkewMask; sqInt prevWord; sqInt skewMask; - sqInt skewWord; + usqInt skewWord; sqInt thisWord; sqInt unskew; sqInt word; @@ -2253,20 +2253,20 @@ static sqInt copyLoopPixMap(void) { - sqInt destPix; - sqInt destPixMask; + unsigned int destPix; + int destPixMask; sqInt destWord; - sqInt destWord1; - sqInt dstShift; + usqInt destWord1; + usqInt dstShift; sqInt dstShift1; sqInt dstShiftInc; sqInt dstShiftLeft; - sqInt endBits; + usqInt endBits; sqInt halftoneWord; sqInt i; sqInt idx; sqInt idx1; - sqInt mapperFlags; + usqInt mapperFlags; sqInt (*mergeFnwith)(sqInt, sqInt); sqInt mergeWord; sqInt nPix; @@ -2275,10 +2275,10 @@ sqInt pv; sqInt scrStartBits; sqInt skewWord; - sqInt sourcePix; - sqInt sourcePixMask; + usqInt sourcePix; + int sourcePixMask; sqInt sourceWord; - sqInt srcShift; + usqInt srcShift; sqInt srcShift1; sqInt srcShiftInc; sqInt startBits; @@ -2410,7 +2410,7 @@ pv = cmLookupTable[pv & cmMask]; } } - destPix = pv; + destPix = ((sqInt) pv); /* adjust dest pix index */ @@ -2562,7 +2562,7 @@ static sqInt destMaskAndPointerInit(void) { - sqInt endBits; + usqInt endBits; sqInt pixPerM1; sqInt startBits; @@ -2800,10 +2800,10 @@ static sqInt expensiveDither32To16threshold(sqInt srcWord, sqInt ditherValue) { - sqInt out; - sqInt pv; - sqInt threshold; - sqInt value; + int out; + usqInt pv; + int threshold; + int value; /* You bet */ @@ -3007,12 +3007,12 @@ initDither8Lookup(void) { sqInt b; - sqInt out; - sqInt pv; + int out; + usqInt pv; sqInt t; - sqInt threshold; + int threshold; sqInt value; - sqInt value1; + int value1; for (b = 0; b <= 0xFF; b += 1) { for (t = 0; t <= 15; t += 1) { @@ -4005,8 +4005,8 @@ static sqInt OLDrgbDiffwith(sqInt sourceWord, sqInt destinationWord) { - sqInt diff; - sqInt pixMask; + usqInt diff; + int pixMask; if (destDepth < 16) { @@ -4050,16 +4050,17 @@ sqInt d; sqInt d1; sqInt d2; - sqInt destPix; - sqInt destPix1; - sqInt destPix2; + usqInt destPix; + usqInt destPix1; + usqInt destPix2; sqInt i; - sqInt mapIndex; + usqInt mapIndex; sqInt mask; sqInt mask3; sqInt mask4; - sqInt pixMask; + unsigned int pixMask; sqInt shiftWord; + sqInt sourcePixel; sqInt srcPix; sqInt srcPix1; sqInt srcPix2; @@ -4085,6 +4086,7 @@ /* Two pixels Tally the right half... */ /* begin rgbMap:from:to: */ + sourcePixel = destinationWord & 0xFFFF; if (((d = cmBitsPerColor - 5)) > 0) { /* Expand to more bits by zero-fill */ @@ -4093,12 +4095,12 @@ /* Transfer mask */ mask = (1 << 5) - 1; - srcPix = (destinationWord & 0xFFFF) << d; + srcPix = sourcePixel << d; mask = mask << d; destPix = srcPix & mask; mask = mask << cmBitsPerColor; srcPix = srcPix << d; - mapIndex = (destPix + (srcPix & mask)) + ((srcPix << d) & (mask << cmBitsPerColor)); + mapIndex = ((sqInt) ((destPix + (srcPix & mask)) + ((srcPix << d) & (mask << cmBitsPerColor)))); goto l1; } else { @@ -4111,7 +4113,7 @@ /* Sometimes called with 16 bits, though pixel is 15, but we must never return more than 15. */ - mapIndex = (destinationWord & 0xFFFF) & 0x7FFF; + mapIndex = ((sqInt) (sourcePixel & 0x7FFF)); goto l1; } if (5 == 8) { @@ -4119,14 +4121,14 @@ /* Sometimes called with 32 bits, though pixel is 24, but we must never return more than 24. */ - mapIndex = (destinationWord & 0xFFFF) & 0xFFFFFF; + mapIndex = ((sqInt) (sourcePixel & 0xFFFFFF)); goto l1; } - mapIndex = destinationWord & 0xFFFF; + mapIndex = ((sqInt) sourcePixel); goto l1; } - if ((destinationWord & 0xFFFF) == 0) { - mapIndex = destinationWord & 0xFFFF; + if (sourcePixel == 0) { + mapIndex = ((sqInt) sourcePixel); goto l1; } d = 5 - cmBitsPerColor; @@ -4134,16 +4136,16 @@ /* Transfer mask */ mask = (1 << cmBitsPerColor) - 1; - srcPix = ((usqInt) (destinationWord & 0xFFFF)) >> d; + srcPix = ((usqInt) sourcePixel) >> d; destPix = srcPix & mask; mask = mask << cmBitsPerColor; srcPix = ((usqInt) srcPix) >> d; destPix = (destPix + (srcPix & mask)) + ((((usqInt) srcPix) >> d) & (mask << cmBitsPerColor)); if (destPix == 0) { - mapIndex = 1; + mapIndex = ((sqInt) 1); goto l1; } - mapIndex = destPix; + mapIndex = ((sqInt) destPix); goto l1; } l1: /* end rgbMap:from:to: */; @@ -4162,7 +4164,7 @@ destPix1 = srcPix1 & mask3; mask3 = mask3 << cmBitsPerColor; srcPix1 = srcPix1 << d1; - mapIndex = (destPix1 + (srcPix1 & mask3)) + ((srcPix1 << d1) & (mask3 << cmBitsPerColor)); + mapIndex = ((sqInt) ((destPix1 + (srcPix1 & mask3)) + ((srcPix1 << d1) & (mask3 << cmBitsPerColor)))); goto l2; } else { @@ -4175,7 +4177,7 @@ /* Sometimes called with 16 bits, though pixel is 15, but we must never return more than 15. */ - mapIndex = (((usqInt) destinationWord) >> 16) & 0x7FFF; + mapIndex = ((sqInt) ((((usqInt) destinationWord) >> 16) & 0x7FFF)); goto l2; } if (5 == 8) { @@ -4183,14 +4185,14 @@ /* Sometimes called with 32 bits, though pixel is 24, but we must never return more than 24. */ - mapIndex = (((usqInt) destinationWord) >> 16) & 0xFFFFFF; + mapIndex = ((sqInt) ((((usqInt) destinationWord) >> 16) & 0xFFFFFF)); goto l2; } - mapIndex = ((usqInt) destinationWord) >> 16; + mapIndex = ((sqInt) (((usqInt) destinationWord) >> 16)); goto l2; } if ((((usqInt) destinationWord) >> 16) == 0) { - mapIndex = ((usqInt) destinationWord) >> 16; + mapIndex = ((sqInt) (((usqInt) destinationWord) >> 16)); goto l2; } d1 = 5 - cmBitsPerColor; @@ -4204,10 +4206,10 @@ srcPix1 = ((usqInt) srcPix1) >> d1; destPix1 = (destPix1 + (srcPix1 & mask3)) + ((((usqInt) srcPix1) >> d1) & (mask3 << cmBitsPerColor)); if (destPix1 == 0) { - mapIndex = 1; + mapIndex = ((sqInt) 1); goto l2; } - mapIndex = destPix1; + mapIndex = ((sqInt) destPix1); goto l2; } l2: /* end rgbMap:from:to: */; @@ -4231,7 +4233,7 @@ destPix2 = srcPix2 & mask4; mask4 = mask4 << cmBitsPerColor; srcPix2 = srcPix2 << d2; - mapIndex = (destPix2 + (srcPix2 & mask4)) + ((srcPix2 << d2) & (mask4 << cmBitsPerColor)); + mapIndex = ((sqInt) ((destPix2 + (srcPix2 & mask4)) + ((srcPix2 << d2) & (mask4 << cmBitsPerColor)))); goto l3; } else { @@ -4244,7 +4246,7 @@ /* Sometimes called with 16 bits, though pixel is 15, but we must never return more than 15. */ - mapIndex = destinationWord & 0x7FFF; + mapIndex = ((sqInt) (destinationWord & 0x7FFF)); goto l3; } if (8 == 8) { @@ -4252,14 +4254,14 @@ /* Sometimes called with 32 bits, though pixel is 24, but we must never return more than 24. */ - mapIndex = destinationWord & 0xFFFFFF; + mapIndex = ((sqInt) (destinationWord & 0xFFFFFF)); goto l3; } - mapIndex = destinationWord; + mapIndex = ((sqInt) destinationWord); goto l3; } if (destinationWord == 0) { - mapIndex = destinationWord; + mapIndex = ((sqInt) destinationWord); goto l3; } d2 = 8 - cmBitsPerColor; @@ -4273,10 +4275,10 @@ srcPix2 = ((usqInt) srcPix2) >> d2; destPix2 = (destPix2 + (srcPix2 & mask4)) + ((((usqInt) srcPix2) >> d2) & (mask4 << cmBitsPerColor)); if (destPix2 == 0) { - mapIndex = 1; + mapIndex = ((sqInt) 1); goto l3; } - mapIndex = destPix2; + mapIndex = ((sqInt) destPix2); goto l3; } l3: /* end rgbMap:from:to: */; @@ -4325,8 +4327,8 @@ partitionedANDtonBitsnPartitions(sqInt word1, sqInt word2, sqInt nBits, sqInt nParts) { sqInt i; - sqInt mask; - sqInt result; + int mask; + usqInt result; /* partition mask starts at the right */ @@ -4422,9 +4424,9 @@ partitionedMulwithnBitsnPartitions(sqInt word1, sqInt word2, sqInt nBits, sqInt nParts) { sqInt dMask; - sqInt product; + usqInt product; sqInt result; - sqInt sMask; + int sMask; /* partition mask starts at the right */ @@ -4457,13 +4459,13 @@ partitionedRgbComponentAlphadestnBitsnPartitions(sqInt sourceWord, sqInt destWord, sqInt nBits, sqInt nParts) { sqInt d; - sqInt destPix; + usqInt destPix; sqInt i; - sqInt mask; + int mask; sqInt mask3; sqInt p1; sqInt p2; - sqInt result; + usqInt result; sqInt srcPix; sqInt v; @@ -4613,12 +4615,12 @@ performCopyLoop(void) { sqInt dWid; - sqInt dxLowBits; - sqInt endBits; + usqInt dxLowBits; + usqInt endBits; sqInt pixPerM1; sqInt pixPerM11; sqInt startBits; - sqInt sxLowBits; + usqInt sxLowBits; sqInt t; /* begin destMaskAndPointerInit */ @@ -4776,14 +4778,14 @@ static sqInt pickSourcePixelsflagssrcMaskdestMasksrcShiftIncdstShiftInc(sqInt nPixels, sqInt mapperFlags, sqInt srcMask, sqInt dstMask, sqInt srcShiftInc, sqInt dstShiftInc) { - sqInt destPix; - sqInt destWord; + unsigned int destPix; + usqInt destWord; sqInt dstShift; sqInt idx; sqInt idx1; sqInt nPix; sqInt pv; - sqInt sourcePix; + usqInt sourcePix; sqInt sourceWord; sqInt srcShift; sqInt val; @@ -4858,7 +4860,7 @@ pv = cmLookupTable[pv & cmMask]; } } - destPix = pv; + destPix = ((sqInt) pv); /* adjust dest pix index */ @@ -4895,7 +4897,7 @@ static sqInt pickWarpPixelAtXy(sqInt xx, sqInt yy) { - sqInt sourcePix; + usqInt sourcePix; sqInt sourceWord; sqInt srcIndex; sqInt x; @@ -4931,10 +4933,10 @@ pixClearwith(sqInt sourceWord, sqInt destinationWord) { sqInt i; - sqInt mask; + int mask; sqInt nBits; - sqInt pv; - sqInt result; + usqInt pv; + usqInt result; if (destDepth == 32) { if (sourceWord == destinationWord) { @@ -4988,7 +4990,7 @@ sqInt highMask; sqInt i; sqInt lowMask; - sqInt result; + usqInt result; sqInt shift; if (destPPW == 1) { @@ -5031,18 +5033,12 @@ sqInt val; sqInt _return_value; - if (BytesPerOop == 4) { - colorA = positive32BitValueOf(stackValue(2)); - } - else { - colorA = positive64BitValueOf(stackValue(2)); - } - if (BytesPerOop == 4) { - colorB = positive32BitValueOf(stackValue(1)); - } - else { - colorB = positive64BitValueOf(stackValue(1)); - } + colorA = (BytesPerOop == 4 + ? positive32BitValueOf(stackValue(2)) + : positive64BitValueOf(stackValue(2))); + colorB = (BytesPerOop == 4 + ? positive32BitValueOf(stackValue(1)) + : positive64BitValueOf(stackValue(1))); testID = stackIntegerValue(0); rcvr = stackValue(3); if (failed()) { @@ -5140,7 +5136,7 @@ sqInt ascii; sqInt bbObj; sqInt charIndex; - sqInt endBits; + usqInt endBits; sqInt glyphIndex; sqInt glyphMap; sqInt kernDelta; @@ -5453,7 +5449,7 @@ sqInt bitsSize; sqInt depth; sqInt mask; - sqInt pixel; + usqInt pixel; sqInt ppW; sqInt rcvr; sqInt shift; @@ -5559,7 +5555,7 @@ EXPORT(sqInt) primitiveWarpBits(void) { - sqInt endBits; + usqInt endBits; sqInt ns; sqInt pixPerM1; sqInt rcvr; @@ -5742,17 +5738,17 @@ sqInt deltaX; sqInt deltaY; sqInt destWord; - sqInt ditherBase; - sqInt ditherIndex; - sqInt ditherThreshold; + usqInt ditherBase; + usqInt ditherIndex; + int ditherThreshold; sqInt dstIndex; sqInt dstMask; sqInt dstValue; sqInt dstY; sqInt sourceWord; - sqInt srcAlpha; + usqInt srcAlpha; sqInt srcIndex; - sqInt srcShift; + usqInt srcShift; sqInt srcY; @@ -5866,7 +5862,7 @@ register long dstIndex; sqInt dstY; register long sourceWord; - sqInt srcAlpha; + unsigned register long srcAlpha; register long srcIndex; sqInt srcY; @@ -5950,19 +5946,19 @@ rgbComponentAlpha32with(sqInt sourceWord, sqInt destinationWord) { sqInt a; - sqInt aA; - sqInt aB; - sqInt aG; + usqInt aA; + usqInt aB; + usqInt aG; sqInt alpha; sqInt answer; - sqInt aR; + usqInt aR; sqInt b; - sqInt d; + usqInt d; sqInt dstMask; sqInt g; sqInt r; - sqInt s; - sqInt srcAlpha; + usqInt s; + usqInt srcAlpha; sqInt srcColor; alpha = sourceWord; @@ -6053,19 +6049,19 @@ static sqInt rgbComponentAlpha8(void) { - sqInt adjust; + usqInt adjust; sqInt deltaX; sqInt deltaY; sqInt destWord; sqInt dstIndex; - sqInt dstMask; + usqInt dstMask; sqInt dstValue; sqInt dstY; - sqInt mapperFlags; + usqInt mapperFlags; unsigned int *mappingTable; sqInt pv; - sqInt sourceWord; - sqInt srcAlpha; + usqInt sourceWord; + usqInt srcAlpha; sqInt srcIndex; sqInt srcShift; sqInt srcY; @@ -6183,7 +6179,7 @@ pv = cmLookupTable[pv & cmMask]; } } - sourceWord = pv; + sourceWord = ((sqInt) pv); /* Store back */ @@ -6246,13 +6242,13 @@ { sqInt alpha; sqInt d; - sqInt destPix; + usqInt destPix; sqInt i; - sqInt mask; + int mask; sqInt mask3; sqInt p1; sqInt p2; - sqInt result; + usqInt result; sqInt srcPix; sqInt v; @@ -6363,14 +6359,14 @@ rgbDiffwith(sqInt sourceWord, sqInt destinationWord) { sqInt bitsPerColor; - sqInt destPixVal; + usqInt destPixVal; sqInt destShifted; sqInt diff; sqInt i; sqInt maskShifted; - sqInt pixMask; + int pixMask; sqInt rgbMask; - sqInt sourcePixVal; + usqInt sourcePixVal; sqInt sourceShifted; pixMask = maskTable[destDepth]; @@ -6457,7 +6453,7 @@ rgbMapfromto(sqInt sourcePixel, sqInt nBitsIn, sqInt nBitsOut) { sqInt d; - sqInt destPix; + usqInt destPix; sqInt mask; sqInt srcPix; @@ -6784,9 +6780,9 @@ sourceSkewAndPointerInit(void) { sqInt dWid; - sqInt dxLowBits; + usqInt dxLowBits; sqInt pixPerM1; - sqInt sxLowBits; + usqInt sxLowBits; /* A mask, assuming power of two */ @@ -6871,16 +6867,16 @@ { sqInt d; sqInt d1; - sqInt destPix; - sqInt destPix1; + usqInt destPix; + usqInt destPix1; sqInt destShifted; sqInt i; - sqInt mapIndex; + usqInt mapIndex; sqInt mask; sqInt mask3; sqInt maskShifted; - sqInt pixMask; - sqInt pixVal; + int pixMask; + usqInt pixVal; sqInt srcPix; sqInt srcPix1; @@ -6915,7 +6911,7 @@ destPix = srcPix & mask; mask = mask << cmBitsPerColor; srcPix = srcPix << d; - mapIndex = (destPix + (srcPix & mask)) + ((srcPix << d) & (mask << cmBitsPerColor)); + mapIndex = ((sqInt) ((destPix + (srcPix & mask)) + ((srcPix << d) & (mask << cmBitsPerColor)))); goto l1; } else { @@ -6928,7 +6924,7 @@ /* Sometimes called with 16 bits, though pixel is 15, but we must never return more than 15. */ - mapIndex = pixVal & 0x7FFF; + mapIndex = ((sqInt) (pixVal & 0x7FFF)); goto l1; } if (5 == 8) { @@ -6936,14 +6932,14 @@ /* Sometimes called with 32 bits, though pixel is 24, but we must never return more than 24. */ - mapIndex = pixVal & 0xFFFFFF; + mapIndex = ((sqInt) (pixVal & 0xFFFFFF)); goto l1; } - mapIndex = pixVal; + mapIndex = ((sqInt) pixVal); goto l1; } if (pixVal == 0) { - mapIndex = pixVal; + mapIndex = ((sqInt) pixVal); goto l1; } d = 5 - cmBitsPerColor; @@ -6957,10 +6953,10 @@ srcPix = ((usqInt) srcPix) >> d; destPix = (destPix + (srcPix & mask)) + ((((usqInt) srcPix) >> d) & (mask << cmBitsPerColor)); if (destPix == 0) { - mapIndex = 1; + mapIndex = ((sqInt) 1); goto l1; } - mapIndex = destPix; + mapIndex = ((sqInt) destPix); goto l1; } l1: /* end rgbMap:from:to: */; @@ -6980,7 +6976,7 @@ destPix1 = srcPix1 & mask3; mask3 = mask3 << cmBitsPerColor; srcPix1 = srcPix1 << d1; - mapIndex = (destPix1 + (srcPix1 & mask3)) + ((srcPix1 << d1) & (mask3 << cmBitsPerColor)); + mapIndex = ((sqInt) ((destPix1 + (srcPix1 & mask3)) + ((srcPix1 << d1) & (mask3 << cmBitsPerColor)))); goto l2; } else { @@ -6993,7 +6989,7 @@ /* Sometimes called with 16 bits, though pixel is 15, but we must never return more than 15. */ - mapIndex = pixVal & 0x7FFF; + mapIndex = ((sqInt) (pixVal & 0x7FFF)); goto l2; } if (8 == 8) { @@ -7001,14 +6997,14 @@ /* Sometimes called with 32 bits, though pixel is 24, but we must never return more than 24. */ - mapIndex = pixVal & 0xFFFFFF; + mapIndex = ((sqInt) (pixVal & 0xFFFFFF)); goto l2; } - mapIndex = pixVal; + mapIndex = ((sqInt) pixVal); goto l2; } if (pixVal == 0) { - mapIndex = pixVal; + mapIndex = ((sqInt) pixVal); goto l2; } d1 = 8 - cmBitsPerColor; @@ -7022,10 +7018,10 @@ srcPix1 = ((usqInt) srcPix1) >> d1; destPix1 = (destPix1 + (srcPix1 & mask3)) + ((((usqInt) srcPix1) >> d1) & (mask3 << cmBitsPerColor)); if (destPix1 == 0) { - mapIndex = 1; + mapIndex = ((sqInt) 1); goto l2; } - mapIndex = destPix1; + mapIndex = ((sqInt) destPix1); goto l2; } l2: /* end rgbMap:from:to: */; @@ -7185,7 +7181,7 @@ static sqInt warpBits(void) { - sqInt endBits; + usqInt endBits; sqInt ns; sqInt pixPerM1; sqInt startBits; @@ -7273,13 +7269,13 @@ sqInt deltaP12y; sqInt deltaP43x; sqInt deltaP43y; - sqInt destPix; + unsigned int destPix; sqInt destWord; - sqInt destWord1; - sqInt dstMask; + usqInt destWord1; + int dstMask; sqInt dstShiftInc; sqInt dstShiftLeft; - sqInt endBits; + usqInt endBits; sqInt fieldOop; sqInt fieldOop1; sqInt fieldOop2; @@ -7299,7 +7295,7 @@ sqInt halftoneWord; sqInt i; sqInt i1; - sqInt mapperFlags; + usqInt mapperFlags; sqInt (*mergeFnwith)(sqInt, sqInt); sqInt mergeWord; sqInt nPix; @@ -7314,8 +7310,8 @@ sqInt smoothingCount; sqInt sourceMapOop; sqInt sourcePix; - sqInt sourcePix1; - sqInt sourcePix2; + usqInt sourcePix1; + usqInt sourcePix2; sqInt sourceWord; sqInt sourceWord1; sqInt srcIndex; @@ -7773,7 +7769,7 @@ pv = cmLookupTable[pv & cmMask]; } } - destPix = pv; + destPix = ((sqInt) pv); destWord1 = destWord1 | ((destPix & dstMask) << dstBitShift); dstBitShift += dstShiftInc; sx += xDelta; @@ -7884,8 +7880,8 @@ { sqInt a; sqInt b; - sqInt destWord; - sqInt dstMask; + usqInt destWord; + int dstMask; sqInt g; sqInt i; sqInt j; @@ -7894,7 +7890,7 @@ sqInt pv; sqInt r; sqInt rgb; - sqInt sourcePix; + usqInt sourcePix; sqInt sourceWord; sqInt srcIndex; sqInt val; @@ -8073,14 +8069,14 @@ static sqInt warpPickSourcePixelsxDeltahyDeltahxDeltavyDeltavdstShiftIncflags(sqInt nPixels, sqInt xDeltah, sqInt yDeltah, sqInt xDeltav, sqInt yDeltav, sqInt dstShiftInc, sqInt mapperFlags) { - sqInt destPix; - sqInt destWord; - sqInt dstMask; + unsigned int destPix; + usqInt destWord; + int dstMask; sqInt nPix; sqInt pv; sqInt sourcePix; - sqInt sourcePix1; - sqInt sourcePix2; + usqInt sourcePix1; + usqInt sourcePix2; sqInt sourceWord; sqInt sourceWord1; sqInt srcIndex; @@ -8167,7 +8163,7 @@ pv = cmLookupTable[pv & cmMask]; } } - destPix = pv; + destPix = ((sqInt) pv); destWord = destWord | ((destPix & dstMask) << dstBitShift); dstBitShift += dstShiftInc; sx += xDeltah; Modified: branches/Cog/nscogsrc/plugins/DSAPrims/DSAPrims.c =================================================================== --- branches/Cog/nscogsrc/plugins/DSAPrims/DSAPrims.c 2015-02-21 01:44:49 UTC (rev 3259) +++ branches/Cog/nscogsrc/plugins/DSAPrims/DSAPrims.c 2015-02-21 06:09:27 UTC (rev 3260) @@ -1,9 +1,9 @@ /* Automatically generated by - VMPluginCodeGenerator VMMaker.oscog-eem.990 uuid: f4a22308-891c-4542-b6a4-10fe174bc82a + VMPluginCodeGenerator VMMaker.oscog-eem.1072 uuid: bd9d8dd5-dea0-49da-8be7-cb246f49f554 from - DSAPlugin VMMaker.oscog-eem.990 uuid: f4a22308-891c-4542-b6a4-10fe174bc82a + DSAPlugin VMMaker.oscog-eem.1072 uuid: bd9d8dd5-dea0-49da-8be7-cb246f49f554 */ -static char __buildInfo[] = "DSAPlugin VMMaker.oscog-eem.990 uuid: f4a22308-891c-4542-b6a4-10fe174bc82a " __DATE__ ; +static char __buildInfo[] = "DSAPlugin VMMaker.oscog-eem.1072 uuid: bd9d8dd5-dea0-49da-8be7-cb246f49f554 " __DATE__ ; @@ -91,9 +91,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "DSAPrims VMMaker.oscog-eem.990 (i)" + "DSAPrims VMMaker.oscog-eem.1072 (i)" #else - "DSAPrims VMMaker.oscog-eem.990 (e)" + "DSAPrims VMMaker.oscog-eem.1072 (e)" #endif ; static sqInt remainderDigitCount; @@ -146,10 +146,10 @@ { sqInt borrow; sqInt carry; - sqInt d1; - sqInt d2; + unsigned char d1; + unsigned char d2; sqInt digitShift; - sqInt firstDigit; + unsigned char firstDigit; sqInt firstTwoDigits; sqInt i; sqInt i1; @@ -161,7 +161,7 @@ sqInt rIndex; sqInt rIndex1; sqInt sum; - sqInt thirdDigit; + unsigned char thirdDigit; d1 = dsaDivisor[divisorDigitCount]; d2 = dsaDivisor[divisorDigitCount - 1]; @@ -282,11 +282,11 @@ { sqInt borrow; sqInt carry; - sqInt d1; - sqInt d2; + unsigned char d1; + unsigned char d2; sqInt digitShift; sqInt div; - sqInt firstDigit; + unsigned char firstDigit; sqInt firstTwoDigits; sqInt i; sqInt i1; @@ -300,7 +300,7 @@ sqInt rIndex; sqInt rIndex1; sqInt sum; - sqInt thirdDigit; + unsigned char thirdDigit; quo = stackObjectValue(0); div = stackObjectValue(1); @@ -419,7 +419,7 @@ primitiveBigMultiply(void) { sqInt carry; - sqInt digit; + unsigned char digit; sqInt f1; sqInt f1Len; unsigned char *f1Ptr; @@ -529,13 +529,13 @@ EXPORT(sqInt) primitiveHashBlock(void) { - sqInt a; - sqInt b; + unsigned int a; + unsigned int b; sqInt buf; unsigned int *bufPtr; - sqInt c; - sqInt d; - sqInt e; + unsigned int c; + unsigned int d; + unsigned int e; sqInt i; sqInt state; unsigned int *statePtr; Modified: branches/Cog/nscogsrc/plugins/FilePlugin/FilePlugin.c =================================================================== --- branches/Cog/nscogsrc/plugins/FilePlugin/FilePlugin.c 2015-02-21 01:44:49 UTC (rev 3259) +++ branches/Cog/nscogsrc/plugins/FilePlugin/FilePlugin.c 2015-02-21 06:09:27 UTC (rev 3260) @@ -1,9 +1,9 @@ /* Automatically generated by - VMPluginCodeGenerator VMMaker.oscog-eem.1064 uuid: 9d9d2583-03e6-4b6b-9b24-51587933f8f3 + VMPluginCodeGenerator VMMaker.oscog-eem.1072 uuid: bd9d8dd5-dea0-49da-8be7-cb246f49f554 from - FilePlugin VMMaker.oscog-eem.1064 uuid: 9d9d2583-03e6-4b6b-9b24-51587933f8f3 + FilePlugin VMMaker.oscog-eem.1072 uuid: bd9d8dd5-dea0-49da-8be7-cb246f49f554 */ -static char __buildInfo[] = "FilePlugin VMMaker.oscog-eem.1064 uuid: 9d9d2583-03e6-4b6b-9b24-51587933f8f3 " __DATE__ ; +static char __buildInfo[] = "FilePlugin VMMaker.oscog-eem.1072 uuid: bd9d8dd5-dea0-49da-8be7-cb246f49f554 " __DATE__ ; @@ -177,9 +177,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "FilePlugin VMMaker.oscog-eem.1064 (i)" + "FilePlugin VMMaker.oscog-eem.1072 (i)" #else - "FilePlugin VMMaker.oscog-eem.1064 (e)" + "FilePlugin VMMaker.oscog-eem.1072 (e)" #endif ; static void * sCCPfn; @@ -853,12 +853,9 @@ || (!(isWordsOrBytes(array)))) { return primitiveFailFor(PrimErrBadArgument); } - if (isWords(array)) { - elementSize = 4; - } - else { - elementSize = 1; - } + elementSize = (isWords(array) + ? 4 + : 1); if (!((startIndex >= 1) && (((startIndex + count) - 1) <= (slotSizeOf(array))))) { return primitiveFailFor(PrimErrBadIndex); @@ -1083,12 +1080,9 @@ || (!(isWordsOrBytes(array)))) { return primitiveFailFor(PrimErrBadArgument); } - if (isWords(array)) { - elementSize = 4; - } - else { - elementSize = 1; - } + elementSize = (isWords(array) + ? 4 + : 1); if (!((startIndex >= 1) && (((startIndex + count) - 1) <= (slotSizeOf(array))))) { return primitiveFailFor(PrimErrBadIndex); Modified: branches/Cog/nscogsrc/plugins/IA32ABI/IA32ABI.c =================================================================== --- branches/Cog/nscogsrc/plugins/IA32ABI/IA32ABI.c 2015-02-21 01:44:49 UTC (rev 3259) +++ branches/Cog/nscogsrc/plugins/IA32ABI/IA32ABI.c 2015-02-21 06:09:27 UTC (rev 3260) @@ -1,9 +1,9 @@ /* Automatically generated by - VMPluginCodeGenerator VMMaker.oscog-eem.1064 uuid: 9d9d2583-03e6-4b6b-9b24-51587933f8f3 + VMPluginCodeGenerator VMMaker.oscog-eem.1072 uuid: bd9d8dd5-dea0-49da-8be7-cb246f49f554 from - NewsqueakIA32ABIPlugin VMMaker.oscog-eem.1064 uuid: 9d9d2583-03e6-4b6b-9b24-51587933f8f3 + NewsqueakIA32ABIPlugin VMMaker.oscog-eem.1072 uuid: bd9d8dd5-dea0-49da-8be7-cb246f49f554 */ -static char __buildInfo[] = "NewsqueakIA32ABIPlugin VMMaker.oscog-eem.1064 uuid: 9d9d2583-03e6-4b6b-9b24-51587933f8f3 " __DATE__ ; +static char __buildInfo[] = "NewsqueakIA32ABIPlugin VMMaker.oscog-eem.1072 uuid: bd9d8dd5-dea0-49da-8be7-cb246f49f554 " __DATE__ ; @@ -223,9 +223,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "IA32ABI VMMaker.oscog-eem.1064 (i)" + "IA32ABI VMMaker.oscog-eem.1072 (i)" #else - "IA32ABI VMMaker.oscog-eem.1064 (e)" + "IA32ABI VMMaker.oscog-eem.1072 (e)" #endif ; @@ -288,12 +288,9 @@ rcvr = stackValue(0); value = longAt((rcvr + BaseHeaderSize) + BytesPerOop); - if (BytesPerWord == 8) { - valueOop = positive64BitIntegerFor(value); - } - else { - valueOop = positive32BitIntegerFor(value); - } + valueOop = (BytesPerWord == 8 + ? positive64BitIntegerFor(value) + : positive32BitIntegerFor(value)); return methodReturnValue(valueOop); } @@ -707,9 +704,9 @@ || (((((usqInt)byteOffset)) + 8) <= (abs(dataSize))))) { return primitiveFailFor(PrimErrBadIndex); } - if ((((longAt(rcvr + BaseHeaderSize)) > 0 - ? (startAddr = (rcvr + BaseHeaderSize) + BytesPerOop) - : (startAddr = longAt((rcvr + BaseHeaderSize) + BytesPerOop)))) == 0) { + if (((startAddr = ((longAt(rcvr + BaseHeaderSize)) > 0 + ? (rcvr + BaseHeaderSize) + BytesPerOop + : longAt((rcvr + BaseHeaderSize) + BytesPerOop)))) == 0) { return primitiveFailFor(PrimErrBadReceiver); } addr = startAddr + byteOffset; @@ -755,9 +752,9 @@ if (isOopImmutable(rcvr)) { return primitiveFailFor(PrimErrNoModification); } - if ((((longAt(rcvr + BaseHeaderSize)) > 0 - ? (startAddr = (rcvr + BaseHeaderSize) + BytesPerOop) - : (startAddr = longAt((rcvr + BaseHeaderSize) + BytesPerOop)))) == 0) { + if (((startAddr = ((longAt(rcvr + BaseHeaderSize)) > 0 + ? (rcvr + BaseHeaderSize) + BytesPerOop + : longAt((rcvr + BaseHeaderSize) + BytesPerOop)))) == 0) { return primitiveFailFor(PrimErrBadReceiver); } addr = startAddr + byteOffset; @@ -796,9 +793,9 @@ || (((((usqInt)byteOffset)) + 4) <= (abs(dataSize))))) { return primitiveFailFor(PrimErrBadIndex); } - if ((((longAt(rcvr + BaseHeaderSize)) > 0 - ? (startAddr = (rcvr + BaseHeaderSize) + BytesPerOop) - : (startAddr = longAt((rcvr + BaseHeaderSize) + BytesPerOop)))) == 0) { + if (((startAddr = ((longAt(rcvr + BaseHeaderSize)) > 0 + ? (rcvr + BaseHeaderSize) + BytesPerOop + : longAt((rcvr + BaseHeaderSize) + BytesPerOop)))) == 0) { return primitiveFailFor(PrimErrBadReceiver); } addr = startAddr + byteOffset; @@ -844,9 +841,9 @@ if (isOopImmutable(rcvr)) { return primitiveFailFor(PrimErrNoModification); } - if ((((longAt(rcvr + BaseHeaderSize)) > 0 - ? (startAddr = (rcvr + BaseHeaderSize) + BytesPerOop) - : (startAddr = longAt((rcvr + BaseHeaderSize) + BytesPerOop)))) == 0) { + if (((startAddr = ((longAt(rcvr + BaseHeaderSize)) > 0 + ? (rcvr + BaseHeaderSize) + BytesPerOop + : longAt((rcvr + BaseHeaderSize) + BytesPerOop)))) == 0) { return primitiveFailFor(PrimErrBadReceiver); } addr = startAddr + byteOffset; @@ -1089,9 +1086,9 @@ || (((((usqInt)byteOffset)) + 1) <= (abs(dataSize))))) { return primitiveFailFor(PrimErrBadIndex); } - if ((((longAt(rcvr + BaseHeaderSize)) > 0 - ? (startAddr = (rcvr + BaseHeaderSize) + BytesPerOop) - : (startAddr = longAt((rcvr + BaseHeaderSize) + BytesPerOop)))) == 0) { + if (((startAddr = ((longAt(rcvr + BaseHeaderSize)) > 0 + ? (rcvr + BaseHeaderSize) + BytesPerOop + : longAt((rcvr + BaseHeaderSize) + BytesPerOop)))) == 0) { return primitiveFailFor(PrimErrBadReceiver); } addr = startAddr + byteOffset; @@ -1134,9 +1131,9 @@ if (isOopImmutable(rcvr)) { return primitiveFailFor(PrimErrNoModification); } - if ((((longAt(rcvr + BaseHeaderSize)) > 0 - ? (startAddr = (rcvr + BaseHeaderSize) + BytesPerOop) - : (startAddr = longAt((rcvr + BaseHeaderSize) + BytesPerOop)))) == 0) { + if (((startAddr = ((longAt(rcvr + BaseHeaderSize)) > 0 + ? (rcvr + BaseHeaderSize) + BytesPerOop + : longAt((rcvr + BaseHeaderSize) + BytesPerOop)))) == 0) { return primitiveFailFor(PrimErrBadReceiver); } addr = startAddr + byteOffset; @@ -1171,9 +1168,9 @@ || (((((usqInt)byteOffset)) + 4) <= (abs(dataSize))))) { return primitiveFailFor(PrimErrBadIndex); } - if ((((longAt(rcvr + BaseHeaderSize)) > 0 - ? (startAddr = (rcvr + BaseHeaderSize) + BytesPerOop) - : (startAddr = longAt((rcvr + BaseHeaderSize) + BytesPerOop)))) == 0) { + if (((startAddr = ((longAt(rcvr + BaseHeaderSize)) > 0 + ? (rcvr + BaseHeaderSize) + BytesPerOop @@ Diff output truncated at 50000 characters. @@

1 0

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

21 Feb '15

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.1072.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.1072 Author: eem Time: 20 February 2015, 7:30:18.738 pm UUID: bd9d8dd5-dea0-49da-8be7-cb246f49f554 Ancestors: VMMaker.oscog-eem.1071 Fix typing multiple assignments to a variable - promote the type to the largest integral type of all assignments (primitiveDecompressFromByteArray) - do /not/ promote a variable typed with an integral type to a floating point type (transformColor:) Provide size of short int. Fix weird regression for Objectmemory>>baseHeaderSize =============== Diff against VMMaker.oscog-eem.1071 =============== Item was changed: ----- Method: CCodeGenerator>>isActualType:compatibleWithFormalType: (in category 'inlining') ----- isActualType: actualTypeOrNil compatibleWithFormalType: formalTypeOrNil | actualType formalType | actualType := actualTypeOrNil ifNil: [#sqInt]. formalType := formalTypeOrNil ifNil: [#sqInt]. ((self isIntegralCType: actualType) and: [self isIntegralCType: formalType]) ifFalse: [^actualType = formalType + or: [formalType = #double and: [actualType = #float]]]. + "For now, insist that the signedness agrees. If the actual's type is unknown allow inlining. + A formal defaults to #sqInt. Allowing inlining an unsigned type within a sqInt formal is wrong; + snd for testing, it breaks e.g. the BitBltPlugin." - or: [formalType = 'double' and: [actualType = 'float']]]. - "For now, insist that the signedness agrees." ^(actualType first = $u) = (formalType first = $u) + or: [actualTypeOrNil isNil] ! - or: [actualTypeOrNil isNil] "a nil formal defaults to #sqInt"! Item was added: + ----- Method: CCodeGenerator>>mergeTypeOf:in:with: (in category 'type inference') ----- + mergeTypeOf: var in: aDictionary with: newType + "var is a variable that has been assigned an expression of type newType. + Either assign its type, if it is as yet untyped, or merge newType with its existing type. + N.B. We refuse to promote a variable that already has integral type to a floating point + type. The existing plugins depend on this; one can always use an explicit type in future." + | existingType mergedType | + existingType := self + extractTypeFor: var + fromDeclaration: (aDictionary at: var ifAbsentPut: [newType, ' ', var]). + existingType ~= newType ifTrue: + [((self isIntegralCType: existingType) + and: [self isFloatingPointCType: newType]) ifFalse: + [mergedType := self promoteArithmeticTypes: existingType and: newType. + aDictionary at: var put: mergedType, ' ', var]]! Item was added: + ----- Method: CCodeGenerator>>promoteArithmeticTypes:and: (in category 'type inference') ----- + promoteArithmeticTypes: firstType and: secondType + "Answer the return type for an arithmetic sendThis is so that the inliner can still + inline simple expressions. Deal with pointer arithmetic, floating point arithmetic + and promotion." + ((#(#double float) includes: firstType) + or: [#(#double float) includes: secondType]) ifTrue: + [^(firstType = #float and: [secondType = #float]) + ifTrue: [#float] + ifFalse: [#double]]. + "deal with unknowns, answering nil." + (firstType isNil or: [secondType isNil]) ifTrue: + [^nil]. + "deal with promotion; answer the longest type, defaulting to the recever if they're the same" + ^(self sizeOfIntegralCType: firstType) >= (self sizeOfIntegralCType: secondType) + ifTrue: [firstType] + ifFalse: [secondType]! Item was changed: ----- Method: CCodeGenerator>>sizeOfIntegralCType: (in category 'inlining') ----- sizeOfIntegralCType: anIntegralCType "<String>" "N.B. Only works for values for which isIntegralCType: answers true." | prunedCType index | (anIntegralCType beginsWith: 'register ') ifTrue: [^self sizeOfIntegralCType: (anIntegralCType allButFirst: 9)]. prunedCType := (anIntegralCType beginsWith: 'unsigned ') ifTrue: [(anIntegralCType allButFirst: 9) withBlanksTrimmed] ifFalse: [(anIntegralCType beginsWith: 'signed ') ifTrue: [(anIntegralCType allButFirst: 7) withBlanksTrimmed] ifFalse: [anIntegralCType]]. ^prunedCType asString caseOf: { ['sqLong'] -> [8]. ['usqLong'] -> [8]. ['sqInt'] -> [BytesPerWord]. ['usqInt'] -> [BytesPerWord]. ['int'] -> [4]. ['short'] -> [2]. + ['short int'] -> [2]. ['char'] -> [1]. ['long'] -> [BytesPerWord]. ['size_t'] -> [BytesPerWord]. ['pid_t'] -> [BytesPerWord]. } otherwise: [((anIntegralCType beginsWith: 'unsigned') "e.g. 'unsigned : 8'" and: [(anIntegralCType includesAnyOf: '[*]') not and: [(index := anIntegralCType indexOf: $:) > 0]]) ifTrue: [(Integer readFrom: (anIntegralCType copyFrom: index + 1 to: anIntegralCType size) withBlanksTrimmed readStream) + 7 // 8] ifFalse: [self error: 'unrecognized integral type']]! Item was changed: ----- Method: CCodeGenerator>>typeForArithmetic:in: (in category 'type inference') ----- typeForArithmetic: sendNode in: aTMethod "Answer the return type for an arithmetic sendThis is so that the inliner can still inline simple expressions. Deal with pointer arithmetic, floating point arithmetic and promotion." | rcvrType argType | - argType := self typeFor: sendNode args first in: aTMethod. - argType = #double ifTrue: - [^#double]. rcvrType := self typeFor: sendNode receiver in: aTMethod. + argType := self typeFor: sendNode args first in: aTMethod. - "deal with unknowns, answering nil." - (rcvrType isNil or: [argType isNil]) ifTrue: - [^nil]. "deal with pointer arithmetic" + ((rcvrType notNil and: [rcvrType last = $*]) or: [argType notNil and: [argType last = $*]]) ifTrue: + [(rcvrType isNil or: [argType isNil]) ifTrue: + [^nil]. + (rcvrType last = $* and: [argType last = $*]) ifTrue: + [sendNode selector == #- ifTrue: + [^#int]. + self error: 'invalid pointer arithmetic']. + ^rcvrType last = $* - (rcvrType last = $* or: [argType last = $*]) ifTrue: - [(sendNode selector == #- - and: [rcvrType last = $* and: [argType last = $*]]) ifTrue: - [^#int]. - ^rcvrType last = $ ifTrue: [rcvrType] ifFalse: [argType]]. + ^self promoteArithmeticTypes: rcvrType and: argType! - "deal with promotion; answer the longest type, defaulting to the recever if they're the same" - ^(self sizeOfIntegralCType: rcvrType) >= (self sizeOfIntegralCType: argType) - ifTrue: [rcvrType] - ifFalse: [argType]! Item was changed: ----- Method: ObjectMemory>>baseHeaderSize (in category 'interpreter access') ----- baseHeaderSize + "N.B. This would appear to hard-code the header size for 32-bit images. But if generating + a 64-bit image, this method could be removed and the relevant one substituted. We can't + mark this method as <doNotGenerate> as we need an actual method to guide code gen." + ^4! - "To support SmartSyntaxPluginCodeGenerator" - ^self baseHeaderSize! Item was changed: ----- Method: TMethod>>inferTypesForImplicitlyTypedVariablesIn: (in category 'type inference') ----- inferTypesForImplicitlyTypedVariablesIn: aCodeGen "infer types for untyped variables from assignments and arithmetic uses. For debugging answer a Dictionary from var to the nodes that determined types This for debugging: (self copy inferTypesForImplicitlyTypedVariablesIn: aCodeGen)" | alreadyExplicitlyTyped effectiveNodes | + "selector = #transformColor: ifTrue: - "selector = #blockDispatchTargetsFor:perform:arg: ifTrue: [self halt]." alreadyExplicitlyTyped := declarations keys asSet. effectiveNodes := Dictionary new. "this for debugging" parseTree nodesDo: [:node| | type var | "If there is something of the form i >= 0, then i should be signed, not unsigned." (node isSend and: [(locals includes: (var := node receiver variableNameOrNil)) and: [(alreadyExplicitlyTyped includes: var) not "don't be fooled by inferred unsigned types" and: [(#(<= < >= >) includes: node selector) and: [node args first isConstant and: [node args first value = 0 and: [(type := self typeFor: var in: aCodeGen) notNil and: [type first == $u]]]]]]]) ifTrue: [declarations at: var put: (aCodeGen signedTypeForIntegralType: type), ' ', var. effectiveNodes at: var put: { declarations at: var. node }]. "if an assignment to an untyped local of a known type, set the local's type to that type. Only observe known sends (methods in the current set) and typed local variables." (node isAssignment and: [(locals includes: (var := node variable name)) + and: [(alreadyExplicitlyTyped includes: var) not "don't be fooled by previously inferred types" - and: [(declarations includesKey: var) not and: [(type := node expression isSend ifTrue: [aCodeGen returnTypeForSend: node expression in: self] ifFalse: [self typeFor: node expression in: aCodeGen]) notNil and: [type ~= #void]]]]) ifTrue: + [aCodeGen mergeTypeOf: var in: declarations with: type. + effectiveNodes at: var put: { declarations at: var. node }, (effectiveNodes at: var ifAbsent: [#()])]]. - [declarations at: var put: type, ' ', var. - effectiveNodes at: var put: { declarations at: var. node }]]. ^effectiveNodes!

1 0

[commit][3259] Merge from oscog:
by commits＠squeakvm.org 21 Feb '15

21 Feb '15

Revision: 3259 Author: lewis Date: 2015-02-20 17:44:49 -0800 (Fri, 20 Feb 2015) Log Message: ----------- Merge from oscog: Author: rowledge Date: 2015-02-20 17:23:27 -0800 (Fri, 20 Feb 2015) Log Message: ----------- open the number of buffers provided by the xioctl( cam, VIDIOC_REQBUFS call, save the number in the cam struct and use it +when closing the camera connection. Makes things work cleanly on Raspberry Pi Modified Paths: -------------- branches/Cog/platforms/unix/plugins/CameraPlugin/sqCamera-linux.c Modified Paths: -------------- trunk/platforms/unix/plugins/CameraPlugin/sqCamera-linux.c Modified: trunk/platforms/unix/plugins/CameraPlugin/sqCamera-linux.c =================================================================== --- trunk/platforms/unix/plugins/CameraPlugin/sqCamera-linux.c 2015-02-21 01:23:27 UTC (rev 3258) +++ trunk/platforms/unix/plugins/CameraPlugin/sqCamera-linux.c 2015-02-21 01:44:49 UTC (rev 3259) @@ -585,8 +585,11 @@ if (!(cam->buffers = calloc (req.count, sizeof (struct buffer)))) return false; + /* we have at least as many buffers as requested; save that actual number for uninit_map later */ + cam->nBuffers = req.count; + vBufReset(bufPtr); - for (bufPtr->index = 0; bufPtr->index < req.count; bufPtr->index++) { + for (bufPtr->index = 0; bufPtr->index < /* req.count */ cam->nBuffers; bufPtr->index++) { if (!xioctl(cam, VIDIOC_QUERYBUF, bufPtr)) return false;

1 0

[commit][3258] open the number of buffers provided by the xioctl( cam, VIDIOC_REQBUFS call, save the number in the cam struct and use it when closing the camera connection .
by commits＠squeakvm.org 21 Feb '15

21 Feb '15

Revision: 3258 Author: rowledge Date: 2015-02-20 17:23:27 -0800 (Fri, 20 Feb 2015) Log Message: ----------- open the number of buffers provided by the xioctl( cam, VIDIOC_REQBUFS call, save the number in the cam struct and use it when closing the camera connection. Makes things work cleanly on Raspberry Pi Modified Paths: -------------- branches/Cog/platforms/unix/plugins/CameraPlugin/sqCamera-linux.c Modified: branches/Cog/platforms/unix/plugins/CameraPlugin/sqCamera-linux.c =================================================================== --- branches/Cog/platforms/unix/plugins/CameraPlugin/sqCamera-linux.c 2015-02-18 00:00:19 UTC (rev 3257) +++ branches/Cog/platforms/unix/plugins/CameraPlugin/sqCamera-linux.c 2015-02-21 01:23:27 UTC (rev 3258) @@ -585,8 +585,11 @@ if (!(cam->buffers = calloc (req.count, sizeof (struct buffer)))) return false; + /* we have at least as many buffers as requested; save that actual number for uninit_map later */ + cam->nBuffers = req.count; + vBufReset(bufPtr); - for (bufPtr->index = 0; bufPtr->index < req.count; bufPtr->index++) { + for (bufPtr->index = 0; bufPtr->index < /* req.count */ cam->nBuffers; bufPtr->index++) { if (!xioctl(cam, VIDIOC_QUERYBUF, bufPtr)) return false;

1 0

why is my spur image taking up so much memory?
by Chris Muller 20 Feb '15

20 Feb '15

I did a SpaceTally new systemWideSpaceTally explore and, inside that (self inject: 0 into: [ : sum : each | sum + each spaceForInstances]) asBytesDescription "===> 152M" And yet, (Smalltalk vmParameterAt: 3) asBytesDescription "===> 677M" Ubuntu's "System Monitor" shows it taking "306.8 MiB" which is how big the file is on disk. So, its either 152MB, 677M, or 306M depending on who you ask. I was trying to get my image size cut down, I've never had this problem before -- where the SpaceTally reports total objects reports only a fraction compared to the actual consumption of the image...

3 2

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

Vm-dev February 2015