Vm-dev December 2013

vm-dev@lists.squeakfoundation.org

27 participants
102 discussions

pixelValueAt: is not robust to hibernation [was: [squeak-dev] The Trunk: MorphicExtras-nice.137.mcz]
by David T. Lewis 20 Dec '13

20 Dec '13

Moving this to vm-dev for discussion of the BitBlt primitive. On Fri, Dec 20, 2013 at 02:13:29AM +0100, Nicolas Cellier wrote: > 2013/12/20 Bert Freudenberg <bert(a)freudenbergs.de> > > > > > On 20.12.2013, at 00:55, Nicolas Cellier < > > nicolas.cellier.aka.nice(a)gmail.com> wrote: > > > > 2013/12/13 Nicolas Cellier <nicolas.cellier.aka.nice(a)gmail.com> > > > >> I feel like it would be better to change pixelValueAt: so as to always > >> unhibernate, but I did not dare if ever someone had the idea of sending it > >> in tight loops (one shouldn't, there is BitBlt for that purpose, but who > >> knows...). > >> > >> Maybe we could fail primitivePixelValueAt if receiver is Byte like, and > >> unhibernate in fallback code. > >> We would let every other BitBlt primitives accept a ByteArray to allow > >> BitBlt tricks. > >> > >> Thoughts? > >> > >> > > No one raised a comment so far. > > Isn't it a good idea to fail the primitive? > > > > > > The primitive must fail, yes. That is simply a bug. Before that primitive > > existed, pixelValueAt: used BitBlt which did the unhibernate. > > > > If yes, then it's very simple to implement, just add: > > > > (interpreterProxy isWords: bitmap) ifFalse:[interpreterProxy > > primitiveFail]. > > > > > > IMHO the primitive should do the same check as BitBlt: verify that the > > size of the bits is exactly right given width, height, and depth. > > > > - Bert - > > > > I opened http://bugs.squeak.org/view.php?id=7799 just in case. > Thanks for opening the bugs.squeak.org issue. Your patch adds this: bitsSize := interpreterProxy byteSizeOf: bitmap. ((interpreterProxy isWordsOrBytes: bitmap) and: [bitsSize = (stride * height * 4 "bytes per word")]) ifFalse: [^interpreterProxy primitiveFail]. Which translates as: bitsSize = interpreterProxy->byteSizeOf(bitmap); if (!((interpreterProxy->isWordsOrBytes(bitmap)) && (bitsSize == ((stride * height) * 4)))) { interpreterProxy->primitiveFail(); return null; } This looks like exactly what Bert was suggesting. I think there are two things we should test: 1) Check if the extra computation has an effect on performance. 2) Check to make sure the logic works on the 64 bit image, to make sure that the 4 bytes per word does the right thing (I think that it will work, and I can follow up on this later to be sure). Dave

2 4

[commit][2834] CogVM source as per VMMaker.oscog-eem.565.
by commits＠squeakvm.org 20 Dec '13

20 Dec '13

Revision: 2834 Author: eliot Date: 2013-12-20 11:21:10 -0800 (Fri, 20 Dec 2013) Log Message: ----------- CogVM source as per VMMaker.oscog-eem.565. Rescue the Stack VM by refactoring the snapshot bereavement code to be CoInterpreter-agnostic. Give CoInterpreter its own method cache print routine for the same reason. Make the Spur instantiation primtives fail for format 7 (forwarded format) and name this for use as the format of immediate classes. 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/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 2013-12-16 23:52:11 UTC (rev 2833) +++ branches/Cog/nscogsrc/vm/cogit.c 2013-12-20 19:21:10 UTC (rev 2834) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.563 uuid: 3116fc1b-f9a5-45f5-bc7e-4b5c68ec8247 + CCodeGenerator VMMaker.oscog-eem.565 uuid: aa89a317-26e5-404d-aaff-e2433a344379 from - StackToRegisterMappingCogit VMMaker.oscog-eem.563 uuid: 3116fc1b-f9a5-45f5-bc7e-4b5c68ec8247 + StackToRegisterMappingCogit VMMaker.oscog-eem.565 uuid: aa89a317-26e5-404d-aaff-e2433a344379 */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.563 uuid: 3116fc1b-f9a5-45f5-bc7e-4b5c68ec8247 " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.565 uuid: aa89a317-26e5-404d-aaff-e2433a344379 " __DATE__ ; char *__cogitBuildInfo = __buildInfo; Modified: branches/Cog/nscogsrc/vm/cogit.h =================================================================== --- branches/Cog/nscogsrc/vm/cogit.h 2013-12-16 23:52:11 UTC (rev 2833) +++ branches/Cog/nscogsrc/vm/cogit.h 2013-12-20 19:21:10 UTC (rev 2834) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.563 uuid: 3116fc1b-f9a5-45f5-bc7e-4b5c68ec8247 + CCodeGenerator VMMaker.oscog-eem.565 uuid: aa89a317-26e5-404d-aaff-e2433a344379 */ Modified: branches/Cog/nscogsrc/vm/cogmethod.h =================================================================== --- branches/Cog/nscogsrc/vm/cogmethod.h 2013-12-16 23:52:11 UTC (rev 2833) +++ branches/Cog/nscogsrc/vm/cogmethod.h 2013-12-20 19:21:10 UTC (rev 2834) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.563 uuid: 3116fc1b-f9a5-45f5-bc7e-4b5c68ec8247 + CCodeGenerator VMMaker.oscog-eem.565 uuid: aa89a317-26e5-404d-aaff-e2433a344379 */ typedef struct { Modified: branches/Cog/nscogsrc/vm/cointerp.c =================================================================== --- branches/Cog/nscogsrc/vm/cointerp.c 2013-12-16 23:52:11 UTC (rev 2833) +++ branches/Cog/nscogsrc/vm/cointerp.c 2013-12-20 19:21:10 UTC (rev 2834) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.563 uuid: 3116fc1b-f9a5-45f5-bc7e-4b5c68ec8247 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.565 uuid: aa89a317-26e5-404d-aaff-e2433a344379 from - CoInterpreter VMMaker.oscog-eem.563 uuid: 3116fc1b-f9a5-45f5-bc7e-4b5c68ec8247 + CoInterpreter VMMaker.oscog-eem.565 uuid: aa89a317-26e5-404d-aaff-e2433a344379 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.563 uuid: 3116fc1b-f9a5-45f5-bc7e-4b5c68ec8247 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.565 uuid: aa89a317-26e5-404d-aaff-e2433a344379 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2030,7 +2030,7 @@ /* 575 */ (void (*)(void))0, 0 }; static void (*externalPrimitiveTable[MaxExternalPrimitiveTableSize + 1 /* 4097 */])(void); -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.563"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.565"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; @@ -54405,7 +54405,6 @@ sqInt activeContext; sqInt activeContext1; sqInt chunk; - sqInt decodedIP; sqInt fmt; sqInt fwdBlock; sqInt header; @@ -54414,6 +54413,7 @@ sqInt iLimiT; sqInt obj; sqInt oop; + sqInt pc; sqInt realHeader; sqInt sz; sqInt sz1; @@ -54443,11 +54443,13 @@ longAtput((oop + BaseHeaderSize) + (InstructionPointerIndex << ShiftForWord), GIV(nilObj)); } else { - decodedIP = longAt((oop + BaseHeaderSize) + (InstructionPointerIndex << ShiftForWord)); - if (((decodedIP & 1)) - && ((((sqInt) decodedIP)) < 0)) { - decodedIP = mustMapMachineCodePCcontext((decodedIP >> 1), oop); - longAtput((oop + BaseHeaderSize) + (InstructionPointerIndex << ShiftForWord), decodedIP); + /* begin ensureContextHasBytecodePC: */ + assert(!(isMarriedOrWidowedContext(oop))); + pc = longAt((oop + BaseHeaderSize) + (InstructionPointerIndex << ShiftForWord)); + if (((pc & 1)) + && (((pc = (pc >> 1))) < 0)) { + pc = mustMapMachineCodePCcontext(pc, oop); + longAtput((oop + BaseHeaderSize) + (InstructionPointerIndex << ShiftForWord), pc); } } for (i = ((fetchStackPointerOf(oop)) + CtxtTempFrameStart), iLimiT = ((numSlotsOf(oop)) - 1); i <= iLimiT; i += 1) { Modified: branches/Cog/nscogsrc/vm/cointerp.h =================================================================== --- branches/Cog/nscogsrc/vm/cointerp.h 2013-12-16 23:52:11 UTC (rev 2833) +++ branches/Cog/nscogsrc/vm/cointerp.h 2013-12-20 19:21:10 UTC (rev 2834) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.563 uuid: 3116fc1b-f9a5-45f5-bc7e-4b5c68ec8247 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.565 uuid: aa89a317-26e5-404d-aaff-e2433a344379 */ Modified: branches/Cog/nscogsrc/vm/gcc3x-cointerp.c =================================================================== --- branches/Cog/nscogsrc/vm/gcc3x-cointerp.c 2013-12-16 23:52:11 UTC (rev 2833) +++ branches/Cog/nscogsrc/vm/gcc3x-cointerp.c 2013-12-20 19:21:10 UTC (rev 2834) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.563 uuid: 3116fc1b-f9a5-45f5-bc7e-4b5c68ec8247 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.565 uuid: aa89a317-26e5-404d-aaff-e2433a344379 from - CoInterpreter VMMaker.oscog-eem.563 uuid: 3116fc1b-f9a5-45f5-bc7e-4b5c68ec8247 + CoInterpreter VMMaker.oscog-eem.565 uuid: aa89a317-26e5-404d-aaff-e2433a344379 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.563 uuid: 3116fc1b-f9a5-45f5-bc7e-4b5c68ec8247 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.565 uuid: aa89a317-26e5-404d-aaff-e2433a344379 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2033,7 +2033,7 @@ /* 575 */ (void (*)(void))0, 0 }; static void (*externalPrimitiveTable[MaxExternalPrimitiveTableSize + 1 /* 4097 */])(void); -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.563"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.565"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; @@ -54414,7 +54414,6 @@ sqInt activeContext; sqInt activeContext1; sqInt chunk; - sqInt decodedIP; sqInt fmt; sqInt fwdBlock; sqInt header; @@ -54423,6 +54422,7 @@ sqInt iLimiT; sqInt obj; sqInt oop; + sqInt pc; sqInt realHeader; sqInt sz; sqInt sz1; @@ -54452,11 +54452,13 @@ longAtput((oop + BaseHeaderSize) + (InstructionPointerIndex << ShiftForWord), GIV(nilObj)); } else { - decodedIP = longAt((oop + BaseHeaderSize) + (InstructionPointerIndex << ShiftForWord)); - if (((decodedIP & 1)) - && ((((sqInt) decodedIP)) < 0)) { - decodedIP = mustMapMachineCodePCcontext((decodedIP >> 1), oop); - longAtput((oop + BaseHeaderSize) + (InstructionPointerIndex << ShiftForWord), decodedIP); + /* begin ensureContextHasBytecodePC: */ + assert(!(isMarriedOrWidowedContext(oop))); + pc = longAt((oop + BaseHeaderSize) + (InstructionPointerIndex << ShiftForWord)); + if (((pc & 1)) + && (((pc = (pc >> 1))) < 0)) { + pc = mustMapMachineCodePCcontext(pc, oop); + longAtput((oop + BaseHeaderSize) + (InstructionPointerIndex << ShiftForWord), pc); } } for (i = ((fetchStackPointerOf(oop)) + CtxtTempFrameStart), iLimiT = ((numSlotsOf(oop)) - 1); i <= iLimiT; i += 1) { Modified: branches/Cog/nscogsrc/vm/interp.h =================================================================== --- branches/Cog/nscogsrc/vm/interp.h 2013-12-16 23:52:11 UTC (rev 2833) +++ branches/Cog/nscogsrc/vm/interp.h 2013-12-20 19:21:10 UTC (rev 2834) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.563 uuid: 3116fc1b-f9a5-45f5-bc7e-4b5c68ec8247 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.565 uuid: aa89a317-26e5-404d-aaff-e2433a344379 */ #define VM_PROXY_MAJOR 1 Modified: branches/Cog/nscogsrc/vm/vmCallback.h =================================================================== --- branches/Cog/nscogsrc/vm/vmCallback.h 2013-12-16 23:52:11 UTC (rev 2833) +++ branches/Cog/nscogsrc/vm/vmCallback.h 2013-12-20 19:21:10 UTC (rev 2834) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.563 uuid: 3116fc1b-f9a5-45f5-bc7e-4b5c68ec8247 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.565 uuid: aa89a317-26e5-404d-aaff-e2433a344379 */ #define VM_CALLBACK_INC 1 Property changes on: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h ___________________________________________________________________ Modified: checkindate - Mon Dec 16 15:49:50 PST 2013 + Fri Dec 20 11:19:05 PST 2013 Modified: branches/Cog/spursrc/vm/cogit.c =================================================================== --- branches/Cog/spursrc/vm/cogit.c 2013-12-16 23:52:11 UTC (rev 2833) +++ branches/Cog/spursrc/vm/cogit.c 2013-12-20 19:21:10 UTC (rev 2834) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.563 uuid: 3116fc1b-f9a5-45f5-bc7e-4b5c68ec8247 + CCodeGenerator VMMaker.oscog-eem.565 uuid: aa89a317-26e5-404d-aaff-e2433a344379 from - StackToRegisterMappingCogit VMMaker.oscog-eem.563 uuid: 3116fc1b-f9a5-45f5-bc7e-4b5c68ec8247 + StackToRegisterMappingCogit VMMaker.oscog-eem.565 uuid: aa89a317-26e5-404d-aaff-e2433a344379 */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.563 uuid: 3116fc1b-f9a5-45f5-bc7e-4b5c68ec8247 " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.565 uuid: aa89a317-26e5-404d-aaff-e2433a344379 " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -15661,9 +15661,12 @@ getInlineCacheClassTagFrominto(sqInt sourceReg, sqInt destReg) { AbstractInstruction *entryLabel; + AbstractInstruction *immLabel; AbstractInstruction *jumpCompare; AbstractInstruction *jumpNotImm; sqInt quickConstant; + sqInt quickConstant1; + sqInt quickConstant2; /* begin AlignmentNops: */ genoperand(AlignmentNops, ((BytesPerWord < 8) ? 8 : BytesPerWord)); @@ -15683,6 +15686,7 @@ flag("endianness"); jmpTarget(jumpNotImm, gMoveMwrR(0, sourceReg, destReg)); jmpTarget(jumpCompare, gAndCqR(classIndexMask(), destReg)); + return entryLabel; } Modified: branches/Cog/spursrc/vm/cogit.h =================================================================== --- branches/Cog/spursrc/vm/cogit.h 2013-12-16 23:52:11 UTC (rev 2833) +++ branches/Cog/spursrc/vm/cogit.h 2013-12-20 19:21:10 UTC (rev 2834) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.563 uuid: 3116fc1b-f9a5-45f5-bc7e-4b5c68ec8247 + CCodeGenerator VMMaker.oscog-eem.565 uuid: aa89a317-26e5-404d-aaff-e2433a344379 */ Modified: branches/Cog/spursrc/vm/cogmethod.h =================================================================== --- branches/Cog/spursrc/vm/cogmethod.h 2013-12-16 23:52:11 UTC (rev 2833) +++ branches/Cog/spursrc/vm/cogmethod.h 2013-12-20 19:21:10 UTC (rev 2834) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.563 uuid: 3116fc1b-f9a5-45f5-bc7e-4b5c68ec8247 + CCodeGenerator VMMaker.oscog-eem.565 uuid: aa89a317-26e5-404d-aaff-e2433a344379 */ typedef struct { Modified: branches/Cog/spursrc/vm/cointerp.c =================================================================== --- branches/Cog/spursrc/vm/cointerp.c 2013-12-16 23:52:11 UTC (rev 2833) +++ branches/Cog/spursrc/vm/cointerp.c 2013-12-20 19:21:10 UTC (rev 2834) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.563 uuid: 3116fc1b-f9a5-45f5-bc7e-4b5c68ec8247 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.565 uuid: aa89a317-26e5-404d-aaff-e2433a344379 from - CoInterpreter VMMaker.oscog-eem.563 uuid: 3116fc1b-f9a5-45f5-bc7e-4b5c68ec8247 + CoInterpreter VMMaker.oscog-eem.565 uuid: aa89a317-26e5-404d-aaff-e2433a344379 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.563 uuid: 3116fc1b-f9a5-45f5-bc7e-4b5c68ec8247 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.565 uuid: aa89a317-26e5-404d-aaff-e2433a344379 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2162,7 +2162,7 @@ 0 }; static void (*externalPrimitiveTable[MaxExternalPrimitiveTableSize + 1 /* 4097 */])(void); usqInt heapBase; -const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.563]"; +const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.565]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; @@ -6363,7 +6363,6 @@ /* begin internalPush: */ longAtPointerput((localSP -= BytesPerOop), longAt((rcvr1 + (BaseHeaderSize)) + (byte3 << 2))); } - null; goto l4; } if (opType == 3) { @@ -6373,7 +6372,6 @@ assert(GIV(method) == (iframeMethod(localFP))); object = longAt((GIV(method) + (BaseHeaderSize)) + ((byte3 + LiteralStart) << 2)); longAtPointerput((localSP -= BytesPerOop), object); - null; goto l4; } if (opType == 4) { @@ -6401,7 +6399,6 @@ /* begin internalPush: */ longAtPointerput((localSP -= BytesPerOop), longAt((litVar1 + (BaseHeaderSize)) + (ValueIndex << 2))); - null; goto l4; } top = longAtPointer(localSP); @@ -25703,7 +25700,7 @@ Allow fixed classes to be instantiated here iff nElements = 0. */ if ((nElements != 0) - || (instSpec >= 9)) { + || (instSpec > 5)) { return null; } numSlots = classFormat & ((1 << 16) - 1); @@ -57830,7 +57827,6 @@ sqInt activeContext1; sqInt address; sqInt address1; - sqInt decodedIP; sqInt fmt; sqInt i; sqInt iLimiT; @@ -57842,6 +57838,7 @@ sqInt objOop1; sqInt objOop11; sqInt objOop2; + sqInt pc; sqInt prevObj; sqInt prevObj1; sqInt prevPrevObj; @@ -57891,13 +57888,15 @@ longAtput((objOop1 + (BaseHeaderSize)) + (InstructionPointerIndex << 2), GIV(nilObj)); } else { - decodedIP = longAt((objOop1 + (BaseHeaderSize)) + (InstructionPointerIndex << 2)); - if (((decodedIP & 1)) - && ((((sqInt) decodedIP)) < 0)) { - decodedIP = mustMapMachineCodePCcontext((decodedIP >> 1), objOop1); + /* begin ensureContextHasBytecodePC: */ + assert(!(isMarriedOrWidowedContext(objOop1))); + pc = longAt((objOop1 + (BaseHeaderSize)) + (InstructionPointerIndex << 2)); + if (((pc & 1)) + && (((pc = (pc >> 1))) < 0)) { + pc = mustMapMachineCodePCcontext(pc, objOop1); /* begin storePointerUnchecked:ofObject:withValue: */ assert(!(isForwarded(objOop1))); - longAtput((objOop1 + (BaseHeaderSize)) + (InstructionPointerIndex << 2), decodedIP); + longAtput((objOop1 + (BaseHeaderSize)) + (InstructionPointerIndex << 2), pc); } } for (i = ((fetchStackPointerOf(objOop1)) + CtxtTempFrameStart), iLimiT = ((numSlotsOf(objOop1)) - 1); i <= iLimiT; i += 1) { @@ -57948,13 +57947,15 @@ longAtput((objOop1 + (BaseHeaderSize)) + (InstructionPointerIndex << 2), GIV(nilObj)); } else { - decodedIP = longAt((objOop1 + (BaseHeaderSize)) + (InstructionPointerIndex << 2)); - if (((decodedIP & 1)) - && ((((sqInt) decodedIP)) < 0)) { - decodedIP = mustMapMachineCodePCcontext((decodedIP >> 1), objOop1); + /* begin ensureContextHasBytecodePC: */ + assert(!(isMarriedOrWidowedContext(objOop1))); + pc = longAt((objOop1 + (BaseHeaderSize)) + (InstructionPointerIndex << 2)); + if (((pc & 1)) + && (((pc = (pc >> 1))) < 0)) { + pc = mustMapMachineCodePCcontext(pc, objOop1); /* begin storePointerUnchecked:ofObject:withValue: */ assert(!(isForwarded(objOop1))); - longAtput((objOop1 + (BaseHeaderSize)) + (InstructionPointerIndex << 2), decodedIP); + longAtput((objOop1 + (BaseHeaderSize)) + (InstructionPointerIndex << 2), pc); } } for (i = ((fetchStackPointerOf(objOop1)) + CtxtTempFrameStart), iLimiT = ((numSlotsOf(objOop1)) - 1); i <= iLimiT; i += 1) { @@ -58007,13 +58008,15 @@ longAtput((objOop11 + (BaseHeaderSize)) + (InstructionPointerIndex << 2), GIV(nilObj)); } else { - decodedIP = longAt((objOop11 + (BaseHeaderSize)) + (InstructionPointerIndex << 2)); - if (((decodedIP & 1)) - && ((((sqInt) decodedIP)) < 0)) { - decodedIP = mustMapMachineCodePCcontext((decodedIP >> 1), objOop11); + /* begin ensureContextHasBytecodePC: */ + assert(!(isMarriedOrWidowedContext(objOop11))); + pc = longAt((objOop11 + (BaseHeaderSize)) + (InstructionPointerIndex << 2)); + if (((pc & 1)) + && (((pc = (pc >> 1))) < 0)) { + pc = mustMapMachineCodePCcontext(pc, objOop11); /* begin storePointerUnchecked:ofObject:withValue: */ assert(!(isForwarded(objOop11))); - longAtput((objOop11 + (BaseHeaderSize)) + (InstructionPointerIndex << 2), decodedIP); + longAtput((objOop11 + (BaseHeaderSize)) + (InstructionPointerIndex << 2), pc); } } for (i = ((fetchStackPointerOf(objOop11)) + CtxtTempFrameStart), iLimiT = ((numSlotsOf(objOop11)) - 1); i <= iLimiT; i += 1) { Modified: branches/Cog/spursrc/vm/cointerp.h =================================================================== --- branches/Cog/spursrc/vm/cointerp.h 2013-12-16 23:52:11 UTC (rev 2833) +++ branches/Cog/spursrc/vm/cointerp.h 2013-12-20 19:21:10 UTC (rev 2834) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.563 uuid: 3116fc1b-f9a5-45f5-bc7e-4b5c68ec8247 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.565 uuid: aa89a317-26e5-404d-aaff-e2433a344379 */ Modified: branches/Cog/spursrc/vm/gcc3x-cointerp.c =================================================================== --- branches/Cog/spursrc/vm/gcc3x-cointerp.c 2013-12-16 23:52:11 UTC (rev 2833) +++ branches/Cog/spursrc/vm/gcc3x-cointerp.c 2013-12-20 19:21:10 UTC (rev 2834) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.563 uuid: 3116fc1b-f9a5-45f5-bc7e-4b5c68ec8247 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.565 uuid: aa89a317-26e5-404d-aaff-e2433a344379 from - CoInterpreter VMMaker.oscog-eem.563 uuid: 3116fc1b-f9a5-45f5-bc7e-4b5c68ec8247 + CoInterpreter VMMaker.oscog-eem.565 uuid: aa89a317-26e5-404d-aaff-e2433a344379 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.563 uuid: 3116fc1b-f9a5-45f5-bc7e-4b5c68ec8247 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.565 uuid: aa89a317-26e5-404d-aaff-e2433a344379 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2165,7 +2165,7 @@ 0 }; static void (*externalPrimitiveTable[MaxExternalPrimitiveTableSize + 1 /* 4097 */])(void); usqInt heapBase; -const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.563]"; +const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.565]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; @@ -6372,7 +6372,6 @@ /* begin internalPush: */ longAtPointerput((localSP -= BytesPerOop), longAt((rcvr1 + (BaseHeaderSize)) + (byte3 << 2))); } - null; goto l4; } if (opType == 3) { @@ -6382,7 +6381,6 @@ assert(GIV(method) == (iframeMethod(localFP))); object = longAt((GIV(method) + (BaseHeaderSize)) + ((byte3 + LiteralStart) << 2)); longAtPointerput((localSP -= BytesPerOop), object); - null; goto l4; } if (opType == 4) { @@ -6410,7 +6408,6 @@ /* begin internalPush: */ longAtPointerput((localSP -= BytesPerOop), longAt((litVar1 + (BaseHeaderSize)) + (ValueIndex << 2))); - null; goto l4; } top = longAtPointer(localSP); @@ -25712,7 +25709,7 @@ Allow fixed classes to be instantiated here iff nElements = 0. */ if ((nElements != 0) - || (instSpec >= 9)) { + || (instSpec > 5)) { return null; } numSlots = classFormat & ((1 << 16) - 1); @@ -57839,7 +57836,6 @@ sqInt activeContext1; sqInt address; sqInt address1; - sqInt decodedIP; sqInt fmt; sqInt i; sqInt iLimiT; @@ -57851,6 +57847,7 @@ sqInt objOop1; sqInt objOop11; sqInt objOop2; + sqInt pc; sqInt prevObj; sqInt prevObj1; sqInt prevPrevObj; @@ -57900,13 +57897,15 @@ longAtput((objOop1 + (BaseHeaderSize)) + (InstructionPointerIndex << 2), GIV(nilObj)); } else { - decodedIP = longAt((objOop1 + (BaseHeaderSize)) + (InstructionPointerIndex << 2)); - if (((decodedIP & 1)) - && ((((sqInt) decodedIP)) < 0)) { - decodedIP = mustMapMachineCodePCcontext((decodedIP >> 1), objOop1); + /* begin ensureContextHasBytecodePC: */ + assert(!(isMarriedOrWidowedContext(objOop1))); + pc = longAt((objOop1 + (BaseHeaderSize)) + (InstructionPointerIndex << 2)); + if (((pc & 1)) + && (((pc = (pc >> 1))) < 0)) { + pc = mustMapMachineCodePCcontext(pc, objOop1); /* begin storePointerUnchecked:ofObject:withValue: */ assert(!(isForwarded(objOop1))); - longAtput((objOop1 + (BaseHeaderSize)) + (InstructionPointerIndex << 2), decodedIP); + longAtput((objOop1 + (BaseHeaderSize)) + (InstructionPointerIndex << 2), pc); } } for (i = ((fetchStackPointerOf(objOop1)) + CtxtTempFrameStart), iLimiT = ((numSlotsOf(objOop1)) - 1); i <= iLimiT; i += 1) { @@ -57957,13 +57956,15 @@ longAtput((objOop1 + (BaseHeaderSize)) + (InstructionPointerIndex << 2), GIV(nilObj)); } else { - decodedIP = longAt((objOop1 + (BaseHeaderSize)) + (InstructionPointerIndex << 2)); - if (((decodedIP & 1)) - && ((((sqInt) decodedIP)) < 0)) { - decodedIP = mustMapMachineCodePCcontext((decodedIP >> 1), objOop1); + /* begin ensureContextHasBytecodePC: */ + assert(!(isMarriedOrWidowedContext(objOop1))); + pc = longAt((objOop1 + (BaseHeaderSize)) + (InstructionPointerIndex << 2)); + if (((pc & 1)) + && (((pc = (pc >> 1))) < 0)) { + pc = mustMapMachineCodePCcontext(pc, objOop1); /* begin storePointerUnchecked:ofObject:withValue: */ assert(!(isForwarded(objOop1))); - longAtput((objOop1 + (BaseHeaderSize)) + (InstructionPointerIndex << 2), decodedIP); + longAtput((objOop1 + (BaseHeaderSize)) + (InstructionPointerIndex << 2), pc); } } for (i = ((fetchStackPointerOf(objOop1)) + CtxtTempFrameStart), iLimiT = ((numSlotsOf(objOop1)) - 1); i <= iLimiT; i += 1) { @@ -58016,13 +58017,15 @@ longAtput((objOop11 + (BaseHeaderSize)) + (InstructionPointerIndex << 2), GIV(nilObj)); } else { - decodedIP = longAt((objOop11 + (BaseHeaderSize)) + (InstructionPointerIndex << 2)); - if (((decodedIP & 1)) - && ((((sqInt) decodedIP)) < 0)) { - decodedIP = mustMapMachineCodePCcontext((decodedIP >> 1), objOop11); + /* begin ensureContextHasBytecodePC: */ + assert(!(isMarriedOrWidowedContext(objOop11))); + pc = longAt((objOop11 + (BaseHeaderSize)) + (InstructionPointerIndex << 2)); + if (((pc & 1)) + && (((pc = (pc >> 1))) < 0)) { + pc = mustMapMachineCodePCcontext(pc, objOop11); /* begin storePointerUnchecked:ofObject:withValue: */ assert(!(isForwarded(objOop11))); - longAtput((objOop11 + (BaseHeaderSize)) + (InstructionPointerIndex << 2), decodedIP); + longAtput((objOop11 + (BaseHeaderSize)) + (InstructionPointerIndex << 2), pc); } } for (i = ((fetchStackPointerOf(objOop11)) + CtxtTempFrameStart), iLimiT = ((numSlotsOf(objOop11)) - 1); i <= iLimiT; i += 1) { Modified: branches/Cog/spursrc/vm/interp.h =================================================================== --- branches/Cog/spursrc/vm/interp.h 2013-12-16 23:52:11 UTC (rev 2833) +++ branches/Cog/spursrc/vm/interp.h 2013-12-20 19:21:10 UTC (rev 2834) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.563 uuid: 3116fc1b-f9a5-45f5-bc7e-4b5c68ec8247 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.565 uuid: aa89a317-26e5-404d-aaff-e2433a344379 */ #define VM_PROXY_MAJOR 1 Modified: branches/Cog/spursrc/vm/vmCallback.h =================================================================== --- branches/Cog/spursrc/vm/vmCallback.h 2013-12-16 23:52:11 UTC (rev 2833) +++ branches/Cog/spursrc/vm/vmCallback.h 2013-12-20 19:21:10 UTC (rev 2834) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.563 uuid: 3116fc1b-f9a5-45f5-bc7e-4b5c68ec8247 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.565 uuid: aa89a317-26e5-404d-aaff-e2433a344379 */ #define VM_CALLBACK_INC 1 Modified: branches/Cog/spurstacksrc/vm/gcc3x-interp.c =================================================================== --- branches/Cog/spurstacksrc/vm/gcc3x-interp.c 2013-12-16 23:52:11 UTC (rev 2833) +++ branches/Cog/spurstacksrc/vm/gcc3x-interp.c 2013-12-20 19:21:10 UTC (rev 2834) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.563 uuid: 3116fc1b-f9a5-45f5-bc7e-4b5c68ec8247 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.565 uuid: aa89a317-26e5-404d-aaff-e2433a344379 from - StackInterpreter VMMaker.oscog-eem.563 uuid: 3116fc1b-f9a5-45f5-bc7e-4b5c68ec8247 + StackInterpreter VMMaker.oscog-eem.565 uuid: aa89a317-26e5-404d-aaff-e2433a344379 */ -static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.563 uuid: 3116fc1b-f9a5-45f5-bc7e-4b5c68ec8247 " __DATE__ ; +static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.565 uuid: aa89a317-26e5-404d-aaff-e2433a344379 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -1955,7 +1955,7 @@ 0 }; char * breakSelector; sqInt breakSelectorLength = -1; -const char *interpreterVersion = "Croquet Closure Stack VM [StackInterpreter VMMaker.oscog-eem.563]"; +const char *interpreterVersion = "Croquet Closure Stack VM [StackInterpreter VMMaker.oscog-eem.565]"; volatile int sendTrace; sqInt suppressHeartbeatFlag; @@ -23150,7 +23150,7 @@ Allow fixed classes to be instantiated here iff nElements = 0. */ if ((nElements != 0) - || (instSpec >= 9)) { + || (instSpec > 5)) { return null; } numSlots = classFormat & ((1 << 16) - 1); @@ -46021,10 +46021,7 @@ || ((s == thing) || ((c == thing) || ((p == thing) - || ((m == thing) - || ((addressCouldBeObj(m)) - && ((maybeMethodHasCogMethod(m)) - && ((((sqInt)(cogMethodOf(m)))) == thing)))))))) + || (m == thing))))) && ((((s & 3) != 0) || (addressCouldBeObj(s))) && ((c != 0) @@ -53185,7 +53182,6 @@ sqInt activeContext; sqInt address; sqInt address1; - sqInt decodedIP; sqInt firstBytecode; sqInt fmt; sqInt i; @@ -53244,14 +53240,7 @@ longAtput((objOop1 + (BaseHeaderSize)) + (InstructionPointerIndex << 2), GIV(nilObj)); } else { - decodedIP = longAt((objOop1 + (BaseHeaderSize)) + (InstructionPointerIndex << 2)); - if (((decodedIP & 1)) - && ((((sqInt) decodedIP)) < 0)) { - decodedIP = mustMapMachineCodePCcontext((decodedIP >> 1), objOop1); - /* begin storePointerUnchecked:ofObject:withValue: */ - assert(!(isForwarded(objOop1))); - longAtput((objOop1 + (BaseHeaderSize)) + (InstructionPointerIndex << 2), decodedIP); - } + /* begin ensureContextHasBytecodePC: */ } for (i = ((fetchStackPointerOf(objOop1)) + CtxtTempFrameStart), iLimiT = ((numSlotsOf(objOop1)) - 1); i <= iLimiT; i += 1) { /* begin storePointerUnchecked:ofObject:withValue: */ @@ -53314,14 +53303,7 @@ longAtput((objOop1 + (BaseHeaderSize)) + (InstructionPointerIndex << 2), GIV(nilObj)); } else { - decodedIP = longAt((objOop1 + (BaseHeaderSize)) + (InstructionPointerIndex << 2)); - if (((decodedIP & 1)) - && ((((sqInt) decodedIP)) < 0)) { - decodedIP = mustMapMachineCodePCcontext((decodedIP >> 1), objOop1); - /* begin storePointerUnchecked:ofObject:withValue: */ - assert(!(isForwarded(objOop1))); - longAtput((objOop1 + (BaseHeaderSize)) + (InstructionPointerIndex << 2), decodedIP); - } + /* begin ensureContextHasBytecodePC: */ } for (i = ((fetchStackPointerOf(objOop1)) + CtxtTempFrameStart), iLimiT = ((numSlotsOf(objOop1)) - 1); i <= iLimiT; i += 1) { /* begin storePointerUnchecked:ofObject:withValue: */ @@ -53386,14 +53368,7 @@ longAtput((objOop11 + (BaseHeaderSize)) + (InstructionPointerIndex << 2), GIV(nilObj)); } else { - decodedIP = longAt((objOop11 + (BaseHeaderSize)) + (InstructionPointerIndex << 2)); - if (((decodedIP & 1)) - && ((((sqInt) decodedIP)) < 0)) { - decodedIP = mustMapMachineCodePCcontext((decodedIP >> 1), objOop11); - /* begin storePointerUnchecked:ofObject:withValue: */ - assert(!(isForwarded(objOop11))); - longAtput((objOop11 + (BaseHeaderSize)) + (InstructionPointerIndex << 2), decodedIP); - } + /* begin ensureContextHasBytecodePC: */ } for (i = ((fetchStackPointerOf(objOop11)) + CtxtTempFrameStart), iLimiT = ((numSlotsOf(objOop11)) - 1); i <= iLimiT; i += 1) { /* begin storePointerUnchecked:ofObject:withValue: */ Modified: branches/Cog/spurstacksrc/vm/interp.c =================================================================== --- branches/Cog/spurstacksrc/vm/interp.c 2013-12-16 23:52:11 UTC (rev 2833) +++ branches/Cog/spurstacksrc/vm/interp.c 2013-12-20 19:21:10 UTC (rev 2834) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.563 uuid: 3116fc1b-f9a5-45f5-bc7e-4b5c68ec8247 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.565 uuid: aa89a317-26e5-404d-aaff-e2433a344379 from - StackInterpreter VMMaker.oscog-eem.563 uuid: 3116fc1b-f9a5-45f5-bc7e-4b5c68ec8247 + StackInterpreter VMMaker.oscog-eem.565 uuid: aa89a317-26e5-404d-aaff-e2433a344379 */ -static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.563 uuid: 3116fc1b-f9a5-45f5-bc7e-4b5c68ec8247 " __DATE__ ; +static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.565 uuid: aa89a317-26e5-404d-aaff-e2433a344379 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -1952,7 +1952,7 @@ 0 }; char * breakSelector; sqInt breakSelectorLength = -1; -const char *interpreterVersion = "Croquet Closure Stack VM [StackInterpreter VMMaker.oscog-eem.563]"; +const char *interpreterVersion = "Croquet Closure Stack VM [StackInterpreter VMMaker.oscog-eem.565]"; volatile int sendTrace; sqInt suppressHeartbeatFlag; @@ -23141,7 +23141,7 @@ Allow fixed classes to be instantiated here iff nElements = 0. */ if ((nElements != 0) - || (instSpec >= 9)) { + || (instSpec > 5)) { return null; } numSlots = classFormat & ((1 << 16) - 1); @@ -46012,10 +46012,7 @@ || ((s == thing) || ((c == thing) || ((p == thing) - || ((m == thing) - || ((addressCouldBeObj(m)) - && ((maybeMethodHasCogMethod(m)) - && ((((sqInt)(cogMethodOf(m)))) == thing)))))))) + || (m == thing))))) && ((((s & 3) != 0) || (addressCouldBeObj(s))) && ((c != 0) @@ -53176,7 +53173,6 @@ sqInt activeContext; sqInt address; sqInt address1; - sqInt decodedIP; sqInt firstBytecode; sqInt fmt; sqInt i; @@ -53235,14 +53231,7 @@ longAtput((objOop1 + (BaseHeaderSize)) + (InstructionPointerIndex << 2), GIV(nilObj)); } else { - decodedIP = longAt((objOop1 + (BaseHeaderSize)) + (InstructionPointerIndex << 2)); - if (((decodedIP & 1)) - && ((((sqInt) decodedIP)) < 0)) { - decodedIP = mustMapMachineCodePCcontext((decodedIP >> 1), objOop1); - /* begin storePointerUnchecked:ofObject:withValue: */ - assert(!(isForwarded(objOop1))); - longAtput((objOop1 + (BaseHeaderSize)) + (InstructionPointerIndex << 2), decodedIP); - } + /* begin ensureContextHasBytecodePC: */ } for (i = ((fetchStackPointerOf(objOop1)) + CtxtTempFrameStart), iLimiT = ((numSlotsOf(objOop1)) - 1); i <= iLimiT; i += 1) { /* begin storePointerUnchecked:ofObject:withValue: */ @@ -53305,14 +53294,7 @@ longAtput((objOop1 + (BaseHeaderSize)) + (InstructionPointerIndex << 2), GIV(nilObj)); } else { - decodedIP = longAt((objOop1 + (BaseHeaderSize)) + (InstructionPointerIndex << 2)); - if (((decodedIP & 1)) - && ((((sqInt) decodedIP)) < 0)) { - decodedIP = mustMapMachineCodePCcontext((decodedIP >> 1), objOop1); - /* begin storePointerUnchecked:ofObject:withValue: */ - assert(!(isForwarded(objOop1))); - longAtput((objOop1 + (BaseHeaderSize)) + (InstructionPointerIndex << 2), decodedIP); - } + /* begin ensureContextHasBytecodePC: */ } for (i = ((fetchStackPointerOf(objOop1)) + CtxtTempFrameStart), iLimiT = ((numSlotsOf(objOop1)) - 1); i <= iLimiT; i += 1) { /* begin storePointerUnchecked:ofObject:withValue: */ @@ -53377,14 +53359,7 @@ longAtput((objOop11 + (BaseHeaderSize)) + (InstructionPointerIndex << 2), GIV(nilObj)); } else { - decodedIP = longAt((objOop11 + (BaseHeaderSize)) + (InstructionPointerIndex << 2)); - if (((decodedIP & 1)) - && ((((sqInt) decodedIP)) < 0)) { - decodedIP = mustMapMachineCodePCcontext((decodedIP >> 1), objOop11); - /* begin storePointerUnchecked:ofObject:withValue: */ - assert(!(isForwarded(objOop11))); - longAtput((objOop11 + (BaseHeaderSize)) + (InstructionPointerIndex << 2), decodedIP); - } + /* begin ensureContextHasBytecodePC: */ } for (i = ((fetchStackPointerOf(objOop11)) + CtxtTempFrameStart), iLimiT = ((numSlotsOf(objOop11)) - 1); i <= iLimiT; i += 1) { /* begin storePointerUnchecked:ofObject:withValue: */ Modified: branches/Cog/spurstacksrc/vm/interp.h =================================================================== --- branches/Cog/spurstacksrc/vm/interp.h 2013-12-16 23:52:11 UTC (rev 2833) +++ branches/Cog/spurstacksrc/vm/interp.h 2013-12-20 19:21:10 UTC (rev 2834) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.563 uuid: 3116fc1b-f9a5-45f5-bc7e-4b5c68ec8247 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.565 uuid: aa89a317-26e5-404d-aaff-e2433a344379 */ #define VM_PROXY_MAJOR 1 Modified: branches/Cog/spurstacksrc/vm/vmCallback.h =================================================================== --- branches/Cog/spurstacksrc/vm/vmCallback.h 2013-12-16 23:52:11 UTC (rev 2833) +++ branches/Cog/spurstacksrc/vm/vmCallback.h 2013-12-20 19:21:10 UTC (rev 2834) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.563 uuid: 3116fc1b-f9a5-45f5-bc7e-4b5c68ec8247 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.565 uuid: aa89a317-26e5-404d-aaff-e2433a344379 */ #define VM_CALLBACK_INC 1 Modified: branches/Cog/src/vm/cogit.c =================================================================== --- branches/Cog/src/vm/cogit.c 2013-12-16 23:52:11 UTC (rev 2833) +++ branches/Cog/src/vm/cogit.c 2013-12-20 19:21:10 UTC (rev 2834) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.563 uuid: 3116fc1b-f9a5-45f5-bc7e-4b5c68ec8247 + CCodeGenerator VMMaker.oscog-eem.565 uuid: aa89a317-26e5-404d-aaff-e2433a344379 from - StackToRegisterMappingCogit VMMaker.oscog-eem.563 uuid: 3116fc1b-f9a5-45f5-bc7e-4b5c68ec8247 + StackToRegisterMappingCogit VMMaker.oscog-eem.565 uuid: aa89a317-26e5-404d-aaff-e2433a344379 */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.563 uuid: 3116fc1b-f9a5-45f5-bc7e-4b5c68ec8247 " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.565 uuid: aa89a317-26e5-404d-aaff-e2433a344379 " __DATE__ ; char *__cogitBuildInfo = __buildInfo; Modified: branches/Cog/src/vm/cogit.h =================================================================== --- branches/Cog/src/vm/cogit.h 2013-12-16 23:52:11 UTC (rev 2833) +++ branches/Cog/src/vm/cogit.h 2013-12-20 19:21:10 UTC (rev 2834) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.563 uuid: 3116fc1b-f9a5-45f5-bc7e-4b5c68ec8247 + CCodeGenerator VMMaker.oscog-eem.565 uuid: aa89a317-26e5-404d-aaff-e2433a344379 */ Modified: branches/Cog/src/vm/cogmethod.h =================================================================== --- branches/Cog/src/vm/cogmethod.h 2013-12-16 23:52:11 UTC (rev 2833) +++ branches/Cog/src/vm/cogmethod.h 2013-12-20 19:21:10 UTC (rev 2834) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.563 uuid: 3116fc1b-f9a5-45f5-bc7e-4b5c68ec8247 + CCodeGenerator VMMaker.oscog-eem.565 uuid: aa89a317-26e5-404d-aaff-e2433a344379 */ typedef struct { Modified: branches/Cog/src/vm/cointerp.c =================================================================== --- branches/Cog/src/vm/cointerp.c 2013-12-16 23:52:11 UTC (rev 2833) +++ branches/Cog/src/vm/cointerp.c 2013-12-20 19:21:10 UTC (rev 2834) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.563 uuid: 3116fc1b-f9a5-45f5-bc7e-4b5c68ec8247 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.565 uuid: aa89a317-26e5-404d-aaff-e2433a344379 from - CoInterpreter VMMaker.oscog-eem.563 uuid: 3116fc1b-f9a5-45f5-bc7e-4b5c68ec8247 + CoInterpreter VMMaker.oscog-eem.565 uuid: aa89a317-26e5-404d-aaff-e2433a344379 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.563 uuid: 3116fc1b-f9a5-45f5-bc7e-4b5c68ec8247 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.565 uuid: aa89a317-26e5-404d-aaff-e2433a344379 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2020,7 +2020,7 @@ /* 575 */ (void (*)(void))0, 0 }; static void (*externalPrimitiveTable[MaxExternalPrimitiveTableSize + 1 /* 4097 */])(void); -const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.563]"; +const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.565]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; @@ -5532,6 +5532,7 @@ /* begin internalPush: */ longAtPointerput((localSP -= BytesPerOop), longAt((rcvr + BaseHeaderSize) + (byte3 << ShiftForWord))); } + null; goto l4; } if (opType == 3) { @@ -5541,6 +5542,7 @@ assert(GIV(method) == (iframeMethod(localFP))); object = longAt((GIV(method) + BaseHeaderSize) + ((byte3 + LiteralStart) << ShiftForWord)); longAtPointerput((localSP -= BytesPerOop), object); + null; goto l4; } if (opType == 4) { @@ -5554,6 +5556,7 @@ object2 = longAt((oop + BaseHeaderSize) + (ValueIndex << ShiftForWord)); longAtPointerput((localSP -= BytesPerOop), object2); + null; goto l4; } top = longAtPointer(localSP); @@ -49649,7 +49652,6 @@ sqInt activeContext; sqInt activeContext1; sqInt chunk; - sqInt decodedIP; sqInt fmt; sqInt fwdBlock; sqInt header; @@ -49658,6 +49660,7 @@ sqInt iLimiT; sqInt obj; sqInt oop; + sqInt pc; sqInt realHeader; sqInt sz; sqInt sz1; @@ -49687,11 +49690,13 @@ longAtput((oop + BaseHeaderSize) + (InstructionPointerIndex << ShiftForWord), GIV(nilObj)); } else { - decodedIP = longAt((oop + BaseHeaderSize) + (InstructionPointerIndex << ShiftForWord)); - if (((decodedIP & 1)) - && ((((sqInt) decodedIP)) < 0)) { - decodedIP = mustMapMachineCodePCcontext((decodedIP >> 1), oop); - longAtput((oop + BaseHeaderSize) + (InstructionPointerIndex << ShiftForWord), decodedIP); + /* begin ensureContextHasBytecodePC: */ + assert(!(isMarriedOrWidowedContext(oop))); + pc = longAt((oop + BaseHeaderSize) + (InstructionPointerIndex << ShiftForWord)); + if (((pc & 1)) + && (((pc = (pc >> 1))) < 0)) { + pc = mustMapMachineCodePCcontext(pc, oop); + longAtput((oop + BaseHeaderSize) + (InstructionPointerIndex << ShiftForWord), pc); } } for (i = ((fetchStackPointerOf(oop)) + CtxtTempFrameStart), iLimiT = ((numSlotsOf(oop)) - 1); i <= iLimiT; i += 1) { Modified: branches/Cog/src/vm/cointerp.h =================================================================== --- branches/Cog/src/vm/cointerp.h 2013-12-16 23:52:11 UTC (rev 2833) +++ branches/Cog/src/vm/cointerp.h 2013-12-20 19:21:10 UTC (rev 2834) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.563 uuid: 3116fc1b-f9a5-45f5-bc7e-4b5c68ec8247 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.565 uuid: aa89a317-26e5-404d-aaff-e2433a344379 */ Modified: branches/Cog/src/vm/cointerpmt.c =================================================================== --- branches/Cog/src/vm/cointerpmt.c 2013-12-16 23:52:11 UTC (rev 2833) +++ branches/Cog/src/vm/cointerpmt.c 2013-12-20 19:21:10 UTC (rev 2834) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.563 uuid: 3116fc1b-f9a5-45f5-bc7e-4b5c68ec8247 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.565 uuid: aa89a317-26e5-404d-aaff-e2433a344379 from - CoInterpreterMT VMMaker.oscog-eem.563 uuid: 3116fc1b-f9a5-45f5-bc7e-4b5c68ec8247 + CoInterpreterMT VMMaker.oscog-eem.565 uuid: aa89a317-26e5-404d-aaff-e2433a344379 */ -static char __buildInfo[] = "CoInterpreterMT VMMaker.oscog-eem.563 uuid: 3116fc1b-f9a5-45f5-bc7e-4b5c68ec8247 " __DATE__ ; +static char __buildInfo[] = "CoInterpreterMT VMMaker.oscog-eem.565 uuid: aa89a317-26e5-404d-aaff-e2433a344379 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -1201,7 +1201,7 @@ static void rewriteMethodCacheEntryForExternalPrimitiveToFunction(void (*localPrimAddress)(void)); static sqInt roomToPushNArgs(sqInt n); static void runLeakCheckerForFullGC(sqInt fullGCFlag); -static usqInt safeObjectAfter(sqInt oop); +static sqInt safeObjectAfter(sqInt oop); static sqInt safePrintStringOf(sqInt oop); usqInt scavengeThresholdAddress(void); EXPORT(sqInt) sendInvokeCallbackContext(VMCallbackContext *vmCallbackContext); @@ -2118,7 +2118,7 @@ /* 575 */ (void (*)(void))0, 0 }; static void (*externalPrimitiveTable[MaxExternalPrimitiveTableSize + 1 /* 4097 */])(void); -const char *interpreterVersion = "Croquet Closure Cog MT VM [CoInterpreterMT VMMaker.oscog-eem.563]"; +const char *interpreterVersion = "Croquet Closure Cog MT VM [CoInterpreterMT VMMaker.oscog-eem.565]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; sqInt willNotThreadWarnCount; @@ -19888,15 +19888,17 @@ sqInt header1; sqInt header2; sqInt header3; + sqInt header4; usqInt lastWord; sqInt newFreeChunk; sqInt newOop; - usqInt next; + sqInt next; sqInt oop; sqInt realHeader; sqInt sz; sqInt sz1; sqInt sz2; + sqInt sz3; sqInt target; usqInt w; @@ -19907,7 +19909,21 @@ /* begin objectAfterWhileForwarding: */ header2 = longAt(oop); if ((header2 & MarkBit) == 0) { - next = ((sqInt) (objectAfter(oop))); + /* begin objectAfter: */ + if (!(asserta(oopisLessThan(oop, GIV(freeStart))))) { + error("no objects after the end of memory"); + } + if (((longAt(oop)) & TypeMask) == HeaderTypeFree) { + sz2 = (longAt(oop)) & AllButTypeMask; + } + else { + /* begin sizeBitsOf: */ + header3 = longAt(oop); + sz2 = ((header3 & TypeMask) == HeaderTypeSizeAndClass + ? (longAt(oop - (BytesPerWord * 2))) & LongSizeMask + : header3 & SizeMask); + } + next = (oop + sz2) + (headerTypeBytes[(longAt(oop + sz2)) & TypeMask]); goto l1; } fwdBlock1 = (header2 & AllButMarkBitAndTypeMask) << 1; @@ -19922,7 +19938,7 @@ else { sz1 = realHeader & SizeMask; } - next = ((sqInt) ((oop + sz1) + (headerTypeBytes[(longAt(oop + sz1)) & TypeMask]))); + next = (oop + sz1) + (headerTypeBytes[(longAt(oop + sz1)) & TypeMask]); l1: /* end objectAfterWhileForwarding: */; if (!(((longAt(oop)) & TypeMask) == HeaderTypeFree)) { @@ -19976,18 +19992,18 @@ } /* begin safeObjectAfter: */ if (((longAt(newFreeChunk)) & TypeMask) == HeaderTypeFree) { - sz2 = (longAt(newFreeChunk)) & AllButTypeMask; + sz3 = (longAt(newFreeChunk)) & AllButTypeMask; } else { /* begin sizeBitsOf: */ - header3 = longAt(newFreeChunk); - sz2 = ((header3 & TypeMask) == HeaderTypeSizeAndClass + header4 = longAt(newFreeChunk); + sz3 = ((header4 & TypeMask) == HeaderTypeSizeAndClass ? (longAt(newFreeChunk - (BytesPerWord * 2))) & LongSizeMask - : header3 & SizeMask); + : header4 & SizeMask); } - next = ((newFreeChunk + sz2) >= GIV(freeStart) + next = ((newFreeChunk + sz3) >= GIV(freeStart) ? GIV(freeStart) - : (newFreeChunk + sz2) + (headerTypeBytes[(longAt(newFreeChunk + sz2)) & TypeMask])); + : (newFreeChunk + sz3) + (headerTypeBytes[(longAt(newFreeChunk + sz3)) & TypeMask])); assert((next == GIV(freeStart)) || (next == (oopFromChunk(GIV(compEnd))))); if (next == GIV(freeStart)) { @@ -46779,7 +46795,7 @@ given object or free chunk in memory. Return freeStart when enumeration is complete. This is for assertion checking only. */ -static usqInt +static sqInt safeObjectAfter(sqInt oop) { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt header; @@ -51389,7 +51405,6 @@ sqInt activeContext; sqInt activeContext1; sqInt chunk; - sqInt decodedIP; sqInt fmt; sqInt fwdBlock; sqInt header; @@ -51398,6 +51413,7 @@ sqInt iLimiT; sqInt obj; sqInt oop; + sqInt pc; sqInt realHeader; sqInt sz; sqInt sz1; @@ -51427,11 +51443,13 @@ longAtput((oop + BaseHeaderSize) + (InstructionPointerIndex << ShiftForWord), GIV(nilObj)); } else { - decodedIP = longAt((oop + BaseHeaderSize) + (InstructionPointerIndex << ShiftForWord)); - if (((decodedIP & 1)) - && ((((sqInt) decodedIP)) < 0)) { - decodedIP = mustMapMachineCodePCcontext((decodedIP >> 1), oop); - longAtput((oop + BaseHeaderSize) + (InstructionPointerIndex << ShiftForWord), decodedIP); + /* begin ensureContextHasBytecodePC: */ + assert(!(isMarriedOrWidowedContext(oop))); + pc = longAt((oop + BaseHeaderSize) + (InstructionPointerIndex << ShiftForWord)); + if (((pc & 1)) + && (((pc = (pc >> 1))) < 0)) { + pc = mustMapMachineCodePCcontext(pc, oop); + longAtput((oop + BaseHeaderSize) + (InstructionPointerIndex << ShiftForWord), pc); } } for (i = ((fetchStackPointerOf(oop)) + CtxtTempFrameStart), iLimiT = ((numSlotsOf(oop)) - 1); i <= iLimiT; i += 1) { Modified: branches/Cog/src/vm/cointerpmt.h =================================================================== --- branches/Cog/src/vm/cointerpmt.h 2013-12-16 23:52:11 UTC (rev 2833) +++ branches/Cog/src/vm/cointerpmt.h 2013-12-20 19:21:10 UTC (rev 2834) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.563 uuid: 3116fc1b-f9a5-45f5-bc7e-4b5c68ec8247 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.565 uuid: aa89a317-26e5-404d-aaff-e2433a344379 */ Modified: branches/Cog/src/vm/gcc3x-cointerp.c =================================================================== --- branches/Cog/src/vm/gcc3x-cointerp.c 2013-12-16 23:52:11 UTC (rev 2833) +++ branches/Cog/src/vm/gcc3x-cointerp.c 2013-12-20 19:21:10 UTC (rev 2834) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.563 uuid: 3116fc1b-f9a5-45f5-bc7e-4b5c68ec8247 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.565 uuid: aa89a317-26e5-404d-aaff-e2433a344379 from - CoInterpreter VMMaker.oscog-eem.563 uuid: 3116fc1b-f9a5-45f5-bc7e-4b5c68ec8247 + CoInterpreter VMMaker.oscog-eem.565 uuid: aa89a317-26e5-404d-aaff-e2433a344379 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.563 uuid: 3116fc1b-f9a5-45f5-bc7e-4b5c68ec8247 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.565 uuid: aa89a317-26e5-404d-aaff-e2433a344379 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2023,7 +2023,7 @@ /* 575 */ (void (*)(void))0, 0 }; static void (*externalPrimitiveTable[MaxExternalPrimitiveTableSize + 1 /* 4097 */])(void); -const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.563]"; +const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.565]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; @@ -5541,6 +5541,7 @@ /* begin internalPush: */ longAtPointerput((localSP -= BytesPerOop), longAt((rcvr + BaseHeaderSize) + (byte3 << ShiftForWord))); } + null; goto l4; } if (opType == 3) { @@ -5550,6 +5551,7 @@ assert(GIV(method) == (iframeMethod(localFP))); object = longAt((GIV(method) + BaseHeaderSize) + ((byte3 + LiteralStart) << ShiftForWord)); longAtPointerput((localSP -= BytesPerOop), object); + null; goto l4; } if (opType == 4) { @@ -5563,6 +5565,7 @@ object2 = longAt((oop + BaseHeaderSize) + (ValueIndex << ShiftForWord)); longAtPointerput((localSP -= BytesPerOop), object2); + null; goto l4; } top = longAtPointer(localSP); @@ -49658,7 +49661,6 @@ sqInt activeContext; sqInt activeContext1; sqInt chunk; - sqInt decodedIP; sqInt fmt; sqInt fwdBlock; sqInt header; @@ -49667,6 +49669,7 @@ sqInt iLimiT; sqInt obj; sqInt oop; + sqInt pc; sqInt realHeader; sqInt sz; sqInt sz1; @@ -49696,11 +49699,13 @@ longAtput((oop + BaseHeaderSize) + (InstructionPointerIndex << ShiftForWord), GIV(nilObj)); } else { - decodedIP = longAt((oop + BaseHeaderSize) + (InstructionPointerIndex << ShiftForWord)); - if (((decodedIP & 1)) - && ((((sqInt) decodedIP)) < 0)) { - decodedIP = mustMapMachineCodePCcontext((decodedIP >> 1), oop); - longAtput((oop + BaseHeaderSize) + (InstructionPointerIndex << ShiftForWord), decodedIP); + /* begin ensureContextHasBytecodePC: */ + assert(!(isMarriedOrWidowedContext(oop))); + pc = longAt((oop + BaseHeaderSize) + (InstructionPointerIndex << ShiftForWord)); + if (((pc & 1)) + && (((pc = (pc >> 1))) < 0)) { + pc = mustMapMachineCodePCcontext(pc, oop); + longAtput((oop + BaseHeaderSize) + (InstructionPointerIndex << ShiftForWord), pc); } } @@ Diff output truncated at 50000 characters. @@

1 0

VM Maker: VMMaker.oscog-eem.565.mcz
by commits＠source.squeak.org 20 Dec '13

20 Dec '13

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.565.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.565 Author: eem Time: 20 December 2013, 11:10:35.058 am UUID: aa89a317-26e5-404d-aaff-e2433a344379 Ancestors: VMMaker.oscog-eem.564 Rescue the Stack VM by refactoring the snapshot bereavement code to be CoInterpreter-agnostic. Give CoInterpreter its own method cache print routine for the same reason. Change some mistaken uses of methodLabel in the Cogit to backEnd. =============== Diff against VMMaker.oscog-eem.564 =============== Item was added: + ----- Method: CoInterpreter>>printMethodCacheFor: (in category 'debug printing') ----- + printMethodCacheFor: thing + <api> + 0 to: MethodCacheSize - 1 by: MethodCacheEntrySize do: + [:i | | s c m p | + s := methodCache at: i + MethodCacheSelector. + c := methodCache at: i + MethodCacheClass. + m := methodCache at: i + MethodCacheMethod. + p := methodCache at: i + MethodCachePrimFunction. + ((thing = -1 or: [s = thing or: [c = thing or: [p = thing or: [m = thing + or: [(objectMemory addressCouldBeObj: m) + and: [(self maybeMethodHasCogMethod: m) + and: [(self cogMethodOf: m) asInteger = thing]]]]]]]) + and: [(objectMemory addressCouldBeOop: s) + and: [c ~= 0 + and: [(self addressCouldBeClassObj: c) + or: [self addressCouldBeClassObj: (objectMemory classForClassTag: c)]]]]) ifTrue: + [self cCode: [] inSmalltalk: [self transcript ensureCr]. + self printNum: i; cr; tab. + (objectMemory isBytesNonImm: s) + ifTrue: [self cCode: 'printf("%x %.*s\n", s, byteLengthOf(s), (char *)firstIndexableField(s))' + inSmalltalk: [self printHex: s; space; print: (self stringOf: s); cr]] + ifFalse: [self shortPrintOop: s]. + self tab. + (self addressCouldBeClassObj: c) + ifTrue: [self shortPrintOop: c] + ifFalse: [self printNum: c; space; shortPrintOop: (objectMemory classForClassTag: c)]. + self tab; shortPrintOop: m; tab. + self cCode: + [p > 1024 + ifTrue: [self printHexnp: p] + ifFalse: [self printNum: p]] + inSmalltalk: + [p isSymbol ifTrue: [self print: p] ifFalse: [self printNum: p]]. + self cr]]! Item was changed: ----- Method: SimpleStackBasedCogit>>ceShortCutTraceLinkedSend: (in category 'simulation only') ----- ceShortCutTraceLinkedSend: aProcessorSimulationTrap self shortcutTrampoline: aProcessorSimulationTrap + to: [coInterpreter ceTraceLinkedSend: (processor registerAt: (backEnd concreteRegister: ReceiverResultReg))]! - to: [coInterpreter ceTraceLinkedSend: (processor registerAt: (methodLabel concreteRegister: ReceiverResultReg))]! Item was changed: ----- Method: SimpleStackBasedCogit>>ceShortCutTraceStore: (in category 'simulation only') ----- ceShortCutTraceStore: aProcessorSimulationTrap <doNotGenerate> self shortcutTrampoline: aProcessorSimulationTrap to: [coInterpreter + ceTraceStoreOf: (processor registerAt: (backEnd concreteRegister: ClassReg)) + into: (processor registerAt: (backEnd concreteRegister: ReceiverResultReg))]! - ceTraceStoreOf: (processor registerAt: (methodLabel concreteRegister: ClassReg)) - into: (processor registerAt: (methodLabel concreteRegister: ReceiverResultReg))]! Item was changed: ----- Method: StackInterpreter>>bereaveAllMarriedContextsForSnapshotFlushingExternalPrimitivesIf: (in category 'frame access') ----- bereaveAllMarriedContextsForSnapshotFlushingExternalPrimitivesIf: flushExtPrims "Enumerate all contexts and convert married contexts to widowed contexts so that the snapshot contains only single contexts. This allows the test for being married to avoid checking for a context's frame pointer being in bounds. If flushExtPrims is true, flush references to external primitives in methods." <asmLabel: false> objectMemory allObjectsDo: [:obj| | fmt | fmt := objectMemory formatOf: obj. (fmt = objectMemory indexablePointersFormat and: [objectMemory isContextNonImm: obj]) ifTrue: + [(self isMarriedOrWidowedContext: obj) + ifTrue: "The stack pages have already been discarded. Any remaining married contexts are actually widows." + [self markContextAsDead: obj] + ifFalse: + [self ensureContextHasBytecodePC: obj]. - [(self isMarriedOrWidowedContext: obj) ifTrue: - [self markContextAsDead: obj]. "Fill slots beyond top of stack with nil" (self fetchStackPointerOf: obj) + CtxtTempFrameStart to: (objectMemory numSlotsOf: obj) - 1 do: [:i | objectMemory storePointerUnchecked: i ofObject: obj withValue: objectMemory nilObject]]. "Clean out external functions from compiled methods" (flushExtPrims and: [fmt >= objectMemory firstCompiledMethodFormat]) ifTrue: ["Its primitiveExternalCall" (self primitiveIndexOf: obj) = PrimitiveExternalCallIndex ifTrue: [self flushExternalPrimitiveOf: obj]]]! Item was added: + ----- Method: StackInterpreter>>ensureContextHasBytecodePC: (in category 'frame access') ----- + ensureContextHasBytecodePC: aContext + "Make sure the context has a byetcode pc. Can only be used on single contexts. + This is a nop in the StackInterpreter."! Item was changed: ----- Method: StackInterpreter>>printMethodCacheFor: (in category 'debug printing') ----- printMethodCacheFor: thing <api> 0 to: MethodCacheSize - 1 by: MethodCacheEntrySize do: [:i | | s c m p | s := methodCache at: i + MethodCacheSelector. c := methodCache at: i + MethodCacheClass. m := methodCache at: i + MethodCacheMethod. p := methodCache at: i + MethodCachePrimFunction. + ((thing = -1 or: [s = thing or: [c = thing or: [p = thing or: [m = thing]]]]) - ((thing = -1 or: [s = thing or: [c = thing or: [p = thing or: [m = thing - or: [(objectMemory addressCouldBeObj: m) - and: [(self maybeMethodHasCogMethod: m) - and: [(self cogMethodOf: m) asInteger = thing]]]]]]]) and: [(objectMemory addressCouldBeOop: s) and: [c ~= 0 and: [(self addressCouldBeClassObj: c) or: [self addressCouldBeClassObj: (objectMemory classForClassTag: c)]]]]) ifTrue: [self cCode: [] inSmalltalk: [self transcript ensureCr]. self printNum: i; cr; tab. (objectMemory isBytesNonImm: s) ifTrue: [self cCode: 'printf("%x %.*s\n", s, byteLengthOf(s), (char *)firstIndexableField(s))' inSmalltalk: [self printHex: s; space; print: (self stringOf: s); cr]] ifFalse: [self shortPrintOop: s]. self tab. (self addressCouldBeClassObj: c) ifTrue: [self shortPrintOop: c] ifFalse: [self printNum: c; space; shortPrintOop: (objectMemory classForClassTag: c)]. self tab; shortPrintOop: m; tab. self cCode: [p > 1024 ifTrue: [self printHexnp: p] ifFalse: [self printNum: p]] inSmalltalk: [p isSymbol ifTrue: [self print: p] ifFalse: [self printNum: p]]. self cr]]! Item was removed: - ----- Method: StackInterpreterPrimitives>>bereaveAllMarriedContextsForSnapshotFlushingExternalPrimitivesIf: (in category 'frame access') ----- - bereaveAllMarriedContextsForSnapshotFlushingExternalPrimitivesIf: flushExtPrims - "Enumerate all contexts and convert married contexts to widowed contexts so - that the snapshot contains only single contexts. This allows the test for being - married to avoid checking for a context's frame pointer being in bounds. If - flushExtPrims is true, flush references to external primitives in methods." - <asmLabel: false> - objectMemory allObjectsDo: - [:obj| | fmt | - fmt := objectMemory formatOf: obj. - (fmt = objectMemory indexablePointersFormat - and: [objectMemory isContextNonImm: obj]) ifTrue: - [(self isMarriedOrWidowedContext: obj) - ifTrue: "The stack pages have already been discarded. Any remaining married contexts are actually widows." - [self markContextAsDead: obj] - ifFalse: - [| decodedIP | - decodedIP := objectMemory fetchPointer: InstructionPointerIndex ofObject: obj. - ((objectMemory isIntegerObject: decodedIP) - and: [decodedIP signedIntFromLong < 0]) ifTrue: - [decodedIP := self mustMapMachineCodePC: (objectMemory integerValueOf: decodedIP) - context: obj. - objectMemory storePointerUnchecked: InstructionPointerIndex ofObject: obj withValue: decodedIP]]. - "Fill slots beyond top of stack with nil" - (self fetchStackPointerOf: obj) + CtxtTempFrameStart - to: (objectMemory numSlotsOf: obj) - 1 - do: [:i | - objectMemory - storePointerUnchecked: i - ofObject: obj - withValue: objectMemory nilObject]]. - "Clean out external functions from compiled methods" - (flushExtPrims - and: [fmt >= objectMemory firstCompiledMethodFormat]) ifTrue: - ["Its primitiveExternalCall" - (self primitiveIndexOf: obj) = PrimitiveExternalCallIndex ifTrue: - [self flushExternalPrimitiveOf: obj]]]! Item was changed: ----- Method: StackToRegisterMappingCogit>>ceShortCutTraceStore: (in category 'simulation only') ----- ceShortCutTraceStore: aProcessorSimulationTrap <doNotGenerate> self shortcutTrampoline: aProcessorSimulationTrap to: [coInterpreter + ceTraceStoreOf: (processor registerAt: (backEnd concreteRegister: TempReg)) + into: (processor registerAt: (backEnd concreteRegister: ReceiverResultReg))]! - ceTraceStoreOf: (processor registerAt: (methodLabel concreteRegister: TempReg)) - into: (processor registerAt: (methodLabel concreteRegister: ReceiverResultReg))]!

1 0

Re: [squeak-dev] The Trunk: MorphicExtras-nice.137.mcz
by Nicolas Cellier 20 Dec '13

20 Dec '13

I feel like it would be better to change pixelValueAt: so as to always unhibernate, but I did not dare if ever someone had the idea of sending it in tight loops (one shouldn't, there is BitBlt for that purpose, but who knows...). Maybe we could fail primitivePixelValueAt if receiver is Byte like, and unhibernate in fallback code. We would let every other BitBlt primitives accept a ByteArray to allow BitBlt tricks. Thoughts? 2013/12/13 <commits(a)source.squeak.org> > Nicolas Cellier uploaded a new version of MorphicExtras to project The > Trunk: > http://source.squeak.org/trunk/MorphicExtras-nice.137.mcz > > ==================== Summary ==================== > > Name: MorphicExtras-nice.137 > Author: nice > Time: 13 December 2013, 10:07:57.316 pm > UUID: 127ce68e-b210-42a3-b0b3-b40c69941d02 > Ancestors: MorphicExtras-nice.136 > > Correct an awfull bug in PaintBoxMorph>>showColor > One should NEVER send pixelValueAt: nor colorAt: to an hibernated Form (or > ColorForm). > > =============== Diff against MorphicExtras-nice.136 =============== > > Item was changed: > ----- Method: PaintBoxMorph>>showColor (in category 'actions') ----- > showColor > "Display the current color in all brushes, both on and off." > > | offIndex onIndex center | > currentColor ifNil: [^self]. > "colorPatch color: currentColor. May delete later" > (brushes isNil or: [brushes first owner ~~ self]) > ifTrue: > [brushes := OrderedCollection new. > #(#brush1: #brush2: #brush3: #brush4: #brush5: > #brush6:) > do: [:sel | brushes addLast: (self > submorphNamed: sel)]]. > + brushes last offImage unhibernate. > + brushes last onImage unhibernate. > + brushes last pressedImage unhibernate. > + center := brushes last offImage extent // 2. > + offIndex := brushes last offImage pixelValueAt: center. > + onIndex := brushes last onImage pixelValueAt: center. > - center := (brushes sixth) offImage extent // 2. > - offIndex := (brushes sixth) offImage pixelValueAt: center. > - onIndex := (brushes sixth) onImage pixelValueAt: center. > brushes do: > [:bb | > bb offImage colors at: offIndex + 1 put: > currentColor. > bb offImage clearColormapCache. > bb onImage colors at: onIndex + 1 put: > currentColor. > bb onImage clearColormapCache. > bb invalidRect: bb bounds]. > self invalidRect: (brushes first topLeft rect: brushes last > bottomRight)! > > >

2 2

Re: [Vm-dev] Does anybody have a valid link to The Hitchhiker's Guide to the Smalltalk Compiler?
by David Corking 19 Dec '13

19 Dec '13

tty: another visit to the Wayback Machine uncovered a good copy (not yet blocked by the domain squatters): http://web.archive.org/web/20010419215257/http://www.smalltalkchronicles.ne… Have fun! David

2 1

VM Maker: Cog-eem.127.mcz
by commits＠source.squeak.org 18 Dec '13

18 Dec '13

Eliot Miranda uploaded a new version of Cog to project VM Maker: http://source.squeak.org/VMMaker/Cog-eem.127.mcz ==================== Summary ==================== Name: Cog-eem.127 Author: eem Time: 17 December 2013, 5:45:20.273 pm UUID: 54410332-eb77-4003-ac94-35764c1708c7 Ancestors: Cog-eem.126 Spur bootstrap: Give immediate classes an illegal instSPec (7, that of forwarded objects) so that e.g. both SmallInteger new: 0 & SmallInteger new fail. Change to accomodate the new voidVMState... methods. Avoid assert fails during bootstrap by setting bootstrapping flag sooner. Matches VMMaker.oscog-eem.564. =============== Diff against Cog-eem.126 =============== Item was changed: ----- Method: SpurBootstrap>>newClassFormatFor: (in category 'bootstrap image') ----- newClassFormatFor: oldClassObj "OLD: <2 bits=instSize//64><5 bits=cClass><4 bits=instSpec><6 bits=instSize\\64><1 bit=0> NEW: <5 bits inst spec><16 bits inst size>" | oldFormat instSize newInstSpec | + ((oldInterpreter classNameOf: oldClassObj Is: 'SmallInteger') + or: [oldInterpreter classNameOf: oldClassObj Is: 'Character']) ifTrue: + [^newHeap integerObjectOf: newHeap instSpecForImmediateClasses << 16]. oldFormat := oldHeap formatOfClass: oldClassObj. "N.B. SmallInteger with tag bit cleared" oldFormat := oldFormat >> 1. instSize := ((oldFormat bitShift: -10) bitAnd: 16rC0) + ((oldFormat bitShift: -1) bitAnd: 16r3F) - 1. newInstSpec := #(0 1 2 3 4 nil 10 9 16 16 16 16 24 24 24 24) at: ((oldFormat bitShift: -7) bitAnd: 16rF) + 1. ^newHeap integerObjectOf: newInstSpec << 16 + instSize! Item was changed: ----- Method: SpurBootstrap>>on: (in category 'initialize-release') ----- on: imageName StackInterpreter initializeWithOptions: Dictionary new. oldInterpreter := StackInterpreterSimulator new. oldInterpreter openOn: imageName extraMemory: 0. oldHeap := oldInterpreter objectMemory. newHeap := Spur32BitMMLESimulator new. newHeap allocateMemoryOfSize: (oldHeap youngStart * 3 / 2 roundUpTo: 1024 * 1024) newSpaceSize: 1024 * 1024 stackSize: 1024 * 1024 codeSize: 0. newHeap setCheckForLeaks: 15 - 6. "don't check become; or newSpace; soooo many rehashes in bootstrap" + newHeap bootstrapping: true. self initMaps! Item was changed: ----- Method: SpurBootstrap>>scavengeImage (in category 'bootstrap image') ----- scavengeImage "Scavenge the image to get it into a simpler state." + newHeap coInterpreter voidVMStateForSnapshotFlushingExternalPrimitivesIf: false. - newHeap coInterpreter voidVMStateForSnapshot. newHeap flushNewSpace! Item was changed: ----- Method: SpurBootstrap>>withExecutableInterpreter:do: (in category 'bootstrap methods') ----- withExecutableInterpreter: sim do: aBlock "With the oldInterpreter ready to execute code, evaluate aBlock, then return the interpreter (and the heap) to the ``just snapshotted'' state." | savedpc initialContext finalContext | sim initStackPages; loadInitialContext; internalizeIPandSP. initialContext := sim frameContext: sim localFP. savedpc := sim localIP. "sim printHeadFrame." aBlock value. "sim printHeadFrame." sim internalPush: sim localIP; externalizeIPandSP. "now undo the execution state" + finalContext := sim voidVMStateForSnapshotFlushingExternalPrimitivesIf: false. - finalContext := sim voidVMStateForSnapshot. self assert: initialContext = finalContext. self assert: sim localIP = savedpc. sim objectMemory storePointer: SuspendedContextIndex ofObject: sim activeProcess withValue: finalContext! Item was changed: ----- Method: SpurBootstrap>>writeSnapshotOfTransformedImageAs: (in category 'testing') ----- writeSnapshotOfTransformedImageAs: imageFileName "The bootstrapped image typically contains a few big free chunks and one huge free chunk. Test snapshot writing and loading by turning the largest non-huge chunks into segment bridges and saving." | penultimate ultimate heap sizes counts barriers sim | heap := TransformedImage veryDeepCopy. sim := StackInterpreterSimulator onObjectMemory: heap. sim bootstrapping: true. heap coInterpreter: sim. sim initializeInterpreter: 0; setImageHeaderFlagsFrom: ImageHeaderFlags; setDisplayForm: (Form extent: ImageScreenSize >> 16 @ (ImageScreenSize bitAnd: 16rFFFF)). heap allOldSpaceEntitiesDo: [:e| penultimate := ultimate. ultimate := e]. self assert: (heap isFreeObject: penultimate). self assert: (heap isSegmentBridge: ultimate). sizes := Bag new. heap allObjectsInFreeTree: (heap freeLists at: 0) do: [:f| sizes add: (heap bytesInObject: f)]. counts := sizes sortedCounts. self assert: counts last key = 1. "1 huge chunk" counts size > 1 ifTrue: [self assert: ((counts at: counts size - 1) key > 2 and: [(counts at: counts size - 1) value > 1024]). barriers := (1 to: (counts at: counts size - 1) key) collect: [:ign| heap allocateOldSpaceChunkOfExactlyBytes: (counts at: counts size - 1) value]. barriers := barriers, {heap allocateOldSpaceChunkOfExactlyBytes: (heap bytesInObject: penultimate)}] ifFalse: [barriers := {heap allocateOldSpaceChunkOfExactlyBytes: (heap bytesInObject: penultimate)}]. heap setEndOfMemory: barriers last. heap allOldSpaceEntitiesDo: [:e| penultimate := ultimate. ultimate := e]. self assert: (heap addressAfter: ultimate) = barriers last. heap checkFreeSpace. heap runLeakCheckerForFullGC: true. heap segmentManager initializeFromFreeChunks: (barriers sort collect: [:b| heap objectStartingAt: b]). heap checkFreeSpace. heap runLeakCheckerForFullGC: true. + sim bereaveAllMarriedContextsForSnapshotFlushingExternalPrimitivesIf: true. - sim bereaveAndNormalizeContextsAndFlushExternalPrimitives. sim imageName: imageFileName. sim writeImageFileIO!

1 0

VM Maker: VMMaker.oscog-eem.564.mcz
by commits＠source.squeak.org 18 Dec '13

18 Dec '13

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.564.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.564 Author: eem Time: 17 December 2013, 5:41:30.917 pm UUID: 70d96811-1a51-4f85-9f12-cb5a3ba8a8bf Ancestors: VMMaker.oscog-eem.563 Make the instantiation primtijevs fail for format 7 (forwarded format) and name this for use as the format of immediate classes. Include both variants of the get class tag code in the Spur obj rep. =============== Diff against VMMaker.oscog-eem.563 =============== Item was changed: ----- Method: CogObjectRepresentationFor32BitSpur>>getInlineCacheClassTagFrom:into: (in category 'compile abstract instructions') ----- getInlineCacheClassTagFrom: sourceReg into: destReg "Extract the inline cache tag for the object in sourceReg into destReg. The inline cache tag for a given object is the value loaded in inline caches to distinguish objects of different classes. In Spur this is either the tags for immediates, (with 1 & 3 collapsed to 1 for SmallIntegers, and 2 collapsed to 0 for Characters), or the receiver's classIndex. Generate something like this: Lentry: movl rSource, rDest andl $0x3, rDest jz LnotImm andl $1, rDest j Lcmp LnotImm: movl 0(%edx), rDest andl $0x3fffff, rDest Lcmp: At least on a 2.2GHz Intel Core i7 it is slightly faster, 136m sends/sec vs 130m sends/sec for nfib in tinyBenchmarks, than Limm: andl $0x1, rDest j Lcmp Lentry: movl rSource, rDest andl $0x3, rDest jnz Limm movl 0(%edx), rDest andl $0x3fffff, rDest Lcmp: " + | immLabel jumpNotImm entryLabel jumpCompare | + <var: #immLabel type: #'AbstractInstruction *'> - | jumpNotImm entryLabel jumpCompare | <var: #jumpNotImm type: #'AbstractInstruction *'> <var: #entryLabel type: #'AbstractInstruction *'> <var: #jumpCompare type: #'AbstractInstruction *'> + true + ifTrue: + [cogit AlignmentNops: (BytesPerWord max: 8). + entryLabel := cogit Label. + cogit MoveR: sourceReg R: destReg. + cogit AndCq: objectMemory tagMask R: destReg. + jumpNotImm := cogit JumpZero: 0. + cogit AndCq: 1 R: destReg. + jumpCompare := cogit Jump: 0. + "Get least significant half of header word in destReg" + self flag: #endianness. + jumpNotImm jmpTarget: + (cogit MoveMw: 0 r: sourceReg R: destReg). + jumpCompare jmpTarget: + (cogit AndCq: objectMemory classIndexMask R: destReg)] + ifFalse: + [cogit AlignmentNops: BytesPerWord. + immLabel := cogit Label. + cogit AndCq: 1 R: destReg. + jumpCompare := cogit Jump: 0. + cogit AlignmentNops: BytesPerWord. + entryLabel := cogit Label. + cogit MoveR: sourceReg R: destReg. + cogit AndCq: objectMemory tagMask R: destReg. + cogit JumpNonZero: immLabel. + self flag: #endianness. + "Get least significant half of header word in destReg" + cogit MoveMw: 0 r: sourceReg R: destReg. + cogit AndCq: objectMemory classIndexMask R: destReg. + jumpCompare jmpTarget: cogit Label]. - cogit AlignmentNops: (BytesPerWord max: 8). - entryLabel := cogit Label. - cogit MoveR: sourceReg R: destReg. - cogit AndCq: objectMemory tagMask R: destReg. - jumpNotImm := cogit JumpZero: 0. - cogit AndCq: 1 R: destReg. - jumpCompare := cogit Jump: 0. - "Get least significant half of header word in destReg" - self flag: #endianness. - jumpNotImm jmpTarget: - (cogit MoveMw: 0 r: sourceReg R: destReg). - jumpCompare jmpTarget: - (cogit AndCq: objectMemory classIndexMask R: destReg). ^entryLabel! Item was changed: ----- Method: Spur32BitMemoryManager>>instantiateClass:indexableSize: (in category 'instantiation') ----- instantiateClass: classObj indexableSize: nElements | instSpec classFormat numSlots classIndex newObj fillValue | classFormat := self formatOfClass: classObj. instSpec := self instSpecOfClassFormat: classFormat. fillValue := 0. instSpec caseOf: { [self arrayFormat] -> [numSlots := nElements. fillValue := nilObj]. [self indexablePointersFormat] -> [numSlots := (self fixedFieldsOfClassFormat: classFormat) + nElements. fillValue := nilObj]. [self weakArrayFormat] -> [numSlots := (self fixedFieldsOfClassFormat: classFormat) + nElements. fillValue := nilObj]. [self sixtyFourBitIndexableFormat] -> [numSlots := nElements * 2]. [self firstLongFormat] -> [numSlots := nElements]. [self firstShortFormat] -> [numSlots := nElements + 1 // 2. instSpec := instSpec + (nElements bitAnd: 1)]. [self firstByteFormat] -> [numSlots := nElements + 3 // 4. instSpec := instSpec + (4 - nElements bitAnd: 3)]. [self firstCompiledMethodFormat] -> [numSlots := nElements + 3 // 4. instSpec := instSpec + (4 - nElements bitAnd: 3)] } otherwise: ["some Squeak images include funky fixed subclasses of abstract variable superclasses. e.g. DirectoryEntry as a subclass of ArrayedCollection. Allow fixed classes to be instantiated here iff nElements = 0." + (nElements ~= 0 or: [instSpec > self lastPointerFormat]) ifTrue: - (nElements ~= 0 or: [instSpec >= self sixtyFourBitIndexableFormat]) ifTrue: [^nil]. numSlots := self fixedFieldsOfClassFormat: classFormat]. "non-indexable" classIndex := self ensureBehaviorHash: classObj. classIndex < 0 ifTrue: [coInterpreter primitiveFailFor: classIndex negated. ^nil]. numSlots > self maxSlotsForNewSpaceAlloc ifTrue: [newObj := self allocateSlotsInOldSpace: numSlots format: instSpec classIndex: classIndex] ifFalse: [newObj := self allocateSlots: numSlots format: instSpec classIndex: classIndex]. newObj ifNotNil: [self fillObj: newObj numSlots: numSlots with: fillValue]. ^newObj! Item was changed: ----- Method: Spur64BitMemoryManager>>instantiateClass:indexableSize: (in category 'instantiation') ----- instantiateClass: classObj indexableSize: nElements | instSpec classFormat numSlots classIndex newObj fillValue | classFormat := self formatOfClass: classObj. instSpec := self instSpecOfClassFormat: classFormat. fillValue := 0. instSpec caseOf: { [self arrayFormat] -> [numSlots := nElements. fillValue := nilObj]. [self indexablePointersFormat] -> [numSlots := (self fixedFieldsOfClassFormat: classFormat) + nElements. fillValue := nilObj]. [self weakArrayFormat] -> [numSlots := (self fixedFieldsOfClassFormat: classFormat) + nElements. fillValue := nilObj]. [self sixtyFourBitIndexableFormat] -> [numSlots := nElements]. [self firstLongFormat] -> [numSlots := nElements + 1 // 2. instSpec := instSpec + (nElements bitAnd: 1)]. [self firstShortFormat] -> [numSlots := nElements + 3 // 4. instSpec := instSpec + (4 - nElements bitAnd: 3)]. [self firstByteFormat] -> [numSlots := nElements + 7 // 8. instSpec := instSpec + (8 - nElements bitAnd: 7)]. [self firstCompiledMethodFormat] -> [numSlots := nElements + 7 // 8. instSpec := instSpec + (8 - nElements bitAnd: 7)] } otherwise: ["some Squeak images include funky fixed subclasses of abstract variable superclasses. e.g. DirectoryEntry as a subclass of ArrayedCollection. Allow fixed classes to be instantiated here iff nElements = 0." + (nElements ~= 0 or: [instSpec > self lastPointerFormat]) ifTrue: - (nElements ~= 0 or: [instSpec >= self sixtyFourBitIndexableFormat]) ifTrue: [^nil]. numSlots := self fixedFieldsOfClassFormat: classFormat]. "non-indexable" classIndex := self ensureBehaviorHash: classObj. classIndex < 0 ifTrue: [coInterpreter primitiveFailFor: classIndex negated. ^nil]. numSlots > self maxSlotsForNewSpaceAlloc ifTrue: [newObj := self allocateSlotsInOldSpace: numSlots format: instSpec classIndex: classIndex] ifFalse: [newObj := self allocateSlots: numSlots format: instSpec classIndex: classIndex]. newObj ifNotNil: [self fillObj: newObj numSlots: numSlots with: fillValue]. ^newObj! Item was added: + ----- Method: SpurMemoryManager>>instSpecForImmediateClasses (in category 'header formats') ----- + instSpecForImmediateClasses + "Use the format for forwarded objects for immediate classes. Immediate classes (SmallInteger, + Character, etc) can't be instantiated, so the inst spec should be an invalid one to cause the + instantiation primitives to fail. The forwardedFormat is internal to the SpurMemoryManager, + used to mark forwarded objects only, and so is suitable." + ^self forwardedFormat! Item was changed: ----- Method: SpurSegmentManager>>initForBootstrap (in category 'spur bootstrap') ----- initForBootstrap + numSegInfos = 0 ifTrue: + [self allocateOrExtendSegmentInfos]! - self allocateOrExtendSegmentInfos!

1 0

Dalvik vs. ART: Android virtual machines and the battle for better performance | Pocketnow
by phil＠highoctane.be 17 Dec '13

17 Dec '13

http://m.pocketnow.com/2013/11/13/dalvik-vs-art

11 22

Some protection missing (I guess in COG version)
by Nicolas Cellier 17 Dec '13

17 Dec '13

(SmallInteger new: 0) can quickly lead to a VM crash. This should better be intercepted as a primitive failure. I know that we cannot protect against all and every mistake, but this one should be easy. See http://stackoverflow.com/questions/20621119/how-to-print-an-integer-to-tran… I'm thinking of Spur where Character are immediate and where archeo-code could lead to same kind of crash.

3 2

[commit][2833] VMMaker.oscog-eem.563
by commits＠squeakvm.org 16 Dec '13

16 Dec '13

Revision: 2833 Author: eliot Date: 2013-12-16 15:52:11 -0800 (Mon, 16 Dec 2013) Log Message: ----------- VMMaker.oscog-eem.563 Author: eem Time: 16 December 2013, 3:41:22.598 pm UUID: 3116fc1b-f9a5-45f5-bc7e-4b5c68ec8247 Ancestors: VMMaker.oscog-eem.562 Avoid including the instructionPointer in the context when marrying the top frame during divorceAllFrames for voidVMState..If:. (how did this ever work??) Fix bogus assert failure in checkIfValidObjectRef:pc:cogMethod: in Newspeak VM. Fix Spur initial alloc on Mac OS. 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/platforms/Mac OS/vm/sqMacMemory.c branches/Cog/platforms/Mac OS/vm/sqPlatformSpecific.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 2013-12-12 22:53:13 UTC (rev 2832) +++ branches/Cog/nscogsrc/vm/cogit.c 2013-12-16 23:52:11 UTC (rev 2833) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.561 uuid: 13467880-93b9-4137-9bbc-7ebfd22436ab + CCodeGenerator VMMaker.oscog-eem.563 uuid: 3116fc1b-f9a5-45f5-bc7e-4b5c68ec8247 from - StackToRegisterMappingCogit VMMaker.oscog-eem.561 uuid: 13467880-93b9-4137-9bbc-7ebfd22436ab + StackToRegisterMappingCogit VMMaker.oscog-eem.563 uuid: 3116fc1b-f9a5-45f5-bc7e-4b5c68ec8247 */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.561 uuid: 13467880-93b9-4137-9bbc-7ebfd22436ab " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.563 uuid: 3116fc1b-f9a5-45f5-bc7e-4b5c68ec8247 " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -3029,28 +3029,33 @@ if ((annotation == IsSendCall) || (annotation == IsNSSendCall)) { entryPoint = callTargetFromReturnAddress(backEnd, ((sqInt)mcpc)); - /* begin offsetAndSendTableFor:annotation:into: */ - if ((entryPoint & entryPointMask) == checkedEntryAlignment) { - assert(annotation == IsSendCall); - offset = cmEntryOffset; - sendTable = sendTrampolines; - + if (entryPoint <= methodZoneBase) { + offset = entryPoint; } else { - if ((entryPoint & entryPointMask) == dynSuperEntryAlignment) { - assert(annotation == IsNSSendCall); - offset = cmDynSuperEntryOffset; - sendTable = dynamicSuperSendTrampolines; + /* begin offsetAndSendTableFor:annotation:into: */ + if ((entryPoint & entryPointMask) == checkedEntryAlignment) { + assert(annotation == IsSendCall); + offset = cmEntryOffset; + sendTable = sendTrampolines; } else { - assert(annotation == IsSendCall); - offset = cmNoCheckEntryOffset; - sendTable = superSendTrampolines; + if ((entryPoint & entryPointMask) == dynSuperEntryAlignment) { + assert(annotation == IsNSSendCall); + offset = cmDynSuperEntryOffset; + sendTable = dynamicSuperSendTrampolines; + } + else { + assert(annotation == IsSendCall); + offset = cmNoCheckEntryOffset; + sendTable = superSendTrampolines; + + } } + } - selectorOrCacheTag = inlineCacheTagAt(backEnd, ((sqInt)mcpc)); if ((entryPoint > methodZoneBase) && ((offset != cmNoCheckEntryOffset) Modified: branches/Cog/nscogsrc/vm/cogit.h =================================================================== --- branches/Cog/nscogsrc/vm/cogit.h 2013-12-12 22:53:13 UTC (rev 2832) +++ branches/Cog/nscogsrc/vm/cogit.h 2013-12-16 23:52:11 UTC (rev 2833) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.561 uuid: 13467880-93b9-4137-9bbc-7ebfd22436ab + CCodeGenerator VMMaker.oscog-eem.563 uuid: 3116fc1b-f9a5-45f5-bc7e-4b5c68ec8247 */ Modified: branches/Cog/nscogsrc/vm/cogmethod.h =================================================================== --- branches/Cog/nscogsrc/vm/cogmethod.h 2013-12-12 22:53:13 UTC (rev 2832) +++ branches/Cog/nscogsrc/vm/cogmethod.h 2013-12-16 23:52:11 UTC (rev 2833) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.561 uuid: 13467880-93b9-4137-9bbc-7ebfd22436ab + CCodeGenerator VMMaker.oscog-eem.563 uuid: 3116fc1b-f9a5-45f5-bc7e-4b5c68ec8247 */ typedef struct { Modified: branches/Cog/nscogsrc/vm/cointerp.c =================================================================== --- branches/Cog/nscogsrc/vm/cointerp.c 2013-12-12 22:53:13 UTC (rev 2832) +++ branches/Cog/nscogsrc/vm/cointerp.c 2013-12-16 23:52:11 UTC (rev 2833) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.561 uuid: 13467880-93b9-4137-9bbc-7ebfd22436ab + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.563 uuid: 3116fc1b-f9a5-45f5-bc7e-4b5c68ec8247 from - CoInterpreter VMMaker.oscog-eem.561 uuid: 13467880-93b9-4137-9bbc-7ebfd22436ab + CoInterpreter VMMaker.oscog-eem.563 uuid: 3116fc1b-f9a5-45f5-bc7e-4b5c68ec8247 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.561 uuid: 13467880-93b9-4137-9bbc-7ebfd22436ab " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.563 uuid: 3116fc1b-f9a5-45f5-bc7e-4b5c68ec8247 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -1143,7 +1143,7 @@ static void rewriteMethodCacheEntryForExternalPrimitiveToFunction(void (*localPrimAddress)(void)); static sqInt roomToPushNArgs(sqInt n); static void runLeakCheckerForFullGC(sqInt fullGCFlag); -static sqInt safeObjectAfter(sqInt oop); +static usqInt safeObjectAfter(sqInt oop); static sqInt safePrintStringOf(sqInt oop); usqInt scavengeThresholdAddress(void); EXPORT(sqInt) sendInvokeCallbackContext(VMCallbackContext *vmCallbackContext); @@ -1320,18 +1320,19 @@ _iss sqInt statCheckForEvents; _iss sqInt statGrowMemory; _iss sqInt statMarkCount; -_iss sqInt cogCodeSize; _iss sqInt lastCoggableInterpretedBlockMethod; _iss sqInt lastUncoggableInterpretedBlockMethod; _iss sqInt lowSpaceThreshold; _iss sqInt rootTableOverflowed; _iss usqLong statGCEndUsecs; _iss sqInt statSweepCount; +_iss sqInt cogCodeSize; _iss usqInt compEnd; _iss sqInt flagInterpretedMethods; _iss sqInt metaclassNumSlots; _iss sqInt pendingFinalizationSignals; _iss sqInt statIOProcessEvents; +_iss sqInt edenBytes; _iss usqInt fwdTableLast; _iss usqLong gcStartUsecs; _iss sqInt lastBackwardJumpMethod; @@ -1342,7 +1343,6 @@ _iss sqInt statMkFwdCount; _iss sqInt tenuringThreshold; _iss sqInt thisClassIndex; -_iss sqInt edenBytes; _iss sqInt externalPrimitiveTableFirstFreeIndex; _iss sqInt forceTenureFlag; _iss sqInt fullScreenFlag; @@ -2030,7 +2030,7 @@ /* 575 */ (void (*)(void))0, 0 }; static void (*externalPrimitiveTable[MaxExternalPrimitiveTableSize + 1 /* 4097 */])(void); -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.561"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.563"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; @@ -5666,6 +5666,7 @@ /* begin internalPush: */ longAtPointerput((localSP -= BytesPerOop), longAt((rcvr + BaseHeaderSize) + (byte3 << ShiftForWord))); } + null; goto l4; } if (opType == 3) { @@ -5675,6 +5676,7 @@ assert(GIV(method) == (iframeMethod(localFP))); object = longAt((GIV(method) + BaseHeaderSize) + ((byte3 + LiteralStart) << ShiftForWord)); longAtPointerput((localSP -= BytesPerOop), object); + null; goto l4; } if (opType == 4) { @@ -5688,6 +5690,7 @@ object2 = longAt((oop + BaseHeaderSize) + (ValueIndex << ShiftForWord)); longAtPointerput((localSP -= BytesPerOop), object2); + null; goto l4; } top = longAtPointer(localSP); @@ -18742,7 +18745,7 @@ activeContext = longAt(GIV(framePointer) + FoxThisContext); goto l1; } - activeContext = marryFrameSP(GIV(framePointer), GIV(stackPointer)); + activeContext = marryFrameSP(GIV(framePointer), GIV(stackPointer) + BytesPerWord); l1: /* end ensureFrameIsMarried:SP: */; for (i = 0; i < GIV(numStackPages); i += 1) { /* begin stackPageAt: */ @@ -22168,9 +22171,8 @@ sqInt assoc; sqInt classObj; CogMethod *cogMethod; - sqInt fieldIndex; sqInt header; - sqInt offset; + sqInt litCount; } @@ -23724,17 +23726,15 @@ sqInt header1; sqInt header2; sqInt header3; - sqInt header4; usqInt lastWord; sqInt newFreeChunk; sqInt newOop; - sqInt next; + usqInt next; sqInt oop; sqInt realHeader; sqInt sz; sqInt sz1; sqInt sz2; - sqInt sz3; sqInt target; usqInt w; @@ -23745,21 +23745,7 @@ /* begin objectAfterWhileForwarding: */ header2 = longAt(oop); if ((header2 & MarkBit) == 0) { - /* begin objectAfter: */ - if (!(asserta(oopisLessThan(oop, GIV(freeStart))))) { - error("no objects after the end of memory"); - } - if (((longAt(oop)) & TypeMask) == HeaderTypeFree) { - sz2 = (longAt(oop)) & AllButTypeMask; - } - else { - /* begin sizeBitsOf: */ - header3 = longAt(oop); - sz2 = ((header3 & TypeMask) == HeaderTypeSizeAndClass - ? (longAt(oop - (BytesPerWord * 2))) & LongSizeMask - : header3 & SizeMask); - } - next = (oop + sz2) + (headerTypeBytes[(longAt(oop + sz2)) & TypeMask]); + next = ((sqInt) (objectAfter(oop))); goto l1; } fwdBlock1 = (header2 & AllButMarkBitAndTypeMask) << 1; @@ -23774,7 +23760,7 @@ else { sz1 = realHeader & SizeMask; } - next = (oop + sz1) + (headerTypeBytes[(longAt(oop + sz1)) & TypeMask]); + next = ((sqInt) ((oop + sz1) + (headerTypeBytes[(longAt(oop + sz1)) & TypeMask]))); l1: /* end objectAfterWhileForwarding: */; if (!(((longAt(oop)) & TypeMask) == HeaderTypeFree)) { @@ -23828,18 +23814,18 @@ } /* begin safeObjectAfter: */ if (((longAt(newFreeChunk)) & TypeMask) == HeaderTypeFree) { - sz3 = (longAt(newFreeChunk)) & AllButTypeMask; + sz2 = (longAt(newFreeChunk)) & AllButTypeMask; } else { /* begin sizeBitsOf: */ - header4 = longAt(newFreeChunk); - sz3 = ((header4 & TypeMask) == HeaderTypeSizeAndClass + header3 = longAt(newFreeChunk); + sz2 = ((header3 & TypeMask) == HeaderTypeSizeAndClass ? (longAt(newFreeChunk - (BytesPerWord * 2))) & LongSizeMask - : header4 & SizeMask); + : header3 & SizeMask); } - next = ((newFreeChunk + sz3) >= GIV(freeStart) + next = ((newFreeChunk + sz2) >= GIV(freeStart) ? GIV(freeStart) - : (newFreeChunk + sz3) + (headerTypeBytes[(longAt(newFreeChunk + sz3)) & TypeMask])); + : (newFreeChunk + sz2) + (headerTypeBytes[(longAt(newFreeChunk + sz2)) & TypeMask])); assert((next == GIV(freeStart)) || (next == (oopFromChunk(GIV(compEnd))))); if (next == GIV(freeStart)) { @@ -49148,10 +49134,8 @@ minimumMemory = ((GIV(cogCodeSize) + dataSize) + GIV(edenBytes)) + (interpreterAllocationReserveBytes()); /* no need to include the stackZone; this is alloca'ed */ - /* + edenBytes */ - /* don't include edenBytes; this is part of the heap and so part of desiredHeapSize */ - heapSize = (GIV(cogCodeSize) + desiredHeapSize) + (interpreterAllocationReserveBytes()); + heapSize = ((GIV(cogCodeSize) + desiredHeapSize) + GIV(edenBytes)) + (interpreterAllocationReserveBytes()); if (heapSize < minimumMemory) { insufficientMemorySpecifiedError(); } @@ -49163,7 +49147,7 @@ } /* begin setHeapBase:memoryLimit:endOfMemory: */ baseOfHeap = (memory()) + GIV(cogCodeSize); - memLimit = ((memory()) + GIV(cogCodeSize)) + heapSize; + memLimit = (memory()) + heapSize; memEnd = ((memory()) + GIV(cogCodeSize)) + dataSize; /* begin setMemoryLimit: */ assert((memLimit & (BytesPerWord - 1)) == 0); @@ -50049,7 +50033,7 @@ given object or free chunk in memory. Return freeStart when enumeration is complete. This is for assertion checking only. */ -static sqInt +static usqInt safeObjectAfter(sqInt oop) { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt header; Modified: branches/Cog/nscogsrc/vm/cointerp.h =================================================================== --- branches/Cog/nscogsrc/vm/cointerp.h 2013-12-12 22:53:13 UTC (rev 2832) +++ branches/Cog/nscogsrc/vm/cointerp.h 2013-12-16 23:52:11 UTC (rev 2833) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.561 uuid: 13467880-93b9-4137-9bbc-7ebfd22436ab + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.563 uuid: 3116fc1b-f9a5-45f5-bc7e-4b5c68ec8247 */ Modified: branches/Cog/nscogsrc/vm/gcc3x-cointerp.c =================================================================== --- branches/Cog/nscogsrc/vm/gcc3x-cointerp.c 2013-12-12 22:53:13 UTC (rev 2832) +++ branches/Cog/nscogsrc/vm/gcc3x-cointerp.c 2013-12-16 23:52:11 UTC (rev 2833) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.561 uuid: 13467880-93b9-4137-9bbc-7ebfd22436ab + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.563 uuid: 3116fc1b-f9a5-45f5-bc7e-4b5c68ec8247 from - CoInterpreter VMMaker.oscog-eem.561 uuid: 13467880-93b9-4137-9bbc-7ebfd22436ab + CoInterpreter VMMaker.oscog-eem.563 uuid: 3116fc1b-f9a5-45f5-bc7e-4b5c68ec8247 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.561 uuid: 13467880-93b9-4137-9bbc-7ebfd22436ab " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.563 uuid: 3116fc1b-f9a5-45f5-bc7e-4b5c68ec8247 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -1146,7 +1146,7 @@ static void rewriteMethodCacheEntryForExternalPrimitiveToFunction(void (*localPrimAddress)(void)); static sqInt roomToPushNArgs(sqInt n); static void runLeakCheckerForFullGC(sqInt fullGCFlag); -static sqInt safeObjectAfter(sqInt oop); +static usqInt safeObjectAfter(sqInt oop); static sqInt safePrintStringOf(sqInt oop); usqInt scavengeThresholdAddress(void); EXPORT(sqInt) sendInvokeCallbackContext(VMCallbackContext *vmCallbackContext); @@ -1323,18 +1323,19 @@ _iss sqInt statCheckForEvents; _iss sqInt statGrowMemory; _iss sqInt statMarkCount; -_iss sqInt cogCodeSize; _iss sqInt lastCoggableInterpretedBlockMethod; _iss sqInt lastUncoggableInterpretedBlockMethod; _iss sqInt lowSpaceThreshold; _iss sqInt rootTableOverflowed; _iss usqLong statGCEndUsecs; _iss sqInt statSweepCount; +_iss sqInt cogCodeSize; _iss usqInt compEnd; _iss sqInt flagInterpretedMethods; _iss sqInt metaclassNumSlots; _iss sqInt pendingFinalizationSignals; _iss sqInt statIOProcessEvents; +_iss sqInt edenBytes; _iss usqInt fwdTableLast; _iss usqLong gcStartUsecs; _iss sqInt lastBackwardJumpMethod; @@ -1345,7 +1346,6 @@ _iss sqInt statMkFwdCount; _iss sqInt tenuringThreshold; _iss sqInt thisClassIndex; -_iss sqInt edenBytes; _iss sqInt externalPrimitiveTableFirstFreeIndex; _iss sqInt forceTenureFlag; _iss sqInt fullScreenFlag; @@ -2033,7 +2033,7 @@ /* 575 */ (void (*)(void))0, 0 }; static void (*externalPrimitiveTable[MaxExternalPrimitiveTableSize + 1 /* 4097 */])(void); -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.561"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.563"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; @@ -5675,6 +5675,7 @@ /* begin internalPush: */ longAtPointerput((localSP -= BytesPerOop), longAt((rcvr + BaseHeaderSize) + (byte3 << ShiftForWord))); } + null; goto l4; } if (opType == 3) { @@ -5684,6 +5685,7 @@ assert(GIV(method) == (iframeMethod(localFP))); object = longAt((GIV(method) + BaseHeaderSize) + ((byte3 + LiteralStart) << ShiftForWord)); longAtPointerput((localSP -= BytesPerOop), object); + null; goto l4; } if (opType == 4) { @@ -5697,6 +5699,7 @@ object2 = longAt((oop + BaseHeaderSize) + (ValueIndex << ShiftForWord)); longAtPointerput((localSP -= BytesPerOop), object2); + null; goto l4; } top = longAtPointer(localSP); @@ -18751,7 +18754,7 @@ activeContext = longAt(GIV(framePointer) + FoxThisContext); goto l1; } - activeContext = marryFrameSP(GIV(framePointer), GIV(stackPointer)); + activeContext = marryFrameSP(GIV(framePointer), GIV(stackPointer) + BytesPerWord); l1: /* end ensureFrameIsMarried:SP: */; for (i = 0; i < GIV(numStackPages); i += 1) { /* begin stackPageAt: */ @@ -22177,9 +22180,8 @@ sqInt assoc; sqInt classObj; CogMethod *cogMethod; - sqInt fieldIndex; sqInt header; - sqInt offset; + sqInt litCount; } @@ -23733,17 +23735,15 @@ sqInt header1; sqInt header2; sqInt header3; - sqInt header4; usqInt lastWord; sqInt newFreeChunk; sqInt newOop; - sqInt next; + usqInt next; sqInt oop; sqInt realHeader; sqInt sz; sqInt sz1; sqInt sz2; - sqInt sz3; sqInt target; usqInt w; @@ -23754,21 +23754,7 @@ /* begin objectAfterWhileForwarding: */ header2 = longAt(oop); if ((header2 & MarkBit) == 0) { - /* begin objectAfter: */ - if (!(asserta(oopisLessThan(oop, GIV(freeStart))))) { - error("no objects after the end of memory"); - } - if (((longAt(oop)) & TypeMask) == HeaderTypeFree) { - sz2 = (longAt(oop)) & AllButTypeMask; - } - else { - /* begin sizeBitsOf: */ - header3 = longAt(oop); - sz2 = ((header3 & TypeMask) == HeaderTypeSizeAndClass - ? (longAt(oop - (BytesPerWord * 2))) & LongSizeMask - : header3 & SizeMask); - } - next = (oop + sz2) + (headerTypeBytes[(longAt(oop + sz2)) & TypeMask]); + next = ((sqInt) (objectAfter(oop))); goto l1; } fwdBlock1 = (header2 & AllButMarkBitAndTypeMask) << 1; @@ -23783,7 +23769,7 @@ else { sz1 = realHeader & SizeMask; } - next = (oop + sz1) + (headerTypeBytes[(longAt(oop + sz1)) & TypeMask]); + next = ((sqInt) ((oop + sz1) + (headerTypeBytes[(longAt(oop + sz1)) & TypeMask]))); l1: /* end objectAfterWhileForwarding: */; if (!(((longAt(oop)) & TypeMask) == HeaderTypeFree)) { @@ -23837,18 +23823,18 @@ } /* begin safeObjectAfter: */ if (((longAt(newFreeChunk)) & TypeMask) == HeaderTypeFree) { - sz3 = (longAt(newFreeChunk)) & AllButTypeMask; + sz2 = (longAt(newFreeChunk)) & AllButTypeMask; } else { /* begin sizeBitsOf: */ - header4 = longAt(newFreeChunk); - sz3 = ((header4 & TypeMask) == HeaderTypeSizeAndClass + header3 = longAt(newFreeChunk); + sz2 = ((header3 & TypeMask) == HeaderTypeSizeAndClass ? (longAt(newFreeChunk - (BytesPerWord * 2))) & LongSizeMask - : header4 & SizeMask); + : header3 & SizeMask); } - next = ((newFreeChunk + sz3) >= GIV(freeStart) + next = ((newFreeChunk + sz2) >= GIV(freeStart) ? GIV(freeStart) - : (newFreeChunk + sz3) + (headerTypeBytes[(longAt(newFreeChunk + sz3)) & TypeMask])); + : (newFreeChunk + sz2) + (headerTypeBytes[(longAt(newFreeChunk + sz2)) & TypeMask])); assert((next == GIV(freeStart)) || (next == (oopFromChunk(GIV(compEnd))))); if (next == GIV(freeStart)) { @@ -49157,10 +49143,8 @@ minimumMemory = ((GIV(cogCodeSize) + dataSize) + GIV(edenBytes)) + (interpreterAllocationReserveBytes()); /* no need to include the stackZone; this is alloca'ed */ - /* + edenBytes */ - /* don't include edenBytes; this is part of the heap and so part of desiredHeapSize */ - heapSize = (GIV(cogCodeSize) + desiredHeapSize) + (interpreterAllocationReserveBytes()); + heapSize = ((GIV(cogCodeSize) + desiredHeapSize) + GIV(edenBytes)) + (interpreterAllocationReserveBytes()); if (heapSize < minimumMemory) { insufficientMemorySpecifiedError(); } @@ -49172,7 +49156,7 @@ } /* begin setHeapBase:memoryLimit:endOfMemory: */ baseOfHeap = (memory()) + GIV(cogCodeSize); - memLimit = ((memory()) + GIV(cogCodeSize)) + heapSize; + memLimit = (memory()) + heapSize; memEnd = ((memory()) + GIV(cogCodeSize)) + dataSize; /* begin setMemoryLimit: */ assert((memLimit & (BytesPerWord - 1)) == 0); @@ -50058,7 +50042,7 @@ given object or free chunk in memory. Return freeStart when enumeration is complete. This is for assertion checking only. */ -static sqInt +static usqInt safeObjectAfter(sqInt oop) { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt header; Modified: branches/Cog/nscogsrc/vm/interp.h =================================================================== --- branches/Cog/nscogsrc/vm/interp.h 2013-12-12 22:53:13 UTC (rev 2832) +++ branches/Cog/nscogsrc/vm/interp.h 2013-12-16 23:52:11 UTC (rev 2833) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.561 uuid: 13467880-93b9-4137-9bbc-7ebfd22436ab + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.563 uuid: 3116fc1b-f9a5-45f5-bc7e-4b5c68ec8247 */ #define VM_PROXY_MAJOR 1 Modified: branches/Cog/nscogsrc/vm/vmCallback.h =================================================================== --- branches/Cog/nscogsrc/vm/vmCallback.h 2013-12-12 22:53:13 UTC (rev 2832) +++ branches/Cog/nscogsrc/vm/vmCallback.h 2013-12-16 23:52:11 UTC (rev 2833) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.561 uuid: 13467880-93b9-4137-9bbc-7ebfd22436ab + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.563 uuid: 3116fc1b-f9a5-45f5-bc7e-4b5c68ec8247 */ #define VM_CALLBACK_INC 1 Property changes on: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h ___________________________________________________________________ Modified: checkindate - Thu Dec 12 14:52:39 PST 2013 + Mon Dec 16 15:49:50 PST 2013 Modified: branches/Cog/platforms/Mac OS/vm/sqMacMemory.c =================================================================== --- branches/Cog/platforms/Mac OS/vm/sqMacMemory.c 2013-12-12 22:53:13 UTC (rev 2832) +++ branches/Cog/platforms/Mac OS/vm/sqMacMemory.c 2013-12-16 23:52:11 UTC (rev 2833) @@ -35,10 +35,14 @@ static int pageSize = 0; static unsigned int pageMask = 0; -usqInt sqGetAvailableMemory() { +#define roundDownToPage(v) ((v)&pageMask) +#define roundUpToPage(v) (((v)+pageSize-1)&pageMask) +usqInt +sqGetAvailableMemory() +{ /****** - Note: + Note: (Except Spur) For os-x this doesn't matter we just mmap 512MB for the image, and the application allocates more out of the 4GB address for VM logic. ******/ @@ -46,52 +50,76 @@ return gMaxHeapSize >= 0xFFFFFFFFULL ? 0xFFFFFFFF : gMaxHeapSize; } -usqInt sqAllocateMemoryMac(sqInt minHeapSize, sqInt desiredHeapSize) { +usqInt +sqAllocateMemoryMac(sqInt desiredHeapSize, sqInt minHeapSize) +{ void * debug, *actually; - #pragma unused(minHeapSize,desiredHeapSize) - +#if SPURVM pageSize= getpagesize(); pageMask= ~(pageSize - 1); + + gHeapSize = roundUpToPage(desiredHeapSize); + debug = mmap(NULL, gHeapSize,PROT_READ|PROT_WRITE,MAP_ANON|MAP_SHARED,-1,0); +#else +# pragma unused(minHeapSize,desiredHeapSize) + + pageSize= getpagesize(); + pageMask= ~(pageSize - 1); gHeapSize = gMaxHeapSize; debug = mmap( NULL, gMaxHeapSize+pageSize, PROT_READ | PROT_WRITE, MAP_ANON | MAP_SHARED,-1,0); - //debug = mmap( /*2147483648U-512*1024*1024*/ - // 3221225472U, gMaxHeapSize+pageSize , PROT_READ | PROT_WRITE, MAP_ANON | MAP_SHARED,-1,0); - - if(debug == MAP_FAILED) +#endif /* SPURVM */ + + if (debug == MAP_FAILED) return 0; mmapWasAt = debug; actually = debug+pageSize-1; actually = (void*) (((usqInt) actually) & pageMask); - + return memoryAllocationBase = (usqInt) actually; } -sqInt sqGrowMemoryBy(sqInt memoryLimit, sqInt delta) { +#if !SPURVM +sqInt +sqGrowMemoryBy(sqInt memoryLimit, sqInt delta) +{ if ((usqInt) memoryLimit + (usqInt) delta - memoryAllocationBase > gMaxHeapSize) return memoryLimit; - + gHeapSize += delta; return memoryLimit + delta; } -sqInt sqShrinkMemoryBy(sqInt memoryLimit, sqInt delta) { +sqInt +sqShrinkMemoryBy(sqInt memoryLimit, sqInt delta) +{ return sqGrowMemoryBy(memoryLimit,0-delta); } -sqInt sqMemoryExtraBytesLeft(int flag) { +sqInt +sqMemoryExtraBytesLeft(int flag) +{ return flag ? gMaxHeapSize - gHeapSize : 0; } +#endif /* ! SPURVM */ -void sqMacMemoryFree() { +void +sqMacMemoryFree() +{ if (!memoryAllocationBase) return; +#if SPURVM + /* N.B. This is a hack for an unsupported configuration (NSPlugin(*/ + /* If we really need to free memry we need to unmap all segments. */ + /* But right now this is called only on exit and so is unnecessary. */ + if (munmap((void *)memoryAllocationBase,gHeapSize)) + perror("munmap"); +#else if (munmap((void *)memoryAllocationBase,gMaxHeapSize+pageSize)) perror("munmap"); +#endif memoryAllocationBase = 0; } -#define roundDownToPage(v) ((v)&pageMask) -#define roundUpToPage(v) (((v)+pageSize-1)&pageMask) #if COGVM void sqMakeMemoryExecutableFromTo(unsigned long startAddr, unsigned long endAddr) Modified: branches/Cog/platforms/Mac OS/vm/sqPlatformSpecific.h =================================================================== --- branches/Cog/platforms/Mac OS/vm/sqPlatformSpecific.h 2013-12-12 22:53:13 UTC (rev 2832) +++ branches/Cog/platforms/Mac OS/vm/sqPlatformSpecific.h 2013-12-16 23:52:11 UTC (rev 2833) @@ -74,10 +74,10 @@ #define allocateMemoryMinimumImageFileHeaderSize(heapSize, minimumMemory, fileStream, headerSize) \ sqAllocateMemoryMac(heapSize, minimumMemory) -usqInt sqAllocateMemoryMac(sqInt minHeapSize, sqInt desiredHeapSize); +usqInt sqAllocateMemoryMac(sqInt desiredHeapSize, sqInt minHeapSize); -#define sqAllocateMemory(x,y) sqAllocateMemoryMac(x,&y); +#define sqAllocateMemory(x,y) sqAllocateMemoryMac(&y,x) /* override reserveExtraCHeapBytes() macro to reduce Squeak object heap size on Mac */ #undef reserveExtraCHeapBytes Modified: branches/Cog/spursrc/vm/cogit.c =================================================================== --- branches/Cog/spursrc/vm/cogit.c 2013-12-12 22:53:13 UTC (rev 2832) +++ branches/Cog/spursrc/vm/cogit.c 2013-12-16 23:52:11 UTC (rev 2833) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.554 uuid: a666e7e4-245e-4e8a-9536-3aefd4509f47 + CCodeGenerator VMMaker.oscog-eem.563 uuid: 3116fc1b-f9a5-45f5-bc7e-4b5c68ec8247 from - StackToRegisterMappingCogit VMMaker.oscog-eem.554 uuid: a666e7e4-245e-4e8a-9536-3aefd4509f47 + StackToRegisterMappingCogit VMMaker.oscog-eem.563 uuid: 3116fc1b-f9a5-45f5-bc7e-4b5c68ec8247 */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.554 uuid: a666e7e4-245e-4e8a-9536-3aefd4509f47 " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.563 uuid: 3116fc1b-f9a5-45f5-bc7e-4b5c68ec8247 " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -847,6 +847,7 @@ static AbstractInstruction * longJumpTargetAddress(AbstractInstruction * self_in_longJumpTargetAddress); static AbstractInstruction * gMoveAwR(sqInt address, sqInt reg); static AbstractInstruction * gMoveCwR(sqInt wordConstant, sqInt reg); +static AbstractInstruction * gMoveMwrR(sqInt offset, sqInt baseReg, sqInt destReg); static AbstractInstruction * gMoveRMwr(sqInt sourceReg, sqInt offset, sqInt baseReg); static AbstractInstruction * gMoveRR(sqInt reg1, sqInt reg2); static AbstractInstruction * gMulRR(sqInt reg1, sqInt reg2); @@ -2614,18 +2615,23 @@ } if (annotation == IsSendCall) { entryPoint = callTargetFromReturnAddress(backEnd, ((sqInt)mcpc)); - /* begin offsetAndSendTableFor:annotation:into: */ - if ((entryPoint & entryPointMask) == checkedEntryAlignment) { - offset = cmEntryOffset; - sendTable = sendTrampolines; - + if (entryPoint <= methodZoneBase) { + offset = entryPoint; } else { - offset = cmNoCheckEntryOffset; - sendTable = superSendTrampolines; + /* begin offsetAndSendTableFor:annotation:into: */ + if ((entryPoint & entryPointMask) == checkedEntryAlignment) { + offset = cmEntryOffset; + sendTable = sendTrampolines; + } + else { + offset = cmNoCheckEntryOffset; + sendTable = superSendTrampolines; + + } + } - selectorOrCacheTag = inlineCacheTagAt(backEnd, ((sqInt)mcpc)); if ((entryPoint > methodZoneBase) && ((offset != cmNoCheckEntryOffset) @@ -14189,11 +14195,11 @@ genPushRegisterArgsForNumArgs(sqInt numArgs) { if (numArgs <= (numRegArgs())) { + assert((numRegArgs()) <= 2); /* begin MoveMw:r:R: */ genoperandoperandoperand(MoveMwrR, 0, SPReg, TempReg); /* begin MoveR:Mw:r: */ genoperandoperandoperand(MoveRMwr, ReceiverResultReg, 0, SPReg); - assert((numRegArgs()) <= 2); if (numArgs > 0) { /* begin PushR: */ genoperand(PushR, Arg0Reg); @@ -14204,6 +14210,7 @@ } /* begin PushR: */ genoperand(PushR, TempReg); + } } @@ -15626,6 +15633,18 @@ 1 & 3 collapsed to 1 for SmallIntegers, and 2 collapsed to 0 for Characters), or the receiver's classIndex. Generate something like this: + Lentry: + movl rSource, rDest + andl $0x3, rDest + jz LnotImm + andl $1, rDest + j Lcmp + LnotImm: + movl 0(%edx), rDest + andl $0x3fffff, rDest + Lcmp: + At least on a 2.2GHz Intel Core i7 it is slightly faster, + 136m sends/sec vs 130m sends/sec for nfib in tinyBenchmarks, than Limm: andl $0x1, rDest j Lcmp @@ -15635,44 +15654,35 @@ jnz Limm movl 0(%edx), rDest andl $0x3fffff, rDest - Lcmp + Lcmp: */ static AbstractInstruction * getInlineCacheClassTagFrominto(sqInt sourceReg, sqInt destReg) { AbstractInstruction *entryLabel; - AbstractInstruction *immLabel; AbstractInstruction *jumpCompare; + AbstractInstruction *jumpNotImm; sqInt quickConstant; - sqInt quickConstant1; /* begin AlignmentNops: */ - genoperand(AlignmentNops, BytesPerWord); + genoperand(AlignmentNops, ((BytesPerWord < 8) ? 8 : BytesPerWord)); /* begin Label */ - immLabel = genoperandoperand(Label, (labelCounter += 1), bytecodePC); - /* begin AndCq:R: */ - genoperandoperand(AndCqR, 1, destReg); - /* begin Jump: */ - jumpCompare = genoperand(Jump, ((sqInt)0)); - /* begin AlignmentNops: */ - genoperand(AlignmentNops, BytesPerWord); - /* begin Label */ entryLabel = genoperandoperand(Label, (labelCounter += 1), bytecodePC); /* begin MoveR:R: */ genoperandoperand(MoveRR, sourceReg, destReg); /* begin AndCq:R: */ quickConstant = tagMask(); genoperandoperand(AndCqR, quickConstant, destReg); - /* begin JumpNonZero: */ - genoperand(JumpNonZero, ((sqInt)immLabel)); + /* begin JumpZero: */ + jumpNotImm = genoperand(JumpZero, ((sqInt)0)); + /* begin AndCq:R: */ + genoperandoperand(AndCqR, 1, destReg); + /* begin Jump: */ + jumpCompare = genoperand(Jump, ((sqInt)0)); flag("endianness"); - /* begin MoveMw:r:R: */ - genoperandoperandoperand(MoveMwrR, 0, sourceReg, destReg); - /* begin AndCq:R: */ - quickConstant1 = classIndexMask(); - genoperandoperand(AndCqR, quickConstant1, destReg); - jmpTarget(jumpCompare, gLabel()); + jmpTarget(jumpNotImm, gMoveMwrR(0, sourceReg, destReg)); + jmpTarget(jumpCompare, gAndCqR(classIndexMask(), destReg)); return entryLabel; } @@ -16669,6 +16679,12 @@ } static AbstractInstruction * +gMoveMwrR(sqInt offset, sqInt baseReg, sqInt destReg) +{ + return genoperandoperandoperand(MoveMwrR, offset, baseReg, destReg); +} + +static AbstractInstruction * gMoveRMwr(sqInt sourceReg, sqInt offset, sqInt baseReg) { return genoperandoperandoperand(MoveRMwr, sourceReg, offset, baseReg); Modified: branches/Cog/spursrc/vm/cogit.h =================================================================== --- branches/Cog/spursrc/vm/cogit.h 2013-12-12 22:53:13 UTC (rev 2832) +++ branches/Cog/spursrc/vm/cogit.h 2013-12-16 23:52:11 UTC (rev 2833) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.554 uuid: a666e7e4-245e-4e8a-9536-3aefd4509f47 + CCodeGenerator VMMaker.oscog-eem.563 uuid: 3116fc1b-f9a5-45f5-bc7e-4b5c68ec8247 */ Modified: branches/Cog/spursrc/vm/cogmethod.h =================================================================== --- branches/Cog/spursrc/vm/cogmethod.h 2013-12-12 22:53:13 UTC (rev 2832) +++ branches/Cog/spursrc/vm/cogmethod.h 2013-12-16 23:52:11 UTC (rev 2833) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.554 uuid: a666e7e4-245e-4e8a-9536-3aefd4509f47 + CCodeGenerator VMMaker.oscog-eem.563 uuid: 3116fc1b-f9a5-45f5-bc7e-4b5c68ec8247 */ typedef struct { Modified: branches/Cog/spursrc/vm/cointerp.c =================================================================== --- branches/Cog/spursrc/vm/cointerp.c 2013-12-12 22:53:13 UTC (rev 2832) +++ branches/Cog/spursrc/vm/cointerp.c 2013-12-16 23:52:11 UTC (rev 2833) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.561 uuid: 13467880-93b9-4137-9bbc-7ebfd22436ab + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.563 uuid: 3116fc1b-f9a5-45f5-bc7e-4b5c68ec8247 from - CoInterpreter VMMaker.oscog-eem.561 uuid: 13467880-93b9-4137-9bbc-7ebfd22436ab + CoInterpreter VMMaker.oscog-eem.563 uuid: 3116fc1b-f9a5-45f5-bc7e-4b5c68ec8247 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.561 uuid: 13467880-93b9-4137-9bbc-7ebfd22436ab " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.563 uuid: 3116fc1b-f9a5-45f5-bc7e-4b5c68ec8247 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -1457,13 +1457,13 @@ _iss usqLong longRunningPrimitiveStopUsecs; _iss sqInt numSegInfos; _iss sqInt statCheckForEvents; -_iss sqInt cogCodeSize; _iss sqInt gcMode; _iss sqInt lastCoggableInterpretedBlockMethod; _iss sqInt lastUncoggableInterpretedBlockMethod; _iss usqInt lowSpaceThreshold; _iss usqLong statGCEndUsecs; _iss sqInt classTableIndex; +_iss sqInt cogCodeSize; _iss sqInt flagInterpretedMethods; _iss usqInt freeOldSpaceStart; _iss sqInt metaclassNumSlots; @@ -2162,7 +2162,7 @@ 0 }; static void (*externalPrimitiveTable[MaxExternalPrimitiveTableSize + 1 /* 4097 */])(void); usqInt heapBase; -const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.561]"; +const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.563]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; @@ -6363,6 +6363,7 @@ /* begin internalPush: */ longAtPointerput((localSP -= BytesPerOop), longAt((rcvr1 + (BaseHeaderSize)) + (byte3 << 2))); } + null; goto l4; } if (opType == 3) { @@ -6372,6 +6373,7 @@ assert(GIV(method) == (iframeMethod(localFP))); object = longAt((GIV(method) + (BaseHeaderSize)) + ((byte3 + LiteralStart) << 2)); longAtPointerput((localSP -= BytesPerOop), object); + null; goto l4; } if (opType == 4) { @@ -6399,6 +6401,7 @@ /* begin internalPush: */ longAtPointerput((localSP -= BytesPerOop), longAt((litVar1 + (BaseHeaderSize)) + (ValueIndex << 2))); + null; goto l4; } top = longAtPointer(localSP); @@ -17879,7 +17882,7 @@ assert(pageListIsWellFormed()); } /* begin ensureFrameIsMarried:SP: */ - theSP = GIV(stackPointer); + theSP = GIV(stackPointer) + BytesPerWord; if (((((usqInt)(longAt(GIV(framePointer) + FoxMethod)))) < (startOfMemory()) ? ((longAt(GIV(framePointer) + FoxMethod)) & MFMethodFlagHasContextFlag) != 0 : (byteAt((GIV(framePointer) + FoxIFrameFlags) + 2)) != 0)) { @@ -22404,11 +22407,17 @@ sqInt fmt; fmt = (((usqInt) (longAt(objOop))) >> 24) & 0x1F; - if (fmt <= 5) { + if (fmt <= 4) { + if (fmt == 2) { - /* pointer; may need to delve into the class format word */ + /* array starts at 0. */ - if (((fmt >= 3) && (fmt <= 4))) { + return pointerForOop(objOop + (BaseHeaderSize)); + } + if (fmt >= 3) { + + /* indexable with inst vars; need to delve into the class format word */ + /* begin formatOfClass: */ /* begin fetchClassOfNonImm: */ classIndex = (longAt(objOop)) & 0x3FFFFF; @@ -22430,10 +22439,13 @@ classFormat = ((longAt((classPointer + (BaseHeaderSize)) + (InstanceSpecificationIndex << 2))) >> 1); return pointerForOop((objOop + (BaseHeaderSize)) + ((classFormat & ((1 << 16) - 1)) << (wordSize()))); } - return pointerForOop((objOop + (BaseHeaderSize)) + ((numSlotsOf(objOop)) << (wordSize()))); + return 0; } - assert(fmt < (firstCompiledMethodFormat())); - return pointerForOop(objOop + (BaseHeaderSize)); + if ((fmt >= 9) + && (fmt < 24)) { + return pointerForOop(objOop + (BaseHeaderSize)); + } + return 0; } sqInt @@ -23084,16 +23096,30 @@ sqInt assoc; sqInt classObj; CogMethod *cogMethod; - sqInt fieldIndex; sqInt header; - sqInt offset; + sqInt litCount; sqInt referent; sqInt referent1; /* begin actuallyFollowNecessaryForwardingInMethod: */ - /* begin literal:ofMethod: */ - offset = (literalCountOfHeader(headerOf(methodObj))) - 1; - assoc = longAt((methodObj + (BaseHeaderSize)) + ((offset + LiteralStart) << 2)); + header = longAt((methodObj + (BaseHeaderSize)) + (HeaderIndex << 2)); + if (isCogMethodReference(header)) { + + /* If the method class is not used we can avoid the forwarding + check for both the cogMehod and the bytecoded method. */ + + cogMethod = ((CogMethod *) header); + if (!((cogMethod->cmUsesMethodClass))) { + goto l1; + } + followForwardedLiteralsIn(cogMethod); + header = (cogMethod->methodHeader); + } + + /* Slang super expansion limitation */ + + litCount = (((usqInt) header) >> 10) & 0xFF; + assoc = longAt((methodObj + (BaseHeaderSize)) + (((litCount - 1) + LiteralStart) << 2)); if (((longAt(assoc)) & 0x3FFFFF) == 8) { /* begin followForwarded: */ assert(isForwarded(assoc)); @@ -23103,9 +23129,7 @@ referent = longAt((referent + (BaseHeaderSize)) + (0 << 2)); } assoc = referent; - /* begin setMethodClassAssociationOf:to: */ /* begin storePointer:ofObject:withValue: */ - fieldIndex = ((literalCountOfHeader(headerOf(methodObj))) + LiteralStart) - 1; assert(!(isForwarded(methodObj))); if (isOldObject(methodObj)) { @@ -23122,44 +23146,40 @@ } } } - longAtput((methodObj + (BaseHeaderSize)) + (fieldIndex << 2), assoc); + longAtput((methodObj + (BaseHeaderSize)) + (((litCount + LiteralStart) - 1) << 2), assoc); } - classObj = longAt((assoc + (BaseHeaderSize)) + (ValueIndex << 2)); - if (((longAt(classObj)) & 0x3FFFFF) == 8) { - /* begin followForwarded: */ - assert(isForwarded(assoc)); - referent1 = longAt((assoc + (BaseHeaderSize)) + (0 << 2)); - while (((referent1 & 3) == 0) - && (((longAt(referent1)) & 0x3FFFFF) == 8)) { - referent1 = longAt((referent1 + (BaseHeaderSize)) + (0 << 2)); - } - classObj = referent1; - /* begin storePointer:ofObject:withValue: */ - assert(!(isForwarded(assoc))); - if (isOldObject(assoc)) { + if ((numSlotsOf(assoc)) >= (ValueIndex + 1)) { + classObj = longAt((assoc + (BaseHeaderSize)) + (ValueIndex << 2)); + if (((longAt(classObj)) & 0x3FFFFF) == 8) { + /* begin followForwarded: */ + assert(isForwarded(assoc)); + referent1 = longAt((assoc + (BaseHeaderSize)) + (0 << 2)); + while (((referent1 & 3) == 0) + && (((longAt(referent1)) & 0x3FFFFF) == 8)) { + referent1 = longAt((referent1 + (BaseHeaderSize)) + (0 << 2)); + } + classObj = referent1; + /* begin storePointer:ofObject:withValue: */ + assert(!(isForwarded(assoc))); + if (isOldObject(assoc)) { - /* most stores into young objects */ + /* most stores into young objects */ - if (((classObj & 3) == 0) - && ((((usqInt) classObj)) < (((usqInt) GIV(newSpaceLimit))))) { - /* begin possibleRootStoreInto: */ - if (!(((((usqInt) (longAt(assoc))) >> 29) & 1) != 0)) { - remember(assoc); - /* begin setIsRememberedOf:to: */ - flag("endianness"); - longAtput(assoc, (longAt(assoc)) | (1 << 29)); + if (((classObj & 3) == 0) + && ((((usqInt) classObj)) < (((usqInt) GIV(newSpaceLimit))))) { + /* begin possibleRootStoreInto: */ + if (!(((((usqInt) (longAt(assoc))) >> 29) & 1) != 0)) { + remember(assoc); + /* begin setIsRememberedOf:to: */ + flag("endianness"); + longAtput(assoc, (longAt(assoc)) | (1 << 29)); + } } } + longAtput((assoc + (BaseHeaderSize)) + (ValueIndex << 2), classObj); } - longAtput((assoc + (BaseHeaderSize)) + (ValueIndex << 2), classObj); } - header = longAt((methodObj + (BaseHeaderSize)) + (HeaderIndex << 2)); - if (isCogMethodReference(header)) { - cogMethod = ((CogMethod *) header); - if ((cogMethod->cmUsesMethodClass)) { - followForwardedLiteralsIn(cogMethod); - } - } +l1: /* end actuallyFollowNecessaryForwardingInMethod: */; } @@ -52270,10 +52290,8 @@ minimumMemory = ((GIV(cogCodeSize) + dataSize) + edenBytes) + (interpreterAllocationReserveBytes()); /* no need to include the stackZone; this is alloca'ed */ - /* + edenBytes */ - /* don't include edenBytes; this is part of the heap and so part of desiredHeapSize */ - heapSize = (GIV(cogCodeSize) + desiredHeapSize) + (interpreterAllocationReserveBytes()); + heapSize = ((GIV(cogCodeSize) + desiredHeapSize) + edenBytes) + (interpreterAllocationReserveBytes()); if (heapSize < minimumMemory) { insufficientMemorySpecifiedError(); } @@ -52285,7 +52303,7 @@ } /* begin setHeapBase:memoryLimit:endOfMemory: */ baseOfHeap = (memory()) + GIV(cogCodeSize); - memLimit = ((memory()) + GIV(cogCodeSize)) + heapSize; + memLimit = (memory()) + heapSize; memEnd = ((memory()) + GIV(cogCodeSize)) + dataSize; GIV(newSpaceStart) = baseOfHeap; GIV(newSpaceLimit) = (baseOfHeap + edenBytes) + (interpreterAllocationReserveBytes()); Modified: branches/Cog/spursrc/vm/cointerp.h =================================================================== --- branches/Cog/spursrc/vm/cointerp.h 2013-12-12 22:53:13 UTC (rev 2832) +++ branches/Cog/spursrc/vm/cointerp.h 2013-12-16 23:52:11 UTC (rev 2833) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.561 uuid: 13467880-93b9-4137-9bbc-7ebfd22436ab + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.563 uuid: 3116fc1b-f9a5-45f5-bc7e-4b5c68ec8247 */ Modified: branches/Cog/spursrc/vm/gcc3x-cointerp.c =================================================================== --- branches/Cog/spursrc/vm/gcc3x-cointerp.c 2013-12-12 22:53:13 UTC (rev 2832) +++ branches/Cog/spursrc/vm/gcc3x-cointerp.c 2013-12-16 23:52:11 UTC (rev 2833) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.561 uuid: 13467880-93b9-4137-9bbc-7ebfd22436ab + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.563 uuid: 3116fc1b-f9a5-45f5-bc7e-4b5c68ec8247 from - CoInterpreter VMMaker.oscog-eem.561 uuid: 13467880-93b9-4137-9bbc-7ebfd22436ab + CoInterpreter VMMaker.oscog-eem.563 uuid: 3116fc1b-f9a5-45f5-bc7e-4b5c68ec8247 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.561 uuid: 13467880-93b9-4137-9bbc-7ebfd22436ab " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.563 uuid: 3116fc1b-f9a5-45f5-bc7e-4b5c68ec8247 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -1460,13 +1460,13 @@ _iss usqLong longRunningPrimitiveStopUsecs; _iss sqInt numSegInfos; _iss sqInt statCheckForEvents; -_iss sqInt cogCodeSize; _iss sqInt gcMode; _iss sqInt lastCoggableInterpretedBlockMethod; _iss sqInt lastUncoggableInterpretedBlockMethod; _iss usqInt lowSpaceThreshold; _iss usqLong statGCEndUsecs; _iss sqInt classTableIndex; +_iss sqInt cogCodeSize; _iss sqInt flagInterpretedMethods; _iss usqInt freeOldSpaceStart; _iss sqInt metaclassNumSlots; @@ -2165,7 +2165,7 @@ 0 }; static void (*externalPrimitiveTable[MaxExternalPrimitiveTableSize + 1 /* 4097 */])(void); usqInt heapBase; -const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.561]"; +const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.563]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; @@ -6372,6 +6372,7 @@ /* begin internalPush: */ longAtPointerput((localSP -= BytesPerOop), longAt((rcvr1 + (BaseHeaderSize)) + (byte3 << 2))); } + null; goto l4; } if (opType == 3) { @@ -6381,6 +6382,7 @@ assert(GIV(method) == (iframeMethod(localFP))); object = longAt((GIV(method) + (BaseHeaderSize)) + ((byte3 + LiteralStart) << 2)); longAtPointerput((localSP -= BytesPerOop), object); + null; goto l4; } if (opType == 4) { @@ -6408,6 +6410,7 @@ /* begin internalPush: */ longAtPointerput((localSP -= BytesPerOop), longAt((litVar1 + (BaseHeaderSize)) + (ValueIndex << 2))); + null; goto l4; } top = longAtPointer(localSP); @@ -17888,7 +17891,7 @@ assert(pageListIsWellFormed()); } /* begin ensureFrameIsMarried:SP: */ - theSP = GIV(stackPointer); + theSP = GIV(stackPointer) + BytesPerWord; if (((((usqInt)(longAt(GIV(framePointer) + FoxMethod)))) < (startOfMemory()) ? ((longAt(GIV(framePointer) + FoxMethod)) & MFMethodFlagHasContextFlag) != 0 : (byteAt((GIV(framePointer) + FoxIFrameFlags) + 2)) != 0)) { @@ -22413,11 +22416,17 @@ sqInt fmt; fmt = (((usqInt) (longAt(objOop))) >> 24) & 0x1F; - if (fmt <= 5) { + if (fmt <= 4) { + if (fmt == 2) { - /* pointer; may need to delve into the class format word */ + /* array starts at 0. */ - if (((fmt >= 3) && (fmt <= 4))) { + return pointerForOop(objOop + (BaseHeaderSize)); + } + if (fmt >= 3) { + + /* indexable with inst vars; need to delve into the class format word */ + /* begin formatOfClass: */ /* begin fetchClassOfNonImm: */ classIndex = (longAt(objOop)) & 0x3FFFFF; @@ -22439,10 +22448,13 @@ classFormat = ((longAt((classPointer + (BaseHeaderSize)) + (InstanceSpecificationIndex << 2))) >> 1); return pointerForOop((objOop + (BaseHeaderSize)) + ((classFormat & ((1 << 16) - 1)) << (wordSize()))); } - return pointerForOop((objOop + (BaseHeaderSize)) + ((numSlotsOf(objOop)) << (wordSize()))); + return 0; } - assert(fmt < (firstCompiledMethodFormat())); - return pointerForOop(objOop + (BaseHeaderSize)); + if ((fmt >= 9) + && (fmt < 24)) { + return pointerForOop(objOop + (BaseHeaderSize)); + } + return 0; } sqInt @@ -23093,16 +23105,30 @@ sqInt assoc; sqInt classObj; CogMethod *cogMethod; - sqInt fieldIndex; sqInt header; - sqInt offset; + sqInt litCount; sqInt referent; sqInt referent1; /* begin actuallyFollowNecessaryForwardingInMethod: */ - /* begin literal:ofMethod: */ - offset = (literalCountOfHeader(headerOf(methodObj))) - 1; - assoc = longAt((methodObj + (BaseHeaderSize)) + ((offset + LiteralStart) << 2)); + header = longAt((methodObj + (BaseHeaderSize)) + (HeaderIndex << 2)); + if (isCogMethodReference(header)) { + + /* If the method class is not used we can avoid the forwarding + check for both the cogMehod and the bytecoded method. */ + + cogMethod = ((CogMethod *) header); + if (!((cogMethod->cmUsesMethodClass))) { + goto l1; + } + followForwardedLiteralsIn(cogMethod); + header = (cogMethod->methodHeader); + } + + /* Slang super expansion limitation */ + + litCount = (((usqInt) header) >> 10) & 0xFF; + assoc = longAt((methodObj + (BaseHeaderSize)) + (((litCount - 1) + LiteralStart) << 2)); if (((longAt(assoc)) & 0x3FFFFF) == 8) { /* begin followForwarded: */ assert(isForwarded(assoc)); @@ -23112,9 +23138,7 @@ referent = longAt((referent + (BaseHeaderSize)) + (0 << 2)); } assoc = referent; - /* begin setMethodClassAssociationOf:to: */ /* begin storePointer:ofObject:withValue: */ - fieldIndex = ((literalCountOfHeader(headerOf(methodObj))) + LiteralStart) - 1; assert(!(isForwarded(methodObj))); if (isOldObject(methodObj)) { @@ -23131,44 +23155,40 @@ } } } - longAtput((methodObj + (BaseHeaderSize)) + (fieldIndex << 2), assoc); + longAtput((methodObj + (BaseHeaderSize)) + (((litCount + LiteralStart) - 1) << 2), assoc); } - classObj = longAt((assoc + (BaseHeaderSize)) + (ValueIndex << 2)); - if (((longAt(classObj)) & 0x3FFFFF) == 8) { - /* begin followForwarded: */ - assert(isForwarded(assoc)); - referent1 = longAt((assoc + (BaseHeaderSize)) + (0 << 2)); - while (((referent1 & 3) == 0) - && (((longAt(referent1)) & 0x3FFFFF) == 8)) { - referent1 = longAt((referent1 + (BaseHeaderSize)) + (0 << 2)); - } - classObj = referent1; - /* begin storePointer:ofObject:withValue: */ - assert(!(isForwarded(assoc))); - if (isOldObject(assoc)) { + if ((numSlotsOf(assoc)) >= (ValueIndex + 1)) { + classObj = longAt((assoc + (BaseHeaderSize)) + (ValueIndex << 2)); + if (((longAt(classObj)) & 0x3FFFFF) == 8) { + /* begin followForwarded: */ + assert(isForwarded(assoc)); + referent1 = longAt((assoc + (BaseHeaderSize)) + (0 << 2)); + while (((referent1 & 3) == 0) + && (((longAt(referent1)) & 0x3FFFFF) == 8)) { + referent1 = longAt((referent1 + (BaseHeaderSize)) + (0 << 2)); + } + classObj = referent1; + /* begin storePointer:ofObject:withValue: */ + assert(!(isForwarded(assoc))); + if (isOldObject(assoc)) { - /* most stores into young objects */ + /* most stores into young objects */ - if (((classObj & 3) == 0) - && ((((usqInt) classObj)) < (((usqInt) GIV(newSpaceLimit))))) { - /* begin possibleRootStoreInto: */ - if (!(((((usqInt) (longAt(assoc))) >> 29) & 1) != 0)) { - remember(assoc); - /* begin setIsRememberedOf:to: */ - flag("endianness"); - longAtput(assoc, (longAt(assoc)) | (1 << 29)); + if (((classObj & 3) == 0) + && ((((usqInt) classObj)) < (((usqInt) GIV(newSpaceLimit))))) { + /* begin possibleRootStoreInto: */ + if (!(((((usqInt) (longAt(assoc))) >> 29) & 1) != 0)) { + remember(assoc); + /* begin setIsRememberedOf:to: */ + flag("endianness"); + longAtput(assoc, (longAt(assoc)) | (1 << 29)); + } } } + longAtput((assoc + (BaseHeaderSize)) + (ValueIndex << 2), classObj); } - longAtput((assoc + (BaseHeaderSize)) + (ValueIndex << 2), classObj); } - header = longAt((methodObj + (BaseHeaderSize)) + (HeaderIndex << 2)); - if (isCogMethodReference(header)) { - cogMethod = ((CogMethod *) header); - if ((cogMethod->cmUsesMethodClass)) { - followForwardedLiteralsIn(cogMethod); - } - } +l1: /* end actuallyFollowNecessaryForwardingInMethod: */; } @@ -52279,10 +52299,8 @@ minimumMemory = ((GIV(cogCodeSize) + dataSize) + edenBytes) + (interpreterAllocationReserveBytes()); /* no need to include the stackZone; this is alloca'ed */ - /* + edenBytes */ - /* don't include edenBytes; this is part of the heap and so part of desiredHeapSize */ - heapSize = (GIV(cogCodeSize) + desiredHeapSize) + (interpreterAllocationReserveBytes()); + heapSize = ((GIV(cogCodeSize) + desiredHeapSize) + edenBytes) + (interpreterAllocationReserveBytes()); if (heapSize < minimumMemory) { insufficientMemorySpecifiedError(); } @@ -52294,7 +52312,7 @@ } /* begin setHeapBase:memoryLimit:endOfMemory: */ baseOfHeap = (memory()) + GIV(cogCodeSize); - memLimit = ((memory()) + GIV(cogCodeSize)) + heapSize; + memLimit = (memory()) + heapSize; memEnd = ((memory()) + GIV(cogCodeSize)) + dataSize; GIV(newSpaceStart) = baseOfHeap; GIV(newSpaceLimit) = (baseOfHeap + edenBytes) + (interpreterAllocationReserveBytes()); Modified: branches/Cog/spursrc/vm/interp.h =================================================================== --- branches/Cog/spursrc/vm/interp.h 2013-12-12 22:53:13 UTC (rev 2832) +++ branches/Cog/spursrc/vm/interp.h 2013-12-16 23:52:11 UTC (rev 2833) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.561 uuid: 13467880-93b9-4137-9bbc-7ebfd22436ab + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.563 uuid: 3116fc1b-f9a5-45f5-bc7e-4b5c68ec8247 */ #define VM_PROXY_MAJOR 1 Modified: branches/Cog/spursrc/vm/vmCallback.h =================================================================== --- branches/Cog/spursrc/vm/vmCallback.h 2013-12-12 22:53:13 UTC (rev 2832) @@ Diff output truncated at 50000 characters. @@

1 0

← Newer
1
2
3
4
5
6
7
...
11
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

Vm-dev December 2013