Vm-dev April 2014

vm-dev@lists.squeakfoundation.org

39 participants
112 discussions

Re: Pharo VM bug 11130
by Stephan Eggermont 12 Apr '14

12 Apr '14

Nicolas wrote >YES, I use fogbugz, and I starred this issue. >But for some reason, the only things I regularly see coming in my inbox are those automated Monkey editions. >Either I mechanically removed a human edition in a flow of monkeys, or I did not receive anything human… Known issue with Fogbugz, I’m afraid. Monkey has a separate flow. To get notified of non-monkey changes, you need to add yourself to the subscriber list. I added you to the list. Stephan p.s. Eliot, you are not subscribed

1 0

ARMJit work started
by stephane ducasse 12 Apr '14

12 Apr '14

Hi all just to let you know that max mattone payed by our team is starting to work on an ARMjit to complement ASMJit. We asked him to post to this mailing-list. Stef

2 1

[commit][2893] CogVM source as per VMMaker.oscog-eem.673
by commits＠squeakvm.org 11 Apr '14

11 Apr '14

Revision: 2893 Author: eliot Date: 2014-04-11 12:55:48 -0700 (Fri, 11 Apr 2014) Log Message: ----------- CogVM source as per VMMaker.oscog-eem.673 Sista: We cannot back-up the machine-code pc in ceCounterTripped: because there isn't always a send preceeding the jump (e.g. in and: [] and or: [] chains). Instead, prevent subsequent counter trips (to reduce the number of necessary skipBackBeforeJump sends in the image) by nilling out SelectorCounterTripped. The image-level optimization code will both restore the selector and back-up the pc. Modified Paths: -------------- branches/Cog/sistasrc/vm/cogit.c branches/Cog/sistasrc/vm/cogit.h branches/Cog/sistasrc/vm/cogmethod.h branches/Cog/sistasrc/vm/cointerp.c branches/Cog/sistasrc/vm/cointerp.h branches/Cog/sistasrc/vm/gcc3x-cointerp.c branches/Cog/sistasrc/vm/interp.h branches/Cog/sistasrc/vm/vmCallback.h branches/Cog/spursistasrc/vm/cogit.c branches/Cog/spursistasrc/vm/cogit.h branches/Cog/spursistasrc/vm/cogmethod.h branches/Cog/spursistasrc/vm/cointerp.c branches/Cog/spursistasrc/vm/cointerp.h branches/Cog/spursistasrc/vm/gcc3x-cointerp.c branches/Cog/spursistasrc/vm/interp.h branches/Cog/spursistasrc/vm/vmCallback.h Property Changed: ---------------- branches/Cog/platforms/Cross/vm/sqSCCSVersion.h Property changes on: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h ___________________________________________________________________ Modified: checkindate - Fri Apr 11 11:49:37 PDT 2014 + Fri Apr 11 12:54:42 PDT 2014 Modified: branches/Cog/sistasrc/vm/cogit.c =================================================================== --- branches/Cog/sistasrc/vm/cogit.c 2014-04-11 18:50:26 UTC (rev 2892) +++ branches/Cog/sistasrc/vm/cogit.c 2014-04-11 19:55:48 UTC (rev 2893) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.671 uuid: 49fb678b-0fe3-42cf-a276-c617f429951d + CCodeGenerator VMMaker.oscog-eem.673 uuid: a10ccba5-8338-4cc4-ae49-a11440780603 from - SistaStackToRegisterMappingCogit VMMaker.oscog-eem.671 uuid: 49fb678b-0fe3-42cf-a276-c617f429951d + SistaStackToRegisterMappingCogit VMMaker.oscog-eem.673 uuid: a10ccba5-8338-4cc4-ae49-a11440780603 */ -static char __buildInfo[] = "SistaStackToRegisterMappingCogit VMMaker.oscog-eem.671 uuid: 49fb678b-0fe3-42cf-a276-c617f429951d " __DATE__ ; +static char __buildInfo[] = "SistaStackToRegisterMappingCogit VMMaker.oscog-eem.673 uuid: a10ccba5-8338-4cc4-ae49-a11440780603 " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -12041,15 +12041,15 @@ ssFlushTo(simStackPtr - 1); desc = ssTop(); ssPop(1); - /* begin Label */ - retry = genoperandoperand(Label, (labelCounter += 1), bytecodePC); popToReg(desc, TempReg); ssAllocateRequiredReg(SendNumArgsReg); counter = (&(counters[counterIndex])); counterIndex += 1; flag("will need to use MoveAw32:R: if 64 bits"); assert(BytesPerWord == CounterBytes); - addDependent(counter, annotateAbsolutePCRef(gMoveAwR(((usqInt)counter), SendNumArgsReg))); + /* begin MoveAw:R: */ + retry = genoperandoperand(MoveAwR, ((usqInt)counter), SendNumArgsReg); + addDependent(counter, annotateAbsolutePCRef(retry)); /* begin SubCq:R: */ genoperandoperand(SubCqR, 65536, SendNumArgsReg); /* begin JumpCarry: */ @@ -12339,10 +12339,10 @@ /* begin JumpZero: */ jumpMBB = genoperand(JumpZero, ((sqInt)0)); compileTrampolineForcallJumpBarnumArgsargargargargsaveRegsresultReg(ceCounterTripped, 1, 1, TempReg, null, null, null, 0, null); - if ((cResultRegister(backEnd)) != ReceiverResultReg) { + if ((cResultRegister(backEnd)) != TempReg) { /* begin MoveR:R: */ reg1 = cResultRegister(backEnd); - genoperandoperand(MoveRR, reg1, ReceiverResultReg); + genoperandoperand(MoveRR, reg1, TempReg); } assert(!(shouldAnnotateObjectReference(boolean))); jmpTarget(jumpMBB, gAddCqR(boolean, TempReg)); Modified: branches/Cog/sistasrc/vm/cogit.h =================================================================== --- branches/Cog/sistasrc/vm/cogit.h 2014-04-11 18:50:26 UTC (rev 2892) +++ branches/Cog/sistasrc/vm/cogit.h 2014-04-11 19:55:48 UTC (rev 2893) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.671 uuid: 49fb678b-0fe3-42cf-a276-c617f429951d + CCodeGenerator VMMaker.oscog-eem.673 uuid: a10ccba5-8338-4cc4-ae49-a11440780603 */ Modified: branches/Cog/sistasrc/vm/cogmethod.h =================================================================== --- branches/Cog/sistasrc/vm/cogmethod.h 2014-04-11 18:50:26 UTC (rev 2892) +++ branches/Cog/sistasrc/vm/cogmethod.h 2014-04-11 19:55:48 UTC (rev 2893) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.671 uuid: 49fb678b-0fe3-42cf-a276-c617f429951d + CCodeGenerator VMMaker.oscog-eem.673 uuid: a10ccba5-8338-4cc4-ae49-a11440780603 */ typedef struct { Modified: branches/Cog/sistasrc/vm/cointerp.c =================================================================== --- branches/Cog/sistasrc/vm/cointerp.c 2014-04-11 18:50:26 UTC (rev 2892) +++ branches/Cog/sistasrc/vm/cointerp.c 2014-04-11 19:55:48 UTC (rev 2893) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.672 uuid: 21493732-2e31-4b57-a8ae-aa6e6a9e4c3c + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.673 uuid: a10ccba5-8338-4cc4-ae49-a11440780603 from - CoInterpreter VMMaker.oscog-eem.672 uuid: 21493732-2e31-4b57-a8ae-aa6e6a9e4c3c + CoInterpreter VMMaker.oscog-eem.673 uuid: a10ccba5-8338-4cc4-ae49-a11440780603 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.672 uuid: 21493732-2e31-4b57-a8ae-aa6e6a9e4c3c " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.673 uuid: a10ccba5-8338-4cc4-ae49-a11440780603 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2039,7 +2039,7 @@ /* 574 */ (void (*)(void))0, /* 575 */ (void (*)(void))0, 0 }; -const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.672]"; +const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.673]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; @@ -11261,12 +11261,17 @@ /* Two things are going on here. The main one is catching a counter trip and - attempting to send the SelectorCounterTripped selector. In this case, if - the send can be made, the - pc should be backed up to the return address of the send that yields the - boolean to be - tested, so that after potential optimization, computation proceeds by - retryying the jump. + attempting to send the SelectorCounterTripped selector. In this case we + would like to back-up + the pc to the return address of the send that + yields the boolean to be tested, so that + after potential optimization, computation proceeds by retrying the jump. + But we cannot, + since there may be no send, just a pop (as in and: [] and or: [] chains). + In this case we also + want to prevent further callbacks until optimization is complete. So we + nil-out the + SelectorCounterTripped entry in the specialSelectorArray. The minor case is that there is an unlikely possibility that the cointer tripped but condition @@ -11286,14 +11291,15 @@ char *sp11; char *sp2; sqInt top; + sqInt top1; if (!((condition == GIV(falseObj)) || (condition == GIV(trueObj)))) { /* begin ceSendMustBeBoolean: */ /* begin popStack */ - top = longAt(GIV(stackPointer)); + top1 = longAt(GIV(stackPointer)); GIV(stackPointer) += BytesPerWord; - GIV(instructionPointer) = ((sqInt) top); + GIV(instructionPointer) = ((sqInt) top1); /* begin push: */ longAtput((sp2 = GIV(stackPointer) - BytesPerWord), condition); GIV(stackPointer) = sp2; @@ -11323,7 +11329,16 @@ resetCountersIn(mframeHomeMethod(GIV(framePointer))); return condition; } - GIV(instructionPointer) = getJumpTargetPCAt(popStack()); + /* begin splObj:put: */ + /* begin storePointer:ofObject:withValue: */ + if ((((usqInt) GIV(specialObjectsOop))) < (((usqInt) GIV(youngStart)))) { + possibleRootStoreIntovalue(GIV(specialObjectsOop), GIV(nilObj)); + } + longAtput((GIV(specialObjectsOop) + BaseHeaderSize) + (SelectorCounterTripped << ShiftForWord), GIV(nilObj)); + /* begin popStack */ + top = longAt(GIV(stackPointer)); + GIV(stackPointer) += BytesPerWord; + GIV(instructionPointer) = ((sqInt) top); /* begin ensureFrameIsMarried:SP: */ if (((((usqInt)(longAt(GIV(framePointer) + FoxMethod)))) < (startOfMemory()) ? ((longAt(GIV(framePointer) + FoxMethod)) & MFMethodFlagHasContextFlag) != 0 Modified: branches/Cog/sistasrc/vm/cointerp.h =================================================================== --- branches/Cog/sistasrc/vm/cointerp.h 2014-04-11 18:50:26 UTC (rev 2892) +++ branches/Cog/sistasrc/vm/cointerp.h 2014-04-11 19:55:48 UTC (rev 2893) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.672 uuid: 21493732-2e31-4b57-a8ae-aa6e6a9e4c3c + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.673 uuid: a10ccba5-8338-4cc4-ae49-a11440780603 */ Modified: branches/Cog/sistasrc/vm/gcc3x-cointerp.c =================================================================== --- branches/Cog/sistasrc/vm/gcc3x-cointerp.c 2014-04-11 18:50:26 UTC (rev 2892) +++ branches/Cog/sistasrc/vm/gcc3x-cointerp.c 2014-04-11 19:55:48 UTC (rev 2893) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.672 uuid: 21493732-2e31-4b57-a8ae-aa6e6a9e4c3c + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.673 uuid: a10ccba5-8338-4cc4-ae49-a11440780603 from - CoInterpreter VMMaker.oscog-eem.672 uuid: 21493732-2e31-4b57-a8ae-aa6e6a9e4c3c + CoInterpreter VMMaker.oscog-eem.673 uuid: a10ccba5-8338-4cc4-ae49-a11440780603 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.672 uuid: 21493732-2e31-4b57-a8ae-aa6e6a9e4c3c " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.673 uuid: a10ccba5-8338-4cc4-ae49-a11440780603 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2042,7 +2042,7 @@ /* 574 */ (void (*)(void))0, /* 575 */ (void (*)(void))0, 0 }; -const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.672]"; +const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.673]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; @@ -11270,12 +11270,17 @@ /* Two things are going on here. The main one is catching a counter trip and - attempting to send the SelectorCounterTripped selector. In this case, if - the send can be made, the - pc should be backed up to the return address of the send that yields the - boolean to be - tested, so that after potential optimization, computation proceeds by - retryying the jump. + attempting to send the SelectorCounterTripped selector. In this case we + would like to back-up + the pc to the return address of the send that + yields the boolean to be tested, so that + after potential optimization, computation proceeds by retrying the jump. + But we cannot, + since there may be no send, just a pop (as in and: [] and or: [] chains). + In this case we also + want to prevent further callbacks until optimization is complete. So we + nil-out the + SelectorCounterTripped entry in the specialSelectorArray. The minor case is that there is an unlikely possibility that the cointer tripped but condition @@ -11295,14 +11300,15 @@ char *sp11; char *sp2; sqInt top; + sqInt top1; if (!((condition == GIV(falseObj)) || (condition == GIV(trueObj)))) { /* begin ceSendMustBeBoolean: */ /* begin popStack */ - top = longAt(GIV(stackPointer)); + top1 = longAt(GIV(stackPointer)); GIV(stackPointer) += BytesPerWord; - GIV(instructionPointer) = ((sqInt) top); + GIV(instructionPointer) = ((sqInt) top1); /* begin push: */ longAtput((sp2 = GIV(stackPointer) - BytesPerWord), condition); GIV(stackPointer) = sp2; @@ -11332,7 +11338,16 @@ resetCountersIn(mframeHomeMethod(GIV(framePointer))); return condition; } - GIV(instructionPointer) = getJumpTargetPCAt(popStack()); + /* begin splObj:put: */ + /* begin storePointer:ofObject:withValue: */ + if ((((usqInt) GIV(specialObjectsOop))) < (((usqInt) GIV(youngStart)))) { + possibleRootStoreIntovalue(GIV(specialObjectsOop), GIV(nilObj)); + } + longAtput((GIV(specialObjectsOop) + BaseHeaderSize) + (SelectorCounterTripped << ShiftForWord), GIV(nilObj)); + /* begin popStack */ + top = longAt(GIV(stackPointer)); + GIV(stackPointer) += BytesPerWord; + GIV(instructionPointer) = ((sqInt) top); /* begin ensureFrameIsMarried:SP: */ if (((((usqInt)(longAt(GIV(framePointer) + FoxMethod)))) < (startOfMemory()) ? ((longAt(GIV(framePointer) + FoxMethod)) & MFMethodFlagHasContextFlag) != 0 Modified: branches/Cog/sistasrc/vm/interp.h =================================================================== --- branches/Cog/sistasrc/vm/interp.h 2014-04-11 18:50:26 UTC (rev 2892) +++ branches/Cog/sistasrc/vm/interp.h 2014-04-11 19:55:48 UTC (rev 2893) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.672 uuid: 21493732-2e31-4b57-a8ae-aa6e6a9e4c3c + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.673 uuid: a10ccba5-8338-4cc4-ae49-a11440780603 */ #define VM_PROXY_MAJOR 1 Modified: branches/Cog/sistasrc/vm/vmCallback.h =================================================================== --- branches/Cog/sistasrc/vm/vmCallback.h 2014-04-11 18:50:26 UTC (rev 2892) +++ branches/Cog/sistasrc/vm/vmCallback.h 2014-04-11 19:55:48 UTC (rev 2893) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.672 uuid: 21493732-2e31-4b57-a8ae-aa6e6a9e4c3c + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.673 uuid: a10ccba5-8338-4cc4-ae49-a11440780603 */ #define VM_CALLBACK_INC 1 Modified: branches/Cog/spursistasrc/vm/cogit.c =================================================================== --- branches/Cog/spursistasrc/vm/cogit.c 2014-04-11 18:50:26 UTC (rev 2892) +++ branches/Cog/spursistasrc/vm/cogit.c 2014-04-11 19:55:48 UTC (rev 2893) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.671 uuid: 49fb678b-0fe3-42cf-a276-c617f429951d + CCodeGenerator VMMaker.oscog-eem.673 uuid: a10ccba5-8338-4cc4-ae49-a11440780603 from - SistaStackToRegisterMappingCogit VMMaker.oscog-eem.671 uuid: 49fb678b-0fe3-42cf-a276-c617f429951d + SistaStackToRegisterMappingCogit VMMaker.oscog-eem.673 uuid: a10ccba5-8338-4cc4-ae49-a11440780603 */ -static char __buildInfo[] = "SistaStackToRegisterMappingCogit VMMaker.oscog-eem.671 uuid: 49fb678b-0fe3-42cf-a276-c617f429951d " __DATE__ ; +static char __buildInfo[] = "SistaStackToRegisterMappingCogit VMMaker.oscog-eem.673 uuid: a10ccba5-8338-4cc4-ae49-a11440780603 " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -12889,15 +12889,15 @@ ssFlushTo(simStackPtr - 1); desc = ssTop(); ssPop(1); - /* begin Label */ - retry = genoperandoperand(Label, (labelCounter += 1), bytecodePC); popToReg(desc, TempReg); ssAllocateRequiredReg(SendNumArgsReg); counter = (&(counters[counterIndex])); counterIndex += 1; flag("will need to use MoveAw32:R: if 64 bits"); assert(BytesPerWord == CounterBytes); - addDependent(counter, annotateAbsolutePCRef(gMoveAwR(((usqInt)counter), SendNumArgsReg))); + /* begin MoveAw:R: */ + retry = genoperandoperand(MoveAwR, ((usqInt)counter), SendNumArgsReg); + addDependent(counter, annotateAbsolutePCRef(retry)); /* begin SubCq:R: */ genoperandoperand(SubCqR, 65536, SendNumArgsReg); /* begin JumpCarry: */ @@ -13212,10 +13212,10 @@ /* begin JumpZero: */ jumpMBB = genoperand(JumpZero, ((sqInt)0)); compileTrampolineForcallJumpBarnumArgsargargargargsaveRegsresultReg(ceCounterTripped, 1, 1, TempReg, null, null, null, 0, null); - if ((cResultRegister(backEnd)) != ReceiverResultReg) { + if ((cResultRegister(backEnd)) != TempReg) { /* begin MoveR:R: */ reg1 = cResultRegister(backEnd); - genoperandoperand(MoveRR, reg1, ReceiverResultReg); + genoperandoperand(MoveRR, reg1, TempReg); } assert(!(shouldAnnotateObjectReference(boolean))); jmpTarget(jumpMBB, gAddCqR(boolean, TempReg)); Modified: branches/Cog/spursistasrc/vm/cogit.h =================================================================== --- branches/Cog/spursistasrc/vm/cogit.h 2014-04-11 18:50:26 UTC (rev 2892) +++ branches/Cog/spursistasrc/vm/cogit.h 2014-04-11 19:55:48 UTC (rev 2893) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.671 uuid: 49fb678b-0fe3-42cf-a276-c617f429951d + CCodeGenerator VMMaker.oscog-eem.673 uuid: a10ccba5-8338-4cc4-ae49-a11440780603 */ Modified: branches/Cog/spursistasrc/vm/cogmethod.h =================================================================== --- branches/Cog/spursistasrc/vm/cogmethod.h 2014-04-11 18:50:26 UTC (rev 2892) +++ branches/Cog/spursistasrc/vm/cogmethod.h 2014-04-11 19:55:48 UTC (rev 2893) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.671 uuid: 49fb678b-0fe3-42cf-a276-c617f429951d + CCodeGenerator VMMaker.oscog-eem.673 uuid: a10ccba5-8338-4cc4-ae49-a11440780603 */ typedef struct { Modified: branches/Cog/spursistasrc/vm/cointerp.c =================================================================== --- branches/Cog/spursistasrc/vm/cointerp.c 2014-04-11 18:50:26 UTC (rev 2892) +++ branches/Cog/spursistasrc/vm/cointerp.c 2014-04-11 19:55:48 UTC (rev 2893) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.672 uuid: 21493732-2e31-4b57-a8ae-aa6e6a9e4c3c + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.673 uuid: a10ccba5-8338-4cc4-ae49-a11440780603 from - CoInterpreter VMMaker.oscog-eem.672 uuid: 21493732-2e31-4b57-a8ae-aa6e6a9e4c3c + CoInterpreter VMMaker.oscog-eem.673 uuid: a10ccba5-8338-4cc4-ae49-a11440780603 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.672 uuid: 21493732-2e31-4b57-a8ae-aa6e6a9e4c3c " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.673 uuid: a10ccba5-8338-4cc4-ae49-a11440780603 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -1299,7 +1299,7 @@ static void setSignalLowSpaceFlagAndSaveProcess(void); static void setTraceFlagOnContextsFramesPageIfNeeded(sqInt aContext); sqInt shiftForWord(void); -static usqLong shortentoIndexableSize(sqInt objOop, sqInt indexableSize); +static sqInt shortentoIndexableSize(sqInt objOop, sqInt indexableSize); static sqInt shortPrintContext(sqInt aContext); static sqInt shortPrintFrameAndCallers(char *theFP); EXPORT(void) shortPrintFramesInPage(StackPage *thePage); @@ -2196,7 +2196,7 @@ /* 574 */ (void (*)(void))0, /* 575 */ (void (*)(void))0, 0 }; -const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.672]"; +const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.673]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; @@ -5386,6 +5386,7 @@ GIV(framePointer) = localFP; ceEnterCogCodePopReceiverReg(); + null; goto l148; } localIP = pointerForOop(longAt(localFP + FoxIFSavedIP)); @@ -5400,7 +5401,7 @@ /* begin fetchNextBytecode */ currentBytecode = byteAtPointer(++localIP); - /* return self */ + null; l148: /* end baseFrameReturn */; goto l145; } @@ -14010,12 +14011,17 @@ /* Two things are going on here. The main one is catching a counter trip and - attempting to send the SelectorCounterTripped selector. In this case, if - the send can be made, the - pc should be backed up to the return address of the send that yields the - boolean to be - tested, so that after potential optimization, computation proceeds by - retryying the jump. + attempting to send the SelectorCounterTripped selector. In this case we + would like to back-up + the pc to the return address of the send that + yields the boolean to be tested, so that + after potential optimization, computation proceeds by retrying the jump. + But we cannot, + since there may be no send, just a pop (as in and: [] and or: [] chains). + In this case we also + want to prevent further callbacks until optimization is complete. So we + nil-out the + SelectorCounterTripped entry in the specialSelectorArray. The minor case is that there is an unlikely possibility that the cointer tripped but condition @@ -14036,14 +14042,15 @@ char *sp2; char *theSP; sqInt top; + sqInt top1; if (!((condition == GIV(falseObj)) || (condition == GIV(trueObj)))) { /* begin ceSendMustBeBoolean: */ /* begin popStack */ - top = longAt(GIV(stackPointer)); + top1 = longAt(GIV(stackPointer)); GIV(stackPointer) += BytesPerWord; - GIV(instructionPointer) = ((sqInt) top); + GIV(instructionPointer) = ((sqInt) top1); /* begin push: */ longAtput((sp2 = GIV(stackPointer) - BytesPerWord), condition); GIV(stackPointer) = sp2; @@ -14073,7 +14080,29 @@ resetCountersIn(mframeHomeMethod(GIV(framePointer))); return condition; } - GIV(instructionPointer) = getJumpTargetPCAt(popStack()); + /* begin splObj:put: */ + /* begin storePointer:ofObject:withValue: */ + assert(!(isForwarded(GIV(specialObjectsOop)))); + if (isOldObject(GIV(specialObjectsOop))) { + + /* most stores into young objects */ + + if (((GIV(nilObj) & 3) == 0) + && ((((usqInt) GIV(nilObj))) < (((usqInt) GIV(newSpaceLimit))))) { + /* begin possibleRootStoreInto: */ + if (!(((((usqInt) (longAt(GIV(specialObjectsOop)))) >> 29) & 1) != 0)) { + remember(GIV(specialObjectsOop)); + /* begin setIsRememberedOf:to: */ + flag("endianness"); + longAtput(GIV(specialObjectsOop), (longAt(GIV(specialObjectsOop))) | (1 << 29)); + } + } + } + longAtput((GIV(specialObjectsOop) + (BaseHeaderSize)) + (SelectorCounterTripped << 2), GIV(nilObj)); + /* begin popStack */ + top = longAt(GIV(stackPointer)); + GIV(stackPointer) += BytesPerWord; + GIV(instructionPointer) = ((sqInt) top); /* begin ensureFrameIsMarried:SP: */ theSP = GIV(stackPointer); if (((((usqInt)(longAt(GIV(framePointer) + FoxMethod)))) < (startOfMemory()) @@ -57147,7 +57176,7 @@ zero if no change was possible. */ -static usqLong +static sqInt shortentoIndexableSize(sqInt objOop, sqInt indexableSize) { usqLong bytesAfter; Modified: branches/Cog/spursistasrc/vm/cointerp.h =================================================================== --- branches/Cog/spursistasrc/vm/cointerp.h 2014-04-11 18:50:26 UTC (rev 2892) +++ branches/Cog/spursistasrc/vm/cointerp.h 2014-04-11 19:55:48 UTC (rev 2893) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.672 uuid: 21493732-2e31-4b57-a8ae-aa6e6a9e4c3c + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.673 uuid: a10ccba5-8338-4cc4-ae49-a11440780603 */ Modified: branches/Cog/spursistasrc/vm/gcc3x-cointerp.c =================================================================== --- branches/Cog/spursistasrc/vm/gcc3x-cointerp.c 2014-04-11 18:50:26 UTC (rev 2892) +++ branches/Cog/spursistasrc/vm/gcc3x-cointerp.c 2014-04-11 19:55:48 UTC (rev 2893) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.672 uuid: 21493732-2e31-4b57-a8ae-aa6e6a9e4c3c + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.673 uuid: a10ccba5-8338-4cc4-ae49-a11440780603 from - CoInterpreter VMMaker.oscog-eem.672 uuid: 21493732-2e31-4b57-a8ae-aa6e6a9e4c3c + CoInterpreter VMMaker.oscog-eem.673 uuid: a10ccba5-8338-4cc4-ae49-a11440780603 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.672 uuid: 21493732-2e31-4b57-a8ae-aa6e6a9e4c3c " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.673 uuid: a10ccba5-8338-4cc4-ae49-a11440780603 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -1302,7 +1302,7 @@ static void setSignalLowSpaceFlagAndSaveProcess(void); static void setTraceFlagOnContextsFramesPageIfNeeded(sqInt aContext); sqInt shiftForWord(void); -static usqLong shortentoIndexableSize(sqInt objOop, sqInt indexableSize); +static sqInt shortentoIndexableSize(sqInt objOop, sqInt indexableSize); static sqInt shortPrintContext(sqInt aContext); static sqInt shortPrintFrameAndCallers(char *theFP); EXPORT(void) shortPrintFramesInPage(StackPage *thePage); @@ -2199,7 +2199,7 @@ /* 574 */ (void (*)(void))0, /* 575 */ (void (*)(void))0, 0 }; -const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.672]"; +const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.673]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; @@ -5395,6 +5395,7 @@ GIV(framePointer) = localFP; ceEnterCogCodePopReceiverReg(); + null; goto l148; } localIP = pointerForOop(longAt(localFP + FoxIFSavedIP)); @@ -5409,7 +5410,7 @@ /* begin fetchNextBytecode */ currentBytecode = byteAtPointer(++localIP); - /* return self */ + null; l148: /* end baseFrameReturn */; goto l145; } @@ -14019,12 +14020,17 @@ /* Two things are going on here. The main one is catching a counter trip and - attempting to send the SelectorCounterTripped selector. In this case, if - the send can be made, the - pc should be backed up to the return address of the send that yields the - boolean to be - tested, so that after potential optimization, computation proceeds by - retryying the jump. + attempting to send the SelectorCounterTripped selector. In this case we + would like to back-up + the pc to the return address of the send that + yields the boolean to be tested, so that + after potential optimization, computation proceeds by retrying the jump. + But we cannot, + since there may be no send, just a pop (as in and: [] and or: [] chains). + In this case we also + want to prevent further callbacks until optimization is complete. So we + nil-out the + SelectorCounterTripped entry in the specialSelectorArray. The minor case is that there is an unlikely possibility that the cointer tripped but condition @@ -14045,14 +14051,15 @@ char *sp2; char *theSP; sqInt top; + sqInt top1; if (!((condition == GIV(falseObj)) || (condition == GIV(trueObj)))) { /* begin ceSendMustBeBoolean: */ /* begin popStack */ - top = longAt(GIV(stackPointer)); + top1 = longAt(GIV(stackPointer)); GIV(stackPointer) += BytesPerWord; - GIV(instructionPointer) = ((sqInt) top); + GIV(instructionPointer) = ((sqInt) top1); /* begin push: */ longAtput((sp2 = GIV(stackPointer) - BytesPerWord), condition); GIV(stackPointer) = sp2; @@ -14082,7 +14089,29 @@ resetCountersIn(mframeHomeMethod(GIV(framePointer))); return condition; } - GIV(instructionPointer) = getJumpTargetPCAt(popStack()); + /* begin splObj:put: */ + /* begin storePointer:ofObject:withValue: */ + assert(!(isForwarded(GIV(specialObjectsOop)))); + if (isOldObject(GIV(specialObjectsOop))) { + + /* most stores into young objects */ + + if (((GIV(nilObj) & 3) == 0) + && ((((usqInt) GIV(nilObj))) < (((usqInt) GIV(newSpaceLimit))))) { + /* begin possibleRootStoreInto: */ + if (!(((((usqInt) (longAt(GIV(specialObjectsOop)))) >> 29) & 1) != 0)) { + remember(GIV(specialObjectsOop)); + /* begin setIsRememberedOf:to: */ + flag("endianness"); + longAtput(GIV(specialObjectsOop), (longAt(GIV(specialObjectsOop))) | (1 << 29)); + } + } + } + longAtput((GIV(specialObjectsOop) + (BaseHeaderSize)) + (SelectorCounterTripped << 2), GIV(nilObj)); + /* begin popStack */ + top = longAt(GIV(stackPointer)); + GIV(stackPointer) += BytesPerWord; + GIV(instructionPointer) = ((sqInt) top); /* begin ensureFrameIsMarried:SP: */ theSP = GIV(stackPointer); if (((((usqInt)(longAt(GIV(framePointer) + FoxMethod)))) < (startOfMemory()) @@ -57156,7 +57185,7 @@ zero if no change was possible. */ -static usqLong +static sqInt shortentoIndexableSize(sqInt objOop, sqInt indexableSize) { usqLong bytesAfter; Modified: branches/Cog/spursistasrc/vm/interp.h =================================================================== --- branches/Cog/spursistasrc/vm/interp.h 2014-04-11 18:50:26 UTC (rev 2892) +++ branches/Cog/spursistasrc/vm/interp.h 2014-04-11 19:55:48 UTC (rev 2893) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.672 uuid: 21493732-2e31-4b57-a8ae-aa6e6a9e4c3c + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.673 uuid: a10ccba5-8338-4cc4-ae49-a11440780603 */ #define VM_PROXY_MAJOR 1 Modified: branches/Cog/spursistasrc/vm/vmCallback.h =================================================================== --- branches/Cog/spursistasrc/vm/vmCallback.h 2014-04-11 18:50:26 UTC (rev 2892) +++ branches/Cog/spursistasrc/vm/vmCallback.h 2014-04-11 19:55:48 UTC (rev 2893) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.672 uuid: 21493732-2e31-4b57-a8ae-aa6e6a9e4c3c + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.673 uuid: a10ccba5-8338-4cc4-ae49-a11440780603 */ #define VM_CALLBACK_INC 1

