Vm-dev December 2014

vm-dev@lists.squeakfoundation.org

33 participants
160 discussions

More bitblt extensions intend for Pi but possibly more widely useful
by tim Rowledge 06 Dec '14

06 Dec '14

I’ve been working with Ben Avison again to do some further extensions to bitblt for speeding up Pi scratch. This time we’ve added some code that can very quickly work out if two Forms have corresponding pixels where the colours meet some rule. Scratch uses a complex pile of bitblts and masking and tallying and probably appeals to Cthulhu to do this. We can now use prims that are very highly ARM optimised and, for example, stop when the first match is found if the test is just a ‘does this touch that’. Since similar code is in the latest image, I think largely as eToys support, this ought to have some benefits for any platform. Although the ARM specific code won’t do much for x86 machines, there is a generic C code loop that is still much faster than a stack of blts. I propose to add the new prim to the BitBltPlugin soon for general release, unless someone can make really good arguments for not so doing. It is of course possible that it may take a little back and forth to get the build rules perfect. We also made a much faster (by ARM optimising) routine to double a Scratch stage Form for the presentation mode, though I’m not sure this has very wide application. Probably this should go in the ScratchPlugin, though from the building point of view it is much easier to think of it in the bitbltplugin. Ben made full use of the macro framework provided by the fastblt framework. So - any thoughts on this? Problems it might cause? Extra ideas for more speedups? Good places for chocolate? tim -- tim Rowledge; tim(a)rowledge.org; http://www.rowledge.org/tim loggerheads - lumberjack sniffing addicts

1 0

[commit][3160] CogVM source as per VMMaker.oscog-eem.968
by commits＠squeakvm.org 06 Dec '14

06 Dec '14

