Vm-dev May 2014

vm-dev@lists.squeakfoundation.org

32 participants
151 discussions

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

10 May '14

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.715.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.715 Author: eem Time: 10 May 2014, 8:46:22.584 am UUID: 113af7b7-74d5-4593-b954-b54dd3ee4850 Ancestors: VMMaker.oscog-eem.714 And fix the hurried fix in VMMaker.oscog-eem.713. =============== Diff against VMMaker.oscog-eem.714 =============== Item was changed: ----- Method: CCodeGenerator>>addMethodFor:selector: (in category 'utilities') ----- addMethodFor: aClass selector: selector "Add the given method to the code base and answer its translation or nil if it shouldn't be translated." | method tmethod | selector == #initialize ifTrue: [^nil]. method := aClass compiledMethodAt: selector. (method pragmaAt: #doNotGenerate) ifNotNil: ["only remove a previous method if this one overrides it, i.e. this is a subclass method. If the existing method is in a different hierarchy this method must be merely a redeirect." + (methods at: selector ifAbsent: []) ifNotNil: - (methods at: selector) ifNotNil: [:tm| (aClass includesBehavior: tm definingClass) ifTrue: [methods removeKey: selector]]. ^nil]. method isSubclassResponsibility ifTrue: [methods removeKey: selector ifAbsent: []. ^nil]. (self shouldIncludeMethodFor: aClass selector: selector) ifFalse: [methods removeKey: selector ifAbsent: []. ^nil]. tmethod := self addMethod: (self compileToTMethodSelector: selector in: aClass). "If the method has a macro then add the macro. But keep the method for analysis purposes (e.g. its variable accesses)." (method pragmaAt: #cmacro:) ifNotNil: [:pragma| self addMacro: (pragma argumentAt: 1) for: selector. (inlineList includes: selector) ifTrue: [inlineList := inlineList copyWithout: selector]]. (method propertyValueAt: #cmacro:) ifNotNil: [:macro| self addMacro: macro for: selector. (inlineList includes: selector) ifTrue: [inlineList := inlineList copyWithout: selector]]. ^tmethod!

1 0

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

10 May '14

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.714.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.714 Author: eem Time: 10 May 2014, 8:43:01.735 am UUID: dd2b59a7-26ea-4c52-b953-8ca494015df5 Ancestors: VMMaker.oscog-eem.713 Get rid of the stupid validate macro hack. =============== Diff against VMMaker.oscog-eem.713 =============== Item was changed: ----- Method: NewObjectMemory>>validate (in category 'simulation') ----- validate + "Validate all the objects in the heap." + self cCode: [] inSmalltalk: [ - "Validate all the objects in the heap. This is a noop unless simulating, but is sent - so we need a null implementation when generating code." - <cmacro: '() 0'> | oop prev | self interpreter transcript show: 'Validating...'. oop := self firstObject. [oop < freeStart] whileTrue: [self validate: oop. prev := oop. "look here if debugging prev obj overlapping this one" oop := self objectAfter: oop]. + self touch: prev. "Don't offer to delete this please" + self interpreter transcript show: 'done.'; cr]! - prev := prev. "Don't offer to delete this please" - self interpreter transcript show: 'done.'; cr! Item was changed: ----- Method: ObjectMemory>>validate (in category 'simulation') ----- validate + "Validate all the objects in the heap." + self cCode: [] inSmalltalk: [ - "Validate all the objects in the heap. This is a noop unless simulating, but is sent - so we need a null implementation when generating code." - <cmacro: '() 0'> | oop prev | self interpreter transcript show: 'Validating...'. oop := self firstObject. [oop < endOfMemory] whileTrue: [ self validate: oop. prev := oop. "look here if debugging prev obj overlapping this one" oop := self objectAfter: oop. ]. + self touch: prev. "Don't offer to delete this please" + self interpreter transcript show: 'done.'; cr]! - prev := prev. "Don't offer to delete this please" - self interpreter transcript show: 'done.'; cr! Item was removed: - ----- Method: StackInterpreter>>validate (in category 'simulation support') ----- - validate - <doNotGenerate> - objectMemory validate!

1 0

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

10 May '14

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.713.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.713 Author: eem Time: 10 May 2014, 8:36:58.406 am UUID: 5b3f6116-8cfd-4972-b9db-35af8de02111 Ancestors: VMMaker.oscog-eem.712 Fix the regression introduced by VMMaker.oscog-eem.709. When "adding" a method marked <doNotImplement> make sure that any inherited version of the method is removed. The old code also removed methods that weren't inherited. =============== Diff against VMMaker.oscog-eem.712 =============== Item was changed: ----- Method: CCodeGenerator>>addMethodFor:selector: (in category 'utilities') ----- addMethodFor: aClass selector: selector "Add the given method to the code base and answer its translation or nil if it shouldn't be translated." | method tmethod | selector == #initialize ifTrue: [^nil]. method := aClass compiledMethodAt: selector. (method pragmaAt: #doNotGenerate) ifNotNil: + ["only remove a previous method if this one overrides it, i.e. this is a subclass method. + If the existing method is in a different hierarchy this method must be merely a redeirect." + (methods at: selector) ifNotNil: + [:tm| + (aClass includesBehavior: tm definingClass) ifTrue: + [methods removeKey: selector]]. - [methods removeKey: selector ifAbsent: []. ^nil]. method isSubclassResponsibility ifTrue: [methods removeKey: selector ifAbsent: []. ^nil]. (self shouldIncludeMethodFor: aClass selector: selector) ifFalse: [methods removeKey: selector ifAbsent: []. ^nil]. tmethod := self addMethod: (self compileToTMethodSelector: selector in: aClass). "If the method has a macro then add the macro. But keep the method for analysis purposes (e.g. its variable accesses)." (method pragmaAt: #cmacro:) ifNotNil: [:pragma| self addMacro: (pragma argumentAt: 1) for: selector. (inlineList includes: selector) ifTrue: [inlineList := inlineList copyWithout: selector]]. (method propertyValueAt: #cmacro:) ifNotNil: [:macro| self addMacro: macro for: selector. (inlineList includes: selector) ifTrue: [inlineList := inlineList copyWithout: selector]]. ^tmethod!

1 0

[commit][2919] Correct syntax of inline assembler for byte and word swap operations in win32
by commits＠squeakvm.org 10 May '14

10 May '14

Revision: 2919 Author: eliot Date: 2014-05-10 08:08:04 -0700 (Sat, 10 May 2014) Log Message: ----------- Correct syntax of inline assembler for byte and word swap operations in win32 16-bit displays. Thanks to Nicolai Hess! Modified Paths: -------------- branches/Cog/platforms/win32/vm/sqWin32Window.c Property Changed: ---------------- branches/Cog/platforms/Cross/vm/sqSCCSVersion.h Property changes on: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h ___________________________________________________________________ Modified: checkindate - Sat May 10 07:52:58 PDT 2014 + Sat May 10 08:05:46 PDT 2014 Modified: branches/Cog/platforms/win32/vm/sqWin32Window.c =================================================================== --- branches/Cog/platforms/win32/vm/sqWin32Window.c 2014-05-10 14:57:27 UTC (rev 2918) +++ branches/Cog/platforms/win32/vm/sqWin32Window.c 2014-05-10 15:08:04 UTC (rev 2919) @@ -1854,17 +1854,12 @@ #else /* LSB_FIRST */ # if defined(__GNUC__) && (defined(_X86_) || defined(i386) || defined(__i386) || defined(__i386__)) /* GCC generates *optimal* code with a little help */ -# if __GNUC__ >= 3 -# define BYTE_SWAP(w) __asm__("bswap %0" : "=r" (w) : "r" (w)) -# define WORD_SWAP(w) __asm__("roll $16, %0" : "=r" (w) : "r" (w)) -# else -# define BYTE_SWAP(w) __asm__("bswap %%eax" : "=eax" (w) : "eax" (w)) -# define WORD_SWAP(w) __asm__("roll $16, %%eax" : "=eax" (w) : "eax" (w)) -# endif +# define BYTE_SWAP(w) __asm__("bswap %0" : "+r" (w)) +# define WORD_SWAP(w) __asm__("roll $16, %0" : "+r" (w)) # define SRC_PIX_REG asm("%esi") # define DST_PIX_REG asm("%edi") -# else /* Not GCC?! Well, it's your own fault */ -# define BYTE_SWAP(w) w = (w << 24) | ((w & 0xFF00) << 8) | ((w >> 8) & 0xFF00) | (w >> 24) +# else /* Not GCC?! Well, it's your own fault ;-) */ +# define BYTE_SWAP(w) w = (w<<24) | ((w&0xFF00)<<8) | ((w>>8)&0xFF00) | (w>>24) # define WORD_SWAP(w) w = (( (unsigned)(w) << 16) | ((unsigned) (w) >> 16)) # endif /* __GNUC__ */ #endif /* MSB_FIRST */

1 0

[commit][2918] CogVM source as per VMMaker.oscog-eem.712
by commits＠squeakvm.org 10 May '14

10 May '14