1 0

VM Maker: VMMaker.oscog-eem.673.mcz
by commits＠source.squeak.org 11 Apr '14

11 Apr '14

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.673.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.673 Author: eem Time: 11 April 2014, 12:37:19.779 pm UUID: a10ccba5-8338-4cc4-ae49-a11440780603 Ancestors: VMMaker.oscog-eem.672 Sista: We cannot back-up the machine-code pc in ceCounterTripped: because there isn't always a send preceeding the jump (e.g. in and: [] and or: [] chains). Instead, prevent subsequent counter trips (to reduce the number of necessary skipBackBeforeJump sends in the image) by nilling out SelectorCounterTripped. The image-level optimization code will both restore the selector and back-up the pc. =============== Diff against VMMaker.oscog-eem.672 =============== Item was changed: ----- Method: CoInterpreter>>ceCounterTripped: (in category 'cog jit support') ----- ceCounterTripped: condition "Two things are going on here. The main one is catching a counter trip and attempting + to send the SelectorCounterTripped selector. In this case we would like to back-up + the pc to the return address of the send that yields the boolean to be tested, so that + after potential optimization, computation proceeds by retrying the jump. But we cannot, + since there may be no send, just a pop (as in and: [] and or: [] chains). In this case we also + want to prevent further callbacks until optimization is complete. So we nil-out the + SelectorCounterTripped entry in the specialSelectorArray. - to send the SelectorCounterTripped selector. In this case, if the send can be made, the - pc should be backed up to the return address of the send that yields the boolean to be - tested, so that after potential optimization, computation proceeds by retryying the jump. The minor case is that there is an unlikely possibility that the cointer tripped but condition is not a boolean, in which case a mustBeBoolean response should occur." <api> <option: #SistaStackToRegisterMappingCogit> "Send e.g. thisContext conditionalBranchCounterTrippedOn: boolean." | context counterTrippedSelector classTag | (condition = objectMemory falseObject or: [condition = objectMemory trueObject]) ifFalse: [^self ceSendMustBeBoolean: condition]. counterTrippedSelector := objectMemory maybeSplObj: SelectorCounterTripped. (counterTrippedSelector isNil or: [counterTrippedSelector = objectMemory nilObject]) ifTrue: [cogit resetCountersIn: (self mframeHomeMethod: framePointer). ^condition]. classTag := objectMemory classTagForSpecialObjectsIndex: ClassMethodContext compactClassIndex: ClassMethodContextCompactIndex. (self lookupInMethodCacheSel: counterTrippedSelector classTag: classTag) ifFalse: [messageSelector := counterTrippedSelector. (self lookupMethodNoMNUEtcInClass: (objectMemory classTagForClass: classTag)) ~= 0 ifTrue: [cogit resetCountersIn: (self mframeHomeMethod: framePointer). ^condition]]. (primitiveFunctionPointer ~= 0 or: [(self argumentCountOf: newMethod) ~= 1]) ifTrue: [cogit resetCountersIn: (self mframeHomeMethod: framePointer). ^condition]. + objectMemory splObj: SelectorCounterTripped put: objectMemory nilObject. + instructionPointer := self popStack. - "now back-up the pc; there is always a jump following the - call to the ceSendMustBeBooleanAddTrue/FalseTrampoline." - instructionPointer := cogit getJumpTargetPCAt: self popStack. context := self ensureFrameIsMarried: framePointer SP: stackPointer. self push: context. self push: condition. self ifAppropriateCompileToNativeCode: newMethod selector: counterTrippedSelector. self activateNewMethod. "not reached" ^true! Item was changed: ----- Method: SistaStackToRegisterMappingCogit>>genJumpIf:to: (in category 'bytecode generators') ----- genJumpIf: boolean to: targetBytecodePC "The heart of performance counting in Sista. Conditional branches are 6 times less frequent than sends and can provide basic block frequencies (send counters can't). Each conditional has a 32-bit counter split into an upper 16 bits counting executions and a lower half counting untaken executions of the branch. Executing the branch decrements the upper half, tripping if the count goes negative. Not taking the branch decrements the lower half. N.B. We *do not* eliminate dead branches (true ifTrue:/true ifFalse:) so that scanning for send and branch data is simplified and that branch data is correct." <inline: false> | desc ok counter countTripped retry | <var: #desc type: #'CogSimStackEntry *'> <var: #ok type: #'AbstractInstruction *'> <var: #retry type: #'AbstractInstruction *'> <var: #counter type: #'AbstractInstruction *'> <var: #countTripped type: #'AbstractInstruction *'> self ssFlushTo: simStackPtr - 1. desc := self ssTop. self ssPop: 1. - retry := self Label. desc popToReg: TempReg. self ssAllocateRequiredReg: SendNumArgsReg. "Use this as the count reg." counter := self addressOf: (counters at: counterIndex). counterIndex := counterIndex + 1. self flag: 'will need to use MoveAw32:R: if 64 bits'. self assert: BytesPerWord = CounterBytes. + retry := self MoveAw: counter asUnsignedInteger R: SendNumArgsReg. + counter addDependent: (self annotateAbsolutePCRef: retry). - counter addDependent: (self annotateAbsolutePCRef: (self MoveAw: counter asUnsignedInteger R: SendNumArgsReg)). self SubCq: 16r10000 R: SendNumArgsReg. "Count executed" "Don't write back if we trip; avoids wrapping count back to initial value, and if we trip we don't execute." countTripped := self JumpCarry: 0. counter addDependent: (self annotateAbsolutePCRef: (self MoveR: SendNumArgsReg Aw: counter asUnsignedInteger)). "write back" "Cunning trick by LPD. If true and false are contiguous subtract the smaller. Correct result is either 0 or the distance between them. If result is not 0 or their distance send mustBeBoolean." self assert: (objectMemory objectAfter: objectMemory falseObject) = objectMemory trueObject. self annotate: (self SubCw: boolean R: TempReg) objRef: boolean. self JumpZero: (self ensureFixupAt: targetBytecodePC - initialPC). self SubCq: 1 R: SendNumArgsReg. "Count untaken" counter addDependent: (self annotateAbsolutePCRef: (self MoveR: SendNumArgsReg Aw: counter asUnsignedInteger)). "write back" self CmpCq: (boolean == objectMemory falseObject ifTrue: [objectMemory trueObject - objectMemory falseObject] ifFalse: [objectMemory falseObject - objectMemory trueObject]) R: TempReg. ok := self JumpZero: 0. self MoveCq: 0 R: SendNumArgsReg. "if SendNumArgsReg is 0 this is a mustBeBoolean, not a counter trip." countTripped jmpTarget: (self CallRT: (boolean == objectMemory falseObject ifTrue: [ceSendMustBeBooleanAddFalseTrampoline] ifFalse: [ceSendMustBeBooleanAddTrueTrampoline])). + "If we're in an image which hasn't got the Sista code loaded then the ceCounterTripped: + trampoline will return directly to machine code, returning the boolean. So the code should + jump back to the retry point. The trampoline makes sure that TempReg has been reloaded." - "If we're in an image which hasn't got the Sista code loaded then the ceCounterTripped: trampoline - will return directly to machine code, returning the boolean. So the code should jump back to the - retry point. This is the return address of the non-inlined method that yields the boolean to be tested. - If ceCounterTripped: does not return it will examine the branch to retry to reposition the PC to that point." self annotateBytecode: self Label. self Jump: retry. ok jmpTarget: self Label. ^0! Item was changed: ----- Method: SistaStackToRegisterMappingCogit>>genMustBeBooleanTrampolineFor:called: (in category 'initialization') ----- genMustBeBooleanTrampolineFor: boolean called: trampolineName "This can be entered in one of two states, depending on SendNumArgsReg. See e.g. genJumpIf:to:. If SendNumArgsReg is non-zero then this has been entered via the initial test of the counter in the jump executed count (i.e. the counter has tripped). In this case TempReg contains the boolean to be tested and should not be offset, and ceCounterTripped should be invoked with the unoffset TempReg. If SendNumArgsReg is zero then this has been entered for must-be-boolean processing. TempReg has been offset by boolean and must be corrected and ceSendMustBeBoolean: invoked with the corrected value." <var: #trampolineName type: #'char *'> | jumpMBB | <var: #jumpMBB type: #'AbstractInstruction *'> <inline: false> opcodeIndex := 0. self CmpCq: 0 R: SendNumArgsReg. jumpMBB := self JumpZero: 0. self compileTrampolineFor: #ceCounterTripped: callJumpBar: true numArgs: 1 arg: TempReg arg: nil arg: nil arg: nil saveRegs: false resultReg: nil. "For the case where the ceCounterTripped: call returns (e.g. because there's no callback selector installed), the call to the ceSendMustBeBooleanAddTrue/FalseTrampoline is followed by a jump + back to the start of the counter/condition test sequence. For this case copy the C result to + TempReg (the register that is tested), to reload it with the boolean to be tested." + backEnd cResultRegister ~= TempReg ifTrue: + [self MoveR: backEnd cResultRegister R: TempReg]. - back to the return address of the send that yields the boolean to be tested. For this case copy - the C result to ReceiverResultReg, to reload it with the boolean to be tested." - backEnd cResultRegister ~= ReceiverResultReg ifTrue: - [self MoveR: backEnd cResultRegister R: ReceiverResultReg]. "If the objectRepresentation does want true & false to be mobile then we need to record these addresses." self assert: (objectRepresentation shouldAnnotateObjectReference: boolean) not. jumpMBB jmpTarget: (self AddCq: boolean R: TempReg). ^self genTrampolineFor: #ceSendMustBeBoolean: called: trampolineName callJumpBar: true numArgs: 1 arg: TempReg arg: nil arg: nil arg: nil saveRegs: false resultReg: nil appendOpcodes: true!

1 0

[commit][2892] CogVM source as per VMMaker.oscog-eem.672
by commits＠squeakvm.org 11 Apr '14

11 Apr '14

Revision: 2892 Author: eliot Date: 2014-04-11 11:50:26 -0700 (Fri, 11 Apr 2014) Log Message: ----------- CogVM source as per VMMaker.oscog-eem.672 Implement the new Spur interpreterProxy API for ObjectMemory (of course pinObject: fails, and isCharacterValue: has a smaller range). Modified Paths: -------------- branches/Cog/nscogsrc/vm/cogit.c branches/Cog/nscogsrc/vm/cogit.h branches/Cog/nscogsrc/vm/cogmethod.h branches/Cog/nscogsrc/vm/cointerp.c branches/Cog/nscogsrc/vm/cointerp.h branches/Cog/nscogsrc/vm/gcc3x-cointerp.c branches/Cog/nscogsrc/vm/interp.h branches/Cog/nscogsrc/vm/vmCallback.h branches/Cog/nsspursrc/vm/cogit.c branches/Cog/nsspursrc/vm/cogit.h branches/Cog/nsspursrc/vm/cogmethod.h branches/Cog/nsspursrc/vm/cointerp.c branches/Cog/nsspursrc/vm/cointerp.h branches/Cog/nsspursrc/vm/gcc3x-cointerp.c branches/Cog/nsspursrc/vm/interp.h branches/Cog/nsspursrc/vm/vmCallback.h branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c branches/Cog/nsspurstacksrc/vm/interp.c branches/Cog/nsspurstacksrc/vm/interp.h branches/Cog/nsspurstacksrc/vm/vmCallback.h branches/Cog/sistasrc/vm/cointerp.c branches/Cog/sistasrc/vm/cointerp.h branches/Cog/sistasrc/vm/gcc3x-cointerp.c branches/Cog/sistasrc/vm/interp.h branches/Cog/sistasrc/vm/vmCallback.h branches/Cog/spursistasrc/vm/cointerp.c branches/Cog/spursistasrc/vm/cointerp.h branches/Cog/spursistasrc/vm/gcc3x-cointerp.c branches/Cog/spursistasrc/vm/interp.h branches/Cog/spursistasrc/vm/vmCallback.h branches/Cog/spursrc/vm/cogit.c branches/Cog/spursrc/vm/cogit.h branches/Cog/spursrc/vm/cogmethod.h branches/Cog/spursrc/vm/cointerp.c branches/Cog/spursrc/vm/cointerp.h branches/Cog/spursrc/vm/gcc3x-cointerp.c branches/Cog/spursrc/vm/interp.h branches/Cog/spursrc/vm/vmCallback.h branches/Cog/spurstacksrc/vm/gcc3x-interp.c branches/Cog/spurstacksrc/vm/interp.c branches/Cog/spurstacksrc/vm/interp.h branches/Cog/spurstacksrc/vm/vmCallback.h branches/Cog/src/vm/cogit.c branches/Cog/src/vm/cogit.h branches/Cog/src/vm/cogmethod.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/src/vm/interp.h branches/Cog/src/vm/vmCallback.h branches/Cog/stacksrc/vm/gcc3x-interp.c branches/Cog/stacksrc/vm/interp.c branches/Cog/stacksrc/vm/interp.h branches/Cog/stacksrc/vm/vmCallback.h Property Changed: ---------------- branches/Cog/platforms/Cross/vm/sqSCCSVersion.h Modified: branches/Cog/nscogsrc/vm/cogit.c =================================================================== --- branches/Cog/nscogsrc/vm/cogit.c 2014-04-10 18:41:54 UTC (rev 2891) +++ branches/Cog/nscogsrc/vm/cogit.c 2014-04-11 18:50:26 UTC (rev 2892) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.670 uuid: 071bf6af-04c0-4256-b053-d66378b73d27 + CCodeGenerator VMMaker.oscog-eem.672 uuid: 21493732-2e31-4b57-a8ae-aa6e6a9e4c3c from - StackToRegisterMappingCogit VMMaker.oscog-eem.670 uuid: 071bf6af-04c0-4256-b053-d66378b73d27 + StackToRegisterMappingCogit VMMaker.oscog-eem.672 uuid: 21493732-2e31-4b57-a8ae-aa6e6a9e4c3c */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.670 uuid: 071bf6af-04c0-4256-b053-d66378b73d27 " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.672 uuid: 21493732-2e31-4b57-a8ae-aa6e6a9e4c3c " __DATE__ ; char *__cogitBuildInfo = __buildInfo; Modified: branches/Cog/nscogsrc/vm/cogit.h =================================================================== --- branches/Cog/nscogsrc/vm/cogit.h 2014-04-10 18:41:54 UTC (rev 2891) +++ branches/Cog/nscogsrc/vm/cogit.h 2014-04-11 18:50:26 UTC (rev 2892) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.670 uuid: 071bf6af-04c0-4256-b053-d66378b73d27 + CCodeGenerator VMMaker.oscog-eem.672 uuid: 21493732-2e31-4b57-a8ae-aa6e6a9e4c3c */ Modified: branches/Cog/nscogsrc/vm/cogmethod.h =================================================================== --- branches/Cog/nscogsrc/vm/cogmethod.h 2014-04-10 18:41:54 UTC (rev 2891) +++ branches/Cog/nscogsrc/vm/cogmethod.h 2014-04-11 18:50:26 UTC (rev 2892) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.670 uuid: 071bf6af-04c0-4256-b053-d66378b73d27 + CCodeGenerator VMMaker.oscog-eem.672 uuid: 21493732-2e31-4b57-a8ae-aa6e6a9e4c3c */ typedef struct { Modified: branches/Cog/nscogsrc/vm/cointerp.c =================================================================== --- branches/Cog/nscogsrc/vm/cointerp.c 2014-04-10 18:41:54 UTC (rev 2891) +++ branches/Cog/nscogsrc/vm/cointerp.c 2014-04-11 18:50:26 UTC (rev 2892) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.670 uuid: 071bf6af-04c0-4256-b053-d66378b73d27 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.672 uuid: 21493732-2e31-4b57-a8ae-aa6e6a9e4c3c from - CoInterpreter VMMaker.oscog-eem.670 uuid: 071bf6af-04c0-4256-b053-d66378b73d27 + CoInterpreter VMMaker.oscog-eem.672 uuid: 21493732-2e31-4b57-a8ae-aa6e6a9e4c3c */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.670 uuid: 071bf6af-04c0-4256-b053-d66378b73d27 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.672 uuid: 21493732-2e31-4b57-a8ae-aa6e6a9e4c3c " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -426,7 +426,9 @@ void ceTraceStoreOfinto(sqInt aValue, sqInt anObject); static sqInt changeClassOfto(sqInt rcvr, sqInt argClass); sqInt characterForAscii(sqInt ascii); +sqInt characterObjectOf(sqInt characterCode); sqInt characterTable(void); +sqInt characterValueOf(sqInt oop); static sqInt cheapAddressCouldBeInHeap(sqInt address); sqInt checkAllAccessibleObjectsOkay(void); void checkAssertsEnabledInCoInterpreter(void); @@ -659,6 +661,7 @@ static sqInt isBaseFrame(char *theFP); sqInt isBytes(sqInt oop); sqInt isCharacterObject(sqInt oop); +sqInt isCharacterValue(sqInt anInteger); static sqInt isClassOfNonImmequalTo(sqInt oop, sqInt classOop); sqInt isCogMethodReference(sqInt methodHeader); static sqInt isCompiledMethodHeader(sqInt objHeader); @@ -686,6 +689,7 @@ static sqInt isOopForwarded(sqInt oop); sqInt isOopImmutable(sqInt anOop); sqInt isOopMutable(sqInt anOop); +sqInt isPinned(sqInt objOop); sqInt isPointers(sqInt oop); static sqInt isPrimitiveFunctionPointerAnIndex(void); sqInt isQuickPrimitiveIndex(sqInt anInteger); @@ -811,6 +815,7 @@ static sqInt pageIndexFor(void *pointer); static sqInt pageListIsWellFormed(void); sqInt penultimateLiteralOf(sqInt aMethodOop); +void pinObject(sqInt objOop); sqInt popRemappableOop(void); sqInt popStack(void); sqInt pop(sqInt nItems); @@ -2040,7 +2045,7 @@ /* 574 */ (void (*)(void))0, /* 575 */ (void (*)(void))0, 0 }; -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.670"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.672"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; @@ -4338,7 +4343,7 @@ ? ((longAt(localFP + FoxMethod)) & MFMethodFlagIsBlockFlag) != 0 : (byteAt((localFP + FoxIFrameFlags) + 3)) != 0))) { goto commonCallerReturn; - goto l299; + goto l301; } closure = longAt(localFP + (frameStackedReceiverOffsetNumArgs(((((usqInt)(longAt(localFP + FoxMethod)))) < (startOfMemory()) ? ((mframeCogMethod(localFP))->cmNumArgs) @@ -4375,11 +4380,11 @@ theMethod = longAt((home + BaseHeaderSize) + (MethodIndex << ShiftForWord)); if ((primitiveIndexOfMethodheader(theMethod, headerOf(theMethod))) == 198) { unwindContextOrNilOrZero = home; - goto l300; + goto l302; } } unwindContextOrNilOrZero = ctxtOrNilOrZero; - l300: /* end internalFindUnwindThroughContext: */; + l302: /* end internalFindUnwindThroughContext: */; if (unwindContextOrNilOrZero == GIV(nilObj)) { /* error: can't find home on chain; cannot return */ @@ -4393,10 +4398,10 @@ : (byteAt((localFP + FoxIFrameFlags) + 2)) != 0)) { assert(isContext(frameContext(localFP))); ourContext = longAt(localFP + FoxThisContext); - goto l301; + goto l303; } ourContext = marryFrameSP(localFP, localSP); - l301: /* end ensureFrameIsMarried:SP: */; + l303: /* end ensureFrameIsMarried:SP: */; /* begin internalPush: */ longAtPointerput((localSP -= BytesPerOop), ourContext); /* begin internalPush: */ @@ -4405,7 +4410,7 @@ GIV(argumentCount) = 1; goto normalSend; /* return self */ - goto l299; + goto l301; } if (unwindContextOrNilOrZero != 0) { /* begin internalAboutToReturn:through: */ @@ -4417,10 +4422,10 @@ : (byteAt((localFP + FoxIFrameFlags) + 2)) != 0)) { assert(isContext(frameContext(localFP))); ourContext1 = longAt(localFP + FoxThisContext); - goto l302; + goto l304; } ourContext1 = marryFrameSP(localFP, localSP); - l302: /* end ensureFrameIsMarried:SP: */; + l304: /* end ensureFrameIsMarried:SP: */; /* begin internalPush: */ longAtPointerput((localSP -= BytesPerOop), ourContext1); /* begin internalPush: */ @@ -4431,7 +4436,7 @@ GIV(argumentCount) = 2; goto normalSend; /* return self */ - goto l299; + goto l301; } contextToReturnTo = null; if (((longAt((home + BaseHeaderSize) + (SenderIndex << ShiftForWord))) & 1)) { @@ -4490,10 +4495,10 @@ : (byteAt((localFP + FoxIFrameFlags) + 2)) != 0)) { assert(isContext(frameContext(localFP))); ourContext2 = longAt(localFP + FoxThisContext); - goto l303; + goto l305; } ourContext2 = marryFrameSP(localFP, localSP); - l303: /* end ensureFrameIsMarried:SP: */; + l305: /* end ensureFrameIsMarried:SP: */; /* begin internalPush: */ longAtPointerput((localSP -= BytesPerOop), ourContext2); /* begin internalPush: */ @@ -4502,7 +4507,7 @@ GIV(argumentCount) = 1; goto normalSend; /* return self */ - goto l299; + goto l301; } } assert(pageListIsWellFormed()); @@ -4613,7 +4618,7 @@ GIV(framePointer) = localFP; ceEnterCogCodePopReceiverReg(); - goto l299; + goto l301; } localIP = pointerForOop(longAt(localFP + FoxIFSavedIP)); } @@ -4631,7 +4636,7 @@ /* return self */ } - l299: /* end case */; + l301: /* end case */; break; case 121: /* returnTrue */ @@ -4751,27 +4756,27 @@ fp = (thePage->headFP); if (fp == theFP) { frameAbove = 0; - goto l305; + goto l307; } while (((callerFP = frameCallerFP(fp))) != 0) { if (callerFP == theFP) { frameAbove = fp; - goto l305; + goto l307; } fp = callerFP; } error("did not find theFP in stack page"); frameAbove = 0; - l305: /* end findFrameAbove:inPage: */; + l307: /* end findFrameAbove:inPage: */; /* begin newStackPage */ lruOrFree = ((mostRecentlyUsedPage())->nextPage); if (isFree(lruOrFree)) { newPage = lruOrFree; - goto l306; + goto l308; } divorceFramesIn(lruOrFree); newPage = lruOrFree; - l306: /* end newStackPage */; + l308: /* end newStackPage */; assert(newPage == GIV(stackPage)); moveFramesInthroughtoPage(thePage, frameAbove, newPage); markStackPageMostRecentlyUsed(newPage); @@ -4795,7 +4800,7 @@ longAtput((sp2 = GIV(stackPointer) - BytesPerWord), GIV(instructionPointer)); GIV(stackPointer) = sp2; ceSendAborttonumArgs(longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (SelectorCannotReturn << ShiftForWord)), contextToReturnFrom, 1); - goto l307; + goto l309; } GIV(instructionPointer) = 0; thePage = makeBaseFrameFor(contextToReturnTo); @@ -4834,7 +4839,7 @@ GIV(framePointer) = localFP; ceEnterCogCodePopReceiverReg(); - goto l307; + goto l309; } localIP = pointerForOop(longAt(localFP + FoxIFSavedIP)); } @@ -4852,8 +4857,8 @@ currentBytecode = (byteAtPointer(++localIP)) + GIV(bytecodeSetSelector); /* return self */ - l307: /* end baseFrameReturn */; - goto l304; + l309: /* end baseFrameReturn */; + goto l306; } /* begin frameCallerSavedIP: */ localIP = pointerForOop(longAt(localFP + FoxCallerSavedIP)); @@ -4882,7 +4887,7 @@ GIV(framePointer) = localFP; ceEnterCogCodePopReceiverReg(); - goto l304; + goto l306; } localIP = pointerForOop(longAt(localFP + FoxIFSavedIP)); } @@ -4899,7 +4904,7 @@ longAtPointerput(localSP, localReturnValue); } - l304: /* end case */; + l306: /* end case */; break; case 126: /* dynamicSuperSendBytecode */ @@ -5195,7 +5200,7 @@ GIV(newMethod) = GIV(methodCache)[probe1 + MethodCacheMethod]; primitiveFunctionPointer = ((void (*)()) (GIV(methodCache)[probe1 + MethodCachePrimFunction])); ok = 1; - goto l312; + goto l314; } /* second probe */ @@ -5206,7 +5211,7 @@ GIV(newMethod) = GIV(methodCache)[probe1 + MethodCacheMethod]; primitiveFunctionPointer = ((void (*)()) (GIV(methodCache)[probe1 + MethodCachePrimFunction])); ok = 1; - goto l312; + goto l314; } probe1 = (((usqInt) hash1) >> 2) & MethodCacheMask; if (((GIV(methodCache)[probe1 + MethodCacheSelector]) == GIV(messageSelector)) @@ -5214,10 +5219,10 @@ GIV(newMethod) = GIV(methodCache)[probe1 + MethodCacheMethod]; primitiveFunctionPointer = ((void (*)()) (GIV(methodCache)[probe1 + MethodCachePrimFunction])); ok = 1; - goto l312; + goto l314; } ok = 0; - l312: /* end lookupInMethodCacheSel:classTag: */; + l314: /* end lookupInMethodCacheSel:classTag: */; if (ok) { /* begin ifAppropriateCompileToNativeCode:selector: */ VM_LABEL(0ifAppropriateCompileToNativeCodeselector); @@ -5258,7 +5263,7 @@ localFP = pointerForOop(GIV(framePointer)); addNewMethodToCache(GIV(lkupClass)); } - l313: /* end internalFindNewMethod */; + l315: /* end internalFindNewMethod */; /* begin internalExecuteNewMethod */ VM_LABEL(0internalExecuteNewMethod); if (primitiveFunctionPointer != 0) { @@ -5272,31 +5277,31 @@ if (localPrimIndex >= 264) { longAtPointerput(localSP, longAt(((longAtPointer(localSP)) + BaseHeaderSize) + ((localPrimIndex - 264) << ShiftForWord))); 1; - goto l309; + goto l311; } if (localPrimIndex == 256) { 1; - goto l309; + goto l311; } if (localPrimIndex == 257) { longAtPointerput(localSP, GIV(trueObj)); 1; - goto l309; + goto l311; } if (localPrimIndex == 258) { longAtPointerput(localSP, GIV(falseObj)); 1; - goto l309; + goto l311; } if (localPrimIndex == 259) { longAtPointerput(localSP, GIV(nilObj)); 1; - goto l309; + goto l311; } longAtPointerput(localSP, (((localPrimIndex - 261) << 1) | 1)); 1; - l309: /* end internalQuickPrimitiveResponse */; - goto l308; + l311: /* end internalQuickPrimitiveResponse */; + goto l310; } /* begin externalizeIPandSP */ assert((((usqInt)localIP)) != (ceReturnToInterpreterPC())); @@ -5347,7 +5352,7 @@ returntoExecutive(popStack(), 1); browserPluginReturnIfNeeded(); null; - goto l308; + goto l310; } } if (methodHasCogMethod(GIV(newMethod))) { @@ -5428,11 +5433,11 @@ table = longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (PrimErrTableIndex << ShiftForWord)); if (GIV(primFailCode) <= (((sqInt) (lastPointerOf(table)) >> 2))) { errorCode = longAt((table + BaseHeaderSize) + ((GIV(primFailCode) - 1) << ShiftForWord)); - goto l310; + goto l312; } } errorCode = ((GIV(primFailCode) << 1) | 1); - l310: /* end getErrorObjectFromPrimFailCode */; + l312: /* end getErrorObjectFromPrimFailCode */; longAtPointerput(localSP, errorCode); } GIV(primFailCode) = 0; @@ -5456,7 +5461,7 @@ localFP = pointerForOop(GIV(framePointer)); } } - l308: /* end internalExecuteNewMethod */; + l310: /* end internalExecuteNewMethod */; /* begin fetchNextBytecode */ currentBytecode = (byteAtPointer(++localIP)) + GIV(bytecodeSetSelector); @@ -6833,7 +6838,7 @@ /* begin fetchNextBytecode */ currentBytecode = (byteAtPointer(++localIP)) + GIV(bytecodeSetSelector); - goto l314; + goto l316; } if (bytecode == 172) { @@ -6843,7 +6848,7 @@ /* begin fetchNextBytecode */ currentBytecode = (byteAtPointer(++localIP)) + GIV(bytecodeSetSelector); - goto l314; + goto l316; } if (bytecode > 167) { @@ -6854,7 +6859,7 @@ localIP = (localIP + offset) + 1; currentBytecode = (byteAtPointer(localIP)) + GIV(bytecodeSetSelector); - goto l314; + goto l316; } } currentBytecode = bytecode + GIV(bytecodeSetSelector); @@ -6862,7 +6867,7 @@ /* begin internalPush: */ longAtPointerput((localSP -= BytesPerOop), GIV(trueObj)); } - l314: /* end case */; + l316: /* end case */; break; case 179: /* bytecodePrimGreaterThan */ @@ -7012,7 +7017,7 @@ localIP = (localIP + (bytecode - 151)) + 1; currentBytecode = (byteAtPointer(localIP)) + GIV(bytecodeSetSelector); - goto l315; + goto l317; } if (bytecode == 172) { @@ -7023,14 +7028,14 @@ localIP = (localIP + offset) + 1; currentBytecode = (byteAtPointer(localIP)) + GIV(bytecodeSetSelector); - goto l315; + goto l317; } currentBytecode = bytecode + GIV(bytecodeSetSelector); /* begin internalPush: */ longAtPointerput((localSP -= BytesPerOop), GIV(falseObj)); } - l315: /* end case */; + l317: /* end case */; break; case 180: /* bytecodePrimLessOrEqual */ @@ -8377,7 +8382,9 @@ result1 = byteAt((rcvr + BaseHeaderSize) + (((index >> 1)) - 1)); result = (CharacterTable == null - ? characterObjectOf(result1) + ? (((result1 >= 0) && (result1 <= 0xFF)) + ? longAt(((longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (CharacterTable << ShiftForWord))) + BaseHeaderSize) + (result1 << ShiftForWord)) + : GIV(nilObj)) : longAt(((longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (CharacterTable << ShiftForWord))) + BaseHeaderSize) + (result1 << ShiftForWord))); goto l120; } @@ -8480,7 +8487,7 @@ GIV(primFailCode) = PrimErrBadReceiver; 0; - goto l127; + goto l128; } /* begin lengthOf:baseHeader:format: */ if ((hdr & TypeMask) == HeaderTypeSizeAndClass) { @@ -8492,35 +8499,35 @@ sz1 -= hdr & Size4Bit; if (fmt1 <= 4) { totalLength = ((usqInt) (sz1 - BaseHeaderSize)) >> ShiftForWord; - goto l125; + goto l126; } totalLength = (fmt1 < 8 ? ((usqInt) (sz1 - BaseHeaderSize)) >> 2 : (sz1 - BaseHeaderSize) - (fmt1 & 3)); - l125: /* end lengthOf:baseHeader:format: */; + l126: /* end lengthOf:baseHeader:format: */; /* begin fixedFieldsOf:format:length: */ if ((fmt1 > 4) || (fmt1 == 2)) { fixedFields1 = 0; - goto l126; + goto l127; } if (fmt1 < 2) { fixedFields1 = totalLength; - goto l126; + goto l127; } class = (((ccIndex1 = (((usqInt) (longAt(rcvr))) >> 12) & 0x1F)) == 0 ? (longAt(rcvr - BaseHeaderSize)) & AllButTypeMask : longAt(((longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (CompactClasses << ShiftForWord))) + BaseHeaderSize) + ((ccIndex1 - 1) << ShiftForWord))); classFormat = (longAt((class + BaseHeaderSize) + (InstanceSpecificationIndex << ShiftForWord))) - 1; fixedFields1 = (((((usqInt) classFormat) >> 11) & 192) + ((((usqInt) classFormat) >> 2) & 0x3F)) - 1; - l126: /* end fixedFieldsOf:format:length: */; + l127: /* end fixedFieldsOf:format:length: */; GIV(atCache)[atIx + AtCacheOop] = rcvr; GIV(atCache)[atIx + AtCacheFmt] = fmt1; GIV(atCache)[atIx + AtCacheFixedFields] = fixedFields1; GIV(atCache)[atIx + AtCacheSize] = (totalLength - fixedFields1); 1; - l127: /* end install:inAtCache:at:string: */; + l128: /* end install:inAtCache:at:string: */; } else { if (primitiveFunctionPointer == primitiveStringAtPut) { @@ -8539,12 +8546,12 @@ sz2 -= hdr1 & Size4Bit; if (fmt2 <= 4) { totalLength1 = ((usqInt) (sz2 - BaseHeaderSize)) >> ShiftForWord; - goto l128; + goto l129; } totalLength1 = (fmt2 < 8 ? ((usqInt) (sz2 - BaseHeaderSize)) >> 2 : (sz2 - BaseHeaderSize) - (fmt2 & 3)); - l128: /* end lengthOf:baseHeader:format: */; + l129: /* end lengthOf:baseHeader:format: */; fixedFields2 = 0; /* special flag for strings */ @@ -8556,7 +8563,7 @@ GIV(atCache)[atIx + AtCacheFixedFields] = fixedFields2; GIV(atCache)[atIx + AtCacheSize] = (totalLength1 - fixedFields2); 1; - l131: /* end install:inAtCache:at:string: */; + l132: /* end install:inAtCache:at:string: */; } else { GIV(argumentCount) = 2; @@ -8580,7 +8587,7 @@ possibleRootStoreIntovalue(rcvr, value); } longAtput((rcvr + BaseHeaderSize) + (((((index >> 1)) + fixedFields) - 1) << ShiftForWord), value); - goto l123; + goto l124; } if (fmt < 8) { @@ -8589,10 +8596,10 @@ valToPut = positive32BitValueOf(value); if (!GIV(primFailCode)) { long32Atput((rcvr + BaseHeaderSize) + ((((index >> 1)) - 1) << 2), valToPut); - goto l123; + goto l124; } GIV(primFailCode) = PrimErrBadArgument; - goto l123; + goto l124; } if (fmt >= 16) { @@ -8601,22 +8608,22 @@ /* begin is:instanceOf:compactClassIndex: */ if ((value & 1)) { isCharacter = 0; - goto l122; + goto l123; } /* begin isClassOfNonImm:equalTo:compactClassIndex: */ assert(!((value & 1))); ccIndex3 = (((usqInt) (longAt(value))) >> 12) & 0x1F; if (ccIndex3 == 0) { isCharacter = ((longAt(value - BaseHeaderSize)) & AllButTypeMask) == (longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassCharacter << ShiftForWord))); - goto l132; + goto l133; } isCharacter = (longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassCharacter << ShiftForWord))) == (longAt(((longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (CompactClasses << ShiftForWord))) + BaseHeaderSize) + ((ccIndex3 - 1) << ShiftForWord))); - l132: /* end isClassOfNonImm:equalTo:compactClassIndex: */; - l122: /* end is:instanceOf:compactClassIndex: */; + l133: /* end isClassOfNonImm:equalTo:compactClassIndex: */; + l123: /* end is:instanceOf:compactClassIndex: */; if (!isCharacter) { GIV(primFailCode) = PrimErrBadArgument; - goto l123; + goto l124; } valToPut = longAt((value + BaseHeaderSize) + (CharacterValueIndex << ShiftForWord)); valToPut = ((valToPut & 1) @@ -8629,7 +8636,7 @@ if ((fmt >= 12) && (((index >> 1)) < ((((literalCountOfHeader(headerOf(rcvr))) + LiteralStart) * BytesPerOop) + 1))) { GIV(primFailCode) = PrimErrBadIndex; - goto l123; + goto l124; } valToPut = ((value & 1) ? (value >> 1) @@ -8638,17 +8645,17 @@ if (!((valToPut >= 0) && (valToPut <= 0xFF))) { GIV(primFailCode) = PrimErrBadArgument; - goto l123; + goto l124; } byteAtput((rcvr + BaseHeaderSize) + (((index >> 1)) - 1), valToPut); - goto l123; + goto l124; } /* begin primitiveFailFor: */ reasonCode = (((((usqInt) (longAt(rcvr))) >> (instFormatFieldLSB())) & 15) >= 2 ? PrimErrBadIndex : PrimErrBadReceiver); GIV(primFailCode) = reasonCode; - l123: /* end commonVariable:at:put:cacheIndex: */; + l124: /* end commonVariable:at:put:cacheIndex: */; } if (!GIV(primFailCode)) { /* begin fetchNextBytecode */ @@ -8694,21 +8701,21 @@ /* begin is:instanceOf:compactClassIndex: */ if ((rcvr & 1)) { isString = 0; - goto l136; + goto l137; } /* begin isClassOfNonImm:equalTo:compactClassIndex: */ assert(!((rcvr & 1))); ccIndex = (((usqInt) (longAt(rcvr))) >> 12) & 0x1F; if (ccIndex == 0) { isString = ((longAt(rcvr - BaseHeaderSize)) & AllButTypeMask) == (longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassByteString << ShiftForWord))); - goto l138; + goto l139; } isString = ClassByteStringCompactIndex == ccIndex; - goto l138; + goto l139; isString = (longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassByteString << ShiftForWord))) == (longAt(((longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (CompactClasses << ShiftForWord))) + BaseHeaderSize) + ((ccIndex - 1) << ShiftForWord))); - l138: /* end isClassOfNonImm:equalTo:compactClassIndex: */; - l136: /* end is:instanceOf:compactClassIndex: */; + l139: /* end isClassOfNonImm:equalTo:compactClassIndex: */; + l137: /* end is:instanceOf:compactClassIndex: */; if (isString) { /* begin lengthOf: */ header = longAt(rcvr); @@ -8723,36 +8730,36 @@ sz1 -= header & Size4Bit; if (fmt <= 4) { sz = ((usqInt) (sz1 - BaseHeaderSize)) >> ShiftForWord; - goto l134; + goto l135; } sz = (fmt < 8 ? ((usqInt) (sz1 - BaseHeaderSize)) >> 2 : (sz1 - BaseHeaderSize) - (fmt & 3)); - l134: /* end lengthOf: */; + l135: /* end lengthOf: */; longAtPointerput(localSP, ((sz << 1) | 1)); /* begin fetchNextBytecode */ currentBytecode = (byteAtPointer(++localIP)) + GIV(bytecodeSetSelector); - goto l133; + goto l134; } /* begin is:instanceOf:compactClassIndex: */ if ((rcvr & 1)) { isArray = 0; - goto l137; + goto l138; } /* begin isClassOfNonImm:equalTo:compactClassIndex: */ assert(!((rcvr & 1))); ccIndex1 = (((usqInt) (longAt(rcvr))) >> 12) & 0x1F; if (ccIndex1 == 0) { isArray = ((longAt(rcvr - BaseHeaderSize)) & AllButTypeMask) == (longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassArray << ShiftForWord))); - goto l139; + goto l140; } isArray = ClassArrayCompactIndex == ccIndex1; - goto l139; + goto l140; isArray = (longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassArray << ShiftForWord))) == (longAt(((longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (CompactClasses << ShiftForWord))) + BaseHeaderSize) + ((ccIndex1 - 1) << ShiftForWord))); - l139: /* end isClassOfNonImm:equalTo:compactClassIndex: */; - l137: /* end is:instanceOf:compactClassIndex: */; + l140: /* end isClassOfNonImm:equalTo:compactClassIndex: */; + l138: /* end is:instanceOf:compactClassIndex: */; if (isArray) { /* begin lengthOf: */ header1 = longAt(rcvr); @@ -8767,23 +8774,23 @@ sz2 -= header1 & Size4Bit; if (fmt1 <= 4) { sz = ((usqInt) (sz2 - BaseHeaderSize)) >> ShiftForWord; - goto l135; + goto l136; } sz = (fmt1 < 8 ? ((usqInt) (sz2 - BaseHeaderSize)) >> 2 : (sz2 - BaseHeaderSize) - (fmt1 & 3)); - l135: /* end lengthOf: */; + l136: /* end lengthOf: */; longAtPointerput(localSP, ((sz << 1) | 1)); /* begin fetchNextBytecode */ currentBytecode = (byteAtPointer(++localIP)) + GIV(bytecodeSetSelector); - goto l133; + goto l134; } GIV(messageSelector) = longAt(((longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (SpecialSelectors << ShiftForWord))) + BaseHeaderSize) + ((18 * 2) << ShiftForWord)); GIV(argumentCount) = 0; goto normalSend; } - l133: /* end case */; + l134: /* end case */; break; case 195: case 355: /*99*/ @@ -8881,19 +8888,19 @@ /* begin is:instanceOf:compactClassIndex: */ if ((rcvr & 1)) { isBlock = 0; - goto l141; + goto l142; } /* begin isClassOfNonImm:equalTo:compactClassIndex: */ assert(!((rcvr & 1))); ccIndex = (((usqInt) (longAt(rcvr))) >> 12) & 0x1F; if (ccIndex == 0) { isBlock = ((longAt(rcvr - BaseHeaderSize)) & AllButTypeMask) == (longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassBlockClosure << ShiftForWord))); - goto l142; + goto l143; } isBlock = (longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassBlockClosure << ShiftForWord))) == (longAt(((longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (CompactClasses << ShiftForWord))) + BaseHeaderSize) + ((ccIndex - 1) << ShiftForWord))); - l142: /* end isClassOfNonImm:equalTo:compactClassIndex: */; - l141: /* end is:instanceOf:compactClassIndex: */; + l143: /* end isClassOfNonImm:equalTo:compactClassIndex: */; + l142: /* end is:instanceOf:compactClassIndex: */; if (isBlock) { /* begin externalizeIPandSP */ assert((((usqInt)localIP)) != (ceReturnToInterpreterPC())); @@ -8912,14 +8919,14 @@ /* begin fetchNextBytecode */ currentBytecode = (byteAtPointer(++localIP)) + GIV(bytecodeSetSelector); - goto l140; + goto l141; } GIV(primFailCode) = 0; } GIV(messageSelector) = longAt(((longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (SpecialSelectors << ShiftForWord))) + BaseHeaderSize) + ((25 * 2) << ShiftForWord)); goto normalSend; } - l140: /* end case */; + l141: /* end case */; break; case 202: /* bytecodePrimValueWithArg */ @@ -8934,19 +8941,19 @@ /* begin is:instanceOf:compactClassIndex: */ if ((rcvr & 1)) { isBlock = 0; - goto l144; + goto l145; } /* begin isClassOfNonImm:equalTo:compactClassIndex: */ assert(!((rcvr & 1))); ccIndex = (((usqInt) (longAt(rcvr))) >> 12) & 0x1F; if (ccIndex == 0) { isBlock = ((longAt(rcvr - BaseHeaderSize)) & AllButTypeMask) == (longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassBlockClosure << ShiftForWord))); - goto l145; + goto l146; } isBlock = (longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassBlockClosure << ShiftForWord))) == (longAt(((longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (CompactClasses << ShiftForWord))) + BaseHeaderSize) + ((ccIndex - 1) << ShiftForWord))); - l145: /* end isClassOfNonImm:equalTo:compactClassIndex: */; - l144: /* end is:instanceOf:compactClassIndex: */; + l146: /* end isClassOfNonImm:equalTo:compactClassIndex: */; + l145: /* end is:instanceOf:compactClassIndex: */; if (isBlock) { /* begin externalizeIPandSP */ assert((((usqInt)localIP)) != (ceReturnToInterpreterPC())); @@ -8965,14 +8972,14 @@ /* begin fetchNextBytecode */ currentBytecode = (byteAtPointer(++localIP)) + GIV(bytecodeSetSelector); - goto l143; + goto l144; } GIV(primFailCode) = 0; } GIV(messageSelector) = longAt(((longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (SpecialSelectors << ShiftForWord))) + BaseHeaderSize) + ((26 * 2) << ShiftForWord)); goto normalSend; } - l143: /* end case */; + l144: /* end case */; break; case 203: case 363: /*107*/ @@ -9021,13 +9028,13 @@ /* begin isClassOfNonImm:equalTo: */ if ((rcvr & 1)) { successBoolean = 0; - goto l147; + goto l148; } cl = (((ccIndex = (((usqInt) (longAt(rcvr))) >> 12) & 0x1F)) == 0 ? (longAt(rcvr - BaseHeaderSize)) & AllButTypeMask : longAt(((longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (CompactClasses << ShiftForWord))) + BaseHeaderSize) + ((ccIndex - 1) << ShiftForWord))); successBoolean = cl == (longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassPoint << ShiftForWord))); - l147: /* end isClassOfNonImm:equalTo: */; + l148: /* end isClassOfNonImm:equalTo: */; if (!successBoolean) { /* Don't overwrite an error code that has already been set. */ @@ -9041,14 +9048,14 @@ /* begin fetchNextBytecode */ currentBytecode = (byteAtPointer(++localIP)) + GIV(bytecodeSetSelector); - goto l146; + goto l147; } GIV(primFailCode) = 0; GIV(messageSelector) = longAt(((longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (SpecialSelectors << ShiftForWord))) + BaseHeaderSize) + ((30 * 2) << ShiftForWord)); GIV(argumentCount) = 0; goto normalSend; } - l146: /* end case */; + l147: /* end case */; break; case 207: /* bytecodePrimPointY */ @@ -9067,13 +9074,13 @@ /* begin isClassOfNonImm:equalTo: */ if ((rcvr & 1)) { successBoolean = 0; - goto l149; + goto l150; } cl = (((ccIndex = (((usqInt) (longAt(rcvr))) >> 12) & 0x1F)) == 0 ? (longAt(rcvr - BaseHeaderSize)) & AllButTypeMask : longAt(((longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (CompactClasses << ShiftForWord))) + BaseHeaderSize) + ((ccIndex - 1) << ShiftForWord))); successBoolean = cl == (longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassPoint << ShiftForWord))); - l149: /* end isClassOfNonImm:equalTo: */; + l150: /* end isClassOfNonImm:equalTo: */; if (!successBoolean) { /* Don't overwrite an error code that has already been set. */ @@ -9087,14 +9094,14 @@ /* begin fetchNextBytecode */ currentBytecode = (byteAtPointer(++localIP)) + GIV(bytecodeSetSelector); - goto l148; + goto l149; } GIV(primFailCode) = 0; GIV(messageSelector) = longAt(((longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (SpecialSelectors << ShiftForWord))) + BaseHeaderSize) + ((0x1F * 2) << ShiftForWord)); GIV(argumentCount) = 0; goto normalSend; } - l148: /* end case */; + l149: /* end case */; break; case 208: case 209: @@ -9267,7 +9274,7 @@ case 0: /* begin internalPush: */ longAtPointerput((localSP -= BytesPerOop), GIV(falseObj)); - goto l150; + goto l151; break; case 1: @@ -9286,10 +9293,10 @@ : (byteAt((localFP + FoxIFrameFlags) + 2)) != 0)) { assert(isContext(frameContext(localFP))); context = longAt(localFP + FoxThisContext); - goto l151; + goto l152; } context = marryFrameSP(localFP, localSP); - l151: /* end ensureFrameIsMarried:SP: */; + l152: /* end ensureFrameIsMarried:SP: */; thing = context; break; @@ -9304,7 +9311,7 @@ /* begin internalPush: */ longAtPointerput((localSP -= BytesPerOop), thing); } - l150: /* end case */; + l151: /* end case */; break; case 336: /*80*/ /* bytecodePrimAdd */ @@ -9333,7 +9340,7 @@ /* begin fetchNextBytecode */ currentBytecode = (byteAtPointer(++localIP)) + GIV(bytecodeSetSelector); - goto l152; + goto l153; } } else { @@ -9348,77 +9355,77 @@ /* begin loadFloatOrIntFrom: */ if ((rcvr & 1)) { rcvr1 = ((double) ((rcvr >> 1)) ); - goto l153; + goto l154; } /* begin floatValueOf: */ /* begin is:instanceOf:compactClassIndex: */ if ((rcvr & 1)) { isFloat = 0; - goto l155; + goto l156; } /* begin isClassOfNonImm:equalTo:compactClassIndex: */ assert(!((rcvr & 1))); ccIndex = (((usqInt) (longAt(rcvr))) >> 12) & 0x1F; if (ccIndex == 0) { isFloat = ((longAt(rcvr - BaseHeaderSize)) & AllButTypeMask) == (longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassFloat << ShiftForWord))); - goto l159; + goto l160; } isFloat = ClassFloatCompactIndex == ccIndex; - goto l159; + goto l160; isFloat = (longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassFloat << ShiftForWord))) == (longAt(((longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (CompactClasses << ShiftForWord))) + BaseHeaderSize) + ((ccIndex - 1) << ShiftForWord))); - l159: /* end isClassOfNonImm:equalTo:compactClassIndex: */; - l155: /* end is:instanceOf:compactClassIndex: */; + l160: /* end isClassOfNonImm:equalTo:compactClassIndex: */; + l156: /* end is:instanceOf:compactClassIndex: */; if (isFloat) { ; fetchFloatAtinto(rcvr + (BaseHeaderSize), result1); rcvr1 = result1; - goto l156; + goto l157; } /* begin primitiveFail */ if (!GIV(primFailCode)) { GIV(primFailCode) = 1; } rcvr1 = 0.0; - l156: /* end floatValueOf: */; - l153: /* end loadFloatOrIntFrom: */; + l157: /* end floatValueOf: */; + l154: /* end loadFloatOrIntFrom: */; /* begin loadFloatOrIntFrom: */ if ((arg & 1)) { arg1 = ((double) ((arg >> 1)) ); - goto l154; + goto l155; } /* begin floatValueOf: */ /* begin is:instanceOf:compactClassIndex: */ if ((arg & 1)) { isFloat1 = 0; - goto l157; + goto l158; } /* begin isClassOfNonImm:equalTo:compactClassIndex: */ assert(!((arg & 1))); ccIndex1 = (((usqInt) (longAt(arg))) >> 12) & 0x1F; if (ccIndex1 == 0) { isFloat1 = ((longAt(arg - BaseHeaderSize)) & AllButTypeMask) == (longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassFloat << ShiftForWord))); - goto l160; + goto l161; } isFloat1 = ClassFloatCompactIndex == ccIndex1; - goto l160; + goto l161; isFloat1 = (longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassFloat << ShiftForWord))) == (longAt(((longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (CompactClasses << ShiftForWord))) + BaseHeaderSize) + ((ccIndex1 - 1) << ShiftForWord))); - l160: /* end isClassOfNonImm:equalTo:compactClassIndex: */; - l157: /* end is:instanceOf:compactClassIndex: */; + l161: /* end isClassOfNonImm:equalTo:compactClassIndex: */; + l158: /* end is:instanceOf:compactClassIndex: */; if (isFloat1) { ; fetchFloatAtinto(arg + (BaseHeaderSize), result2); arg1 = result2; - goto l158; + goto l159; } /* begin primitiveFail */ if (!GIV(primFailCode)) { GIV(primFailCode) = 1; } arg1 = 0.0; - l158: /* end floatValueOf: */; - l154: /* end loadFloatOrIntFrom: */; + l159: /* end floatValueOf: */; + l155: /* end loadFloatOrIntFrom: */; if (!GIV(primFailCode)) { /* begin pop:thenPushFloat: */ longAtput((sp = GIV(stackPointer) + ((2 - 1) * BytesPerWord)), floatObjectOf(rcvr1 + arg1)); @@ -9433,14 +9440,14 @@ /* begin fetchNextBytecode */ currentBytecode = (byteAtPointer(++localIP)) + GIV(bytecodeSetSelector); - goto l152; + goto l153; } } GIV(messageSelector) = longAt(((longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (SpecialSelectors << ShiftForWord))) + BaseHeaderSize) + ((0 * 2) << ShiftForWord)); GIV(argumentCount) = 1; goto normalSend; } - l152: /* end case */; + l153: /* end case */; break; case 337: /*81*/ /* bytecodePrimSubtract */ @@ -9469,7 +9476,7 @@ /* begin fetchNextBytecode */ currentBytecode = (byteAtPointer(++localIP)) + GIV(bytecodeSetSelector); - goto l161; + goto l162; } } else { @@ -9484,77 +9491,77 @@ /* begin loadFloatOrIntFrom: */ if ((rcvr & 1)) { rcvr1 = ((double) ((rcvr >> 1)) ); - goto l162; + goto l163; } /* begin floatValueOf: */ /* begin is:instanceOf:compactClassIndex: */ if ((rcvr & 1)) { isFloat = 0; - goto l164; + goto l165; } /* begin isClassOfNonImm:equalTo:compactClassIndex: */ assert(!((rcvr & 1))); ccIndex = (((usqInt) (longAt(rcvr))) >> 12) & 0x1F; if (ccIndex == 0) { isFloat = ((longAt(rcvr - BaseHeaderSize)) & AllButTypeMask) == (longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassFloat << ShiftForWord))); - goto l168; + goto l169; } isFloat = ClassFloatCompactIndex == ccIndex; - goto l168; + goto l169; isFloat = (longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassFloat << ShiftForWord))) == (longAt(((longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (CompactClasses << ShiftForWord))) + BaseHeaderSize) + ((ccIndex - 1) << ShiftForWord))); - l168: /* end isClassOfNonImm:equalTo:compactClassIndex: */; - l164: /* end is:instanceOf:compactClassIndex: */; + l169: /* end isClassOfNonImm:equalTo:compactClassIndex: */; + l165: /* end is:instanceOf:compactClassIndex: */; if (isFloat) { ; fetchFloatAtinto(rcvr + (BaseHeaderSize), result1); rcvr1 = result1; - goto l165; + goto l166; } /* begin primitiveFail */ if (!GIV(primFailCode)) { GIV(primFailCode) = 1; } rcvr1 = 0.0; - l165: /* end floatValueOf: */; - l162: /* end loadFloatOrIntFrom: */; + l166: /* end floatValueOf: */; + l163: /* end loadFloatOrIntFrom: */; /* begin loadFloatOrIntFrom: */ if ((arg & 1)) { arg1 = ((double) ((arg >> 1)) ); - goto l163; + goto l164; } /* begin floatValueOf: */ /* begin is:instanceOf:compactClassIndex: */ if ((arg & 1)) { isFloat1 = 0; - goto l166; + goto l167; } /* begin isClassOfNonImm:equalTo:compactClassIndex: */ assert(!((arg & 1))); ccIndex1 = (((usqInt) (longAt(arg))) >> 12) & 0x1F; if (ccIndex1 == 0) { isFloat1 = ((longAt(arg - BaseHeaderSize)) & AllButTypeMask) == (longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassFloat << ShiftForWord))); - goto l169; + goto l170; } isFloat1 = ClassFloatCompactIndex == ccIndex1; - goto l169; + goto l170; isFloat1 = (longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassFloat << ShiftForWord))) == (longAt(((longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (CompactClasses << ShiftForWord))) + BaseHeaderSize) + ((ccIndex1 - 1) << ShiftForWord))); - l169: /* end isClassOfNonImm:equalTo:compactClassIndex: */; - l166: /* end is:instanceOf:compactClassIndex: */; + l170: /* end isClassOfNonImm:equalTo:compactClassIndex: */; + l167: /* end is:instanceOf:compactClassIndex: */; if (isFloat1) { ; fetchFloatAtinto(arg + (BaseHeaderSize), result2); arg1 = result2; - goto l167; + goto l168; } /* begin primitiveFail */ if (!GIV(primFailCode)) { GIV(primFailCode) = 1; } arg1 = 0.0; - l167: /* end floatValueOf: */; - l163: /* end loadFloatOrIntFrom: */; + l168: /* end floatValueOf: */; + l164: /* end loadFloatOrIntFrom: */; if (!GIV(primFailCode)) { /* begin pop:thenPushFloat: */ longAtput((sp = GIV(stackPointer) + ((2 - 1) * BytesPerWord)), floatObjectOf(rcvr1 - arg1)); @@ -9569,14 +9576,14 @@ /* begin fetchNextBytecode */ currentBytecode = (byteAtPointer(++localIP)) + GIV(bytecodeSetSelector); - goto l161; + goto l162; } } GIV(messageSelector) = longAt(((longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (SpecialSelectors << ShiftForWord))) + BaseHeaderSize) + ((1 * 2) << ShiftForWord)); GIV(argumentCount) = 1; goto normalSend; } - l161: /* end case */; + l162: /* end case */; break; case 338: /*82*/ /* bytecodePrimLessThanV4 */ @@ -9608,7 +9615,7 @@ else { goto booleanCheatFalseV4; } - goto l170; + goto l171; } /* begin initPrimCall */ GIV(primFailCode) = 0; @@ -9616,77 +9623,77 @@ /* begin loadFloatOrIntFrom: */ if ((rcvr & 1)) { rcvr1 = ((double) ((rcvr >> 1)) ); - goto l171; + goto l172; } /* begin floatValueOf: */ /* begin is:instanceOf:compactClassIndex: */ if ((rcvr & 1)) { isFloat = 0; - goto l173; + goto l174; } /* begin isClassOfNonImm:equalTo:compactClassIndex: */ assert(!((rcvr & 1))); ccIndex = (((usqInt) (longAt(rcvr))) >> 12) & 0x1F; if (ccIndex == 0) { isFloat = ((longAt(rcvr - BaseHeaderSize)) & AllButTypeMask) == (longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassFloat << ShiftForWord))); - goto l177; + goto l178; } isFloat = ClassFloatCompactIndex == ccIndex; - goto l177; + goto l178; isFloat = (longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassFloat << ShiftForWord))) == (longAt(((longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (CompactClasses << ShiftForWord))) + BaseHeaderSize) + ((ccIndex - 1) << ShiftForWord))); - l177: /* end isClassOfNonImm:equalTo:compactClassIndex: */; - l173: /* end is:instanceOf:compactClassIndex: */; + l178: /* end isClassOfNonImm:equalTo:compactClassIndex: */; + l174: /* end is:instanceOf:compactClassIndex: */; if (isFloat) { ; fetchFloatAtinto(rcvr + (BaseHeaderSize), result); rcvr1 = result; - goto l174; + goto l175; } /* begin primitiveFail */ if (!GIV(primFailCode)) { GIV(primFailCode) = 1; } rcvr1 = 0.0; - l174: /* end floatValueOf: */; - l171: /* end loadFloatOrIntFrom: */; + l175: /* end floatValueOf: */; + l172: /* end loadFloatOrIntFrom: */; /* begin loadFloatOrIntFrom: */ if ((arg & 1)) { arg1 = ((double) ((arg >> 1)) ); - goto l172; + goto l173; } /* begin floatValueOf: */ /* begin is:instanceOf:compactClassIndex: */ if ((arg & 1)) { isFloat1 = 0; - goto l175; + goto l176; } /* begin isClassOfNonImm:equalTo:compactClassIndex: */ assert(!((arg & 1))); ccIndex1 = (((usqInt) (longAt(arg))) >> 12) & 0x1F; if (ccIndex1 == 0) { isFloat1 = ((longAt(arg - BaseHeaderSize)) & AllButTypeMask) == (longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassFloat << ShiftForWord))); - goto l178; + goto l179; } isFloat1 = ClassFloatCompactIndex == ccIndex1; - goto l178; + goto l179; isFloat1 = (longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassFloat << ShiftForWord))) == (longAt(((longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (CompactClasses << ShiftForWord))) + BaseHeaderSize) + ((ccIndex1 - 1) << ShiftForWord))); - l178: /* end isClassOfNonImm:equalTo:compactClassIndex: */; - l175: /* end is:instanceOf:compactClassIndex: */; + l179: /* end isClassOfNonImm:equalTo:compactClassIndex: */; + l176: /* end is:instanceOf:compactClassIndex: */; if (isFloat1) { ; fetchFloatAtinto(arg + (BaseHeaderSize), result1); arg1 = result1; - goto l176; + goto l177; } /* begin primitiveFail */ if (!GIV(primFailCode)) { GIV(primFailCode) = 1; } arg1 = 0.0; - l176: /* end floatValueOf: */; - l172: /* end loadFloatOrIntFrom: */; + l177: /* end floatValueOf: */; + l173: /* end loadFloatOrIntFrom: */; aBool = rcvr1 < arg1; if (!GIV(primFailCode)) { /* begin booleanCheatV4: */ @@ -9696,13 +9703,13 @@ else { goto booleanCheatFalseV4; } - goto l170; + goto l171; } GIV(messageSelector) = longAt(((longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (SpecialSelectors << ShiftForWord))) + BaseHeaderSize) + ((2 * 2) << ShiftForWord)); GIV(argumentCount) = 1; goto normalSend; } - l170: /* end case */; + l171: /* end case */; booleanCheatTrueV4: /* booleanCheatTrueV4 */ @@ -9725,7 +9732,7 @@ /* begin fetchNextBytecode */ currentBytecode = (byteAtPointer(++localIP)) + GIV(bytecodeSetSelector); - goto l316; + goto l318; } if (bytecode == 244) { @@ -9735,7 +9742,7 @@ /* begin fetchNextBytecode */ currentBytecode = (byteAtPointer(++localIP)) + GIV(bytecodeSetSelector); - goto l316; + goto l318; } if (bytecode == 243) { @@ -9746,7 +9753,7 @@ localIP = (localIP + offset) + 1; currentBytecode = (byteAtPointer(localIP)) + GIV(bytecodeSetSelector); - goto l316; + goto l318; } } currentBytecode = bytecode + GIV(bytecodeSetSelector); @@ -9754,7 +9761,7 @@ /* begin internalPush: */ longAtPointerput((localSP -= BytesPerOop), GIV(trueObj)); } - l316: /* end case */; + l318: /* end case */; break; case 339: /*83*/ /* bytecodePrimGreaterThanV4 */ @@ -9786,7 +9793,7 @@ else { /* goto booleanCheatFalseV4 */ } - goto l179; + goto l180; } /* begin initPrimCall */ GIV(primFailCode) = 0; @@ -9794,77 +9801,77 @@ /* begin loadFloatOrIntFrom: */ if ((rcvr & 1)) { rcvr1 = ((double) ((rcvr >> 1)) ); - goto l180; + goto l181; } /* begin floatValueOf: */ /* begin is:instanceOf:compactClassIndex: */ if ((rcvr & 1)) { isFloat = 0; - goto l182; + goto l183; } /* begin isClassOfNonImm:equalTo:compactClassIndex: */ assert(!((rcvr & 1))); ccIndex = (((usqInt) (longAt(rcvr))) >> 12) & 0x1F; if (ccIndex == 0) { isFloat = ((longAt(rcvr - BaseHeaderSize)) & AllButTypeMask) == (longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassFloat << ShiftForWord))); - goto l186; + goto l187; } isFloat = ClassFloatCompactIndex == ccIndex; - goto l186; + goto l187; isFloat = (longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassFloat << ShiftForWord))) == (longAt(((longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (CompactClasses << ShiftForWord))) + BaseHeaderSize) + ((ccIndex - 1) << ShiftForWord))); - l186: /* end isClassOfNonImm:equalTo:compactClassIndex: */; - l182: /* end is:instanceOf:compactClassIndex: */; + l187: /* end isClassOfNonImm:equalTo:compactClassIndex: */; + l183: /* end is:instanceOf:compactClassIndex: */; if (isFloat) { ; fetchFloatAtinto(rcvr + (BaseHeaderSize), result); rcvr1 = result; - goto l183; + goto l184; } /* begin primitiveFail */ if (!GIV(primFailCode)) { GIV(primFailCode) = 1; } rcvr1 = 0.0; - l183: /* end floatValueOf: */; - l180: /* end loadFloatOrIntFrom: */; + l184: /* end floatValueOf: */; + l181: /* end loadFloatOrIntFrom: */; /* begin loadFloatOrIntFrom: */ if ((arg & 1)) { arg1 = ((double) ((arg >> 1)) ); - goto l181; + goto l182; } /* begin floatValueOf: */ /* begin is:instanceOf:compactClassIndex: */ if ((arg & 1)) { isFloat1 = 0; - goto l184; + goto l185; } /* begin isClassOfNonImm:equalTo:compactClassIndex: */ assert(!((arg & 1))); ccIndex1 = (((usqInt) (longAt(arg))) >> 12) & 0x1F; if (ccIndex1 == 0) { isFloat1 = ((longAt(arg - BaseHeaderSize)) & AllButTypeMask) == (longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassFloat << ShiftForWord))); - goto l187; + goto l188; } isFloat1 = ClassFloatCompactIndex == ccIndex1; - goto l187; + goto l188; isFloat1 = (longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassFloat << ShiftForWord))) == (longAt(((longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (CompactClasses << ShiftForWord))) + BaseHeaderSize) + ((ccIndex1 - 1) << ShiftForWord))); - l187: /* end isClassOfNonImm:equalTo:compactClassIndex: */; - l184: /* end is:instanceOf:compactClassIndex: */; + l188: /* end isClassOfNonImm:equalTo:compactClassIndex: */; + l185: /* end is:instanceOf:compactClassIndex: */; if (isFloat1) { ; fetchFloatAtinto(arg + (BaseHeaderSize), result1); arg1 = result1; - goto l185; + goto l186; } /* begin primitiveFail */ if (!GIV(primFailCode)) { GIV(primFailCode) = 1; } arg1 = 0.0; - l185: /* end floatValueOf: */; - l181: /* end loadFloatOrIntFrom: */; + l186: /* end floatValueOf: */; + l182: /* end loadFloatOrIntFrom: */; aBool = rcvr1 > arg1; if (!GIV(primFailCode)) { /* begin booleanCheatV4: */ @@ -9874,13 +9881,13 @@ else { goto booleanCheatFalseV4; } - goto l179; + goto l180; } GIV(messageSelector) = longAt(((longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (SpecialSelectors << ShiftForWord))) + BaseHeaderSize) + ((3 * 2) << ShiftForWord)); GIV(argumentCount) = 1; goto normalSend; } - l179: /* end case */; + l180: /* end case */; booleanCheatFalseV4: /* booleanCheatFalseV4 */ @@ -9904,7 +9911,7 @@ localIP = (localIP + (bytecode - 207)) + 1; currentBytecode = (byteAtPointer(localIP)) + GIV(bytecodeSetSelector); - goto l317; + goto l319; } if (bytecode == 244) { @@ -9915,14 +9922,14 @@ localIP = (localIP + offset) + 1; currentBytecode = (byteAtPointer(localIP)) + GIV(bytecodeSetSelector); - goto l317; + goto l319; } currentBytecode = bytecode + GIV(bytecodeSetSelector); /* begin internalPush: */ longAtPointerput((localSP -= BytesPerOop), GIV(falseObj)); } - l317: /* end case */; + l319: /* end case */; @@ Diff output truncated at 50000 characters. @@

1 0

VM Maker: VMMaker.oscog-eem.672.mcz
by commits＠source.squeak.org 11 Apr '14

11 Apr '14

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.672.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.672 Author: eem Time: 11 April 2014, 11:40:53.798 am UUID: 21493732-2e31-4b57-a8ae-aa6e6a9e4c3c Ancestors: VMMaker.oscog-eem.671 Implement the new Spur interpreterProxy API for ObjectMemory (of course pinObject: fails, and isCharacterValue: has a smaller range). =============== Diff against VMMaker.oscog-eem.671 =============== Item was added: + ----- Method: NewObjectMemory>>characterValueOf: (in category 'primitive support') ----- + characterValueOf: oop + <api> + (self isCharacterObject: oop) ifFalse: + [coInterpreter primitiveFailFor: PrimErrUnsupported. + ^-1]. + ^self integerValueOf: (self fetchPointer: 0 ofObject: oop)! Item was added: + ----- Method: NewObjectMemory>>pinObject: (in category 'primitive support') ----- + pinObject: objOop + "For forward-compatibility with Spur. Fail; ObjectMemory does not support pinning." + <api> + coInterpreter primitiveFailFor: PrimErrUnsupported! Item was added: + ----- Method: ObjectMemory>>characterObjectOf: (in category 'primitive support') ----- + characterObjectOf: characterCode + <api> + ^(characterCode between: 0 and: 255) + ifTrue: [self fetchPointer: characterCode ofObject: self characterTable] + ifFalse: [nilObj]! Item was added: + ----- Method: ObjectMemory>>isCharacterValue: (in category 'primitive support') ----- + isCharacterValue: anInteger + <api> + ^self isInRangeCharacterCode: anInteger! Item was changed: ----- Method: ObjectMemory>>isInRangeCharacterCode: (in category 'interpreter access') ----- isInRangeCharacterCode: characterCode + ^characterCode between: 0 and: 255! - ^characterCode >= 0 and: [characterCode <= 255]! Item was added: + ----- Method: ObjectMemory>>isPinned: (in category 'primitive support') ----- + isPinned: objOop + "For forward-compatibility with Spur. Answer false; ObjectMemory does not support pinning." + <api> + ^false! Item was changed: ----- Method: SpurMemoryManager class>>vmProxyMinorVersion (in category 'simulation only') ----- vmProxyMinorVersion - "hack around the CoInterpreter/ObjectMemory split refactoring" ^StackInterpreter vmProxyMinorVersion max: 13! Item was changed: ----- Method: SpurMemoryManager>>pinObject: (in category 'primitive support') ----- pinObject: objOop + "Pin objOop in memory. If objOop is in oldSpace merely set its isPinned + bit. If objOop is in newSpace then created a pinned copy in oldSpace + and forward objOop to the pinned copy. Answer the (possibly changed) + oop of the pinned object." <api> self shouldBeImplemented! Item was changed: ----- Method: StackInterpreter class>>vmProxyMinorVersion (in category 'api version') ----- vmProxyMinorVersion "Define the VM_PROXY_MINOR version for this VM as used to define the api in platforms/Cross/vm/sqVirtualMachine.[ch]" + ^false + ifTrue: + [(initializationOptions at: #SpurObjectMemory ifAbsent: [false]) + ifTrue: [13] + ifFalse: [12]] + ifFalse: [13] "As of 4/11/2014 ObjectMemory supports the new API"! - ^(initializationOptions at: #SpurObjectMemory ifAbsent: [false]) - ifTrue: [13] - ifFalse: [12]!

1 0

[commit][2891] CogVM source as per VMMaker.oscog-eem.671
by commits＠squeakvm.org 10 Apr '14

10 Apr '14

Revision: 2891 Author: eliot Date: 2014-04-10 11:41:54 -0700 (Thu, 10 Apr 2014) Log Message: ----------- CogVM source as per VMMaker.oscog-eem.671 Sista: Revise counter tripping so that ceCounterTripped: repositions the context's pc after the send preceeding the conditional branch, instead of it being done by slower Smalltalk code (skipBackAfterJump which for convenience may parse from the beginning of the method). Make sure findUnofficialFiles looks in the sista dirs. Modified Paths: -------------- branches/Cog/scripts/findUnofficialFiles branches/Cog/sistasrc/vm/cogit.c branches/Cog/sistasrc/vm/cogit.h branches/Cog/sistasrc/vm/cogmethod.h branches/Cog/sistasrc/vm/cointerp.c branches/Cog/sistasrc/vm/cointerp.h branches/Cog/sistasrc/vm/gcc3x-cointerp.c branches/Cog/sistasrc/vm/interp.h branches/Cog/sistasrc/vm/vmCallback.h branches/Cog/spursistasrc/vm/cogit.c branches/Cog/spursistasrc/vm/cogit.h branches/Cog/spursistasrc/vm/cogmethod.h branches/Cog/spursistasrc/vm/cointerp.c branches/Cog/spursistasrc/vm/cointerp.h branches/Cog/spursistasrc/vm/gcc3x-cointerp.c branches/Cog/spursistasrc/vm/interp.h branches/Cog/spursistasrc/vm/vmCallback.h Property Changed: ---------------- branches/Cog/platforms/Cross/vm/sqSCCSVersion.h Property changes on: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h ___________________________________________________________________ Modified: checkindate - Wed Apr 9 12:27:13 PDT 2014 + Thu Apr 10 11:40:46 PDT 2014 Modified: branches/Cog/scripts/findUnofficialFiles =================================================================== --- branches/Cog/scripts/findUnofficialFiles 2014-04-09 19:32:17 UTC (rev 2890) +++ branches/Cog/scripts/findUnofficialFiles 2014-04-10 18:41:54 UTC (rev 2891) @@ -1,4 +1,4 @@ #!/bin/sh # List any files with an un-checked-in package version comment "* VMMaker-..." find ${@-src nscogsrc stacksrc spursrc spurstacksrc nsspursrc nsspurstacksrc sistasrc spursistasrc} -name .svn -prune -o $ -type f -a -name '*.[ch]' $ \ - -exec egrep -l '\* VMMaker|\* VMConstruction' {} \; + -exec egrep -l '\* VMMaker|\* VMConstruction|\* Freetype-Plugin|\* Cog-' {} \; Modified: branches/Cog/sistasrc/vm/cogit.c =================================================================== --- branches/Cog/sistasrc/vm/cogit.c 2014-04-09 19:32:17 UTC (rev 2890) +++ branches/Cog/sistasrc/vm/cogit.c 2014-04-10 18:41:54 UTC (rev 2891) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.670 uuid: 071bf6af-04c0-4256-b053-d66378b73d27 + CCodeGenerator VMMaker.oscog-eem.671 uuid: 49fb678b-0fe3-42cf-a276-c617f429951d from - SistaStackToRegisterMappingCogit VMMaker.oscog-eem.670 uuid: 071bf6af-04c0-4256-b053-d66378b73d27 + SistaStackToRegisterMappingCogit VMMaker.oscog-eem.671 uuid: 49fb678b-0fe3-42cf-a276-c617f429951d */ -static char __buildInfo[] = "SistaStackToRegisterMappingCogit VMMaker.oscog-eem.670 uuid: 071bf6af-04c0-4256-b053-d66378b73d27 " __DATE__ ; +static char __buildInfo[] = "SistaStackToRegisterMappingCogit VMMaker.oscog-eem.671 uuid: 49fb678b-0fe3-42cf-a276-c617f429951d " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -797,6 +797,7 @@ static AbstractInstruction * genoperandoperandoperand(sqInt opcode, sqInt operandOne, sqInt operandTwo, sqInt operandThree); static AbstractInstruction * getInlineCacheClassTagFrominto(sqInt sourceReg, sqInt destReg); static AbstractInstruction * getJmpTarget(AbstractInstruction * self_in_getJmpTarget); +sqInt getJumpTargetPCAt(sqInt pc); static sqInt getLiteral(sqInt litIndex); static sqInt hasDoublePrecisionFloatingPointSupport(AbstractInstruction * self_in_hasDoublePrecisionFloatingPointSupport); static sqInt hasLinkRegister(AbstractInstruction * self_in_hasLinkRegister); @@ -12035,19 +12036,20 @@ void *jumpTarget; AbstractInstruction *ok; sqInt quickConstant; - sqInt reg1; AbstractInstruction *retry; ssFlushTo(simStackPtr - 1); desc = ssTop(); ssPop(1); + /* begin Label */ + retry = genoperandoperand(Label, (labelCounter += 1), bytecodePC); popToReg(desc, TempReg); ssAllocateRequiredReg(SendNumArgsReg); counter = (&(counters[counterIndex])); counterIndex += 1; flag("will need to use MoveAw32:R: if 64 bits"); assert(BytesPerWord == CounterBytes); - retry = addDependent(counter, annotateAbsolutePCRef(gMoveAwR(((usqInt)counter), SendNumArgsReg))); + addDependent(counter, annotateAbsolutePCRef(gMoveAwR(((usqInt)counter), SendNumArgsReg))); /* begin SubCq:R: */ genoperandoperand(SubCqR, 65536, SendNumArgsReg); /* begin JumpCarry: */ @@ -12077,11 +12079,6 @@ /* begin Label */ abstractInstruction = genoperandoperand(Label, (labelCounter += 1), bytecodePC); annotatewith(abstractInstruction, HasBytecodePC); - if ((cResultRegister(backEnd)) != TempReg) { - /* begin MoveR:R: */ - reg1 = cResultRegister(backEnd); - genoperandoperand(MoveRR, reg1, TempReg); - } /* begin Jump: */ genoperand(Jump, ((sqInt)retry)); jmpTarget(ok, gLabel()); @@ -12334,6 +12331,7 @@ genMustBeBooleanTrampolineForcalled(sqInt boolean, char *trampolineName) { AbstractInstruction *jumpMBB; + sqInt reg1; opcodeIndex = 0; /* begin CmpCq:R: */ @@ -12341,6 +12339,11 @@ /* begin JumpZero: */ jumpMBB = genoperand(JumpZero, ((sqInt)0)); compileTrampolineForcallJumpBarnumArgsargargargargsaveRegsresultReg(ceCounterTripped, 1, 1, TempReg, null, null, null, 0, null); + if ((cResultRegister(backEnd)) != ReceiverResultReg) { + /* begin MoveR:R: */ + reg1 = cResultRegister(backEnd); + genoperandoperand(MoveRR, reg1, ReceiverResultReg); + } assert(!(shouldAnnotateObjectReference(boolean))); jmpTarget(jumpMBB, gAddCqR(boolean, TempReg)); return genTrampolineForcalledcallJumpBarnumArgsargargargargsaveRegsresultRegappendOpcodes(ceSendMustBeBoolean, trampolineName, 1, 1, TempReg, null, null, null, 0, null, 1); @@ -15059,6 +15062,12 @@ return ((AbstractInstruction *) (((self_in_getJmpTarget->operands))[0])); } +sqInt +getJumpTargetPCAt(sqInt pc) +{ + return jumpTargetPCAt(backEnd, pc); +} + static sqInt getLiteral(sqInt litIndex) { Modified: branches/Cog/sistasrc/vm/cogit.h =================================================================== --- branches/Cog/sistasrc/vm/cogit.h 2014-04-09 19:32:17 UTC (rev 2890) +++ branches/Cog/sistasrc/vm/cogit.h 2014-04-10 18:41:54 UTC (rev 2891) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.670 uuid: 071bf6af-04c0-4256-b053-d66378b73d27 + CCodeGenerator VMMaker.oscog-eem.671 uuid: 49fb678b-0fe3-42cf-a276-c617f429951d */ @@ -38,6 +38,7 @@ sqInt genQuickReturnConst(void); sqInt genQuickReturnInstVar(void); sqInt genQuickReturnSelf(void); +sqInt getJumpTargetPCAt(sqInt pc); void initializeCodeZoneFromupTo(sqInt startAddress, sqInt endAddress); sqInt interpretOffset(void); sqInt isPCWithinMethodZone(char *address); Modified: branches/Cog/sistasrc/vm/cogmethod.h =================================================================== --- branches/Cog/sistasrc/vm/cogmethod.h 2014-04-09 19:32:17 UTC (rev 2890) +++ branches/Cog/sistasrc/vm/cogmethod.h 2014-04-10 18:41:54 UTC (rev 2891) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.670 uuid: 071bf6af-04c0-4256-b053-d66378b73d27 + CCodeGenerator VMMaker.oscog-eem.671 uuid: 49fb678b-0fe3-42cf-a276-c617f429951d */ typedef struct { Modified: branches/Cog/sistasrc/vm/cointerp.c =================================================================== --- branches/Cog/sistasrc/vm/cointerp.c 2014-04-09 19:32:17 UTC (rev 2890) +++ branches/Cog/sistasrc/vm/cointerp.c 2014-04-10 18:41:54 UTC (rev 2891) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.670 uuid: 071bf6af-04c0-4256-b053-d66378b73d27 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.671 uuid: 49fb678b-0fe3-42cf-a276-c617f429951d from - CoInterpreter VMMaker.oscog-eem.670 uuid: 071bf6af-04c0-4256-b053-d66378b73d27 + CoInterpreter VMMaker.oscog-eem.671 uuid: 49fb678b-0fe3-42cf-a276-c617f429951d */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.670 uuid: 071bf6af-04c0-4256-b053-d66378b73d27 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.671 uuid: 49fb678b-0fe3-42cf-a276-c617f429951d " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2034,7 +2034,7 @@ /* 574 */ (void (*)(void))0, /* 575 */ (void (*)(void))0, 0 }; -const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.670]"; +const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.671]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; @@ -11253,6 +11253,17 @@ } +/* Two things are going on here. The main one is catching a counter trip and + attempting to send the SelectorCounterTripped selector. In this case, if + the send can be made, the + pc should be backed up to the return address of the send that yields the + boolean to be + tested, so that after potential optimization, computation proceeds by + retryying the jump. + + The minor case is that there is an unlikely possibility that the cointer + tripped but condition + is not a boolean, in which case a mustBeBoolean response should occur. */ /* Send e.g. thisContext conditionalBranchCounterTrippedOn: boolean. */ sqInt @@ -11265,8 +11276,25 @@ sqInt methodHeader; char *sp; char *sp1; + char *sp11; + char *sp2; sqInt top; + if (!((condition == GIV(falseObj)) + || (condition == GIV(trueObj)))) { + /* begin ceSendMustBeBoolean: */ + /* begin popStack */ + top = longAt(GIV(stackPointer)); + GIV(stackPointer) += BytesPerWord; + GIV(instructionPointer) = ((sqInt) top); + /* begin push: */ + longAtput((sp2 = GIV(stackPointer) - BytesPerWord), condition); + GIV(stackPointer) = sp2; + /* begin push: */ + longAtput((sp11 = GIV(stackPointer) - BytesPerWord), GIV(instructionPointer)); + GIV(stackPointer) = sp11; + return ceSendAborttonumArgs(longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (SelectorMustBeBoolean << ShiftForWord)), condition, 0); + } counterTrippedSelector = (SelectorCounterTripped < (lengthOf(GIV(specialObjectsOop))) ? longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (SelectorCounterTripped << ShiftForWord)) : 0); @@ -11288,10 +11316,7 @@ resetCountersIn(mframeHomeMethod(GIV(framePointer))); return condition; } - /* begin popStack */ - top = longAt(GIV(stackPointer)); - GIV(stackPointer) += BytesPerWord; - GIV(instructionPointer) = ((sqInt) top); + GIV(instructionPointer) = getJumpTargetPCAt(popStack()); /* begin ensureFrameIsMarried:SP: */ if (((((usqInt)(longAt(GIV(framePointer) + FoxMethod)))) < (startOfMemory()) ? ((longAt(GIV(framePointer) + FoxMethod)) & MFMethodFlagHasContextFlag) != 0 Modified: branches/Cog/sistasrc/vm/cointerp.h =================================================================== --- branches/Cog/sistasrc/vm/cointerp.h 2014-04-09 19:32:17 UTC (rev 2890) +++ branches/Cog/sistasrc/vm/cointerp.h 2014-04-10 18:41:54 UTC (rev 2891) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.670 uuid: 071bf6af-04c0-4256-b053-d66378b73d27 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.671 uuid: 49fb678b-0fe3-42cf-a276-c617f429951d */ Modified: branches/Cog/sistasrc/vm/gcc3x-cointerp.c =================================================================== --- branches/Cog/sistasrc/vm/gcc3x-cointerp.c 2014-04-09 19:32:17 UTC (rev 2890) +++ branches/Cog/sistasrc/vm/gcc3x-cointerp.c 2014-04-10 18:41:54 UTC (rev 2891) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.670 uuid: 071bf6af-04c0-4256-b053-d66378b73d27 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.671 uuid: 49fb678b-0fe3-42cf-a276-c617f429951d from - CoInterpreter VMMaker.oscog-eem.670 uuid: 071bf6af-04c0-4256-b053-d66378b73d27 + CoInterpreter VMMaker.oscog-eem.671 uuid: 49fb678b-0fe3-42cf-a276-c617f429951d */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.670 uuid: 071bf6af-04c0-4256-b053-d66378b73d27 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.671 uuid: 49fb678b-0fe3-42cf-a276-c617f429951d " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2037,7 +2037,7 @@ /* 574 */ (void (*)(void))0, /* 575 */ (void (*)(void))0, 0 }; -const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.670]"; +const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.671]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; @@ -11262,6 +11262,17 @@ } +/* Two things are going on here. The main one is catching a counter trip and + attempting to send the SelectorCounterTripped selector. In this case, if + the send can be made, the + pc should be backed up to the return address of the send that yields the + boolean to be + tested, so that after potential optimization, computation proceeds by + retryying the jump. + + The minor case is that there is an unlikely possibility that the cointer + tripped but condition + is not a boolean, in which case a mustBeBoolean response should occur. */ /* Send e.g. thisContext conditionalBranchCounterTrippedOn: boolean. */ sqInt @@ -11274,8 +11285,25 @@ sqInt methodHeader; char *sp; char *sp1; + char *sp11; + char *sp2; sqInt top; + if (!((condition == GIV(falseObj)) + || (condition == GIV(trueObj)))) { + /* begin ceSendMustBeBoolean: */ + /* begin popStack */ + top = longAt(GIV(stackPointer)); + GIV(stackPointer) += BytesPerWord; + GIV(instructionPointer) = ((sqInt) top); + /* begin push: */ + longAtput((sp2 = GIV(stackPointer) - BytesPerWord), condition); + GIV(stackPointer) = sp2; + /* begin push: */ + longAtput((sp11 = GIV(stackPointer) - BytesPerWord), GIV(instructionPointer)); + GIV(stackPointer) = sp11; + return ceSendAborttonumArgs(longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (SelectorMustBeBoolean << ShiftForWord)), condition, 0); + } counterTrippedSelector = (SelectorCounterTripped < (lengthOf(GIV(specialObjectsOop))) ? longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (SelectorCounterTripped << ShiftForWord)) : 0); @@ -11297,10 +11325,7 @@ resetCountersIn(mframeHomeMethod(GIV(framePointer))); return condition; } - /* begin popStack */ - top = longAt(GIV(stackPointer)); - GIV(stackPointer) += BytesPerWord; - GIV(instructionPointer) = ((sqInt) top); + GIV(instructionPointer) = getJumpTargetPCAt(popStack()); /* begin ensureFrameIsMarried:SP: */ if (((((usqInt)(longAt(GIV(framePointer) + FoxMethod)))) < (startOfMemory()) ? ((longAt(GIV(framePointer) + FoxMethod)) & MFMethodFlagHasContextFlag) != 0 Modified: branches/Cog/sistasrc/vm/interp.h =================================================================== --- branches/Cog/sistasrc/vm/interp.h 2014-04-09 19:32:17 UTC (rev 2890) +++ branches/Cog/sistasrc/vm/interp.h 2014-04-10 18:41:54 UTC (rev 2891) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.670 uuid: 071bf6af-04c0-4256-b053-d66378b73d27 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.671 uuid: 49fb678b-0fe3-42cf-a276-c617f429951d */ #define VM_PROXY_MAJOR 1 Modified: branches/Cog/sistasrc/vm/vmCallback.h =================================================================== --- branches/Cog/sistasrc/vm/vmCallback.h 2014-04-09 19:32:17 UTC (rev 2890) +++ branches/Cog/sistasrc/vm/vmCallback.h 2014-04-10 18:41:54 UTC (rev 2891) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.670 uuid: 071bf6af-04c0-4256-b053-d66378b73d27 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.671 uuid: 49fb678b-0fe3-42cf-a276-c617f429951d */ #define VM_CALLBACK_INC 1 Modified: branches/Cog/spursistasrc/vm/cogit.c =================================================================== --- branches/Cog/spursistasrc/vm/cogit.c 2014-04-09 19:32:17 UTC (rev 2890) +++ branches/Cog/spursistasrc/vm/cogit.c 2014-04-10 18:41:54 UTC (rev 2891) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.670 uuid: 071bf6af-04c0-4256-b053-d66378b73d27 + CCodeGenerator VMMaker.oscog-eem.671 uuid: 49fb678b-0fe3-42cf-a276-c617f429951d from - SistaStackToRegisterMappingCogit VMMaker.oscog-eem.670 uuid: 071bf6af-04c0-4256-b053-d66378b73d27 + SistaStackToRegisterMappingCogit VMMaker.oscog-eem.671 uuid: 49fb678b-0fe3-42cf-a276-c617f429951d */ -static char __buildInfo[] = "SistaStackToRegisterMappingCogit VMMaker.oscog-eem.670 uuid: 071bf6af-04c0-4256-b053-d66378b73d27 " __DATE__ ; +static char __buildInfo[] = "SistaStackToRegisterMappingCogit VMMaker.oscog-eem.671 uuid: 49fb678b-0fe3-42cf-a276-c617f429951d " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -795,6 +795,7 @@ static AbstractInstruction * genoperandoperandoperand(sqInt opcode, sqInt operandOne, sqInt operandTwo, sqInt operandThree); static AbstractInstruction * getInlineCacheClassTagFrominto(sqInt sourceReg, sqInt destReg); static AbstractInstruction * getJmpTarget(AbstractInstruction * self_in_getJmpTarget); +sqInt getJumpTargetPCAt(sqInt pc); static sqInt getLiteral(sqInt litIndex); static sqInt hasDoublePrecisionFloatingPointSupport(AbstractInstruction * self_in_hasDoublePrecisionFloatingPointSupport); static sqInt hasLinkRegister(AbstractInstruction * self_in_hasLinkRegister); @@ -12883,19 +12884,20 @@ void *jumpTarget; AbstractInstruction *ok; sqInt quickConstant; - sqInt reg1; AbstractInstruction *retry; ssFlushTo(simStackPtr - 1); desc = ssTop(); ssPop(1); + /* begin Label */ + retry = genoperandoperand(Label, (labelCounter += 1), bytecodePC); popToReg(desc, TempReg); ssAllocateRequiredReg(SendNumArgsReg); counter = (&(counters[counterIndex])); counterIndex += 1; flag("will need to use MoveAw32:R: if 64 bits"); assert(BytesPerWord == CounterBytes); - retry = addDependent(counter, annotateAbsolutePCRef(gMoveAwR(((usqInt)counter), SendNumArgsReg))); + addDependent(counter, annotateAbsolutePCRef(gMoveAwR(((usqInt)counter), SendNumArgsReg))); /* begin SubCq:R: */ genoperandoperand(SubCqR, 65536, SendNumArgsReg); /* begin JumpCarry: */ @@ -12925,11 +12927,6 @@ /* begin Label */ abstractInstruction = genoperandoperand(Label, (labelCounter += 1), bytecodePC); annotatewith(abstractInstruction, HasBytecodePC); - if ((cResultRegister(backEnd)) != TempReg) { - /* begin MoveR:R: */ - reg1 = cResultRegister(backEnd); - genoperandoperand(MoveRR, reg1, TempReg); - } /* begin Jump: */ genoperand(Jump, ((sqInt)retry)); jmpTarget(ok, gLabel()); @@ -13207,6 +13204,7 @@ genMustBeBooleanTrampolineForcalled(sqInt boolean, char *trampolineName) { AbstractInstruction *jumpMBB; + sqInt reg1; opcodeIndex = 0; /* begin CmpCq:R: */ @@ -13214,6 +13212,11 @@ /* begin JumpZero: */ jumpMBB = genoperand(JumpZero, ((sqInt)0)); compileTrampolineForcallJumpBarnumArgsargargargargsaveRegsresultReg(ceCounterTripped, 1, 1, TempReg, null, null, null, 0, null); + if ((cResultRegister(backEnd)) != ReceiverResultReg) { + /* begin MoveR:R: */ + reg1 = cResultRegister(backEnd); + genoperandoperand(MoveRR, reg1, ReceiverResultReg); + } assert(!(shouldAnnotateObjectReference(boolean))); jmpTarget(jumpMBB, gAddCqR(boolean, TempReg)); return genTrampolineForcalledcallJumpBarnumArgsargargargargsaveRegsresultRegappendOpcodes(ceSendMustBeBoolean, trampolineName, 1, 1, TempReg, null, null, null, 0, null, 1); @@ -15985,6 +15988,12 @@ return ((AbstractInstruction *) (((self_in_getJmpTarget->operands))[0])); } +sqInt +getJumpTargetPCAt(sqInt pc) +{ + return jumpTargetPCAt(backEnd, pc); +} + static sqInt getLiteral(sqInt litIndex) { Modified: branches/Cog/spursistasrc/vm/cogit.h =================================================================== --- branches/Cog/spursistasrc/vm/cogit.h 2014-04-09 19:32:17 UTC (rev 2890) +++ branches/Cog/spursistasrc/vm/cogit.h 2014-04-10 18:41:54 UTC (rev 2891) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.670 uuid: 071bf6af-04c0-4256-b053-d66378b73d27 + CCodeGenerator VMMaker.oscog-eem.671 uuid: 49fb678b-0fe3-42cf-a276-c617f429951d */ @@ -39,6 +39,7 @@ sqInt genQuickReturnConst(void); sqInt genQuickReturnInstVar(void); sqInt genQuickReturnSelf(void); +sqInt getJumpTargetPCAt(sqInt pc); void initializeCodeZoneFromupTo(sqInt startAddress, sqInt endAddress); sqInt interpretOffset(void); sqInt isPCWithinMethodZone(char *address); Modified: branches/Cog/spursistasrc/vm/cogmethod.h =================================================================== --- branches/Cog/spursistasrc/vm/cogmethod.h 2014-04-09 19:32:17 UTC (rev 2890) +++ branches/Cog/spursistasrc/vm/cogmethod.h 2014-04-10 18:41:54 UTC (rev 2891) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.670 uuid: 071bf6af-04c0-4256-b053-d66378b73d27 + CCodeGenerator VMMaker.oscog-eem.671 uuid: 49fb678b-0fe3-42cf-a276-c617f429951d */ typedef struct { Modified: branches/Cog/spursistasrc/vm/cointerp.c =================================================================== --- branches/Cog/spursistasrc/vm/cointerp.c 2014-04-09 19:32:17 UTC (rev 2890) +++ branches/Cog/spursistasrc/vm/cointerp.c 2014-04-10 18:41:54 UTC (rev 2891) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.670 uuid: 071bf6af-04c0-4256-b053-d66378b73d27 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.671 uuid: 49fb678b-0fe3-42cf-a276-c617f429951d from - CoInterpreter VMMaker.oscog-eem.670 uuid: 071bf6af-04c0-4256-b053-d66378b73d27 + CoInterpreter VMMaker.oscog-eem.671 uuid: 49fb678b-0fe3-42cf-a276-c617f429951d */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.670 uuid: 071bf6af-04c0-4256-b053-d66378b73d27 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.671 uuid: 49fb678b-0fe3-42cf-a276-c617f429951d " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -1299,7 +1299,7 @@ static void setSignalLowSpaceFlagAndSaveProcess(void); static void setTraceFlagOnContextsFramesPageIfNeeded(sqInt aContext); sqInt shiftForWord(void); -static sqInt shortentoIndexableSize(sqInt objOop, sqInt indexableSize); +static usqLong shortentoIndexableSize(sqInt objOop, sqInt indexableSize); static sqInt shortPrintContext(sqInt aContext); static sqInt shortPrintFrameAndCallers(char *theFP); EXPORT(void) shortPrintFramesInPage(StackPage *thePage); @@ -2196,7 +2196,7 @@ /* 574 */ (void (*)(void))0, /* 575 */ (void (*)(void))0, 0 }; -const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.670]"; +const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.671]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; @@ -6412,6 +6412,7 @@ /* begin internalPush: */ longAtPointerput((localSP -= BytesPerOop), longAt((rcvr1 + (BaseHeaderSize)) + (byte3 << 2))); } + null; goto l4; } if (opType == 3) { @@ -6421,6 +6422,7 @@ assert(GIV(method) == (iframeMethod(localFP))); object = longAt((GIV(method) + (BaseHeaderSize)) + ((byte3 + LiteralStart) << 2)); longAtPointerput((localSP -= BytesPerOop), object); + null; goto l4; } if (opType == 4) { @@ -6448,6 +6450,7 @@ /* begin internalPush: */ longAtPointerput((localSP -= BytesPerOop), longAt((litVar1 + (BaseHeaderSize)) + (ValueIndex << 2))); + null; goto l4; } top = longAtPointer(localSP); @@ -14006,6 +14009,17 @@ } +/* Two things are going on here. The main one is catching a counter trip and + attempting to send the SelectorCounterTripped selector. In this case, if + the send can be made, the + pc should be backed up to the return address of the send that yields the + boolean to be + tested, so that after potential optimization, computation proceeds by + retryying the jump. + + The minor case is that there is an unlikely possibility that the cointer + tripped but condition + is not a boolean, in which case a mustBeBoolean response should occur. */ /* Send e.g. thisContext conditionalBranchCounterTrippedOn: boolean. */ sqInt @@ -14018,9 +14032,26 @@ sqInt methodHeader; char *sp; char *sp1; + char *sp11; + char *sp2; char *theSP; sqInt top; + if (!((condition == GIV(falseObj)) + || (condition == GIV(trueObj)))) { + /* begin ceSendMustBeBoolean: */ + /* begin popStack */ + top = longAt(GIV(stackPointer)); + GIV(stackPointer) += BytesPerWord; + GIV(instructionPointer) = ((sqInt) top); + /* begin push: */ + longAtput((sp2 = GIV(stackPointer) - BytesPerWord), condition); + GIV(stackPointer) = sp2; + /* begin push: */ + longAtput((sp11 = GIV(stackPointer) - BytesPerWord), GIV(instructionPointer)); + GIV(stackPointer) = sp11; + return ceSendAborttonumArgs(longAt((GIV(specialObjectsOop) + (BaseHeaderSize)) + (SelectorMustBeBoolean << 2)), condition, 0); + } counterTrippedSelector = (SelectorCounterTripped < (numSlotsOf(GIV(specialObjectsOop))) ? longAt((GIV(specialObjectsOop) + (BaseHeaderSize)) + (SelectorCounterTripped << 2)) : 0); @@ -14042,10 +14073,7 @@ resetCountersIn(mframeHomeMethod(GIV(framePointer))); return condition; } - /* begin popStack */ - top = longAt(GIV(stackPointer)); - GIV(stackPointer) += BytesPerWord; - GIV(instructionPointer) = ((sqInt) top); + GIV(instructionPointer) = getJumpTargetPCAt(popStack()); /* begin ensureFrameIsMarried:SP: */ theSP = GIV(stackPointer); if (((((usqInt)(longAt(GIV(framePointer) + FoxMethod)))) < (startOfMemory()) @@ -57113,7 +57141,7 @@ zero if no change was possible. */ -static sqInt +static usqLong shortentoIndexableSize(sqInt objOop, sqInt indexableSize) { usqLong bytesAfter; Modified: branches/Cog/spursistasrc/vm/cointerp.h =================================================================== --- branches/Cog/spursistasrc/vm/cointerp.h 2014-04-09 19:32:17 UTC (rev 2890) +++ branches/Cog/spursistasrc/vm/cointerp.h 2014-04-10 18:41:54 UTC (rev 2891) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.670 uuid: 071bf6af-04c0-4256-b053-d66378b73d27 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.671 uuid: 49fb678b-0fe3-42cf-a276-c617f429951d */ Modified: branches/Cog/spursistasrc/vm/gcc3x-cointerp.c =================================================================== --- branches/Cog/spursistasrc/vm/gcc3x-cointerp.c 2014-04-09 19:32:17 UTC (rev 2890) +++ branches/Cog/spursistasrc/vm/gcc3x-cointerp.c 2014-04-10 18:41:54 UTC (rev 2891) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.670 uuid: 071bf6af-04c0-4256-b053-d66378b73d27 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.671 uuid: 49fb678b-0fe3-42cf-a276-c617f429951d from - CoInterpreter VMMaker.oscog-eem.670 uuid: 071bf6af-04c0-4256-b053-d66378b73d27 + CoInterpreter VMMaker.oscog-eem.671 uuid: 49fb678b-0fe3-42cf-a276-c617f429951d */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.670 uuid: 071bf6af-04c0-4256-b053-d66378b73d27 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.671 uuid: 49fb678b-0fe3-42cf-a276-c617f429951d " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -1302,7 +1302,7 @@ static void setSignalLowSpaceFlagAndSaveProcess(void); static void setTraceFlagOnContextsFramesPageIfNeeded(sqInt aContext); sqInt shiftForWord(void); -static sqInt shortentoIndexableSize(sqInt objOop, sqInt indexableSize); +static usqLong shortentoIndexableSize(sqInt objOop, sqInt indexableSize); static sqInt shortPrintContext(sqInt aContext); static sqInt shortPrintFrameAndCallers(char *theFP); EXPORT(void) shortPrintFramesInPage(StackPage *thePage); @@ -2199,7 +2199,7 @@ /* 574 */ (void (*)(void))0, /* 575 */ (void (*)(void))0, 0 }; -const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.670]"; +const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.671]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; @@ -6421,6 +6421,7 @@ /* begin internalPush: */ longAtPointerput((localSP -= BytesPerOop), longAt((rcvr1 + (BaseHeaderSize)) + (byte3 << 2))); } + null; goto l4; } if (opType == 3) { @@ -6430,6 +6431,7 @@ assert(GIV(method) == (iframeMethod(localFP))); object = longAt((GIV(method) + (BaseHeaderSize)) + ((byte3 + LiteralStart) << 2)); longAtPointerput((localSP -= BytesPerOop), object); + null; goto l4; } if (opType == 4) { @@ -6457,6 +6459,7 @@ /* begin internalPush: */ longAtPointerput((localSP -= BytesPerOop), longAt((litVar1 + (BaseHeaderSize)) + (ValueIndex << 2))); + null; goto l4; } top = longAtPointer(localSP); @@ -14015,6 +14018,17 @@ } +/* Two things are going on here. The main one is catching a counter trip and + attempting to send the SelectorCounterTripped selector. In this case, if + the send can be made, the + pc should be backed up to the return address of the send that yields the + boolean to be + tested, so that after potential optimization, computation proceeds by + retryying the jump. + + The minor case is that there is an unlikely possibility that the cointer + tripped but condition + is not a boolean, in which case a mustBeBoolean response should occur. */ /* Send e.g. thisContext conditionalBranchCounterTrippedOn: boolean. */ sqInt @@ -14027,9 +14041,26 @@ sqInt methodHeader; char *sp; char *sp1; + char *sp11; + char *sp2; char *theSP; sqInt top; + if (!((condition == GIV(falseObj)) + || (condition == GIV(trueObj)))) { + /* begin ceSendMustBeBoolean: */ + /* begin popStack */ + top = longAt(GIV(stackPointer)); + GIV(stackPointer) += BytesPerWord; + GIV(instructionPointer) = ((sqInt) top); + /* begin push: */ + longAtput((sp2 = GIV(stackPointer) - BytesPerWord), condition); + GIV(stackPointer) = sp2; + /* begin push: */ + longAtput((sp11 = GIV(stackPointer) - BytesPerWord), GIV(instructionPointer)); + GIV(stackPointer) = sp11; + return ceSendAborttonumArgs(longAt((GIV(specialObjectsOop) + (BaseHeaderSize)) + (SelectorMustBeBoolean << 2)), condition, 0); + } counterTrippedSelector = (SelectorCounterTripped < (numSlotsOf(GIV(specialObjectsOop))) ? longAt((GIV(specialObjectsOop) + (BaseHeaderSize)) + (SelectorCounterTripped << 2)) : 0); @@ -14051,10 +14082,7 @@ resetCountersIn(mframeHomeMethod(GIV(framePointer))); return condition; } - /* begin popStack */ - top = longAt(GIV(stackPointer)); - GIV(stackPointer) += BytesPerWord; - GIV(instructionPointer) = ((sqInt) top); + GIV(instructionPointer) = getJumpTargetPCAt(popStack()); /* begin ensureFrameIsMarried:SP: */ theSP = GIV(stackPointer); if (((((usqInt)(longAt(GIV(framePointer) + FoxMethod)))) < (startOfMemory()) @@ -57122,7 +57150,7 @@ zero if no change was possible. */ -static sqInt +static usqLong shortentoIndexableSize(sqInt objOop, sqInt indexableSize) { usqLong bytesAfter; Modified: branches/Cog/spursistasrc/vm/interp.h =================================================================== --- branches/Cog/spursistasrc/vm/interp.h 2014-04-09 19:32:17 UTC (rev 2890) +++ branches/Cog/spursistasrc/vm/interp.h 2014-04-10 18:41:54 UTC (rev 2891) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.670 uuid: 071bf6af-04c0-4256-b053-d66378b73d27 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.671 uuid: 49fb678b-0fe3-42cf-a276-c617f429951d */ #define VM_PROXY_MAJOR 1 Modified: branches/Cog/spursistasrc/vm/vmCallback.h =================================================================== --- branches/Cog/spursistasrc/vm/vmCallback.h 2014-04-09 19:32:17 UTC (rev 2890) +++ branches/Cog/spursistasrc/vm/vmCallback.h 2014-04-10 18:41:54 UTC (rev 2891) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.670 uuid: 071bf6af-04c0-4256-b053-d66378b73d27 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.671 uuid: 49fb678b-0fe3-42cf-a276-c617f429951d */ #define VM_CALLBACK_INC 1

1 0

VM Maker: VMMaker.oscog-eem.671.mcz
by commits＠source.squeak.org 10 Apr '14

10 Apr '14

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.671.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.671 Author: eem Time: 10 April 2014, 11:37:05.919 am UUID: 49fb678b-0fe3-42cf-a276-c617f429951d Ancestors: VMMaker.oscog-eem.670 Sista: Revise counter tripping so that ceCounterTripped: repositions the context's pc after the send preceeding the conditional branch, instead of it being done by slower Smalltalk code (skipBackAfterJump which for convenience may parse from the beginning of the method). Add the Sista configurations to gen all versions under ver ctrl. =============== Diff against VMMaker.oscog-eem.670 =============== Item was changed: ----- Method: CoInterpreter>>ceCounterTripped: (in category 'cog jit support') ----- ceCounterTripped: condition + "Two things are going on here. The main one is catching a counter trip and attempting + to send the SelectorCounterTripped selector. In this case, if the send can be made, the + pc should be backed up to the return address of the send that yields the boolean to be + tested, so that after potential optimization, computation proceeds by retryying the jump. + + The minor case is that there is an unlikely possibility that the cointer tripped but condition + is not a boolean, in which case a mustBeBoolean response should occur." <api> <option: #SistaStackToRegisterMappingCogit> "Send e.g. thisContext conditionalBranchCounterTrippedOn: boolean." | context counterTrippedSelector classTag | + (condition = objectMemory falseObject + or: [condition = objectMemory trueObject]) ifFalse: + [^self ceSendMustBeBoolean: condition]. + counterTrippedSelector := objectMemory maybeSplObj: SelectorCounterTripped. (counterTrippedSelector isNil or: [counterTrippedSelector = objectMemory nilObject]) ifTrue: [cogit resetCountersIn: (self mframeHomeMethod: framePointer). ^condition]. + - classTag := objectMemory classTagForSpecialObjectsIndex: ClassMethodContext compactClassIndex: ClassMethodContextCompactIndex. (self lookupInMethodCacheSel: counterTrippedSelector classTag: classTag) ifFalse: [messageSelector := counterTrippedSelector. (self lookupMethodNoMNUEtcInClass: (objectMemory classTagForClass: classTag)) ~= 0 ifTrue: [cogit resetCountersIn: (self mframeHomeMethod: framePointer). ^condition]]. (primitiveFunctionPointer ~= 0 or: [(self argumentCountOf: newMethod) ~= 1]) ifTrue: [cogit resetCountersIn: (self mframeHomeMethod: framePointer). ^condition]. + "now back-up the pc; there is always a jump following the + call to the ceSendMustBeBooleanAddTrue/FalseTrampoline." + instructionPointer := cogit getJumpTargetPCAt: self popStack. - instructionPointer := self popStack. context := self ensureFrameIsMarried: framePointer SP: stackPointer. self push: context. self push: condition. self ifAppropriateCompileToNativeCode: newMethod selector: counterTrippedSelector. self activateNewMethod. "not reached" ^true! Item was changed: ----- Method: SistaStackToRegisterMappingCogit>>genJumpIf:to: (in category 'bytecode generators') ----- genJumpIf: boolean to: targetBytecodePC "The heart of performance counting in Sista. Conditional branches are 6 times less frequent than sends and can provide basic block frequencies (send counters can't). Each conditional has a 32-bit counter split into an upper 16 bits counting executions and a lower half counting untaken executions of the branch. Executing the branch decrements the upper half, tripping if the count goes negative. Not taking the branch decrements the lower half. N.B. We *do not* eliminate dead branches (true ifTrue:/true ifFalse:) so that scanning for send and branch data is simplified and that branch data is correct." <inline: false> | desc ok counter countTripped retry | <var: #desc type: #'CogSimStackEntry *'> <var: #ok type: #'AbstractInstruction *'> <var: #retry type: #'AbstractInstruction *'> <var: #counter type: #'AbstractInstruction *'> <var: #countTripped type: #'AbstractInstruction *'> self ssFlushTo: simStackPtr - 1. desc := self ssTop. self ssPop: 1. + retry := self Label. desc popToReg: TempReg. self ssAllocateRequiredReg: SendNumArgsReg. "Use this as the count reg." counter := self addressOf: (counters at: counterIndex). counterIndex := counterIndex + 1. self flag: 'will need to use MoveAw32:R: if 64 bits'. self assert: BytesPerWord = CounterBytes. + counter addDependent: (self annotateAbsolutePCRef: (self MoveAw: counter asUnsignedInteger R: SendNumArgsReg)). - retry := counter addDependent: (self annotateAbsolutePCRef: - (self MoveAw: counter asUnsignedInteger R: SendNumArgsReg)). self SubCq: 16r10000 R: SendNumArgsReg. "Count executed" "Don't write back if we trip; avoids wrapping count back to initial value, and if we trip we don't execute." countTripped := self JumpCarry: 0. counter addDependent: (self annotateAbsolutePCRef: (self MoveR: SendNumArgsReg Aw: counter asUnsignedInteger)). "write back" "Cunning trick by LPD. If true and false are contiguous subtract the smaller. Correct result is either 0 or the distance between them. If result is not 0 or their distance send mustBeBoolean." self assert: (objectMemory objectAfter: objectMemory falseObject) = objectMemory trueObject. self annotate: (self SubCw: boolean R: TempReg) objRef: boolean. self JumpZero: (self ensureFixupAt: targetBytecodePC - initialPC). self SubCq: 1 R: SendNumArgsReg. "Count untaken" counter addDependent: (self annotateAbsolutePCRef: (self MoveR: SendNumArgsReg Aw: counter asUnsignedInteger)). "write back" self CmpCq: (boolean == objectMemory falseObject ifTrue: [objectMemory trueObject - objectMemory falseObject] ifFalse: [objectMemory falseObject - objectMemory trueObject]) R: TempReg. ok := self JumpZero: 0. self MoveCq: 0 R: SendNumArgsReg. "if SendNumArgsReg is 0 this is a mustBeBoolean, not a counter trip." countTripped jmpTarget: (self CallRT: (boolean == objectMemory falseObject ifTrue: [ceSendMustBeBooleanAddFalseTrampoline] ifFalse: [ceSendMustBeBooleanAddTrueTrampoline])). + "If we're in an image which hasn't got the Sista code loaded then the ceCounterTripped: trampoline + will return directly to machine code, returning the boolean. So the code should jump back to the + retry point. This is the return address of the non-inlined method that yields the boolean to be tested. + If ceCounterTripped: does not return it will examine the branch to retry to reposition the PC to that point." - "If we're in an image which hasn't got the Sista code loaded then the ceCounterTripped: trampoline will - return directly to machine code, returning the boolean. So the code should jump back to the retry point. - This is always the point at which the boolean is tested. The register to be tested must be reloaded with - the return value of the trampoline, if it differs from cResultRegister. - - In images with the Sista code loaded, return must be via backing up the PC to after the send, and returning - (this time answering the boolean via ReceiverResultReg). For this case, and for normal mustBeBoolean - processing, the return address of the mustBeBoolean trampoline call must be annotated as a bytecode pc." self annotateBytecode: self Label. - backEnd cResultRegister ~= TempReg ifTrue: - [self MoveR: backEnd cResultRegister R: TempReg]. self Jump: retry. ok jmpTarget: self Label. ^0! Item was changed: ----- Method: SistaStackToRegisterMappingCogit>>genMustBeBooleanTrampolineFor:called: (in category 'initialization') ----- genMustBeBooleanTrampolineFor: boolean called: trampolineName "This can be entered in one of two states, depending on SendNumArgsReg. See e.g. genJumpIf:to:. If SendNumArgsReg is non-zero then this has been entered via the initial test of the counter in the jump executed count (i.e. the counter has tripped). In this case TempReg contains the boolean to be tested and should not be offset, and ceCounterTripped should be invoked with the unoffset TempReg. If SendNumArgsReg is zero then this has been entered for must-be-boolean processing. TempReg has been offset by boolean and must be corrected and ceSendMustBeBoolean: invoked with the corrected value." <var: #trampolineName type: #'char *'> | jumpMBB | <var: #jumpMBB type: #'AbstractInstruction *'> <inline: false> opcodeIndex := 0. self CmpCq: 0 R: SendNumArgsReg. jumpMBB := self JumpZero: 0. self compileTrampolineFor: #ceCounterTripped: callJumpBar: true numArgs: 1 arg: TempReg arg: nil arg: nil arg: nil saveRegs: false resultReg: nil. + "For the case where the ceCounterTripped: call returns (e.g. because there's no callback selector + installed), the call to the ceSendMustBeBooleanAddTrue/FalseTrampoline is followed by a jump + back to the return address of the send that yields the boolean to be tested. For this case copy + the C result to ReceiverResultReg, to reload it with the boolean to be tested." + backEnd cResultRegister ~= ReceiverResultReg ifTrue: + [self MoveR: backEnd cResultRegister R: ReceiverResultReg]. "If the objectRepresentation does want true & false to be mobile then we need to record these addresses." self assert: (objectRepresentation shouldAnnotateObjectReference: boolean) not. jumpMBB jmpTarget: (self AddCq: boolean R: TempReg). ^self genTrampolineFor: #ceSendMustBeBoolean: called: trampolineName callJumpBar: true numArgs: 1 arg: TempReg arg: nil arg: nil arg: nil saveRegs: false resultReg: nil appendOpcodes: true! Item was added: + ----- Method: SistaStackToRegisterMappingCogit>>getJumpTargetPCAt: (in category 'method introspection') ----- + getJumpTargetPCAt: pc + <api> + ^backEnd jumpTargetPCAt: pc! Item was changed: ----- Method: VMMaker class>>generateAllConfigurationsUnderVersionControl (in category 'configurations') ----- generateAllConfigurationsUnderVersionControl self generateNewspeakCogVM; generateNewspeakSpurCogVM; generateNewspeakSpurStackVM; generateSqueakCogVM; generateSqueakCogMTVM; generateSqueakStackVM; generateSqueakSpurCogVM; + generateSqueakSpurStackVM; + generateSqueakCogSistaVM; + generateSqueakSpurCogSistaVM! - generateSqueakSpurStackVM!

1 0

mirror of github/pharo-vm created
by Esteban Lorenzano 10 Apr '14

10 Apr '14

Hi, As promised, I have set a jenkins job to mirror pharovm flavour sources into mcz files. I created a project into smalltalkhub: http://smalltalkhub.com/#!/~Pharo/PharoVM that will have latest sources from pharo vm’s. I’m not pushing back to same repository as before (http://source.squeak.org) because I want to keep same project structure as we are using (vmmaker + all plugins together) and I didn’t wanted to mess with project there :) please let me know if you need something else. cheers, Esteban

2 1

SqueakSSL same test failures with default config...
by gettimothy 10 Apr '14

10 Apr '14

Howdy. I had backed up my ssh_config file with the standard values, so I did a quick reconfigure, stopped and started the sshd daemon and same results on the tests as my previous post--so my conjecture in the previous post is incorrect. Interesting output on the terminal when I run the tests: 4147410568:error:0906D06C:PEM routines:PEM_read_bio:no start line:pem_lib.c:703:Expecting: CERTIFICATE 4147410568:error:140AD009:SSL routines:SSL_CTX_use_certificate_file:PEM lib:ssl_rsa.c:491: 4147410568:error:0906D06C:PEM routines:PEM_read_bio:no start line:pem_lib.c:703:Expecting: ANY PRIVATE KEY 4147410568:error:140B0009:SSL routines:SSL_CTX_use_PrivateKey_file:PEM lib:ssl_rsa.c:669: 4147410568:error:1408A0C1:SSL routines:SSL3_GET_CLIENT_HELLO:no shared cipher:s3_srvr.c:1353: Oh well, back to it.

1 0

← Newer
1
...
4
5
6
7
8
9
10
11
12
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

Vm-dev April 2014