Revision: 3160 Author: eliot Date: 2014-12-05 15:14:12 -0800 (Fri, 05 Dec 2014) Log Message: ----------- CogVM source as per VMMaker.oscog-eem.968 Extend the -breakmnu facility to break on creating MNU PIC entries, not just activating them. Modified Paths: -------------- branches/Cog/nscogsrc/vm/cogit.c branches/Cog/nscogsrc/vm/cogit.h branches/Cog/nscogsrc/vm/cointerp.c branches/Cog/nscogsrc/vm/cointerp.h branches/Cog/nscogsrc/vm/gcc3x-cointerp.c branches/Cog/nsspursrc/vm/cogit.c branches/Cog/nsspursrc/vm/cogit.h branches/Cog/nsspursrc/vm/cointerp.c branches/Cog/nsspursrc/vm/cointerp.h branches/Cog/nsspursrc/vm/gcc3x-cointerp.c branches/Cog/sistasrc/vm/cogit.c branches/Cog/sistasrc/vm/cogit.h branches/Cog/sistasrc/vm/cointerp.c branches/Cog/sistasrc/vm/cointerp.h branches/Cog/sistasrc/vm/gcc3x-cointerp.c branches/Cog/spursistasrc/vm/cogit.c branches/Cog/spursistasrc/vm/cogit.h branches/Cog/spursistasrc/vm/cointerp.c branches/Cog/spursistasrc/vm/cointerp.h branches/Cog/spursistasrc/vm/gcc3x-cointerp.c branches/Cog/spursrc/vm/cogit.c branches/Cog/spursrc/vm/cogit.h branches/Cog/spursrc/vm/cointerp.c branches/Cog/spursrc/vm/cointerp.h branches/Cog/spursrc/vm/gcc3x-cointerp.c branches/Cog/src/vm/cogit.c branches/Cog/src/vm/cogit.h branches/Cog/src/vm/cointerp.c branches/Cog/src/vm/cointerp.h branches/Cog/src/vm/cointerpmt.c branches/Cog/src/vm/cointerpmt.h branches/Cog/src/vm/gcc3x-cointerp.c branches/Cog/src/vm/gcc3x-cointerpmt.c Property Changed: ---------------- branches/Cog/platforms/Cross/vm/sqSCCSVersion.h Modified: branches/Cog/nscogsrc/vm/cogit.c =================================================================== --- branches/Cog/nscogsrc/vm/cogit.c 2014-12-05 20:27:02 UTC (rev 3159) +++ branches/Cog/nscogsrc/vm/cogit.c 2014-12-05 23:14:12 UTC (rev 3160) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.966 uuid: 46dd10c6-dc03-444c-bfa2-0f0b279c9b06 + CCodeGenerator VMMaker.oscog-eem.968 uuid: ddef3ea8-2ea4-4fe4-98ac-de4698b42ab8 from - StackToRegisterMappingCogit VMMaker.oscog-eem.966 uuid: 46dd10c6-dc03-444c-bfa2-0f0b279c9b06 + StackToRegisterMappingCogit VMMaker.oscog-eem.968 uuid: ddef3ea8-2ea4-4fe4-98ac-de4698b42ab8 */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.966 uuid: 46dd10c6-dc03-444c-bfa2-0f0b279c9b06 " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.968 uuid: ddef3ea8-2ea4-4fe4-98ac-de4698b42ab8 " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -9366,7 +9366,7 @@ sqInt size; sqInt target; - compilationBreakpoint((cPIC->selector), lengthOf((cPIC->selector))); + compilationBreakpointisMNUCase((cPIC->selector), lengthOf((cPIC->selector)), isMNUCase); allocateOpcodesbytecodes(5, 0); assert(!(inlineCacheTagIsYoung(caseNTag))); assert((caseNMethod != null) @@ -9501,7 +9501,7 @@ if (isYoung(selector)) { return 0; } - compilationBreakpoint(selector, lengthOf(selector)); + compilationBreakpointisMNUCase(selector, lengthOf(selector), 1); assert(endCPICCase0 != null); startAddress = allocate(closedPICSize); if (startAddress == 0) { @@ -9539,7 +9539,7 @@ sqInt mapSize; sqInt startAddress; - compilationBreakpoint(selector, lengthOf(selector)); + compilationBreakpointisMNUCase(selector, lengthOf(selector), 0); startAddress = allocate(openPICSize); if (startAddress == 0) { return ((CogMethod *) InsufficientCodeSpace); @@ -9579,7 +9579,7 @@ if (isYoung(selector)) { return ((CogMethod *) YoungSelectorInPIC); } - compilationBreakpoint(selector, lengthOf(selector)); + compilationBreakpointisMNUCase(selector, lengthOf(selector), isMNUCase); startAddress = allocate(closedPICSize); if (startAddress == 0) { return ((CogMethod *) InsufficientCodeSpace); @@ -9615,7 +9615,7 @@ assert((!(methodHasCogMethod(aMethodObj))) || ((noAssertMethodClassAssociationOf(aMethodObj)) == (nilObject()))); - compilationBreakpoint(aSelectorOop, lengthOf(aSelectorOop)); + compilationBreakpointisMNUCase(aSelectorOop, lengthOf(aSelectorOop), 0); if (aMethodObj == breakMethod) { haltmsg("Compilation of breakMethod"); } @@ -14009,7 +14009,7 @@ void setSelectorOfto(CogMethod *cogMethod, sqInt aSelectorOop) { - compilationBreakpoint(aSelectorOop, lengthOf(aSelectorOop)); + compilationBreakpointisMNUCase(aSelectorOop, lengthOf(aSelectorOop), 0); assert(((cogMethod->cmType)) == CMMethod); (cogMethod->selector = aSelectorOop); if (isYoung(aSelectorOop)) { Modified: branches/Cog/nscogsrc/vm/cogit.h =================================================================== --- branches/Cog/nscogsrc/vm/cogit.h 2014-12-05 20:27:02 UTC (rev 3159) +++ branches/Cog/nscogsrc/vm/cogit.h 2014-12-05 23:14:12 UTC (rev 3160) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.966 uuid: 46dd10c6-dc03-444c-bfa2-0f0b279c9b06 + CCodeGenerator VMMaker.oscog-eem.968 uuid: ddef3ea8-2ea4-4fe4-98ac-de4698b42ab8 */ Modified: branches/Cog/nscogsrc/vm/cointerp.c =================================================================== --- branches/Cog/nscogsrc/vm/cointerp.c 2014-12-05 20:27:02 UTC (rev 3159) +++ branches/Cog/nscogsrc/vm/cointerp.c 2014-12-05 23:14:12 UTC (rev 3160) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.966 uuid: 46dd10c6-dc03-444c-bfa2-0f0b279c9b06 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.968 uuid: ddef3ea8-2ea4-4fe4-98ac-de4698b42ab8 from - CoInterpreter VMMaker.oscog-eem.966 uuid: 46dd10c6-dc03-444c-bfa2-0f0b279c9b06 + CoInterpreter VMMaker.oscog-eem.968 uuid: ddef3ea8-2ea4-4fe4-98ac-de4698b42ab8 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.966 uuid: 46dd10c6-dc03-444c-bfa2-0f0b279c9b06 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.968 uuid: ddef3ea8-2ea4-4fe4-98ac-de4698b42ab8 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -496,6 +496,7 @@ static sqInt mframeReceiver(char *theFP) NoDbgRegParms; static sqInt minimumUnusedHeadroom(void); sqInt mMethodClass(void); +void mnuCompilationBreakpointFor(sqInt selectorOop); static sqInt mnuMethodOrNilFor(sqInt rcvr) NoDbgRegParms; static char * moveFramesInthroughtoPage(StackPage *oldPage, char *theFP, StackPage *newPage) NoDbgRegParms; static sqInt mustMapMachineCodePCcontext(sqInt theIP, sqInt aOnceMarriedContext) NoDbgRegParms; @@ -1502,14 +1503,14 @@ sqInt checkAllocFiller; sqInt inIOProcessEvents; sqInt checkForLeaks; +sqInt breakSelectorLength = -1; sqInt desiredEdenBytes; sqInt desiredNumStackPages; -sqInt breakSelectorLength = -1; sqInt extraVMMemory; sqInt desiredCogCodeSize; +char * breakSelector; usqInt heapBase; void * showSurfaceFn; -char * breakSelector; sqInt deferDisplayUpdates; struct VirtualMachine* interpreterProxy; static void (*interruptCheckChain)(void) = 0; @@ -2096,7 +2097,7 @@ /* 574 */ (void (*)(void))0, /* 575 */ (void (*)(void))0, 0 }; -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.966"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.968"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -2106,9 +2107,9 @@ #define cPICNumCasesHack hack hack hack i.e. the getter macro does all the work #define nextOpenPIC methodObject #define nextOpenPICHack hack hack hack i.e. the getter macro does all the work -#define compilationBreakpoint(sel, len) do { \ - if ((len) == breakSelectorLength \ - && !strncmp((char *)((sel) + BaseHeaderSize), breakSelector, breakSelectorLength)) { \ +#define compilationBreakpointisMNUCase(sel, len, isMNU) do { \ + if ((len) == (isMNU ? -breakSelectorLength : breakSelectorLength) \ + && !strncmp((char *)((sel) + BaseHeaderSize), breakSelector, (isMNU ? -breakSelectorLength : breakSelectorLength))) { \ suppressHeartbeatFlag = 1; \ compilationBreakpointFor(sel); \ } \ @@ -2120,6 +2121,13 @@ #define getDesiredCogCodeSize() integerObjectOf(desiredCogCodeSize) #define heapBase() heapBase #define initialEnterSmalltalkExecutive() enterSmalltalkExecutiveImplementation() +#define mnuCompilationBreakpoint(sel, len) do { \ + if ((len) == -breakSelectorLength \ + && !strncmp((char *)((sel) + BaseHeaderSize), breakSelector, -breakSelectorLength)) { \ + suppressHeartbeatFlag = 1; \ + compilationBreakpointFor(sel); \ + } \ +} while (0) #define primTraceLogIndex(aValue) (GIV(primTraceLogIndex) = (aValue)) #define setDesiredCogCodeSize(dccs) (desiredCogCodeSize = (dccs)) #define mostRecentlyUsedPage() GIV(mostRecentlyUsedPage) @@ -17880,7 +17888,14 @@ return methodClassOf(((mframeHomeMethod(GIV(framePointer)))->methodObject)); } +void +mnuCompilationBreakpointFor(sqInt selectorOop) +{ + suppressHeartbeatFlag = 1; + warning("compilation MNU break (heartbeat suppressed)"); +} + /* Lookup the doesNotUnderstand: selector in the class of the argument rcvr. Answer either the matching method (cogged if appropriate), or nil, if not found. Modified: branches/Cog/nscogsrc/vm/cointerp.h =================================================================== --- branches/Cog/nscogsrc/vm/cointerp.h 2014-12-05 20:27:02 UTC (rev 3159) +++ branches/Cog/nscogsrc/vm/cointerp.h 2014-12-05 23:14:12 UTC (rev 3160) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.966 uuid: 46dd10c6-dc03-444c-bfa2-0f0b279c9b06 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.968 uuid: ddef3ea8-2ea4-4fe4-98ac-de4698b42ab8 */ @@ -78,6 +78,7 @@ CogMethod * mframeHomeMethodExport(void); CogMethod * mframeHomeMethod(char *theFP); sqInt mMethodClass(void); +void mnuCompilationBreakpointFor(sqInt selectorOop); usqInt newMethodAddress(void); usqInt nextProfileTickAddress(void); sqInt noAssertHeaderOf(sqInt methodPointer); @@ -290,13 +291,20 @@ /*** Macros ***/ -#define compilationBreakpoint(sel, len) do { \ - if ((len) == breakSelectorLength \ - && !strncmp((char *)((sel) + BaseHeaderSize), breakSelector, breakSelectorLength)) { \ +#define compilationBreakpointisMNUCase(sel, len, isMNU) do { \ + if ((len) == (isMNU ? -breakSelectorLength : breakSelectorLength) \ + && !strncmp((char *)((sel) + BaseHeaderSize), breakSelector, (isMNU ? -breakSelectorLength : breakSelectorLength))) { \ suppressHeartbeatFlag = 1; \ compilationBreakpointFor(sel); \ } \ } while (0) +#define mnuCompilationBreakpoint(sel, len) do { \ + if ((len) == -breakSelectorLength \ + && !strncmp((char *)((sel) + BaseHeaderSize), breakSelector, -breakSelectorLength)) { \ + suppressHeartbeatFlag = 1; \ + compilationBreakpointFor(sel); \ + } \ +} while (0) #define classFieldOffset() (0 - BaseHeaderSize) #define compactClassFieldWidth() 5 #define instFormatFieldLSB() 8 Modified: branches/Cog/nscogsrc/vm/gcc3x-cointerp.c =================================================================== --- branches/Cog/nscogsrc/vm/gcc3x-cointerp.c 2014-12-05 20:27:02 UTC (rev 3159) +++ branches/Cog/nscogsrc/vm/gcc3x-cointerp.c 2014-12-05 23:14:12 UTC (rev 3160) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.966 uuid: 46dd10c6-dc03-444c-bfa2-0f0b279c9b06 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.968 uuid: ddef3ea8-2ea4-4fe4-98ac-de4698b42ab8 from - CoInterpreter VMMaker.oscog-eem.966 uuid: 46dd10c6-dc03-444c-bfa2-0f0b279c9b06 + CoInterpreter VMMaker.oscog-eem.968 uuid: ddef3ea8-2ea4-4fe4-98ac-de4698b42ab8 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.966 uuid: 46dd10c6-dc03-444c-bfa2-0f0b279c9b06 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.968 uuid: ddef3ea8-2ea4-4fe4-98ac-de4698b42ab8 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -499,6 +499,7 @@ static sqInt mframeReceiver(char *theFP) NoDbgRegParms; static sqInt minimumUnusedHeadroom(void); sqInt mMethodClass(void); +void mnuCompilationBreakpointFor(sqInt selectorOop); static sqInt mnuMethodOrNilFor(sqInt rcvr) NoDbgRegParms; static char * moveFramesInthroughtoPage(StackPage *oldPage, char *theFP, StackPage *newPage) NoDbgRegParms; static sqInt mustMapMachineCodePCcontext(sqInt theIP, sqInt aOnceMarriedContext) NoDbgRegParms; @@ -1505,14 +1506,14 @@ sqInt checkAllocFiller; sqInt inIOProcessEvents; sqInt checkForLeaks; +sqInt breakSelectorLength = -1; sqInt desiredEdenBytes; sqInt desiredNumStackPages; -sqInt breakSelectorLength = -1; sqInt extraVMMemory; sqInt desiredCogCodeSize; +char * breakSelector; usqInt heapBase; void * showSurfaceFn; -char * breakSelector; sqInt deferDisplayUpdates; struct VirtualMachine* interpreterProxy; static void (*interruptCheckChain)(void) = 0; @@ -2099,7 +2100,7 @@ /* 574 */ (void (*)(void))0, /* 575 */ (void (*)(void))0, 0 }; -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.966"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.968"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -2109,9 +2110,9 @@ #define cPICNumCasesHack hack hack hack i.e. the getter macro does all the work #define nextOpenPIC methodObject #define nextOpenPICHack hack hack hack i.e. the getter macro does all the work -#define compilationBreakpoint(sel, len) do { \ - if ((len) == breakSelectorLength \ - && !strncmp((char *)((sel) + BaseHeaderSize), breakSelector, breakSelectorLength)) { \ +#define compilationBreakpointisMNUCase(sel, len, isMNU) do { \ + if ((len) == (isMNU ? -breakSelectorLength : breakSelectorLength) \ + && !strncmp((char *)((sel) + BaseHeaderSize), breakSelector, (isMNU ? -breakSelectorLength : breakSelectorLength))) { \ suppressHeartbeatFlag = 1; \ compilationBreakpointFor(sel); \ } \ @@ -2123,6 +2124,13 @@ #define getDesiredCogCodeSize() integerObjectOf(desiredCogCodeSize) #define heapBase() heapBase #define initialEnterSmalltalkExecutive() enterSmalltalkExecutiveImplementation() +#define mnuCompilationBreakpoint(sel, len) do { \ + if ((len) == -breakSelectorLength \ + && !strncmp((char *)((sel) + BaseHeaderSize), breakSelector, -breakSelectorLength)) { \ + suppressHeartbeatFlag = 1; \ + compilationBreakpointFor(sel); \ + } \ +} while (0) #define primTraceLogIndex(aValue) (GIV(primTraceLogIndex) = (aValue)) #define setDesiredCogCodeSize(dccs) (desiredCogCodeSize = (dccs)) #define mostRecentlyUsedPage() GIV(mostRecentlyUsedPage) @@ -17889,7 +17897,14 @@ return methodClassOf(((mframeHomeMethod(GIV(framePointer)))->methodObject)); } +void +mnuCompilationBreakpointFor(sqInt selectorOop) +{ + suppressHeartbeatFlag = 1; + warning("compilation MNU break (heartbeat suppressed)"); +} + /* Lookup the doesNotUnderstand: selector in the class of the argument rcvr. Answer either the matching method (cogged if appropriate), or nil, if not found. Modified: branches/Cog/nsspursrc/vm/cogit.c =================================================================== --- branches/Cog/nsspursrc/vm/cogit.c 2014-12-05 20:27:02 UTC (rev 3159) +++ branches/Cog/nsspursrc/vm/cogit.c 2014-12-05 23:14:12 UTC (rev 3160) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.966 uuid: 46dd10c6-dc03-444c-bfa2-0f0b279c9b06 + CCodeGenerator VMMaker.oscog-eem.968 uuid: ddef3ea8-2ea4-4fe4-98ac-de4698b42ab8 from - StackToRegisterMappingCogit VMMaker.oscog-eem.966 uuid: 46dd10c6-dc03-444c-bfa2-0f0b279c9b06 + StackToRegisterMappingCogit VMMaker.oscog-eem.968 uuid: ddef3ea8-2ea4-4fe4-98ac-de4698b42ab8 */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.966 uuid: 46dd10c6-dc03-444c-bfa2-0f0b279c9b06 " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.968 uuid: ddef3ea8-2ea4-4fe4-98ac-de4698b42ab8 " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -9324,7 +9324,7 @@ sqInt size; sqInt target; - compilationBreakpoint((cPIC->selector), lengthOf((cPIC->selector))); + compilationBreakpointisMNUCase((cPIC->selector), lengthOf((cPIC->selector)), isMNUCase); allocateOpcodesbytecodes(5, 0); assert(!(inlineCacheTagIsYoung(caseNTag))); assert((caseNMethod != null) @@ -9459,7 +9459,7 @@ if (isYoung(selector)) { return 0; } - compilationBreakpoint(selector, lengthOf(selector)); + compilationBreakpointisMNUCase(selector, lengthOf(selector), 1); assert(endCPICCase0 != null); startAddress = allocate(closedPICSize); if (startAddress == 0) { @@ -9497,7 +9497,7 @@ sqInt mapSize; sqInt startAddress; - compilationBreakpoint(selector, lengthOf(selector)); + compilationBreakpointisMNUCase(selector, lengthOf(selector), 0); startAddress = allocate(openPICSize); if (startAddress == 0) { return ((CogMethod *) InsufficientCodeSpace); @@ -9537,7 +9537,7 @@ if (isYoung(selector)) { return ((CogMethod *) YoungSelectorInPIC); } - compilationBreakpoint(selector, lengthOf(selector)); + compilationBreakpointisMNUCase(selector, lengthOf(selector), isMNUCase); startAddress = allocate(closedPICSize); if (startAddress == 0) { return ((CogMethod *) InsufficientCodeSpace); @@ -9573,7 +9573,7 @@ assert((!(methodHasCogMethod(aMethodObj))) || ((noAssertMethodClassAssociationOf(aMethodObj)) == (nilObject()))); - compilationBreakpoint(aSelectorOop, lengthOf(aSelectorOop)); + compilationBreakpointisMNUCase(aSelectorOop, lengthOf(aSelectorOop), 0); if (aMethodObj == breakMethod) { haltmsg("Compilation of breakMethod"); } @@ -13910,7 +13910,7 @@ void setSelectorOfto(CogMethod *cogMethod, sqInt aSelectorOop) { - compilationBreakpoint(aSelectorOop, lengthOf(aSelectorOop)); + compilationBreakpointisMNUCase(aSelectorOop, lengthOf(aSelectorOop), 0); assert(((cogMethod->cmType)) == CMMethod); (cogMethod->selector = aSelectorOop); if (isYoung(aSelectorOop)) { Modified: branches/Cog/nsspursrc/vm/cogit.h =================================================================== --- branches/Cog/nsspursrc/vm/cogit.h 2014-12-05 20:27:02 UTC (rev 3159) +++ branches/Cog/nsspursrc/vm/cogit.h 2014-12-05 23:14:12 UTC (rev 3160) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.966 uuid: 46dd10c6-dc03-444c-bfa2-0f0b279c9b06 + CCodeGenerator VMMaker.oscog-eem.968 uuid: ddef3ea8-2ea4-4fe4-98ac-de4698b42ab8 */ Modified: branches/Cog/nsspursrc/vm/cointerp.c =================================================================== --- branches/Cog/nsspursrc/vm/cointerp.c 2014-12-05 20:27:02 UTC (rev 3159) +++ branches/Cog/nsspursrc/vm/cointerp.c 2014-12-05 23:14:12 UTC (rev 3160) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.966 uuid: 46dd10c6-dc03-444c-bfa2-0f0b279c9b06 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.968 uuid: ddef3ea8-2ea4-4fe4-98ac-de4698b42ab8 from - CoInterpreter VMMaker.oscog-eem.966 uuid: 46dd10c6-dc03-444c-bfa2-0f0b279c9b06 + CoInterpreter VMMaker.oscog-eem.968 uuid: ddef3ea8-2ea4-4fe4-98ac-de4698b42ab8 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.966 uuid: 46dd10c6-dc03-444c-bfa2-0f0b279c9b06 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.968 uuid: ddef3ea8-2ea4-4fe4-98ac-de4698b42ab8 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -506,6 +506,7 @@ static sqInt mframeReceiver(char *theFP) NoDbgRegParms; static sqInt minimumUnusedHeadroom(void); sqInt mMethodClass(void); +void mnuCompilationBreakpointFor(sqInt selectorOop); static sqInt mnuMethodOrNilFor(sqInt rcvr) NoDbgRegParms; static char * moveFramesInthroughtoPage(StackPage *oldPage, char *theFP, StackPage *newPage) NoDbgRegParms; static sqInt mustMapMachineCodePCcontext(sqInt theIP, sqInt aOnceMarriedContext) NoDbgRegParms; @@ -1723,14 +1724,14 @@ sqInt checkForLeaks; sqInt checkAllocFiller; sqInt inIOProcessEvents; +sqInt breakSelectorLength = -1; sqInt desiredEdenBytes; sqInt desiredNumStackPages; -sqInt breakSelectorLength = -1; sqInt extraVMMemory; sqInt desiredCogCodeSize; +char * breakSelector; usqInt heapBase; void * showSurfaceFn; -char * breakSelector; sqInt deferDisplayUpdates; struct VirtualMachine* interpreterProxy; static void (*interruptCheckChain)(void) = 0; @@ -2345,7 +2346,7 @@ /*540*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, /*560*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, 0, 0, 0,-1,-1 }; -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.966"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.968"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -2355,9 +2356,9 @@ #define cPICNumCasesHack hack hack hack i.e. the getter macro does all the work #define nextOpenPIC methodObject #define nextOpenPICHack hack hack hack i.e. the getter macro does all the work -#define compilationBreakpoint(sel, len) do { \ - if ((len) == breakSelectorLength \ - && !strncmp((char *)((sel) + BaseHeaderSize), breakSelector, breakSelectorLength)) { \ +#define compilationBreakpointisMNUCase(sel, len, isMNU) do { \ + if ((len) == (isMNU ? -breakSelectorLength : breakSelectorLength) \ + && !strncmp((char *)((sel) + BaseHeaderSize), breakSelector, (isMNU ? -breakSelectorLength : breakSelectorLength))) { \ suppressHeartbeatFlag = 1; \ compilationBreakpointFor(sel); \ } \ @@ -2369,6 +2370,13 @@ #define getDesiredCogCodeSize() integerObjectOf(desiredCogCodeSize) #define heapBase() heapBase #define initialEnterSmalltalkExecutive() enterSmalltalkExecutiveImplementation() +#define mnuCompilationBreakpoint(sel, len) do { \ + if ((len) == -breakSelectorLength \ + && !strncmp((char *)((sel) + BaseHeaderSize), breakSelector, -breakSelectorLength)) { \ + suppressHeartbeatFlag = 1; \ + compilationBreakpointFor(sel); \ + } \ +} while (0) #define primTraceLogIndex(aValue) (GIV(primTraceLogIndex) = (aValue)) #define setDesiredCogCodeSize(dccs) (desiredCogCodeSize = (dccs)) #define mostRecentlyUsedPage() GIV(mostRecentlyUsedPage) @@ -8842,7 +8850,7 @@ /* bytecodePrimBitShift */ { sqInt integerArgument; - sqLong integerReceiver; + usqInt integerReceiver; sqInt shifted; char *sp; @@ -8902,7 +8910,7 @@ null; goto l76; } - shifted = ((unsigned sqLong)integerReceiver) >> (0 - integerArgument); + shifted = ((usqInt) integerReceiver) >> (0 - integerArgument); } shifted = positive32BitIntegerFor(shifted); /* begin pop:thenPush: */ @@ -11590,7 +11598,7 @@ /* bytecodePrimBitShift */ { sqInt integerArgument; - sqLong integerReceiver; + usqInt integerReceiver; sqInt shifted; char *sp; @@ -11650,7 +11658,7 @@ null; goto l183; } - shifted = ((unsigned sqLong)integerReceiver) >> (0 - integerArgument); + shifted = ((usqInt) integerReceiver) >> (0 - integerArgument); } shifted = positive32BitIntegerFor(shifted); /* begin pop:thenPush: */ @@ -22119,7 +22127,14 @@ return methodClassOf(((mframeHomeMethod(GIV(framePointer)))->methodObject)); } +void +mnuCompilationBreakpointFor(sqInt selectorOop) +{ + suppressHeartbeatFlag = 1; + warning("compilation MNU break (heartbeat suppressed)"); +} + /* Lookup the doesNotUnderstand: selector in the class of the argument rcvr. Answer either the matching method (cogged if appropriate), or nil, if not found. @@ -29379,7 +29394,7 @@ primitiveBitShift(void) { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt integerArgument; - sqLong integerReceiver; + usqInt integerReceiver; sqInt shifted; char *sp; @@ -29426,7 +29441,7 @@ } return; } - shifted = ((unsigned sqLong)integerReceiver) >> (0 - integerArgument); + shifted = ((usqInt) integerReceiver) >> (0 - integerArgument); } shifted = positive32BitIntegerFor(shifted); /* begin pop:thenPush: */ Modified: branches/Cog/nsspursrc/vm/cointerp.h =================================================================== --- branches/Cog/nsspursrc/vm/cointerp.h 2014-12-05 20:27:02 UTC (rev 3159) +++ branches/Cog/nsspursrc/vm/cointerp.h 2014-12-05 23:14:12 UTC (rev 3160) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.966 uuid: 46dd10c6-dc03-444c-bfa2-0f0b279c9b06 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.968 uuid: ddef3ea8-2ea4-4fe4-98ac-de4698b42ab8 */ @@ -80,6 +80,7 @@ CogMethod * mframeHomeMethodExport(void); CogMethod * mframeHomeMethod(char *theFP); sqInt mMethodClass(void); +void mnuCompilationBreakpointFor(sqInt selectorOop); usqInt newMethodAddress(void); usqInt nextProfileTickAddress(void); sqInt noAssertHeaderOf(sqInt methodPointer); @@ -338,13 +339,20 @@ /*** Macros ***/ -#define compilationBreakpoint(sel, len) do { \ - if ((len) == breakSelectorLength \ - && !strncmp((char *)((sel) + BaseHeaderSize), breakSelector, breakSelectorLength)) { \ +#define compilationBreakpointisMNUCase(sel, len, isMNU) do { \ + if ((len) == (isMNU ? -breakSelectorLength : breakSelectorLength) \ + && !strncmp((char *)((sel) + BaseHeaderSize), breakSelector, (isMNU ? -breakSelectorLength : breakSelectorLength))) { \ suppressHeartbeatFlag = 1; \ compilationBreakpointFor(sel); \ } \ } while (0) +#define mnuCompilationBreakpoint(sel, len) do { \ + if ((len) == -breakSelectorLength \ + && !strncmp((char *)((sel) + BaseHeaderSize), breakSelector, -breakSelectorLength)) { \ + suppressHeartbeatFlag = 1; \ + compilationBreakpointFor(sel); \ + } \ +} while (0) #define startOfMemory() heapBase #define shiftForWord() 2 #define wordSize() 4 Modified: branches/Cog/nsspursrc/vm/gcc3x-cointerp.c =================================================================== --- branches/Cog/nsspursrc/vm/gcc3x-cointerp.c 2014-12-05 20:27:02 UTC (rev 3159) +++ branches/Cog/nsspursrc/vm/gcc3x-cointerp.c 2014-12-05 23:14:12 UTC (rev 3160) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.966 uuid: 46dd10c6-dc03-444c-bfa2-0f0b279c9b06 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.968 uuid: ddef3ea8-2ea4-4fe4-98ac-de4698b42ab8 from - CoInterpreter VMMaker.oscog-eem.966 uuid: 46dd10c6-dc03-444c-bfa2-0f0b279c9b06 + CoInterpreter VMMaker.oscog-eem.968 uuid: ddef3ea8-2ea4-4fe4-98ac-de4698b42ab8 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.966 uuid: 46dd10c6-dc03-444c-bfa2-0f0b279c9b06 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.968 uuid: ddef3ea8-2ea4-4fe4-98ac-de4698b42ab8 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -509,6 +509,7 @@ static sqInt mframeReceiver(char *theFP) NoDbgRegParms; static sqInt minimumUnusedHeadroom(void); sqInt mMethodClass(void); +void mnuCompilationBreakpointFor(sqInt selectorOop); static sqInt mnuMethodOrNilFor(sqInt rcvr) NoDbgRegParms; static char * moveFramesInthroughtoPage(StackPage *oldPage, char *theFP, StackPage *newPage) NoDbgRegParms; static sqInt mustMapMachineCodePCcontext(sqInt theIP, sqInt aOnceMarriedContext) NoDbgRegParms; @@ -1726,14 +1727,14 @@ sqInt checkForLeaks; sqInt checkAllocFiller; sqInt inIOProcessEvents; +sqInt breakSelectorLength = -1; sqInt desiredEdenBytes; sqInt desiredNumStackPages; -sqInt breakSelectorLength = -1; sqInt extraVMMemory; sqInt desiredCogCodeSize; +char * breakSelector; usqInt heapBase; void * showSurfaceFn; -char * breakSelector; sqInt deferDisplayUpdates; struct VirtualMachine* interpreterProxy; static void (*interruptCheckChain)(void) = 0; @@ -2348,7 +2349,7 @@ /*540*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, /*560*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, 0, 0, 0,-1,-1 }; -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.966"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.968"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -2358,9 +2359,9 @@ #define cPICNumCasesHack hack hack hack i.e. the getter macro does all the work #define nextOpenPIC methodObject #define nextOpenPICHack hack hack hack i.e. the getter macro does all the work -#define compilationBreakpoint(sel, len) do { \ - if ((len) == breakSelectorLength \ - && !strncmp((char *)((sel) + BaseHeaderSize), breakSelector, breakSelectorLength)) { \ +#define compilationBreakpointisMNUCase(sel, len, isMNU) do { \ + if ((len) == (isMNU ? -breakSelectorLength : breakSelectorLength) \ + && !strncmp((char *)((sel) + BaseHeaderSize), breakSelector, (isMNU ? -breakSelectorLength : breakSelectorLength))) { \ suppressHeartbeatFlag = 1; \ compilationBreakpointFor(sel); \ } \ @@ -2372,6 +2373,13 @@ #define getDesiredCogCodeSize() integerObjectOf(desiredCogCodeSize) #define heapBase() heapBase #define initialEnterSmalltalkExecutive() enterSmalltalkExecutiveImplementation() +#define mnuCompilationBreakpoint(sel, len) do { \ + if ((len) == -breakSelectorLength \ + && !strncmp((char *)((sel) + BaseHeaderSize), breakSelector, -breakSelectorLength)) { \ + suppressHeartbeatFlag = 1; \ + compilationBreakpointFor(sel); \ + } \ +} while (0) #define primTraceLogIndex(aValue) (GIV(primTraceLogIndex) = (aValue)) #define setDesiredCogCodeSize(dccs) (desiredCogCodeSize = (dccs)) #define mostRecentlyUsedPage() GIV(mostRecentlyUsedPage) @@ -8851,7 +8859,7 @@ /* bytecodePrimBitShift */ { sqInt integerArgument; - sqLong integerReceiver; + usqInt integerReceiver; sqInt shifted; char *sp; @@ -8911,7 +8919,7 @@ null; goto l76; } - shifted = ((unsigned sqLong)integerReceiver) >> (0 - integerArgument); + shifted = ((usqInt) integerReceiver) >> (0 - integerArgument); } shifted = positive32BitIntegerFor(shifted); /* begin pop:thenPush: */ @@ -11599,7 +11607,7 @@ /* bytecodePrimBitShift */ { sqInt integerArgument; - sqLong integerReceiver; + usqInt integerReceiver; sqInt shifted; char *sp; @@ -11659,7 +11667,7 @@ null; goto l183; } - shifted = ((unsigned sqLong)integerReceiver) >> (0 - integerArgument); + shifted = ((usqInt) integerReceiver) >> (0 - integerArgument); } shifted = positive32BitIntegerFor(shifted); /* begin pop:thenPush: */ @@ -22128,7 +22136,14 @@ return methodClassOf(((mframeHomeMethod(GIV(framePointer)))->methodObject)); } +void +mnuCompilationBreakpointFor(sqInt selectorOop) +{ + suppressHeartbeatFlag = 1; + warning("compilation MNU break (heartbeat suppressed)"); +} + /* Lookup the doesNotUnderstand: selector in the class of the argument rcvr. Answer either the matching method (cogged if appropriate), or nil, if not found. @@ -29388,7 +29403,7 @@ primitiveBitShift(void) { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt integerArgument; - sqLong integerReceiver; + usqInt integerReceiver; sqInt shifted; char *sp; @@ -29435,7 +29450,7 @@ } return; } - shifted = ((unsigned sqLong)integerReceiver) >> (0 - integerArgument); + shifted = ((usqInt) integerReceiver) >> (0 - integerArgument); } shifted = positive32BitIntegerFor(shifted); /* begin pop:thenPush: */ Property changes on: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h ___________________________________________________________________ Modified: checkindate - Fri Dec 5 12:23:57 PST 2014 + Fri Dec 5 15:14:03 PST 2014 Modified: branches/Cog/sistasrc/vm/cogit.c =================================================================== --- branches/Cog/sistasrc/vm/cogit.c 2014-12-05 20:27:02 UTC (rev 3159) +++ branches/Cog/sistasrc/vm/cogit.c 2014-12-05 23:14:12 UTC (rev 3160) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.966 uuid: 46dd10c6-dc03-444c-bfa2-0f0b279c9b06 + CCodeGenerator VMMaker.oscog-eem.968 uuid: ddef3ea8-2ea4-4fe4-98ac-de4698b42ab8 from - SistaStackToRegisterMappingCogit VMMaker.oscog-eem.966 uuid: 46dd10c6-dc03-444c-bfa2-0f0b279c9b06 + SistaStackToRegisterMappingCogit VMMaker.oscog-eem.968 uuid: ddef3ea8-2ea4-4fe4-98ac-de4698b42ab8 */ -static char __buildInfo[] = "SistaStackToRegisterMappingCogit VMMaker.oscog-eem.966 uuid: 46dd10c6-dc03-444c-bfa2-0f0b279c9b06 " __DATE__ ; +static char __buildInfo[] = "SistaStackToRegisterMappingCogit VMMaker.oscog-eem.968 uuid: ddef3ea8-2ea4-4fe4-98ac-de4698b42ab8 " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -9288,7 +9288,7 @@ sqInt size; sqInt target; - compilationBreakpoint((cPIC->selector), lengthOf((cPIC->selector))); + compilationBreakpointisMNUCase((cPIC->selector), lengthOf((cPIC->selector)), isMNUCase); allocateOpcodesbytecodes(5, 0); assert(!(inlineCacheTagIsYoung(caseNTag))); assert((caseNMethod != null) @@ -9423,7 +9423,7 @@ if (isYoung(selector)) { return 0; } - compilationBreakpoint(selector, lengthOf(selector)); + compilationBreakpointisMNUCase(selector, lengthOf(selector), 1); assert(endCPICCase0 != null); startAddress = allocate(closedPICSize); if (startAddress == 0) { @@ -9461,7 +9461,7 @@ sqInt mapSize; sqInt startAddress; - compilationBreakpoint(selector, lengthOf(selector)); + compilationBreakpointisMNUCase(selector, lengthOf(selector), 0); startAddress = allocate(openPICSize); if (startAddress == 0) { return ((CogMethod *) InsufficientCodeSpace); @@ -9501,7 +9501,7 @@ if (isYoung(selector)) { return ((CogMethod *) YoungSelectorInPIC); } - compilationBreakpoint(selector, lengthOf(selector)); + compilationBreakpointisMNUCase(selector, lengthOf(selector), isMNUCase); startAddress = allocate(closedPICSize); if (startAddress == 0) { return ((CogMethod *) InsufficientCodeSpace); @@ -9537,7 +9537,7 @@ assert((!(methodHasCogMethod(aMethodObj))) || ((noAssertMethodClassAssociationOf(aMethodObj)) == (nilObject()))); - compilationBreakpoint(aSelectorOop, lengthOf(aSelectorOop)); + compilationBreakpointisMNUCase(aSelectorOop, lengthOf(aSelectorOop), 0); if (aMethodObj == breakMethod) { haltmsg("Compilation of breakMethod"); } @@ -13635,7 +13635,7 @@ void setSelectorOfto(CogMethod *cogMethod, sqInt aSelectorOop) { - compilationBreakpoint(aSelectorOop, lengthOf(aSelectorOop)); + compilationBreakpointisMNUCase(aSelectorOop, lengthOf(aSelectorOop), 0); assert(((cogMethod->cmType)) == CMMethod); (cogMethod->selector = aSelectorOop); if (isYoung(aSelectorOop)) { Modified: branches/Cog/sistasrc/vm/cogit.h =================================================================== --- branches/Cog/sistasrc/vm/cogit.h 2014-12-05 20:27:02 UTC (rev 3159) +++ branches/Cog/sistasrc/vm/cogit.h 2014-12-05 23:14:12 UTC (rev 3160) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.966 uuid: 46dd10c6-dc03-444c-bfa2-0f0b279c9b06 + CCodeGenerator VMMaker.oscog-eem.968 uuid: ddef3ea8-2ea4-4fe4-98ac-de4698b42ab8 */ Modified: branches/Cog/sistasrc/vm/cointerp.c =================================================================== --- branches/Cog/sistasrc/vm/cointerp.c 2014-12-05 20:27:02 UTC (rev 3159) +++ branches/Cog/sistasrc/vm/cointerp.c 2014-12-05 23:14:12 UTC (rev 3160) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.966 uuid: 46dd10c6-dc03-444c-bfa2-0f0b279c9b06 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.968 uuid: ddef3ea8-2ea4-4fe4-98ac-de4698b42ab8 from - CoInterpreter VMMaker.oscog-eem.966 uuid: 46dd10c6-dc03-444c-bfa2-0f0b279c9b06 + CoInterpreter VMMaker.oscog-eem.968 uuid: ddef3ea8-2ea4-4fe4-98ac-de4698b42ab8 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.966 uuid: 46dd10c6-dc03-444c-bfa2-0f0b279c9b06 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.968 uuid: ddef3ea8-2ea4-4fe4-98ac-de4698b42ab8 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -493,6 +493,7 @@ static sqInt mframeReceiver(char *theFP) NoDbgRegParms; static sqInt minimumUnusedHeadroom(void); sqInt mMethodClass(void); +void mnuCompilationBreakpointFor(sqInt selectorOop); static sqInt mnuMethodOrNilFor(sqInt rcvr) NoDbgRegParms; static char * moveFramesInthroughtoPage(StackPage *oldPage, char *theFP, StackPage *newPage) NoDbgRegParms; static sqInt mustMapMachineCodePCcontext(sqInt theIP, sqInt aOnceMarriedContext) NoDbgRegParms; @@ -1499,14 +1500,14 @@ sqInt checkAllocFiller; sqInt inIOProcessEvents; sqInt checkForLeaks; +sqInt breakSelectorLength = -1; sqInt desiredEdenBytes; sqInt desiredNumStackPages; -sqInt breakSelectorLength = -1; sqInt extraVMMemory; sqInt desiredCogCodeSize; +char * breakSelector; usqInt heapBase; void * showSurfaceFn; -char * breakSelector; sqInt deferDisplayUpdates; struct VirtualMachine* interpreterProxy; static void (*interruptCheckChain)(void) = 0; @@ -2093,7 +2094,7 @@ /* 574 */ (void (*)(void))0, /* 575 */ (void (*)(void))0, 0 }; -const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreterPrimitives VMMaker.oscog-eem.966]"; +const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreterPrimitives VMMaker.oscog-eem.968]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -2103,9 +2104,9 @@ #define cPICNumCasesHack hack hack hack i.e. the getter macro does all the work #define nextOpenPIC methodObject #define nextOpenPICHack hack hack hack i.e. the getter macro does all the work -#define compilationBreakpoint(sel, len) do { \ - if ((len) == breakSelectorLength \ - && !strncmp((char *)((sel) + BaseHeaderSize), breakSelector, breakSelectorLength)) { \ +#define compilationBreakpointisMNUCase(sel, len, isMNU) do { \ + if ((len) == (isMNU ? -breakSelectorLength : breakSelectorLength) \ + && !strncmp((char *)((sel) + BaseHeaderSize), breakSelector, (isMNU ? -breakSelectorLength : breakSelectorLength))) { \ suppressHeartbeatFlag = 1; \ compilationBreakpointFor(sel); \ } \ @@ -2117,6 +2118,13 @@ #define getDesiredCogCodeSize() integerObjectOf(desiredCogCodeSize) #define heapBase() heapBase #define initialEnterSmalltalkExecutive() enterSmalltalkExecutiveImplementation() +#define mnuCompilationBreakpoint(sel, len) do { \ + if ((len) == -breakSelectorLength \ + && !strncmp((char *)((sel) + BaseHeaderSize), breakSelector, -breakSelectorLength)) { \ + suppressHeartbeatFlag = 1; \ + compilationBreakpointFor(sel); \ + } \ +} while (0) #define primTraceLogIndex(aValue) (GIV(primTraceLogIndex) = (aValue)) #define setDesiredCogCodeSize(dccs) (desiredCogCodeSize = (dccs)) #define mostRecentlyUsedPage() GIV(mostRecentlyUsedPage) @@ -7947,7 +7955,7 @@ /* bytecodePrimBitShift */ { sqInt integerArgument; - usqInt integerReceiver; + sqLong integerReceiver; sqInt shifted; char *sp; @@ -8007,7 +8015,7 @@ null; goto l108; } - shifted = ((usqInt) integerReceiver) >> (0 - integerArgument); + shifted = ((unsigned sqLong)integerReceiver) >> (0 - integerArgument); } shifted = positive32BitIntegerFor(shifted); /* begin pop:thenPush: */ @@ -10932,7 +10940,7 @@ /* bytecodePrimBitShift */ { sqInt integerArgument; - usqInt integerReceiver; + sqLong integerReceiver; sqInt shifted; char *sp; @@ -10992,7 +11000,7 @@ null; goto l242; } - shifted = ((usqInt) integerReceiver) >> (0 - integerArgument); + shifted = ((unsigned sqLong)integerReceiver) >> (0 - integerArgument); } shifted = positive32BitIntegerFor(shifted); /* begin pop:thenPush: */ @@ -17889,7 +17897,14 @@ return methodClassOf(((mframeHomeMethod(GIV(framePointer)))->methodObject)); } +void +mnuCompilationBreakpointFor(sqInt selectorOop) +{ + suppressHeartbeatFlag = 1; + warning("compilation MNU break (heartbeat suppressed)"); +} + /* Lookup the doesNotUnderstand: selector in the class of the argument rcvr. Answer either the matching method (cogged if appropriate), or nil, if not found. @@ -24575,7 +24590,7 @@ primitiveBitShift(void) { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt integerArgument; - usqInt integerReceiver; + sqLong integerReceiver; sqInt shifted; char *sp; @@ -24622,7 +24637,7 @@ } return; } - shifted = ((usqInt) integerReceiver) >> (0 - integerArgument); + shifted = ((unsigned sqLong)integerReceiver) >> (0 - integerArgument); } shifted = positive32BitIntegerFor(shifted); /* begin pop:thenPush: */ Modified: branches/Cog/sistasrc/vm/cointerp.h =================================================================== --- branches/Cog/sistasrc/vm/cointerp.h 2014-12-05 20:27:02 UTC (rev 3159) +++ branches/Cog/sistasrc/vm/cointerp.h 2014-12-05 23:14:12 UTC (rev 3160) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.966 uuid: 46dd10c6-dc03-444c-bfa2-0f0b279c9b06 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.968 uuid: ddef3ea8-2ea4-4fe4-98ac-de4698b42ab8 */ @@ -76,6 +76,7 @@ sqInt methodShouldBeCogged(sqInt aMethodObj); CogMethod * mframeHomeMethod(char *theFP); sqInt mMethodClass(void); +void mnuCompilationBreakpointFor(sqInt selectorOop); usqInt newMethodAddress(void); usqInt nextProfileTickAddress(void); sqInt noAssertHeaderOf(sqInt methodPointer); @@ -288,13 +289,20 @@ /*** Macros ***/ -#define compilationBreakpoint(sel, len) do { \ - if ((len) == breakSelectorLength \ - && !strncmp((char *)((sel) + BaseHeaderSize), breakSelector, breakSelectorLength)) { \ +#define compilationBreakpointisMNUCase(sel, len, isMNU) do { \ + if ((len) == (isMNU ? -breakSelectorLength : breakSelectorLength) \ + && !strncmp((char *)((sel) + BaseHeaderSize), breakSelector, (isMNU ? -breakSelectorLength : breakSelectorLength))) { \ suppressHeartbeatFlag = 1; \ compilationBreakpointFor(sel); \ } \ } while (0) +#define mnuCompilationBreakpoint(sel, len) do { \ + if ((len) == -breakSelectorLength \ + && !strncmp((char *)((sel) + BaseHeaderSize), breakSelector, -breakSelectorLength)) { \ + suppressHeartbeatFlag = 1; \ + compilationBreakpointFor(sel); \ + } \ +} while (0) #define classFieldOffset() (0 - BaseHeaderSize) #define compactClassFieldWidth() 5 #define instFormatFieldLSB() 8 Modified: branches/Cog/sistasrc/vm/gcc3x-cointerp.c =================================================================== --- branches/Cog/sistasrc/vm/gcc3x-cointerp.c 2014-12-05 20:27:02 UTC (rev 3159) +++ branches/Cog/sistasrc/vm/gcc3x-cointerp.c 2014-12-05 23:14:12 UTC (rev 3160) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.966 uuid: 46dd10c6-dc03-444c-bfa2-0f0b279c9b06 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.968 uuid: ddef3ea8-2ea4-4fe4-98ac-de4698b42ab8 from - CoInterpreter VMMaker.oscog-eem.966 uuid: 46dd10c6-dc03-444c-bfa2-0f0b279c9b06 + CoInterpreter VMMaker.oscog-eem.968 uuid: ddef3ea8-2ea4-4fe4-98ac-de4698b42ab8 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.966 uuid: 46dd10c6-dc03-444c-bfa2-0f0b279c9b06 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.968 uuid: ddef3ea8-2ea4-4fe4-98ac-de4698b42ab8 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -496,6 +496,7 @@ static sqInt mframeReceiver(char *theFP) NoDbgRegParms; static sqInt minimumUnusedHeadroom(void); sqInt mMethodClass(void); +void mnuCompilationBreakpointFor(sqInt selectorOop); static sqInt mnuMethodOrNilFor(sqInt rcvr) NoDbgRegParms; static char * moveFramesInthroughtoPage(StackPage *oldPage, char *theFP, StackPage *newPage) NoDbgRegParms; static sqInt mustMapMachineCodePCcontext(sqInt theIP, sqInt aOnceMarriedContext) NoDbgRegParms; @@ -1502,14 +1503,14 @@ sqInt checkAllocFiller; sqInt inIOProcessEvents; sqInt checkForLeaks; +sqInt breakSelectorLength = -1; sqInt desiredEdenBytes; sqInt desiredNumStackPages; -sqInt breakSelectorLength = -1; sqInt extraVMMemory; sqInt desiredCogCodeSize; +char * breakSelector; usqInt heapBase; void * showSurfaceFn; -char * breakSelector; sqInt deferDisplayUpdates; struct VirtualMachine* interpreterProxy; static void (*interruptCheckChain)(void) = 0; @@ -2096,7 +2097,7 @@ /* 574 */ (void (*)(void))0, /* 575 */ (void (*)(void))0, 0 }; -const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreterPrimitives VMMaker.oscog-eem.966]"; +const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreterPrimitives VMMaker.oscog-eem.968]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -2106,9 +2107,9 @@ #define cPICNumCasesHack hack hack hack i.e. the getter macro does all the work #define nextOpenPIC methodObject #define nextOpenPICHack hack hack hack i.e. the getter macro does all the work -#define compilationBreakpoint(sel, len) do { \ - if ((len) == breakSelectorLength \ - && !strncmp((char *)((sel) + BaseHeaderSize), breakSelector, breakSelectorLength)) { \ +#define compilationBreakpointisMNUCase(sel, len, isMNU) do { \ + if ((len) == (isMNU ? -breakSelectorLength : breakSelectorLength) \ + && !strncmp((char *)((sel) + BaseHeaderSize), breakSelector, (isMNU ? -breakSelectorLength : breakSelectorLength))) { \ suppressHeartbeatFlag = 1; \ compilationBreakpointFor(sel); \ } \ @@ -2120,6 +2121,13 @@ #define getDesiredCogCodeSize() integerObjectOf(desiredCogCodeSize) #define heapBase() heapBase #define initialEnterSmalltalkExecutive() enterSmalltalkExecutiveImplementation() +#define mnuCompilationBreakpoint(sel, len) do { \ + if ((len) == -breakSelectorLength \ + && !strncmp((char *)((sel) + BaseHeaderSize), breakSelector, -breakSelectorLength)) { \ + suppressHeartbeatFlag = 1; \ + compilationBreakpointFor(sel); \ + } \ +} while (0) #define primTraceLogIndex(aValue) (GIV(primTraceLogIndex) = (aValue)) #define setDesiredCogCodeSize(dccs) (desiredCogCodeSize = (dccs)) #define mostRecentlyUsedPage() GIV(mostRecentlyUsedPage) @@ -7956,7 +7964,7 @@ /* bytecodePrimBitShift */ { sqInt integerArgument; - usqInt integerReceiver; + sqLong integerReceiver; sqInt shifted; char *sp; @@ -8016,7 +8024,7 @@ null; goto l108; } - shifted = ((usqInt) integerReceiver) >> (0 - integerArgument); + shifted = ((unsigned sqLong)integerReceiver) >> (0 - integerArgument); } shifted = positive32BitIntegerFor(shifted); /* begin pop:thenPush: */ @@ -10941,7 +10949,7 @@ /* bytecodePrimBitShift */ { sqInt integerArgument; - usqInt integerReceiver; + sqLong integerReceiver; sqInt shifted; char *sp; @@ -11001,7 +11009,7 @@ null; goto l242; } - shifted = ((usqInt) integerReceiver) >> (0 - integerArgument); + shifted = ((unsigned sqLong)integerReceiver) >> (0 - integerArgument); } shifted = positive32BitIntegerFor(shifted); /* begin pop:thenPush: */ @@ -17898,7 +17906,14 @@ return methodClassOf(((mframeHomeMethod(GIV(framePointer)))->methodObject)); } +void +mnuCompilationBreakpointFor(sqInt selectorOop) +{ + suppressHeartbeatFlag = 1; + warning("compilation MNU break (heartbeat suppressed)"); +} + /* Lookup the doesNotUnderstand: selector in the class of the argument rcvr. Answer either the matching method (cogged if appropriate), or nil, if not found. @@ -24584,7 +24599,7 @@ primitiveBitShift(void) { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt integerArgument; - usqInt integerReceiver; + sqLong integerReceiver; sqInt shifted; char *sp; @@ -24631,7 +24646,7 @@ } return; } - shifted = ((usqInt) integerReceiver) >> (0 - integerArgument); + shifted = ((unsigned sqLong)integerReceiver) >> (0 - integerArgument); } shifted = positive32BitIntegerFor(shifted); /* begin pop:thenPush: */ Modified: branches/Cog/spursistasrc/vm/cogit.c =================================================================== --- branches/Cog/spursistasrc/vm/cogit.c 2014-12-05 20:27:02 UTC (rev 3159) +++ branches/Cog/spursistasrc/vm/cogit.c 2014-12-05 23:14:12 UTC (rev 3160) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.966 uuid: 46dd10c6-dc03-444c-bfa2-0f0b279c9b06 + CCodeGenerator VMMaker.oscog-eem.968 uuid: ddef3ea8-2ea4-4fe4-98ac-de4698b42ab8 from - SistaStackToRegisterMappingCogit VMMaker.oscog-eem.966 uuid: 46dd10c6-dc03-444c-bfa2-0f0b279c9b06 + SistaStackToRegisterMappingCogit VMMaker.oscog-eem.968 uuid: ddef3ea8-2ea4-4fe4-98ac-de4698b42ab8 */ -static char __buildInfo[] = "SistaStackToRegisterMappingCogit VMMaker.oscog-eem.966 uuid: 46dd10c6-dc03-444c-bfa2-0f0b279c9b06 " __DATE__ ; +static char __buildInfo[] = "SistaStackToRegisterMappingCogit VMMaker.oscog-eem.968 uuid: ddef3ea8-2ea4-4fe4-98ac-de4698b42ab8 " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -9253,7 +9253,7 @@ sqInt size; sqInt target; - compilationBreakpoint((cPIC->selector), lengthOf((cPIC->selector))); + compilationBreakpointisMNUCase((cPIC->selector), lengthOf((cPIC->selector)), isMNUCase); allocateOpcodesbytecodes(5, 0); assert(!(inlineCacheTagIsYoung(caseNTag))); assert((caseNMethod != null) @@ -9388,7 +9388,7 @@ if (isYoung(selector)) { return 0; } - compilationBreakpoint(selector, lengthOf(selector)); + compilationBreakpointisMNUCase(selector, lengthOf(selector), 1); assert(endCPICCase0 != null); startAddress = allocate(closedPICSize); if (startAddress == 0) { @@ -9426,7 +9426,7 @@ sqInt mapSize; sqInt startAddress; - compilationBreakpoint(selector, lengthOf(selector)); + compilationBreakpointisMNUCase(selector, lengthOf(selector), 0); startAddress = allocate(openPICSize); if (startAddress == 0) { return ((CogMethod *) InsufficientCodeSpace); @@ -9466,7 +9466,7 @@ if (isYoung(selector)) { return ((CogMethod *) YoungSelectorInPIC); } - compilationBreakpoint(selector, lengthOf(selector)); + compilationBreakpointisMNUCase(selector, lengthOf(selector), isMNUCase); startAddress = allocate(closedPICSize); if (startAddress == 0) { return ((CogMethod *) InsufficientCodeSpace); @@ -9502,7 +9502,7 @@ assert((!(methodHasCogMethod(aMethodObj))) || ((noAssertMethodClassAssociationOf(aMethodObj)) == (nilObject()))); - compilationBreakpoint(aSelectorOop, lengthOf(aSelectorOop)); + compilationBreakpointisMNUCase(aSelectorOop, lengthOf(aSelectorOop), 0); if (aMethodObj == breakMethod) { haltmsg("Compilation of breakMethod"); } @@ -13594,7 +13594,7 @@ void setSelectorOfto(CogMethod *cogMethod, sqInt aSelectorOop) { - compilationBreakpoint(aSelectorOop, lengthOf(aSelectorOop)); + compilationBreakpointisMNUCase(aSelectorOop, lengthOf(aSelectorOop), 0); assert(((cogMethod->cmType)) == CMMethod); (cogMethod->selector = aSelectorOop); if (isYoung(aSelectorOop)) { Modified: branches/Cog/spursistasrc/vm/cogit.h =================================================================== --- branches/Cog/spursistasrc/vm/cogit.h 2014-12-05 20:27:02 UTC (rev 3159) +++ branches/Cog/spursistasrc/vm/cogit.h 2014-12-05 23:14:12 UTC (rev 3160) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.966 uuid: 46dd10c6-dc03-444c-bfa2-0f0b279c9b06 + CCodeGenerator VMMaker.oscog-eem.968 uuid: ddef3ea8-2ea4-4fe4-98ac-de4698b42ab8 */ Modified: branches/Cog/spursistasrc/vm/cointerp.c =================================================================== --- branches/Cog/spursistasrc/vm/cointerp.c 2014-12-05 20:27:02 UTC (rev 3159) +++ branches/Cog/spursistasrc/vm/cointerp.c 2014-12-05 23:14:12 UTC (rev 3160) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.966 uuid: 46dd10c6-dc03-444c-bfa2-0f0b279c9b06 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.968 uuid: ddef3ea8-2ea4-4fe4-98ac-de4698b42ab8 from - CoInterpreter VMMaker.oscog-eem.966 uuid: 46dd10c6-dc03-444c-bfa2-0f0b279c9b06 + CoInterpreter VMMaker.oscog-eem.968 uuid: ddef3ea8-2ea4-4fe4-98ac-de4698b42ab8 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.966 uuid: 46dd10c6-dc03-444c-bfa2-0f0b279c9b06 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.968 uuid: ddef3ea8-2ea4-4fe4-98ac-de4698b42ab8 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -503,6 +503,7 @@ static sqInt mframeReceiver(char *theFP) NoDbgRegParms; static sqInt minimumUnusedHeadroom(void); @@ Diff output truncated at 50000 characters. @@

1 0

VM Maker: VMMaker.oscog-eem.968.mcz
by commits＠source.squeak.org 06 Dec '14

06 Dec '14

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.968.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.968 Author: eem Time: 5 December 2014, 3:04:06.059 pm UUID: ddef3ea8-2ea4-4fe4-98ac-de4698b42ab8 Ancestors: VMMaker.oscog-eem.967 Update configs to inlcude Squeak Spur Stack 64 VM =============== Diff against VMMaker.oscog-eem.967 =============== Item was changed: ----- Method: VMMaker class>>generateAllSpurConfigurations (in category 'configurations') ----- generateAllSpurConfigurations self generateNewspeakSpurCogVM; generateNewspeakSpurStackVM; generateSqueakSpurCogVM; generateSqueakSpurCogSistaVM; + generateSqueakSpurStackVM; + generateSqueakSpurStack64VM! - generateSqueakSpurStackVM! Item was changed: ----- Method: VMMaker class>>generateAllSpurConfigurationsUnderVersionControl (in category 'configurations') ----- generateAllSpurConfigurationsUnderVersionControl self generateNewspeakSpurStackVM; generateSqueakSpurStackVM; + generateSqueakSpurStack64VM; generateNewspeakSpurCogVM; generateSqueakSpurCogVM; generateSqueakSpurCogSistaVM! Item was changed: ----- Method: VMMaker class>>generateAllStackConfigurationsUnderVersionControl (in category 'configurations') ----- generateAllStackConfigurationsUnderVersionControl self generateNewspeakSpurStackVM; generateSqueakStackVM; + generateSqueakSpurStackVM; + generateSqueakSpurStack64VM! - generateSqueakSpurStackVM!

1 0

VM Maker: VMMaker.oscog-eem.967.mcz
by commits＠source.squeak.org 06 Dec '14

06 Dec '14

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.967.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.967 Author: eem Time: 5 December 2014, 3:00:37.278 pm UUID: 546b1d7c-4cc7-4e0c-b2a3-4e2877fb821e Ancestors: VMMaker.oscog-eem.966 Extend the -breakmnu facilities to break on creating MNU PIC entries, not just activating them. =============== Diff against VMMaker.oscog-eem.966 =============== Item was removed: - ----- Method: CoInterpreter>>compilationBreak:point: (in category 'debug support') ----- - compilationBreak: selectorOop point: selectorLength - <api> - <cmacro: '(sel, len) do { \ - if ((len) == breakSelectorLength \ - && !!strncmp((char *)((sel) + BaseHeaderSize), breakSelector, breakSelectorLength)) { \ - suppressHeartbeatFlag = 1; \ - compilationBreakpointFor(sel); \ - } \ - } while (0)'> - | i | - breakSelectorLength = selectorLength ifTrue: - [i := breakSelectorLength. - [i > 0] whileTrue: - [(objectMemory byteAt: selectorOop + i + objectMemory baseHeaderSize - 1) = (breakSelector at: i) asInteger - ifTrue: [(i := i - 1) = 0 ifTrue: - [self compilationBreakpointFor: selectorOop]] - ifFalse: [i := 0]]]! Item was added: + ----- Method: CoInterpreter>>compilationBreak:point:isMNUCase: (in category 'debug support') ----- + compilationBreak: selectorOop point: selectorLength isMNUCase: isMNUCase + <api> + <cmacro: '(sel, len, isMNU) do { \ + if ((len) == (isMNU ? -breakSelectorLength : breakSelectorLength) \ + && !!strncmp((char *)((sel) + BaseHeaderSize), breakSelector, (isMNU ? -breakSelectorLength : breakSelectorLength))) { \ + suppressHeartbeatFlag = 1; \ + compilationBreakpointFor(sel); \ + } \ + } while (0)'> + | bsl i | + bsl := isMNUCase ifTrue: [breakSelectorLength negated] ifFalse: [breakSelectorLength]. + bsl = selectorLength ifTrue: + [i := bsl. + [i > 0] whileTrue: + [(objectMemory byteAt: selectorOop + i + objectMemory baseHeaderSize - 1) = (breakSelector at: i) asInteger + ifTrue: [(i := i - 1) = 0 ifTrue: + [self compilationBreakpointFor: selectorOop]] + ifFalse: [i := 0]]]! Item was added: + ----- Method: CoInterpreter>>mnuCompilationBreak:point: (in category 'debug support') ----- + mnuCompilationBreak: selectorOop point: selectorLength + <api> + <cmacro: '(sel, len) do { \ + if ((len) == -breakSelectorLength \ + && !!strncmp((char *)((sel) + BaseHeaderSize), breakSelector, -breakSelectorLength)) { \ + suppressHeartbeatFlag = 1; \ + compilationBreakpointFor(sel); \ + } \ + } while (0)'> + | i | + breakSelectorLength negated = selectorLength ifTrue: + [i := breakSelectorLength negated. + [i > 0] whileTrue: + [(objectMemory byteAt: selectorOop + i + objectMemory baseHeaderSize - 1) = (breakSelector at: i) asInteger + ifTrue: [(i := i - 1) = 0 ifTrue: + [self mnuCompilationBreakpointFor: selectorOop]] + ifFalse: [i := 0]]]! Item was added: + ----- Method: CoInterpreter>>mnuCompilationBreakpointFor: (in category 'debug support') ----- + mnuCompilationBreakpointFor: selectorOop + <api> + suppressHeartbeatFlag := true. + self + cCode: [self warning: 'compilation MNU break (heartbeat suppressed)'] + inSmalltalk: [self halt: 'Compilation for MNU of ', breakSelector]! Item was changed: ----- Method: Cogit>>cog:selector: (in category 'jit - api') ----- cog: aMethodObj selector: aSelectorOop "Attempt to produce a machine code method for the bytecode method object aMethodObj. N.B. If there is no code memory available do *NOT* attempt to reclaim the method zone. Certain clients (e.g. ceSICMiss:) depend on the zone remaining constant across method generation." <api> <returnTypeC: #'CogMethod *'> | cogMethod | <var: #cogMethod type: #'CogMethod *'> self assert: ((coInterpreter methodHasCogMethod: aMethodObj) not or: [(self noAssertMethodClassAssociationOf: aMethodObj) = objectMemory nilObject]). "coInterpreter stringOf: aSelectorOop" coInterpreter compilationBreak: aSelectorOop + point: (objectMemory lengthOf: aSelectorOop) + isMNUCase: false. - point: (objectMemory lengthOf: aSelectorOop). aMethodObj = breakMethod ifTrue: [self halt: 'Compilation of breakMethod']. self cppIf: NewspeakVM ifTrue: [cogMethod := methodZone findPreviouslyCompiledVersionOf: aMethodObj with: aSelectorOop. cogMethod ifNotNil: [(coInterpreter methodHasCogMethod: aMethodObj) not ifTrue: [self assert: (coInterpreter rawHeaderOf: aMethodObj) = cogMethod methodHeader. cogMethod methodObject: aMethodObj. coInterpreter rawHeaderOf: aMethodObj put: cogMethod asInteger]. ^cogMethod]]. "If the generators for the alternate bytecode set are missing then interpret." (coInterpreter methodUsesAlternateBytecodeSet: aMethodObj) ifTrue: [(self numElementsIn: generatorTable) <= 256 ifTrue: [^nil]. bytecodeSetOffset := 256] ifFalse: [bytecodeSetOffset := 0]. objectRepresentation ensureNoForwardedLiteralsIn: aMethodObj. methodObj := aMethodObj. cogMethod := self compileCogMethod: aSelectorOop. (cogMethod asInteger between: MaxNegativeErrorCode and: -1) ifTrue: [cogMethod asInteger = InsufficientCodeSpace ifTrue: [coInterpreter callForCogCompiledCodeCompaction]. self maybeFreeCounters. "Right now no errors should be reported, so nothing more to do." "self reportError: (self cCoerceSimple: cogMethod to: #sqInt)." ^nil]. "self cCode: '' inSmalltalk: [coInterpreter printCogMethod: cogMethod. ""coInterpreter symbolicMethod: aMethodObj."" self assertValidMethodMap: cogMethod." "self disassembleMethod: cogMethod." "printInstructions := clickConfirm := true""]." ^cogMethod! Item was changed: ----- Method: Cogit>>cogExtendPIC:CaseNMethod:tag:isMNUCase: (in category 'in-line cacheing') ----- cogExtendPIC: cPIC CaseNMethod: caseNMethod tag: caseNTag isMNUCase: isMNUCase "Extend the cPIC with the supplied case. If caseNMethod is cogged dispatch direct to its unchecked entry-point. If caseNMethod is not cogged, jump to the fast interpreter dispatch, and if isMNUCase then dispatch to fast MNU invocation and mark the cPIC as having the MNU case for cache flushing." <var: #cPIC type: #'CogMethod *'> | operand target address size end | "stack allocate the various collections so that they are effectively garbage collected on return." coInterpreter compilationBreak: cPIC selector + point: (objectMemory lengthOf: cPIC selector) + isMNUCase: isMNUCase. - point: (objectMemory lengthOf: cPIC selector). self allocateOpcodes: 5 bytecodes: 0. self assert: (objectRepresentation inlineCacheTagIsYoung: caseNTag) not. "Caller patches to open pic if caseNMethod is young." self assert: (caseNMethod notNil and: [(objectMemory isYoung: caseNMethod) not]). (isMNUCase not and: [coInterpreter methodHasCogMethod: caseNMethod]) ifTrue: [operand := 0. target := (coInterpreter cogMethodOf: caseNMethod) asInteger + cmNoCheckEntryOffset] ifFalse: [isMNUCase ifTrue: [cPIC cpicHasMNUCase: true]. operand := caseNMethod. target := cPIC asInteger + (isMNUCase ifTrue: [self sizeof: CogMethod] ifFalse: [self interpretOffset - backEnd callInstructionByteSize])]. self CmpCw: caseNTag R: TempReg. self MoveCw: operand R: SendNumArgsReg. self JumpLongZero: target. self MoveCw: cPIC asInteger R: ClassReg. self JumpLong: (self cPICMissTrampolineFor: cPIC cmNumArgs). self computeMaximumSizes. address := self addressOfEndOfCase: cPIC cPICNumCases - 1 inCPIC: cPIC. size := self generateInstructionsAt: address. end := self outputInstructionsAt: address. processor flushICacheFrom: address to: cPIC asInteger + closedPICSize. cPIC cPICNumCases: cPIC cPICNumCases + 1. ^0! Item was changed: ----- Method: Cogit>>cogMNUPICSelector:methodOperand:numArgs: (in category 'in-line cacheing') ----- cogMNUPICSelector: selector methodOperand: methodOperand numArgs: numArgs <api> "Attempt to create a one-case PIC for an MNU. The tag for the case is at the send site and so doesn't need to be generated." <returnTypeC: #'CogMethod *'> | startAddress headerSize size end | (objectMemory isYoung: selector) ifTrue: [^0]. coInterpreter compilationBreak: selector + point: (objectMemory lengthOf: selector) + isMNUCase: true. - point: (objectMemory lengthOf: selector). self assert: endCPICCase0 notNil. startAddress := methodZone allocate: closedPICSize. startAddress = 0 ifTrue: [coInterpreter callForCogCompiledCodeCompaction. ^0]. methodLabel address: startAddress; dependent: nil. "stack allocate the various collections so that they are effectively garbage collected on return." self allocateOpcodes: numPICCases * 7 bytecodes: 0. self compileMNUCPIC: (self cCoerceSimple: startAddress to: #'CogMethod *') methodOperand: methodOperand numArgs: numArgs. self computeMaximumSizes. headerSize := self sizeof: CogMethod. size := self generateInstructionsAt: startAddress + headerSize. end := self outputInstructionsAt: startAddress + headerSize. "The missOffset is the same as the interpretOffset." self assert: missOffset = (interpretCall address + interpretCall machineCodeSize - startAddress). self assert: startAddress + cmEntryOffset = entry address. ^self fillInCPICHeader: (self cCoerceSimple: startAddress to: #'CogMethod *') size: closedPICSize numArgs: numArgs numCases: 1 hasMNUCase: true selector: selector ! Item was changed: ----- Method: Cogit>>cogOpenPICSelector:numArgs: (in category 'in-line cacheing') ----- cogOpenPICSelector: selector numArgs: numArgs "Create an Open PIC. Temporarily create a direct call of ceSendFromOpenPIC:. Should become a probe of the first-level method lookup cache followed by a call of ceSendFromOpenPIC: if the probe fails." <returnTypeC: #'CogMethod *'> | startAddress headerSize codeSize mapSize end | coInterpreter compilationBreak: selector + point: (objectMemory lengthOf: selector) + isMNUCase: false. - point: (objectMemory lengthOf: selector). startAddress := methodZone allocate: openPICSize. startAddress = 0 ifTrue: [^self cCoerceSimple: InsufficientCodeSpace to: #'CogMethod *']. methodLabel address: startAddress; dependent: nil. "stack allocate the various collections so that they are effectively garbage collected on return." self allocateOpcodes: 100 bytecodes: 0. self compileOpenPIC: selector numArgs: numArgs. self computeMaximumSizes. methodLabel concretizeAt: startAddress. headerSize := self sizeof: CogMethod. codeSize := self generateInstructionsAt: startAddress + headerSize. mapSize := self generateMapAt: startAddress + openPICSize - 1 start: startAddress + cmNoCheckEntryOffset. self assert: entry address - startAddress = cmEntryOffset. self assert: headerSize + codeSize + mapSize <= openPICSize. end := self outputInstructionsAt: startAddress + headerSize. ^self fillInOPICHeader: (self cCoerceSimple: startAddress to: #'CogMethod *') size: openPICSize numArgs: numArgs selector: selector ! Item was changed: ----- Method: Cogit>>cogPICSelector:numArgs:Case0Method:Case1Method:tag:isMNUCase: (in category 'in-line cacheing') ----- cogPICSelector: selector numArgs: numArgs Case0Method: case0CogMethod Case1Method: case1MethodOrNil tag: case1Tag isMNUCase: isMNUCase "Attempt to create a two-case PIC for case0CogMethod and case1Method,case1Tag. The tag for case0CogMethod is at the send site and so doesn't need to be generated. case1Method may be any of - a Cog method; link to its unchecked entry-point - a CompiledMethod; link to ceInterpretMethodFromPIC: - a CompiledMethod; link to ceMNUFromPICMNUMethod:receiver:" <var: #case0CogMethod type: #'CogMethod *'> <returnTypeC: #'CogMethod *'> | startAddress headerSize size end | (objectMemory isYoung: selector) ifTrue: [^self cCoerceSimple: YoungSelectorInPIC to: #'CogMethod *']. coInterpreter compilationBreak: selector + point: (objectMemory lengthOf: selector) + isMNUCase: isMNUCase. - point: (objectMemory lengthOf: selector). startAddress := methodZone allocate: closedPICSize. startAddress = 0 ifTrue: [^self cCoerceSimple: InsufficientCodeSpace to: #'CogMethod *']. methodLabel address: startAddress; dependent: nil. "stack allocate the various collections so that they are effectively garbage collected on return." self allocateOpcodes: numPICCases * 7 bytecodes: 0. self compileCPIC: (self cCoerceSimple: startAddress to: #'CogMethod *') Case0: case0CogMethod Case1Method: case1MethodOrNil tag: case1Tag isMNUCase: isMNUCase numArgs: numArgs. self computeMaximumSizes. headerSize := self sizeof: CogMethod. size := self generateInstructionsAt: startAddress + headerSize. end := self outputInstructionsAt: startAddress + headerSize. "The missOffset is th same as the interpretOffset." self assert: missOffset = (interpretCall address + interpretCall machineCodeSize - startAddress). self assert: startAddress + cmEntryOffset = entry address. self assert: endCPICCase0 address = (startAddress + firstCPICCaseOffset). self assert: endCPICCase1 address = (startAddress + firstCPICCaseOffset + cPICCaseSize). ^self fillInCPICHeader: (self cCoerceSimple: startAddress to: #'CogMethod *') size: closedPICSize numArgs: numArgs numCases: 2 hasMNUCase: isMNUCase selector: selector ! Item was changed: ----- Method: Cogit>>setSelectorOf:to: (in category 'jit - api') ----- setSelectorOf: cogMethod to: aSelectorOop <api> "If a method is compiled to machine code via a block entry it won't have a selector. A subsequent send can find the method and hence fill in the selector." <var: #cogMethod type: #'CogMethod *'> "self disassembleMethod: cogMethod" coInterpreter compilationBreak: aSelectorOop + point: (objectMemory lengthOf: aSelectorOop) + isMNUCase: false. - point: (objectMemory lengthOf: aSelectorOop). self assert: cogMethod cmType = CMMethod. cogMethod selector: aSelectorOop. (objectMemory isYoung: aSelectorOop) ifTrue: [methodZone ensureInYoungReferrers: cogMethod]! Item was removed: - ----- Method: CurrentImageCoInterpreterFacade>>compilationBreak:point: (in category 'debug support') ----- - compilationBreak: aString point: length - ^self! Item was added: + ----- Method: CurrentImageCoInterpreterFacade>>compilationBreak:point:isMNUCase: (in category 'debug support') ----- + compilationBreak: aString point: length isMNUCase: isMNUCase + ^self!

1 0

[commit][3159] VMMaker.oscog-eem.966
by commits＠squeakvm.org 05 Dec '14

05 Dec '14

Revision: 3159 Author: eliot Date: 2014-12-05 12:27:02 -0800 (Fri, 05 Dec 2014) Log Message: ----------- VMMaker.oscog-eem.966 Add a -breakmnu vm argument that calls warning on an mnu of a specific selector. Fix SmartSyntaxPlugin code generation for Spur of - asOop: old code assumed 4 byte oops & headers - Unsigned old code assumed 32-bit oops Affects AsyncFilePlugin, BochsIA32Plugin & FT2Plgin. Avoid duplication of effort in special selector send forwarding fault handling. Improve stack trace printing for Newspeak and Glue by providing something that assumes the penultimate literal is the selector or an AdditionalMethodState-like thing containing it. Reimplement primitiveCopyObject to work for both pointer and bits objects. This to support a good Object>>clone for Spur. Fix Spur's isWordsOrBytes[NonImm]:. More changes to the Mac platform subsystem for 64-bits. Modified Paths: -------------- branches/Cog/nscogsrc/plugins/AsynchFilePlugin/AsynchFilePlugin.c branches/Cog/nscogsrc/vm/cogit.c branches/Cog/nscogsrc/vm/cogit.h branches/Cog/nscogsrc/vm/cointerp.c branches/Cog/nscogsrc/vm/cointerp.h branches/Cog/nscogsrc/vm/gcc3x-cointerp.c branches/Cog/nsspursrc/vm/cogit.c branches/Cog/nsspursrc/vm/cogit.h branches/Cog/nsspursrc/vm/cointerp.c branches/Cog/nsspursrc/vm/cointerp.h branches/Cog/nsspursrc/vm/gcc3x-cointerp.c branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c branches/Cog/nsspurstacksrc/vm/interp.c branches/Cog/platforms/Cross/vm/dispdbg.h branches/Cog/platforms/Mac OS/plugins/HostWindowPlugin/sqMacHostWindow.h branches/Cog/platforms/Mac OS/vm/sqMacNSPlugin.c branches/Cog/platforms/Mac OS/vm/sqMacNSPluginUILogic.c branches/Cog/platforms/Mac OS/vm/sqMacNSPluginUILogic2.c branches/Cog/platforms/Mac OS/vm/sqMacNSPluginUILogic2.h branches/Cog/platforms/Mac OS/vm/sqMacUIEvents.c branches/Cog/platforms/Mac OS/vm/sqMacUIEvents.h branches/Cog/platforms/Mac OS/vm/sqMacUIEventsUniversal.c branches/Cog/platforms/Mac OS/vm/sqMacUnixCommandLineInterface.c branches/Cog/platforms/Mac OS/vm/sqMacWindow.c branches/Cog/platforms/Mac OS/vm/sqMacWindowUniversal.c branches/Cog/platforms/unix/vm/sqUnixMain.c branches/Cog/platforms/win32/vm/sqWin32Intel.c branches/Cog/platforms/win32/vm/sqWin32Window.c branches/Cog/sistasrc/vm/cogit.c branches/Cog/sistasrc/vm/cogit.h branches/Cog/sistasrc/vm/cointerp.c branches/Cog/sistasrc/vm/cointerp.h branches/Cog/sistasrc/vm/gcc3x-cointerp.c branches/Cog/spursistasrc/vm/cogit.c branches/Cog/spursistasrc/vm/cogit.h branches/Cog/spursistasrc/vm/cointerp.c branches/Cog/spursistasrc/vm/cointerp.h branches/Cog/spursistasrc/vm/gcc3x-cointerp.c branches/Cog/spursrc/vm/cogit.c branches/Cog/spursrc/vm/cogit.h branches/Cog/spursrc/vm/cointerp.c branches/Cog/spursrc/vm/cointerp.h branches/Cog/spursrc/vm/gcc3x-cointerp.c branches/Cog/spurstack64src/vm/gcc3x-interp.c branches/Cog/spurstack64src/vm/interp.c branches/Cog/spurstacksrc/vm/gcc3x-interp.c branches/Cog/spurstacksrc/vm/interp.c branches/Cog/src/plugins/AsynchFilePlugin/AsynchFilePlugin.c branches/Cog/src/plugins/BochsIA32Plugin/BochsIA32Plugin.c branches/Cog/src/plugins/GdbARMPlugin/GdbARMPlugin.c branches/Cog/src/vm/cogit.c branches/Cog/src/vm/cogit.h branches/Cog/src/vm/cointerp.c branches/Cog/src/vm/cointerp.h branches/Cog/src/vm/cointerpmt.c branches/Cog/src/vm/cointerpmt.h branches/Cog/src/vm/gcc3x-cointerp.c branches/Cog/src/vm/gcc3x-cointerpmt.c branches/Cog/stacksrc/vm/gcc3x-interp.c branches/Cog/stacksrc/vm/interp.c Property Changed: ---------------- branches/Cog/platforms/Cross/vm/sqSCCSVersion.h Modified: branches/Cog/nscogsrc/plugins/AsynchFilePlugin/AsynchFilePlugin.c =================================================================== --- branches/Cog/nscogsrc/plugins/AsynchFilePlugin/AsynchFilePlugin.c 2014-12-03 22:25:05 UTC (rev 3158) +++ branches/Cog/nscogsrc/plugins/AsynchFilePlugin/AsynchFilePlugin.c 2014-12-05 20:27:02 UTC (rev 3159) @@ -1,9 +1,9 @@ /* Automatically generated by - SmartSyntaxPluginCodeGenerator VMMaker.oscog-eem.597 uuid: c9a71dd4-c394-4a8f-aa4d-a6d4dc3ff220 + SmartSyntaxPluginCodeGenerator VMMaker.oscog-eem.963 uuid: 9df56221-18fd-4dcd-b93f-ae000bef62e5 from - AsynchFilePlugin VMMaker.oscog-eem.597 uuid: c9a71dd4-c394-4a8f-aa4d-a6d4dc3ff220 + AsynchFilePlugin VMMaker.oscog-eem.963 uuid: 9df56221-18fd-4dcd-b93f-ae000bef62e5 */ -static char __buildInfo[] = "AsynchFilePlugin VMMaker.oscog-eem.597 uuid: c9a71dd4-c394-4a8f-aa4d-a6d4dc3ff220 " __DATE__ ; +static char __buildInfo[] = "AsynchFilePlugin VMMaker.oscog-eem.963 uuid: 9df56221-18fd-4dcd-b93f-ae000bef62e5 " __DATE__ ; @@ -100,9 +100,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "AsynchFilePlugin VMMaker.oscog-eem.597 (i)" + "AsynchFilePlugin VMMaker.oscog-eem.963 (i)" #else - "AsynchFilePlugin VMMaker.oscog-eem.597 (e)" + "AsynchFilePlugin VMMaker.oscog-eem.963 (e)" #endif ; static void * sCOAFfn; @@ -224,7 +224,7 @@ /* If the security plugin can be loaded, use it to check for permission. If not, assume it's ok */ - fileNameSize = slotSizeOf(((int) fileName) - 4); + fileNameSize = slotSizeOf(((sqInt)((fileName) - BaseHeaderSize))); if (sCOAFfn != 0) { okToOpen = ((sqInt (*) (char *, sqInt, sqInt)) sCOAFfn)(fileName, fileNameSize, writeFlag); if (!okToOpen) { Modified: branches/Cog/nscogsrc/vm/cogit.c =================================================================== --- branches/Cog/nscogsrc/vm/cogit.c 2014-12-03 22:25:05 UTC (rev 3158) +++ branches/Cog/nscogsrc/vm/cogit.c 2014-12-05 20:27:02 UTC (rev 3159) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.957 uuid: ac5f8308-02e5-4277-b28c-595b7a4cf34a + CCodeGenerator VMMaker.oscog-eem.966 uuid: 46dd10c6-dc03-444c-bfa2-0f0b279c9b06 from - StackToRegisterMappingCogit VMMaker.oscog-eem.957 uuid: ac5f8308-02e5-4277-b28c-595b7a4cf34a + StackToRegisterMappingCogit VMMaker.oscog-eem.966 uuid: 46dd10c6-dc03-444c-bfa2-0f0b279c9b06 */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.957 uuid: ac5f8308-02e5-4277-b28c-595b7a4cf34a " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.966 uuid: 46dd10c6-dc03-444c-bfa2-0f0b279c9b06 " __DATE__ ; char *__cogitBuildInfo = __buildInfo; Modified: branches/Cog/nscogsrc/vm/cogit.h =================================================================== --- branches/Cog/nscogsrc/vm/cogit.h 2014-12-03 22:25:05 UTC (rev 3158) +++ branches/Cog/nscogsrc/vm/cogit.h 2014-12-05 20:27:02 UTC (rev 3159) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.957 uuid: ac5f8308-02e5-4277-b28c-595b7a4cf34a + CCodeGenerator VMMaker.oscog-eem.966 uuid: 46dd10c6-dc03-444c-bfa2-0f0b279c9b06 */ Modified: branches/Cog/nscogsrc/vm/cointerp.c =================================================================== --- branches/Cog/nscogsrc/vm/cointerp.c 2014-12-03 22:25:05 UTC (rev 3158) +++ branches/Cog/nscogsrc/vm/cointerp.c 2014-12-05 20:27:02 UTC (rev 3159) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.962 uuid: 7f55aa33-f2c1-4b7d-8456-5c2a33e4298b + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.966 uuid: 46dd10c6-dc03-444c-bfa2-0f0b279c9b06 from - CoInterpreter VMMaker.oscog-eem.962 uuid: 7f55aa33-f2c1-4b7d-8456-5c2a33e4298b + CoInterpreter VMMaker.oscog-eem.966 uuid: 46dd10c6-dc03-444c-bfa2-0f0b279c9b06 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.962 uuid: 7f55aa33-f2c1-4b7d-8456-5c2a33e4298b " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.966 uuid: 46dd10c6-dc03-444c-bfa2-0f0b279c9b06 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -799,7 +799,6 @@ sqInt nullHeaderForMachineCodeMethod(void); usqInt scavengeThresholdAddress(void); sqInt smallIntegerTag(void); -sqInt withoutForwardingOnandsendToCogit(sqInt obj1, sqInt obj2, sqInt (*selector)(sqInt,sqInt)); sqInt withoutForwardingOnandwithsendToCogit(sqInt obj1, sqInt obj2, sqInt aBool, sqInt (*selector)(sqInt,sqInt,sqInt)); usqInt youngStartAddress(void); static sqInt addressCouldBeObjWhileForwarding(sqInt address) NoDbgRegParms; @@ -859,7 +858,7 @@ void printWronglySizedContexts(sqInt printContexts); static void restoreHeadersFromtofromandtofrom(sqInt firstIn, sqInt lastIn, sqInt hdrBaseIn, sqInt firstOut, sqInt lastOut, sqInt hdrBaseOut) NoDbgRegParms; static void runLeakCheckerForFullGC(sqInt fullGCFlag) NoDbgRegParms; -static usqInt safeObjectAfter(sqInt oop) NoDbgRegParms; +static sqInt safeObjectAfter(sqInt oop) NoDbgRegParms; static sqInt safePrintStringOf(sqInt oop) NoDbgRegParms; static sqInt shortentoIndexableSize(sqInt obj, sqInt nSlots) NoDbgRegParms; static sqInt sizeBitsOfSafe(sqInt oop) NoDbgRegParms; @@ -1232,6 +1231,7 @@ EXPORT(sqInt) returnAsThroughCallbackContext(sqInt returnTypeOop, VMCallbackContext *vmCallbackContext, sqInt callbackMethodContext); static sqInt reverseDisplayFromto(sqInt startIndex, sqInt endIndex) NoDbgRegParms; static sqInt safeMethodClassOf(sqInt methodPointer) NoDbgRegParms; +void setBreakMNUSelector(char *aString); void setBreakSelector(char *aString); void setFullScreenFlag(sqInt value); EXPORT(void (*setInterruptCheckChain(void (*aFunction)(void)))()) ; @@ -1504,9 +1504,9 @@ sqInt checkForLeaks; sqInt desiredEdenBytes; sqInt desiredNumStackPages; +sqInt breakSelectorLength = -1; sqInt extraVMMemory; sqInt desiredCogCodeSize; -sqInt breakSelectorLength = -1; usqInt heapBase; void * showSurfaceFn; char * breakSelector; @@ -2096,7 +2096,7 @@ /* 574 */ (void (*)(void))0, /* 575 */ (void (*)(void))0, 0 }; -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.962"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.966"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -19178,13 +19178,13 @@ sqInt swapBytes; sqInt sz; int w; - long w1; - long w10; - long w11; - long w12; - long w2; - long w3; - long w4; + sqInt w1; + sqInt w10; + sqInt w11; + sqInt w12; + sqInt w2; + sqInt w3; + sqInt w4; int w5; short w6; int w7; @@ -19212,20 +19212,20 @@ : w); /* begin getLongFromFile:swap: */ w1 = 0; - sqImageFileRead((&w1), sizeof(long), 1, f); - dataSize = (swapBytes - ? byteSwapped(w1) - : w1); + sqImageFileRead((&w1), sizeof(w1), 1, f); + dataSize = ((sqInt) ((swapBytes + ? byteSwapped(w1) + : w1))); /* begin getLongFromFile:swap: */ w2 = 0; - sqImageFileRead((&w2), sizeof(long), 1, f); + sqImageFileRead((&w2), sizeof(w2), 1, f); oldBaseAddr = (swapBytes ? byteSwapped(w2) : w2); /* begin specialObjectsOop: */ /* begin getLongFromFile:swap: */ w11 = 0; - sqImageFileRead((&w11), sizeof(long), 1, f); + sqImageFileRead((&w11), sizeof(w11), 1, f); anObject = (swapBytes ? byteSwapped(w11) : w11); @@ -19233,20 +19233,20 @@ /* begin lastHash: */ /* begin getLongFromFile:swap: */ w12 = 0; - sqImageFileRead((&w12), sizeof(long), 1, f); + sqImageFileRead((&w12), sizeof(w12), 1, f); aValue = (swapBytes ? byteSwapped(w12) : w12); lastHash = aValue; /* begin getLongFromFile:swap: */ w3 = 0; - sqImageFileRead((&w3), sizeof(long), 1, f); + sqImageFileRead((&w3), sizeof(w3), 1, f); GIV(savedWindowSize) = (swapBytes ? byteSwapped(w3) : w3); /* begin getLongFromFile:swap: */ w4 = 0; - sqImageFileRead((&w4), sizeof(long), 1, f); + sqImageFileRead((&w4), sizeof(w4), 1, f); headerFlags = (swapBytes ? byteSwapped(w4) : w4); @@ -19323,7 +19323,7 @@ : w9); /* begin getLongFromFile:swap: */ w10 = 0; - sqImageFileRead((&w10), sizeof(long), 1, f); + sqImageFileRead((&w10), sizeof(w10), 1, f); firstSegSize = (swapBytes ? byteSwapped(w10) : w10); @@ -34701,61 +34701,6 @@ } -/* For the purposes of become: send selector to the cogit with obj1 and obj2 - and answer the result. Undo forwarding for the selector, but redo - forwarding after since - become:'s restoreHeadersAfter*Become* methods expect to be able to - restore. - */ - -sqInt -withoutForwardingOnandsendToCogit(sqInt obj1, sqInt obj2, sqInt (*selector)(sqInt,sqInt)) -{ - sqInt aWord; - sqInt aWord1; - sqInt fwdBlock; - sqInt fwdBlock1; - sqInt header; - sqInt header1; - sqInt result; - sqInt savedHeaderA; - sqInt savedHeaderB; - - savedHeaderA = longAt(obj1); - /* begin baseHeader:put: */ - /* begin headerWhileForwardingOf: */ - header = longAt(obj1); - if ((header & MarkBit) != 0) { - - /* oop is forwarded; get its real header from its forwarding table entry */ - - fwdBlock = (header & AllButMarkBitAndTypeMask) << 1; - assert(fwdBlockValid(fwdBlock)); - header = longAt(fwdBlock + BytesPerWord); - } - aWord = header; - longAtput(obj1, aWord); - savedHeaderB = longAt(obj2); - /* begin baseHeader:put: */ - /* begin headerWhileForwardingOf: */ - header1 = longAt(obj2); - if ((header1 & MarkBit) != 0) { - - /* oop is forwarded; get its real header from its forwarding table entry */ - - fwdBlock1 = (header1 & AllButMarkBitAndTypeMask) << 1; - assert(fwdBlockValid(fwdBlock1)); - header1 = longAt(fwdBlock1 + BytesPerWord); - } - aWord1 = header1; - longAtput(obj2, aWord1); - result = selector(obj1, obj2); - longAtput(obj1, savedHeaderA); - longAtput(obj2, savedHeaderB); - return result; -} - - /* For the purposes of become: send selector to the cogit with obj1, obj2 and aBool, and answer the result. Undo forwarding for the selector, but redo forwarding @@ -37046,15 +36991,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; @@ -37065,7 +37012,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; @@ -37080,7 +37041,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)) { @@ -37134,18 +37095,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 = ((((usqInt)(newFreeChunk + sz2))) >= GIV(freeStart) - ? GIV(freeStart) - : (newFreeChunk + sz2) + (headerTypeBytes[(longAt(newFreeChunk + sz2)) & TypeMask])); + next = ((((usqInt)(newFreeChunk + sz3))) >= GIV(freeStart) + ? ((sqInt)GIV(freeStart)) + : (newFreeChunk + sz3) + (headerTypeBytes[(longAt(newFreeChunk + sz3)) & TypeMask])); assert((next == GIV(freeStart)) || (next == (oopFromChunk(GIV(compEnd))))); if (next == GIV(freeStart)) { @@ -39022,7 +38983,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; @@ -39039,7 +39000,7 @@ : header & SizeMask); } return ((((usqInt)(oop + sz))) >= GIV(freeStart) - ? GIV(freeStart) + ? ((sqInt)GIV(freeStart)) : (oop + sz) + (headerTypeBytes[(longAt(oop + sz)) & TypeMask])); } @@ -44588,6 +44549,8 @@ assert((isImmediate(GIV(messageSelector))) || (addressCouldBeObj(GIV(messageSelector)))); + /* begin mnuBreakpoint:receiver: */ + mnuBreakpointreceiver(firstFixedFieldOfMaybeImmediate(GIV(messageSelector)), lengthOfMaybeImmediate(GIV(messageSelector)), null); argumentArray = eeInstantiateSmallClassnumSlots(longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassArray << (shiftForWord()))), GIV(argumentCount)); message = eeInstantiateSmallClassnumSlots(longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassMessage << (shiftForWord()))), MessageLookupClassIndex + 1); @@ -51264,18 +51227,30 @@ } void +setBreakMNUSelector(char *aString) +{ + if (((breakSelector = aString)) == null) { + + /* nil's effective length is zero */ + + breakSelectorLength = MinSmallInteger; + } + else { + breakSelectorLength = -(strlen(aString)); + } +} + +void setBreakSelector(char *aString) { - if (aString == null) { + if (((breakSelector = aString)) == null) { /* nil's effective length is zero */ - breakSelectorLength = -1; - breakSelector = null; + breakSelectorLength = MinSmallInteger; } else { breakSelectorLength = strlen(aString); - breakSelector = aString; } } Modified: branches/Cog/nscogsrc/vm/cointerp.h =================================================================== --- branches/Cog/nscogsrc/vm/cointerp.h 2014-12-03 22:25:05 UTC (rev 3158) +++ branches/Cog/nscogsrc/vm/cointerp.h 2014-12-05 20:27:02 UTC (rev 3159) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.962 uuid: 7f55aa33-f2c1-4b7d-8456-5c2a33e4298b + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.966 uuid: 46dd10c6-dc03-444c-bfa2-0f0b279c9b06 */ @@ -122,7 +122,6 @@ sqInt nullHeaderForMachineCodeMethod(void); usqInt scavengeThresholdAddress(void); sqInt smallIntegerTag(void); -sqInt withoutForwardingOnandsendToCogit(sqInt obj1, sqInt obj2, sqInt (*selector)(sqInt,sqInt)); sqInt withoutForwardingOnandwithsendToCogit(sqInt obj1, sqInt obj2, sqInt aBool, sqInt (*selector)(sqInt,sqInt,sqInt)); usqInt youngStartAddress(void); sqInt addressCouldBeObj(sqInt address); @@ -254,6 +253,7 @@ sqInt printProcsOnList(sqInt procList); sqInt printStackCallStackOf(sqInt frameOrContext); void print(char *s); +void setBreakMNUSelector(char *aString); void setBreakSelector(char *aString); void setNextWakeupUsecs(usqLong value); void shortPrintFrameAndNCallers(char *theFP, sqInt n); Modified: branches/Cog/nscogsrc/vm/gcc3x-cointerp.c =================================================================== --- branches/Cog/nscogsrc/vm/gcc3x-cointerp.c 2014-12-03 22:25:05 UTC (rev 3158) +++ branches/Cog/nscogsrc/vm/gcc3x-cointerp.c 2014-12-05 20:27:02 UTC (rev 3159) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.962 uuid: 7f55aa33-f2c1-4b7d-8456-5c2a33e4298b + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.966 uuid: 46dd10c6-dc03-444c-bfa2-0f0b279c9b06 from - CoInterpreter VMMaker.oscog-eem.962 uuid: 7f55aa33-f2c1-4b7d-8456-5c2a33e4298b + CoInterpreter VMMaker.oscog-eem.966 uuid: 46dd10c6-dc03-444c-bfa2-0f0b279c9b06 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.962 uuid: 7f55aa33-f2c1-4b7d-8456-5c2a33e4298b " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.966 uuid: 46dd10c6-dc03-444c-bfa2-0f0b279c9b06 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -802,7 +802,6 @@ sqInt nullHeaderForMachineCodeMethod(void); usqInt scavengeThresholdAddress(void); sqInt smallIntegerTag(void); -sqInt withoutForwardingOnandsendToCogit(sqInt obj1, sqInt obj2, sqInt (*selector)(sqInt,sqInt)); sqInt withoutForwardingOnandwithsendToCogit(sqInt obj1, sqInt obj2, sqInt aBool, sqInt (*selector)(sqInt,sqInt,sqInt)); usqInt youngStartAddress(void); static sqInt addressCouldBeObjWhileForwarding(sqInt address) NoDbgRegParms; @@ -862,7 +861,7 @@ void printWronglySizedContexts(sqInt printContexts); static void restoreHeadersFromtofromandtofrom(sqInt firstIn, sqInt lastIn, sqInt hdrBaseIn, sqInt firstOut, sqInt lastOut, sqInt hdrBaseOut) NoDbgRegParms; static void runLeakCheckerForFullGC(sqInt fullGCFlag) NoDbgRegParms; -static usqInt safeObjectAfter(sqInt oop) NoDbgRegParms; +static sqInt safeObjectAfter(sqInt oop) NoDbgRegParms; static sqInt safePrintStringOf(sqInt oop) NoDbgRegParms; static sqInt shortentoIndexableSize(sqInt obj, sqInt nSlots) NoDbgRegParms; static sqInt sizeBitsOfSafe(sqInt oop) NoDbgRegParms; @@ -1235,6 +1234,7 @@ EXPORT(sqInt) returnAsThroughCallbackContext(sqInt returnTypeOop, VMCallbackContext *vmCallbackContext, sqInt callbackMethodContext); static sqInt reverseDisplayFromto(sqInt startIndex, sqInt endIndex) NoDbgRegParms; static sqInt safeMethodClassOf(sqInt methodPointer) NoDbgRegParms; +void setBreakMNUSelector(char *aString); void setBreakSelector(char *aString); void setFullScreenFlag(sqInt value); EXPORT(void (*setInterruptCheckChain(void (*aFunction)(void)))()) ; @@ -1507,9 +1507,9 @@ sqInt checkForLeaks; sqInt desiredEdenBytes; sqInt desiredNumStackPages; +sqInt breakSelectorLength = -1; sqInt extraVMMemory; sqInt desiredCogCodeSize; -sqInt breakSelectorLength = -1; usqInt heapBase; void * showSurfaceFn; char * breakSelector; @@ -2099,7 +2099,7 @@ /* 574 */ (void (*)(void))0, /* 575 */ (void (*)(void))0, 0 }; -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.962"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.966"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -19187,13 +19187,13 @@ sqInt swapBytes; sqInt sz; int w; - long w1; - long w10; - long w11; - long w12; - long w2; - long w3; - long w4; + sqInt w1; + sqInt w10; + sqInt w11; + sqInt w12; + sqInt w2; + sqInt w3; + sqInt w4; int w5; short w6; int w7; @@ -19221,20 +19221,20 @@ : w); /* begin getLongFromFile:swap: */ w1 = 0; - sqImageFileRead((&w1), sizeof(long), 1, f); - dataSize = (swapBytes - ? byteSwapped(w1) - : w1); + sqImageFileRead((&w1), sizeof(w1), 1, f); + dataSize = ((sqInt) ((swapBytes + ? byteSwapped(w1) + : w1))); /* begin getLongFromFile:swap: */ w2 = 0; - sqImageFileRead((&w2), sizeof(long), 1, f); + sqImageFileRead((&w2), sizeof(w2), 1, f); oldBaseAddr = (swapBytes ? byteSwapped(w2) : w2); /* begin specialObjectsOop: */ /* begin getLongFromFile:swap: */ w11 = 0; - sqImageFileRead((&w11), sizeof(long), 1, f); + sqImageFileRead((&w11), sizeof(w11), 1, f); anObject = (swapBytes ? byteSwapped(w11) : w11); @@ -19242,20 +19242,20 @@ /* begin lastHash: */ /* begin getLongFromFile:swap: */ w12 = 0; - sqImageFileRead((&w12), sizeof(long), 1, f); + sqImageFileRead((&w12), sizeof(w12), 1, f); aValue = (swapBytes ? byteSwapped(w12) : w12); lastHash = aValue; /* begin getLongFromFile:swap: */ w3 = 0; - sqImageFileRead((&w3), sizeof(long), 1, f); + sqImageFileRead((&w3), sizeof(w3), 1, f); GIV(savedWindowSize) = (swapBytes ? byteSwapped(w3) : w3); /* begin getLongFromFile:swap: */ w4 = 0; - sqImageFileRead((&w4), sizeof(long), 1, f); + sqImageFileRead((&w4), sizeof(w4), 1, f); headerFlags = (swapBytes ? byteSwapped(w4) : w4); @@ -19332,7 +19332,7 @@ : w9); /* begin getLongFromFile:swap: */ w10 = 0; - sqImageFileRead((&w10), sizeof(long), 1, f); + sqImageFileRead((&w10), sizeof(w10), 1, f); firstSegSize = (swapBytes ? byteSwapped(w10) : w10); @@ -34710,61 +34710,6 @@ } -/* For the purposes of become: send selector to the cogit with obj1 and obj2 - and answer the result. Undo forwarding for the selector, but redo - forwarding after since - become:'s restoreHeadersAfter*Become* methods expect to be able to - restore. - */ - -sqInt -withoutForwardingOnandsendToCogit(sqInt obj1, sqInt obj2, sqInt (*selector)(sqInt,sqInt)) -{ - sqInt aWord; - sqInt aWord1; - sqInt fwdBlock; - sqInt fwdBlock1; - sqInt header; - sqInt header1; - sqInt result; - sqInt savedHeaderA; - sqInt savedHeaderB; - - savedHeaderA = longAt(obj1); - /* begin baseHeader:put: */ - /* begin headerWhileForwardingOf: */ - header = longAt(obj1); - if ((header & MarkBit) != 0) { - - /* oop is forwarded; get its real header from its forwarding table entry */ - - fwdBlock = (header & AllButMarkBitAndTypeMask) << 1; - assert(fwdBlockValid(fwdBlock)); - header = longAt(fwdBlock + BytesPerWord); - } - aWord = header; - longAtput(obj1, aWord); - savedHeaderB = longAt(obj2); - /* begin baseHeader:put: */ - /* begin headerWhileForwardingOf: */ - header1 = longAt(obj2); - if ((header1 & MarkBit) != 0) { - - /* oop is forwarded; get its real header from its forwarding table entry */ - - fwdBlock1 = (header1 & AllButMarkBitAndTypeMask) << 1; - assert(fwdBlockValid(fwdBlock1)); - header1 = longAt(fwdBlock1 + BytesPerWord); - } - aWord1 = header1; - longAtput(obj2, aWord1); - result = selector(obj1, obj2); - longAtput(obj1, savedHeaderA); - longAtput(obj2, savedHeaderB); - return result; -} - - /* For the purposes of become: send selector to the cogit with obj1, obj2 and aBool, and answer the result. Undo forwarding for the selector, but redo forwarding @@ -37055,15 +37000,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; @@ -37074,7 +37021,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; @@ -37089,7 +37050,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)) { @@ -37143,18 +37104,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 = ((((usqInt)(newFreeChunk + sz2))) >= GIV(freeStart) - ? GIV(freeStart) - : (newFreeChunk + sz2) + (headerTypeBytes[(longAt(newFreeChunk + sz2)) & TypeMask])); + next = ((((usqInt)(newFreeChunk + sz3))) >= GIV(freeStart) + ? ((sqInt)GIV(freeStart)) + : (newFreeChunk + sz3) + (headerTypeBytes[(longAt(newFreeChunk + sz3)) & TypeMask])); assert((next == GIV(freeStart)) || (next == (oopFromChunk(GIV(compEnd))))); if (next == GIV(freeStart)) { @@ -39031,7 +38992,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; @@ -39048,7 +39009,7 @@ : header & SizeMask); } return ((((usqInt)(oop + sz))) >= GIV(freeStart) - ? GIV(freeStart) + ? ((sqInt)GIV(freeStart)) : (oop + sz) + (headerTypeBytes[(longAt(oop + sz)) & TypeMask])); } @@ -44597,6 +44558,8 @@ assert((isImmediate(GIV(messageSelector))) || (addressCouldBeObj(GIV(messageSelector)))); + /* begin mnuBreakpoint:receiver: */ + mnuBreakpointreceiver(firstFixedFieldOfMaybeImmediate(GIV(messageSelector)), lengthOfMaybeImmediate(GIV(messageSelector)), null); argumentArray = eeInstantiateSmallClassnumSlots(longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassArray << (shiftForWord()))), GIV(argumentCount)); message = eeInstantiateSmallClassnumSlots(longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassMessage << (shiftForWord()))), MessageLookupClassIndex + 1); @@ -51273,18 +51236,30 @@ } void +setBreakMNUSelector(char *aString) +{ + if (((breakSelector = aString)) == null) { + + /* nil's effective length is zero */ + + breakSelectorLength = MinSmallInteger; + } + else { + breakSelectorLength = -(strlen(aString)); + } +} + +void setBreakSelector(char *aString) { - if (aString == null) { + if (((breakSelector = aString)) == null) { /* nil's effective length is zero */ - breakSelectorLength = -1; - breakSelector = null; + breakSelectorLength = MinSmallInteger; } else { breakSelectorLength = strlen(aString); - breakSelector = aString; } } Modified: branches/Cog/nsspursrc/vm/cogit.c =================================================================== --- branches/Cog/nsspursrc/vm/cogit.c 2014-12-03 22:25:05 UTC (rev 3158) +++ branches/Cog/nsspursrc/vm/cogit.c 2014-12-05 20:27:02 UTC (rev 3159) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.957 uuid: ac5f8308-02e5-4277-b28c-595b7a4cf34a + CCodeGenerator VMMaker.oscog-eem.966 uuid: 46dd10c6-dc03-444c-bfa2-0f0b279c9b06 from - StackToRegisterMappingCogit VMMaker.oscog-eem.957 uuid: ac5f8308-02e5-4277-b28c-595b7a4cf34a + StackToRegisterMappingCogit VMMaker.oscog-eem.966 uuid: 46dd10c6-dc03-444c-bfa2-0f0b279c9b06 */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.957 uuid: ac5f8308-02e5-4277-b28c-595b7a4cf34a " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.966 uuid: 46dd10c6-dc03-444c-bfa2-0f0b279c9b06 " __DATE__ ; char *__cogitBuildInfo = __buildInfo; Modified: branches/Cog/nsspursrc/vm/cogit.h =================================================================== --- branches/Cog/nsspursrc/vm/cogit.h 2014-12-03 22:25:05 UTC (rev 3158) +++ branches/Cog/nsspursrc/vm/cogit.h 2014-12-05 20:27:02 UTC (rev 3159) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.957 uuid: ac5f8308-02e5-4277-b28c-595b7a4cf34a + CCodeGenerator VMMaker.oscog-eem.966 uuid: 46dd10c6-dc03-444c-bfa2-0f0b279c9b06 */ Modified: branches/Cog/nsspursrc/vm/cointerp.c =================================================================== --- branches/Cog/nsspursrc/vm/cointerp.c 2014-12-03 22:25:05 UTC (rev 3158) +++ branches/Cog/nsspursrc/vm/cointerp.c 2014-12-05 20:27:02 UTC (rev 3159) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.962 uuid: 7f55aa33-f2c1-4b7d-8456-5c2a33e4298b + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.966 uuid: 46dd10c6-dc03-444c-bfa2-0f0b279c9b06 from - CoInterpreter VMMaker.oscog-eem.962 uuid: 7f55aa33-f2c1-4b7d-8456-5c2a33e4298b + CoInterpreter VMMaker.oscog-eem.966 uuid: 46dd10c6-dc03-444c-bfa2-0f0b279c9b06 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.962 uuid: 7f55aa33-f2c1-4b7d-8456-5c2a33e4298b " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.966 uuid: 46dd10c6-dc03-444c-bfa2-0f0b279c9b06 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -810,7 +810,6 @@ sqLong nullHeaderForMachineCodeMethod(void); usqInt scavengeThresholdAddress(void); sqInt smallIntegerTag(void); -sqInt withoutForwardingOnandsendToCogit(sqInt obj1, sqInt obj2, sqInt (*selector)(sqInt,sqInt)); sqInt withoutForwardingOnandwithsendToCogit(sqInt obj1, sqInt obj2, sqInt aBool, sqInt (*selector)(sqInt,sqInt,sqInt)); static sqInt addressAfter(sqInt objOop) NoDbgRegParms; static sqInt allocateSlotsForPinningInOldSpacebytesformatclassIndex(sqInt numSlots, usqInt totalBytes, sqInt formatField, sqInt classIndex) NoDbgRegParms; @@ -1419,6 +1418,7 @@ EXPORT(sqInt) returnAsThroughCallbackContext(sqInt returnTypeOop, VMCallbackContext *vmCallbackContext, sqInt callbackMethodContext); static sqInt reverseDisplayFromto(sqInt startIndex, sqInt endIndex) NoDbgRegParms; static sqInt safeMethodClassOf(sqInt methodPointer) NoDbgRegParms; +void setBreakMNUSelector(char *aString); void setBreakSelector(char *aString); void setFullScreenFlag(sqInt value); EXPORT(void (*setInterruptCheckChain(void (*aFunction)(void)))()) ; @@ -1725,9 +1725,9 @@ sqInt inIOProcessEvents; sqInt desiredEdenBytes; sqInt desiredNumStackPages; +sqInt breakSelectorLength = -1; sqInt extraVMMemory; sqInt desiredCogCodeSize; -sqInt breakSelectorLength = -1; usqInt heapBase; void * showSurfaceFn; char * breakSelector; @@ -2345,7 +2345,7 @@ /*540*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, /*560*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, 0, 0, 0,-1,-1 }; -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.962"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.966"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -8842,7 +8842,7 @@ /* bytecodePrimBitShift */ { sqInt integerArgument; - usqInt integerReceiver; + sqLong integerReceiver; sqInt shifted; char *sp; @@ -8902,7 +8902,7 @@ null; goto l76; } - shifted = ((usqInt) integerReceiver) >> (0 - integerArgument); + shifted = ((unsigned sqLong)integerReceiver) >> (0 - integerArgument); } shifted = positive32BitIntegerFor(shifted); /* begin pop:thenPush: */ @@ -11590,7 +11590,7 @@ /* bytecodePrimBitShift */ { sqInt integerArgument; - usqInt integerReceiver; + sqLong integerReceiver; sqInt shifted; char *sp; @@ -11650,7 +11650,7 @@ null; goto l183; } - shifted = ((usqInt) integerReceiver) >> (0 - integerArgument); + shifted = ((unsigned sqLong)integerReceiver) >> (0 - integerArgument); } shifted = positive32BitIntegerFor(shifted); /* begin pop:thenPush: */ @@ -23510,15 +23510,15 @@ sqInt survivorBytes; sqInt swapBytes; int w; - long w1; + sqInt w1; short w10; short w11; - long w12; - long w2; - long w3; - long w4; - long w5; - long w6; + sqInt w12; + sqInt w2; + sqInt w3; + sqInt w4; + sqInt w5; + sqInt w6; int w7; short w8; int w9; @@ -23544,20 +23544,20 @@ : w); /* begin getLongFromFile:swap: */ w1 = 0; - sqImageFileRead((&w1), sizeof(long), 1, f); - dataSize = (swapBytes - ? ((((((usqInt) w1 >> 24)) & Byte0Mask) + ((((usqInt) w1 >> 8)) & Byte1Mask)) + ((((usqInt) w1 << 8)) & Byte2Mask)) + ((((usqInt) w1 << 24)) & Byte3Mask) - : w1); + sqImageFileRead((&w1), sizeof(w1), 1, f); + dataSize = ((sqInt) ((swapBytes + ? ((((((usqInt) w1 >> 24)) & Byte0Mask) + ((((usqInt) w1 >> 8)) & Byte1Mask)) + ((((usqInt) w1 << 8)) & Byte2Mask)) + ((((usqInt) w1 << 24)) & Byte3Mask) + : w1))); /* begin getLongFromFile:swap: */ w2 = 0; - sqImageFileRead((&w2), sizeof(long), 1, f); + sqImageFileRead((&w2), sizeof(w2), 1, f); oldBaseAddr = (swapBytes ? ((((((usqInt) w2 >> 24)) & Byte0Mask) + ((((usqInt) w2 >> 8)) & Byte1Mask)) + ((((usqInt) w2 << 8)) & Byte2Mask)) + ((((usqInt) w2 << 24)) & Byte3Mask) : w2); /* begin specialObjectsOop: */ /* begin getLongFromFile:swap: */ w3 = 0; - sqImageFileRead((&w3), sizeof(long), 1, f); + sqImageFileRead((&w3), sizeof(w3), 1, f); anObject = (swapBytes ? ((((((usqInt) w3 >> 24)) & Byte0Mask) + ((((usqInt) w3 >> 8)) & Byte1Mask)) + ((((usqInt) w3 << 8)) & Byte2Mask)) + ((((usqInt) w3 << 24)) & Byte3Mask) : w3); @@ -23565,20 +23565,20 @@ /* begin lastHash: */ /* begin getLongFromFile:swap: */ w4 = 0; - sqImageFileRead((&w4), sizeof(long), 1, f); + sqImageFileRead((&w4), sizeof(w4), 1, f); seed = (swapBytes ? ((((((usqInt) w4 >> 24)) & Byte0Mask) + ((((usqInt) w4 >> 8)) & Byte1Mask)) + ((((usqInt) w4 << 8)) & Byte2Mask)) + ((((usqInt) w4 << 24)) & Byte3Mask) : w4); GIV(lastHash) = seed; /* begin getLongFromFile:swap: */ w5 = 0; - sqImageFileRead((&w5), sizeof(long), 1, f); + sqImageFileRead((&w5), sizeof(w5), 1, f); GIV(savedWindowSize) = (swapBytes ? ((((((usqInt) w5 >> 24)) & Byte0Mask) + ((((usqInt) w5 >> 8)) & Byte1Mask)) + ((((usqInt) w5 << 8)) & Byte2Mask)) + ((((usqInt) w5 << 24)) & Byte3Mask) : w5); /* begin getLongFromFile:swap: */ w6 = 0; - sqImageFileRead((&w6), sizeof(long), 1, f); + sqImageFileRead((&w6), sizeof(w6), 1, f); headerFlags = (swapBytes ? ((((((usqInt) w6 >> 24)) & Byte0Mask) + ((((usqInt) w6 >> 8)) & Byte1Mask)) + ((((usqInt) w6 << 8)) & Byte2Mask)) + ((((usqInt) w6 << 24)) & Byte3Mask) : w6); @@ -23655,7 +23655,7 @@ : w11); /* begin getLongFromFile:swap: */ w12 = 0; - sqImageFileRead((&w12), sizeof(long), 1, f); + sqImageFileRead((&w12), sizeof(w12), 1, f); firstSegSize = (swapBytes ? ((((((usqInt) w12 >> 24)) & Byte0Mask) + ((((usqInt) w12 >> 8)) & Byte1Mask)) + ((((usqInt) w12 << 8)) & Byte2Mask)) + ((((usqInt) w12 << 24)) & Byte3Mask) : w12); @@ -29379,7 +29379,7 @@ primitiveBitShift(void) { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt integerArgument; - usqInt integerReceiver; + sqLong integerReceiver; sqInt shifted; char *sp; @@ -29426,7 +29426,7 @@ } return; } - shifted = ((usqInt) integerReceiver) >> (0 - integerArgument); + shifted = ((unsigned sqLong)integerReceiver) >> (0 - integerArgument); } shifted = positive32BitIntegerFor(shifted); /* begin pop:thenPush: */ @@ -40178,37 +40178,6 @@ } -/* For the purposes of become: send selector to the cogit with obj1 and obj2 - and answer the result. Undo forwarding for the selector. */ - -sqInt -withoutForwardingOnandsendToCogit(sqInt obj1, sqInt obj2, sqInt (*selector)(sqInt,sqInt)) -{ - sqInt referent; - sqInt referent1; - sqInt targetA; - sqInt targetB; - - /* begin followForwarded: */ - assert(isUnambiguouslyForwarder(obj1)); - referent = longAt((obj1 + BaseHeaderSize) + (0 << (shiftForWord()))); - while (((referent & 3) == 0) - && (((longAt(referent)) & 0x3FFFFF) == 8)) { - referent = longAt((referent + BaseHeaderSize) + (0 << (shiftForWord()))); - } - targetA = referent; - /* begin followForwarded: */ - assert(isUnambiguouslyForwarder(obj2)); - referent1 = longAt((obj2 + BaseHeaderSize) + (0 << (shiftForWord()))); - while (((referent1 & 3) == 0) - && (((longAt(referent1)) & 0x3FFFFF) == 8)) { - referent1 = longAt((referent1 + BaseHeaderSize) + (0 << (shiftForWord()))); - } - targetB = referent1; - return selector(targetA, targetB); -} - - /* For the purposes of become: send selector to the cogit with obj1, obj2 and aBool and answer the result. Undo forwarding for the selector. */ @@ -63545,6 +63514,8 @@ assert((isImmediate(GIV(messageSelector))) || (addressCouldBeObj(GIV(messageSelector)))); + /* begin mnuBreakpoint:receiver: */ + mnuBreakpointreceiver(firstFixedFieldOfMaybeImmediate(GIV(messageSelector)), lengthOfMaybeImmediate(GIV(messageSelector)), null); /* begin eeInstantiateSmallClassIndex:format:numSlots: */ assert((GIV(argumentCount) >= 0) && (ClassArrayCompactIndex != 0)); @@ -65893,22 +65864,23 @@ /* Handle a special send fault that may be due to a special selector - send accessing a forwarded object. - Unforward the object on the stack and in inst vars and answer its target. */ + send accessing a forwarded object. obj is forwarded. + Unforward stack contents and and inst vars and answer obj's target. */ static sqInt handleSpecialSelectorSendFaultForfpsp(sqInt obj, char *theFP, char *theSP) { + sqInt rcvr; sqInt referent; assert(isOopForwarded(obj)); followForwardedFrameContentsstackPointer(theFP, theSP); - if (isPointers(((((usqInt)(longAt(theFP + FoxMethod)))) < (startOfMemory()) + rcvr = ((((usqInt)(longAt(theFP + FoxMethod)))) < (startOfMemory()) ? longAt(theFP + FoxMFReceiver) - : longAt(theFP + FoxIFReceiver)))) { - followForwardedObjectFieldstoDepth(((((usqInt)(longAt(theFP + FoxMethod)))) < (startOfMemory()) - ? longAt(theFP + FoxMFReceiver) - : longAt(theFP + FoxIFReceiver)), 0); + : longAt(theFP + FoxIFReceiver)); + if (((rcvr & 3) == 0) + && (((((usqInt) (longAt(rcvr))) >> 24) & 0x1F) <= 5)) { + followForwardedObjectFieldstoDepth(rcvr, 0); } /* begin followForwarded: */ assert(isUnambiguouslyForwarder(obj)); @@ -71705,18 +71677,30 @@ } void +setBreakMNUSelector(char *aString) +{ + if (((breakSelector = aString)) == null) { + + /* nil's effective length is zero */ + + breakSelectorLength = MinSmallInteger; + } + else { + breakSelectorLength = -(strlen(aString)); + } +} + +void setBreakSelector(char *aString) { - if (aString == null) { + if (((breakSelector = aString)) == null) { /* nil's effective length is zero */ - breakSelectorLength = -1; - breakSelector = null; + breakSelectorLength = MinSmallInteger; } else { breakSelectorLength = strlen(aString); - breakSelector = aString; } } Modified: branches/Cog/nsspursrc/vm/cointerp.h =================================================================== --- branches/Cog/nsspursrc/vm/cointerp.h 2014-12-03 22:25:05 UTC (rev 3158) +++ branches/Cog/nsspursrc/vm/cointerp.h 2014-12-05 20:27:02 UTC (rev 3159) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.962 uuid: 7f55aa33-f2c1-4b7d-8456-5c2a33e4298b + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.966 uuid: 46dd10c6-dc03-444c-bfa2-0f0b279c9b06 */ @@ -128,7 +128,6 @@ sqLong nullHeaderForMachineCodeMethod(void); usqInt scavengeThresholdAddress(void); sqInt smallIntegerTag(void); -sqInt withoutForwardingOnandsendToCogit(sqInt obj1, sqInt obj2, sqInt (*selector)(sqInt,sqInt)); sqInt withoutForwardingOnandwithsendToCogit(sqInt obj1, sqInt obj2, sqInt aBool, sqInt (*selector)(sqInt,sqInt,sqInt)); sqInt byteSwapped(sqInt w); sqInt isIntegerValue(sqInt intValue); @@ -302,6 +301,7 @@ sqInt printProcsOnList(sqInt procList); sqInt printStackCallStackOf(sqInt frameOrContext); void print(char *s); +void setBreakMNUSelector(char *aString); void setBreakSelector(char *aString); void setNextWakeupUsecs(usqLong value); void shortPrintFrameAndNCallers(char *theFP, sqInt n); Modified: branches/Cog/nsspursrc/vm/gcc3x-cointerp.c =================================================================== --- branches/Cog/nsspursrc/vm/gcc3x-cointerp.c 2014-12-03 22:25:05 UTC (rev 3158) +++ branches/Cog/nsspursrc/vm/gcc3x-cointerp.c 2014-12-05 20:27:02 UTC (rev 3159) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.962 uuid: 7f55aa33-f2c1-4b7d-8456-5c2a33e4298b + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.966 uuid: 46dd10c6-dc03-444c-bfa2-0f0b279c9b06 from - CoInterpreter VMMaker.oscog-eem.962 uuid: 7f55aa33-f2c1-4b7d-8456-5c2a33e4298b + CoInterpreter VMMaker.oscog-eem.966 uuid: 46dd10c6-dc03-444c-bfa2-0f0b279c9b06 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.962 uuid: 7f55aa33-f2c1-4b7d-8456-5c2a33e4298b " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.966 uuid: 46dd10c6-dc03-444c-bfa2-0f0b279c9b06 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -813,7 +813,6 @@ sqLong nullHeaderForMachineCodeMethod(void); usqInt scavengeThresholdAddress(void); sqInt smallIntegerTag(void); -sqInt withoutForwardingOnandsendToCogit(sqInt obj1, sqInt obj2, sqInt (*selector)(sqInt,sqInt)); sqInt withoutForwardingOnandwithsendToCogit(sqInt obj1, sqInt obj2, sqInt aBool, sqInt (*selector)(sqInt,sqInt,sqInt)); static sqInt addressAfter(sqInt objOop) NoDbgRegParms; static sqInt allocateSlotsForPinningInOldSpacebytesformatclassIndex(sqInt numSlots, usqInt totalBytes, sqInt formatField, sqInt classIndex) NoDbgRegParms; @@ -1422,6 +1421,7 @@ EXPORT(sqInt) returnAsThroughCallbackContext(sqInt returnTypeOop, VMCallbackContext *vmCallbackContext, sqInt callbackMethodContext); static sqInt reverseDisplayFromto(sqInt startIndex, sqInt endIndex) NoDbgRegParms; static sqInt safeMethodClassOf(sqInt methodPointer) NoDbgRegParms; +void setBreakMNUSelector(char *aString); void setBreakSelector(char *aString); void setFullScreenFlag(sqInt value); EXPORT(void (*setInterruptCheckChain(void (*aFunction)(void)))()) ; @@ -1728,9 +1728,9 @@ sqInt inIOProcessEvents; sqInt desiredEdenBytes; sqInt desiredNumStackPages; +sqInt breakSelectorLength = -1; sqInt extraVMMemory; sqInt desiredCogCodeSize; -sqInt breakSelectorLength = -1; usqInt heapBase; void * showSurfaceFn; char * breakSelector; @@ -2348,7 +2348,7 @@ /*540*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, /*560*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, 0, 0, 0,-1,-1 }; -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.962"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.966"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -8851,7 +8851,7 @@ /* bytecodePrimBitShift */ { sqInt integerArgument; - usqInt integerReceiver; + sqLong integerReceiver; sqInt shifted; char *sp; @@ -8911,7 +8911,7 @@ null; goto l76; } - shifted = ((usqInt) integerReceiver) >> (0 - integerArgument); + shifted = ((unsigned sqLong)integerReceiver) >> (0 - integerArgument); } shifted = positive32BitIntegerFor(shifted); /* begin pop:thenPush: */ @@ -11599,7 +11599,7 @@ /* bytecodePrimBitShift */ { sqInt integerArgument; - usqInt integerReceiver; + sqLong integerReceiver; sqInt shifted; char *sp; @@ -11659,7 +11659,7 @@ null; goto l183; } - shifted = ((usqInt) integerReceiver) >> (0 - integerArgument); + shifted = ((unsigned sqLong)integerReceiver) >> (0 - integerArgument); } shifted = positive32BitIntegerFor(shifted); /* begin pop:thenPush: */ @@ -23519,15 +23519,15 @@ sqInt survivorBytes; sqInt swapBytes; int w; - long w1; + sqInt w1; short w10; short w11; - long w12; - long w2; - long w3; - long w4; - long w5; - long w6; + sqInt w12; + sqInt w2; + sqInt w3; + sqInt w4; + sqInt w5; + sqInt w6; int w7; short w8; int w9; @@ -23553,20 +23553,20 @@ : w); /* begin getLongFromFile:swap: */ w1 = 0; - sqImageFileRead((&w1), sizeof(long), 1, f); - dataSize = (swapBytes - ? ((((((usqInt) w1 >> 24)) & Byte0Mask) + ((((usqInt) w1 >> 8)) & Byte1Mask)) + ((((usqInt) w1 << 8)) & Byte2Mask)) + ((((usqInt) w1 << 24)) & Byte3Mask) - : w1); + sqImageFileRead((&w1), sizeof(w1), 1, f); + dataSize = ((sqInt) ((swapBytes + ? ((((((usqInt) w1 >> 24)) & Byte0Mask) + ((((usqInt) w1 >> 8)) & Byte1Mask)) + ((((usqInt) w1 << 8)) & Byte2Mask)) + ((((usqInt) w1 << 24)) & Byte3Mask) + : w1))); /* begin getLongFromFile:swap: */ w2 = 0; - sqImageFileRead((&w2), sizeof(long), 1, f); + sqImageFileRead((&w2), sizeof(w2), 1, f); oldBaseAddr = (swapBytes ? ((((((usqInt) w2 >> 24)) & Byte0Mask) + ((((usqInt) w2 >> 8)) & Byte1Mask)) + ((((usqInt) w2 << 8)) & Byte2Mask)) + ((((usqInt) w2 << 24)) & Byte3Mask) : w2); /* begin specialObjectsOop: */ /* begin getLongFromFile:swap: */ w3 = 0; - sqImageFileRead((&w3), sizeof(long), 1, f); + sqImageFileRead((&w3), sizeof(w3), 1, f); anObject = (swapBytes ? ((((((usqInt) w3 >> 24)) & Byte0Mask) + ((((usqInt) w3 >> 8)) & Byte1Mask)) + ((((usqInt) w3 << 8)) & Byte2Mask)) + ((((usqInt) w3 << 24)) & Byte3Mask) : w3); @@ -23574,20 +23574,20 @@ /* begin lastHash: */ /* begin getLongFromFile:swap: */ w4 = 0; - sqImageFileRead((&w4), sizeof(long), 1, f); + sqImageFileRead((&w4), sizeof(w4), 1, f); seed = (swapBytes ? ((((((usqInt) w4 >> 24)) & Byte0Mask) + ((((usqInt) w4 >> 8)) & Byte1Mask)) + ((((usqInt) w4 << 8)) & Byte2Mask)) + ((((usqInt) w4 << 24)) & Byte3Mask) : w4); GIV(lastHash) = seed; /* begin getLongFromFile:swap: */ w5 = 0; - sqImageFileRead((&w5), sizeof(long), 1, f); + sqImageFileRead((&w5), sizeof(w5), 1, f); GIV(savedWindowSize) = (swapBytes ? ((((((usqInt) w5 >> 24)) & Byte0Mask) + ((((usqInt) w5 >> 8)) & Byte1Mask)) + ((((usqInt) w5 << 8)) & Byte2Mask)) + ((((usqInt) w5 << 24)) & Byte3Mask) : w5); /* begin getLongFromFile:swap: */ w6 = 0; - sqImageFileRead((&w6), sizeof(long), 1, f); + sqImageFileRead((&w6), sizeof(w6), 1, f); headerFlags = (swapBytes ? ((((((usqInt) w6 >> 24)) & Byte0Mask) + ((((usqInt) w6 >> 8)) & Byte1Mask)) + ((((usqInt) w6 << 8)) & Byte2Mask)) + ((((usqInt) w6 << 24)) & Byte3Mask) : w6); @@ -23664,7 +23664,7 @@ : w11); /* begin getLongFromFile:swap: */ w12 = 0; - sqImageFileRead((&w12), sizeof(long), 1, f); + sqImageFileRead((&w12), sizeof(w12), 1, f); firstSegSize = (swapBytes ? ((((((usqInt) w12 >> 24)) & Byte0Mask) + ((((usqInt) w12 >> 8)) & Byte1Mask)) + ((((usqInt) w12 << 8)) & Byte2Mask)) + ((((usqInt) w12 << 24)) & Byte3Mask) : w12); @@ -29388,7 +29388,7 @@ primitiveBitShift(void) { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt integerArgument; - usqInt integerReceiver; + sqLong integerReceiver; sqInt shifted; char *sp; @@ -29435,7 +29435,7 @@ } return; } - shifted = ((usqInt) integerReceiver) >> (0 - integerArgument); + shifted = ((unsigned sqLong)integerReceiver) >> (0 - integerArgument); } shifted = positive32BitIntegerFor(shifted); /* begin pop:thenPush: */ @@ -40187,37 +40187,6 @@ } -/* For the purposes of become: send selector to the cogit with obj1 and obj2 - and answer the result. Undo forwarding for the selector. */ - -sqInt -withoutForwardingOnandsendToCogit(sqInt obj1, sqInt obj2, sqInt (*selector)(sqInt,sqInt)) -{ - sqInt referent; - sqInt referent1; - sqInt targetA; - sqInt targetB; - - /* begin followForwarded: */ - assert(isUnambiguouslyForwarder(obj1)); - referent = longAt((obj1 + BaseHeaderSize) + (0 << (shiftForWord()))); - while (((referent & 3) == 0) - && (((longAt(referent)) & 0x3FFFFF) == 8)) { - referent = longAt((referent + BaseHeaderSize) + (0 << (shiftForWord()))); - } - targetA = referent; - /* begin followForwarded: */ - assert(isUnambiguouslyForwarder(obj2)); - referent1 = longAt((obj2 + BaseHeaderSize) + (0 << (shiftForWord()))); - while (((referent1 & 3) == 0) - && (((longAt(referent1)) & 0x3FFFFF) == 8)) { - referent1 = longAt((referent1 + BaseHeaderSize) + (0 << (shiftForWord()))); - } - targetB = referent1; - return selector(targetA, targetB); -} - - /* For the purposes of become: send selector to the cogit with obj1, obj2 and aBool and answer the result. Undo forwarding for the selector. */ @@ -63554,6 +63523,8 @@ assert((isImmediate(GIV(messageSelector))) || (addressCouldBeObj(GIV(messageSelector)))); + /* begin mnuBreakpoint:receiver: */ + mnuBreakpointreceiver(firstFixedFieldOfMaybeImmediate(GIV(messageSelector)), lengthOfMaybeImmediate(GIV(messageSelector)), null); /* begin eeInstantiateSmallClassIndex:format:numSlots: */ assert((GIV(argumentCount) >= 0) && (ClassArrayCompactIndex != 0)); @@ -65902,22 +65873,23 @@ /* Handle a special send fault that may be due to a special selector - send accessing a forwarded object. - Unforward the object on the stack and in inst vars and answer its target. */ + send accessing a forwarded object. obj is forwarded. + Unforward stack contents and and inst vars and answer obj's target. */ static sqInt handleSpecialSelectorSendFaultForfpsp(sqInt obj, char *theFP, char *theSP) { + sqInt rcvr; sqInt referent; assert(isOopForwarded(obj)); followForwardedFrameContentsstackPointer(theFP, theSP); - if (isPointers(((((usqInt)(longAt(theFP + FoxMethod)))) < (startOfMemory()) + rcvr = ((((usqInt)(longAt(theFP + FoxMethod)))) < (startOfMemory()) ? longAt(theFP + FoxMFReceiver) - : longAt(theFP + FoxIFReceiver)))) { - followForwardedObjectFieldstoDepth(((((usqInt)(longAt(theFP + FoxMethod)))) < (startOfMemory()) - ? longAt(theFP + FoxMFReceiver) - : longAt(theFP + FoxIFReceiver)), 0); + : longAt(theFP + FoxIFReceiver)); + if (((rcvr & 3) == 0) + && (((((usqInt) (longAt(rcvr))) >> 24) & 0x1F) <= 5)) { + followForwardedObjectFieldstoDepth(rcvr, 0); } /* begin followForwarded: */ assert(isUnambiguouslyForwarder(obj)); @@ -71714,18 +71686,30 @@ } void +setBreakMNUSelector(char *aString) +{ + if (((breakSelector = aString)) == null) { + + /* nil's effective length is zero */ + + breakSelectorLength = MinSmallInteger; + } + else { + breakSelectorLength = -(strlen(aString)); + } +} + +void setBreakSelector(char *aString) { - if (aString == null) { + if (((breakSelector = aString)) == null) { /* nil's effective length is zero */ - breakSelectorLength = -1; - breakSelector = null; + breakSelectorLength = MinSmallInteger; } else { breakSelectorLength = strlen(aString); - breakSelector = aString; } } Modified: branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c =================================================================== --- branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c 2014-12-03 22:25:05 UTC (rev 3158) +++ branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c 2014-12-05 20:27:02 UTC (rev 3159) @@ -2,11 +2,11 @@ /* Automatically generated by @@ Diff output truncated at 50000 characters. @@

1 0

VM Maker: VMMaker.oscog-eem.966.mcz
by commits＠source.squeak.org 05 Dec '14

05 Dec '14

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.966.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.966 Author: eem Time: 5 December 2014, 12:15:48.45 pm UUID: 46dd10c6-dc03-444c-bfa2-0f0b279c9b06 Ancestors: VMMaker.oscog-eem.965 Add support for a -breakmnu vm argument that calls warning (or in the simulator, halts) on an mnu of a specific selector. Update StackInterpreter's class comment. Eliminate a type clash with getLongFromFile:swap: =============== Diff against VMMaker.oscog-eem.965 =============== Item was removed: - ----- Method: CogVMSimulator>>sendBreak:point:receiver: (in category 'debugging traps') ----- - sendBreak: selectorString point: selectorLength receiver: receiverOrNil - "self shortPrintFrameAndCallers: localFP" - | i | - breakSelectorLength = selectorLength ifTrue: - [i := breakSelectorLength. - [i > 0] whileTrue: - [(objectMemory byteAt: selectorString + i - 1) = (breakSelector at: i) asInteger - ifTrue: [(i := i - 1) = 0 ifTrue: - [self changed: #byteCountText. - self halt: 'Send of ' - , breakSelector, - (receiverOrNil - ifNotNil: [' to ', (self shortPrint: receiverOrNil)] - ifNil: [''])]] - ifFalse: [i := 0]]]! Item was changed: InterpreterPrimitives subclass: #StackInterpreter instanceVariableNames: 'currentBytecode bytecodeSetSelector localFP localIP localSP stackLimit stackPage stackPages method instructionPointer stackPointer framePointer localReturnValue extA extB primitiveFunctionPointer methodCache atCache lkupClassTag lkupClass methodDictLinearSearchLimit highestRunnableProcessPriority nextWakeupUsecs nextPollUsecs inIOProcessEvents interruptKeycode interruptPending savedWindowSize imageHeaderFlags fullScreenFlag deferDisplayUpdates pendingFinalizationSignals extraVMMemory interpreterProxy showSurfaceFn primitiveTable primitiveAccessorDepthTable externalPrimitiveTable externalPrimitiveTableFirstFreeIndex overflowedPage extraFramesToMoveOnOverflow globalSessionID jmpBuf jmpDepth suspendedCallbacks suspendedMethods numStackPages desiredNumStackPages desiredEdenBytes classNameIndex thisClassIndex metaclassNumSlots interruptCheckChain suppressHeartbeatFlag breakSelector breakSelectorLength longRunningPrimitiveCheckMethod longRunningPrimitiveCheckSemaphore longRunningPrimitiveStartUsecs longRunningPrimitiveStopUsecs longRunningPrimitiveGCUsecs longRunningPrimitiveCheckSequenceNumber longRunningPrimitiveSignalUndelivered checkAllocFiller tempOop tempOop2 theUnknownShort the2ndUnknownShort imageFloatsBigEndian maxExtSemTabSizeSet lastMethodCacheProbeWrite gcSemaphoreIndex classByteArrayCompactIndex statForceInterruptCheck statStackOverflow statStackPageDivorce statCheckForEvents statProcessSwitch statIOProcessEvents statPendingFinalizationSignals' classVariableNames: 'AltBytecodeEncoderClassName AltLongStoreBytecode AlternateHeaderHasPrimFlag AtCacheEntries AtCacheFixedFields AtCacheFmt AtCacheMask AtCacheOop AtCacheSize AtCacheTotalSize AtPutBase BytecodeEncoderClassName BytecodeTable CacheProbeMax DirBadPath DirEntryFound DirNoMoreEntries DumpStackOnLowSpace EnclosingMixinIndex EnclosingObjectIndex FailImbalancedPrimitives HeaderFlagBitPosition LongStoreBytecode MaxExternalPrimitiveTableSize MaxJumpBuf MaxPrimitiveIndex MaxQuickPrimitiveIndex MethodHeaderArgCountShift MethodHeaderTempCountShift MixinIndex PrimitiveExternalCallIndex PrimitiveTable StackPageReachedButUntraced StackPageTraceInvalid StackPageTraced StackPageUnreached V3PrimitiveBitsMask' poolDictionaries: 'VMBasicConstants VMMethodCacheConstants VMObjectIndices VMSpurObjectRepresentationConstants VMSqueakClassIndices VMSqueakV3BytecodeConstants VMStackFrameOffsets' category: 'VMMaker-Interpreter'! + !StackInterpreter commentStamp: 'eem 12/5/2014 11:32' prior: 0! - !StackInterpreter commentStamp: 'eem 9/11/2013 18:30' prior: 0! This class is a complete implementation of the Smalltalk-80 virtual machine, derived originally from the Blue Book specification but quite different in some areas. This VM supports Closures but *not* old-style BlockContexts. It has been modernized with 32-bit pointers, better management of Contexts (see next item), and attention to variable use that allows the CCodeGenerator (qv) to keep, eg, the instruction pointer and stack pointer in registers as well as keeping most simple variables in a global array that seems to improve performance for most platforms. The VM does not use Contexts directly. Instead Contexts serve as proxies for a more conventional stack format that is invisible to the image. There is considerable explanation at http://www.mirandabanda.org/cogblog/2009/01/14/under-cover-contexts-and-the…. The VM maintains a fixed-size stack zone divided into pages, each page being capable of holding several method/block activations. A send establishes a new frame in the current stack page, a return returns to the previous frame. This eliminates allocation/deallocation of contexts and the moving of receiver and arguments from caller to callee on each send/return. Contexts are created lazily when an activation needs a context (creating a block, explicit use of thisContext, access to sender when sender is a frame, or linking of stack pages together). Contexts are either conventional and heap-resident ("single") or "married" and serve as proxies for their corresponding frame or "widowed", meaning that their spouse frame has been returned from (died). A married context is specially marked (more details in the code) and refers to its frame. Likewise a married frame is specially marked and refers to its context. In addition to SmallInteger arithmetic and Floats, the VM supports logic on 32-bit PositiveLargeIntegers, thus allowing it to simulate itself much more effectively than would otherwise be the case. + StackInterpreter and subclasses support multiple memory managers. Currently there are two. NewMemoryManager is a slightly refined version of ObjectMemory, and is the memory manager and garbage collector for the original Squeak object representation as described in "Back to the Future The Story of Squeak, A Practical Smalltalk Written in Itself", see http://ftp.squeak.org/docs/OOPSLA.Squeak.html. Spur is a faster, more regular object representation that is designed for more performance and functionality, and to have a common header format for both 32-bit and 64-bit versions. You can read about it in SpurMemoryManager's class comment. There is also a video of a presentation at ESUG 2014 (https://www.youtube.com/watch?v=k0nBNS1aHZ4), along with slides (http://www.slideshare.net/esug/spur-a-new-object-representation-for-cog?rel…).! - NOTE: Here follows a list of things to be borne in mind when working on this code, or when making changes for the future. - - 1. There are a number of things that should be done the next time we plan to release a completely incompatible image format. These include unifying the instanceSize field of the class format word -- see instantiateClass:indexableSize:, and unifying the bits of the method primitive index (if we decide we need more than 512, after all) -- see primitiveIndexOf:. Also, contexts should be given a special format code (see next item). - - 2. There are several fast checks for contexts (see isContextHeader: and isMethodContextHeader:) which will fail if the compact class indices of BlockContext or MethodContext change. This is necessary because the oops may change during a compaction when the oops are being adjusted. It's important to be aware of this when writing a new image using the SystemTracer. A better solution would be to reserve one of the format codes for Contexts only. An even better solution is to eliminate compact classes altogether (see 6.). - - 3. We have made normal files tolerant to size and positions up to 32 bits. This has not been done for async files, since they are still experimental. The code in size, at: and at:put: should work with sizes and indices up to 31 bits, although I have not tested it (di 12/98); it might or might not work with 32-bit sizes. [Late news, the support has been extended to 64-bit file sizes]. - - 4. Note that 0 is used in a couple of places as an impossible oop. This should be changed to a constant that really is impossible (or perhaps there is code somewhere that guarantees it --if so it should be put in this comment). The places include the method cache and the at cache. - - 5. Moving to a 2 bit immediate tag and having immediate Characters is a good choice for Unicode and the JIT. We can still have 31-bit SmallIntegers by allowing two tag patterns for SmallInteger. - - 6. If Eliot Miranda's 2 word header scheme is acceptable in terms of footprint (we estimate about a 10% increase in image size with about 35 reclaimed by better representation of CompiledMethod - loss of MethodProperties) then the in-line cache for the JIT is simplified, class access is faster and header access is the same in 32-bit and full 64-bit images. [Late breaking news, the 2-word header scheme is more compact, by over 2%]. See SpurMemorymanager's class comment.! Item was changed: ----- Method: StackInterpreter>>createActualMessageTo: (in category 'message sending') ----- createActualMessageTo: lookupClass "Bundle up the selector, arguments and lookupClass into a Message object. In the process it pops the arguments off the stack, and pushes the message object. This can then be presented as the argument of e.g. #doesNotUnderstand:" | argumentArray message | <inline: false> "This is a useful break-point" self assert: ((objectMemory isImmediate: messageSelector) or: [objectMemory addressCouldBeObj: messageSelector]). + self mnuBreakpoint: messageSelector receiver: nil. objectMemory hasSpurMemoryManagerAPI ifTrue: [argumentArray := objectMemory eeInstantiateSmallClassIndex: ClassArrayCompactIndex format: objectMemory arrayFormat numSlots: argumentCount. message := objectMemory eeInstantiateSmallClassIndex: ClassMessageCompactIndex format: objectMemory nonIndexablePointerFormat numSlots: MessageLookupClassIndex + 1] ifFalse: [argumentArray := objectMemory eeInstantiateSmallClass: (objectMemory splObj: ClassArray) numSlots: argumentCount. message := objectMemory eeInstantiateSmallClass: (objectMemory splObj: ClassMessage) numSlots: MessageLookupClassIndex + 1]. "Since the array is new can use unchecked stores." (argumentCount - 1) * objectMemory bytesPerOop to: 0 by: objectMemory bytesPerOop negated do: [:i| self longAt: argumentArray + objectMemory baseHeaderSize + i put: self popStack]. "Since message is new can use unchecked stores." objectMemory storePointerUnchecked: MessageSelectorIndex ofObject: message withValue: messageSelector; storePointerUnchecked: MessageArgumentsIndex ofObject: message withValue: argumentArray; storePointerUnchecked: MessageLookupClassIndex ofObject: message withValue: lookupClass. self push: message. argumentCount := 1! Item was changed: ----- Method: StackInterpreter>>getLongFromFile:swap: (in category 'image save/restore') ----- getLongFromFile: aFile swap: swapFlag "Answer the next 32 or 64 bit word read from aFile, byte-swapped according to the swapFlag." - <var: #aFile type: #sqImageFile> | w | - <var: #w type: #long> w := 0. self cCode: [self sq: (self addressOf: w) + Image: (self sizeof: w) - Image: (self sizeof: #long) File: 1 Read: aFile] inSmalltalk: [w := objectMemory nextLongFrom: aFile]. ^swapFlag ifTrue: [objectMemory byteSwapped: w] ifFalse: [w]! Item was added: + ----- Method: StackInterpreter>>mnuBreak:point:receiver: (in category 'debugging traps') ----- + mnuBreak: selectorString point: selectorLength receiver: receiverOrNil + <doNotGenerate> "C version is in platforms/Cross/vm/dispdbg.h" + "self shortPrintFrameAndCallers: localFP" + | i | + breakSelectorLength negated = selectorLength ifTrue: + [i := breakSelectorLength negated. + [i > 0] whileTrue: + [(objectMemory byteAt: selectorString + i - 1) = (breakSelector at: i) asInteger + ifTrue: [(i := i - 1) = 0 ifTrue: + [self changed: #byteCountText. + self halt: 'MNU of ' + , breakSelector, + (receiverOrNil + ifNotNil: [' to ', (self shortPrint: receiverOrNil)] + ifNil: [''])]] + ifFalse: [i := 0]]]! Item was added: + ----- Method: StackInterpreter>>mnuBreakpoint:receiver: (in category 'debug support') ----- + mnuBreakpoint: selector receiver: rcvr + <inline: true> + self mnuBreak: (objectMemory firstFixedFieldOfMaybeImmediate: selector) + point: (objectMemory lengthOfMaybeImmediate: selector) + receiver: rcvr! Item was added: + ----- Method: StackInterpreter>>sendBreak:point:receiver: (in category 'debugging traps') ----- + sendBreak: selectorString point: selectorLength receiver: receiverOrNil + <doNotGenerate> "C version is in platforms/Cross/vm/dispdbg.h" + "self shortPrintFrameAndCallers: localFP" + | i | + breakSelectorLength = selectorLength ifTrue: + [i := breakSelectorLength. + [i > 0] whileTrue: + [(objectMemory byteAt: selectorString + i - 1) = (breakSelector at: i) asInteger + ifTrue: [(i := i - 1) = 0 ifTrue: + [self changed: #byteCountText. + self halt: 'Send of ' + , breakSelector, + (receiverOrNil + ifNotNil: [' to ', (self shortPrint: receiverOrNil)] + ifNil: [''])]] + ifFalse: [i := 0]]]! Item was added: + ----- Method: StackInterpreter>>setBreakMNUSelector: (in category 'debug support') ----- + setBreakMNUSelector: aString + <api> + <var: #aString type: #'char *'> + (breakSelector := aString) + ifNil: [breakSelectorLength := objectMemory minSmallInteger "nil's effective length is zero"] + ifNotNil: [breakSelectorLength := (self strlen: aString) negated]! Item was changed: ----- Method: StackInterpreter>>setBreakSelector: (in category 'debug support') ----- setBreakSelector: aString <api> <var: #aString type: #'char *'> + (breakSelector := aString) + ifNil: [breakSelectorLength := objectMemory minSmallInteger "nil's effective length is zero"] + ifNotNil: [breakSelectorLength := self strlen: aString]! - aString isNil - ifTrue: [breakSelectorLength := -1. "nil's effective length is zero" breakSelector := nil] - ifFalse: [breakSelectorLength := self strlen: aString. breakSelector := aString]! Item was removed: - ----- Method: StackInterpreterSimulator>>sendBreak:point:receiver: (in category 'debugging traps') ----- - sendBreak: selectorString point: selectorLength receiver: receiverOrNil - "self shortPrintFrameAndCallers: localFP" - | i | - breakSelectorLength = selectorLength ifTrue: - [i := breakSelectorLength. - [i > 0] whileTrue: - [(objectMemory byteAt: selectorString + i - 1) = (breakSelector at: i) asInteger - ifTrue: [(i := i - 1) = 0 ifTrue: - [self halt: 'Send of ' - , breakSelector, - (receiverOrNil - ifNotNil: [' to ', (self shortPrint: receiverOrNil)] - ifNil: [''])]] - ifFalse: [i := 0]]]!

1 0

[commit][3152] Make sure to compile the SmallFloat64 primitives.
by commits＠squeakvm.org 05 Dec '14

05 Dec '14

Revision: 3152 Author: eliot Date: 2014-11-26 11:57:25 -0800 (Wed, 26 Nov 2014) Log Message: ----------- Make sure to compile the SmallFloat64 primitives. Modified Paths: -------------- branches/Cog/image/MorphFloat.st Modified: branches/Cog/image/MorphFloat.st =================================================================== --- branches/Cog/image/MorphFloat.st 2014-11-26 01:09:16 UTC (rev 3151) +++ branches/Cog/image/MorphFloat.st 2014-11-26 19:57:25 UTC (rev 3152) @@ -102,7 +102,27 @@ [:s :m| m methodClassAssociation: binding]. bfc organization removeEmptyCategories; sortCategories]. + "shrink method dictionaries after removals; rehash does not shrink :-(" + {boxedFloat. boxedFloat class} do: + [:bfc| | nmd | + nmd := MethodDictionary new. + bfc selectorsAndMethodsDo: + [:s :m| nmd at: s put: m]. + bfc methodDict: nmd]. + "Compile the SmallFloat64 primitives. + These have primitive number 500 + the corresponding boxed primitive number" + boxedFloat selectors do: + [:s| | code | + code := (boxedFloat sourceCodeAt: s) asString. + code := code copyReplaceAll: '<primitive: ' with: '<primitive: 5'. + smallFloat + compile: code + classified: (boxedFloat organization categoryOfElement: s) + withStamp: 'eem 11/25/2014 7:54' + notifying: nil]. + smallFloat organization sortCategories. + boxedFloat comment: 'My instances hold 64-bit Floats in heap objects. This is the only representation on 32-bit systems. But on 64-bit systems SmallFloat64 holds a subset of the full 64-bit double-precision range in immediate objects.' stamp: 'eem 11/25/2014 7:54'. smallFloat comment: 'My instances represent 64-bit Floats whose exponent fits in 8 bits as immediate objects. This representation is only available on 64-bit systems, not 32-bit systems.'

5 9

Spur with Immediate Floating Point Support implies a break
by Eliot Miranda 05 Dec '14

05 Dec '14

Hi All, some of you have been brave enough to use Spur and may have got used to being able to update. Recently I've updated Spur with support for immediate floating-point in 64-bit Spur. Alas these changes are not amenable to a straight-forward Monticello update. Now that I've updated Kernel.spur with these changes you'll not be able to simply update your image. There /may/ be a chance of being able to update if you first file-in MorphFloat.st (find attached). It worked for me. So in a recent SPur image, file-in MorphFloat.st and then update. If things get stuck on a partial update of Kernel.spur-eem.867(blah).mcd, then load Kernel.spur-eem.867.mcz manually and then update again. If this doesn't work apologies. What you can definitely do is upload the latest Spur image from www.mirandabanda.org/files/Cog/SpurImages/2014-12-01 and rebuild. -- best, Eliot

7 17

VM Maker: VMMaker.oscog-eem.965.mcz
by commits＠source.squeak.org 05 Dec '14

05 Dec '14

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.965.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.965 Author: eem Time: 4 December 2014, 6:29:43.217 pm UUID: e8fc6a7f-6a04-4e57-a9f7-2ca56387d4d8 Ancestors: VMMaker.oscog-eem.964 Fix in-image PC mapping testing. Add Spur64BitCoMemoryManager. Nuke the now obsolete withoutForwardingOn:and:sendToCogit: =============== Diff against VMMaker.oscog-eem.964 =============== Item was changed: ----- Method: CurrentImageCoInterpreterFacade class>>forCogit: (in category 'instance creation') ----- forCogit: aCogit | class | class := self allSubclasses + detect: [:subclass| + aCogit class objectMemoryClass objectRepresentationClass + == subclass objectRepresentationClass] - detect: [:subclass| aCogit class objectMemoryClass = subclass objectRepresentationClass objectMemoryClass] ifNone: [self error: 'cannot find subclass for the Cogit''s objectRepresentation and/or objectMemory']. ^class new cogit: aCogit; yourself! Item was added: + ----- Method: CurrentImageCoInterpreterFacade>>bytesPerOop (in category 'accessing') ----- + bytesPerOop + ^objectMemory bytesPerOop! Item was changed: ----- Method: CurrentImageCoInterpreterFacade>>initialize (in category 'initialize-release') ----- initialize memory := (VMBIGENDIAN ifTrue: [Bitmap] ifFalse: [LittleEndianBitmap]) new: 1024*1024/4. objectMemory := self class objectMemoryClass simulatorClass new. + objectMemory memory: memory. objectMemory initializeFreeSpaceForFacadeFrom: self startOfMemory to: self variablesBase. - objectMemory memory: memory. coInterpreter := CoInterpreter new. coInterpreter instVarNamed: 'objectMemory' put: objectMemory; instVarNamed: 'primitiveTable' put: (CArrayAccessor on: CoInterpreter primitiveTable copy). variables := Dictionary new. #('stackLimit') do: [:l| self addressForLabel: l]. self initializeObjectMap! Item was removed: - ----- Method: NewCoObjectMemory>>withoutForwardingOn:and:sendToCogit: (in category 'cog jit support') ----- - withoutForwardingOn: obj1 and: obj2 sendToCogit: selector - "For the purposes of become: send selector to the cogit with obj1 and obj2 and - answer the result. Undo forwarding for the selector, but redo forwarding after since - become:'s restoreHeadersAfter*Become* methods expect to be able to restore." - <api> - <var: #selector declareC: 'sqInt (*selector)(sqInt,sqInt)'> - | savedHeaderA savedHeaderB result | - savedHeaderA := self baseHeader: obj1. - self baseHeader: obj1 put: (self headerWhileForwardingOf: obj1). - savedHeaderB := self baseHeader: obj2. - self baseHeader: obj2 put: (self headerWhileForwardingOf: obj2). - - result := cogit perform: selector with: obj1 with: obj2. - - self baseHeader: obj1 put: savedHeaderA. - self baseHeader: obj2 put: savedHeaderB. - ^result! Item was removed: - ----- Method: Spur32BitCoMemoryManager>>withoutForwardingOn:and:sendToCogit: (in category 'cog jit support') ----- - withoutForwardingOn: obj1 and: obj2 sendToCogit: selector - "For the purposes of become: send selector to the cogit with obj1 and obj2 - and answer the result. Undo forwarding for the selector." - <api> - <var: #selector declareC: 'sqInt (*selector)(sqInt,sqInt)'> - | targetA targetB | - targetA := self followForwarded: obj1. - targetB := self followForwarded: obj2. - ^cogit perform: selector with: targetA with: targetB! Item was added: + Spur64BitMemoryManager subclass: #Spur64BitCoMemoryManager + instanceVariableNames: 'cogit' + classVariableNames: '' + poolDictionaries: 'CogMethodConstants' + category: 'VMMaker-SpurMemoryManager'! + + !Spur64BitCoMemoryManager commentStamp: 'eem 11/25/2013 14:47' prior: 0! + Spur64BitCoMemoryManager is a refinement of Spur64BitMemoryManager that supports the CoInterpreter/Cogit just-in-time compiler. The significant difference from Spur64BitMemoryManager is the memory layout. Spur64BitCoMemoryManager adds the cogCodeZone beneath newSpace: + + low address: + cogCodeZone: + generated run-time + cog methods + free space + young referrers + newSpace: + past/future survivor space + future/past survivor space + eden + first oldSpace segment + ... + subsequent oldSpace segment + high address: + + It would be convenient if the code zone were placed between newSpace and oldSpace; then Cog methods could be onsidered neither old nor young, filtering them out of copyAndForward: and the store check with single bounds checks. But the CoInterpreter already assumes Cog methods are less than all objects (e.g. in its isMachineCodeFrame:). If the dynamic frequency of isMachineCodeFrame: is higher (likely because this is used in e.g. scanning for unwind protects in non-local return) then it should keep the single bounds check. So the coder zone remains beneath newSpace and Spur64BitCoMemoryManager ocerrides isReallyYoungObject: to filter-out Cog methods for copyAndForward:. + + Instance Variables + cogit: <SimpleStackBasedCogit or subclass> + + cogit + - the just-in-time compiler! Item was added: + ----- Method: Spur64BitCoMemoryManager class>>exportAPISelectors: (in category 'translation') ----- + exportAPISelectors: options + ^(Set withAll: (self exportAPISelectorsFor: self)) + addAll: (SpurGenerationScavenger exportAPISelectors: options); + yourself! Item was added: + ----- Method: Spur64BitCoMemoryManager class>>objectRepresentationClass (in category 'accessing class hierarchy') ----- + objectRepresentationClass + ^CogObjectRepresentationFor64BitSpur! Item was added: + ----- Method: Spur64BitCoMemoryManager class>>simulatorClass (in category 'simulation only') ----- + simulatorClass + ^Spur64BitMMLECoSimulator! Item was added: + ----- Method: Spur64BitCoMemoryManager>>assimilateNewSegment: (in category 'growing/shrinking memory') ----- + assimilateNewSegment: segInfo + "Update after adding a segment. + Here we make sure the new segment is not executable." + <var: #segInfo type: #'SpurSegmentInfo *'> + super assimilateNewSegment: segInfo. + coInterpreter sqMakeMemoryNotExecutableFrom: segInfo segStart To: segInfo segLimit! Item was added: + ----- Method: Spur64BitCoMemoryManager>>ceClassAtIndex: (in category 'trampolines') ----- + ceClassAtIndex: classIndex + <api> + | result | + result := self classAtIndex: classIndex. + self assert: (coInterpreter addressCouldBeClassObj: result). + ^result! Item was added: + ----- Method: Spur64BitCoMemoryManager>>ceSheduleScavenge (in category 'trampolines') ----- + ceSheduleScavenge + <api> + self assert: freeStart >= scavengeThreshold. + self scheduleScavenge! Item was added: + ----- Method: Spur64BitCoMemoryManager>>checkForLeaks (in category 'accessing') ----- + checkForLeaks + ^checkForLeaks! Item was added: + ----- Method: Spur64BitCoMemoryManager>>checkMemoryMap (in category 'debug support') ----- + checkMemoryMap + "Override to check that Cog methods are considered neither young nor old. + Being young would cause them to be scavenged. + Being old would cause them to be remembered if stored into (but wait, they don't get stored into)." + + self assert: (self isYoungObject: newSpaceStart). + self assert: (self isYoungObject: newSpaceLimit - self wordSize). + self assert: (self isOldObject: newSpaceStart) not. + self assert: (self isOldObject: newSpaceLimit - self wordSize) not. + self assert: (self isYoungObject: newSpaceLimit) not. + self assert: (self isYoungObject: oldSpaceStart) not. + self assert: (self isYoungObject: endOfMemory) not. + self assert: (self isOldObject: oldSpaceStart). + self assert: (self isOldObject: endOfMemory). + + "we would like the following to be true, but we either choose one boundary check for + cogMethods vs objects (isMachineCodeFrame: et al) or one boundary check for + copyAndForward:. We can't have both, and the former is likely the highest dynamic + frequency." + false ifTrue: + [self assert: (self isYoungObject: cogit minCogMethodAddress) not. + self assert: (self isYoungObject: cogit maxCogMethodAddress) not]. + self assert: (self isOldObject: cogit minCogMethodAddress) not. + self assert: (self isOldObject: cogit maxCogMethodAddress) not! Item was added: + ----- Method: Spur64BitCoMemoryManager>>clearLeakMapAndMapAccessibleObjects (in category 'debug support') ----- + clearLeakMapAndMapAccessibleObjects + "Perform an integrity/leak check using the heapMap. Set a bit at each object's header. + Override to set a bit at each Cog method" + super clearLeakMapAndMapAccessibleObjects. + cogit addCogMethodsToHeapMap! Item was added: + ----- Method: Spur64BitCoMemoryManager>>ensureNoForwardedLiteralsIn: (in category 'cog jit support') ----- + ensureNoForwardedLiteralsIn: aMethodObj + "Ensure there are no forwarded literals in the argument." + <api> + self followForwardedObjectFields: aMethodObj toDepth: 0! Item was added: + ----- Method: Spur64BitCoMemoryManager>>freeStart: (in category 'cog jit support') ----- + freeStart: aValue + self assert: (aValue >= scavenger eden start and: [aValue < (scavengeThreshold + 1024)]). + self assert: (scavengeThreshold max: aValue) + coInterpreter interpreterAllocationReserveBytes <= scavenger eden limit. + ^freeStart := aValue! Item was added: + ----- Method: Spur64BitCoMemoryManager>>freeStartAddress (in category 'trampoline support') ----- + freeStartAddress + <api> + <returnTypeC: #usqInt> + ^self cCode: [(self addressOf: freeStart) asUnsignedInteger] + inSmalltalk: [cogit simulatedReadWriteVariableAddress: #freeStart in: self]! Item was added: + ----- Method: Spur64BitCoMemoryManager>>getScavengeThreshold (in category 'cog jit support') ----- + getScavengeThreshold + <api> + <returnTypeC: #usqInt> + ^scavengeThreshold! Item was added: + ----- Method: Spur64BitCoMemoryManager>>headerWhileForwardingOf: (in category 'garbage collection') ----- + headerWhileForwardingOf: aCompiledMethodObjOop + "Answer the header of the argument even though + it may have its header word in a forwarding block + (which shouldn't happen with Spur)." + self assert: (self isForwarded: aCompiledMethodObjOop) not. + ^self baseHeader: aCompiledMethodObjOop! Item was added: + ----- Method: Spur64BitCoMemoryManager>>ifAProxy:updateCopy: (in category 'image segment in/out') ----- + ifAProxy: objOop updateCopy: copy + "If the obejct being copied to the segment is weird and has exotic state, + i.e. a married context or a jitted method, update the copy with the vanilla state." + + super ifAProxy: objOop updateCopy: copy. + (self isCompiledMethod: objOop) ifTrue: + [| methodHeader | + methodHeader := coInterpreter rawHeaderOf: objOop. + (coInterpreter isCogMethodReference: methodHeader) ifTrue: + [self storePointerUnchecked: HeaderIndex + ofObject: copy + withValue: (coInterpreter cCoerceSimple: methodHeader to: #'CogMethod *') methodHeader]]! Item was added: + ----- Method: Spur64BitCoMemoryManager>>initializeFreeSpaceForFacadeFrom:to: (in category 'simulation only') ----- + initializeFreeSpaceForFacadeFrom: base to: limit + "c.f. initializeFreeSpacePostLoad: freeListObj." + | freeListObj freeBytes | + newSpaceLimit := oldSpaceStart := freeStart := base. + endOfMemory := scavengeThreshold := limit. + segmentManager initSegmentForInImageCompilationFrom: base to: limit. + freeListObj := self allocateSlots: self numFreeLists + format: self wordIndexableFormat + classIndex: self wordSizeClassIndexPun. + freeLists := self firstIndexableField: freeListObj. + freeListsMask := 0. + 0 to: self numFreeLists - 1 do: + [:i| + (freeLists at: i) ~= 0 ifTrue: + [freeListsMask := freeListsMask bitOr: (1 << i). + freeLists at: i put: (segmentManager swizzleObj: (freeLists at: i))]]. + freeBytes := segmentManager lastSegment segLimit - self bridgeSize - freeStart. + freeLists at: 0 put: (self initFreeChunkWithBytes: freeBytes at: freeStart). + totalFreeOldSpace := freeBytes! Item was added: + ----- Method: Spur64BitCoMemoryManager>>isForwardedClassIndex: (in category 'class table') ----- + isForwardedClassIndex: maybeClassIndex + "A lenient tester of forwarded class indices for inline cache management in the Cogit." + <api> + | classTablePage entry | + maybeClassIndex asUnsignedInteger >= self classTableRootSlots ifTrue: + [^false]. + classTablePage := self fetchPointer: maybeClassIndex >> self classTableMajorIndexShift + ofObject: hiddenRootsObj. + classTablePage = nilObj ifTrue: + [^false]. + entry := self + fetchPointer: (maybeClassIndex bitAnd: self classTableMinorIndexMask) + ofObject: classTablePage. + ^self isForwarded: entry! Item was added: + ----- Method: Spur64BitCoMemoryManager>>isImmediateClass: (in category 'cog jit support') ----- + isImmediateClass: classObj + <api> + ^(self instSpecOfClass: classObj) = self instSpecForImmediateClasses! Item was added: + ----- Method: Spur64BitCoMemoryManager>>isReallyYoungObject: (in category 'object testing') ----- + isReallyYoungObject: objOop + <api> + "Answer if obj is young. Require that obj is non-immediate. Override to filter-out Cog methods" + self assert: (self isNonImmediate: objOop). + ^(self oop: objOop isLessThan: newSpaceLimit) + and: [self oop: objOop isGreaterThanOrEqualTo: newSpaceStart]! Item was added: + ----- Method: Spur64BitCoMemoryManager>>methodHeaderOf: (in category 'growing/shrinking memory') ----- + methodHeaderOf: methodObj + "Answer the method header of a CompiledMethod object. + If the method has been cogged then the header is a pointer to + the CogMethod and the real header will be stored in the CogMethod." + <api> + <inline: true> + | header | + self assert: (self isCompiledMethod: methodObj). + header := self fetchPointer: HeaderIndex ofObject: methodObj. + ^(self isIntegerObject: header) + ifTrue: [header] + ifFalse: + [self assert: header asUnsignedInteger < newSpaceStart. + self assert: (coInterpreter cCoerceSimple: header to: #'CogMethod *') objectHeader + = self nullHeaderForMachineCodeMethod.. + (coInterpreter cCoerceSimple: header to: #'CogMethod *') methodHeader]! Item was added: + ----- Method: Spur64BitCoMemoryManager>>nullHeaderForMachineCodeMethod (in category 'garbage collection') ----- + nullHeaderForMachineCodeMethod + <api> + <returnTypeC: #sqLong> + ^(self firstLongFormat << self formatShift) + + (1 << self markedBitFullShift) + + ClassBitmapCompactIndex! Item was added: + ----- Method: Spur64BitCoMemoryManager>>remember: (in category 'cog jit support') ----- + remember: objOop + <doNotGenerate> + ^scavenger remember: objOop! Item was added: + ----- Method: Spur64BitCoMemoryManager>>scavengeThresholdAddress (in category 'trampoline support') ----- + scavengeThresholdAddress + <api> + <returnTypeC: #usqInt> + ^self cCode: [(self addressOf: scavengeThreshold) asUnsignedInteger] + inSmalltalk: [cogit simulatedReadWriteVariableAddress: #getScavengeThreshold in: self]! Item was added: + ----- Method: Spur64BitCoMemoryManager>>smallIntegerTag (in category 'cog jit support') ----- + smallIntegerTag + <api> + ^1! Item was added: + ----- Method: Spur64BitCoMemoryManager>>startOfMemory (in category 'accessing') ----- + startOfMemory + "Return the start of object memory. This is immediately after the native code zone. + N.B. the stack zone is alloca'ed. Use a macro so as not to punish the debug VM." + <api> + <cmacro: '() heapBase'> + <returnTypeC: #usqInt> + ^coInterpreter heapBase! Item was added: + ----- Method: Spur64BitCoMemoryManager>>unalignedLongAt: (in category 'simulation only') ----- + unalignedLongAt: byteAddress + <doNotGenerate> + | rem | + self shouldBeImplemented. + rem := byteAddress \\ 4. + ^rem = 0 + ifTrue: [self longAt: byteAddress] + ifFalse: [((self longAt: byteAddress - rem) + ((self longAt: byteAddress - rem + 4) bitShift: 32) bitShift: rem * -8) bitAnd: 16rFFFFFFFF]! Item was added: + ----- Method: Spur64BitCoMemoryManager>>unalignedLongAt:put: (in category 'simulation only') ----- + unalignedLongAt: byteAddress put: aLong + <doNotGenerate> + | rem mask | + self shouldBeImplemented. + rem := byteAddress \\ 4. + ^rem = 0 + ifTrue: [self longAt: byteAddress put: aLong] + ifFalse: + [mask := 16rFFFFFFFF bitAnd: (-1 bitShift: rem * 8). + self longAt: byteAddress - rem + put: ((self longAt: byteAddress - rem) bitAnd: mask bitInvert) + + ((aLong bitShift: rem * 8) bitAnd: mask). + self longAt: byteAddress - rem + 4 + put: ((self longAt: byteAddress - rem + 4) bitAnd: mask) + + ((aLong bitShift: 4 - rem * -8) bitAnd: mask bitInvert). + aLong]! Item was added: + ----- Method: Spur64BitCoMemoryManager>>withoutForwardingOn:and:with:sendToCogit: (in category 'cog jit support') ----- + withoutForwardingOn: obj1 and: obj2 with: aBool sendToCogit: selector + "For the purposes of become: send selector to the cogit with obj1, obj2 + and aBool and answer the result. Undo forwarding for the selector." + <api> + <var: #selector declareC: 'sqInt (*selector)(sqInt,sqInt,sqInt)'> + | targetA targetB | + targetA := self followForwarded: obj1. + targetB := self followForwarded: obj2. + ^cogit perform: selector with: targetA with: targetB with: aBool!

1 0

Re: [Vm-dev] [squeak-dev] Spur with Immediate Floating Point Support implies a break
by Bert Freudenberg 05 Dec '14

05 Dec '14

On 05.12.2014, at 00:50, Chris Cunnington <brasspen(a)gmail.com> wrote: > > - the heap readdresses 32-bit locations, so they are not the same as the addresses in memory, the numbers on the metal > - a 32-bit address can be an immediate object, because the address can be a 30-bit number. (i.e. @00000007) > - a 32-bit address can be a reference to 96-bit object somewhere. The 32-bit address leads to a header that describes the object pursuant of the ObjectMemory comment [1] > > If these things are true, then doesn't that mean every time a number is used, then that 32-bit space, which could have been an address, is now invalid as an address to an object? If that's right, then it's a tad odd, right? The more math you do then the more @00000007 and @00000008 numbers are consumed leaving fewer, of the possible 4.3 billion 32-bit words to address objects with headers. That is exactly right, you understood perfectly fine :) > And if that's true, then some intelligence in the VM somewhere is saying: "No, that address is working as an 'immediate object' for math. You'll have to use another 32-bit address to lead you to the 96-bits that come complete with a header”. Indeed, only one in four words is a valid address for an object. But this is actually optimal for a 32-bit processor. Its data bus is 32 bits wide. It cannot read a single byte from memory, it always reads 4 bytes, 32 bits. If you wanted to read 32 bits from the address @00000007 it would have to fetch the two 32 bit words from address @00000004 and @00000008, and combine 8 bits from one with 24 bits from the other. I think Intel CPUs actually do that, whereas others just say "nope, I won’t do that, it’s silly”. This is called “aligned” vs “unaligned” access. Unaligned access is slow, if it works at all. That is why we align all objects on addresses that are a multiple of 4 bytes. This is not a waste of memory since most objects are a multiple of 4 bytes long anyway. That’s because each reference to an object is 32 bits, so all pointer objects are multiple of 4 bytes long. Same for word objects. Only in byte objects we may waste 1 to 3 bytes. Wasting on average 2 bytes per string is a small price to pay for a huge gain in speed for the whole VM. - Bert -

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

Vm-dev December 2014