Revision: 2918 Author: eliot Date: 2014-05-10 07:57:27 -0700 (Sat, 10 May 2014) Log Message: ----------- CogVM source as per VMMaker.oscog-eem.712 Spur: Revise pigCompact to maintain the doubly-linked free list after sweepToCoallesceFreeSpaceForPigCompactFrom:. This means pigCompact can now be repeated. Repeat pigCompact 3 times, which appears to compact well. This needs lots of profiling!! Move running of leak checker (which computes the leak map) to markObjects from clients and hence cure assert failures during GC in the Cogit. Revise unmarking and mapping during eliminateAndFreeForwardersForPigCompact. Instead of a scavenge merely mapInterpreterOops and explicitly (via added) unmarkSurvivingObjectsForPigCompact. Fix slip in fUOASACFSFPC. Fix remapObj: to not copyAndForward: unless a scavenge is in progress. Fix the assert fail on pigCompact. Since pastSpace is not voided, pastSpace must be swept to follow forwarders. Refactor mapMachineCode to mapMachineCode: theGCMode and hence call mapMachineCode: GCModeFull in eliminateAndFreeForwardersFor[Fit|Pig]Compact. With these changes the Newspeak bootstrap completes on the NS Spur Cog VM. General: Rename checkValidObjectReference: et al to checkValidOopReference: et al (since that's what they check) and add checkValidObjectReference: to check just that. Modified Paths: -------------- branches/Cog/nscogsrc/vm/cogit.c branches/Cog/nscogsrc/vm/cogit.h branches/Cog/nscogsrc/vm/cogmethod.h branches/Cog/nscogsrc/vm/cointerp.c branches/Cog/nscogsrc/vm/cointerp.h branches/Cog/nscogsrc/vm/gcc3x-cointerp.c branches/Cog/nscogsrc/vm/interp.h branches/Cog/nscogsrc/vm/vmCallback.h branches/Cog/nsspursrc/vm/cogit.c branches/Cog/nsspursrc/vm/cogit.h branches/Cog/nsspursrc/vm/cogmethod.h branches/Cog/nsspursrc/vm/cointerp.c branches/Cog/nsspursrc/vm/cointerp.h branches/Cog/nsspursrc/vm/gcc3x-cointerp.c branches/Cog/nsspursrc/vm/interp.h branches/Cog/nsspursrc/vm/vmCallback.h branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c branches/Cog/nsspurstacksrc/vm/interp.c branches/Cog/nsspurstacksrc/vm/interp.h branches/Cog/nsspurstacksrc/vm/vmCallback.h branches/Cog/sistasrc/vm/cogit.c branches/Cog/sistasrc/vm/cogit.h branches/Cog/sistasrc/vm/cogmethod.h branches/Cog/sistasrc/vm/cointerp.c branches/Cog/sistasrc/vm/cointerp.h branches/Cog/sistasrc/vm/gcc3x-cointerp.c branches/Cog/sistasrc/vm/interp.h branches/Cog/sistasrc/vm/vmCallback.h branches/Cog/spursistasrc/vm/cogit.c branches/Cog/spursistasrc/vm/cogit.h branches/Cog/spursistasrc/vm/cogmethod.h branches/Cog/spursistasrc/vm/cointerp.c branches/Cog/spursistasrc/vm/cointerp.h branches/Cog/spursistasrc/vm/gcc3x-cointerp.c branches/Cog/spursistasrc/vm/interp.h branches/Cog/spursistasrc/vm/vmCallback.h branches/Cog/spursrc/vm/cogit.c branches/Cog/spursrc/vm/cogit.h branches/Cog/spursrc/vm/cogmethod.h branches/Cog/spursrc/vm/cointerp.c branches/Cog/spursrc/vm/cointerp.h branches/Cog/spursrc/vm/gcc3x-cointerp.c branches/Cog/spursrc/vm/interp.h branches/Cog/spursrc/vm/vmCallback.h branches/Cog/spurstacksrc/vm/gcc3x-interp.c branches/Cog/spurstacksrc/vm/interp.c branches/Cog/spurstacksrc/vm/interp.h branches/Cog/spurstacksrc/vm/vmCallback.h branches/Cog/src/vm/cogit.c branches/Cog/src/vm/cogit.h branches/Cog/src/vm/cogmethod.h branches/Cog/src/vm/cointerp.c branches/Cog/src/vm/cointerp.h branches/Cog/src/vm/cointerpmt.c branches/Cog/src/vm/cointerpmt.h branches/Cog/src/vm/gcc3x-cointerp.c branches/Cog/src/vm/gcc3x-cointerpmt.c branches/Cog/src/vm/interp.h branches/Cog/src/vm/vmCallback.h branches/Cog/stacksrc/vm/gcc3x-interp.c branches/Cog/stacksrc/vm/interp.c branches/Cog/stacksrc/vm/interp.h branches/Cog/stacksrc/vm/vmCallback.h Property Changed: ---------------- branches/Cog/platforms/Cross/vm/sqSCCSVersion.h Modified: branches/Cog/nscogsrc/vm/cogit.c =================================================================== --- branches/Cog/nscogsrc/vm/cogit.c 2014-05-07 04:38:16 UTC (rev 2917) +++ branches/Cog/nscogsrc/vm/cogit.c 2014-05-10 14:57:27 UTC (rev 2918) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.706 uuid: 6eba60e7-a131-4353-870a-b34e8230b701 + CCodeGenerator VMMaker.oscog-eem.712 uuid: 2f12e8dd-7da6-4358-9eb4-ba4782b7206d from - StackToRegisterMappingCogit VMMaker.oscog-eem.706 uuid: 6eba60e7-a131-4353-870a-b34e8230b701 + StackToRegisterMappingCogit VMMaker.oscog-eem.712 uuid: 2f12e8dd-7da6-4358-9eb4-ba4782b7206d */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.706 uuid: 6eba60e7-a131-4353-870a-b34e8230b701 " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.712 uuid: 2f12e8dd-7da6-4358-9eb4-ba4782b7206d " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -406,14 +406,15 @@ static sqInt ceImplicitReceiverForreceiverclass(sqInt selector, sqInt receiver, sqInt rcvrClass); sqInt ceSICMiss(sqInt receiver); void checkAssertsEnabledInCogit(void); -static sqInt checkIfValidObjectRefAndTargetpccogMethod(sqInt annotation, char *mcpc, sqInt cogMethod); -static sqInt checkIfValidObjectRefpccogMethod(sqInt annotation, char *mcpc, sqInt cogMethod); +static sqInt checkIfValidOopRefAndTargetpccogMethod(sqInt annotation, char *mcpc, sqInt cogMethod); +static sqInt checkIfValidOopRefpccogMethod(sqInt annotation, char *mcpc, sqInt cogMethod); sqInt checkIntegrityOfObjectReferencesInCode(sqInt fullGCFlag); static sqInt checkMaybeObjRefAt(sqInt mcpc); static void checkPrimitiveTableEnablers(void); static sqInt checkValidInlineCacheTag(sqInt cacheTag); static sqInt checkValidObjectReferencesInClosedPIC(CogMethod *cPIC); static sqInt checkValidObjectReference(sqInt anOop); +static sqInt checkValidOopReference(sqInt anOop); static void clearCogCompiledCode(void); static sqInt closedPICRefersToUnmarkedObject(CogMethod *cPIC); static CogMethod * cmHomeMethod(CogBlockMethod * self_in_cmHomeMethod); @@ -2300,7 +2301,7 @@ cogMethod = ((CogMethod *) methodZoneBase); while (cogMethod < (limitZony())) { if (((cogMethod->cmType)) != CMFree) { - if (!(asserta(checkValidObjectReference((cogMethod->selector))))) { + if (!(asserta(checkValidOopReference((cogMethod->selector))))) { ok = 0; } if (!(asserta((cogMethodDoesntLookKosher(cogMethod)) == 0))) { @@ -2309,7 +2310,7 @@ } if ((((cogMethod->cmType)) == CMMethod) || (((cogMethod->cmType)) == CMOpenPIC)) { - if (!(asserta((mapForperformUntilarg(cogMethod, checkIfValidObjectRefAndTargetpccogMethod, ((sqInt)cogMethod))) == 0))) { + if (!(asserta((mapForperformUntilarg(cogMethod, checkIfValidOopRefAndTargetpccogMethod, ((sqInt)cogMethod))) == 0))) { ok = 0; } } @@ -3117,7 +3118,7 @@ } static sqInt -checkIfValidObjectRefAndTargetpccogMethod(sqInt annotation, char *mcpc, sqInt cogMethod) +checkIfValidOopRefAndTargetpccogMethod(sqInt annotation, char *mcpc, sqInt cogMethod) { sqInt cacheTag; sqInt cacheTag1; @@ -3134,7 +3135,7 @@ if (annotation == IsObjectReference) { literal = literalBeforeFollowingAddress(backEnd, ((sqInt)mcpc)); - if (!(asserta(checkValidObjectReference(literal)))) { + if (!(asserta(checkValidOopReference(literal)))) { return 1; } if ((couldBeObject(literal)) @@ -3167,7 +3168,7 @@ && ((((((CogMethod *) (entryPoint1 - cmEntryOffset)))->cmType)) == CMOpenPIC)))); if (tagCouldBeObj) { if (couldBeObject(cacheTag1)) { - if (!(asserta(checkValidObjectReference(cacheTag1)))) { + if (!(asserta(checkValidOopReference(cacheTag1)))) { return 4; } } @@ -3222,7 +3223,7 @@ } static sqInt -checkIfValidObjectRefpccogMethod(sqInt annotation, char *mcpc, sqInt cogMethod) +checkIfValidOopRefpccogMethod(sqInt annotation, char *mcpc, sqInt cogMethod) { sqInt entryPoint; sqInt literal; @@ -3233,7 +3234,7 @@ if (annotation == IsObjectReference) { literal = literalBeforeFollowingAddress(backEnd, ((sqInt)mcpc)); - if (!(checkValidObjectReference(literal))) { + if (!(checkValidOopReference(literal))) { print("object ref leak in CM "); printHex(((sqInt)cogMethod)); print(" @ "); @@ -3287,7 +3288,7 @@ /* unlinked send or super send; cacheTag is a selector */ - if (!(checkValidObjectReference(selectorOrCacheTag))) { + if (!(checkValidOopReference(selectorOrCacheTag))) { print("selector leak in CM "); printHex(((sqInt)cogMethod)); print(" @ "); @@ -3331,7 +3332,7 @@ ok = 0; } } - if (!(checkValidObjectReference((cogMethod->selector)))) { + if (!(checkValidOopReference((cogMethod->selector)))) { print("object leak in CM "); printHex(((sqInt)cogMethod)); print(" selector"); @@ -3347,14 +3348,14 @@ cr(); ok = 0; } - if (!(isCompiledMethod((cogMethod->methodObject)))) { + if (!(isOopCompiledMethod((cogMethod->methodObject)))) { print("non-method in CM "); printHex(((sqInt)cogMethod)); print(" methodObject"); cr(); ok = 0; } - if ((mapForperformUntilarg(cogMethod, checkIfValidObjectRefpccogMethod, ((sqInt)cogMethod))) != 0) { + if ((mapForperformUntilarg(cogMethod, checkIfValidOopRefpccogMethod, ((sqInt)cogMethod))) != 0) { ok = 0; } if (!fullGCFlag) { @@ -3377,7 +3378,7 @@ } else { if (((cogMethod->cmType)) == CMOpenPIC) { - if ((mapForperformUntilarg(cogMethod, checkIfValidObjectRefpccogMethod, ((sqInt)cogMethod))) != 0) { + if ((mapForperformUntilarg(cogMethod, checkIfValidOopRefpccogMethod, ((sqInt)cogMethod))) != 0) { ok = 0; } } @@ -3475,6 +3476,13 @@ static sqInt checkValidObjectReference(sqInt anOop) { + return (!(isImmediate(anOop))) + && ((heapMapAtWord(pointerForOop(anOop))) != 0); +} + +static sqInt +checkValidOopReference(sqInt anOop) +{ return ((anOop & 1)) || ((heapMapAtWord(pointerForOop(anOop))) != 0); } Modified: branches/Cog/nscogsrc/vm/cogit.h =================================================================== --- branches/Cog/nscogsrc/vm/cogit.h 2014-05-07 04:38:16 UTC (rev 2917) +++ branches/Cog/nscogsrc/vm/cogit.h 2014-05-10 14:57:27 UTC (rev 2918) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.706 uuid: 6eba60e7-a131-4353-870a-b34e8230b701 + CCodeGenerator VMMaker.oscog-eem.712 uuid: 2f12e8dd-7da6-4358-9eb4-ba4782b7206d */ Modified: branches/Cog/nscogsrc/vm/cogmethod.h =================================================================== --- branches/Cog/nscogsrc/vm/cogmethod.h 2014-05-07 04:38:16 UTC (rev 2917) +++ branches/Cog/nscogsrc/vm/cogmethod.h 2014-05-10 14:57:27 UTC (rev 2918) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.706 uuid: 6eba60e7-a131-4353-870a-b34e8230b701 + CCodeGenerator VMMaker.oscog-eem.712 uuid: 2f12e8dd-7da6-4358-9eb4-ba4782b7206d */ typedef struct { Modified: branches/Cog/nscogsrc/vm/cointerp.c =================================================================== --- branches/Cog/nscogsrc/vm/cointerp.c 2014-05-07 04:38:16 UTC (rev 2917) +++ branches/Cog/nscogsrc/vm/cointerp.c 2014-05-10 14:57:27 UTC (rev 2918) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.706 uuid: 6eba60e7-a131-4353-870a-b34e8230b701 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.712 uuid: 2f12e8dd-7da6-4358-9eb4-ba4782b7206d from - CoInterpreter VMMaker.oscog-eem.706 uuid: 6eba60e7-a131-4353-870a-b34e8230b701 + CoInterpreter VMMaker.oscog-eem.712 uuid: 2f12e8dd-7da6-4358-9eb4-ba4782b7206d */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.706 uuid: 6eba60e7-a131-4353-870a-b34e8230b701 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.712 uuid: 2f12e8dd-7da6-4358-9eb4-ba4782b7206d " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -1157,7 +1157,7 @@ static void rewriteMethodCacheEntryForExternalPrimitiveToFunction(void (*localPrimAddress)(void)); static sqInt roomToPushNArgs(sqInt n); static void runLeakCheckerForFullGC(sqInt fullGCFlag); -static usqInt safeObjectAfter(sqInt oop); +static sqInt safeObjectAfter(sqInt oop); static sqInt safePrintStringOf(sqInt oop); usqInt scavengeThresholdAddress(void); EXPORT(sqInt) sendInvokeCallbackContext(VMCallbackContext *vmCallbackContext); @@ -2045,7 +2045,7 @@ /* 574 */ (void (*)(void))0, /* 575 */ (void (*)(void))0, 0 }; -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.706"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.712"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; @@ -2088,7 +2088,6 @@ #define setDesiredCogCodeSize(dccs) (desiredCogCodeSize = (dccs)) #define stackPageAtpages(index,pages) ((pages) + (index)) #define startOfMemory() heapBase -#define validate() 0 #define youngStart() GIV(youngStart) @@ -5684,7 +5683,6 @@ /* begin internalPush: */ longAtPointerput((localSP -= BytesPerOop), longAt((rcvr + BaseHeaderSize) + (byte3 << ShiftForWord))); } - null; goto l4; } if (opType == 3) { @@ -5694,7 +5692,6 @@ assert(GIV(method) == (iframeMethod(localFP))); object = longAt((GIV(method) + BaseHeaderSize) + ((byte3 + LiteralStart) << ShiftForWord)); longAtPointerput((localSP -= BytesPerOop), object); - null; goto l4; } if (opType == 4) { @@ -5708,7 +5705,6 @@ object2 = longAt((oop + BaseHeaderSize) + (ValueIndex << ShiftForWord)); longAtPointerput((localSP -= BytesPerOop), object2); - null; goto l4; } top = longAtPointer(localSP); @@ -24007,15 +24003,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; @@ -24026,7 +24024,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; @@ -24041,7 +24053,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)) { @@ -24095,18 +24107,18 @@ } /* begin safeObjectAfter: */ if (((longAt(newFreeChunk)) & TypeMask) == HeaderTypeFree) { - sz2 = (longAt(newFreeChunk)) & AllButTypeMask; + sz3 = (longAt(newFreeChunk)) & AllButTypeMask; } else { /* begin sizeBitsOf: */ - header3 = longAt(newFreeChunk); - sz2 = ((header3 & TypeMask) == HeaderTypeSizeAndClass + header4 = longAt(newFreeChunk); + sz3 = ((header4 & TypeMask) == HeaderTypeSizeAndClass ? (longAt(newFreeChunk - (BytesPerWord * 2))) & LongSizeMask - : header3 & SizeMask); + : header4 & SizeMask); } - next = ((newFreeChunk + sz2) >= GIV(freeStart) + next = ((newFreeChunk + sz3) >= GIV(freeStart) ? GIV(freeStart) - : (newFreeChunk + sz2) + (headerTypeBytes[(longAt(newFreeChunk + sz2)) & TypeMask])); + : (newFreeChunk + sz3) + (headerTypeBytes[(longAt(newFreeChunk + sz3)) & TypeMask])); assert((next == GIV(freeStart)) || (next == (oopFromChunk(GIV(compEnd))))); if (next == GIV(freeStart)) { @@ -27367,7 +27379,7 @@ sqInt oop; mapStackPages(); - /* begin mapMachineCode */ + /* begin mapMachineCode: */ mapObjectReferencesInMachineCode(GIV(gcMode)); /* begin mapTraceLogs */ mapTraceLog(); @@ -50586,7 +50598,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; Modified: branches/Cog/nscogsrc/vm/cointerp.h =================================================================== --- branches/Cog/nscogsrc/vm/cointerp.h 2014-05-07 04:38:16 UTC (rev 2917) +++ branches/Cog/nscogsrc/vm/cointerp.h 2014-05-10 14:57:27 UTC (rev 2918) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.706 uuid: 6eba60e7-a131-4353-870a-b34e8230b701 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.712 uuid: 2f12e8dd-7da6-4358-9eb4-ba4782b7206d */ Modified: branches/Cog/nscogsrc/vm/gcc3x-cointerp.c =================================================================== --- branches/Cog/nscogsrc/vm/gcc3x-cointerp.c 2014-05-07 04:38:16 UTC (rev 2917) +++ branches/Cog/nscogsrc/vm/gcc3x-cointerp.c 2014-05-10 14:57:27 UTC (rev 2918) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.706 uuid: 6eba60e7-a131-4353-870a-b34e8230b701 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.712 uuid: 2f12e8dd-7da6-4358-9eb4-ba4782b7206d from - CoInterpreter VMMaker.oscog-eem.706 uuid: 6eba60e7-a131-4353-870a-b34e8230b701 + CoInterpreter VMMaker.oscog-eem.712 uuid: 2f12e8dd-7da6-4358-9eb4-ba4782b7206d */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.706 uuid: 6eba60e7-a131-4353-870a-b34e8230b701 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.712 uuid: 2f12e8dd-7da6-4358-9eb4-ba4782b7206d " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -1160,7 +1160,7 @@ static void rewriteMethodCacheEntryForExternalPrimitiveToFunction(void (*localPrimAddress)(void)); static sqInt roomToPushNArgs(sqInt n); static void runLeakCheckerForFullGC(sqInt fullGCFlag); -static usqInt safeObjectAfter(sqInt oop); +static sqInt safeObjectAfter(sqInt oop); static sqInt safePrintStringOf(sqInt oop); usqInt scavengeThresholdAddress(void); EXPORT(sqInt) sendInvokeCallbackContext(VMCallbackContext *vmCallbackContext); @@ -2048,7 +2048,7 @@ /* 574 */ (void (*)(void))0, /* 575 */ (void (*)(void))0, 0 }; -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.706"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.712"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; @@ -2091,7 +2091,6 @@ #define setDesiredCogCodeSize(dccs) (desiredCogCodeSize = (dccs)) #define stackPageAtpages(index,pages) ((pages) + (index)) #define startOfMemory() heapBase -#define validate() 0 #define youngStart() GIV(youngStart) @@ -5693,7 +5692,6 @@ /* begin internalPush: */ longAtPointerput((localSP -= BytesPerOop), longAt((rcvr + BaseHeaderSize) + (byte3 << ShiftForWord))); } - null; goto l4; } if (opType == 3) { @@ -5703,7 +5701,6 @@ assert(GIV(method) == (iframeMethod(localFP))); object = longAt((GIV(method) + BaseHeaderSize) + ((byte3 + LiteralStart) << ShiftForWord)); longAtPointerput((localSP -= BytesPerOop), object); - null; goto l4; } if (opType == 4) { @@ -5717,7 +5714,6 @@ object2 = longAt((oop + BaseHeaderSize) + (ValueIndex << ShiftForWord)); longAtPointerput((localSP -= BytesPerOop), object2); - null; goto l4; } top = longAtPointer(localSP); @@ -24016,15 +24012,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; @@ -24035,7 +24033,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; @@ -24050,7 +24062,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)) { @@ -24104,18 +24116,18 @@ } /* begin safeObjectAfter: */ if (((longAt(newFreeChunk)) & TypeMask) == HeaderTypeFree) { - sz2 = (longAt(newFreeChunk)) & AllButTypeMask; + sz3 = (longAt(newFreeChunk)) & AllButTypeMask; } else { /* begin sizeBitsOf: */ - header3 = longAt(newFreeChunk); - sz2 = ((header3 & TypeMask) == HeaderTypeSizeAndClass + header4 = longAt(newFreeChunk); + sz3 = ((header4 & TypeMask) == HeaderTypeSizeAndClass ? (longAt(newFreeChunk - (BytesPerWord * 2))) & LongSizeMask - : header3 & SizeMask); + : header4 & SizeMask); } - next = ((newFreeChunk + sz2) >= GIV(freeStart) + next = ((newFreeChunk + sz3) >= GIV(freeStart) ? GIV(freeStart) - : (newFreeChunk + sz2) + (headerTypeBytes[(longAt(newFreeChunk + sz2)) & TypeMask])); + : (newFreeChunk + sz3) + (headerTypeBytes[(longAt(newFreeChunk + sz3)) & TypeMask])); assert((next == GIV(freeStart)) || (next == (oopFromChunk(GIV(compEnd))))); if (next == GIV(freeStart)) { @@ -27376,7 +27388,7 @@ sqInt oop; mapStackPages(); - /* begin mapMachineCode */ + /* begin mapMachineCode: */ mapObjectReferencesInMachineCode(GIV(gcMode)); /* begin mapTraceLogs */ mapTraceLog(); @@ -50595,7 +50607,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; Modified: branches/Cog/nscogsrc/vm/interp.h =================================================================== --- branches/Cog/nscogsrc/vm/interp.h 2014-05-07 04:38:16 UTC (rev 2917) +++ branches/Cog/nscogsrc/vm/interp.h 2014-05-10 14:57:27 UTC (rev 2918) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.706 uuid: 6eba60e7-a131-4353-870a-b34e8230b701 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.712 uuid: 2f12e8dd-7da6-4358-9eb4-ba4782b7206d */ #define VM_PROXY_MAJOR 1 Modified: branches/Cog/nscogsrc/vm/vmCallback.h =================================================================== --- branches/Cog/nscogsrc/vm/vmCallback.h 2014-05-07 04:38:16 UTC (rev 2917) +++ branches/Cog/nscogsrc/vm/vmCallback.h 2014-05-10 14:57:27 UTC (rev 2918) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.706 uuid: 6eba60e7-a131-4353-870a-b34e8230b701 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.712 uuid: 2f12e8dd-7da6-4358-9eb4-ba4782b7206d */ #define VM_CALLBACK_INC 1 Modified: branches/Cog/nsspursrc/vm/cogit.c =================================================================== --- branches/Cog/nsspursrc/vm/cogit.c 2014-05-07 04:38:16 UTC (rev 2917) +++ branches/Cog/nsspursrc/vm/cogit.c 2014-05-10 14:57:27 UTC (rev 2918) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.706 uuid: 6eba60e7-a131-4353-870a-b34e8230b701 + CCodeGenerator VMMaker.oscog-eem.712 uuid: 2f12e8dd-7da6-4358-9eb4-ba4782b7206d from - StackToRegisterMappingCogit VMMaker.oscog-eem.706 uuid: 6eba60e7-a131-4353-870a-b34e8230b701 + StackToRegisterMappingCogit VMMaker.oscog-eem.712 uuid: 2f12e8dd-7da6-4358-9eb4-ba4782b7206d */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.706 uuid: 6eba60e7-a131-4353-870a-b34e8230b701 " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.712 uuid: 2f12e8dd-7da6-4358-9eb4-ba4782b7206d " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -394,14 +394,15 @@ static sqInt ceImplicitReceiverForreceiverclass(sqInt selector, sqInt receiver, sqInt rcvrClass); sqInt ceSICMiss(sqInt receiver); void checkAssertsEnabledInCogit(void); -static sqInt checkIfValidObjectRefAndTargetpccogMethod(sqInt annotation, char *mcpc, sqInt cogMethod); -static sqInt checkIfValidObjectRefpccogMethod(sqInt annotation, char *mcpc, sqInt cogMethod); +static sqInt checkIfValidOopRefAndTargetpccogMethod(sqInt annotation, char *mcpc, sqInt cogMethod); +static sqInt checkIfValidOopRefpccogMethod(sqInt annotation, char *mcpc, sqInt cogMethod); sqInt checkIntegrityOfObjectReferencesInCode(sqInt fullGCFlag); static sqInt checkMaybeObjRefAt(sqInt mcpc); static void checkPrimitiveTableEnablers(void); static sqInt checkValidInlineCacheTag(sqInt classIndexOrTagPattern); static sqInt checkValidObjectReferencesInClosedPIC(CogMethod *cPIC); static sqInt checkValidObjectReference(sqInt anOop); +static sqInt checkValidOopReference(sqInt anOop); static void clearCogCompiledCode(void); static CogMethod * cmHomeMethod(CogBlockMethod * self_in_cmHomeMethod); char * codeEntryFor(char *address); @@ -2297,7 +2298,7 @@ cogMethod = ((CogMethod *) methodZoneBase); while (cogMethod < (limitZony())) { if (((cogMethod->cmType)) != CMFree) { - if (!(asserta(checkValidObjectReference((cogMethod->selector))))) { + if (!(asserta(checkValidOopReference((cogMethod->selector))))) { ok = 0; } if (!(asserta((cogMethodDoesntLookKosher(cogMethod)) == 0))) { @@ -2306,7 +2307,7 @@ } if ((((cogMethod->cmType)) == CMMethod) || (((cogMethod->cmType)) == CMOpenPIC)) { - if (!(asserta((mapForperformUntilarg(cogMethod, checkIfValidObjectRefAndTargetpccogMethod, ((sqInt)cogMethod))) == 0))) { + if (!(asserta((mapForperformUntilarg(cogMethod, checkIfValidOopRefAndTargetpccogMethod, ((sqInt)cogMethod))) == 0))) { ok = 0; } } @@ -3116,7 +3117,7 @@ } static sqInt -checkIfValidObjectRefAndTargetpccogMethod(sqInt annotation, char *mcpc, sqInt cogMethod) +checkIfValidOopRefAndTargetpccogMethod(sqInt annotation, char *mcpc, sqInt cogMethod) { sqInt cacheTag; sqInt cacheTag1; @@ -3133,7 +3134,7 @@ if (annotation == IsObjectReference) { literal = literalBeforeFollowingAddress(backEnd, ((sqInt)mcpc)); - if (!(asserta(checkValidObjectReference(literal)))) { + if (!(asserta(checkValidOopReference(literal)))) { return 1; } if ((couldBeObject(literal)) @@ -3166,7 +3167,7 @@ && ((((((CogMethod *) (entryPoint1 - cmEntryOffset)))->cmType)) == CMOpenPIC)))); if (tagCouldBeObj) { if (couldBeObject(cacheTag1)) { - if (!(asserta(checkValidObjectReference(cacheTag1)))) { + if (!(asserta(checkValidOopReference(cacheTag1)))) { return 4; } } @@ -3221,7 +3222,7 @@ } static sqInt -checkIfValidObjectRefpccogMethod(sqInt annotation, char *mcpc, sqInt cogMethod) +checkIfValidOopRefpccogMethod(sqInt annotation, char *mcpc, sqInt cogMethod) { sqInt entryPoint; sqInt literal; @@ -3232,7 +3233,7 @@ if (annotation == IsObjectReference) { literal = literalBeforeFollowingAddress(backEnd, ((sqInt)mcpc)); - if (!(checkValidObjectReference(literal))) { + if (!(checkValidOopReference(literal))) { print("object ref leak in CM "); printHex(((sqInt)cogMethod)); print(" @ "); @@ -3286,7 +3287,7 @@ /* unlinked send or super send; cacheTag is a selector */ - if (!(checkValidObjectReference(selectorOrCacheTag))) { + if (!(checkValidOopReference(selectorOrCacheTag))) { print("selector leak in CM "); printHex(((sqInt)cogMethod)); print(" @ "); @@ -3330,7 +3331,7 @@ ok = 0; } } - if (!(checkValidObjectReference((cogMethod->selector)))) { + if (!(checkValidOopReference((cogMethod->selector)))) { print("object leak in CM "); printHex(((sqInt)cogMethod)); print(" selector"); @@ -3346,14 +3347,14 @@ cr(); ok = 0; } - if (!(isCompiledMethod((cogMethod->methodObject)))) { + if (!(isOopCompiledMethod((cogMethod->methodObject)))) { print("non-method in CM "); printHex(((sqInt)cogMethod)); print(" methodObject"); cr(); ok = 0; } - if ((mapForperformUntilarg(cogMethod, checkIfValidObjectRefpccogMethod, ((sqInt)cogMethod))) != 0) { + if ((mapForperformUntilarg(cogMethod, checkIfValidOopRefpccogMethod, ((sqInt)cogMethod))) != 0) { ok = 0; } if (!fullGCFlag) { @@ -3376,7 +3377,7 @@ } else { if (((cogMethod->cmType)) == CMOpenPIC) { - if ((mapForperformUntilarg(cogMethod, checkIfValidObjectRefpccogMethod, ((sqInt)cogMethod))) != 0) { + if ((mapForperformUntilarg(cogMethod, checkIfValidOopRefpccogMethod, ((sqInt)cogMethod))) != 0) { ok = 0; } } @@ -3465,6 +3466,13 @@ static sqInt checkValidObjectReference(sqInt anOop) { + return (!(isImmediate(anOop))) + && ((heapMapAtWord(pointerForOop(anOop))) != 0); +} + +static sqInt +checkValidOopReference(sqInt anOop) +{ return (isImmediate(anOop)) || ((heapMapAtWord(pointerForOop(anOop))) != 0); } Modified: branches/Cog/nsspursrc/vm/cogit.h =================================================================== --- branches/Cog/nsspursrc/vm/cogit.h 2014-05-07 04:38:16 UTC (rev 2917) +++ branches/Cog/nsspursrc/vm/cogit.h 2014-05-10 14:57:27 UTC (rev 2918) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.706 uuid: 6eba60e7-a131-4353-870a-b34e8230b701 + CCodeGenerator VMMaker.oscog-eem.712 uuid: 2f12e8dd-7da6-4358-9eb4-ba4782b7206d */ Modified: branches/Cog/nsspursrc/vm/cogmethod.h =================================================================== --- branches/Cog/nsspursrc/vm/cogmethod.h 2014-05-07 04:38:16 UTC (rev 2917) +++ branches/Cog/nsspursrc/vm/cogmethod.h 2014-05-10 14:57:27 UTC (rev 2918) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.706 uuid: 6eba60e7-a131-4353-870a-b34e8230b701 + CCodeGenerator VMMaker.oscog-eem.712 uuid: 2f12e8dd-7da6-4358-9eb4-ba4782b7206d */ typedef struct { Modified: branches/Cog/nsspursrc/vm/cointerp.c =================================================================== --- branches/Cog/nsspursrc/vm/cointerp.c 2014-05-07 04:38:16 UTC (rev 2917) +++ branches/Cog/nsspursrc/vm/cointerp.c 2014-05-10 14:57:27 UTC (rev 2918) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.706 uuid: 6eba60e7-a131-4353-870a-b34e8230b701 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.712 uuid: 2f12e8dd-7da6-4358-9eb4-ba4782b7206d from - CoInterpreter VMMaker.oscog-eem.706 uuid: 6eba60e7-a131-4353-870a-b34e8230b701 + CoInterpreter VMMaker.oscog-eem.712 uuid: 2f12e8dd-7da6-4358-9eb4-ba4782b7206d */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.706 uuid: 6eba60e7-a131-4353-870a-b34e8230b701 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.712 uuid: 2f12e8dd-7da6-4358-9eb4-ba4782b7206d " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -935,12 +935,14 @@ static sqInt okayOop(sqInt signedOop); static sqInt oopisGreaterThanOrEqualTo(sqInt anOop, sqInt otherOop); static sqInt oopisGreaterThanOrEqualToandLessThanOrEqualTo(sqInt anOop, sqInt baseOop, sqInt limitOop); +static sqInt oopisGreaterThanOrEqualToandLessThan(sqInt anOop, sqInt baseOop, sqInt limitOop); static sqInt oopisGreaterThan(sqInt anOop, sqInt otherOop); static sqInt oopisLessThanOrEqualTo(sqInt anOop, sqInt otherOop); static sqInt oopisLessThan(sqInt anOop, sqInt otherOop); static sqInt pageIndexFor(void *pointer); static sqInt pageListIsWellFormed(void); sqInt penultimateLiteralOf(sqInt aMethodOop); +static void pigCompact(void); void pinObject(sqInt objOop); static sqInt popObjStack(sqInt objStack); sqInt popRemappableOop(void); @@ -1453,19 +1455,19 @@ _iss char * stackBasePlus1; _iss sqInt hiddenRootsObj; _iss usqInt endOfMemory; +_iss SpurCircularBuffer highestObjects; _iss sqInt totalFreeOldSpace; -_iss SpurCircularBuffer highestObjects; _iss sqInt trueObj; _iss sqInt remapBufferCount; _iss SpurSegmentInfo * segments; _iss sqInt needGCFlag; _iss sqInt falseObj; _iss sqInt traceLogIndex; +_iss sqInt firstFreeChunk; _iss sqInt bytesPerPage; -_iss sqInt firstFreeChunk; _iss sqInt * freeLists; +_iss usqInt pastSpaceStart; _iss sqInt numSegments; -_iss usqInt pastSpaceStart; _iss usqInt freeListsMask; _iss char * stackLimit; _iss usqInt scavengeThreshold; @@ -1481,7 +1483,6 @@ _iss usqInt oldSpaceStart; _iss sqInt weaklingStack; _iss SpurNewSpaceSpace futureSpace; -_iss sqInt futureSurvivorStart; _iss sqInt jmpDepth; _iss sqLong nextProfileTick; _iss sqInt numRememberedEphemerons; @@ -1489,6 +1490,7 @@ _iss sqInt numClassTablePages; _iss sqInt longRunningPrimitiveCheckSemaphore; _iss sqInt tempOop; +_iss sqInt futureSurvivorStart; _iss char * objStackInvalidBecause; _iss SpurNewSpaceSpace eden; _iss sqInt profileSemaphore; @@ -1510,7 +1512,6 @@ _iss sqInt lastMethodCacheProbeWrite; _iss sqInt lkupClass; _iss sqInt backwardJumpCount; -_iss sqInt gcMode; _iss sqInt metaclassNumSlots; _iss usqLong nextWakeupUsecs; _iss sqInt preemptionYields; @@ -1520,6 +1521,7 @@ _iss usqLong longRunningPrimitiveStopUsecs; _iss sqInt numSegInfos; _iss usqLong statCheckForEvents; +_iss sqInt gcMode; _iss sqInt lastCoggableInterpretedBlockMethod; _iss sqInt lastUncoggableInterpretedBlockMethod; _iss usqInt lowSpaceThreshold; @@ -1555,6 +1557,7 @@ _iss sqInt globalSessionID; _iss sqInt interruptKeycode; _iss sqInt maxExtSemTabSizeSet; +_iss sqInt scavengeInProgress; _iss usqLong statFullGCUsecs; _iss sqInt statFullGCs; _iss sqInt statGrowMemory; @@ -1569,7 +1572,6 @@ _iss sqInt longRunningPrimitiveSignalUndelivered; _iss StackPage * overflowedPage; _iss sqInt savedWindowSize; -_iss sqInt scavengeInProgress; _iss sqInt signalLowSpace; _iss sqInt statCodeCompactionCount; _iss usqLong statCodeCompactionUsecs; @@ -2220,7 +2222,7 @@ /* 574 */ (void (*)(void))0, /* 575 */ (void (*)(void))0, 0 }; -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.706"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.712"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; @@ -2242,6 +2244,7 @@ #define flush() fflush(stdout) #define freeStart() GIV(freeStart) #define futureSpace() GIV(futureSpace) +#define futureSurvivorStart() GIV(futureSurvivorStart) #define getCodeCompactionCount() integerObjectOf(GIV(statCodeCompactionCount)) #define getCodeCompactionMSecs() integerObjectOf((GIV(statCodeCompactionUsecs) + 500) / 1000) #define getCogCodeSize() integerObjectOf(GIV(cogCodeSize)) @@ -5512,6 +5515,7 @@ GIV(framePointer) = localFP; ceEnterCogCodePopReceiverReg(); + null; goto l290; } localIP = pointerForOop(longAt(localFP + FoxIFSavedIP)); @@ -5529,7 +5533,7 @@ /* begin fetchNextBytecode */ currentBytecode = (byteAtPointer(++localIP)) + GIV(bytecodeSetSelector); - /* return self */ + null; l290: /* end baseFrameReturn */; goto l287; } @@ -6573,7 +6577,6 @@ /* begin internalPush: */ longAtPointerput((localSP -= BytesPerOop), longAt((rcvr1 + (BaseHeaderSize)) + (byte3 << 2))); } - null; goto l5; } if (opType == 3) { @@ -6583,7 +6586,6 @@ assert(GIV(method) == (iframeMethod(localFP))); object = longAt((GIV(method) + (BaseHeaderSize)) + ((byte3 + LiteralStart) << 2)); longAtPointerput((localSP -= BytesPerOop), object); - null; goto l5; } if (opType == 4) { @@ -6611,7 +6613,6 @@ /* begin internalPush: */ longAtPointerput((localSP -= BytesPerOop), longAt((litVar1 + (BaseHeaderSize)) + (ValueIndex << 2))); - null; goto l5; } top = longAtPointer(localSP); @@ -15496,8 +15497,7 @@ || ((((((usqInt) address)) >= (((usqInt) (((pastSpace()).start))))) && ((((usqInt) address)) < (((usqInt) GIV(pastSpaceStart))))) || (GIV(scavengeInProgress) - && (((((usqInt) address)) >= (((usqInt) (((futureSpace()).start))))) - && ((((usqInt) address)) < (((usqInt) GIV(futureSurvivorStart))))))))); + && (oopisGreaterThanOrEqualToandLessThan(address, ((futureSpace()).start), futureSurvivorStart())))))); } static sqInt @@ -15833,9 +15833,6 @@ l1: /* end allocateSlots:format:classIndex: */; return freeChunk; } - /* begin runLeakCheckerForFullGC: */ - runLeakCheckerForFullGCexcludeUnmarkedNewSpaceObjsclassIndicesShouldBeValid(0, 0, 1); - /* return self */ markObjects(); /* begin allocateLargestFreeChunk */ freeChunk1 = findLargestFreeChunk(); @@ -16113,9 +16110,6 @@ sqInt slotBytes; sqInt start; - /* begin runLeakCheckerForFullGC: */ - runLeakCheckerForFullGCexcludeUnmarkedNewSpaceObjsclassIndicesShouldBeValid(0, 0, 1); - /* return self */ markObjects(); /* begin allocateLargestFreeChunk */ freeChunk1 = findLargestFreeChunk(); @@ -22553,86 +22547,10 @@ static void compact(void) { DECL_MAYBE_SQ_GLOBAL_STRUCT - sqInt cascade0; - sqInt cascade1; - sqInt free; - sqInt high; - sqInt low; - sqInt nextFree; - usqInt numSlots; - usqInt numSlots1; - sqInt prevFree; - sqInt prevPrevFree; - sqInt scanAddress; - sqInt slotBytes; - assert((GIV(firstFreeChunk) == 0) || (isFreeObject(GIV(firstFreeChunk)))); - /* begin pigCompact */ - ; - /* begin sortedFreeListPairwiseReverseDo: */ - free = GIV(lastFreeChunk); - prevPrevFree = (prevFree = 0); - while (free != 0) { - nextFree = (longAt((free + (BaseHeaderSize)) + (0 << 2))) ^ prevFree; - assert((free == 0) - || (isFreeObject(free))); - assert((prevFree == 0) - || (prevFree > free)); - - /* begin addressAfter: */ - /* begin numSlotsOfAny: */ - numSlots1 = byteAt(free + 7); - numSlots = (numSlots1 == 0xFF - ? longAt(free - (BaseHeaderSize)) - : numSlots1); - slotBytes = (numSlots == 0 - ? 8 - : (numSlots + (numSlots & 1)) << 2); - scanAddress = (free + (BaseHeaderSize)) + slotBytes; - while ((((usqInt) scanAddress)) < (((usqInt) ((prevFree == 0 - ? GIV(endOfMemory) - (2 * (BaseHeaderSize)) - : ((byteAt(prevFree + 7)) == 0xFF - ? prevFree - (BaseHeaderSize) - : prevFree)))))) { - scanAddress = moveARunOfObjectsStartingAtupTo(scanAddress, (prevFree == 0 - ? GIV(endOfMemory) - (2 * (BaseHeaderSize)) - : ((byteAt(prevFree + 7)) == 0xFF - ? prevFree - (BaseHeaderSize) - : prevFree))); - if (scanAddress == 0) { - goto l1; - } - } + pigCompact(); - assert((prevFree == 0) - || (isFreeObject(prevFree))); - assert((prevPrevFree == 0) - || (isFreeObject(prevPrevFree))); - if (!(((longAt(free)) & 0x3FFFFF) == 0)) { - free = (longAt((prevFree + (BaseHeaderSize)) + (0 << 2))) ^ prevPrevFree; - } - if ((nextFree == 0) - || (((longAt(nextFree)) & 0x3FFFFF) == 0)) { - prevPrevFree = prevFree; - prevFree = free; - free = nextFree; - } - else { - free = GIV(lastFreeChunk); - prevPrevFree = (prevFree = 0); - while (free > nextFree) { - nextFree = (longAt((free + (BaseHeaderSize)) + (0 << 2))) ^ prevFree; - assert(isFreeObject(nextFree)); - prevPrevFree = prevFree; - prevFree = free; - free = nextFree; - } - } - } - null; -l1: /* end pigCompact */; - } sqInt @@ -24236,8 +24154,8 @@ } } doScavenge(DontTenureButDoUnmark); - /* begin mapMachineCode */ - mapObjectReferencesInMachineCode(GIV(gcMode)); + /* begin mapMachineCode: */ + mapObjectReferencesInMachineCode(GCModeFull); /* begin checkFreeSpace */ assert(bitsSetInFreeSpaceMaskForAllFreeLists()); assert(GIV(totalFreeOldSpace) == (totalFreeListBytes())); @@ -24392,30 +24310,46 @@ static void eliminateAndFreeForwardersForPigCompact(void) { DECL_MAYBE_SQ_GLOBAL_STRUCT + sqInt address; + sqInt address1; sqInt bytes; + sqInt endOfFreeRun; sqInt f; - sqInt firstFree; - sqInt firstFreeStart; + sqInt firstOfFreeRun; sqInt i; sqInt iLimiT; sqInt index; - sqInt lastFree; sqInt lowest; sqInt lowestForwarder; sqInt lowestForwarder1; + usqInt numSlots; + usqInt numSlots1; sqInt o; sqInt o1; sqInt obj; sqInt objOop; sqInt objOop1; + sqInt objOop11; + sqInt objOop12; sqInt objOop2; + sqInt objOop21; + sqInt objOop3; + sqInt objOop4; + sqInt prevFree; sqInt prevObj; sqInt prevObj1; + sqInt prevObj11; + sqInt prevObj2; + sqInt prevPrevFree; sqInt prevPrevObj; sqInt prevPrevObj1; + sqInt prevPrevObj11; + sqInt prevPrevObj2; sqInt referent; sqInt referent1; + sqInt referent11; sqInt referent2; + sqInt startOfFreeRun; assert(!(isForwarded(GIV(nilObj)))); assert(!(isForwarded(GIV(falseObj)))); @@ -24427,17 +24361,18 @@ if (((longAt(GIV(specialObjectsOop))) & 0x3FFFFF) == 8) { /* begin followForwarded: */ assert(isForwarded(GIV(specialObjectsOop))); - referent1 = longAt((GIV(specialObjectsOop) + (BaseHeaderSize)) + (0 << 2)); - while (((referent1 & 3) == 0) - && (((longAt(referent1)) & 0x3FFFFF) == 8)) { - referent1 = longAt((referent1 + (BaseHeaderSize)) + (0 << 2)); + referent = longAt((GIV(specialObjectsOop) + (BaseHeaderSize)) + (0 << 2)); + while (((referent & 3) == 0) + && (((longAt(referent)) & 0x3FFFFF) == 8)) { + referent = longAt((referent + (BaseHeaderSize)) + (0 << 2)); } - GIV(specialObjectsOop) = referent1; + GIV(specialObjectsOop) = referent; } /* begin followForwardedObjStacks */ followForwardedInObjStackatIndex(GIV(markStack), MarkStackRootIndex); followForwardedInObjStackatIndex(GIV(weaklingStack), WeaklingStackRootIndex); followForwardedInObjStackatIndex(GIV(ephemeronQueue), EphemeronQueueRootIndex); + mapInterpreterOops(); /* begin followRememberedForwardersAndForgetFreeObjectsForPigCompact */ index = 0; while (index < GIV(rememberedSetSize)) { @@ -24456,85 +24391,143 @@ longAtput(obj, (longAt(obj)) & (~(1 << 29))); /* begin followForwarded: */ assert(isForwarded(obj)); - referent2 = longAt((obj + (BaseHeaderSize)) + (0 << 2)); - while (((referent2 & 3) == 0) - && (((longAt(referent2)) & 0x3FFFFF) == 8)) { - referent2 = longAt((referent2 + (BaseHeaderSize)) + (0 << 2)); + referent1 = longAt((obj + (BaseHeaderSize)) + (0 << 2)); + while (((referent1 & 3) == 0) + && (((longAt(referent1)) & 0x3FFFFF) == 8)) { + referent1 = longAt((referent1 + (BaseHeaderSize)) + (0 << 2)); } - obj = referent2; + obj = referent1; assert(isRemembered(obj)); GIV(rememberedSet)[index] = obj; } index += 1; } } - GIV(totalFreeOldSpace) = 0; - doScavenge(DontTenureButDoUnmark); - assert(GIV(totalFreeOldSpace) == 0); - /* begin mapMachineCode */ - mapObjectReferencesInMachineCode(GIV(gcMode)); + /* begin unmarkSurvivingObjectsForPigCompact */ + /* begin allPastSpaceObjectsDo: */ + /* begin allPastSpaceEntitiesDo: */ + prevPrevObj = (prevObj = null); + /* begin objectStartingAt: */ + address = ((pastSpace()).start); + numSlots = byteAt(address + 7); + objOop1 = (numSlots == 0xFF + ? address + (BaseHeaderSize) + : address); + while ((((usqInt) objOop1)) < (((usqInt) GIV(pastSpaceStart)))) { + assert(isEnumerableObjectNoAssert(objOop1)); + if (((((usqInt) (longAt(objOop1 + 4))) >> 23) & 1) != 0) { + setIsMarkedOfto(objOop1, 0); + } + + + prevPrevObj = prevObj; + prevObj = objOop1; + objOop1 = objectAfterlimit(objOop1, GIV(pastSpaceStart)); + } + + /* begin sweepToFollowForwardersForPigCompact */ + assert((GIV(freeStart) == (((eden()).start))) + && ((futureSurvivorStart()) == (((futureSpace()).start)))); + /* begin allPastSpaceObjectsDo: */ + /* begin allPastSpaceEntitiesDo: */ + prevPrevObj2 = (prevObj2 = null); + /* begin objectStartingAt: */ + address1 = ((pastSpace()).start); + numSlots1 = byteAt(address1 + 7); + objOop12 = (numSlots1 == 0xFF + ? address1 + (BaseHeaderSize) + : address1); + while ((((usqInt) objOop12)) < (((usqInt) GIV(pastSpaceStart)))) { + assert(isEnumerableObjectNoAssert(objOop12)); + if (!(((longAt(objOop12)) & 0x3FFFFF) == 8)) { + for (i = 0, iLimiT = ((numPointerSlotsOf(objOop12)) - 1); i <= iLimiT; i += 1) { + f = longAt((objOop12 + (BaseHeaderSize)) + (i << 2)); + if (((f & 3) == 0) + && (((longAt(f)) & 0x3FFFFF) == 8)) { + /* begin followForwarded: */ + assert(isForwarded(f)); + referent2 = longAt((f + (BaseHeaderSize)) + (0 << 2)); + while (((referent2 & 3) == 0) + && (((longAt(referent2)) & 0x3FFFFF) == 8)) { + referent2 = longAt((referent2 + (BaseHeaderSize)) + (0 << 2)); + } + f = referent2; + /* begin storePointerUnchecked:ofObject:withValue: */ + assert(!(isForwarded(objOop12))); + longAtput((objOop12 + (BaseHeaderSize)) + (i << 2), f); + } + } + } + + + prevPrevObj2 = prevObj2; + prevObj2 = objOop12; + objOop12 = objectAfterlimit(objOop12, GIV(pastSpaceStart)); + } + + lowestForwarder1 = 0; /* begin allOldSpaceObjectsDo: */ /* begin allOldSpaceObjectsFrom:do: */ /* begin allOldSpaceEntitiesFrom:do: */ - prevPrevObj = (prevObj = null); - objOop1 = GIV(nilObj); + prevPrevObj11 = (prevObj11 = null); + objOop11 = GIV(nilObj); while (1) { - assert((objOop1 % (allocationUnit())) == 0); - if (!((((usqInt) objOop1)) < (((usqInt) GIV(endOfMemory))))) break; - assert((long64At(objOop1)) != 0); - if (isEnumerableObject(objOop1)) { - if (((longAt(objOop1)) & 0x3FFFFF) == 8) { + assert((objOop11 % (allocationUnit())) == 0); + if (!((((usqInt) objOop11)) < (((usqInt) GIV(endOfMemory))))) break; + assert((long64At(objOop11)) != 0); + if (isEnumerableObject(objOop11)) { + if (((longAt(objOop11)) & 0x3FFFFF) == 8) { if (lowestForwarder1 == 0) { lowestForwarder1 = 0; } } else { - for (i = 0, iLimiT = ((numPointerSlotsOf(objOop1)) - 1); i <= iLimiT; i += 1) { - f = longAt((objOop1 + (BaseHeaderSize)) + (i << 2)); + for (i = 0, iLimiT = ((numPointerSlotsOf(objOop11)) - 1); i <= iLimiT; i += 1) { + f = longAt((objOop11 + (BaseHeaderSize)) + (i << 2)); if (((f & 3) == 0) && (((longAt(f)) & 0x3FFFFF) == 8)) { /* begin followForwarded: */ assert(isForwarded(f)); - referent = longAt((f + (BaseHeaderSize)) + (0 << 2)); - while (((referent & 3) == 0) - && (((longAt(referent)) & 0x3FFFFF) == 8)) { - referent = longAt((referent + (BaseHeaderSize)) + (0 << 2)); + referent11 = longAt((f + (BaseHeaderSize)) + (0 << 2)); + while (((referent11 & 3) == 0) + && (((longAt(referent11)) & 0x3FFFFF) == 8)) { + referent11 = longAt((referent11 + (BaseHeaderSize)) + (0 << 2)); } - f = referent; + f = referent11; /* begin storePointer:ofObject:withValue: */ - assert(!(isForwarded(objOop1))); - if (isOldObject(objOop1)) { + assert(!(isForwarded(objOop11))); + if (isOldObject(objOop11)) { /* most stores into young objects */ if (((f & 3) == 0) && ((((usqInt) f)) < (((usqInt) GIV(newSpaceLimit))))) { /* begin possibleRootStoreInto: */ - if (!(((((usqInt) (longAt(objOop1))) >> 29) & 1) != 0)) { - remember(objOop1); + if (!(((((usqInt) (longAt(objOop11))) >> 29) & 1) != 0)) { + remember(objOop11); /* begin setIsRememberedOf:to: */ flag("endianness"); - longAtput(objOop1, (longAt(objOop1)) | (1 << 29)); + longAtput(objOop11, (longAt(objOop11)) | (1 << 29)); } } } - longAtput((objOop1 + (BaseHeaderSize)) + (i << 2), f); + longAtput((objOop11 + (BaseHeaderSize)) + (i << 2), f); } } } } - prevPrevObj = prevObj; - prevObj = objOop1; - objOop1 = objectAfterlimit(objOop1, GIV(endOfMemory)); + prevPrevObj11 = prevObj11; + prevObj11 = objOop11; + objOop11 = objectAfterlimit(objOop11, GIV(endOfMemory)); } lowestForwarder = lowestForwarder1; - /* begin sweepToCoallesceFreeSpaceAndRebuildFreeListsForPigCompactFrom: */ + /* begin sweepToCoallesceFreeSpaceForPigCompactFrom: */ lowest = ((((lowestForwarder == 0 ? GIV(endOfMemory) : lowestForwarder)) < ((GIV(firstFreeChunk) == 0 @@ -24544,50 +24537,82 @@ : lowestForwarder)) : ((GIV(firstFreeChunk) == 0 ? GIV(endOfMemory) : GIV(firstFreeChunk)))); - firstFree = (GIV(totalFreeOldSpace) = 0); + firstOfFreeRun = (prevPrevFree = (prevFree = 0)); /* begin allOldSpaceEntitiesFrom:do: */ prevPrevObj1 = (prevObj1 = null); - objOop2 = lowest; + objOop3 = lowest; while (1) { - assert((objOop2 % (allocationUnit())) == 0); - if (!((((usqInt) objOop2)) < (((usqInt) GIV(endOfMemory))))) break; - assert((long64At(objOop2)) != 0); - if ((((longAt(objOop2)) & 0x3FFFFF) == 0) - || (((longAt(objOop2)) & 0x3FFFFF) == 8)) { - if (firstFree == 0) { - firstFree = objOop2; - firstFreeStart = ((byteAt(objOop2 + 7)) == 0xFF - ? objOop2 - (BaseHeaderSize) - : objOop2); + assert((objOop3 % (allocationUnit())) == 0); + if (!((((usqInt) objOop3)) < (((usqInt) GIV(endOfMemory))))) break; + assert((long64At(objOop3)) != 0); + if ((((longAt(objOop3)) & 0x3FFFFF) == 0) + || (((longAt(objOop3)) & 0x3FFFFF) == 8)) { + if (firstOfFreeRun == 0) { + /* begin setObjectFree: */ + if ((byteAt(objOop3 + 7)) == 0) { + /* begin setRawNumSlotsOf:to: */ + flag("endian"); + byteAtput(objOop3 + 7, 1); + } + /* begin setFree: */ + long32Atput(objOop3, 0); + firstOfFreeRun = objOop3; + startOfFreeRun = ((byteAt(objOop3 + 7)) == 0xFF + ? objOop3 - (BaseHeaderSize) + : objOop3); } - lastFree = objOop2; + endOfFreeRun = objOop3; } else { - if (firstFree != 0) { - bytes = (addressAfter(lastFree)) - firstFreeStart; - /* begin addFreeChunkWithBytes:at: */ - freeChunkWithBytesat(bytes, firstFreeStart); - GIV(totalFreeOldSpace) += bytes; + if (firstOfFreeRun != 0) { + bytes = (addressAfter(endOfFreeRun)) - startOfFreeRun; + firstOfFreeRun = initFreeChunkWithBytesat(bytes, startOfFreeRun); + /* begin inSortedFreeListLink:to:given: */ + if (prevFree == 0) { + GIV(firstFreeChunk) = firstOfFreeRun; + } + else { + /* begin storePointer:ofFreeChunk:withUncheckedValue: */ + assert(isFreeObject(prevFree)); + longAtput((prevFree + (BaseHeaderSize)) + (0 << 2), prevPrevFree ^ firstOfFreeRun); + } + prevPrevFree = prevFree; + prevFree = firstOfFreeRun; + firstOfFreeRun = 0; } - firstFree = 0; } prevPrevObj1 = prevObj1; - prevObj1 = objOop2; - objOop2 = objectAfterlimit(objOop2, GIV(endOfMemory)); + prevObj1 = objOop3; + objOop3 = objectAfterlimit(objOop3, GIV(endOfMemory)); } - if (firstFree != 0) { - bytes = (addressAfter(lastFree)) - firstFreeStart; - /* begin addFreeChunkWithBytes:at: */ - freeChunkWithBytesat(bytes, firstFreeStart); - GIV(totalFreeOldSpace) += bytes; + if (firstOfFreeRun != 0) { + bytes = (addressAfter(endOfFreeRun)) - startOfFreeRun; + firstOfFreeRun = initFreeChunkWithBytesat(bytes, startOfFreeRun); + /* begin inSortedFreeListLink:to:given: */ + if (prevFree == 0) { + GIV(firstFreeChunk) = firstOfFreeRun; + } + else { + /* begin storePointer:ofFreeChunk:withUncheckedValue: */ + assert(isFreeObject(prevFree)); + longAtput((prevFree + (BaseHeaderSize)) + (0 << 2), prevPrevFree ^ firstOfFreeRun); + } + prevPrevFree = prevFree; + prevFree = firstOfFreeRun; + firstOfFreeRun = 0; } - GIV(firstFreeChunk) = (GIV(lastFreeChunk) = 0); - /* begin checkFreeSpace */ - assert(bitsSetInFreeSpaceMaskForAllFreeLists()); - assert(GIV(totalFreeOldSpace) == (totalFreeListBytes())); + if (prevFree != GIV(firstFreeChunk)) { + /* begin storePointer:ofFreeChunk:withValue: */ + assert(isFreeObject(prevFree)); + assert((prevPrevFree == 0) + || (isFreeObject(prevPrevFree))); + longAtput((prevFree + (BaseHeaderSize)) + (0 << 2), prevPrevFree); + } + GIV(lastFreeChunk) = prevFree; + null; assert((numberOfForwarders()) == 0); } @@ -30090,7 +30115,7 @@ the need to test firstFreeChunk when filling highestObjects. */ GIV(firstFreeChunk) = (sortedFreeChunks = (lastLargeFree = 0)); - /* begin allOldSpaceEntitiesForCoalescingDo: */ + /* begin allOldSpaceEntitiesForCoalescingFrom:do: */ prevPrevObj = (prevObj = null); objOop = GIV(nilObj); while (1) { @@ -30183,6 +30208,7 @@ } } + flag("future work"); rawNumSlotsAfter = byteAt(objOop + 7); if ((rawNumSlotsAfter != rawNumSlots) && (rawNumSlotsAfter == 0xFF)) { @@ -30288,7 +30314,7 @@ GIV(freeLists)[i] = 0; } GIV(firstFreeChunk) = (prevPrevFree = (prevFree = 0)); - /* begin allOldSpaceEntitiesForCoalescingDo: */ + /* begin allOldSpaceEntitiesForCoalescingFrom:do: */ prevPrevObj = (prevObj = null); objOop = GIV(nilObj); while (1) { @@ -30345,6 +30371,7 @@ prevFree = here; } + flag("future work"); rawNumSlotsAfter = byteAt(objOop + 7); if ((rawNumSlotsAfter != rawNumSlots) && (rawNumSlotsAfter == 0xFF)) { @@ -30422,10 +30449,18 @@ usqLong fullGC(void) { DECL_MAYBE_SQ_GLOBAL_STRUCT + usqInt bytes; sqInt cascade0; sqInt cascade01; + sqInt free; + sqInt freeObj; sqInt i; sqInt i1; + sqInt i2; + sqInt nextFree; + sqInt prevFree; + sqInt prevPrevFree; + sqInt start; sqInt traceType; GIV(needGCFlag) = 0; @@ -30480,9 +30515,6 @@ primTraceLogIndex(GIV(primTraceLogIndex) + 1); } /* begin globalGarbageCollect */ - /* begin runLeakCheckerForFullGC: */ - runLeakCheckerForFullGCexcludeUnmarkedNewSpaceObjsclassIndicesShouldBeValid(1, 0, 1); - /* return self */ assert(validObjStacks()); assert(isEmptyObjStack(GIV(markStack))); assert(isEmptyObjStack(GIV(weaklingStack))); @@ -30494,12 +30526,36 @@ freeUnmarkedObjectsAndSortAndCoalesceFreeSpaceForPigCompact(); runLeakCheckerForFullGCexcludeUnmarkedNewSpaceObjsclassIndicesShouldBeValid(1, 1, 1); - flag("future work"); - compact(); - /* begin eliminateAndFreeForwarders */ - ; @@ Diff output truncated at 50000 characters. @@

1 0

VM Maker: Cog-eem.148.mcz
by commits＠source.squeak.org 10 May '14

10 May '14

Eliot Miranda uploaded a new version of Cog to project VM Maker: http://source.squeak.org/VMMaker/Cog-eem.148.mcz ==================== Summary ==================== Name: Cog-eem.148 Author: eem Time: 10 May 2014, 6:51:48.461 am UUID: bb4be1fe-0f91-4771-ac8e-f246aa1da5e9 Ancestors: Cog-eem.147 Delete override of Time class>>milliseconds:since: which is in Kernel (at least in Squeak trunk 4.5). =============== Diff against Cog-eem.147 =============== Item was removed: - ----- Method: Time class>>milliseconds:since: (in category '*Cog-Benchmarks-SMark') ----- - milliseconds: currentTime since: lastTime - "Answer the elapsed time since last recorded in milliseconds. - Compensate for rollover." - - | delta | - delta := currentTime - lastTime. - ^ delta < 0 - ifTrue: [SmallInteger maxVal + delta] - ifFalse: [delta] - !

1 0

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

10 May '14

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.712.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.712 Author: eem Time: 9 May 2014, 8:36:18.801 pm UUID: 2f12e8dd-7da6-4358-9eb4-ba4782b7206d Ancestors: VMMaker.oscog-eem.711 Fix receiver of heapMapAtWord: and hence simulation of leak checking. Nuke the now unnecessary simulator redirect. In Spur32BitMMLECoSimulator>>heapMapAtWord: send asInteger to coerce cog methods. =============== Diff against VMMaker.oscog-eem.711 =============== Item was changed: ----- Method: CoInterpreter>>checkStackIntegrity (in category 'object memory support') ----- checkStackIntegrity "Perform an integrity/leak check using the heapMap. Assume clearLeakMapAndMapAccesibleObjects has set a bit at each object's header. Scan all objects accessible from the stack checking that every pointer points to a header. Answer if no dangling pointers were detected." | ok | <inline: false> <var: #thePage type: #'StackPage *'> <var: #theSP type: #'char *'> <var: #theFP type: #'char *'> <var: #callerFP type: #'char *'> <var: #frameRcvrOffset type: #'char *'> <var: #cogMethod type: #'CogMethod *'> ok := true. 0 to: numStackPages - 1 do: [:i| | thePage theSP theFP frameRcvrOffset callerFP oop | thePage := stackPages stackPageAt: i. (stackPages isFree: thePage) ifFalse: [thePage = stackPage ifTrue: [theSP := stackPointer. theFP := framePointer] ifFalse: [theSP := thePage headSP. theFP := thePage headFP]. "Skip the instruction pointer on top of stack of inactive pages." thePage = stackPage ifFalse: [theSP := theSP + BytesPerWord]. [frameRcvrOffset := self frameReceiverOffset: theFP. [theSP <= frameRcvrOffset] whileTrue: [oop := stackPages longAt: theSP. ((objectMemory isNonImmediate: oop) + and: [(objectMemory heapMapAtWord: (self pointerForOop: oop)) = 0]) ifTrue: - and: [(self heapMapAtWord: (self pointerForOop: oop)) = 0]) ifTrue: [self printFrameThing: 'object leak in frame temp' andFrame: theFP at: theSP. ok := false]. theSP := theSP + BytesPerWord]. (self frameHasContext: theFP) ifTrue: [oop := self frameContext: theFP. ((objectMemory isImmediate: oop) + or: [(objectMemory heapMapAtWord: (self pointerForOop: oop)) = 0]) ifTrue: - or: [(self heapMapAtWord: (self pointerForOop: oop)) = 0]) ifTrue: [self printFrameThing: 'object leak in frame ctxt' andFrame: theFP at: theFP + FoxThisContext. ok := false]. (objectMemory isContext: oop) ifFalse: [self printFrameThing: 'frame ctxt should be context' andFrame: theFP at: theFP + FoxThisContext. ok := false]. ((objectMemory isContext: oop) and: [self isMarriedOrWidowedContext: oop]) ifFalse: [self printFrameThing: 'frame ctxt should be married' andFrame: theFP at: theFP + FoxThisContext. ok := false]. ((objectMemory isContext: oop) and: [(self frameOfMarriedContext: oop) = theFP]) ifFalse: [self printFrameThing: 'frame ctxt should be married to this frame ' andFrame: theFP at: theFP + FoxThisContext. ok := false]]. (self isMachineCodeFrame: theFP) ifTrue: [| cogMethod | cogMethod := self mframeHomeMethod: theFP. + (objectMemory heapMapAtWord: (self pointerForOop: cogMethod)) = 0 ifTrue: - (self heapMapAtWord: (self pointerForOop: cogMethod)) = 0 ifTrue: [self printFrameThing: 'object leak in mframe mthd' andFrame: theFP at: theFP + FoxMethod. ok := false]] ifFalse: [oop := self iframeMethod: theFP. ((objectMemory isImmediate: oop) + or: [(objectMemory heapMapAtWord: (self pointerForOop: oop)) = 0]) ifTrue: - or: [(self heapMapAtWord: (self pointerForOop: oop)) = 0]) ifTrue: [self printFrameThing: 'object leak in iframe mthd' andFrame: theFP at: theFP + FoxMethod. ok := false]]. (callerFP := self frameCallerFP: theFP) ~= 0] whileTrue: [theSP := theFP + FoxCallerSavedIP + BytesPerWord. theFP := callerFP]. theSP := theFP + FoxCallerSavedIP + BytesPerWord. [theSP <= thePage baseAddress] whileTrue: [oop := stackPages longAt: theSP. ((objectMemory isNonImmediate: oop) + and: [(objectMemory heapMapAtWord: (self pointerForOop: oop)) = 0]) ifTrue: - and: [(self heapMapAtWord: (self pointerForOop: oop)) = 0]) ifTrue: [self printFrameThing: 'object leak in frame arg' andFrame: theFP at: theSP. ok := false]. theSP := theSP + BytesPerWord]]]. ^ok! Item was changed: ----- Method: CogObjectRepresentation>>checkValidObjectReference: (in category 'garbage collection') ----- checkValidObjectReference: anOop ^(objectMemory isImmediate: anOop) not + and: [(objectMemory heapMapAtWord: (self pointerForOop: anOop)) ~= 0]! - and: [(self heapMapAtWord: (self pointerForOop: anOop)) ~= 0]! Item was changed: ----- Method: CogObjectRepresentationForSqueakV3>>checkValidOopReference: (in category 'garbage collection') ----- checkValidOopReference: anOop ^(objectMemory isIntegerObject: anOop) + or: [(objectMemory heapMapAtWord: (self pointerForOop: anOop)) ~= 0]! - or: [(self heapMapAtWord: (self pointerForOop: anOop)) ~= 0]! Item was removed: - ----- Method: CogVMSimulator>>heapMapAtWord: (in category 'debug support') ----- - heapMapAtWord: address - ^objectMemory heapMap heapMapAtWord: address asUnsignedInteger! Item was changed: ----- Method: Spur32BitMMLECoSimulator>>heapMapAtWord: (in category 'debug support') ----- heapMapAtWord: address + ^heapMap heapMapAtWord: address asInteger! - ^heapMap heapMapAtWord: address! Item was added: + ----- Method: Spur32BitMMLESimulator>>heapMapAtWord: (in category 'debug support') ----- + heapMapAtWord: address + ^heapMap heapMapAtWord: address! Item was changed: ----- Method: StackInterpreter>>checkStackIntegrity (in category 'object memory support') ----- checkStackIntegrity "Perform an integrity/leak check using the heapMap. Assume clearLeakMapAndMapAccesibleObjects has set a bit at each object's header. Scan all objects accessible from the stack checking that every pointer points to a header. Answer if no dangling pointers were detected." | ok | <inline: false> <var: #thePage type: #'StackPage *'> <var: #theSP type: #'char *'> <var: #theFP type: #'char *'> <var: #callerFP type: #'char *'> ok := true. 0 to: numStackPages - 1 do: [:i| | thePage theSP theFP callerFP oop | thePage := stackPages stackPageAt: i. (stackPages isFree: thePage) ifFalse: [thePage = stackPage ifTrue: [theSP := stackPointer. theFP := framePointer] ifFalse: [theSP := thePage headSP. theFP := thePage headFP]. "Skip the instruction pointer on top of stack of inactive pages." thePage = stackPage ifFalse: [theSP := theSP + BytesPerWord]. [[theSP <= (theFP + FoxReceiver)] whileTrue: [oop := stackPages longAt: theSP. ((objectMemory isNonImmediate: oop) + and: [(objectMemory heapMapAtWord: (self pointerForOop: oop)) = 0]) ifTrue: - and: [(self heapMapAtWord: (self pointerForOop: oop)) = 0]) ifTrue: [self printFrameThing: 'object leak in frame temp' andFrame: theFP at: theSP. ok := false]. theSP := theSP + BytesPerWord]. (self frameHasContext: theFP) ifTrue: [oop := self frameContext: theFP. ((objectMemory isImmediate: oop) + or: [(objectMemory heapMapAtWord: (self pointerForOop: oop)) = 0]) ifTrue: - or: [(self heapMapAtWord: (self pointerForOop: oop)) = 0]) ifTrue: [self printFrameThing: 'object leak in frame ctxt' andFrame: theFP at: theFP + FoxThisContext. ok := false]. (objectMemory isContext: oop) ifFalse: [self printFrameThing: 'frame ctxt should be context' andFrame: theFP at: theFP + FoxThisContext. ok := false]. ((objectMemory isContext: oop) and: [self isMarriedOrWidowedContext: oop]) ifFalse: [self printFrameThing: 'frame ctxt should be married' andFrame: theFP at: theFP + FoxThisContext. ok := false]. ((objectMemory isContext: oop) and: [(self isMarriedOrWidowedContext: oop) and: [(self frameOfMarriedContext: oop) = theFP]]) ifFalse: [self printFrameThing: 'frame ctxt should be married to this frame ' andFrame: theFP at: theFP + FoxThisContext. ok := false]]. oop := self frameMethod: theFP. ((objectMemory isImmediate: oop) + or: [(objectMemory heapMapAtWord: (self pointerForOop: oop)) = 0]) ifTrue: - or: [(self heapMapAtWord: (self pointerForOop: oop)) = 0]) ifTrue: [self printFrameThing: 'object leak in frame mthd' andFrame: theFP at: theFP + FoxMethod. ok := false]. (callerFP := self frameCallerFP: theFP) ~= 0] whileTrue: [theSP := theFP + FoxCallerSavedIP + BytesPerWord. theFP := callerFP]. theSP := theFP + FoxCallerSavedIP + BytesPerWord. [theSP <= thePage baseAddress] whileTrue: [oop := stackPages longAt: theSP. ((objectMemory isNonImmediate: oop) + and: [(objectMemory heapMapAtWord: (self pointerForOop: oop)) = 0]) ifTrue: - and: [(self heapMapAtWord: (self pointerForOop: oop)) = 0]) ifTrue: [self printFrameThing: 'object leak in frame arg' andFrame: theFP at: theSP. ok := false]. theSP := theSP + BytesPerWord]]]. ^ok! Item was removed: - ----- Method: StackInterpreterSimulator>>heapMapAtWord: (in category 'debug support') ----- - heapMapAtWord: address - ^objectMemory heapMap heapMapAtWord: address!

1 0

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

10 May '14

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.711.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.711 Author: eem Time: 9 May 2014, 4:11:21.064 pm UUID: a8207038-3c80-4bb7-919a-7018c5ac3528 Ancestors: VMMaker.oscog-eem.710 Revise pigCompact to maintain the doubly-linked free list after sweepToCoallesceFreeSpaceForPigCompactFrom:. This means pigCompact can now be repeated. Repeat pigCompact 3 times, which appears to compact well. This needs lots of profiling!! =============== Diff against VMMaker.oscog-eem.710 =============== Item was added: + ----- Method: Spur32BitMMLESimulator>>inSortedFreeListLink:to:given: (in category 'compaction') ----- + inSortedFreeListLink: freeChunk to: nextFree given: prevFree + "thisContext sender selector = #sweepToCoallesceFreeSpaceForPigCompactFrom: ifTrue: + [| pit | + pit := [:label :thing| + coInterpreter print: label; space; printHex: thing. + (thing ~= 0 and: [self isFreeObject: thing]) ifTrue: + [coInterpreter print: ' (free) ']]. + pit value: 'link ' value: freeChunk. + pit value: ' to ' value: nextFree. + pit value: ' from ' value: prevFree. + coInterpreter cr]." + "freeChunk = 16r10B0730 ifTrue: + [self halt]." + super inSortedFreeListLink: freeChunk to: nextFree given: prevFree! Item was removed: - ----- Method: SpurMemoryManager>>allOldSpaceEntitiesForCoalescingDo: (in category 'object enumeration') ----- - allOldSpaceEntitiesForCoalescingDo: aBlock - <inline: true> - | prevObj prevPrevObj objOop rawNumSlots rawNumSlotsAfter | - prevPrevObj := prevObj := nil. - objOop := self firstObject. - [self assert: objOop \\ self allocationUnit = 0. - self oop: objOop isLessThan: endOfMemory] whileTrue: - [self assert: (self long64At: objOop) ~= 0. - rawNumSlots := self rawNumSlotsOf: objOop. - aBlock value: objOop. - "If the number of slot changes coalescing changed an object from a single to a double header." - rawNumSlotsAfter := self rawNumSlotsOf: objOop. - (rawNumSlotsAfter ~= rawNumSlots - and: [rawNumSlotsAfter = self numSlotsMask]) ifTrue: - [objOop := objOop + self baseHeaderSize. - self assert: (self objectAfter: prevObj limit: endOfMemory) = objOop]. - prevPrevObj := prevObj. - prevObj := objOop. - objOop := self objectAfter: objOop limit: endOfMemory]. - self touch: prevPrevObj. - self touch: prevObj! Item was added: + ----- Method: SpurMemoryManager>>allOldSpaceEntitiesForCoalescingFrom:do: (in category 'object enumeration') ----- + allOldSpaceEntitiesForCoalescingFrom: firstObj do: aBlock + <inline: true> + | prevObj prevPrevObj objOop rawNumSlots rawNumSlotsAfter | + prevPrevObj := prevObj := nil. + objOop := firstObj. + [self assert: objOop \\ self allocationUnit = 0. + self oop: objOop isLessThan: endOfMemory] whileTrue: + [self assert: (self long64At: objOop) ~= 0. + rawNumSlots := self rawNumSlotsOf: objOop. + aBlock value: objOop. + "If the number of slot changes coalescing changed an object from a single to a double header. + In future have the block return the vaue. It should know when things change." + self flag: 'future work'. + rawNumSlotsAfter := self rawNumSlotsOf: objOop. + (rawNumSlotsAfter ~= rawNumSlots + and: [rawNumSlotsAfter = self numSlotsMask]) ifTrue: + [objOop := objOop + self baseHeaderSize. + self assert: (self objectAfter: prevObj limit: endOfMemory) = objOop]. + prevPrevObj := prevObj. + prevObj := objOop. + objOop := self objectAfter: objOop limit: endOfMemory]. + self touch: prevPrevObj. + self touch: prevObj! Item was changed: ----- Method: SpurMemoryManager>>eliminateAndFreeForwardersForPigCompact (in category 'gc - global') ----- eliminateAndFreeForwardersForPigCompact "As the final phase of global garbage collect, sweep the heap to follow forwarders, then free forwarders, coalescing with free space as we go." <inline: false> | lowestForwarder | self assert: (self isForwarded: nilObj) not. self assert: (self isForwarded: falseObj) not. self assert: (self isForwarded: trueObj) not. self assert: (self isForwarded: self freeListsObj) not. self assert: (self isForwarded: hiddenRootsObj) not. self assert: (self isForwarded: classTableFirstPage) not. self followSpecialObjectsOop. self followForwardedObjStacks. coInterpreter mapInterpreterOops. scavenger followRememberedForwardersAndForgetFreeObjectsForPigCompact. self unmarkSurvivingObjectsForPigCompact. lowestForwarder := self sweepToFollowForwardersForPigCompact. + self sweepToCoallesceFreeSpaceForPigCompactFrom: lowestForwarder. - self sweepToCoallesceFreeSpaceAndRebuildFreeListsForPigCompactFrom: lowestForwarder. - self checkFreeSpace. self assert: self numberOfForwarders = 0! Item was changed: ----- Method: SpurMemoryManager>>freeUnmarkedObjectsAndSortAndCoalesceFreeSpaceForFitCompact (in category 'gc - global') ----- freeUnmarkedObjectsAndSortAndCoalesceFreeSpaceForFitCompact "Sweep all of old space, freeing unmarked objects, coalescing free chunks, and sorting free space. Small free chunks are sorted in address order on each small list head. Large free chunks are sorted on the sortedFreeChunks list. Record as many of the highest objects as there is room for in highestObjects, a circular buffer, for the use of exactFitCompact. Use unused eden space for highestObjects. If highestObjects does not wrap, store 0 at highestObjects last. Record the lowest free object in firstFreeChunk. Let the segmentManager mark which segments contain pinned objects via notePinned:." | lastLargeFree lastHighest highestObjectsWraps sortedFreeChunks | <inline: false> <var: #lastHighest type: #usqInt> self checkFreeSpace. scavenger forgetUnmarkedRememberedObjects. segmentManager prepareForGlobalSweep."for notePinned:" "for sorting free space throw away the list heads, rebuilding them for small free chunks below." self resetFreeListHeads. highestObjects initializeStart: freeStart limit: scavenger eden limit. lastHighest := highestObjects start - self wordSize. "a.k.a. freeStart - wordSize" highestObjectsWraps := 0. self assert: highestObjects limit - highestObjects start // self wordSize >= 1024. firstFreeChunk := sortedFreeChunks := lastLargeFree := 0. "Note that if we were truly striving for performance we could split the scan into two phases, one up to the first free object and one after, which would remove the need to test firstFreeChunk when filling highestObjects." + self allOldSpaceEntitiesForCoalescingFrom: self firstObject do: - self allOldSpaceEntitiesForCoalescingDo: [:o| self assert: (firstFreeChunk = 0 or: [self isFreeObject: firstFreeChunk]). (self isMarked: o) ifTrue: "forwarders should have been followed in markAndTrace:" [self assert: (self isForwarded: o) not. self setIsMarkedOf: o to: false. "this will unmark bridges. undo the damage in notePinned:" (self isPinned: o) ifTrue: [segmentManager notePinned: o]. firstFreeChunk ~= 0 ifTrue: [false "conceptually...: " ifTrue: [highestObjects addLast: o] ifFalse: "but we inline so we can use the local lastHighest" [(lastHighest := lastHighest + self wordSize) >= highestObjects limit ifTrue: [highestObjectsWraps := highestObjectsWraps + 1. lastHighest := highestObjects start]. self longAt: lastHighest put: o]]] ifFalse: "unmarked; two cases, an unreachable object or a free chunk." [| here | here := self coallesceFreeChunk: o. (self isLargeFreeObject: here) ifTrue: [self setFree: here. lastLargeFree = 0 ifTrue: [sortedFreeChunks := lastLargeFree := here] ifFalse: [self storePointer: self freeChunkNextAddressIndex ofFreeChunk: lastLargeFree withValue: here]. lastLargeFree := here] ifFalse: [self freeSmallObject: here]. firstFreeChunk = 0 ifTrue: [self assert: (self isFreeObject: here). firstFreeChunk := here]]]. highestObjects last: lastHighest. highestObjectsWraps ~= 0 ifTrue: [highestObjects first: (lastHighest + self wordSize >= highestObjects limit ifTrue: [highestObjects start] ifFalse: [lastHighest + self wordSize])]. lastLargeFree ~= 0 ifTrue: [self storePointer: self freeChunkNextAddressIndex ofFreeChunk: lastLargeFree withValue: 0]. totalFreeOldSpace := self reverseSmallListHeads. totalFreeOldSpace := totalFreeOldSpace + (self rebuildFreeTreeFrom: sortedFreeChunks). self checkFreeSpace. self touch: highestObjectsWraps! Item was changed: ----- Method: SpurMemoryManager>>freeUnmarkedObjectsAndSortAndCoalesceFreeSpaceForPigCompact (in category 'gc - global') ----- freeUnmarkedObjectsAndSortAndCoalesceFreeSpaceForPigCompact "Sweep all of old space, freeing unmarked objects, coalescing free chunks, and sorting free space. Doubly-link the free chunks in address order through the freeChunkNextIndex field using the xor trick to use only one field, see e.g. The Art of Computer Programming, Vol 1, D.E. Knuth, 3rd Ed, Sec 2.2.4 `Circular Lists', exercise. 18 http://en.wikipedia.org/wiki/XOR_linked_list. Record the lowest free object in firstFreeChunk and the highest in lastFreeChunk. Let the segmentManager mark which segments contain pinned objects via notePinned:." | prevPrevFree prevFree | <inline: false> self checkFreeSpace. scavenger forgetUnmarkedRememberedObjects. self doScavenge: MarkOnTenure. segmentManager prepareForGlobalSweep."for notePinned:" "throw away the list heads, including the tree." self resetFreeListHeads. firstFreeChunk := prevPrevFree := prevFree := 0. + self allOldSpaceEntitiesForCoalescingFrom: self firstObject do: - self allOldSpaceEntitiesForCoalescingDo: [:o| self assert: (firstFreeChunk = 0 or: [self isFreeObject: firstFreeChunk]). (self isMarked: o) ifTrue: "forwarders should have been followed in markAndTrace:" [self assert: (self isForwarded: o) not. self setIsMarkedOf: o to: false. "this will unmark bridges. undo the damage in notePinned:" (self isPinned: o) ifTrue: [segmentManager notePinned: o]] ifFalse: "unmarked; two cases, an unreachable object or a free chunk." [| here | self assert: (self isRemembered: o) not. "scavenger should have cleared this above" here := self coallesceFreeChunk: o. self setObjectFree: here. self inSortedFreeListLink: prevFree to: here given: prevPrevFree. prevPrevFree := prevFree. prevFree := here]]. prevFree ~= firstFreeChunk ifTrue: [self storePointer: self freeChunkNextIndex ofFreeChunk: prevFree withValue: prevPrevFree]. lastFreeChunk := prevFree. self cCode: [] inSmalltalk: [self checkTraversableSortedFreeList]! Item was changed: ----- Method: SpurMemoryManager>>globalGarbageCollect (in category 'gc - global') ----- globalGarbageCollect self assert: self validObjStacks. self assert: (self isEmptyObjStack: markStack). self assert: (self isEmptyObjStack: weaklingStack). self markObjects. self expungeDuplicateAndUnmarkedClasses: true. self nilUnmarkedWeaklingSlots. self freeUnmarkedObjectsAndSortAndCoalesceFreeSpace. "Mid-way the leak check must be more lenient. Unmarked classes will have been expunged from the table, but unmarked instances will not yet have been reclaimed." self runLeakCheckerForFullGC: true excludeUnmarkedNewSpaceObjs: true classIndicesShouldBeValid: true. + UseFitCompact + ifTrue: + [self compact. + self eliminateAndFreeForwarders] + ifFalse: + [1 to: 3 do: + [:i| + self pigCompact. + self eliminateAndFreeForwardersForPigCompact]. + self rebuildFreeListsForPigCompact]. - "At least for pigCompact it is worth repeating these two phases to get better compaction, - for example during snapshot. In which case the code needs to be reorganized to not - rebuild the free list after compact, but instead just coallesce, and maintain the sorted free - list until compaction has been repeated sufficiently (an experiment showed no improvement - after 3 repetitions, but a useful gain of ~ 200k in a small image on the third iteration." - self flag: 'future work'. - self compact. - self eliminateAndFreeForwarders. self assert: self validObjStacks. self assert: (self isEmptyObjStack: markStack). self assert: (self isEmptyObjStack: weaklingStack). self assert: self allObjectsUnmarked. self runLeakCheckerForFullGC: true! Item was added: + ----- Method: SpurMemoryManager>>rebuildFreeListsForPigCompact (in category 'compaction') ----- + rebuildFreeListsForPigCompact + "Rebuild the free lists from the doubly-linked free list." + totalFreeOldSpace := 0. + self sortedFreeListDo: + [:freeObj| | start bytes | + bytes := (self bytesInObject: freeObj). + start := self startOfObject: freeObj. + self addFreeChunkWithBytes: bytes at: start]! Item was added: + ----- Method: SpurMemoryManager>>sortedFreeListDo: (in category 'compaction') ----- + sortedFreeListDo: aBlock + "Evaluate aBlock with ascending entries in the free list" + | free nextFree prevFree prevPrevFree | + <inline: true> + free := firstFreeChunk. + prevPrevFree := prevFree := 0. + [free ~= 0] whileTrue: + [nextFree := self nextInSortedFreeListLink: free given: prevFree. + self assert: (self isFreeObject: free). + self assert: (nextFree = 0 or: [nextFree > free and: [self isFreeObject: nextFree]]). + self assert: (prevFree = 0 or: [prevFree < free]). + aBlock value: free. + prevPrevFree := prevFree. + prevFree := free. + free := nextFree]! Item was changed: ----- Method: SpurMemoryManager>>sortedFreeListPairwiseReverseDo: (in category 'compaction') ----- sortedFreeListPairwiseReverseDo: aBinaryBlock "Evaluate aBinaryBlock with adjacent entries in the free list, from high address to low address. The second argument is in fact the start of the next free chunk, not the free chunk itself. Use endOfMemory - bridgeSize as the second argument in the first evaluation." | free nextFree prevFree prevPrevFree | + <inline: true> free := lastFreeChunk. prevPrevFree := prevFree := 0. [free ~= 0] whileTrue: [nextFree := self nextInSortedFreeListLink: free given: prevFree. self assert: (free = 0 or: [self isFreeObject: free]). self assert: (prevFree = 0 or: [prevFree > free]). aBinaryBlock value: free value: (prevFree = 0 ifTrue: [endOfMemory - self bridgeSize] ifFalse: [self startOfObject: prevFree]). self assert: (prevFree = 0 or: [self isFreeObject: prevFree]). self assert: (prevPrevFree = 0 or: [self isFreeObject: prevPrevFree]). (self isFreeObject: free) ifFalse: [free := self nextInSortedFreeListLink: prevFree given: prevPrevFree]. (nextFree = 0 or: [self isFreeObject: nextFree]) ifTrue: [prevPrevFree := prevFree. prevFree := free. free := nextFree] ifFalse: [free := lastFreeChunk. prevPrevFree := prevFree := 0. [free > nextFree] whileTrue: [nextFree := self nextInSortedFreeListLink: free given: prevFree. self assert: (self isFreeObject: nextFree). prevPrevFree := prevFree. prevFree := free. free := nextFree]]]! Item was changed: ----- Method: SpurMemoryManager>>sweepToCoallesceFreeSpaceAndRebuildFreeListsForPigCompactFrom: (in category 'compaction') ----- sweepToCoallesceFreeSpaceAndRebuildFreeListsForPigCompactFrom: lowestForwarder "Coallesce free chunks and forwarders and rebuild the free list." | lowest firstFree firstFreeStart lastFree | lowest := (lowestForwarder = 0 ifTrue: [endOfMemory] ifFalse: [lowestForwarder]) min: (firstFreeChunk = 0 ifTrue: [endOfMemory] ifFalse: [firstFreeChunk]). firstFree := totalFreeOldSpace := 0. + self allOldSpaceEntitiesForCoalescingFrom: lowest do: - self allOldSpaceEntitiesFrom: lowest do: [:o| ((self isFreeObject: o) or: [self isForwarded: o]) ifTrue: [firstFree = 0 ifTrue: [firstFree := o. firstFreeStart := self startOfObject: o]. lastFree := o] ifFalse: [firstFree ~= 0 ifTrue: [| bytes | bytes := (self addressAfter: lastFree) - firstFreeStart. self addFreeChunkWithBytes: bytes at: firstFreeStart]. firstFree := 0]]. firstFree ~= 0 ifTrue: [| bytes | bytes := (self addressAfter: lastFree) - firstFreeStart. self addFreeChunkWithBytes: bytes at: firstFreeStart]. firstFreeChunk := lastFreeChunk := 0! Item was added: + ----- Method: SpurMemoryManager>>sweepToCoallesceFreeSpaceForPigCompactFrom: (in category 'compaction') ----- + sweepToCoallesceFreeSpaceForPigCompactFrom: lowestForwarder + "Coallesce free chunks and forwarders, maintaining the doubly-linked free list." + | lowest firstOfFreeRun startOfFreeRun endOfFreeRun prevPrevFree prevFree | + lowest := (lowestForwarder = 0 ifTrue: [endOfMemory] ifFalse: [lowestForwarder]) + min: (firstFreeChunk = 0 ifTrue: [endOfMemory] ifFalse: [firstFreeChunk]). + firstOfFreeRun := prevPrevFree := prevFree := 0. + self allOldSpaceEntitiesFrom: lowest do: + [:o| + ((self isFreeObject: o) or: [self isForwarded: o]) + ifTrue: + [firstOfFreeRun = 0 ifTrue: + [self setObjectFree: o. + firstOfFreeRun := o. + startOfFreeRun := self startOfObject: o]. + endOfFreeRun := o] + ifFalse: + [firstOfFreeRun ~= 0 ifTrue: + [| bytes | + bytes := (self addressAfter: endOfFreeRun) - startOfFreeRun. + firstOfFreeRun := self initFreeChunkWithBytes: bytes at: startOfFreeRun. + self inSortedFreeListLink: prevFree to: firstOfFreeRun given: prevPrevFree. + prevPrevFree := prevFree. + prevFree := firstOfFreeRun. + firstOfFreeRun := 0]]]. + firstOfFreeRun ~= 0 ifTrue: + [| bytes | + bytes := (self addressAfter: endOfFreeRun) - startOfFreeRun. + firstOfFreeRun := self initFreeChunkWithBytes: bytes at: startOfFreeRun. + self inSortedFreeListLink: prevFree to: firstOfFreeRun given: prevPrevFree. + prevPrevFree := prevFree. + prevFree := firstOfFreeRun. + firstOfFreeRun := 0]. + prevFree ~= firstFreeChunk ifTrue: + [self storePointer: self freeChunkNextIndex + ofFreeChunk: prevFree + withValue: prevPrevFree]. + lastFreeChunk := prevFree. + self cCode: [] inSmalltalk: [self checkTraversableSortedFreeList]!

1 0

VM Maker: VMMaker.oscog-eem.710.mcz
by commits＠source.squeak.org 09 May '14

09 May '14

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.710.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.710 Author: eem Time: 9 May 2014, 1:48:04.592 pm UUID: 4941dccb-3db2-4b61-ab4e-55a912e9093b Ancestors: VMMaker.oscog-eem.709 Spur: Move running of leak checker (which computes the leak map) to markObjects from clients and hence cure assert failures during GC in the Cogit. Revise unmarking and mapping during eliminateAndFreeForwardersForPigCompact. Instead of a scavenge merely mapInterpreterOops and explicitly (via added) unmarkSurvivingObjectsForPigCompact. Fix slip in fUOASACFSFPC. Fix remapObj: to not copyAndForward: unless a scavenge is in progress. With these changes the Newspeak bootstrap runs to completion on the NS Spur Cog VM. =============== Diff against VMMaker.oscog-eem.709 =============== Item was changed: ----- Method: Spur32BitMMLECoSimulator>>globalGarbageCollect (in category 'gc - global') ----- globalGarbageCollect + self halt: 'GC number ', statFullGCs printString. - self halt. ^super globalGarbageCollect! Item was changed: ----- Method: SpurMemoryManager>>allInstancesOf: (in category 'primitive support') ----- allInstancesOf: aClass "Attempt to answer an array of all objects, excluding those that may be garbage collected as a side effect of allocating the result array. If no memory is available answer the number of instances as a SmallInteger. Since objects are at least 16 bytes big, and the largest SmallInteger covers 1/4 of the address space, the count can never overflow." | classIndex freeChunk ptr start limit count bytes | classIndex := self rawHashBitsOf: aClass. (classIndex = 0 or: [aClass ~~ (self classOrNilAtIndex: classIndex)]) ifTrue: [freeChunk := self allocateSlots: 0 format: self arrayFormat classIndex: ClassArrayCompactIndex. ^freeChunk]. - self runLeakCheckerForFullGC: false. self markObjects. "don't want to revive objects unnecessarily." freeChunk := self allocateLargestFreeChunk. ptr := start := freeChunk + self baseHeaderSize. limit := self addressAfter: freeChunk. count := 0. self allHeapEntitiesDo: [:obj| "continue enumerating even if no room so as to unmark all objects." (self isMarked: obj) ifTrue: [(self isNormalObject: obj) ifTrue: [self setIsMarkedOf: obj to: false. (self classIndexOf: obj) = classIndex ifTrue: [count := count + 1. ptr < limit ifTrue: [self longAt: ptr put: obj. ptr := ptr + self bytesPerSlot]]] ifFalse: [(self isSegmentBridge: obj) ifFalse: [self setIsMarkedOf: obj to: false]]]]. self assert: self allObjectsUnmarked. self assert: (self isEmptyObjStack: markStack). self emptyObjStack: weaklingStack. (count > (ptr - start / self bytesPerSlot) "not enough room" or: [limit ~= ptr and: [limit - ptr <= self allocationUnit]]) ifTrue: "can't split a single word" [self freeObject: freeChunk. ^self integerObjectOf: count]. count < self numSlotsMask ifTrue: [| smallObj | smallObj := self allocateSlots: count format: self arrayFormat classIndex: ClassArrayCompactIndex. 0 to: count - 1 do: [:i| self storePointerUnchecked: i ofObject: smallObj withValue: (self fetchPointer: i ofObject: freeChunk)]. self freeChunkWithBytes: (self bytesInObject: freeChunk) at: (self startOfObject: freeChunk). self beRootIfOld: smallObj. self checkFreeSpace. ^smallObj]. bytes := self largeObjectBytesForSlots: count. start := self startOfObject: freeChunk. self freeChunkWithBytes: limit - start - bytes at: start + bytes. totalFreeOldSpace := totalFreeOldSpace - bytes. self setOverflowNumSlotsOf: freeChunk to: count. self set: freeChunk classIndexTo: ClassArrayCompactIndex formatTo: self arrayFormat. self possibleRootStoreInto: freeChunk. self checkFreeSpace. self runLeakCheckerForFullGC: false. ^freeChunk ! Item was changed: ----- Method: SpurMemoryManager>>allObjects (in category 'primitive support') ----- allObjects "Attempt to answer an array of all objects, excluding those that may be garbage collected as a side effect of allocating the result array. If no memory is available answer the number of objects as a SmallInteger. Since objects are at least 16 bytes big, and the largest SmallInteger covers 1/4 of the address space, the count can never overflow." | freeChunk ptr start limit count bytes | - self runLeakCheckerForFullGC: false. self markObjects. "don't want to revive objects unnecessarily." freeChunk := self allocateLargestFreeChunk. ptr := start := freeChunk + self baseHeaderSize. limit := self addressAfter: freeChunk. count := 0. self allHeapEntitiesDo: [:obj| "continue enumerating even if no room so as to unmark all objects." (self isMarked: obj) ifTrue: [(self isNormalObject: obj) ifTrue: [self setIsMarkedOf: obj to: false. count := count + 1. ptr < limit ifTrue: [self longAt: ptr put: obj. ptr := ptr + self bytesPerSlot]] ifFalse: [(self isSegmentBridge: obj) ifFalse: [self setIsMarkedOf: obj to: false]]]]. self assert: self allObjectsUnmarked. self assert: (self isEmptyObjStack: markStack). self emptyObjStack: weaklingStack. self assert: count >= self numSlotsMask. (count > (ptr - start / self bytesPerSlot) "not enough room" or: [limit ~= ptr and: [limit - ptr <= self allocationUnit]]) ifTrue: "can't split a single word" [self freeChunkWithBytes: (self bytesInObject: freeChunk) at: (self startOfObject: freeChunk). self checkFreeSpace. ^self integerObjectOf: count]. bytes := self largeObjectBytesForSlots: count. start := self startOfObject: freeChunk. self freeChunkWithBytes: limit - start - bytes at: start + bytes. totalFreeOldSpace := totalFreeOldSpace - bytes. self setOverflowNumSlotsOf: freeChunk to: count. self set: freeChunk classIndexTo: ClassArrayCompactIndex formatTo: self arrayFormat. self possibleRootStoreInto: freeChunk. self checkFreeSpace. self runLeakCheckerForFullGC: false. ^freeChunk ! Item was changed: ----- Method: SpurMemoryManager>>eliminateAndFreeForwardersForPigCompact (in category 'gc - global') ----- eliminateAndFreeForwardersForPigCompact "As the final phase of global garbage collect, sweep the heap to follow forwarders, then free forwarders, coalescing with free space as we go." <inline: false> | lowestForwarder | self assert: (self isForwarded: nilObj) not. self assert: (self isForwarded: falseObj) not. self assert: (self isForwarded: trueObj) not. self assert: (self isForwarded: self freeListsObj) not. self assert: (self isForwarded: hiddenRootsObj) not. self assert: (self isForwarded: classTableFirstPage) not. self followSpecialObjectsOop. - "N.B. we don't have to explicitly do mapInterpreterOops since the scavenge below - will do it, except that scavenging maps only young references in machine code." self followForwardedObjStacks. + coInterpreter mapInterpreterOops. scavenger followRememberedForwardersAndForgetFreeObjectsForPigCompact. + self unmarkSurvivingObjectsForPigCompact. - "Because of the flushEden before markObjects the scavenge /should not/ - tenure. In fact it must not because the free list has not been rebuilt, so - there is no space, and any attempt to tenure will allocate a new segment." - totalFreeOldSpace := 0. - self doScavenge: DontTenureButDoUnmark. - self assert: totalFreeOldSpace = 0. - coInterpreter mapMachineCode: GCModeFull. lowestForwarder := self sweepToFollowForwardersForPigCompact. self sweepToCoallesceFreeSpaceAndRebuildFreeListsForPigCompactFrom: lowestForwarder. self checkFreeSpace. self assert: self numberOfForwarders = 0! Item was changed: ----- Method: SpurMemoryManager>>freeUnmarkedObjectsAndSortAndCoalesceFreeSpaceForPigCompact (in category 'gc - global') ----- freeUnmarkedObjectsAndSortAndCoalesceFreeSpaceForPigCompact "Sweep all of old space, freeing unmarked objects, coalescing free chunks, and sorting free space. Doubly-link the free chunks in address order through the freeChunkNextIndex field using the xor trick to use only one field, see e.g. The Art of Computer Programming, Vol 1, D.E. Knuth, 3rd Ed, Sec 2.2.4 `Circular Lists', exercise. 18 http://en.wikipedia.org/wiki/XOR_linked_list. Record the lowest free object in firstFreeChunk and the highest in lastFreeChunk. Let the segmentManager mark which segments contain pinned objects via notePinned:." | prevPrevFree prevFree | <inline: false> self checkFreeSpace. - "Using pigCompact we scavenge to unmark objects before the free list has been - rebuilt, and that scavenge must not tenure. So get tenuring out of the way now." scavenger forgetUnmarkedRememberedObjects. + self doScavenge: MarkOnTenure. - self self doScavenge: MarkOnTenure. segmentManager prepareForGlobalSweep."for notePinned:" "throw away the list heads, including the tree." self resetFreeListHeads. firstFreeChunk := prevPrevFree := prevFree := 0. self allOldSpaceEntitiesForCoalescingDo: [:o| self assert: (firstFreeChunk = 0 or: [self isFreeObject: firstFreeChunk]). (self isMarked: o) ifTrue: "forwarders should have been followed in markAndTrace:" [self assert: (self isForwarded: o) not. self setIsMarkedOf: o to: false. "this will unmark bridges. undo the damage in notePinned:" (self isPinned: o) ifTrue: [segmentManager notePinned: o]] ifFalse: "unmarked; two cases, an unreachable object or a free chunk." [| here | self assert: (self isRemembered: o) not. "scavenger should have cleared this above" here := self coallesceFreeChunk: o. self setObjectFree: here. self inSortedFreeListLink: prevFree to: here given: prevPrevFree. prevPrevFree := prevFree. prevFree := here]]. prevFree ~= firstFreeChunk ifTrue: [self storePointer: self freeChunkNextIndex ofFreeChunk: prevFree withValue: prevPrevFree]. lastFreeChunk := prevFree. self cCode: [] inSmalltalk: [self checkTraversableSortedFreeList]! Item was changed: ----- Method: SpurMemoryManager>>globalGarbageCollect (in category 'gc - global') ----- globalGarbageCollect - self runLeakCheckerForFullGC: true. self assert: self validObjStacks. self assert: (self isEmptyObjStack: markStack). self assert: (self isEmptyObjStack: weaklingStack). self markObjects. self expungeDuplicateAndUnmarkedClasses: true. self nilUnmarkedWeaklingSlots. self freeUnmarkedObjectsAndSortAndCoalesceFreeSpace. "Mid-way the leak check must be more lenient. Unmarked classes will have been expunged from the table, but unmarked instances will not yet have been reclaimed." self runLeakCheckerForFullGC: true excludeUnmarkedNewSpaceObjs: true classIndicesShouldBeValid: true. "At least for pigCompact it is worth repeating these two phases to get better compaction, for example during snapshot. In which case the code needs to be reorganized to not rebuild the free list after compact, but instead just coallesce, and maintain the sorted free list until compaction has been repeated sufficiently (an experiment showed no improvement after 3 repetitions, but a useful gain of ~ 200k in a small image on the third iteration." self flag: 'future work'. self compact. self eliminateAndFreeForwarders. self assert: self validObjStacks. self assert: (self isEmptyObjStack: markStack). self assert: (self isEmptyObjStack: weaklingStack). self assert: self allObjectsUnmarked. self runLeakCheckerForFullGC: true! Item was changed: ----- Method: SpurMemoryManager>>markObjects (in category 'gc - global') ----- markObjects <inline: false> "Mark all accessible objects." "If the incremental collector is running mark bits may be set; stop it and clear them if necessary." self cCode: '' inSmalltalk: [coInterpreter transcript nextPutAll: 'marking...'; flush]. + self runLeakCheckerForFullGC: true. + self ensureAllMarkBitsAreZero. self ensureAdequateClassTableBitmap. self initializeUnscannedEphemerons. self initializeMarkStack. self initializeWeaklingStack. self markAccessibleObjects! Item was changed: ----- Method: SpurMemoryManager>>remapObj: (in category 'gc - scavenging') ----- remapObj: objOop + "Scavenge or simply follow objOop. Answer the new location of objOop. + The send should have been guarded by a send of shouldRemapOop:. - "Scavenge or simply follow objOop. Answer the new location of objOop. The - send should have been guarded by a send of shouldRemapOop: or shouldScavengeObj:. The method is called remapObj: for compatibility with ObjectMemory." <api> <inline: false> | resolvedObj | self assert: (self shouldRemapOop: objOop). (self isForwarded: objOop) ifTrue: [resolvedObj := self followForwarded: objOop. (self isInFutureSpace: resolvedObj) ifTrue: "already scavenged" [^resolvedObj]] ifFalse: [resolvedObj := objOop]. + (scavengeInProgress + and: [self isReallyYoung: resolvedObj]) ifFalse: "a becommed or compacted object whose target is in old space, or a CogMethod." - (self isReallyYoung: resolvedObj) ifFalse: "a becommed or compacted object whose target is in old space, or a CogMethod." [^resolvedObj]. ^scavenger copyAndForward: resolvedObj! Item was added: + ----- Method: SpurMemoryManager>>unmarkSurvivingObjectsForPigCompact (in category 'gc - global') ----- + unmarkSurvivingObjectsForPigCompact + self allPastSpaceObjectsDo: + [:objOop| + (self isMarked: objOop) ifTrue: + [self setIsMarkedOf: objOop to: false]]!

1 0

VM Maker: VMMaker.oscog-eem.709.mcz
by commits＠source.squeak.org 09 May '14

09 May '14

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.709.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.709 Author: eem Time: 9 May 2014, 11:19:07.459 am UUID: c02c4c66-6d97-4c82-8c28-12766fc8b13d Ancestors: VMMaker.oscog-eem.708 Slang: Fix (i.e. prevent) inlining of api methods in the Cogit used in the CoInterpreter and vice verce. When "adding" a method marked <doNotImplement> make sure that any inherited version of the method is removed. Remove an obsolete def of CoInterpreter>>freeStart. =============== Diff against VMMaker.oscog-eem.708 =============== Item was changed: ----- Method: CCodeGenerator>>addMethodFor:selector: (in category 'utilities') ----- addMethodFor: aClass selector: selector "Add the given method to the code base and answer its translation or nil if it shouldn't be translated." | method tmethod | selector == #initialize ifTrue: [^nil]. method := aClass compiledMethodAt: selector. (method pragmaAt: #doNotGenerate) ifNotNil: + [methods removeKey: selector ifAbsent: []. + ^nil]. - [^nil]. method isSubclassResponsibility ifTrue: + [methods removeKey: selector ifAbsent: []. + ^nil]. - [^nil]. (self shouldIncludeMethodFor: aClass selector: selector) ifFalse: + [methods removeKey: selector ifAbsent: []. + ^nil]. - [^nil]. tmethod := self addMethod: (self compileToTMethodSelector: selector in: aClass). "If the method has a macro then add the macro. But keep the method for analysis purposes (e.g. its variable accesses)." (method pragmaAt: #cmacro:) ifNotNil: [:pragma| self addMacro: (pragma argumentAt: 1) for: selector. (inlineList includes: selector) ifTrue: [inlineList := inlineList copyWithout: selector]]. (method propertyValueAt: #cmacro:) ifNotNil: [:macro| self addMacro: macro for: selector. (inlineList includes: selector) ifTrue: [inlineList := inlineList copyWithout: selector]]. ^tmethod! Item was changed: ----- Method: CCodeGenerator>>collectInlineList: (in category 'inlining') ----- collectInlineList: inlineFlagOrSymbol "Make a list of methods that should be inlined. If inlineFlagOrSymbol == #asSpecified only inline methods marked with <inline: true>." "Details: The method must not include any inline C, since the translator cannot currently map variable names in inlined C code. Methods to be inlined must be small or called from only one place." | selectorsOfMethodsNotToInline callsOf | self assert: (#(true false asSpecified) includes: inlineFlagOrSymbol). selectorsOfMethodsNotToInline := Set new: methods size. selectorsOfMethodsNotToInline addAll: macros keys. + apiMethods ifNotNil: + [selectorsOfMethodsNotToInline addAll: apiMethods keys]. methods do: [:m| m isStructAccessor ifTrue: [selectorsOfMethodsNotToInline add: m selector]]. "build dictionary to record the number of calls to each method" callsOf := Dictionary new: methods size * 2. methods keysAndValuesDo: [:s :m| m isRealMethod ifTrue: [callsOf at: s put: 0]]. "For each method, scan its parse tree once or twice to: 1. determine if the method contains unrenamable C code or declarations or has a C builtin 2. determine how many nodes it has 3. increment the sender counts of the methods it calls" inlineList := Set new: methods size * 2. (methods reject: [:m| selectorsOfMethodsNotToInline includes: m selector]) do: [:m| | inlineIt hasUnrenamableCCode nodeCount | breakSrcInlineSelector = m selector ifTrue: [self halt]. inlineIt := #dontCare. (translationDict includesKey: m selector) ifTrue: [hasUnrenamableCCode := true] ifFalse: [hasUnrenamableCCode := m hasUnrenamableCCode. nodeCount := 0. m parseTree nodesDo: [:node| node isSend ifTrue: [callsOf at: node selector ifPresent: [:senderCount| callsOf at: node selector put: senderCount + 1]]. nodeCount := nodeCount + 1]. inlineIt := m extractInlineDirective]. "may be true, false, or #dontCare" (hasUnrenamableCCode or: [inlineIt == false]) ifTrue: "don't inline if method has C code or contains negative inline directive" [inlineIt == true ifTrue: [logger ensureCr; nextPutAll: 'failed to inline '; nextPutAll: m selector; nextPutAll: ' as it contains unrenamable C declarations or C code'; cr; flush]. selectorsOfMethodsNotToInline add: m selector] ifFalse: [(inlineFlagOrSymbol == #asSpecified ifTrue: [inlineIt == true] ifFalse: [nodeCount < 40 or: [inlineIt == true]]) ifTrue: "inline if method has no C code and is either small or contains inline directive" [inlineList add: m selector]]]. inlineFlagOrSymbol ~~ #asSpecified ifTrue: [callsOf associationsDo: [:assoc| (assoc value = 1 and: [(selectorsOfMethodsNotToInline includes: assoc key) not]) ifTrue: [inlineList add: assoc key]]]! Item was removed: - ----- Method: CoInterpreter>>freeStart (in category 'cog jit support') ----- - freeStart - <doNotGenerate> - ^objectMemory freeStart!

1 0

← Newer
1
...
8
9
10
11
12
13
14
15
16
Older →

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 May 2014