Vm-dev February 2015

vm-dev@lists.squeakfoundation.org

27 participants
101 discussions

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

06 Feb '15

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.1046.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.1046 Author: eem Time: 6 February 2015, 11:05:41.709 am UUID: b7e289ed-2b6a-43c7-a1d0-82fdaf8538bb Ancestors: VMMaker.oscog-eem.1045 Spur: Scavenging ephemerons should update the ephemeron's key with the scavenged key. Add an assert to remapObj:. =============== Diff against VMMaker.oscog-eem.1045 =============== Item was changed: ----- Method: SpurGenerationScavenger>>fireEphemeronsInRememberedSet (in category 'weakness and ephemerality') ----- fireEphemeronsInRememberedSet "There are ephemerons to be fired in the remembered set. Fire them and scavenge their keys. Leave it to scavengeLoop to remove any scavenged ephemerons that no longer have new referents." | i | self assert: self noUnfiredEphemeronsAtEndOfRememberedSet. i := 0. [i < numRememberedEphemerons] whileTrue: [ | ephemeron | ephemeron := rememberedSet at: i. self assert: (manager isEphemeron: ephemeron). self assert: (self isScavengeSurvivor: (manager keyOfEphemeron: ephemeron)) not. coInterpreter fireEphemeron: ephemeron. + manager + storePointerUnchecked: 0 + ofObject: ephemeron + withValue: (self copyAndForward: (manager keyOfEphemeron: ephemeron)). - self copyAndForward: (manager keyOfEphemeron: ephemeron). (self scavengeReferentsOf: ephemeron) ifTrue: "keep in set" [i := i + 1] ifFalse: [manager setIsRememberedOf: ephemeron to: false. "remove from set by overwriting with next-to-be scanned" numRememberedEphemerons := numRememberedEphemerons - 1. previousRememberedSetSize := previousRememberedSetSize - 1. rememberedSetSize := rememberedSetSize - 1. "First overwrite with last firable ephemeron (could be a noop if this is the last one). Then overwrite last firable entry with next unscanned rememberedSet entry (could also be a noop). Then overwrite next unscanned entry with last unscanned rememberedSet entry (could also be a noop)." rememberedSet at: i put: (rememberedSet at: numRememberedEphemerons); at: numRememberedEphemerons put: (rememberedSet at: previousRememberedSetSize); at: previousRememberedSetSize put: (rememberedSet at: rememberedSetSize)]]. "no more firable ephemerons in this cycle. scavengeRememberedSetStartingAt: may find new ones." numRememberedEphemerons := 0! Item was changed: ----- Method: SpurGenerationScavenger>>fireEphemeronsOnEphemeronList (in category 'weakness and ephemerality') ----- fireEphemeronsOnEphemeronList "There are ephemerons to be fired in the remembered set. Fire them and scavenge their keys. Be careful since copyAndForward: can remember ephemerons (ephemerons pointing to ephemerons)." | ephemeron ephemeronCorpse | ephemeronList ifNil: [^self]. ephemeronCorpse := self firstCorpse: ephemeronList. "Reset the list head so that new ephemerons will get added to a new list, not concatenated on the one we are scanning." ephemeronList := nil. [ephemeronCorpse notNil] whileTrue: [self assert: (manager isForwarded: ephemeronCorpse). ephemeron := manager followForwarded: ephemeronCorpse. self assert: (self isScavengeSurvivor: (manager keyOfEphemeron: ephemeron)) not. coInterpreter fireEphemeron: ephemeron. + manager + storePointerUnchecked: 0 + ofObject: ephemeron + withValue: (self copyAndForward: (manager keyOfEphemeron: ephemeron)). - self copyAndForward: (manager keyOfEphemeron: ephemeron). self cCoerceSimple: (self scavengeReferentsOf: ephemeron) to: #void. ephemeronCorpse := self nextCorpseOrNil: ephemeronCorpse]! 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:. 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: + [self deny: (self isInFutureSpace: resolvedObj). + resolvedObj := objOop]. - [resolvedObj := objOop]. (scavengeInProgress and: [self isReallyYoung: resolvedObj]) ifTrue: "a becommed or compacted object whose target is in old space, or a CogMethod." [^scavenger copyAndForward: resolvedObj]. ^resolvedObj!

1 0

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

05 Feb '15

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.1045.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.1045 Author: eem Time: 5 February 2015, 2:48:26.718 pm UUID: afe6083b-7ae4-4670-9338-4db5a0538104 Ancestors: VMMaker.oscog-eem.1044 Make getModuleName simulate for the LargeIntegers plugin's primGetModuleName. =============== Diff against VMMaker.oscog-eem.1044 =============== Item was changed: ----- Method: CCodeGenerator>>declareModuleName: (in category 'public') ----- declareModuleName: nameString "add the declaration of a module name, version and local/external tag" self var: #moduleName declareC:'const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN "', nameString,' (i)" #else "', nameString,' (e)" #endif + '. + "and for run-time use, answer the string" + ^nameString, ' (i)'! - '.! Item was changed: ----- Method: InterpreterPlugin>>getModuleName (in category 'initialize') ----- getModuleName "Note: This is hardcoded so it can be run from Squeak. The module name is used for validating a module *after* it is loaded to check if it does really contain the module we're thinking it contains. This is important!!" <returnTypeC:'const char*'> <export: true> + ^self cCode: [moduleName] + inSmalltalk: + [self class codeGeneratorClass new pluginClass: self class]! - ^moduleName! Item was added: + ----- Method: InterpreterPlugin>>st:rn:cpy: (in category 'simulation support') ----- + st: aString rn: bString cpy: n + <doNotGenerate> + ^interpreterProxy st: aString rn: bString cpy: n! Item was added: + ----- Method: InterpreterPlugin>>strlen: (in category 'simulation support') ----- + strlen: aCString + <doNotGenerate> + ^interpreterProxy strlen: aCString! Item was changed: ----- Method: LargeIntegersPlugin>>primGetModuleName (in category 'control & support primitives') ----- primGetModuleName "If calling this primitive fails, then C module does not exist." + | strLen strOop | - | strLen strOop strPtr | - <var: #strPtr type: 'char *'> self debugCode: [self msg: 'primGetModuleName']. self primitive: 'primGetModuleName' parameters: #() receiver: #Oop. strLen := self strlen: self getModuleName. strOop := interpreterProxy instantiateClass: interpreterProxy classString indexableSize: strLen. + self st: (interpreterProxy firstIndexableField: strOop) + rn: self getModuleName + cpy: strLen. - strPtr := interpreterProxy firstIndexableField: strOop. - 0 to: strLen - 1 do: [:i | strPtr at: i put: (self getModuleName at: i)]. ^strOop! Item was changed: ----- Method: VMPluginCodeGenerator>>pluginClass: (in category 'public') ----- pluginClass: aPluginClass + "Set the plugin class and name when generating plugins. + And for run-time use, answer the name string." - "Set the plugin class and name when generating plugins." | packageId | pluginClass := aPluginClass. pluginName := pluginClass moduleName. packageId := self shortMonticelloDescriptionForClass: pluginClass. (packageId beginsWith: pluginClass name) ifTrue: [packageId := packageId allButFirst: pluginClass name size]. (packageId beginsWith: pluginName) ifTrue: [packageId := packageId allButFirst: pluginName size]. + ^self declareModuleName: pluginClass moduleNameAndVersion, packageId! - self declareModuleName: pluginClass moduleNameAndVersion, packageId!

1 0

[commit][3248] CogVM source as per VMMaker.oscog-eem.1044
by commits＠squeakvm.org 05 Feb '15

05 Feb '15

Revision: 3248 Author: eliot Date: 2015-02-04 16:50:56 -0800 (Wed, 04 Feb 2015) Log Message: ----------- CogVM source as per VMMaker.oscog-eem.1044 Nope. The fix is to make ensureBehaviorHash: inlineable. Modified Paths: -------------- branches/Cog/nscogsrc/vm/cointerp.c branches/Cog/nscogsrc/vm/cointerp.h branches/Cog/nscogsrc/vm/gcc3x-cointerp.c branches/Cog/nsspursrc/vm/cointerp.c branches/Cog/nsspursrc/vm/cointerp.h branches/Cog/nsspursrc/vm/gcc3x-cointerp.c branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c branches/Cog/nsspurstacksrc/vm/interp.c branches/Cog/sistasrc/vm/cointerp.c branches/Cog/sistasrc/vm/cointerp.h branches/Cog/sistasrc/vm/gcc3x-cointerp.c branches/Cog/spursistasrc/vm/cointerp.c branches/Cog/spursistasrc/vm/cointerp.h branches/Cog/spursistasrc/vm/gcc3x-cointerp.c branches/Cog/spursrc/vm/cointerp.c branches/Cog/spursrc/vm/cointerp.h branches/Cog/spursrc/vm/gcc3x-cointerp.c branches/Cog/spurstack64src/vm/gcc3x-interp.c branches/Cog/spurstack64src/vm/interp.c branches/Cog/spurstacksrc/vm/gcc3x-interp.c branches/Cog/spurstacksrc/vm/interp.c branches/Cog/src/vm/cointerp.c branches/Cog/src/vm/cointerp.h branches/Cog/src/vm/cointerpmt.c branches/Cog/src/vm/cointerpmt.h branches/Cog/src/vm/gcc3x-cointerp.c branches/Cog/src/vm/gcc3x-cointerpmt.c branches/Cog/stacksrc/vm/gcc3x-interp.c branches/Cog/stacksrc/vm/interp.c Property Changed: ---------------- branches/Cog/platforms/Cross/vm/sqSCCSVersion.h Modified: branches/Cog/nscogsrc/vm/cointerp.c =================================================================== --- branches/Cog/nscogsrc/vm/cointerp.c 2015-02-05 00:15:02 UTC (rev 3247) +++ branches/Cog/nscogsrc/vm/cointerp.c 2015-02-05 00:50:56 UTC (rev 3248) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1040 uuid: be108ef5-00a3-425b-b228-16515cc447c7 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1044 uuid: e04ad0a1-2b15-4561-a3ed-1a4d4d6d58c8 from - CoInterpreter VMMaker.oscog-eem.1040 uuid: be108ef5-00a3-425b-b228-16515cc447c7 + CoInterpreter VMMaker.oscog-eem.1044 uuid: e04ad0a1-2b15-4561-a3ed-1a4d4d6d58c8 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1040 uuid: be108ef5-00a3-425b-b228-16515cc447c7 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1044 uuid: e04ad0a1-2b15-4561-a3ed-1a4d4d6d58c8 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2097,7 +2097,7 @@ /* 575 */ (void (*)(void))0, 0 }; char expensiveAsserts = 0; -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.1040"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.1044"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; Modified: branches/Cog/nscogsrc/vm/cointerp.h =================================================================== --- branches/Cog/nscogsrc/vm/cointerp.h 2015-02-05 00:15:02 UTC (rev 3247) +++ branches/Cog/nscogsrc/vm/cointerp.h 2015-02-05 00:50:56 UTC (rev 3248) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1040 uuid: be108ef5-00a3-425b-b228-16515cc447c7 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1044 uuid: e04ad0a1-2b15-4561-a3ed-1a4d4d6d58c8 */ Modified: branches/Cog/nscogsrc/vm/gcc3x-cointerp.c =================================================================== --- branches/Cog/nscogsrc/vm/gcc3x-cointerp.c 2015-02-05 00:15:02 UTC (rev 3247) +++ branches/Cog/nscogsrc/vm/gcc3x-cointerp.c 2015-02-05 00:50:56 UTC (rev 3248) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1040 uuid: be108ef5-00a3-425b-b228-16515cc447c7 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1044 uuid: e04ad0a1-2b15-4561-a3ed-1a4d4d6d58c8 from - CoInterpreter VMMaker.oscog-eem.1040 uuid: be108ef5-00a3-425b-b228-16515cc447c7 + CoInterpreter VMMaker.oscog-eem.1044 uuid: e04ad0a1-2b15-4561-a3ed-1a4d4d6d58c8 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1040 uuid: be108ef5-00a3-425b-b228-16515cc447c7 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1044 uuid: e04ad0a1-2b15-4561-a3ed-1a4d4d6d58c8 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2100,7 +2100,7 @@ /* 575 */ (void (*)(void))0, 0 }; char expensiveAsserts = 0; -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.1040"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.1044"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; Modified: branches/Cog/nsspursrc/vm/cointerp.c =================================================================== --- branches/Cog/nsspursrc/vm/cointerp.c 2015-02-05 00:15:02 UTC (rev 3247) +++ branches/Cog/nsspursrc/vm/cointerp.c 2015-02-05 00:50:56 UTC (rev 3248) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1042 uuid: cd14932f-16ef-41a5-8212-83e584ac417d + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1044 uuid: e04ad0a1-2b15-4561-a3ed-1a4d4d6d58c8 from - CoInterpreter VMMaker.oscog-eem.1042 uuid: cd14932f-16ef-41a5-8212-83e584ac417d + CoInterpreter VMMaker.oscog-eem.1044 uuid: e04ad0a1-2b15-4561-a3ed-1a4d4d6d58c8 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1042 uuid: cd14932f-16ef-41a5-8212-83e584ac417d " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1044 uuid: e04ad0a1-2b15-4561-a3ed-1a4d4d6d58c8 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2352,7 +2352,7 @@ /*560*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, 0, 0, 0,-1,-1 }; char expensiveAsserts = 0; -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.1042"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.1044"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -5102,7 +5102,7 @@ if (!((byteAt((localFP + FoxIFrameFlags) + 3)) != 0)) { goto commonCallerReturn; - goto l220; + goto l219; } closure = longAt(localFP + (frameStackedReceiverOffsetNumArgs(((((usqInt)(longAt(localFP + FoxMethod)))) < (startOfMemory()) ? ((mframeCogMethod(localFP))->cmNumArgs) @@ -5155,10 +5155,10 @@ : (byteAt((localFP + FoxIFrameFlags) + 2)) != 0)) { assert(isContext(frameContext(localFP))); ourContext = longAt(localFP + FoxThisContext); - goto l224; + goto l223; } ourContext = marryFrameSP(localFP, localSP); - l224: /* end ensureFrameIsMarried:SP: */; + l223: /* end ensureFrameIsMarried:SP: */; /* begin internalPush: */ longAtPointerput((localSP -= BytesPerOop), ourContext); /* begin internalPush: */ @@ -5167,7 +5167,7 @@ GIV(argumentCount) = 1; goto normalSend; /* return self */ - goto l220; + goto l219; } if (unwindContextOrNilOrZero != 0) { /* begin internalAboutToReturn:through: */ @@ -5177,10 +5177,10 @@ : (byteAt((localFP + FoxIFrameFlags) + 2)) != 0)) { assert(isContext(frameContext(localFP))); ourContext1 = longAt(localFP + FoxThisContext); - goto l221; + goto l220; } ourContext1 = marryFrameSP(localFP, localSP); - l221: /* end ensureFrameIsMarried:SP: */; + l220: /* end ensureFrameIsMarried:SP: */; /* begin internalPush: */ longAtPointerput((localSP -= BytesPerOop), ourContext1); /* begin internalPush: */ @@ -5191,7 +5191,7 @@ GIV(argumentCount) = 2; goto normalSend; /* return self */ - goto l220; + goto l219; } contextToReturnTo = null; if (((longAt((home + BaseHeaderSize) + (SenderIndex << (shiftForWord())))) & 1)) { @@ -5248,10 +5248,10 @@ : (byteAt((localFP + FoxIFrameFlags) + 2)) != 0)) { assert(isContext(frameContext(localFP))); ourContext2 = longAt(localFP + FoxThisContext); - goto l223; + goto l222; } ourContext2 = marryFrameSP(localFP, localSP); - l223: /* end ensureFrameIsMarried:SP: */; + l222: /* end ensureFrameIsMarried:SP: */; /* begin internalPush: */ longAtPointerput((localSP -= BytesPerOop), ourContext2); /* begin internalPush: */ @@ -5260,7 +5260,7 @@ GIV(argumentCount) = 1; goto normalSend; /* return self */ - goto l220; + goto l219; } } assert(pageListIsWellFormed()); @@ -5379,11 +5379,11 @@ GIV(framePointer) = localFP; ceEnterCogCodePopReceiverReg(); - goto l222; + goto l221; } localIP = pointerForOop(longAt(localFP + FoxIFSavedIP)); } - l222: /* end maybeReturnToMachineCodeFrame */; + l221: /* end maybeReturnToMachineCodeFrame */; /* begin setMethod: */ assert((((usqInt)(longAt(localFP + FoxMethod)))) >= (startOfMemory())); GIV(method) = longAt(localFP + FoxMethod); @@ -5397,7 +5397,7 @@ longAtPointerput(localSP, localReturnValue); } - l220: /* end case */; + l219: /* end case */; break; case 121: /* returnTrue */ @@ -5516,27 +5516,27 @@ fp = (thePage->headFP); if (fp == theFP) { frameAbove = 0; - goto l227; + goto l226; } while (((callerFP = frameCallerFP(fp))) != 0) { if (callerFP == theFP) { frameAbove = fp; - goto l227; + goto l226; } fp = callerFP; } error("did not find theFP in stack page"); frameAbove = 0; - l227: /* end findFrameAbove:inPage: */; + l226: /* end findFrameAbove:inPage: */; /* begin newStackPage */ lruOrFree = ((mostRecentlyUsedPage())->nextPage); if (isFree(lruOrFree)) { newPage = lruOrFree; - goto l228; + goto l227; } divorceFramesIn(lruOrFree); newPage = lruOrFree; - l228: /* end newStackPage */; + l227: /* end newStackPage */; assert(newPage == GIV(stackPage)); moveFramesInthroughtoPage(thePage, frameAbove, newPage); markStackPageMostRecentlyUsed(newPage); @@ -5560,7 +5560,7 @@ longAtput((sp2 = GIV(stackPointer) - BytesPerWord), GIV(instructionPointer)); GIV(stackPointer) = sp2; ceSendAborttonumArgs(longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (SelectorCannotReturn << (shiftForWord()))), contextToReturnFrom, 1); - goto l226; + goto l225; } GIV(instructionPointer) = 0; thePage = makeBaseFrameFor(contextToReturnTo); @@ -5598,7 +5598,7 @@ GIV(framePointer) = localFP; ceEnterCogCodePopReceiverReg(); - goto l226; + goto l225; } localIP = pointerForOop(longAt(localFP + FoxIFSavedIP)); } @@ -5616,8 +5616,8 @@ currentBytecode = (byteAtPointer(++localIP)) + GIV(bytecodeSetSelector); /* return self */ - l226: /* end baseFrameReturn */; - goto l225; + l225: /* end baseFrameReturn */; + goto l224; } /* begin frameCallerSavedIP: */ localIP = pointerForOop(longAt(localFP + FoxCallerSavedIP)); @@ -5645,7 +5645,7 @@ GIV(framePointer) = localFP; ceEnterCogCodePopReceiverReg(); - goto l225; + goto l224; } localIP = pointerForOop(longAt(localFP + FoxIFSavedIP)); } @@ -5662,7 +5662,7 @@ longAtPointerput(localSP, localReturnValue); } - l225: /* end case */; + l224: /* end case */; break; case 126: case 127: @@ -5691,10 +5691,10 @@ : (byteAt((localFP + FoxIFrameFlags) + 2)) != 0)) { assert(isContext(frameContext(localFP))); ourContext = longAt(localFP + FoxThisContext); - goto l229; + goto l228; } ourContext = marryFrameSP(localFP, localSP); - l229: /* end ensureFrameIsMarried:SP: */; + l228: /* end ensureFrameIsMarried:SP: */; localIP -= 1; /* begin internalPush: */ longAtPointerput((localSP -= BytesPerOop), ourContext); @@ -6008,10 +6008,10 @@ classTablePage = longAt((GIV(hiddenRootsObj) + BaseHeaderSize) + ((((usqInt) lkupClassTag) >> 10) << (shiftForWord()))); if (classTablePage == GIV(nilObj)) { classOrInteger = null; - goto l236; + goto l235; } classOrInteger = longAt((classTablePage + BaseHeaderSize) + ((lkupClassTag & ((1 << 10) - 1)) << (shiftForWord()))); - l236: /* end classAtIndex: */; + l235: /* end classAtIndex: */; GIV(traceLog)[GIV(traceLogIndex)] = classOrInteger; GIV(traceLog)[GIV(traceLogIndex) + 1] = GIV(messageSelector); GIV(traceLog)[GIV(traceLogIndex) + 2] = TraceIsFromInterpreter; @@ -6037,7 +6037,7 @@ GIV(newMethod) = GIV(methodCache)[probe + MethodCacheMethod]; primitiveFunctionPointer = ((void (*)()) (GIV(methodCache)[probe + MethodCachePrimFunction])); ok = 1; - goto l231; + goto l230; } /* second probe */ @@ -6048,7 +6048,7 @@ GIV(newMethod) = GIV(methodCache)[probe + MethodCacheMethod]; primitiveFunctionPointer = ((void (*)()) (GIV(methodCache)[probe + MethodCachePrimFunction])); ok = 1; - goto l231; + goto l230; } probe = (((usqInt) hash) >> 2) & MethodCacheMask; if (((GIV(methodCache)[probe + MethodCacheSelector]) == GIV(messageSelector)) @@ -6056,10 +6056,10 @@ GIV(newMethod) = GIV(methodCache)[probe + MethodCacheMethod]; primitiveFunctionPointer = ((void (*)()) (GIV(methodCache)[probe + MethodCachePrimFunction])); ok = 1; - goto l231; + goto l230; } ok = 0; - l231: /* end inlineLookupInMethodCacheSel:classTag: */; + l230: /* end inlineLookupInMethodCacheSel:classTag: */; if (ok) { /* begin ifAppropriateCompileToNativeCode:selector: */ methodHeader2 = longAt((GIV(newMethod) + BaseHeaderSize) + (HeaderIndex << (shiftForWord()))); @@ -6117,7 +6117,7 @@ maybeFlagMethodAsInterpreted(GIV(newMethod)); } } - goto l234; + goto l233; } } /* begin classForClassTag: */ @@ -6128,10 +6128,10 @@ classTablePage1 = longAt((GIV(hiddenRootsObj) + BaseHeaderSize) + ((((usqInt) lkupClassTag) >> 10) << (shiftForWord()))); if (classTablePage1 == GIV(nilObj)) { GIV(lkupClass) = null; - goto l230; + goto l229; } GIV(lkupClass) = longAt((classTablePage1 + BaseHeaderSize) + ((lkupClassTag & ((1 << 10) - 1)) << (shiftForWord()))); - l230: /* end classAtIndex: */; + l229: /* end classAtIndex: */; lookupMethodInClass(GIV(lkupClass)); /* begin internalizeIPandSP */ assert(GIV(instructionPointer) != (ceReturnToInterpreterPC())); @@ -6140,7 +6140,7 @@ localFP = pointerForOop(GIV(framePointer)); addNewMethodToCache(GIV(lkupClass)); } - l234: /* end internalFindNewMethod */; + l233: /* end internalFindNewMethod */; /* begin internalExecuteNewMethod */ if (primitiveFunctionPointer != 0) { if ((((unsigned long) primitiveFunctionPointer)) <= MaxQuickPrimitiveIndex) { @@ -6153,31 +6153,31 @@ /* begin internalStackTopPut: */ longAtPointerput(localSP, longAt(((longAtPointer(localSP)) + BaseHeaderSize) + ((localPrimIndex - 264) << (shiftForWord())))); 1; - goto l232; + goto l231; } if (localPrimIndex == 256) { 1; - goto l232; + goto l231; } if (localPrimIndex == 257) { longAtPointerput(localSP, GIV(trueObj)); 1; - goto l232; + goto l231; } if (localPrimIndex == 258) { longAtPointerput(localSP, GIV(falseObj)); 1; - goto l232; + goto l231; } if (localPrimIndex == 259) { longAtPointerput(localSP, GIV(nilObj)); 1; - goto l232; + goto l231; } longAtPointerput(localSP, (((localPrimIndex - 261) << 1) | 1)); 1; - l232: /* end internalQuickPrimitiveResponse */; - goto l233; + l231: /* end internalQuickPrimitiveResponse */; + goto l232; } /* begin externalizeIPandSP */ assert((((usqInt)localIP)) != (ceReturnToInterpreterPC())); @@ -6241,7 +6241,7 @@ returntoExecutive(popStack(), 1); browserPluginReturnIfNeeded(); null; - goto l233; + goto l232; } } if (methodHasCogMethod(GIV(newMethod))) { @@ -6318,11 +6318,11 @@ table = longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (PrimErrTableIndex << (shiftForWord()))); if (GIV(primFailCode) <= ((lastPointerOf(table)) / BytesPerWord)) { errorCode = longAt((table + BaseHeaderSize) + ((GIV(primFailCode) - 1) << (shiftForWord()))); - goto l235; + goto l234; } } errorCode = ((GIV(primFailCode) << 1) | 1); - l235: /* end getErrorObjectFromPrimFailCode */; + l234: /* end getErrorObjectFromPrimFailCode */; longAtPointerput(localSP, errorCode); } GIV(primFailCode) = 0; @@ -6346,7 +6346,7 @@ localFP = pointerForOop(GIV(framePointer)); } } - l233: /* end internalExecuteNewMethod */; + l232: /* end internalExecuteNewMethod */; /* begin fetchNextBytecode */ currentBytecode = (byteAtPointer(++localIP)) + GIV(bytecodeSetSelector); @@ -6731,8 +6731,8 @@ sqInt classPointer; sqInt err; sqInt err1; - sqInt newHash; - sqInt newHash1; + sqInt hash; + sqInt hash1; sqInt objOop; sqInt objOop1; sqInt referent; @@ -6750,38 +6750,33 @@ superclass = objOop; /* begin ensureBehaviorHash: */ assert(addressCouldBeClassObj(superclass)); - if (((newHash = (long32At(superclass + 4)) & 0x3FFFFF)) == 0) { - if (!(objCouldBeClassObj(superclass))) { + if (((hash = (long32At(superclass + 4)) & 0x3FFFFF)) != 0) { + hash; + } + else { + if (objCouldBeClassObj(superclass)) { + if (((err = enterIntoClassTable(superclass))) != 0) { + -err; + } + else { + (long32At(superclass + 4)) & 0x3FFFFF; + } + } + else { -PrimErrBadReceiver; - goto l237; } - if (((err = enterIntoClassTable(superclass))) != 0) { - -err; - goto l237; - } - newHash = (long32At(superclass + 4)) & 0x3FFFFF; - assert((classAtIndex(newHash)) == superclass); } - newHash; - l237: /* end ensureBehaviorHash: */; /* begin classTagForClass: */ assert(addressCouldBeClassObj(superclass)); /* begin ensureBehaviorHash: */ assert(addressCouldBeClassObj(superclass)); - if (((newHash1 = (long32At(superclass + 4)) & 0x3FFFFF)) == 0) { - if (!(objCouldBeClassObj(superclass))) { - lkupClassTag = -PrimErrBadReceiver; - goto l238; - } - if (((err1 = enterIntoClassTable(superclass))) != 0) { - lkupClassTag = -err1; - goto l238; - } - newHash1 = (long32At(superclass + 4)) & 0x3FFFFF; - assert((classAtIndex(newHash1)) == superclass); - } - lkupClassTag = newHash1; - l238: /* end ensureBehaviorHash: */; + lkupClassTag = (((hash1 = (long32At(superclass + 4)) & 0x3FFFFF)) != 0 + ? hash1 + : (objCouldBeClassObj(superclass) + ? (((err1 = enterIntoClassTable(superclass))) != 0 + ? -err1 + : (long32At(superclass + 4)) & 0x3FFFFF) + : -PrimErrBadReceiver)); /* begin ensureReceiverUnforwarded */ if ((((longAtPointer(localSP + (GIV(argumentCount) * BytesPerOop))) & 3) == 0) && (((longAt(longAtPointer(localSP + (GIV(argumentCount) * BytesPerOop)))) & 0x3FFFFF) == 8)) { @@ -7798,7 +7793,7 @@ /* begin fetchNextBytecode */ currentBytecode = (byteAtPointer(++localIP)) + GIV(bytecodeSetSelector); - goto l239; + goto l236; } if (bytecode == 172) { @@ -7808,7 +7803,7 @@ /* begin fetchNextBytecode */ currentBytecode = (byteAtPointer(++localIP)) + GIV(bytecodeSetSelector); - goto l239; + goto l236; } if (bytecode > 167) { @@ -7819,7 +7814,7 @@ localIP = (localIP + offset) + 1; currentBytecode = (byteAtPointer(localIP)) + GIV(bytecodeSetSelector); - goto l239; + goto l236; } } currentBytecode = bytecode + GIV(bytecodeSetSelector); @@ -7827,7 +7822,7 @@ /* begin internalPush: */ longAtPointerput((localSP -= BytesPerOop), GIV(trueObj)); } - l239: /* end case */; + l236: /* end case */; break; case 179: /* bytecodePrimGreaterThan */ @@ -7944,7 +7939,7 @@ localIP = (localIP + (bytecode - 151)) + 1; currentBytecode = (byteAtPointer(localIP)) + GIV(bytecodeSetSelector); - goto l240; + goto l237; } if (bytecode == 172) { @@ -7955,14 +7950,14 @@ localIP = (localIP + offset) + 1; currentBytecode = (byteAtPointer(localIP)) + GIV(bytecodeSetSelector); - goto l240; + goto l237; } currentBytecode = bytecode + GIV(bytecodeSetSelector); /* begin internalPush: */ longAtPointerput((localSP -= BytesPerOop), GIV(falseObj)); } - l240: /* end case */; + l237: /* end case */; break; case 180: /* bytecodePrimLessOrEqual */ @@ -10499,7 +10494,7 @@ /* begin fetchNextBytecode */ currentBytecode = (byteAtPointer(++localIP)) + GIV(bytecodeSetSelector); - goto l241; + goto l238; } if (bytecode == 244) { @@ -10509,7 +10504,7 @@ /* begin fetchNextBytecode */ currentBytecode = (byteAtPointer(++localIP)) + GIV(bytecodeSetSelector); - goto l241; + goto l238; } if (bytecode == 243) { @@ -10520,7 +10515,7 @@ localIP = (localIP + offset) + 1; currentBytecode = (byteAtPointer(localIP)) + GIV(bytecodeSetSelector); - goto l241; + goto l238; } } currentBytecode = bytecode + GIV(bytecodeSetSelector); @@ -10528,7 +10523,7 @@ /* begin internalPush: */ longAtPointerput((localSP -= BytesPerOop), GIV(trueObj)); } - l241: /* end case */; + l238: /* end case */; break; case 339: /*83*/ /* bytecodePrimGreaterThanV4 */ @@ -10645,7 +10640,7 @@ localIP = (localIP + (bytecode - 207)) + 1; currentBytecode = (byteAtPointer(localIP)) + GIV(bytecodeSetSelector); - goto l242; + goto l239; } if (bytecode == 244) { @@ -10656,14 +10651,14 @@ localIP = (localIP + offset) + 1; currentBytecode = (byteAtPointer(localIP)) + GIV(bytecodeSetSelector); - goto l242; + goto l239; } currentBytecode = bytecode + GIV(bytecodeSetSelector); /* begin internalPush: */ longAtPointerput((localSP -= BytesPerOop), GIV(falseObj)); } - l242: /* end case */; + l239: /* end case */; break; case 340: /*84*/ /* bytecodePrimLessOrEqualV4 */ @@ -13553,12 +13548,12 @@ sqInt byte; sqInt classObj; sqInt err; + sqInt hash; sqInt i; sqInt mClassMixin; sqInt mixin; sqInt mixinApplication; sqInt mixinApplication1; - sqInt newHash; sqInt objOop; sqInt oop; sqInt tagBits; @@ -13604,20 +13599,13 @@ assert(addressCouldBeClassObj(classObj)); /* begin ensureBehaviorHash: */ assert(addressCouldBeClassObj(classObj)); - if (((newHash = (long32At(classObj + 4)) & 0x3FFFFF)) == 0) { - if (!(objCouldBeClassObj(classObj))) { - lkupClassTag = -PrimErrBadReceiver; - goto l212; - } - if (((err = enterIntoClassTable(classObj))) != 0) { - lkupClassTag = -err; - goto l212; - } - newHash = (long32At(classObj + 4)) & 0x3FFFFF; - assert((classAtIndex(newHash)) == classObj); - } - lkupClassTag = newHash; - l212: /* end ensureBehaviorHash: */; + lkupClassTag = (((hash = (long32At(classObj + 4)) & 0x3FFFFF)) != 0 + ? hash + : (objCouldBeClassObj(classObj) + ? (((err = enterIntoClassTable(classObj))) != 0 + ? -err + : (long32At(classObj + 4)) & 0x3FFFFF) + : -PrimErrBadReceiver)); goto commonSend; } break; @@ -13636,7 +13624,7 @@ localIP += offset; /* begin ifBackwardsCheckForEvents: */ if (offset >= 0) { - goto l213; + goto l212; } if (localSP < GIV(stackLimit)) { /* begin externalizeIPandSP */ @@ -13653,7 +13641,7 @@ localSP = pointerForOop(GIV(stackPointer)); localFP = pointerForOop(GIV(framePointer)); if (switched) { - goto l213; + goto l212; } } backwardJumpCountByte = byteAt(localFP + ((VMBIGENDIAN @@ -13683,7 +13671,7 @@ byteAtput(localFP + ((VMBIGENDIAN ? (FoxIFrameFlags + BytesPerWord) - 1 : FoxIFrameFlags)), backwardJumpCountByte); - l213: /* end ifBackwardsCheckForEvents: */; + l212: /* end ifBackwardsCheckForEvents: */; /* begin fetchNextBytecode */ currentBytecode = (byteAtPointer(++localIP)) + GIV(bytecodeSetSelector); @@ -13714,7 +13702,7 @@ GIV(messageSelector) = longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (SelectorMustBeBoolean << (shiftForWord()))); GIV(argumentCount) = 0; goto normalSend; - goto l214; + goto l213; } /* begin fetchNextBytecode */ currentBytecode = (byteAtPointer(++localIP)) + GIV(bytecodeSetSelector); @@ -13722,7 +13710,7 @@ } /* begin internalPop: */ localSP += 1 * BytesPerOop; - l214: /* end jumplfTrueBy: */; + l213: /* end jumplfTrueBy: */; } break; case 500: /*244*/ @@ -13750,7 +13738,7 @@ GIV(messageSelector) = longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (SelectorMustBeBoolean << (shiftForWord()))); GIV(argumentCount) = 0; goto normalSend; - goto l215; + goto l214; } /* begin fetchNextBytecode */ currentBytecode = (byteAtPointer(++localIP)) + GIV(bytecodeSetSelector); @@ -13758,7 +13746,7 @@ } /* begin internalPop: */ localSP += 1 * BytesPerOop; - l215: /* end jumplfFalseBy: */; + l214: /* end jumplfFalseBy: */; } break; case 501: /*245*/ @@ -13804,15 +13792,15 @@ currentBytecode = (byteAtPointer(++localIP)) + GIV(bytecodeSetSelector); null; - goto l216; + goto l215; } else { goto respondToUnknownBytecode; - goto l216; + goto l215; } } - l216: /* end case */; + l215: /* end case */; break; case 509: /*253*/ /* extPushClosureBytecode */ @@ -13847,10 +13835,10 @@ : (byteAt((localFP + FoxIFrameFlags) + 2)) != 0)) { assert(isContext(frameContext(localFP))); context = longAt(localFP + FoxThisContext); - goto l217; + goto l216; } context = marryFrameSP(localFP, localSP + (numCopied * BytesPerOop)); - l217: /* end ensureFrameIsMarried:SP: */; + l216: /* end ensureFrameIsMarried:SP: */; /* begin closureIn:numArgs:instructionPointer:numCopiedValues: */ initialIP = ((oopForPointer(localIP)) + 2) - (GIV(method) + BaseHeaderSize); /* begin eeInstantiateSmallClassIndex:format:numSlots: */ @@ -13874,13 +13862,13 @@ if ((GIV(freeStart) + numBytes) > (((eden()).limit))) { error("no room in eden for allocateSmallNewSpaceSlots:format:classIndex:"); newClosure1 = 0; - goto l218; + goto l217; } } long64Atput(newObj, (((((usqLong) (ClosureFirstCopiedValueIndex + numCopied))) << 56) + (3 << 24)) + ClassBlockClosureCompactIndex); GIV(freeStart) += numBytes; newClosure1 = newObj; - l218: /* end allocateSmallNewSpaceSlots:format:classIndex: */; + l217: /* end allocateSmallNewSpaceSlots:format:classIndex: */; /* begin storePointerUnchecked:ofObject:withValue: */ assert(!(isForwarded(newClosure1))); @@ -15084,6 +15072,7 @@ CogMethod *cogMethod1; sqInt err; sqInt errSelIdx; + sqInt hash; sqInt mClassMixin; sqInt methodHeader; sqInt methodHeader1; @@ -15091,7 +15080,6 @@ sqInt mixinApplication; sqInt mixinApplication1; CogMethod *newCogMethod; - sqInt newHash; sqInt objOop; sqInt tagBits; sqInt top; @@ -15129,20 +15117,13 @@ assert(addressCouldBeClassObj(classObj)); /* begin ensureBehaviorHash: */ assert(addressCouldBeClassObj(classObj)); - if (((newHash = (long32At(classObj + 4)) & 0x3FFFFF)) == 0) { - if (!(objCouldBeClassObj(classObj))) { - classTag = -PrimErrBadReceiver; - goto l1; - } - if (((err = enterIntoClassTable(classObj))) != 0) { - classTag = -err; - goto l1; - } - newHash = (long32At(classObj + 4)) & 0x3FFFFF; - assert((classAtIndex(newHash)) == classObj); - } - classTag = newHash; -l1: /* end ensureBehaviorHash: */; + classTag = (((hash = (long32At(classObj + 4)) & 0x3FFFFF)) != 0 + ? hash + : (objCouldBeClassObj(classObj) + ? (((err = enterIntoClassTable(classObj))) != 0 + ? -err + : (long32At(classObj + 4)) & 0x3FFFFF) + : -PrimErrBadReceiver)); GIV(argumentCount) = numArgs; if (lookupInMethodCacheSelclassTag(selector, classTag)) { @@ -15914,10 +15895,10 @@ CogMethod *cogMethod1; sqInt err; sqInt errSelIdx; + sqInt hash; sqInt methodHeader; sqInt methodHeader1; CogMethod *newCogMethod; - sqInt newHash; sqInt objOop; sqInt tagBits; sqInt top; @@ -15954,20 +15935,13 @@ assert(addressCouldBeClassObj(classObj)); /* begin ensureBehaviorHash: */ assert(addressCouldBeClassObj(classObj)); - if (((newHash = (long32At(classObj + 4)) & 0x3FFFFF)) == 0) { - if (!(objCouldBeClassObj(classObj))) { - classTag = -PrimErrBadReceiver; - goto l1; - } - if (((err = enterIntoClassTable(classObj))) != 0) { - classTag = -err; - goto l1; - } - newHash = (long32At(classObj + 4)) & 0x3FFFFF; - assert((classAtIndex(newHash)) == classObj); - } - classTag = newHash; - l1: /* end ensureBehaviorHash: */; + classTag = (((hash = (long32At(classObj + 4)) & 0x3FFFFF)) != 0 + ? hash + : (objCouldBeClassObj(classObj) + ? (((err = enterIntoClassTable(classObj))) != 0 + ? -err + : (long32At(classObj + 4)) & 0x3FFFFF) + : -PrimErrBadReceiver)); } GIV(argumentCount) = numArgs; if (lookupInMethodCacheSelclassTag(selector, classTag)) { @@ -28251,28 +28225,21 @@ primitiveBehaviorHash(void) { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt err; + sqInt hash; sqInt hashOrError; - sqInt newHash; char *sp; assert((isNonImmediate(stackTop())) && (addressCouldBeClassObj(stackTop()))); /* begin ensureBehaviorHash: */ assert(addressCouldBeClassObj(longAt(GIV(stackPointer)))); - if (((newHash = (long32At((longAt(GIV(stackPointer))) + 4)) & 0x3FFFFF)) == 0) { - if (!(objCouldBeClassObj(longAt(GIV(stackPointer))))) { - hashOrError = -PrimErrBadReceiver; - goto l1; - } - if (((err = enterIntoClassTable(longAt(GIV(stackPointer))))) != 0) { - hashOrError = -err; - goto l1; - } - newHash = (long32At((longAt(GIV(stackPointer))) + 4)) & 0x3FFFFF; - assert((classAtIndex(newHash)) == (longAt(GIV(stackPointer)))); - } - hashOrError = newHash; -l1: /* end ensureBehaviorHash: */; + hashOrError = (((hash = (long32At((longAt(GIV(stackPointer))) + 4)) & 0x3FFFFF)) != 0 + ? hash + : (objCouldBeClassObj(longAt(GIV(stackPointer))) + ? (((err = enterIntoClassTable(longAt(GIV(stackPointer))))) != 0 + ? -err + : (long32At((longAt(GIV(stackPointer))) + 4)) & 0x3FFFFF) + : -PrimErrBadReceiver)); if (hashOrError >= 0) { /* begin pop:thenPushInteger: */ longAtput((sp = GIV(stackPointer) + (((GIV(argumentCount) + 1) - 1) * BytesPerWord)), ((hashOrError << 1) | 1)); @@ -34175,8 +34142,8 @@ sqInt classObj; sqInt classObj1; sqInt err; + sqInt hash; sqInt instSpec; - sqInt newHash; sqInt newObj; sqInt newObj1; usqInt numBytes; @@ -34200,28 +34167,21 @@ if (!((instSpec <= 1) || (instSpec == 5))) { obj = null; - goto l3; + goto l2; } /* begin ensureBehaviorHash: */ assert(addressCouldBeClassObj(classObj1)); - if (((newHash = (long32At(classObj1 + 4)) & 0x3FFFFF)) == 0) { - if (!(objCouldBeClassObj(classObj1))) { - classIndex = -PrimErrBadReceiver; - goto l1; - } - if (((err = enterIntoClassTable(classObj1))) != 0) { - classIndex = -err; - goto l1; - } - newHash = (long32At(classObj1 + 4)) & 0x3FFFFF; - assert((classAtIndex(newHash)) == classObj1); - } - classIndex = newHash; -l1: /* end ensureBehaviorHash: */; + classIndex = (((hash = (long32At(classObj1 + 4)) & 0x3FFFFF)) != 0 + ? hash + : (objCouldBeClassObj(classObj1) + ? (((err = enterIntoClassTable(classObj1))) != 0 + ? -err + : (long32At(classObj1 + 4)) & 0x3FFFFF) + : -PrimErrBadReceiver)); if (classIndex < 0) { GIV(primFailCode) = -classIndex; obj = null; - goto l3; + goto l2; } numSlots = classFormat & ((1 << 16) - 1); /* begin allocateSlots:format:classIndex: */ @@ -34242,7 +34202,7 @@ forceInterruptCheck(); } newObj = allocateSlotsInOldSpacebytesformatclassIndex(numSlots, numBytes, instSpec, classIndex); - goto l2; + goto l1; } if (numSlots >= 0xFF) { @@ -34260,7 +34220,7 @@ assert((newObj1 % (allocationUnit())) == 0); GIV(freeStart) += numBytes; newObj = newObj1; -l2: /* end allocateSlots:format:classIndex: */; +l1: /* end allocateSlots:format:classIndex: */; if (!(newObj == null)) { /* begin fillObj:numSlots:with: */ assert(oopisLessThan(((newObj + BaseHeaderSize) + (numSlots * BytesPerOop)) - 1, addressAfter(newObj))); @@ -34270,7 +34230,7 @@ } } obj = newObj; -l3: /* end instantiateClass: */; +l2: /* end instantiateClass: */; if (obj == null) { /* begin primitiveFailFor: */ reasonCode = (isFixedSizePointerFormat(instSpecOfClassFormat(((longAt(((longAt(GIV(stackPointer))) + BaseHeaderSize) + (InstanceSpecificationIndex << (shiftForWord())))) >> 1))) @@ -34294,11 +34254,11 @@ sqInt classFormat; sqInt classIndex; sqInt err; + sqInt hash; sqInt header; sqInt i; sqInt instSpec; sqInt literalCount; - sqInt newHash; sqInt newObj; sqInt newObj1; usqInt numBytes; @@ -34327,35 +34287,28 @@ instSpec = (((usqInt) classFormat) >> 16) & 0x1F; if (instSpec != 24) { theMethod = null; - goto l3; + goto l2; } numSlots = (size + 3) / 4; instSpec += (4 - size) & 3; /* begin ensureBehaviorHash: */ assert(addressCouldBeClassObj(class)); - if (((newHash = (long32At(class + 4)) & 0x3FFFFF)) == 0) { - if (!(objCouldBeClassObj(class))) { - classIndex = -PrimErrBadReceiver; - goto l2; - } - if (((err = enterIntoClassTable(class))) != 0) { - classIndex = -err; - goto l2; - } - newHash = (long32At(class + 4)) & 0x3FFFFF; - assert((classAtIndex(newHash)) == class); - } - classIndex = newHash; -l2: /* end ensureBehaviorHash: */; + classIndex = (((hash = (long32At(class + 4)) & 0x3FFFFF)) != 0 + ? hash + : (objCouldBeClassObj(class) + ? (((err = enterIntoClassTable(class))) != 0 + ? -err + : (long32At(class + 4)) & 0x3FFFFF) + : -PrimErrBadReceiver)); if (classIndex < 0) { GIV(primFailCode) = -classIndex; theMethod = null; - goto l3; + goto l2; } if (numSlots > ((1 << 16) - 1)) { if (numSlots > (((512 * 1024) * 1024) - 1)) { theMethod = null; - goto l3; + goto l2; } newObj = allocateSlotsInOldSpacebytesformatclassIndex(numSlots, ((numSlots == 0 ? 8 @@ -34411,7 +34364,7 @@ } } theMethod = newObj; -l3: /* end instantiateCompiledMethodClass:indexableSize: */; +l2: /* end instantiateCompiledMethodClass:indexableSize: */; if (!(theMethod)) { /* begin primitiveFailFor: */ reasonCode = (isCompiledMethodFormat(instSpecOfClassFormat(((longAt((class + BaseHeaderSize) + (InstanceSpecificationIndex << (shiftForWord())))) >> 1))) @@ -35064,9 +35017,9 @@ sqInt currentClass; sqInt delta; sqInt err; + sqInt hash; sqInt index; sqInt lookupClass; - sqInt newHash; usqInt numSlots; sqInt objOop; sqInt offset; @@ -35106,7 +35059,7 @@ if (!(((argumentArray & 3) == 0) && (((((usqInt) (longAt(argumentArray))) >> 24) & 0x1F) == 2))) { GIV(primFailCode) = PrimErrBadArgument; - goto l2; + goto l1; } /* begin numSlotsOf: */ flag("endianness"); @@ -35117,7 +35070,7 @@ : numSlots); if (arraySize > LargeContextSlots) { GIV(primFailCode) = PrimErrBadNumArgs; - goto l2; + goto l1; } /* Push newMethod to save it in case of failure, @@ -35159,20 +35112,13 @@ assert(addressCouldBeClassObj(lookupClass)), /* begin ensureBehaviorHash: */ assert(addressCouldBeClassObj(lookupClass)), - (((newHash = (long32At(lookupClass + 4)) & 0x3FFFFF)) == 0 - ? ((!(objCouldBeClassObj(lookupClass)) - ? (-PrimErrBadReceiver, - goto l1) - : 0), - (((err = enterIntoClassTable(lookupClass))) != 0 - ? (-err, - goto l1) - : 0), - (newHash = (long32At(lookupClass + 4)) & 0x3FFFFF), - assert((classAtIndex(newHash)) == lookupClass)) - : 0), - newHash, - l1: /* end ensureBehaviorHash: */))); + (((hash = (long32At(lookupClass + 4)) & 0x3FFFFF)) != 0 + ? hash + : (objCouldBeClassObj(lookupClass) + ? (((err = enterIntoClassTable(lookupClass))) != 0 + ? -err + : (long32At(lookupClass + 4)) & 0x3FFFFF) + : -PrimErrBadReceiver))))); if ((((GIV(newMethod) & 3) == 0) && (((((usqInt) (longAt(GIV(newMethod)))) >> 24) & 0x1F) >= 24)) && ((argumentCountOf(GIV(newMethod))) != GIV(argumentCount))) { @@ -35187,7 +35133,7 @@ GIV(stackPointer) += BytesPerWord; GIV(newMethod) = ((sqInt) top); GIV(primFailCode) = PrimErrBadNumArgs; - goto l2; + goto l1; } /* +2 = receiver + saved newMethod */ @@ -35203,7 +35149,7 @@ /* begin initPrimCall */ GIV(primFailCode) = 0; null; -l2: /* end primitiveObject:perform:withArguments:lookedUpIn: */; +l1: /* end primitiveObject:perform:withArguments:lookedUpIn: */; } static void @@ -35214,8 +35160,8 @@ usqInt arraySize; sqInt delta; sqInt err; + sqInt hash; sqInt index; - sqInt newHash; usqInt numSlots; sqInt offset; sqInt performArgCount; @@ -35235,7 +35181,7 @@ if (!(((argumentArray & 3) == 0) && (((((usqInt) (longAt(argumentArray))) >> 24) & 0x1F) == 2))) { GIV(primFailCode) = PrimErrBadArgument; - goto l2; + goto l1; } /* begin numSlotsOf: */ flag("endianness"); @@ -35246,7 +35192,7 @@ : numSlots); if (arraySize > LargeContextSlots) { GIV(primFailCode) = PrimErrBadNumArgs; - goto l2; + goto l1; } /* Push newMethod to save it in case of failure, @@ -35295,7 +35241,7 @@ GIV(stackPointer) += BytesPerWord; GIV(newMethod) = ((sqInt) top); GIV(primFailCode) = PrimErrBadNumArgs; - goto l2; + goto l1; } /* +2 = receiver + saved newMethod */ @@ -35311,7 +35257,7 @@ /* begin initPrimCall */ GIV(primFailCode) = 0; null; -l2: /* end primitiveObject:perform:withArguments:lookedUpIn: */; +l1: /* end primitiveObject:perform:withArguments:lookedUpIn: */; } @@ -39888,8 +39834,8 @@ sqInt classIndex; sqInt err; sqInt fillValue; + sqInt hash; sqInt instSpec; - sqInt newHash; sqInt newObj; sqInt newObj1; usqInt numBytes; @@ -39950,20 +39896,13 @@ if (classIndex == 0) { /* begin ensureBehaviorHash: */ assert(addressCouldBeClassObj(classObj)); - if (((newHash = (long32At(classObj + 4)) & 0x3FFFFF)) == 0) { - if (!(objCouldBeClassObj(classObj))) { - classIndex = -PrimErrBadReceiver; - goto l1; - } - if (((err = enterIntoClassTable(classObj))) != 0) { - classIndex = -err; - goto l1; - } - newHash = (long32At(classObj + 4)) & 0x3FFFFF; - assert((classAtIndex(newHash)) == classObj); - } - classIndex = newHash; - l1: /* end ensureBehaviorHash: */; + classIndex = (((hash = (long32At(classObj + 4)) & 0x3FFFFF)) != 0 + ? hash + : (objCouldBeClassObj(classObj) + ? (((err = enterIntoClassTable(classObj))) != 0 + ? -err + : (long32At(classObj + 4)) & 0x3FFFFF) + : -PrimErrBadReceiver)); if (classIndex < 0) { GIV(primFailCode) = -classIndex; return null; @@ -39999,7 +39938,7 @@ forceInterruptCheck(); } newObj = allocateSlotsInOldSpacebytesformatclassIndex(numSlots, numBytes, instSpec, classIndex); - goto l2; + goto l1; } if (numSlots >= 0xFF) { @@ -40017,7 +39956,7 @@ assert((newObj1 % (allocationUnit())) == 0); GIV(freeStart) += numBytes; newObj = newObj1; - l2: /* end allocateSlots:format:classIndex: */; + l1: /* end allocateSlots:format:classIndex: */; } if (!(newObj == null)) { /* begin fillObj:numSlots:with: */ @@ -44593,22 +44532,18 @@ classTagForClass(sqInt classObj) { sqInt err; - sqInt newHash; + sqInt hash; assert(addressCouldBeClassObj(classObj)); /* begin ensureBehaviorHash: */ assert(addressCouldBeClassObj(classObj)); - if (((newHash = (long32At(classObj + 4)) & 0x3FFFFF)) == 0) { - if (!(objCouldBeClassObj(classObj))) { - return -PrimErrBadReceiver; - } - if (((err = enterIntoClassTable(classObj))) != 0) { - return -err; - } - newHash = (long32At(classObj + 4)) & 0x3FFFFF; - assert((classAtIndex(newHash)) == classObj); - } - return newHash; + return (((hash = (long32At(classObj + 4)) & 0x3FFFFF)) != 0 + ? hash + : (objCouldBeClassObj(classObj) + ? (((err = enterIntoClassTable(classObj))) != 0 + ? -err + : (long32At(classObj + 4)) & 0x3FFFFF) + : -PrimErrBadReceiver)); } sqInt @@ -45725,20 +45660,16 @@ ensureBehaviorHash(sqInt aBehavior) { sqInt err; - sqInt newHash; + sqInt hash; assert(addressCouldBeClassObj(aBehavior)); - if (((newHash = (long32At(aBehavior + 4)) & 0x3FFFFF)) == 0) { - if (!(objCouldBeClassObj(aBehavior))) { - return -PrimErrBadReceiver; - } - if (((err = enterIntoClassTable(aBehavior))) != 0) { - return -err; - } - newHash = (long32At(aBehavior + 4)) & 0x3FFFFF; - assert((classAtIndex(newHash)) == aBehavior); - } - return newHash; + return (((hash = (long32At(aBehavior + 4)) & 0x3FFFFF)) != 0 + ? hash + : (objCouldBeClassObj(aBehavior) + ? (((err = enterIntoClassTable(aBehavior))) != 0 + ? -err + : (long32At(aBehavior + 4)) & 0x3FFFFF) + : -PrimErrBadReceiver)); } Modified: branches/Cog/nsspursrc/vm/cointerp.h =================================================================== --- branches/Cog/nsspursrc/vm/cointerp.h 2015-02-05 00:15:02 UTC (rev 3247) +++ branches/Cog/nsspursrc/vm/cointerp.h 2015-02-05 00:50:56 UTC (rev 3248) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1042 uuid: cd14932f-16ef-41a5-8212-83e584ac417d + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1044 uuid: e04ad0a1-2b15-4561-a3ed-1a4d4d6d58c8 */ Modified: branches/Cog/nsspursrc/vm/gcc3x-cointerp.c =================================================================== --- branches/Cog/nsspursrc/vm/gcc3x-cointerp.c 2015-02-05 00:15:02 UTC (rev 3247) +++ branches/Cog/nsspursrc/vm/gcc3x-cointerp.c 2015-02-05 00:50:56 UTC (rev 3248) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1042 uuid: cd14932f-16ef-41a5-8212-83e584ac417d + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1044 uuid: e04ad0a1-2b15-4561-a3ed-1a4d4d6d58c8 from - CoInterpreter VMMaker.oscog-eem.1042 uuid: cd14932f-16ef-41a5-8212-83e584ac417d + CoInterpreter VMMaker.oscog-eem.1044 uuid: e04ad0a1-2b15-4561-a3ed-1a4d4d6d58c8 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1042 uuid: cd14932f-16ef-41a5-8212-83e584ac417d " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1044 uuid: e04ad0a1-2b15-4561-a3ed-1a4d4d6d58c8 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2355,7 +2355,7 @@ /*560*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, 0, 0, 0,-1,-1 }; char expensiveAsserts = 0; -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.1042"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.1044"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -5111,7 +5111,7 @@ if (!((byteAt((localFP + FoxIFrameFlags) + 3)) != 0)) { goto commonCallerReturn; - goto l220; + goto l219; } closure = longAt(localFP + (frameStackedReceiverOffsetNumArgs(((((usqInt)(longAt(localFP + FoxMethod)))) < (startOfMemory()) ? ((mframeCogMethod(localFP))->cmNumArgs) @@ -5164,10 +5164,10 @@ : (byteAt((localFP + FoxIFrameFlags) + 2)) != 0)) { assert(isContext(frameContext(localFP))); ourContext = longAt(localFP + FoxThisContext); - goto l224; + goto l223; } ourContext = marryFrameSP(localFP, localSP); - l224: /* end ensureFrameIsMarried:SP: */; + l223: /* end ensureFrameIsMarried:SP: */; /* begin internalPush: */ longAtPointerput((localSP -= BytesPerOop), ourContext); /* begin internalPush: */ @@ -5176,7 +5176,7 @@ GIV(argumentCount) = 1; goto normalSend; /* return self */ - goto l220; + goto l219; } if (unwindContextOrNilOrZero != 0) { /* begin internalAboutToReturn:through: */ @@ -5186,10 +5186,10 @@ : (byteAt((localFP + FoxIFrameFlags) + 2)) != 0)) { assert(isContext(frameContext(localFP))); ourContext1 = longAt(localFP + FoxThisContext); - goto l221; + goto l220; } ourContext1 = marryFrameSP(localFP, localSP); - l221: /* end ensureFrameIsMarried:SP: */; + l220: /* end ensureFrameIsMarried:SP: */; /* begin internalPush: */ longAtPointerput((localSP -= BytesPerOop), ourContext1); /* begin internalPush: */ @@ -5200,7 +5200,7 @@ GIV(argumentCount) = 2; goto normalSend; /* return self */ - goto l220; + goto l219; } contextToReturnTo = null; if (((longAt((home + BaseHeaderSize) + (SenderIndex << (shiftForWord())))) & 1)) { @@ -5257,10 +5257,10 @@ : (byteAt((localFP + FoxIFrameFlags) + 2)) != 0)) { assert(isContext(frameContext(localFP))); ourContext2 = longAt(localFP + FoxThisContext); - goto l223; + goto l222; } ourContext2 = marryFrameSP(localFP, localSP); - l223: /* end ensureFrameIsMarried:SP: */; + l222: /* end ensureFrameIsMarried:SP: */; /* begin internalPush: */ longAtPointerput((localSP -= BytesPerOop), ourContext2); /* begin internalPush: */ @@ -5269,7 +5269,7 @@ GIV(argumentCount) = 1; goto normalSend; /* return self */ - goto l220; + goto l219; } } assert(pageListIsWellFormed()); @@ -5388,11 +5388,11 @@ GIV(framePointer) = localFP; ceEnterCogCodePopReceiverReg(); - goto l222; + goto l221; } localIP = pointerForOop(longAt(localFP + FoxIFSavedIP)); } - l222: /* end maybeReturnToMachineCodeFrame */; + l221: /* end maybeReturnToMachineCodeFrame */; /* begin setMethod: */ assert((((usqInt)(longAt(localFP + FoxMethod)))) >= (startOfMemory())); GIV(method) = longAt(localFP + FoxMethod); @@ -5406,7 +5406,7 @@ longAtPointerput(localSP, localReturnValue); } - l220: /* end case */; + l219: /* end case */; BREAK; CASE(121) /* returnTrue */ @@ -5525,27 +5525,27 @@ fp = (thePage->headFP); if (fp == theFP) { frameAbove = 0; - goto l227; + goto l226; } while (((callerFP = frameCallerFP(fp))) != 0) { if (callerFP == theFP) { frameAbove = fp; - goto l227; + goto l226; } fp = callerFP; } error("did not find theFP in stack page"); frameAbove = 0; - l227: /* end findFrameAbove:inPage: */; + l226: /* end findFrameAbove:inPage: */; /* begin newStackPage */ lruOrFree = ((mostRecentlyUsedPage())->nextPage); if (isFree(lruOrFree)) { newPage = lruOrFree; - goto l228; + goto l227; } divorceFramesIn(lruOrFree); newPage = lruOrFree; - l228: /* end newStackPage */; + l227: /* end newStackPage */; assert(newPage == GIV(stackPage)); moveFramesInthroughtoPage(thePage, frameAbove, newPage); markStackPageMostRecentlyUsed(newPage); @@ -5569,7 +5569,7 @@ longAtput((sp2 = GIV(stackPointer) - BytesPerWord), GIV(instructionPointer)); GIV(stackPointer) = sp2; ceSendAborttonumArgs(longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (SelectorCannotReturn << (shiftForWord()))), contextToReturnFrom, 1); - goto l226; + goto l225; } GIV(instructionPointer) = 0; thePage = makeBaseFrameFor(contextToReturnTo); @@ -5607,7 +5607,7 @@ GIV(framePointer) = localFP; ceEnterCogCodePopReceiverReg(); - goto l226; + goto l225; } localIP = pointerForOop(longAt(localFP + FoxIFSavedIP)); } @@ -5625,8 +5625,8 @@ currentBytecode = (byteAtPointer(++localIP)) + GIV(bytecodeSetSelector); /* return self */ - l226: /* end baseFrameReturn */; - goto l225; + l225: /* end baseFrameReturn */; + goto l224; } /* begin frameCallerSavedIP: */ localIP = pointerForOop(longAt(localFP + FoxCallerSavedIP)); @@ -5654,7 +5654,7 @@ GIV(framePointer) = localFP; ceEnterCogCodePopReceiverReg(); - goto l225; + goto l224; } localIP = pointerForOop(longAt(localFP + FoxIFSavedIP)); } @@ -5671,7 +5671,7 @@ longAtPointerput(localSP, localReturnValue); } - l225: /* end case */; + l224: /* end case */; BREAK; CASE(126) CASE(127) @@ -5700,10 +5700,10 @@ : (byteAt((localFP + FoxIFrameFlags) + 2)) != 0)) { assert(isContext(frameContext(localFP))); ourContext = longAt(localFP + FoxThisContext); - goto l229; + goto l228; } ourContext = marryFrameSP(localFP, localSP); - l229: /* end ensureFrameIsMarried:SP: */; + l228: /* end ensureFrameIsMarried:SP: */; localIP -= 1; /* begin internalPush: */ longAtPointerput((localSP -= BytesPerOop), ourContext); @@ -6017,10 +6017,10 @@ classTablePage = longAt((GIV(hiddenRootsObj) + BaseHeaderSize) + ((((usqInt) lkupClassTag) >> 10) << (shiftForWord()))); if (classTablePage == GIV(nilObj)) { classOrInteger = null; - goto l236; + goto l235; } classOrInteger = longAt((classTablePage + BaseHeaderSize) + ((lkupClassTag & ((1 << 10) - 1)) << (shiftForWord()))); - l236: /* end classAtIndex: */; + l235: /* end classAtIndex: */; GIV(traceLog)[GIV(traceLogIndex)] = classOrInteger; GIV(traceLog)[GIV(traceLogIndex) + 1] = GIV(messageSelector); GIV(traceLog)[GIV(traceLogIndex) + 2] = TraceIsFromInterpreter; @@ -6046,7 +6046,7 @@ GIV(newMethod) = GIV(methodCache)[probe + MethodCacheMethod]; primitiveFunctionPointer = ((void (*)()) (GIV(methodCache)[probe + MethodCachePrimFunction])); ok = 1; - goto l231; + goto l230; } /* second probe */ @@ -6057,7 +6057,7 @@ GIV(newMethod) = GIV(methodCache)[probe + MethodCacheMethod]; primitiveFunctionPointer = ((void (*)()) (GIV(methodCache)[probe + MethodCachePrimFunction])); ok = 1; - goto l231; + goto l230; } probe = (((usqInt) hash) >> 2) & MethodCacheMask; if (((GIV(methodCache)[probe + MethodCacheSelector]) == GIV(messageSelector)) @@ -6065,10 +6065,10 @@ GIV(newMethod) = GIV(methodCache)[probe + MethodCacheMethod]; primitiveFunctionPointer = ((void (*)()) (GIV(methodCache)[probe + MethodCachePrimFunction])); ok = 1; - goto l231; + goto l230; } ok = 0; - l231: /* end inlineLookupInMethodCacheSel:classTag: */; + l230: /* end inlineLookupInMethodCacheSel:classTag: */; if (ok) { /* begin ifAppropriateCompileToNativeCode:selector: */ methodHeader2 = longAt((GIV(newMethod) + BaseHeaderSize) + (HeaderIndex << (shiftForWord()))); @@ -6126,7 +6126,7 @@ maybeFlagMethodAsInterpreted(GIV(newMethod)); } } - goto l234; + goto l233; } } /* begin classForClassTag: */ @@ -6137,10 +6137,10 @@ classTablePage1 = longAt((GIV(hiddenRootsObj) + BaseHeaderSize) + ((((usqInt) lkupClassTag) >> 10) << (shiftForWord()))); if (classTablePage1 == GIV(nilObj)) { GIV(lkupClass) = null; @@ Diff output truncated at 50000 characters. @@

1 0

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

05 Feb '15

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.1044.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.1044 Author: eem Time: 4 February 2015, 4:45:23.297 pm UUID: e04ad0a1-2b15-4561-a3ed-1a4d4d6d58c8 Ancestors: VMMaker.oscog-eem.1043 Nope. The fix is to make ensureBehaviorHash: inlineable. =============== Diff against VMMaker.oscog-eem.1043 =============== Item was changed: ----- Method: SpurMemoryManager>>ensureBehaviorHash: (in category 'class table') ----- ensureBehaviorHash: aBehavior + | hash err | - | newHash err | <inline: true> self assert: (coInterpreter addressCouldBeClassObj: aBehavior). + ^(hash := self rawHashBitsOf: aBehavior) ~= 0 + ifTrue: + [hash] + ifFalse: + [(coInterpreter objCouldBeClassObj: aBehavior) + ifFalse: [PrimErrBadReceiver negated] + ifTrue: + [(err := self enterIntoClassTable: aBehavior) ~= 0 + ifTrue: [err negated] + ifFalse: [self rawHashBitsOf: aBehavior]]]! - (newHash := self rawHashBitsOf: aBehavior) = 0 ifTrue: - [(coInterpreter objCouldBeClassObj: aBehavior) ifFalse: - [^PrimErrBadReceiver negated]. - (err := self enterIntoClassTable: aBehavior) ~= 0 ifTrue: - [^err negated]. - newHash := self rawHashBitsOf: aBehavior. - self assert: (self classAtIndex: newHash) = aBehavior]. - ^newHash! Item was changed: ----- Method: StackInterpreter>>primitiveObject:perform:withArguments:lookedUpIn: (in category 'control primitives') ----- primitiveObject: actualReceiver perform: selector withArguments: argumentArray lookedUpIn: lookupClassOrNil "Common routine used by perform:withArgs:, perform:withArgs:inSuperclass:, object:perform:withArgs:inClass: et al. Answer nil on success. NOTE: The case of doesNotUnderstand: is not a failure to perform. The only failures are arg types and consistency of argumentCount. Since we're in the stack VM we can assume there is space to push the arguments provided they are within limits (max argument count is 15). We can therefore deal with the arbitrary amount of state to remove from the stack (lookup class, selector, mirror receiver) and arbitrary argument orders by deferring popping anything until we know whether the send has succeeded. So on failure we merely have to remove the actual receiver and arguments pushed, and on success we have to slide the actual receiver and arguments down to replace the original ones." <inline: true> + | arraySize performArgCount delta | - | arraySize performArgCount classTag delta | (objectMemory isArray: argumentArray) ifFalse: [^self primitiveFailFor: PrimErrBadArgument]. "Check if number of arguments is reasonable; MaxNumArgs isn't available so just use LargeContextSize" arraySize := objectMemory numSlotsOf: argumentArray. arraySize > LargeContextSlots ifTrue: [^self primitiveFailFor: PrimErrBadNumArgs]. performArgCount := argumentCount. "Push newMethod to save it in case of failure, then push the actual receiver and args out of the array." self push: newMethod. self push: actualReceiver. "Copy the arguments to the stack, and execute" 1 to: arraySize do: [:index| self push: (objectMemory fetchPointer: index - 1 ofObject: argumentArray)]. argumentCount := arraySize. messageSelector := selector. self sendBreakpoint: messageSelector receiver: actualReceiver. self printSends ifTrue: [self printActivationNameForSelector: messageSelector startClass: (lookupClassOrNil isNil ifTrue: [objectMemory fetchClassOf: actualReceiver] ifFalse: [lookupClassOrNil]); cr]. + self findNewMethodInClassTag: (lookupClassOrNil isNil - classTag := lookupClassOrNil isNil ifTrue: [objectMemory fetchClassTagOf: actualReceiver] + ifFalse: [objectMemory classTagForClass: lookupClassOrNil]). - ifFalse: [objectMemory classTagForClass: lookupClassOrNil]. - self findNewMethodInClassTag: classTag. "Only test CompiledMethods for argument count - any other objects playacting as CMs will have to take their chances" ((objectMemory isOopCompiledMethod: newMethod) and: [(self argumentCountOf: newMethod) ~= argumentCount]) ifTrue: ["Restore the state by popping all those array entries and pushing back the selector and array, and fail" self pop: arraySize + 1. newMethod := self popStack. ^self primitiveFailFor: PrimErrBadNumArgs]. "Cannot fail this primitive from here-on. Slide the actual receiver and arguments down to replace the perform arguments and saved newMethod and then execute the new method. Use argumentCount not arraySize because an MNU may have changed it." delta := objectMemory wordSize * (performArgCount + 2). "+2 = receiver + saved newMethod" argumentCount * objectMemory wordSize to: 0 by: objectMemory wordSize negated do: [:offset| stackPages longAt: stackPointer + offset + delta put: (stackPages longAt: stackPointer + offset)]. self pop: performArgCount + 2. self executeNewMethod. self initPrimCall. "Recursive xeq affects primErrorCode" ^nil!

1 0

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

05 Feb '15

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.1043.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.1043 Author: eem Time: 4 February 2015, 4:26:52.679 pm UUID: 60965dc0-4817-47e5-950d-87354d8acb50 Ancestors: VMMaker.oscog-eem.1042 but classTagForClass: can't be inlined yet so rewrite primitiveObject:perform:withArguments:lookedUpIn: =============== Diff against VMMaker.oscog-eem.1042 =============== Item was changed: ----- Method: StackInterpreter>>primitiveObject:perform:withArguments:lookedUpIn: (in category 'control primitives') ----- primitiveObject: actualReceiver perform: selector withArguments: argumentArray lookedUpIn: lookupClassOrNil "Common routine used by perform:withArgs:, perform:withArgs:inSuperclass:, object:perform:withArgs:inClass: et al. Answer nil on success. NOTE: The case of doesNotUnderstand: is not a failure to perform. The only failures are arg types and consistency of argumentCount. Since we're in the stack VM we can assume there is space to push the arguments provided they are within limits (max argument count is 15). We can therefore deal with the arbitrary amount of state to remove from the stack (lookup class, selector, mirror receiver) and arbitrary argument orders by deferring popping anything until we know whether the send has succeeded. So on failure we merely have to remove the actual receiver and arguments pushed, and on success we have to slide the actual receiver and arguments down to replace the original ones." <inline: true> + | arraySize performArgCount classTag delta | - | arraySize performArgCount delta | (objectMemory isArray: argumentArray) ifFalse: [^self primitiveFailFor: PrimErrBadArgument]. "Check if number of arguments is reasonable; MaxNumArgs isn't available so just use LargeContextSize" arraySize := objectMemory numSlotsOf: argumentArray. arraySize > LargeContextSlots ifTrue: [^self primitiveFailFor: PrimErrBadNumArgs]. performArgCount := argumentCount. "Push newMethod to save it in case of failure, then push the actual receiver and args out of the array." self push: newMethod. self push: actualReceiver. "Copy the arguments to the stack, and execute" 1 to: arraySize do: [:index| self push: (objectMemory fetchPointer: index - 1 ofObject: argumentArray)]. argumentCount := arraySize. messageSelector := selector. self sendBreakpoint: messageSelector receiver: actualReceiver. self printSends ifTrue: [self printActivationNameForSelector: messageSelector startClass: (lookupClassOrNil isNil ifTrue: [objectMemory fetchClassOf: actualReceiver] ifFalse: [lookupClassOrNil]); cr]. + classTag := lookupClassOrNil isNil - self findNewMethodInClassTag: (lookupClassOrNil isNil ifTrue: [objectMemory fetchClassTagOf: actualReceiver] + ifFalse: [objectMemory classTagForClass: lookupClassOrNil]. + self findNewMethodInClassTag: classTag. - ifFalse: [objectMemory classTagForClass: lookupClassOrNil]). "Only test CompiledMethods for argument count - any other objects playacting as CMs will have to take their chances" ((objectMemory isOopCompiledMethod: newMethod) and: [(self argumentCountOf: newMethod) ~= argumentCount]) ifTrue: ["Restore the state by popping all those array entries and pushing back the selector and array, and fail" self pop: arraySize + 1. newMethod := self popStack. ^self primitiveFailFor: PrimErrBadNumArgs]. "Cannot fail this primitive from here-on. Slide the actual receiver and arguments down to replace the perform arguments and saved newMethod and then execute the new method. Use argumentCount not arraySize because an MNU may have changed it." delta := objectMemory wordSize * (performArgCount + 2). "+2 = receiver + saved newMethod" argumentCount * objectMemory wordSize to: 0 by: objectMemory wordSize negated do: [:offset| stackPages longAt: stackPointer + offset + delta put: (stackPages longAt: stackPointer + offset)]. self pop: performArgCount + 2. self executeNewMethod. self initPrimCall. "Recursive xeq affects primErrorCode" ^nil!

1 0

[commit][3247] CogVM source as per VMMaker.oscog-eem.1042
by commits＠squeakvm.org 05 Feb '15

05 Feb '15

Revision: 3247 Author: eliot Date: 2015-02-04 16:15:02 -0800 (Wed, 04 Feb 2015) Log Message: ----------- CogVM source as per VMMaker.oscog-eem.1042 fetchClassTagOf: also needs to be inlineable in ifs. Use << instead of bitShift: in Spur seg load. Modified Paths: -------------- branches/Cog/nsspursrc/vm/cointerp.c branches/Cog/nsspursrc/vm/cointerp.h branches/Cog/nsspursrc/vm/gcc3x-cointerp.c branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c branches/Cog/nsspurstacksrc/vm/interp.c branches/Cog/spursistasrc/vm/cointerp.c branches/Cog/spursistasrc/vm/cointerp.h branches/Cog/spursistasrc/vm/gcc3x-cointerp.c branches/Cog/spursrc/vm/cointerp.c branches/Cog/spursrc/vm/cointerp.h branches/Cog/spursrc/vm/gcc3x-cointerp.c branches/Cog/spurstack64src/vm/gcc3x-interp.c branches/Cog/spurstack64src/vm/interp.c branches/Cog/spurstacksrc/vm/gcc3x-interp.c branches/Cog/spurstacksrc/vm/interp.c Property Changed: ---------------- branches/Cog/platforms/Cross/vm/sqSCCSVersion.h Modified: branches/Cog/nsspursrc/vm/cointerp.c =================================================================== --- branches/Cog/nsspursrc/vm/cointerp.c 2015-02-04 23:48:12 UTC (rev 3246) +++ branches/Cog/nsspursrc/vm/cointerp.c 2015-02-05 00:15:02 UTC (rev 3247) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1041 uuid: 07a9d555-3a71-4774-a5f2-04a2ee09a74e + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1042 uuid: cd14932f-16ef-41a5-8212-83e584ac417d from - CoInterpreter VMMaker.oscog-eem.1041 uuid: 07a9d555-3a71-4774-a5f2-04a2ee09a74e + CoInterpreter VMMaker.oscog-eem.1042 uuid: cd14932f-16ef-41a5-8212-83e584ac417d */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1041 uuid: 07a9d555-3a71-4774-a5f2-04a2ee09a74e " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1042 uuid: cd14932f-16ef-41a5-8212-83e584ac417d " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2352,7 +2352,7 @@ /*560*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, 0, 0, 0,-1,-1 }; char expensiveAsserts = 0; -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.1041"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.1042"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -5102,7 +5102,7 @@ if (!((byteAt((localFP + FoxIFrameFlags) + 3)) != 0)) { goto commonCallerReturn; - goto l227; + goto l220; } closure = longAt(localFP + (frameStackedReceiverOffsetNumArgs(((((usqInt)(longAt(localFP + FoxMethod)))) < (startOfMemory()) ? ((mframeCogMethod(localFP))->cmNumArgs) @@ -5155,10 +5155,10 @@ : (byteAt((localFP + FoxIFrameFlags) + 2)) != 0)) { assert(isContext(frameContext(localFP))); ourContext = longAt(localFP + FoxThisContext); - goto l231; + goto l224; } ourContext = marryFrameSP(localFP, localSP); - l231: /* end ensureFrameIsMarried:SP: */; + l224: /* end ensureFrameIsMarried:SP: */; /* begin internalPush: */ longAtPointerput((localSP -= BytesPerOop), ourContext); /* begin internalPush: */ @@ -5167,7 +5167,7 @@ GIV(argumentCount) = 1; goto normalSend; /* return self */ - goto l227; + goto l220; } if (unwindContextOrNilOrZero != 0) { /* begin internalAboutToReturn:through: */ @@ -5177,10 +5177,10 @@ : (byteAt((localFP + FoxIFrameFlags) + 2)) != 0)) { assert(isContext(frameContext(localFP))); ourContext1 = longAt(localFP + FoxThisContext); - goto l228; + goto l221; } ourContext1 = marryFrameSP(localFP, localSP); - l228: /* end ensureFrameIsMarried:SP: */; + l221: /* end ensureFrameIsMarried:SP: */; /* begin internalPush: */ longAtPointerput((localSP -= BytesPerOop), ourContext1); /* begin internalPush: */ @@ -5191,7 +5191,7 @@ GIV(argumentCount) = 2; goto normalSend; /* return self */ - goto l227; + goto l220; } contextToReturnTo = null; if (((longAt((home + BaseHeaderSize) + (SenderIndex << (shiftForWord())))) & 1)) { @@ -5248,10 +5248,10 @@ : (byteAt((localFP + FoxIFrameFlags) + 2)) != 0)) { assert(isContext(frameContext(localFP))); ourContext2 = longAt(localFP + FoxThisContext); - goto l230; + goto l223; } ourContext2 = marryFrameSP(localFP, localSP); - l230: /* end ensureFrameIsMarried:SP: */; + l223: /* end ensureFrameIsMarried:SP: */; /* begin internalPush: */ longAtPointerput((localSP -= BytesPerOop), ourContext2); /* begin internalPush: */ @@ -5260,7 +5260,7 @@ GIV(argumentCount) = 1; goto normalSend; /* return self */ - goto l227; + goto l220; } } assert(pageListIsWellFormed()); @@ -5379,11 +5379,11 @@ GIV(framePointer) = localFP; ceEnterCogCodePopReceiverReg(); - goto l229; + goto l222; } localIP = pointerForOop(longAt(localFP + FoxIFSavedIP)); } - l229: /* end maybeReturnToMachineCodeFrame */; + l222: /* end maybeReturnToMachineCodeFrame */; /* begin setMethod: */ assert((((usqInt)(longAt(localFP + FoxMethod)))) >= (startOfMemory())); GIV(method) = longAt(localFP + FoxMethod); @@ -5397,7 +5397,7 @@ longAtPointerput(localSP, localReturnValue); } - l227: /* end case */; + l220: /* end case */; break; case 121: /* returnTrue */ @@ -5516,27 +5516,27 @@ fp = (thePage->headFP); if (fp == theFP) { frameAbove = 0; - goto l234; + goto l227; } while (((callerFP = frameCallerFP(fp))) != 0) { if (callerFP == theFP) { frameAbove = fp; - goto l234; + goto l227; } fp = callerFP; } error("did not find theFP in stack page"); frameAbove = 0; - l234: /* end findFrameAbove:inPage: */; + l227: /* end findFrameAbove:inPage: */; /* begin newStackPage */ lruOrFree = ((mostRecentlyUsedPage())->nextPage); if (isFree(lruOrFree)) { newPage = lruOrFree; - goto l235; + goto l228; } divorceFramesIn(lruOrFree); newPage = lruOrFree; - l235: /* end newStackPage */; + l228: /* end newStackPage */; assert(newPage == GIV(stackPage)); moveFramesInthroughtoPage(thePage, frameAbove, newPage); markStackPageMostRecentlyUsed(newPage); @@ -5560,7 +5560,7 @@ longAtput((sp2 = GIV(stackPointer) - BytesPerWord), GIV(instructionPointer)); GIV(stackPointer) = sp2; ceSendAborttonumArgs(longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (SelectorCannotReturn << (shiftForWord()))), contextToReturnFrom, 1); - goto l233; + goto l226; } GIV(instructionPointer) = 0; thePage = makeBaseFrameFor(contextToReturnTo); @@ -5598,8 +5598,7 @@ GIV(framePointer) = localFP; ceEnterCogCodePopReceiverReg(); - null; - goto l233; + goto l226; } localIP = pointerForOop(longAt(localFP + FoxIFSavedIP)); } @@ -5616,9 +5615,9 @@ /* begin fetchNextBytecode */ currentBytecode = (byteAtPointer(++localIP)) + GIV(bytecodeSetSelector); - null; - l233: /* end baseFrameReturn */; - goto l232; + /* return self */ + l226: /* end baseFrameReturn */; + goto l225; } /* begin frameCallerSavedIP: */ localIP = pointerForOop(longAt(localFP + FoxCallerSavedIP)); @@ -5646,7 +5645,7 @@ GIV(framePointer) = localFP; ceEnterCogCodePopReceiverReg(); - goto l232; + goto l225; } localIP = pointerForOop(longAt(localFP + FoxIFSavedIP)); } @@ -5663,7 +5662,7 @@ longAtPointerput(localSP, localReturnValue); } - l232: /* end case */; + l225: /* end case */; break; case 126: case 127: @@ -5692,10 +5691,10 @@ : (byteAt((localFP + FoxIFrameFlags) + 2)) != 0)) { assert(isContext(frameContext(localFP))); ourContext = longAt(localFP + FoxThisContext); - goto l236; + goto l229; } ourContext = marryFrameSP(localFP, localSP); - l236: /* end ensureFrameIsMarried:SP: */; + l229: /* end ensureFrameIsMarried:SP: */; localIP -= 1; /* begin internalPush: */ longAtPointerput((localSP -= BytesPerOop), ourContext); @@ -5962,15 +5961,11 @@ VM_LABEL(normalSend); rcvr = longAtPointer(localSP + (GIV(argumentCount) * BytesPerOop)); - /* begin fetchClassTagOf: */ - if (((tagBits = rcvr & 3)) != 0) { - lkupClassTag = ((tagBits & 1) != 0 - ? 1 - : tagBits); - goto l237; - } - lkupClassTag = (longAt(rcvr)) & 0x3FFFFF; - l237: /* end fetchClassTagOf: */; + lkupClassTag = (((tagBits = rcvr & 3)) != 0 + ? ((tagBits & 1) != 0 + ? 1 + : tagBits) + : (longAt(rcvr)) & 0x3FFFFF); assert(lkupClassTag != (nilObject())); commonSend: @@ -6013,10 +6008,10 @@ classTablePage = longAt((GIV(hiddenRootsObj) + BaseHeaderSize) + ((((usqInt) lkupClassTag) >> 10) << (shiftForWord()))); if (classTablePage == GIV(nilObj)) { classOrInteger = null; - goto l244; + goto l236; } classOrInteger = longAt((classTablePage + BaseHeaderSize) + ((lkupClassTag & ((1 << 10) - 1)) << (shiftForWord()))); - l244: /* end classAtIndex: */; + l236: /* end classAtIndex: */; GIV(traceLog)[GIV(traceLogIndex)] = classOrInteger; GIV(traceLog)[GIV(traceLogIndex) + 1] = GIV(messageSelector); GIV(traceLog)[GIV(traceLogIndex) + 2] = TraceIsFromInterpreter; @@ -6042,7 +6037,7 @@ GIV(newMethod) = GIV(methodCache)[probe + MethodCacheMethod]; primitiveFunctionPointer = ((void (*)()) (GIV(methodCache)[probe + MethodCachePrimFunction])); ok = 1; - goto l239; + goto l231; } /* second probe */ @@ -6053,7 +6048,7 @@ GIV(newMethod) = GIV(methodCache)[probe + MethodCacheMethod]; primitiveFunctionPointer = ((void (*)()) (GIV(methodCache)[probe + MethodCachePrimFunction])); ok = 1; - goto l239; + goto l231; } probe = (((usqInt) hash) >> 2) & MethodCacheMask; if (((GIV(methodCache)[probe + MethodCacheSelector]) == GIV(messageSelector)) @@ -6061,10 +6056,10 @@ GIV(newMethod) = GIV(methodCache)[probe + MethodCacheMethod]; primitiveFunctionPointer = ((void (*)()) (GIV(methodCache)[probe + MethodCachePrimFunction])); ok = 1; - goto l239; + goto l231; } ok = 0; - l239: /* end inlineLookupInMethodCacheSel:classTag: */; + l231: /* end inlineLookupInMethodCacheSel:classTag: */; if (ok) { /* begin ifAppropriateCompileToNativeCode:selector: */ methodHeader2 = longAt((GIV(newMethod) + BaseHeaderSize) + (HeaderIndex << (shiftForWord()))); @@ -6122,7 +6117,7 @@ maybeFlagMethodAsInterpreted(GIV(newMethod)); } } - goto l242; + goto l234; } } /* begin classForClassTag: */ @@ -6133,10 +6128,10 @@ classTablePage1 = longAt((GIV(hiddenRootsObj) + BaseHeaderSize) + ((((usqInt) lkupClassTag) >> 10) << (shiftForWord()))); if (classTablePage1 == GIV(nilObj)) { GIV(lkupClass) = null; - goto l238; + goto l230; } GIV(lkupClass) = longAt((classTablePage1 + BaseHeaderSize) + ((lkupClassTag & ((1 << 10) - 1)) << (shiftForWord()))); - l238: /* end classAtIndex: */; + l230: /* end classAtIndex: */; lookupMethodInClass(GIV(lkupClass)); /* begin internalizeIPandSP */ assert(GIV(instructionPointer) != (ceReturnToInterpreterPC())); @@ -6145,7 +6140,7 @@ localFP = pointerForOop(GIV(framePointer)); addNewMethodToCache(GIV(lkupClass)); } - l242: /* end internalFindNewMethod */; + l234: /* end internalFindNewMethod */; /* begin internalExecuteNewMethod */ if (primitiveFunctionPointer != 0) { if ((((unsigned long) primitiveFunctionPointer)) <= MaxQuickPrimitiveIndex) { @@ -6158,31 +6153,31 @@ /* begin internalStackTopPut: */ longAtPointerput(localSP, longAt(((longAtPointer(localSP)) + BaseHeaderSize) + ((localPrimIndex - 264) << (shiftForWord())))); 1; - goto l240; + goto l232; } if (localPrimIndex == 256) { 1; - goto l240; + goto l232; } if (localPrimIndex == 257) { longAtPointerput(localSP, GIV(trueObj)); 1; - goto l240; + goto l232; } if (localPrimIndex == 258) { longAtPointerput(localSP, GIV(falseObj)); 1; - goto l240; + goto l232; } if (localPrimIndex == 259) { longAtPointerput(localSP, GIV(nilObj)); 1; - goto l240; + goto l232; } longAtPointerput(localSP, (((localPrimIndex - 261) << 1) | 1)); 1; - l240: /* end internalQuickPrimitiveResponse */; - goto l241; + l232: /* end internalQuickPrimitiveResponse */; + goto l233; } /* begin externalizeIPandSP */ assert((((usqInt)localIP)) != (ceReturnToInterpreterPC())); @@ -6246,7 +6241,7 @@ returntoExecutive(popStack(), 1); browserPluginReturnIfNeeded(); null; - goto l241; + goto l233; } } if (methodHasCogMethod(GIV(newMethod))) { @@ -6323,11 +6318,11 @@ table = longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (PrimErrTableIndex << (shiftForWord()))); if (GIV(primFailCode) <= ((lastPointerOf(table)) / BytesPerWord)) { errorCode = longAt((table + BaseHeaderSize) + ((GIV(primFailCode) - 1) << (shiftForWord()))); - goto l243; + goto l235; } } errorCode = ((GIV(primFailCode) << 1) | 1); - l243: /* end getErrorObjectFromPrimFailCode */; + l235: /* end getErrorObjectFromPrimFailCode */; longAtPointerput(localSP, errorCode); } GIV(primFailCode) = 0; @@ -6351,7 +6346,7 @@ localFP = pointerForOop(GIV(framePointer)); } } - l241: /* end internalExecuteNewMethod */; + l233: /* end internalExecuteNewMethod */; /* begin fetchNextBytecode */ currentBytecode = (byteAtPointer(++localIP)) + GIV(bytecodeSetSelector); @@ -6758,17 +6753,17 @@ if (((newHash = (long32At(superclass + 4)) & 0x3FFFFF)) == 0) { if (!(objCouldBeClassObj(superclass))) { -PrimErrBadReceiver; - goto l245; + goto l237; } if (((err = enterIntoClassTable(superclass))) != 0) { -err; - goto l245; + goto l237; } newHash = (long32At(superclass + 4)) & 0x3FFFFF; assert((classAtIndex(newHash)) == superclass); } newHash; - l245: /* end ensureBehaviorHash: */; + l237: /* end ensureBehaviorHash: */; /* begin classTagForClass: */ assert(addressCouldBeClassObj(superclass)); /* begin ensureBehaviorHash: */ @@ -6776,17 +6771,17 @@ if (((newHash1 = (long32At(superclass + 4)) & 0x3FFFFF)) == 0) { if (!(objCouldBeClassObj(superclass))) { lkupClassTag = -PrimErrBadReceiver; - goto l246; + goto l238; } if (((err1 = enterIntoClassTable(superclass))) != 0) { lkupClassTag = -err1; - goto l246; + goto l238; } newHash1 = (long32At(superclass + 4)) & 0x3FFFFF; assert((classAtIndex(newHash1)) == superclass); } lkupClassTag = newHash1; - l246: /* end ensureBehaviorHash: */; + l238: /* end ensureBehaviorHash: */; /* begin ensureReceiverUnforwarded */ if ((((longAtPointer(localSP + (GIV(argumentCount) * BytesPerOop))) & 3) == 0) && (((longAt(longAtPointer(localSP + (GIV(argumentCount) * BytesPerOop)))) & 0x3FFFFF) == 8)) { @@ -7803,7 +7798,7 @@ /* begin fetchNextBytecode */ currentBytecode = (byteAtPointer(++localIP)) + GIV(bytecodeSetSelector); - goto l247; + goto l239; } if (bytecode == 172) { @@ -7813,7 +7808,7 @@ /* begin fetchNextBytecode */ currentBytecode = (byteAtPointer(++localIP)) + GIV(bytecodeSetSelector); - goto l247; + goto l239; } if (bytecode > 167) { @@ -7824,7 +7819,7 @@ localIP = (localIP + offset) + 1; currentBytecode = (byteAtPointer(localIP)) + GIV(bytecodeSetSelector); - goto l247; + goto l239; } } currentBytecode = bytecode + GIV(bytecodeSetSelector); @@ -7832,7 +7827,7 @@ /* begin internalPush: */ longAtPointerput((localSP -= BytesPerOop), GIV(trueObj)); } - l247: /* end case */; + l239: /* end case */; break; case 179: /* bytecodePrimGreaterThan */ @@ -7949,7 +7944,7 @@ localIP = (localIP + (bytecode - 151)) + 1; currentBytecode = (byteAtPointer(localIP)) + GIV(bytecodeSetSelector); - goto l248; + goto l240; } if (bytecode == 172) { @@ -7960,14 +7955,14 @@ localIP = (localIP + offset) + 1; currentBytecode = (byteAtPointer(localIP)) + GIV(bytecodeSetSelector); - goto l248; + goto l240; } currentBytecode = bytecode + GIV(bytecodeSetSelector); /* begin internalPush: */ longAtPointerput((localSP -= BytesPerOop), GIV(falseObj)); } - l248: /* end case */; + l240: /* end case */; break; case 180: /* bytecodePrimLessOrEqual */ @@ -9991,6 +9986,22 @@ case 221: case 222: case 223: + case 368: /*112*/ + case 369: /*113*/ + case 370: /*114*/ + case 371: /*115*/ + case 372: /*116*/ + case 373: /*117*/ + case 374: /*118*/ + case 375: /*119*/ + case 376: /*120*/ + case 377: /*121*/ + case 378: /*122*/ + case 379: /*123*/ + case 380: /*124*/ + case 381: /*125*/ + case 382: /*126*/ + case 383: /*127*/ /* sendLiteralSelector0ArgsBytecode */ { sqInt rcvr; @@ -10002,15 +10013,11 @@ GIV(messageSelector) = longAt((GIV(method) + BaseHeaderSize) + (((currentBytecode & 15) + LiteralStart) << (shiftForWord()))); GIV(argumentCount) = 0; rcvr = longAtPointer(localSP + (0 * BytesPerOop)); - /* begin fetchClassTagOf: */ - if (((tagBits = rcvr & 3)) != 0) { - lkupClassTag = ((tagBits & 1) != 0 - ? 1 - : tagBits); - goto l110; - } - lkupClassTag = (longAt(rcvr)) & 0x3FFFFF; - l110: /* end fetchClassTagOf: */; + lkupClassTag = (((tagBits = rcvr & 3)) != 0 + ? ((tagBits & 1) != 0 + ? 1 + : tagBits) + : (longAt(rcvr)) & 0x3FFFFF); assert(lkupClassTag != (nilObject())); goto commonSend; } @@ -10031,6 +10038,22 @@ case 237: case 238: case 239: + case 384: /*128*/ + case 385: /*129*/ + case 386: /*130*/ + case 387: /*131*/ + case 388: /*132*/ + case 389: /*133*/ + case 390: /*134*/ + case 391: /*135*/ + case 392: /*136*/ + case 393: /*137*/ + case 394: /*138*/ + case 395: /*139*/ + case 396: /*140*/ + case 397: /*141*/ + case 398: /*142*/ + case 399: /*143*/ /* sendLiteralSelector1ArgBytecode */ { sqInt rcvr; @@ -10042,15 +10065,11 @@ GIV(messageSelector) = longAt((GIV(method) + BaseHeaderSize) + (((currentBytecode & 15) + LiteralStart) << (shiftForWord()))); GIV(argumentCount) = 1; rcvr = longAtPointer(localSP + (1 * BytesPerOop)); - /* begin fetchClassTagOf: */ - if (((tagBits = rcvr & 3)) != 0) { - lkupClassTag = ((tagBits & 1) != 0 - ? 1 - : tagBits); - goto l111; - } - lkupClassTag = (longAt(rcvr)) & 0x3FFFFF; - l111: /* end fetchClassTagOf: */; + lkupClassTag = (((tagBits = rcvr & 3)) != 0 + ? ((tagBits & 1) != 0 + ? 1 + : tagBits) + : (longAt(rcvr)) & 0x3FFFFF); assert(lkupClassTag != (nilObject())); goto commonSend; } @@ -10071,6 +10090,22 @@ case 253: case 254: case 255: + case 400: /*144*/ + case 401: /*145*/ + case 402: /*146*/ + case 403: /*147*/ + case 404: /*148*/ + case 405: /*149*/ + case 406: /*150*/ + case 407: /*151*/ + case 408: /*152*/ + case 409: /*153*/ + case 410: /*154*/ + case 411: /*155*/ + case 412: /*156*/ + case 413: /*157*/ + case 414: /*158*/ + case 415: /*159*/ /* sendLiteralSelector2ArgsBytecode */ { sqInt rcvr; @@ -10082,15 +10117,11 @@ GIV(messageSelector) = longAt((GIV(method) + BaseHeaderSize) + (((currentBytecode & 15) + LiteralStart) << (shiftForWord()))); GIV(argumentCount) = 2; rcvr = longAtPointer(localSP + (2 * BytesPerOop)); - /* begin fetchClassTagOf: */ - if (((tagBits = rcvr & 3)) != 0) { - lkupClassTag = ((tagBits & 1) != 0 - ? 1 - : tagBits); - goto l112; - } - lkupClassTag = (longAt(rcvr)) & 0x3FFFFF; - l112: /* end fetchClassTagOf: */; + lkupClassTag = (((tagBits = rcvr & 3)) != 0 + ? ((tagBits & 1) != 0 + ? 1 + : tagBits) + : (longAt(rcvr)) & 0x3FFFFF); assert(lkupClassTag != (nilObject())); goto commonSend; } @@ -10110,7 +10141,7 @@ case 0: /* begin internalPush: */ longAtPointerput((localSP -= BytesPerOop), GIV(falseObj)); - goto l113; + goto l110; break; case 1: @@ -10128,10 +10159,10 @@ : (byteAt((localFP + FoxIFrameFlags) + 2)) != 0)) { assert(isContext(frameContext(localFP))); context = longAt(localFP + FoxThisContext); - goto l114; + goto l111; } context = marryFrameSP(localFP, localSP); - l114: /* end ensureFrameIsMarried:SP: */; + l111: /* end ensureFrameIsMarried:SP: */; thing = context; break; @@ -10146,7 +10177,7 @@ /* begin internalPush: */ longAtPointerput((localSP -= BytesPerOop), thing); } - l113: /* end case */; + l110: /* end case */; break; case 336: /*80*/ /* bytecodePrimAdd */ @@ -10173,7 +10204,7 @@ /* begin fetchNextBytecode */ currentBytecode = (byteAtPointer(++localIP)) + GIV(bytecodeSetSelector); - goto l115; + goto l112; } } else { @@ -10188,7 +10219,7 @@ /* begin loadFloatOrIntFrom: */ if ((rcvr & 1)) { rcvr1 = ((double) ((rcvr >> 1)) ); - goto l117; + goto l114; } /* begin floatValueOf: */ isFloat = ((rcvr & 3) == 0) @@ -10197,19 +10228,19 @@ ; fetchFloatAtinto(rcvr + BaseHeaderSize, result1); rcvr1 = result1; - goto l116; + goto l113; } /* begin primitiveFail */ if (!GIV(primFailCode)) { GIV(primFailCode) = 1; } rcvr1 = 0.0; - l116: /* end floatValueOf: */; - l117: /* end loadFloatOrIntFrom: */; + l113: /* end floatValueOf: */; + l114: /* end loadFloatOrIntFrom: */; /* begin loadFloatOrIntFrom: */ if ((arg & 1)) { arg1 = ((double) ((arg >> 1)) ); - goto l119; + goto l116; } /* begin floatValueOf: */ isFloat1 = ((arg & 3) == 0) @@ -10218,15 +10249,15 @@ ; fetchFloatAtinto(arg + BaseHeaderSize, result2); arg1 = result2; - goto l118; + goto l115; } /* begin primitiveFail */ if (!GIV(primFailCode)) { GIV(primFailCode) = 1; } arg1 = 0.0; - l118: /* end floatValueOf: */; - l119: /* end loadFloatOrIntFrom: */; + l115: /* end floatValueOf: */; + l116: /* end loadFloatOrIntFrom: */; if (!GIV(primFailCode)) { /* begin pop:thenPushFloat: */ longAtput((sp = GIV(stackPointer) + ((2 - 1) * BytesPerWord)), floatObjectOf(rcvr1 + arg1)); @@ -10241,7 +10272,7 @@ /* begin fetchNextBytecode */ currentBytecode = (byteAtPointer(++localIP)) + GIV(bytecodeSetSelector); - goto l115; + goto l112; } } /* begin fetchPointer:ofObject: */ @@ -10249,7 +10280,7 @@ GIV(argumentCount) = 1; goto normalSend; } - l115: /* end case */; + l112: /* end case */; break; case 337: /*81*/ /* bytecodePrimSubtract */ @@ -10276,7 +10307,7 @@ /* begin fetchNextBytecode */ currentBytecode = (byteAtPointer(++localIP)) + GIV(bytecodeSetSelector); - goto l120; + goto l117; } } else { @@ -10291,7 +10322,7 @@ /* begin loadFloatOrIntFrom: */ if ((rcvr & 1)) { rcvr1 = ((double) ((rcvr >> 1)) ); - goto l122; + goto l119; } /* begin floatValueOf: */ isFloat = ((rcvr & 3) == 0) @@ -10300,19 +10331,19 @@ ; fetchFloatAtinto(rcvr + BaseHeaderSize, result1); rcvr1 = result1; - goto l121; + goto l118; } /* begin primitiveFail */ if (!GIV(primFailCode)) { GIV(primFailCode) = 1; } rcvr1 = 0.0; - l121: /* end floatValueOf: */; - l122: /* end loadFloatOrIntFrom: */; + l118: /* end floatValueOf: */; + l119: /* end loadFloatOrIntFrom: */; /* begin loadFloatOrIntFrom: */ if ((arg & 1)) { arg1 = ((double) ((arg >> 1)) ); - goto l124; + goto l121; } /* begin floatValueOf: */ isFloat1 = ((arg & 3) == 0) @@ -10321,15 +10352,15 @@ ; fetchFloatAtinto(arg + BaseHeaderSize, result2); arg1 = result2; - goto l123; + goto l120; } /* begin primitiveFail */ if (!GIV(primFailCode)) { GIV(primFailCode) = 1; } arg1 = 0.0; - l123: /* end floatValueOf: */; - l124: /* end loadFloatOrIntFrom: */; + l120: /* end floatValueOf: */; + l121: /* end loadFloatOrIntFrom: */; if (!GIV(primFailCode)) { /* begin pop:thenPushFloat: */ longAtput((sp = GIV(stackPointer) + ((2 - 1) * BytesPerWord)), floatObjectOf(rcvr1 - arg1)); @@ -10344,7 +10375,7 @@ /* begin fetchNextBytecode */ currentBytecode = (byteAtPointer(++localIP)) + GIV(bytecodeSetSelector); - goto l120; + goto l117; } } /* begin fetchPointer:ofObject: */ @@ -10352,7 +10383,7 @@ GIV(argumentCount) = 1; goto normalSend; } - l120: /* end case */; + l117: /* end case */; break; case 338: /*82*/ /* bytecodePrimLessThanV4 */ @@ -10382,7 +10413,7 @@ else { goto booleanCheatFalseV4; } - goto l125; + goto l122; } /* begin initPrimCall */ GIV(primFailCode) = 0; @@ -10390,7 +10421,7 @@ /* begin loadFloatOrIntFrom: */ if ((rcvr & 1)) { rcvr1 = ((double) ((rcvr >> 1)) ); - goto l127; + goto l124; } /* begin floatValueOf: */ isFloat = ((rcvr & 3) == 0) @@ -10399,19 +10430,19 @@ ; fetchFloatAtinto(rcvr + BaseHeaderSize, result); rcvr1 = result; - goto l126; + goto l123; } /* begin primitiveFail */ if (!GIV(primFailCode)) { GIV(primFailCode) = 1; } rcvr1 = 0.0; - l126: /* end floatValueOf: */; - l127: /* end loadFloatOrIntFrom: */; + l123: /* end floatValueOf: */; + l124: /* end loadFloatOrIntFrom: */; /* begin loadFloatOrIntFrom: */ if ((arg & 1)) { arg1 = ((double) ((arg >> 1)) ); - goto l129; + goto l126; } /* begin floatValueOf: */ isFloat1 = ((arg & 3) == 0) @@ -10420,15 +10451,15 @@ ; fetchFloatAtinto(arg + BaseHeaderSize, result1); arg1 = result1; - goto l128; + goto l125; } /* begin primitiveFail */ if (!GIV(primFailCode)) { GIV(primFailCode) = 1; } arg1 = 0.0; - l128: /* end floatValueOf: */; - l129: /* end loadFloatOrIntFrom: */; + l125: /* end floatValueOf: */; + l126: /* end loadFloatOrIntFrom: */; aBool = rcvr1 < arg1; if (!GIV(primFailCode)) { /* begin booleanCheatV4: */ @@ -10438,14 +10469,14 @@ else { goto booleanCheatFalseV4; } - goto l125; + goto l122; } /* begin fetchPointer:ofObject: */ GIV(messageSelector) = longAt(((longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (SpecialSelectors << (shiftForWord())))) + BaseHeaderSize) + ((2 * 2) << (shiftForWord()))); GIV(argumentCount) = 1; goto normalSend; } - l125: /* end case */; + l122: /* end case */; booleanCheatTrueV4: /* booleanCheatTrueV4 */ @@ -10468,7 +10499,7 @@ /* begin fetchNextBytecode */ currentBytecode = (byteAtPointer(++localIP)) + GIV(bytecodeSetSelector); - goto l249; + goto l241; } if (bytecode == 244) { @@ -10478,7 +10509,7 @@ /* begin fetchNextBytecode */ currentBytecode = (byteAtPointer(++localIP)) + GIV(bytecodeSetSelector); - goto l249; + goto l241; } if (bytecode == 243) { @@ -10489,7 +10520,7 @@ localIP = (localIP + offset) + 1; currentBytecode = (byteAtPointer(localIP)) + GIV(bytecodeSetSelector); - goto l249; + goto l241; } } currentBytecode = bytecode + GIV(bytecodeSetSelector); @@ -10497,7 +10528,7 @@ /* begin internalPush: */ longAtPointerput((localSP -= BytesPerOop), GIV(trueObj)); } - l249: /* end case */; + l241: /* end case */; break; case 339: /*83*/ /* bytecodePrimGreaterThanV4 */ @@ -10527,7 +10558,7 @@ else { /* goto booleanCheatFalseV4 */ } - goto l130; + goto l127; } /* begin initPrimCall */ GIV(primFailCode) = 0; @@ -10535,7 +10566,7 @@ /* begin loadFloatOrIntFrom: */ if ((rcvr & 1)) { rcvr1 = ((double) ((rcvr >> 1)) ); - goto l132; + goto l129; } /* begin floatValueOf: */ isFloat = ((rcvr & 3) == 0) @@ -10544,19 +10575,19 @@ ; fetchFloatAtinto(rcvr + BaseHeaderSize, result); rcvr1 = result; - goto l131; + goto l128; } /* begin primitiveFail */ if (!GIV(primFailCode)) { GIV(primFailCode) = 1; } rcvr1 = 0.0; - l131: /* end floatValueOf: */; - l132: /* end loadFloatOrIntFrom: */; + l128: /* end floatValueOf: */; + l129: /* end loadFloatOrIntFrom: */; /* begin loadFloatOrIntFrom: */ if ((arg & 1)) { arg1 = ((double) ((arg >> 1)) ); - goto l134; + goto l131; } /* begin floatValueOf: */ isFloat1 = ((arg & 3) == 0) @@ -10565,15 +10596,15 @@ ; fetchFloatAtinto(arg + BaseHeaderSize, result1); arg1 = result1; - goto l133; + goto l130; } /* begin primitiveFail */ if (!GIV(primFailCode)) { GIV(primFailCode) = 1; } arg1 = 0.0; - l133: /* end floatValueOf: */; - l134: /* end loadFloatOrIntFrom: */; + l130: /* end floatValueOf: */; + l131: /* end loadFloatOrIntFrom: */; aBool = rcvr1 > arg1; if (!GIV(primFailCode)) { /* begin booleanCheatV4: */ @@ -10583,14 +10614,14 @@ else { goto booleanCheatFalseV4; } - goto l130; + goto l127; } /* begin fetchPointer:ofObject: */ GIV(messageSelector) = longAt(((longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (SpecialSelectors << (shiftForWord())))) + BaseHeaderSize) + ((3 * 2) << (shiftForWord()))); GIV(argumentCount) = 1; goto normalSend; } - l130: /* end case */; + l127: /* end case */; booleanCheatFalseV4: /* booleanCheatFalseV4 */ @@ -10614,7 +10645,7 @@ localIP = (localIP + (bytecode - 207)) + 1; currentBytecode = (byteAtPointer(localIP)) + GIV(bytecodeSetSelector); - goto l250; + goto l242; } if (bytecode == 244) { @@ -10625,14 +10656,14 @@ localIP = (localIP + offset) + 1; currentBytecode = (byteAtPointer(localIP)) + GIV(bytecodeSetSelector); - goto l250; + goto l242; } currentBytecode = bytecode + GIV(bytecodeSetSelector); /* begin internalPush: */ longAtPointerput((localSP -= BytesPerOop), GIV(falseObj)); } - l250: /* end case */; + l242: /* end case */; break; case 340: /*84*/ /* bytecodePrimLessOrEqualV4 */ @@ -10662,7 +10693,7 @@ else { goto booleanCheatFalseV4; } - goto l135; + goto l132; } /* begin initPrimCall */ GIV(primFailCode) = 0; @@ -10670,7 +10701,7 @@ /* begin loadFloatOrIntFrom: */ if ((rcvr & 1)) { rcvr1 = ((double) ((rcvr >> 1)) ); - goto l137; + goto l134; } /* begin floatValueOf: */ isFloat = ((rcvr & 3) == 0) @@ -10679,19 +10710,19 @@ ; fetchFloatAtinto(rcvr + BaseHeaderSize, result); rcvr1 = result; - goto l136; + goto l133; } /* begin primitiveFail */ if (!GIV(primFailCode)) { GIV(primFailCode) = 1; } rcvr1 = 0.0; - l136: /* end floatValueOf: */; - l137: /* end loadFloatOrIntFrom: */; + l133: /* end floatValueOf: */; + l134: /* end loadFloatOrIntFrom: */; /* begin loadFloatOrIntFrom: */ if ((arg & 1)) { arg1 = ((double) ((arg >> 1)) ); - goto l139; + goto l136; } /* begin floatValueOf: */ isFloat1 = ((arg & 3) == 0) @@ -10700,15 +10731,15 @@ ; fetchFloatAtinto(arg + BaseHeaderSize, result1); arg1 = result1; - goto l138; + goto l135; } /* begin primitiveFail */ if (!GIV(primFailCode)) { GIV(primFailCode) = 1; } arg1 = 0.0; - l138: /* end floatValueOf: */; - l139: /* end loadFloatOrIntFrom: */; + l135: /* end floatValueOf: */; + l136: /* end loadFloatOrIntFrom: */; aBool = rcvr1 <= arg1; if (!GIV(primFailCode)) { /* begin booleanCheatV4: */ @@ -10718,14 +10749,14 @@ else { goto booleanCheatFalseV4; } - goto l135; + goto l132; } /* begin fetchPointer:ofObject: */ GIV(messageSelector) = longAt(((longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (SpecialSelectors << (shiftForWord())))) + BaseHeaderSize) + ((4 * 2) << (shiftForWord()))); GIV(argumentCount) = 1; goto normalSend; } - l135: /* end case */; + l132: /* end case */; break; case 341: /*85*/ /* bytecodePrimGreaterOrEqualV4 */ @@ -10755,7 +10786,7 @@ else { goto booleanCheatFalseV4; } - goto l140; + goto l137; } /* begin initPrimCall */ GIV(primFailCode) = 0; @@ -10763,7 +10794,7 @@ /* begin loadFloatOrIntFrom: */ if ((rcvr & 1)) { rcvr1 = ((double) ((rcvr >> 1)) ); - goto l142; + goto l139; } /* begin floatValueOf: */ isFloat = ((rcvr & 3) == 0) @@ -10772,19 +10803,19 @@ ; fetchFloatAtinto(rcvr + BaseHeaderSize, result); rcvr1 = result; - goto l141; + goto l138; } /* begin primitiveFail */ if (!GIV(primFailCode)) { GIV(primFailCode) = 1; } rcvr1 = 0.0; - l141: /* end floatValueOf: */; - l142: /* end loadFloatOrIntFrom: */; + l138: /* end floatValueOf: */; + l139: /* end loadFloatOrIntFrom: */; /* begin loadFloatOrIntFrom: */ if ((arg & 1)) { arg1 = ((double) ((arg >> 1)) ); - goto l144; + goto l141; } /* begin floatValueOf: */ isFloat1 = ((arg & 3) == 0) @@ -10793,15 +10824,15 @@ ; fetchFloatAtinto(arg + BaseHeaderSize, result1); arg1 = result1; - goto l143; + goto l140; } /* begin primitiveFail */ if (!GIV(primFailCode)) { GIV(primFailCode) = 1; } arg1 = 0.0; - l143: /* end floatValueOf: */; - l144: /* end loadFloatOrIntFrom: */; + l140: /* end floatValueOf: */; + l141: /* end loadFloatOrIntFrom: */; aBool = rcvr1 >= arg1; if (!GIV(primFailCode)) { /* begin booleanCheatV4: */ @@ -10811,14 +10842,14 @@ else { goto booleanCheatFalseV4; } - goto l140; + goto l137; } /* begin fetchPointer:ofObject: */ GIV(messageSelector) = longAt(((longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (SpecialSelectors << (shiftForWord())))) + BaseHeaderSize) + ((5 * 2) << (shiftForWord()))); GIV(argumentCount) = 1; goto normalSend; } - l140: /* end case */; + l137: /* end case */; break; case 342: /*86*/ /* bytecodePrimEqualV4 */ @@ -10844,7 +10875,7 @@ else { goto booleanCheatFalseV4; } - goto l145; + goto l142; } /* begin initPrimCall */ GIV(primFailCode) = 0; @@ -10852,7 +10883,7 @@ /* begin loadFloatOrIntFrom: */ if ((rcvr & 1)) { rcvr1 = ((double) ((rcvr >> 1)) ); - goto l147; + goto l144; } /* begin floatValueOf: */ isFloat = ((rcvr & 3) == 0) @@ -10861,19 +10892,19 @@ ; fetchFloatAtinto(rcvr + BaseHeaderSize, result); rcvr1 = result; - goto l146; + goto l143; } /* begin primitiveFail */ if (!GIV(primFailCode)) { GIV(primFailCode) = 1; } rcvr1 = 0.0; - l146: /* end floatValueOf: */; - l147: /* end loadFloatOrIntFrom: */; + l143: /* end floatValueOf: */; + l144: /* end loadFloatOrIntFrom: */; /* begin loadFloatOrIntFrom: */ if ((arg & 1)) { arg1 = ((double) ((arg >> 1)) ); - goto l149; + goto l146; } /* begin floatValueOf: */ isFloat1 = ((arg & 3) == 0) @@ -10882,15 +10913,15 @@ ; fetchFloatAtinto(arg + BaseHeaderSize, result1); arg1 = result1; - goto l148; + goto l145; } /* begin primitiveFail */ if (!GIV(primFailCode)) { GIV(primFailCode) = 1; } arg1 = 0.0; - l148: /* end floatValueOf: */; - l149: /* end loadFloatOrIntFrom: */; + l145: /* end floatValueOf: */; + l146: /* end loadFloatOrIntFrom: */; aBool = rcvr1 == arg1; if (!GIV(primFailCode)) { /* begin booleanCheatV4: */ @@ -10900,14 +10931,14 @@ else { goto booleanCheatFalseV4; } - goto l145; + goto l142; } /* begin fetchPointer:ofObject: */ GIV(messageSelector) = longAt(((longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (SpecialSelectors << (shiftForWord())))) + BaseHeaderSize) + ((6 * 2) << (shiftForWord()))); GIV(argumentCount) = 1; goto normalSend; } - l145: /* end case */; + l142: /* end case */; break; case 343: /*87*/ /* bytecodePrimNotEqualV4 */ @@ -10933,7 +10964,7 @@ else { goto booleanCheatFalseV4; } - goto l150; + goto l147; } /* begin initPrimCall */ GIV(primFailCode) = 0; @@ -10941,7 +10972,7 @@ /* begin loadFloatOrIntFrom: */ if ((rcvr & 1)) { rcvr1 = ((double) ((rcvr >> 1)) ); - goto l152; + goto l149; } /* begin floatValueOf: */ isFloat = ((rcvr & 3) == 0) @@ -10950,19 +10981,19 @@ ; fetchFloatAtinto(rcvr + BaseHeaderSize, result); rcvr1 = result; - goto l151; + goto l148; } /* begin primitiveFail */ if (!GIV(primFailCode)) { GIV(primFailCode) = 1; } rcvr1 = 0.0; - l151: /* end floatValueOf: */; - l152: /* end loadFloatOrIntFrom: */; + l148: /* end floatValueOf: */; + l149: /* end loadFloatOrIntFrom: */; /* begin loadFloatOrIntFrom: */ if ((arg & 1)) { arg1 = ((double) ((arg >> 1)) ); - goto l154; + goto l151; } /* begin floatValueOf: */ isFloat1 = ((arg & 3) == 0) @@ -10971,15 +11002,15 @@ ; fetchFloatAtinto(arg + BaseHeaderSize, result1); arg1 = result1; - goto l153; + goto l150; } /* begin primitiveFail */ if (!GIV(primFailCode)) { GIV(primFailCode) = 1; } arg1 = 0.0; - l153: /* end floatValueOf: */; - l154: /* end loadFloatOrIntFrom: */; + l150: /* end floatValueOf: */; + l151: /* end loadFloatOrIntFrom: */; aBool = rcvr1 == arg1; if (!GIV(primFailCode)) { /* begin booleanCheatV4: */ @@ -10989,14 +11020,14 @@ else { goto booleanCheatFalseV4; } - goto l150; + goto l147; } /* begin fetchPointer:ofObject: */ GIV(messageSelector) = longAt(((longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (SpecialSelectors << (shiftForWord())))) + BaseHeaderSize) + ((7 * 2) << (shiftForWord()))); GIV(argumentCount) = 1; goto normalSend; } - l150: /* end case */; + l147: /* end case */; break; case 344: /*88*/ /* bytecodePrimMultiply */ @@ -11027,7 +11058,7 @@ /* begin fetchNextBytecode */ currentBytecode = (byteAtPointer(++localIP)) + GIV(bytecodeSetSelector); - goto l155; + goto l152; } } else { @@ -11042,7 +11073,7 @@ /* begin loadFloatOrIntFrom: */ if ((rcvr & 1)) { rcvr1 = ((double) ((rcvr >> 1)) ); - goto l157; + goto l154; } /* begin floatValueOf: */ isFloat = ((rcvr & 3) == 0) @@ -11051,19 +11082,19 @@ ; fetchFloatAtinto(rcvr + BaseHeaderSize, result1); rcvr1 = result1; - goto l156; + goto l153; } /* begin primitiveFail */ if (!GIV(primFailCode)) { GIV(primFailCode) = 1; } rcvr1 = 0.0; - l156: /* end floatValueOf: */; - l157: /* end loadFloatOrIntFrom: */; + l153: /* end floatValueOf: */; + l154: /* end loadFloatOrIntFrom: */; /* begin loadFloatOrIntFrom: */ if ((arg & 1)) { arg1 = ((double) ((arg >> 1)) ); - goto l159; + goto l156; } /* begin floatValueOf: */ isFloat1 = ((arg & 3) == 0) @@ -11072,15 +11103,15 @@ ; fetchFloatAtinto(arg + BaseHeaderSize, result2); arg1 = result2; - goto l158; + goto l155; } /* begin primitiveFail */ if (!GIV(primFailCode)) { GIV(primFailCode) = 1; } arg1 = 0.0; - l158: /* end floatValueOf: */; - l159: /* end loadFloatOrIntFrom: */; + l155: /* end floatValueOf: */; + l156: /* end loadFloatOrIntFrom: */; if (!GIV(primFailCode)) { /* begin pop:thenPushFloat: */ longAtput((sp = GIV(stackPointer) + ((2 - 1) * BytesPerWord)), floatObjectOf(rcvr1 * arg1)); @@ -11095,7 +11126,7 @@ /* begin fetchNextBytecode */ currentBytecode = (byteAtPointer(++localIP)) + GIV(bytecodeSetSelector); - goto l155; + goto l152; } } /* begin fetchPointer:ofObject: */ @@ -11103,7 +11134,7 @@ GIV(argumentCount) = 1; goto normalSend; } - l155: /* end case */; + l152: /* end case */; break; case 345: /*89*/ /* bytecodePrimDivide */ @@ -11137,7 +11168,7 @@ /* begin fetchNextBytecode */ currentBytecode = (byteAtPointer(++localIP)) + GIV(bytecodeSetSelector); - goto l160; + goto l157; } } } @@ -11153,7 +11184,7 @@ /* begin loadFloatOrIntFrom: */ if ((rcvr & 1)) { rcvr1 = ((double) ((rcvr >> 1)) ); - goto l162; + goto l159; } /* begin floatValueOf: */ isFloat = ((rcvr & 3) == 0) @@ -11162,19 +11193,19 @@ ; fetchFloatAtinto(rcvr + BaseHeaderSize, result1); rcvr1 = result1; - goto l161; + goto l158; } /* begin primitiveFail */ if (!GIV(primFailCode)) { GIV(primFailCode) = 1; } rcvr1 = 0.0; - l161: /* end floatValueOf: */; - l162: /* end loadFloatOrIntFrom: */; + l158: /* end floatValueOf: */; + l159: /* end loadFloatOrIntFrom: */; /* begin loadFloatOrIntFrom: */ if ((arg & 1)) { arg1 = ((double) ((arg >> 1)) ); - goto l164; + goto l161; } /* begin floatValueOf: */ isFloat1 = ((arg & 3) == 0) @@ -11183,15 +11214,15 @@ ; fetchFloatAtinto(arg + BaseHeaderSize, result2); arg1 = result2; - goto l163; + goto l160; } /* begin primitiveFail */ if (!GIV(primFailCode)) { GIV(primFailCode) = 1; } arg1 = 0.0; - l163: /* end floatValueOf: */; - l164: /* end loadFloatOrIntFrom: */; + l160: /* end floatValueOf: */; + l161: /* end loadFloatOrIntFrom: */; /* begin success: */ if (!(arg1 != 0.0)) { @@ -11215,7 +11246,7 @@ /* begin fetchNextBytecode */ currentBytecode = (byteAtPointer(++localIP)) + GIV(bytecodeSetSelector); - goto l160; + goto l157; } } /* begin fetchPointer:ofObject: */ @@ -11223,7 +11254,7 @@ GIV(argumentCount) = 1; goto normalSend; } - l160: /* end case */; + l157: /* end case */; break; case 346: /*90*/ /* bytecodePrimMod */ @@ -11240,14 +11271,14 @@ /* begin fetchNextBytecode */ currentBytecode = (byteAtPointer(++localIP)) + GIV(bytecodeSetSelector); - goto l165; + goto l162; } /* begin fetchPointer:ofObject: */ GIV(messageSelector) = longAt(((longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (SpecialSelectors << (shiftForWord())))) + BaseHeaderSize) + ((10 * 2) << (shiftForWord()))); GIV(argumentCount) = 1; goto normalSend; } - l165: /* end case */; + l162: /* end case */; break; case 347: /*91*/ /* bytecodePrimMakePoint */ @@ -11317,13 +11348,13 @@ if ((GIV(freeStart) + numBytes) > (((eden()).limit))) { error("no room in eden for allocateSmallNewSpaceSlots:format:classIndex:"); pointResult = 0; - goto l170; + goto l167; } } long64Atput(newObj, (((((usqLong) (YIndex + 1))) << 56) + (objFormat << 24)) + ((long32At(classObj + 4)) & 0x3FFFFF)); GIV(freeStart) += numBytes; pointResult = newObj; - l170: /* end eeInstantiateSmallClass:numSlots: */; + l167: /* end eeInstantiateSmallClass:numSlots: */; /* begin storePointerUnchecked:ofObject:withValue: */ assert(!(isForwarded(pointResult))); longAtput((pointResult + BaseHeaderSize) + (XIndex << (shiftForWord())), ((((rcvr >> 1)) << 1) | 1)); @@ -11362,13 +11393,13 @@ if ((GIV(freeStart) + numBytes1) > (((eden()).limit))) { error("no room in eden for allocateSmallNewSpaceSlots:format:classIndex:"); pointResult1 = 0; - goto l167; + goto l164; } } long64Atput(newObj1, (((((usqLong) (YIndex + 1))) << 56) + (objFormat1 << 24)) + ((long32At(classObj1 + 4)) & 0x3FFFFF)); GIV(freeStart) += numBytes1; pointResult1 = newObj1; - l167: /* end eeInstantiateSmallClass:numSlots: */; + l164: /* end eeInstantiateSmallClass:numSlots: */; /* begin storePointerUnchecked:ofObject:withValue: */ assert(!(isForwarded(pointResult1))); longAtput((pointResult1 + BaseHeaderSize) + (XIndex << (shiftForWord())), ((((rcvr >> 1)) << 1) | 1)); @@ -11406,7 +11437,7 @@ } null; - goto l168; + goto l165; } /* begin makePointwithxValue:yValue: */ /* begin eeInstantiateSmallClass:numSlots: */ @@ -11437,13 +11468,13 @@ if ((GIV(freeStart) + numBytes2) > (((eden()).limit))) { error("no room in eden for allocateSmallNewSpaceSlots:format:classIndex:"); pointResult2 = 0; - goto l169; + goto l166; } } long64Atput(newObj2, (((((usqLong) (YIndex + 1))) << 56) + (objFormat2 << 24)) + ((long32At(classObj2 + 4)) & 0x3FFFFF)); GIV(freeStart) += numBytes2; pointResult2 = newObj2; - l169: /* end eeInstantiateSmallClass:numSlots: */; + l166: /* end eeInstantiateSmallClass:numSlots: */; /* begin storePointerUnchecked:ofObject:withValue: */ assert(!(isForwarded(pointResult2))); longAtput((pointResult2 + BaseHeaderSize) + (XIndex << (shiftForWord())), ((0 << 1) | 1)); @@ -11487,7 +11518,7 @@ /* begin pop:thenPush: */ longAtput((sp = GIV(stackPointer) + ((2 - 1) * BytesPerWord)), pt); GIV(stackPointer) = sp; - l168: /* end primitiveMakePoint */; + l165: /* end primitiveMakePoint */; /* begin internalizeIPandSP */ assert(GIV(instructionPointer) != (ceReturnToInterpreterPC())); localIP = pointerForOop(GIV(instructionPointer)); @@ -11497,14 +11528,14 @@ /* begin fetchNextBytecode */ currentBytecode = (byteAtPointer(++localIP)) + GIV(bytecodeSetSelector); - goto l166; + goto l163; } /* begin fetchPointer:ofObject: */ GIV(messageSelector) = longAt(((longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (SpecialSelectors << (shiftForWord())))) + BaseHeaderSize) + ((11 * 2) << (shiftForWord()))); GIV(argumentCount) = 1; goto normalSend; } - l166: /* end case */; + l163: /* end case */; break; case 348: /*92*/ /* bytecodePrimBitShift */ @@ -11530,7 +11561,7 @@ GIV(primFailCode) = 1; } null; - goto l172; + goto l169; } integerReceiver = longAt(GIV(stackPointer) + (1 * BytesPerWord)); integerReceiver = positive32BitValueOf(integerReceiver); @@ -11546,7 +11577,7 @@ GIV(primFailCode) = 1; } null; - goto l172; + goto l169; } shifted = integerReceiver << integerArgument; if (!(integerReceiver == (((usqInt) shifted) >> integerArgument))) { @@ -11555,7 +11586,7 @@ GIV(primFailCode) = 1; } null; - goto l172; + goto l169; } } else { @@ -11568,7 +11599,7 @@ GIV(primFailCode) = 1; } null; - goto l172; + goto l169; } shifted = ((usqInt) integerReceiver) >> (0 - integerArgument); } @@ -11577,7 +11608,7 @@ longAtput((sp = GIV(stackPointer) + ((2 - 1) * BytesPerWord)), shifted); GIV(stackPointer) = sp; } - l172: /* end primitiveBitShift */; + l169: /* end primitiveBitShift */; /* begin internalizeIPandSP */ assert(GIV(instructionPointer) != (ceReturnToInterpreterPC())); localIP = pointerForOop(GIV(instructionPointer)); @@ -11587,14 +11618,14 @@ /* begin fetchNextBytecode */ currentBytecode = (byteAtPointer(++localIP)) + GIV(bytecodeSetSelector); - goto l171; + goto l168; } /* begin fetchPointer:ofObject: */ GIV(messageSelector) = longAt(((longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (SpecialSelectors << (shiftForWord())))) + BaseHeaderSize) + ((12 * 2) << (shiftForWord()))); GIV(argumentCount) = 1; goto normalSend; } - l171: /* end case */; + l168: /* end case */; break; case 349: /*93*/ /* bytecodePrimDiv */ @@ -11611,14 +11642,14 @@ /* begin fetchNextBytecode */ currentBytecode = (byteAtPointer(++localIP)) + GIV(bytecodeSetSelector); - goto l173; + goto l170; } /* begin fetchPointer:ofObject: */ GIV(messageSelector) = longAt(((longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (SpecialSelectors << (shiftForWord())))) + BaseHeaderSize) + ((13 * 2) << (shiftForWord()))); GIV(argumentCount) = 1; goto normalSend; } - l173: /* end case */; + l170: /* end case */; break; case 350: /*94*/ /* bytecodePrimBitAnd */ @@ -11672,14 +11703,14 @@ /* begin fetchNextBytecode */ currentBytecode = (byteAtPointer(++localIP)) + GIV(bytecodeSetSelector); - goto l174; + goto l171; } /* begin fetchPointer:ofObject: */ GIV(messageSelector) = longAt(((longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (SpecialSelectors << (shiftForWord())))) + BaseHeaderSize) + ((14 * 2) << (shiftForWord()))); GIV(argumentCount) = 1; goto normalSend; } - l174: /* end case */; + l171: /* end case */; break; case 351: /*95*/ /* bytecodePrimBitOr */ @@ -11733,14 +11764,14 @@ /* begin fetchNextBytecode */ currentBytecode = (byteAtPointer(++localIP)) + GIV(bytecodeSetSelector); - goto l175; + goto l172; } /* begin fetchPointer:ofObject: */ GIV(messageSelector) = longAt(((longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (SpecialSelectors << (shiftForWord())))) + BaseHeaderSize) + ((15 * 2) << (shiftForWord()))); GIV(argumentCount) = 1; goto normalSend; } - l175: /* end case */; + l172: /* end case */; break; case 352: /*96*/ /* bytecodePrimAt */ @@ -11790,7 +11821,7 @@ if (!(lookupInMethodCacheSelclassTag(GIV(messageSelector), lkupClassTag))) { GIV(argumentCount) = 1; goto commonSend; - goto l176; + goto l173; } if (primitiveFunctionPointer == primitiveAt) { /* begin install:inAtCache:at:string: */ @@ -11804,7 +11835,7 @@ GIV(primFailCode) = PrimErrBadReceiver; 0; - goto l184; + goto l181; } /* begin lengthOf:format: */ /* begin numSlotsOfAny: */ @@ -11814,42 +11845,42 @@ : numSlots3); if (fmt1 <= 9) { totalLength = numSlots1; - goto l185; + goto l182; } if (fmt1 >= 16) { /* bytes, including CompiledMethod */ @@ Diff output truncated at 50000 characters. @@

1 0

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

05 Feb '15

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.1042.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.1042 Author: eem Time: 4 February 2015, 4:10:47.84 pm UUID: cd14932f-16ef-41a5-8212-83e584ac417d Ancestors: VMMaker.oscog-eem.1041 fetchClassTagOf: also needs to be inlineable in ifs. Use << instead of bitShift: in Spur seg load. =============== Diff against VMMaker.oscog-eem.1041 =============== Item was changed: ----- Method: Spur32BitMemoryManager>>fetchClassTagOf: (in category 'interpreter access') ----- fetchClassTagOf: oop | tagBits | + ^(tagBits := oop bitAnd: self tagMask) ~= 0 + ifTrue: [(tagBits bitAnd: 1) ~= 0 ifTrue: [1] ifFalse: [tagBits]] + ifFalse: [self classIndexOf: oop]! - (tagBits := oop bitAnd: self tagMask) ~= 0 ifTrue: - [^(tagBits bitAnd: 1) ~= 0 ifTrue: [1] ifFalse: [tagBits]]. - ^self classIndexOf: oop! Item was changed: ----- Method: SpurMemoryManager>>assignClassIndicesAndPinFrom:to:outPointers: (in category 'image segment in/out') ----- assignClassIndicesAndPinFrom: segmentStart to: segmentLimit outPointers: outPointerArray "This is part of loadImageSegmentFrom:outPointers:. Make a final pass, assigning the real class indices and/or pinning pinned objects." | objOop topHashBit | + topHashBit := 1 << self identityHashFieldWidth - 1. - topHashBit := 1 bitShift: self identityHashFieldWidth - 1. objOop := self objectStartingAt: segmentStart. [objOop < segmentLimit] whileTrue: [| classRef classOop classIndex | "In the segment, class indices are offset indexes into the segment data, or into outPointers. See mapOopsFrom:to:outPointers:outHashes:." classRef := (self classIndexOf: objOop) - self firstClassIndexPun. classOop := (classRef anyMask: topHashBit) ifTrue: [self fetchPointer: classRef - topHashBit ofObject: outPointerArray] ifFalse: [classRef * self allocationUnit + segmentStart]. classIndex := self rawHashBitsOf: classOop. self assert: (classIndex > self lastClassIndexPun and: [(self classOrNilAtIndex: classIndex) = classOop]). self setClassIndexOf: objOop to: classIndex. ((self isInNewSpace: objOop) and: [self isPinned: objOop]) ifTrue: [| oldClone | oldClone := self cloneInOldSpaceForPinning: objOop. oldClone ~= 0 ifTrue: [self setIsPinnedOf: oldClone to: true. self forward: objOop to: oldClone]]. objOop := self objectAfter: objOop limit: segmentLimit]. ! Item was changed: ----- Method: SpurMemoryManager>>mapOopsAndValidateClassRefsFrom:to:outPointers: (in category 'image segment in/out') ----- mapOopsAndValidateClassRefsFrom: segmentStart to: segmentLimit outPointers: outPointerArray "This is part of loadImageSegmentFrom:outPointers:. Scan through mapping oops and validating class references. Defer entering any class objects into the class table and/or pinning objects until the second pass in assignClassIndicesAndPinFrom:to:outPointers:." | numOutPointers objOop topHashBit topOopBit | numOutPointers := self numSlotsOf: outPointerArray. + topHashBit := 1 << self identityHashFieldWidth - 1. + topOopBit := 1 << self bytesPerOop * 8 - 1. - topHashBit := 1 bitShift: self identityHashFieldWidth - 1. - topOopBit := 1 bitShift: self bytesPerOop * 8 - 1. objOop := self objectStartingAt: segmentStart. [objOop < segmentLimit] whileTrue: [| classIndex hash oop mappedOop | (self isMarked: objOop) ifTrue: [^PrimErrInappropriate]. classIndex := (self classIndexOf: objOop) - self firstClassIndexPun. "validate the class ref, but don't update it until any internal classes have been added to the class table." (classIndex anyMask: topHashBit) ifTrue: [classIndex - topHashBit >= numOutPointers ifTrue: [^PrimErrBadIndex]. mappedOop := self fetchPointer: classIndex - topHashBit ofObject: outPointerArray. hash := self rawHashBitsOf: mappedOop. (hash > self lastClassIndexPun and: [(self classOrNilAtIndex: hash) = mappedOop]) ifFalse: [^PrimErrInappropriate]] ifFalse: "The class is contained within the segment." [(oop := classIndex * self allocationUnit + segmentStart) >= segmentLimit ifTrue: [^PrimErrBadIndex]. (self rawHashBitsOf: oop) ~= 0 ifTrue: [^PrimErrInappropriate]]. 0 to: (self numPointerSlotsOf: objOop) - 1 do: [:i| oop := self fetchPointer: i ofObject: objOop. (self isNonImmediate: oop) ifTrue: [(oop anyMask: topOopBit) ifTrue: [(oop := oop - topOopBit / self bytesPerOop) >= numOutPointers ifTrue: [^PrimErrBadIndex]. mappedOop := self fetchPointer: oop ofObject: outPointerArray] ifFalse: [(oop bitAnd: self allocationUnit - 1) ~= 0 ifTrue: [^PrimErrInappropriate]. (mappedOop := oop + segmentStart) >= segmentLimit ifTrue: [^PrimErrBadIndex]]. self storePointerUnchecked: i ofObject: objOop withValue: mappedOop]]. objOop := self objectAfter: objOop limit: segmentLimit]. ^0! Item was changed: ----- Method: SpurMemoryManager>>mapOopsFrom:to:outPointers:outHashes: (in category 'image segment in/out') ----- mapOopsFrom: segStart to: segAddr outPointers: outPointerArray outHashes: savedOutHashes "This is part of storeImageSegmentInto:outPointers:roots:. Now scan, adding out pointers to the outPointersArray; all objects in arrayOfObjects have had their hashes set to point to their copies in segmentWordArray. Answer the outIndex if the scan succeded. Fail if outPointers is too small and answer -1." | objOop outIndex topHashBit topOopBit | outIndex := 0. self fillObj: outPointerArray numSlots: (self numSlotsOf: outPointerArray) with: nilObj. + topHashBit := 1 << self identityHashFieldWidth - 1. + topOopBit := 1 << self bytesPerOop * 8 - 1. - topHashBit := 1 bitShift: self identityHashFieldWidth - 1. - topOopBit := 1 bitShift: self bytesPerOop * 8 - 1. objOop := self objectStartingAt: segStart. [objOop < segAddr] whileTrue: [| oop segIndex | oop := self fetchClassOfNonImm: objOop. (self isMarked: oop) ifFalse: "oop is a new outPointer; allocate its oop" [outIndex := self newOutPointer: oop at: outIndex in: outPointerArray hashes: savedOutHashes topHashBit: topHashBit. outIndex = 0 ifTrue:"no room in outPointers; fail" [^-1]]. "Set the clone's class index to an offset index into segmentWordArray. Use an offset so that code cannot confuse a clone with e.g. a forwarder." segIndex := self rawHashBitsOf: oop. self setClassIndexOf: objOop to: segIndex + self firstClassIndexPun. 0 to: (self numPointerSlotsOf: objOop) - 1 do: [:i| oop := self fetchPointer: i ofObject: objOop. (self isNonImmediate: oop) ifTrue: [(self isMarked: oop) ifFalse: "oop is a new outPointer; allocate its oop" [outIndex := self newOutPointer: oop at: outIndex in: outPointerArray hashes: savedOutHashes topHashBit: topHashBit. outIndex = 0 ifTrue: "no room in outPointers; fail" [^-1]]. oop := self mappedOopOf: oop topHashBit: topHashBit topOopBit: topOopBit.. self storePointerUnchecked: i ofObject: objOop withValue: oop]]. objOop := self objectAfter: objOop limit: segAddr]. ^outIndex!

1 0

[commit][3246] CogVM source as per VMMaker.oscog-eem.1041
by commits＠squeakvm.org 05 Feb '15

05 Feb '15

Revision: 3246 Author: eliot Date: 2015-02-04 15:48:12 -0800 (Wed, 04 Feb 2015) Log Message: ----------- CogVM source as per VMMaker.oscog-eem.1041 Allow primitivePerformWithArgs to avoid fetchClassOf: in Spur by making the last arg to primitiveObject:perform:withArguments:lookedUpIn: lookupClassOrNil. Update Slang constant folding to include nil isNil/notNil. Eliminate NewspeakV3 support from the Newspeak Spur VMs. Fix commonSendAbsent's comment. Use numSlotsOfAny: to avoid unnecessary assert fails in some printing & testing code. Fix ... bug in longPrintOop: Spur: Like V3's, Spur's fetchClassOf: also needs to be inlineable in ifs. Never inline fetchClassOfNonImm: in Spur; it's a lot of code and should be rare, dynamically. Spur image segments: Offset class indices in objects in segment to avoid confusion with forwarders etc. Comment helper methods better. Add 32-bit byte swapping for 64-bit segment support. Don't expunge unmarked entries from the class table in the segment storage markObjects: invocation. Do 32-bit word reversal in 64-bit Spur and hence fix 64-bit image segment load. Make sure the leak checker is run when image segment leak checking is enabled. Modified Paths: -------------- branches/Cog/nscogsrc/vm/cogit.c branches/Cog/nscogsrc/vm/cogit.h branches/Cog/nscogsrc/vm/cointerp.c branches/Cog/nscogsrc/vm/cointerp.h branches/Cog/nscogsrc/vm/gcc3x-cointerp.c branches/Cog/nsspursrc/vm/cogit.c branches/Cog/nsspursrc/vm/cogit.h branches/Cog/nsspursrc/vm/cointerp.c branches/Cog/nsspursrc/vm/cointerp.h branches/Cog/nsspursrc/vm/gcc3x-cointerp.c branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c branches/Cog/nsspurstacksrc/vm/interp.c branches/Cog/sistasrc/vm/cogit.c branches/Cog/sistasrc/vm/cogit.h branches/Cog/sistasrc/vm/cointerp.c branches/Cog/sistasrc/vm/cointerp.h branches/Cog/sistasrc/vm/gcc3x-cointerp.c branches/Cog/spursistasrc/vm/cogit.c branches/Cog/spursistasrc/vm/cogit.h branches/Cog/spursistasrc/vm/cointerp.c branches/Cog/spursistasrc/vm/cointerp.h branches/Cog/spursistasrc/vm/gcc3x-cointerp.c branches/Cog/spursrc/vm/cogit.c branches/Cog/spursrc/vm/cogit.h branches/Cog/spursrc/vm/cointerp.c branches/Cog/spursrc/vm/cointerp.h branches/Cog/spursrc/vm/gcc3x-cointerp.c branches/Cog/spurstack64src/vm/gcc3x-interp.c branches/Cog/spurstack64src/vm/interp.c branches/Cog/spurstacksrc/vm/gcc3x-interp.c branches/Cog/spurstacksrc/vm/interp.c branches/Cog/src/vm/cogit.c branches/Cog/src/vm/cogit.h branches/Cog/src/vm/cointerp.c branches/Cog/src/vm/cointerp.h branches/Cog/src/vm/cointerpmt.c branches/Cog/src/vm/cointerpmt.h branches/Cog/src/vm/gcc3x-cointerp.c branches/Cog/src/vm/gcc3x-cointerpmt.c branches/Cog/stacksrc/vm/gcc3x-interp.c branches/Cog/stacksrc/vm/interp.c Property Changed: ---------------- branches/Cog/platforms/Cross/vm/sqSCCSVersion.h Modified: branches/Cog/nscogsrc/vm/cogit.c =================================================================== --- branches/Cog/nscogsrc/vm/cogit.c 2015-02-02 02:24:35 UTC (rev 3245) +++ branches/Cog/nscogsrc/vm/cogit.c 2015-02-04 23:48:12 UTC (rev 3246) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.1025 uuid: 1a29f456-a8e2-4312-a391-8e2cdb0430ee + CCodeGenerator VMMaker.oscog-eem.1039 uuid: 931d69b1-7be3-42dd-8833-1ba325d2b5f2 from - StackToRegisterMappingCogit VMMaker.oscog-eem.1025 uuid: 1a29f456-a8e2-4312-a391-8e2cdb0430ee + StackToRegisterMappingCogit VMMaker.oscog-eem.1039 uuid: 931d69b1-7be3-42dd-8833-1ba325d2b5f2 */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1025 uuid: 1a29f456-a8e2-4312-a391-8e2cdb0430ee " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1039 uuid: 931d69b1-7be3-42dd-8833-1ba325d2b5f2 " __DATE__ ; char *__cogitBuildInfo = __buildInfo; Modified: branches/Cog/nscogsrc/vm/cogit.h =================================================================== --- branches/Cog/nscogsrc/vm/cogit.h 2015-02-02 02:24:35 UTC (rev 3245) +++ branches/Cog/nscogsrc/vm/cogit.h 2015-02-04 23:48:12 UTC (rev 3246) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.1025 uuid: 1a29f456-a8e2-4312-a391-8e2cdb0430ee + CCodeGenerator VMMaker.oscog-eem.1039 uuid: 931d69b1-7be3-42dd-8833-1ba325d2b5f2 */ Modified: branches/Cog/nscogsrc/vm/cointerp.c =================================================================== --- branches/Cog/nscogsrc/vm/cointerp.c 2015-02-02 02:24:35 UTC (rev 3245) +++ branches/Cog/nscogsrc/vm/cointerp.c 2015-02-04 23:48:12 UTC (rev 3246) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1035 uuid: 33a34378-0618-40c7-8fbb-c467fb40fc57 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1040 uuid: be108ef5-00a3-425b-b228-16515cc447c7 from - CoInterpreter VMMaker.oscog-eem.1035 uuid: 33a34378-0618-40c7-8fbb-c467fb40fc57 + CoInterpreter VMMaker.oscog-eem.1040 uuid: be108ef5-00a3-425b-b228-16515cc447c7 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1035 uuid: 33a34378-0618-40c7-8fbb-c467fb40fc57 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1040 uuid: be108ef5-00a3-425b-b228-16515cc447c7 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -1174,7 +1174,6 @@ EXPORT(void) primitiveEventProcessingControl(void); sqInt primitiveIndexOfMethodheader(sqInt theMethod, sqInt methodHeader); sqInt primitiveIndexOf(sqInt methodPointer); -static sqInt primitiveObjectperformwithArgumentslookedUpIn(sqInt actualReceiver, sqInt selector, sqInt argumentArray, sqInt lookupClass) NoDbgRegParms; static void printActivationNameForSelectorstartClass(sqInt aSelector, sqInt startClass) NoDbgRegParms; static void printActivationNameForreceiverisBlockfirstTemporary(sqInt aMethod, sqInt anObject, sqInt isBlock, sqInt maybeMessage) NoDbgRegParms; void printAllStacks(void); @@ -2098,7 +2097,7 @@ /* 575 */ (void (*)(void))0, 0 }; char expensiveAsserts = 0; -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.1035"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.1040"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -30675,10 +30674,26 @@ static void primitivePerformInSuperclass(void) { DECL_MAYBE_SQ_GLOBAL_STRUCT + sqInt argumentArray; + sqInt arraySize; sqInt ccIndex; + sqInt ccIndex1; + sqInt ccIndex2; sqInt currentClass; + sqInt delta; + sqInt header; + sqInt index; sqInt lookupClass; + sqInt offset; + sqInt performArgCount; sqInt rcvr; + sqInt selector; + sqInt selector1; + char *sp; + char *sp1; + char *sp2; + sqInt sz; + sqInt top; lookupClass = longAt(GIV(stackPointer)); rcvr = longAt(GIV(stackPointer) + (3 * BytesPerWord)); @@ -30695,24 +30710,206 @@ return; } } - primitiveObjectperformwithArgumentslookedUpIn(rcvr, longAt(GIV(stackPointer) + (2 * BytesPerWord)), longAt(GIV(stackPointer) + (1 * BytesPerWord)), lookupClass); + /* begin primitiveObject:perform:withArguments:lookedUpIn: */ + selector = longAt(GIV(stackPointer) + (2 * BytesPerWord)); + argumentArray = longAt(GIV(stackPointer) + (1 * BytesPerWord)); + if (!(((argumentArray & 1) == 0) + && (((((usqInt) (longAt(argumentArray))) >> (instFormatFieldLSB())) & 15) == 2))) { + GIV(primFailCode) = PrimErrBadArgument; + goto l1; + } + /* begin numSlotsOf: */ + header = longAt(argumentArray); + sz = ((header & TypeMask) == HeaderTypeSizeAndClass + ? (longAt(argumentArray - (BytesPerWord * 2))) & AllButTypeMask + : header & SizeMask); + arraySize = ((usqInt) (sz - BaseHeaderSize)) >> (shiftForWord()); + if (arraySize > LargeContextSlots) { + GIV(primFailCode) = PrimErrBadNumArgs; + goto l1; + } + + /* Push newMethod to save it in case of failure, + then push the actual receiver and args out of the array. */ + + performArgCount = GIV(argumentCount); + /* begin push: */ + longAtput((sp1 = GIV(stackPointer) - BytesPerWord), GIV(newMethod)); + GIV(stackPointer) = sp1; + /* begin push: */ + longAtput((sp2 = GIV(stackPointer) - BytesPerWord), rcvr); + GIV(stackPointer) = sp2; + for (index = 1; index <= arraySize; index += 1) { + /* begin push: */ + longAtput((sp = GIV(stackPointer) - BytesPerWord), longAt((argumentArray + BaseHeaderSize) + ((index - 1) << (shiftForWord())))); + GIV(stackPointer) = sp; + } + GIV(argumentCount) = arraySize; + GIV(messageSelector) = selector; + /* begin sendBreakpoint:receiver: */ + selector1 = GIV(messageSelector); + sendBreakpointreceiver(firstFixedFieldOfMaybeImmediate(selector1), lengthOfMaybeImmediate(selector1), rcvr); + if (printOnTrace()) { + printActivationNameForSelectorstartClass(GIV(messageSelector), (lookupClass == null + ? ((rcvr & 1) + ? longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassSmallInteger << (shiftForWord()))) + : (((ccIndex2 = (((usqInt) (longAt(rcvr))) >> (compactClassFieldLSB())) & 0x1F)) == 0 + ? (longAt(rcvr - BaseHeaderSize)) & AllButTypeMask + : (/* begin fetchPointer:ofObject: */ + longAt(((longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (CompactClasses << (shiftForWord())))) + BaseHeaderSize) + ((ccIndex2 - 1) << (shiftForWord())))))) + : lookupClass)); + /* begin cr */ + printf("\n"); + } + findNewMethodInClassTag((lookupClass == null + ? ((rcvr & 1) + ? longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassSmallInteger << (shiftForWord()))) + : (((ccIndex1 = (((usqInt) (longAt(rcvr))) >> (compactClassFieldLSB())) & 0x1F)) == 0 + ? (longAt(rcvr - BaseHeaderSize)) & AllButTypeMask + : (/* begin fetchPointer:ofObject: */ + longAt(((longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (CompactClasses << (shiftForWord())))) + BaseHeaderSize) + ((ccIndex1 - 1) << (shiftForWord())))))) + : lookupClass)); + if ((((GIV(newMethod) & 1) == 0) + && (((((usqInt) (longAt(GIV(newMethod)))) >> (instFormatFieldLSB())) & 15) >= 12)) + && ((argumentCountOf(GIV(newMethod))) != GIV(argumentCount))) { + + /* Restore the state by popping all those array entries and pushing back the selector and array, and fail */ + + /* begin pop: */ + GIV(stackPointer) += (arraySize + 1) * BytesPerWord; + null; + /* begin popStack */ + top = longAt(GIV(stackPointer)); + GIV(stackPointer) += BytesPerWord; + GIV(newMethod) = ((sqInt) top); + GIV(primFailCode) = PrimErrBadNumArgs; + goto l1; + } + + /* +2 = receiver + saved newMethod */ + + delta = BytesPerWord * (performArgCount + 2); + for (offset = (GIV(argumentCount) * BytesPerWord); offset >= 0; offset += (-BytesPerWord)) { + longAtput((GIV(stackPointer) + offset) + delta, longAt(GIV(stackPointer) + offset)); + } + /* begin pop: */ + GIV(stackPointer) += (performArgCount + 2) * BytesPerWord; + null; + executeNewMethod(); + /* begin initPrimCall */ + GIV(primFailCode) = 0; + null; +l1: /* end primitiveObject:perform:withArguments:lookedUpIn: */; } static void primitivePerformWithArgs(void) { DECL_MAYBE_SQ_GLOBAL_STRUCT + sqInt actualReceiver; + sqInt argumentArray; + sqInt arraySize; sqInt ccIndex; - sqInt lookupClass; - sqInt rcvr; + sqInt ccIndex1; + sqInt delta; + sqInt header; + sqInt index; + sqInt offset; + sqInt performArgCount; + sqInt selector; + sqInt selector1; + char *sp; + char *sp1; + char *sp2; + sqInt sz; + sqInt top; - rcvr = longAt(GIV(stackPointer) + (2 * BytesPerWord)); - lookupClass = ((rcvr & 1) + /* begin primitiveObject:perform:withArguments:lookedUpIn: */ + actualReceiver = longAt(GIV(stackPointer) + (2 * BytesPerWord)); + selector = longAt(GIV(stackPointer) + (1 * BytesPerWord)); + argumentArray = longAt(GIV(stackPointer)); + if (!(((argumentArray & 1) == 0) + && (((((usqInt) (longAt(argumentArray))) >> (instFormatFieldLSB())) & 15) == 2))) { + GIV(primFailCode) = PrimErrBadArgument; + goto l1; + } + /* begin numSlotsOf: */ + header = longAt(argumentArray); + sz = ((header & TypeMask) == HeaderTypeSizeAndClass + ? (longAt(argumentArray - (BytesPerWord * 2))) & AllButTypeMask + : header & SizeMask); + arraySize = ((usqInt) (sz - BaseHeaderSize)) >> (shiftForWord()); + if (arraySize > LargeContextSlots) { + GIV(primFailCode) = PrimErrBadNumArgs; + goto l1; + } + + /* Push newMethod to save it in case of failure, + then push the actual receiver and args out of the array. */ + + performArgCount = GIV(argumentCount); + /* begin push: */ + longAtput((sp1 = GIV(stackPointer) - BytesPerWord), GIV(newMethod)); + GIV(stackPointer) = sp1; + /* begin push: */ + longAtput((sp2 = GIV(stackPointer) - BytesPerWord), actualReceiver); + GIV(stackPointer) = sp2; + for (index = 1; index <= arraySize; index += 1) { + /* begin push: */ + longAtput((sp = GIV(stackPointer) - BytesPerWord), longAt((argumentArray + BaseHeaderSize) + ((index - 1) << (shiftForWord())))); + GIV(stackPointer) = sp; + } + GIV(argumentCount) = arraySize; + GIV(messageSelector) = selector; + /* begin sendBreakpoint:receiver: */ + selector1 = GIV(messageSelector); + sendBreakpointreceiver(firstFixedFieldOfMaybeImmediate(selector1), lengthOfMaybeImmediate(selector1), actualReceiver); + if (printOnTrace()) { + printActivationNameForSelectorstartClass(GIV(messageSelector), ((actualReceiver & 1) + ? longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassSmallInteger << (shiftForWord()))) + : (((ccIndex = (((usqInt) (longAt(actualReceiver))) >> (compactClassFieldLSB())) & 0x1F)) == 0 + ? (longAt(actualReceiver - BaseHeaderSize)) & AllButTypeMask + : (/* begin fetchPointer:ofObject: */ + longAt(((longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (CompactClasses << (shiftForWord())))) + BaseHeaderSize) + ((ccIndex - 1) << (shiftForWord()))))))); + /* begin cr */ + printf("\n"); + } + findNewMethodInClassTag(((actualReceiver & 1) ? longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassSmallInteger << (shiftForWord()))) - : (((ccIndex = (((usqInt) (longAt(rcvr))) >> (compactClassFieldLSB())) & 0x1F)) == 0 - ? (longAt(rcvr - BaseHeaderSize)) & AllButTypeMask + : (((ccIndex1 = (((usqInt) (longAt(actualReceiver))) >> (compactClassFieldLSB())) & 0x1F)) == 0 + ? (longAt(actualReceiver - BaseHeaderSize)) & AllButTypeMask : (/* begin fetchPointer:ofObject: */ - longAt(((longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (CompactClasses << (shiftForWord())))) + BaseHeaderSize) + ((ccIndex - 1) << (shiftForWord())))))); - primitiveObjectperformwithArgumentslookedUpIn(rcvr, longAt(GIV(stackPointer) + (1 * BytesPerWord)), longAt(GIV(stackPointer)), lookupClass); + longAt(((longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (CompactClasses << (shiftForWord())))) + BaseHeaderSize) + ((ccIndex1 - 1) << (shiftForWord()))))))); + if ((((GIV(newMethod) & 1) == 0) + && (((((usqInt) (longAt(GIV(newMethod)))) >> (instFormatFieldLSB())) & 15) >= 12)) + && ((argumentCountOf(GIV(newMethod))) != GIV(argumentCount))) { + + /* Restore the state by popping all those array entries and pushing back the selector and array, and fail */ + + /* begin pop: */ + GIV(stackPointer) += (arraySize + 1) * BytesPerWord; + null; + /* begin popStack */ + top = longAt(GIV(stackPointer)); + GIV(stackPointer) += BytesPerWord; + GIV(newMethod) = ((sqInt) top); + GIV(primFailCode) = PrimErrBadNumArgs; + goto l1; + } + + /* +2 = receiver + saved newMethod */ + + delta = BytesPerWord * (performArgCount + 2); + for (offset = (GIV(argumentCount) * BytesPerWord); offset >= 0; offset += (-BytesPerWord)) { + longAtput((GIV(stackPointer) + offset) + delta, longAt(GIV(stackPointer) + offset)); + } + /* begin pop: */ + GIV(stackPointer) += (performArgCount + 2) * BytesPerWord; + null; + executeNewMethod(); + /* begin initPrimCall */ + GIV(primFailCode) = 0; + null; +l1: /* end primitiveObject:perform:withArguments:lookedUpIn: */; } @@ -47223,7 +47420,7 @@ } } else { - if (startIP > 64) { + if (startIP > lastIndex) { print("..."); /* begin cr */ printf("\n"); @@ -48679,109 +48876,6 @@ (primBits & 0x1FF) + ((((usqInt) primBits) >> 19) & 512))); } - -/* Common routine used by perform:withArgs:, perform:withArgs:inSuperclass:, - object:perform:withArgs:inClass: et al. Answer nil on success. - - NOTE: The case of doesNotUnderstand: is not a failure to perform. - The only failures are arg types and consistency of argumentCount. - - Since we're in the stack VM we can assume there is space to push the - arguments provided they are within limits (max argument count is 15). We - can therefore deal - with the arbitrary amount of state to remove from the stack (lookup class, - selector, mirror receiver) and arbitrary argument orders by deferring - popping anything until - we know whether the send has succeeded. So on failure we merely have to - remove the actual receiver and arguments pushed, and on success we have to - slide the actual - receiver and arguments down to replace the original ones. */ - -static sqInt -primitiveObjectperformwithArgumentslookedUpIn(sqInt actualReceiver, sqInt selector, sqInt argumentArray, sqInt lookupClass) -{ DECL_MAYBE_SQ_GLOBAL_STRUCT - sqInt arraySize; - sqInt delta; - sqInt header; - sqInt index; - sqInt offset; - sqInt performArgCount; - char *sp; - char *sp1; - char *sp2; - sqInt sz; - sqInt top; - - if (!(((argumentArray & 1) == 0) - && (((((usqInt) (longAt(argumentArray))) >> (instFormatFieldLSB())) & 15) == 2))) { - return (GIV(primFailCode) = PrimErrBadArgument); - } - /* begin numSlotsOf: */ - header = longAt(argumentArray); - sz = ((header & TypeMask) == HeaderTypeSizeAndClass - ? (longAt(argumentArray - (BytesPerWord * 2))) & AllButTypeMask - : header & SizeMask); - arraySize = ((usqInt) (sz - BaseHeaderSize)) >> (shiftForWord()); - if (arraySize > LargeContextSlots) { - return (GIV(primFailCode) = PrimErrBadNumArgs); - } - - /* Push newMethod to save it in case of failure, - then push the actual receiver and args out of the array. */ - - performArgCount = GIV(argumentCount); - /* begin push: */ - longAtput((sp1 = GIV(stackPointer) - BytesPerWord), GIV(newMethod)); - GIV(stackPointer) = sp1; - /* begin push: */ - longAtput((sp2 = GIV(stackPointer) - BytesPerWord), actualReceiver); - GIV(stackPointer) = sp2; - for (index = 1; index <= arraySize; index += 1) { - /* begin push: */ - longAtput((sp = GIV(stackPointer) - BytesPerWord), longAt((argumentArray + BaseHeaderSize) + ((index - 1) << (shiftForWord())))); - GIV(stackPointer) = sp; - } - GIV(argumentCount) = arraySize; - GIV(messageSelector) = selector; - /* begin sendBreakpoint:receiver: */ - sendBreakpointreceiver(firstFixedFieldOfMaybeImmediate(GIV(messageSelector)), lengthOfMaybeImmediate(GIV(messageSelector)), actualReceiver); - if (printOnTrace()) { - printActivationNameForSelectorstartClass(GIV(messageSelector), lookupClass); - /* begin cr */ - printf("\n"); - } - findNewMethodInClassTag(lookupClass); - if ((((GIV(newMethod) & 1) == 0) - && (((((usqInt) (longAt(GIV(newMethod)))) >> (instFormatFieldLSB())) & 15) >= 12)) - && ((argumentCountOf(GIV(newMethod))) != GIV(argumentCount))) { - - /* Restore the state by popping all those array entries and pushing back the selector and array, and fail */ - - /* begin pop: */ - GIV(stackPointer) += (arraySize + 1) * BytesPerWord; - null; - /* begin popStack */ - top = longAt(GIV(stackPointer)); - GIV(stackPointer) += BytesPerWord; - GIV(newMethod) = ((sqInt) top); - return (GIV(primFailCode) = PrimErrBadNumArgs); - } - - /* +2 = receiver + saved newMethod */ - - delta = BytesPerWord * (performArgCount + 2); - for (offset = (GIV(argumentCount) * BytesPerWord); offset >= 0; offset += (-BytesPerWord)) { - longAtput((GIV(stackPointer) + offset) + delta, longAt(GIV(stackPointer) + offset)); - } - /* begin pop: */ - GIV(stackPointer) += (performArgCount + 2) * BytesPerWord; - null; - executeNewMethod(); - /* begin initPrimCall */ - GIV(primFailCode) = 0; - return null; -} - static void printActivationNameForSelectorstartClass(sqInt aSelector, sqInt startClass) { DECL_MAYBE_SQ_GLOBAL_STRUCT Modified: branches/Cog/nscogsrc/vm/cointerp.h =================================================================== --- branches/Cog/nscogsrc/vm/cointerp.h 2015-02-02 02:24:35 UTC (rev 3245) +++ branches/Cog/nscogsrc/vm/cointerp.h 2015-02-04 23:48:12 UTC (rev 3246) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1035 uuid: 33a34378-0618-40c7-8fbb-c467fb40fc57 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1040 uuid: be108ef5-00a3-425b-b228-16515cc447c7 */ Modified: branches/Cog/nscogsrc/vm/gcc3x-cointerp.c =================================================================== --- branches/Cog/nscogsrc/vm/gcc3x-cointerp.c 2015-02-02 02:24:35 UTC (rev 3245) +++ branches/Cog/nscogsrc/vm/gcc3x-cointerp.c 2015-02-04 23:48:12 UTC (rev 3246) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1035 uuid: 33a34378-0618-40c7-8fbb-c467fb40fc57 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1040 uuid: be108ef5-00a3-425b-b228-16515cc447c7 from - CoInterpreter VMMaker.oscog-eem.1035 uuid: 33a34378-0618-40c7-8fbb-c467fb40fc57 + CoInterpreter VMMaker.oscog-eem.1040 uuid: be108ef5-00a3-425b-b228-16515cc447c7 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1035 uuid: 33a34378-0618-40c7-8fbb-c467fb40fc57 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1040 uuid: be108ef5-00a3-425b-b228-16515cc447c7 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -1177,7 +1177,6 @@ EXPORT(void) primitiveEventProcessingControl(void); sqInt primitiveIndexOfMethodheader(sqInt theMethod, sqInt methodHeader); sqInt primitiveIndexOf(sqInt methodPointer); -static sqInt primitiveObjectperformwithArgumentslookedUpIn(sqInt actualReceiver, sqInt selector, sqInt argumentArray, sqInt lookupClass) NoDbgRegParms; static void printActivationNameForSelectorstartClass(sqInt aSelector, sqInt startClass) NoDbgRegParms; static void printActivationNameForreceiverisBlockfirstTemporary(sqInt aMethod, sqInt anObject, sqInt isBlock, sqInt maybeMessage) NoDbgRegParms; void printAllStacks(void); @@ -2101,7 +2100,7 @@ /* 575 */ (void (*)(void))0, 0 }; char expensiveAsserts = 0; -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.1035"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.1040"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -30684,10 +30683,26 @@ static void primitivePerformInSuperclass(void) { DECL_MAYBE_SQ_GLOBAL_STRUCT + sqInt argumentArray; + sqInt arraySize; sqInt ccIndex; + sqInt ccIndex1; + sqInt ccIndex2; sqInt currentClass; + sqInt delta; + sqInt header; + sqInt index; sqInt lookupClass; + sqInt offset; + sqInt performArgCount; sqInt rcvr; + sqInt selector; + sqInt selector1; + char *sp; + char *sp1; + char *sp2; + sqInt sz; + sqInt top; lookupClass = longAt(GIV(stackPointer)); rcvr = longAt(GIV(stackPointer) + (3 * BytesPerWord)); @@ -30704,24 +30719,206 @@ return; } } - primitiveObjectperformwithArgumentslookedUpIn(rcvr, longAt(GIV(stackPointer) + (2 * BytesPerWord)), longAt(GIV(stackPointer) + (1 * BytesPerWord)), lookupClass); + /* begin primitiveObject:perform:withArguments:lookedUpIn: */ + selector = longAt(GIV(stackPointer) + (2 * BytesPerWord)); + argumentArray = longAt(GIV(stackPointer) + (1 * BytesPerWord)); + if (!(((argumentArray & 1) == 0) + && (((((usqInt) (longAt(argumentArray))) >> (instFormatFieldLSB())) & 15) == 2))) { + GIV(primFailCode) = PrimErrBadArgument; + goto l1; + } + /* begin numSlotsOf: */ + header = longAt(argumentArray); + sz = ((header & TypeMask) == HeaderTypeSizeAndClass + ? (longAt(argumentArray - (BytesPerWord * 2))) & AllButTypeMask + : header & SizeMask); + arraySize = ((usqInt) (sz - BaseHeaderSize)) >> (shiftForWord()); + if (arraySize > LargeContextSlots) { + GIV(primFailCode) = PrimErrBadNumArgs; + goto l1; + } + + /* Push newMethod to save it in case of failure, + then push the actual receiver and args out of the array. */ + + performArgCount = GIV(argumentCount); + /* begin push: */ + longAtput((sp1 = GIV(stackPointer) - BytesPerWord), GIV(newMethod)); + GIV(stackPointer) = sp1; + /* begin push: */ + longAtput((sp2 = GIV(stackPointer) - BytesPerWord), rcvr); + GIV(stackPointer) = sp2; + for (index = 1; index <= arraySize; index += 1) { + /* begin push: */ + longAtput((sp = GIV(stackPointer) - BytesPerWord), longAt((argumentArray + BaseHeaderSize) + ((index - 1) << (shiftForWord())))); + GIV(stackPointer) = sp; + } + GIV(argumentCount) = arraySize; + GIV(messageSelector) = selector; + /* begin sendBreakpoint:receiver: */ + selector1 = GIV(messageSelector); + sendBreakpointreceiver(firstFixedFieldOfMaybeImmediate(selector1), lengthOfMaybeImmediate(selector1), rcvr); + if (printOnTrace()) { + printActivationNameForSelectorstartClass(GIV(messageSelector), (lookupClass == null + ? ((rcvr & 1) + ? longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassSmallInteger << (shiftForWord()))) + : (((ccIndex2 = (((usqInt) (longAt(rcvr))) >> (compactClassFieldLSB())) & 0x1F)) == 0 + ? (longAt(rcvr - BaseHeaderSize)) & AllButTypeMask + : (/* begin fetchPointer:ofObject: */ + longAt(((longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (CompactClasses << (shiftForWord())))) + BaseHeaderSize) + ((ccIndex2 - 1) << (shiftForWord())))))) + : lookupClass)); + /* begin cr */ + printf("\n"); + } + findNewMethodInClassTag((lookupClass == null + ? ((rcvr & 1) + ? longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassSmallInteger << (shiftForWord()))) + : (((ccIndex1 = (((usqInt) (longAt(rcvr))) >> (compactClassFieldLSB())) & 0x1F)) == 0 + ? (longAt(rcvr - BaseHeaderSize)) & AllButTypeMask + : (/* begin fetchPointer:ofObject: */ + longAt(((longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (CompactClasses << (shiftForWord())))) + BaseHeaderSize) + ((ccIndex1 - 1) << (shiftForWord())))))) + : lookupClass)); + if ((((GIV(newMethod) & 1) == 0) + && (((((usqInt) (longAt(GIV(newMethod)))) >> (instFormatFieldLSB())) & 15) >= 12)) + && ((argumentCountOf(GIV(newMethod))) != GIV(argumentCount))) { + + /* Restore the state by popping all those array entries and pushing back the selector and array, and fail */ + + /* begin pop: */ + GIV(stackPointer) += (arraySize + 1) * BytesPerWord; + null; + /* begin popStack */ + top = longAt(GIV(stackPointer)); + GIV(stackPointer) += BytesPerWord; + GIV(newMethod) = ((sqInt) top); + GIV(primFailCode) = PrimErrBadNumArgs; + goto l1; + } + + /* +2 = receiver + saved newMethod */ + + delta = BytesPerWord * (performArgCount + 2); + for (offset = (GIV(argumentCount) * BytesPerWord); offset >= 0; offset += (-BytesPerWord)) { + longAtput((GIV(stackPointer) + offset) + delta, longAt(GIV(stackPointer) + offset)); + } + /* begin pop: */ + GIV(stackPointer) += (performArgCount + 2) * BytesPerWord; + null; + executeNewMethod(); + /* begin initPrimCall */ + GIV(primFailCode) = 0; + null; +l1: /* end primitiveObject:perform:withArguments:lookedUpIn: */; } static void primitivePerformWithArgs(void) { DECL_MAYBE_SQ_GLOBAL_STRUCT + sqInt actualReceiver; + sqInt argumentArray; + sqInt arraySize; sqInt ccIndex; - sqInt lookupClass; - sqInt rcvr; + sqInt ccIndex1; + sqInt delta; + sqInt header; + sqInt index; + sqInt offset; + sqInt performArgCount; + sqInt selector; + sqInt selector1; + char *sp; + char *sp1; + char *sp2; + sqInt sz; + sqInt top; - rcvr = longAt(GIV(stackPointer) + (2 * BytesPerWord)); - lookupClass = ((rcvr & 1) + /* begin primitiveObject:perform:withArguments:lookedUpIn: */ + actualReceiver = longAt(GIV(stackPointer) + (2 * BytesPerWord)); + selector = longAt(GIV(stackPointer) + (1 * BytesPerWord)); + argumentArray = longAt(GIV(stackPointer)); + if (!(((argumentArray & 1) == 0) + && (((((usqInt) (longAt(argumentArray))) >> (instFormatFieldLSB())) & 15) == 2))) { + GIV(primFailCode) = PrimErrBadArgument; + goto l1; + } + /* begin numSlotsOf: */ + header = longAt(argumentArray); + sz = ((header & TypeMask) == HeaderTypeSizeAndClass + ? (longAt(argumentArray - (BytesPerWord * 2))) & AllButTypeMask + : header & SizeMask); + arraySize = ((usqInt) (sz - BaseHeaderSize)) >> (shiftForWord()); + if (arraySize > LargeContextSlots) { + GIV(primFailCode) = PrimErrBadNumArgs; + goto l1; + } + + /* Push newMethod to save it in case of failure, + then push the actual receiver and args out of the array. */ + + performArgCount = GIV(argumentCount); + /* begin push: */ + longAtput((sp1 = GIV(stackPointer) - BytesPerWord), GIV(newMethod)); + GIV(stackPointer) = sp1; + /* begin push: */ + longAtput((sp2 = GIV(stackPointer) - BytesPerWord), actualReceiver); + GIV(stackPointer) = sp2; + for (index = 1; index <= arraySize; index += 1) { + /* begin push: */ + longAtput((sp = GIV(stackPointer) - BytesPerWord), longAt((argumentArray + BaseHeaderSize) + ((index - 1) << (shiftForWord())))); + GIV(stackPointer) = sp; + } + GIV(argumentCount) = arraySize; + GIV(messageSelector) = selector; + /* begin sendBreakpoint:receiver: */ + selector1 = GIV(messageSelector); + sendBreakpointreceiver(firstFixedFieldOfMaybeImmediate(selector1), lengthOfMaybeImmediate(selector1), actualReceiver); + if (printOnTrace()) { + printActivationNameForSelectorstartClass(GIV(messageSelector), ((actualReceiver & 1) + ? longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassSmallInteger << (shiftForWord()))) + : (((ccIndex = (((usqInt) (longAt(actualReceiver))) >> (compactClassFieldLSB())) & 0x1F)) == 0 + ? (longAt(actualReceiver - BaseHeaderSize)) & AllButTypeMask + : (/* begin fetchPointer:ofObject: */ + longAt(((longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (CompactClasses << (shiftForWord())))) + BaseHeaderSize) + ((ccIndex - 1) << (shiftForWord()))))))); + /* begin cr */ + printf("\n"); + } + findNewMethodInClassTag(((actualReceiver & 1) ? longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassSmallInteger << (shiftForWord()))) - : (((ccIndex = (((usqInt) (longAt(rcvr))) >> (compactClassFieldLSB())) & 0x1F)) == 0 - ? (longAt(rcvr - BaseHeaderSize)) & AllButTypeMask + : (((ccIndex1 = (((usqInt) (longAt(actualReceiver))) >> (compactClassFieldLSB())) & 0x1F)) == 0 + ? (longAt(actualReceiver - BaseHeaderSize)) & AllButTypeMask : (/* begin fetchPointer:ofObject: */ - longAt(((longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (CompactClasses << (shiftForWord())))) + BaseHeaderSize) + ((ccIndex - 1) << (shiftForWord())))))); - primitiveObjectperformwithArgumentslookedUpIn(rcvr, longAt(GIV(stackPointer) + (1 * BytesPerWord)), longAt(GIV(stackPointer)), lookupClass); + longAt(((longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (CompactClasses << (shiftForWord())))) + BaseHeaderSize) + ((ccIndex1 - 1) << (shiftForWord()))))))); + if ((((GIV(newMethod) & 1) == 0) + && (((((usqInt) (longAt(GIV(newMethod)))) >> (instFormatFieldLSB())) & 15) >= 12)) + && ((argumentCountOf(GIV(newMethod))) != GIV(argumentCount))) { + + /* Restore the state by popping all those array entries and pushing back the selector and array, and fail */ + + /* begin pop: */ + GIV(stackPointer) += (arraySize + 1) * BytesPerWord; + null; + /* begin popStack */ + top = longAt(GIV(stackPointer)); + GIV(stackPointer) += BytesPerWord; + GIV(newMethod) = ((sqInt) top); + GIV(primFailCode) = PrimErrBadNumArgs; + goto l1; + } + + /* +2 = receiver + saved newMethod */ + + delta = BytesPerWord * (performArgCount + 2); + for (offset = (GIV(argumentCount) * BytesPerWord); offset >= 0; offset += (-BytesPerWord)) { + longAtput((GIV(stackPointer) + offset) + delta, longAt(GIV(stackPointer) + offset)); + } + /* begin pop: */ + GIV(stackPointer) += (performArgCount + 2) * BytesPerWord; + null; + executeNewMethod(); + /* begin initPrimCall */ + GIV(primFailCode) = 0; + null; +l1: /* end primitiveObject:perform:withArguments:lookedUpIn: */; } @@ -47232,7 +47429,7 @@ } } else { - if (startIP > 64) { + if (startIP > lastIndex) { print("..."); /* begin cr */ printf("\n"); @@ -48688,109 +48885,6 @@ (primBits & 0x1FF) + ((((usqInt) primBits) >> 19) & 512))); } - -/* Common routine used by perform:withArgs:, perform:withArgs:inSuperclass:, - object:perform:withArgs:inClass: et al. Answer nil on success. - - NOTE: The case of doesNotUnderstand: is not a failure to perform. - The only failures are arg types and consistency of argumentCount. - - Since we're in the stack VM we can assume there is space to push the - arguments provided they are within limits (max argument count is 15). We - can therefore deal - with the arbitrary amount of state to remove from the stack (lookup class, - selector, mirror receiver) and arbitrary argument orders by deferring - popping anything until - we know whether the send has succeeded. So on failure we merely have to - remove the actual receiver and arguments pushed, and on success we have to - slide the actual - receiver and arguments down to replace the original ones. */ - -static sqInt -primitiveObjectperformwithArgumentslookedUpIn(sqInt actualReceiver, sqInt selector, sqInt argumentArray, sqInt lookupClass) -{ DECL_MAYBE_SQ_GLOBAL_STRUCT - sqInt arraySize; - sqInt delta; - sqInt header; - sqInt index; - sqInt offset; - sqInt performArgCount; - char *sp; - char *sp1; - char *sp2; - sqInt sz; - sqInt top; - - if (!(((argumentArray & 1) == 0) - && (((((usqInt) (longAt(argumentArray))) >> (instFormatFieldLSB())) & 15) == 2))) { - return (GIV(primFailCode) = PrimErrBadArgument); - } - /* begin numSlotsOf: */ - header = longAt(argumentArray); - sz = ((header & TypeMask) == HeaderTypeSizeAndClass - ? (longAt(argumentArray - (BytesPerWord * 2))) & AllButTypeMask - : header & SizeMask); - arraySize = ((usqInt) (sz - BaseHeaderSize)) >> (shiftForWord()); - if (arraySize > LargeContextSlots) { - return (GIV(primFailCode) = PrimErrBadNumArgs); - } - - /* Push newMethod to save it in case of failure, - then push the actual receiver and args out of the array. */ - - performArgCount = GIV(argumentCount); - /* begin push: */ - longAtput((sp1 = GIV(stackPointer) - BytesPerWord), GIV(newMethod)); - GIV(stackPointer) = sp1; - /* begin push: */ - longAtput((sp2 = GIV(stackPointer) - BytesPerWord), actualReceiver); - GIV(stackPointer) = sp2; - for (index = 1; index <= arraySize; index += 1) { - /* begin push: */ - longAtput((sp = GIV(stackPointer) - BytesPerWord), longAt((argumentArray + BaseHeaderSize) + ((index - 1) << (shiftForWord())))); - GIV(stackPointer) = sp; - } - GIV(argumentCount) = arraySize; - GIV(messageSelector) = selector; - /* begin sendBreakpoint:receiver: */ - sendBreakpointreceiver(firstFixedFieldOfMaybeImmediate(GIV(messageSelector)), lengthOfMaybeImmediate(GIV(messageSelector)), actualReceiver); - if (printOnTrace()) { - printActivationNameForSelectorstartClass(GIV(messageSelector), lookupClass); - /* begin cr */ - printf("\n"); - } - findNewMethodInClassTag(lookupClass); - if ((((GIV(newMethod) & 1) == 0) - && (((((usqInt) (longAt(GIV(newMethod)))) >> (instFormatFieldLSB())) & 15) >= 12)) - && ((argumentCountOf(GIV(newMethod))) != GIV(argumentCount))) { - - /* Restore the state by popping all those array entries and pushing back the selector and array, and fail */ - - /* begin pop: */ - GIV(stackPointer) += (arraySize + 1) * BytesPerWord; - null; - /* begin popStack */ - top = longAt(GIV(stackPointer)); - GIV(stackPointer) += BytesPerWord; - GIV(newMethod) = ((sqInt) top); - return (GIV(primFailCode) = PrimErrBadNumArgs); - } - - /* +2 = receiver + saved newMethod */ - - delta = BytesPerWord * (performArgCount + 2); - for (offset = (GIV(argumentCount) * BytesPerWord); offset >= 0; offset += (-BytesPerWord)) { - longAtput((GIV(stackPointer) + offset) + delta, longAt(GIV(stackPointer) + offset)); - } - /* begin pop: */ - GIV(stackPointer) += (performArgCount + 2) * BytesPerWord; - null; - executeNewMethod(); - /* begin initPrimCall */ - GIV(primFailCode) = 0; - return null; -} - static void printActivationNameForSelectorstartClass(sqInt aSelector, sqInt startClass) { DECL_MAYBE_SQ_GLOBAL_STRUCT Modified: branches/Cog/nsspursrc/vm/cogit.c =================================================================== --- branches/Cog/nsspursrc/vm/cogit.c 2015-02-02 02:24:35 UTC (rev 3245) +++ branches/Cog/nsspursrc/vm/cogit.c 2015-02-04 23:48:12 UTC (rev 3246) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.1025 uuid: 1a29f456-a8e2-4312-a391-8e2cdb0430ee + CCodeGenerator VMMaker.oscog-eem.1039 uuid: 931d69b1-7be3-42dd-8833-1ba325d2b5f2 from - StackToRegisterMappingCogit VMMaker.oscog-eem.1025 uuid: 1a29f456-a8e2-4312-a391-8e2cdb0430ee + StackToRegisterMappingCogit VMMaker.oscog-eem.1039 uuid: 931d69b1-7be3-42dd-8833-1ba325d2b5f2 */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1025 uuid: 1a29f456-a8e2-4312-a391-8e2cdb0430ee " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1039 uuid: 931d69b1-7be3-42dd-8833-1ba325d2b5f2 " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -296,7 +296,7 @@ #define NewspeakVM 1 #define Nop 8 #define NotFullyInitialized -1 -#define NSSendIsPCAnnotated 1 +#define NSSendIsPCAnnotated 0 #define NumObjRefsInRuntime 0 #define NumOopsPerIRC 2 #define NumSendTrampolines 4 @@ -929,7 +929,6 @@ static sqInt frameOffsetOfTemporary(sqInt index) NoDbgRegParms; static sqInt genBlockReturn(void); static AbstractInstruction * genDoubleFailIfZeroArgRcvrarg(sqInt rcvrReg, sqInt argReg) NoDbgRegParms; -static sqInt genDynamicSuperSendBytecode(void); static sqInt genExtendedSendBytecode(void); static sqInt genExtendedSuperBytecode(void); static sqInt genExtJumpIfFalse(void); @@ -1094,7 +1093,6 @@ static sqInt genPushActiveContextBytecode(void); static sqInt genPushClosureCopyCopiedValuesBytecode(void); static sqInt genPushEnclosingObjectAt(sqInt level) NoDbgRegParms; -static sqInt genPushImplicitReceiverBytecode(void); static sqInt genPushLiteralVariable(sqInt literalIndex) NoDbgRegParms; static sqInt genPushLiteral(sqInt literal) NoDbgRegParms; static sqInt genPushMaybeContextReceiverVariable(sqInt slotIndex) NoDbgRegParms; @@ -1110,7 +1108,6 @@ static sqInt genSendAbsentImplicitnumArgs(sqInt selector, sqInt numArgs) NoDbgRegParms; static sqInt genSendAbsentOuternumArgsdepth(sqInt selector, sqInt numArgs, sqInt depth) NoDbgRegParms; static sqInt genSendAbsentSelfnumArgs(sqInt selector, sqInt numArgs) NoDbgRegParms; -static sqInt genSendDynamicSupernumArgs(sqInt selector, sqInt numArgs) NoDbgRegParms; static sqInt genSendSupernumArgs(sqInt selector, sqInt numArgs) NoDbgRegParms; static sqInt genSendTrampolineFornumArgscalledargargarg(void *aRoutine, sqInt numArgs, char *aString, sqInt regOrConst0, sqInt regOrConst1, sqInt regOrConst2) NoDbgRegParms; static sqInt genSendTrampolineFornumArgscalledargargargarg(void *aRoutine, sqInt numArgs, char *aString, sqInt regOrConst0, sqInt regOrConst1, sqInt regOrConst2, sqInt regOrConst3) NoDbgRegParms; @@ -1170,8 +1167,8 @@ static CogSimStackEntry ssTopDescriptor(void); static CogSimStackEntry * ssValue(sqInt n) NoDbgRegParms; static sqInt tryCollapseTempVectorInitializationOfSize(sqInt slots) NoDbgRegParms; -static sqInt v3or4PushNilSize(sqInt aMethodObj) NoDbgRegParms; -static sqInt v3or4NumPushNils(BytecodeDescriptor *descriptor, sqInt pc, sqInt nExts, sqInt aMethodObj) NoDbgRegParms; +static sqInt v3PushNilSize(sqInt aMethodObj) NoDbgRegParms; +static sqInt v3NumPushNils(BytecodeDescriptor *descriptor, sqInt pc, sqInt nExts, sqInt aMethodObj) NoDbgRegParms; static sqInt oopisGreaterThanOrEqualTo(sqInt anOop, sqInt otherOop) NoDbgRegParms; static sqInt oopisGreaterThan(sqInt anOop, sqInt otherOop) NoDbgRegParms; static sqInt oopisLessThan(sqInt anOop, sqInt otherOop) NoDbgRegParms; @@ -1397,8 +1394,8 @@ { genReturnNil, 0, needsFrameIfInBlock, 0, 0, 1, 0, 0, 1, 0, 0, 1, 0, 0 }, { genReturnTopFromMethod, 0, needsFrameIfInBlock, -1, 0, 1, 0, 0, 1, 0, 0, 1, 0, 0 }, { genReturnTopFromBlock, 0, needsFrameNever, -1, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0 }, - { genDynamicSuperSendBytecode, 0, 0, 0, 0, 3, 0, 0, 0, 0, 1, 0, 0, 0 }, - { genPushImplicitReceiverBytecode, 0, 0, 0, 0, 2, 0, 0, 0, 0, 1, 0, 0, 1 }, + { unknownBytecode, 0, 0, 0, Nop, 1, 0, 0, 0, 0, 0, 0, 1, 0 }, + { unknownBytecode, 0, 0, 0, Nop, 1, 0, 0, 0, 0, 0, 0, 1, 0 }, { extendedPushBytecode, 0, needsFrameNever, 1, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0 }, { extendedStoreBytecode, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0 }, { extendedStoreAndPopBytecode, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0 }, @@ -18977,13 +18974,7 @@ return gJumpFPEqual(0); } -static sqInt -genDynamicSuperSendBytecode(void) -{ - return genSendDynamicSupernumArgs(getLiteral(byte2), byte1); -} - /* Can use any of the first 32 literals for the selector and pass up to 7 arguments. */ @@ -20466,7 +20457,7 @@ sqInt initialIndexOfIRC; sqInt initialOpcodeIndex; sqInt initialStackPtr; - sqInt (* const pushNilSizeFunction)(sqInt) = v3or4PushNilSize; + sqInt (* const pushNilSizeFunction)(sqInt) = v3PushNilSize; sqInt result; sqInt savedNeedsFrame; sqInt savedNumArgs; @@ -22558,18 +22549,6 @@ } static sqInt -genPushImplicitReceiverBytecode(void) -{ - sqInt result; - - result = genGetImplicitReceiverForforPush(getLiteral(byte1), 1); - if (result != 0) { - return result; - } - return ssPushRegister(ReceiverResultReg); -} - -static sqInt genPushLiteralVariable(sqInt literalIndex) { sqInt association; @@ -22821,13 +22800,6 @@ } static sqInt -genSendDynamicSupernumArgs(sqInt selector, sqInt numArgs) -{ - marshallSendArguments(numArgs); - return genMarshalledSendDynamicSupernumArgs(selector, numArgs); -} - -static sqInt genSendSupernumArgs(sqInt selector, sqInt numArgs) { marshallSendArguments(numArgs); @@ -24128,7 +24100,7 @@ sqInt framelessStackDelta; sqInt nExts; sqInt numPushNils; - sqInt (* const numPushNilsFunction)(struct _BytecodeDescriptor *,sqInt,sqInt,sqInt) = v3or4NumPushNils; + sqInt (* const numPushNilsFunction)(struct _BytecodeDescriptor *,sqInt,sqInt,sqInt) = v3NumPushNils; sqInt pc; sqInt pushingNils; @@ -24690,27 +24662,15 @@ } static sqInt -v3or4PushNilSize(sqInt aMethodObj) +v3PushNilSize(sqInt aMethodObj) { - return (methodUsesAlternateBytecodeSet(aMethodObj) - ? 3 - : 1); + return 1; } static sqInt -v3or4NumPushNils(BytecodeDescriptor *descriptor, sqInt pc, sqInt nExts, sqInt aMethodObj) +v3NumPushNils(BytecodeDescriptor *descriptor, sqInt pc, sqInt nExts, sqInt aMethodObj) { - sqInt numNils; - - if (((numNils = (((descriptor->generator)) == genPushConstantNilBytecode - ? 1 - : 0))) > 0) { - return numNils; - } - return ((((descriptor->generator)) == genExtPushPseudoVariableOrOuterBytecode) - && ((assert((fetchByteofObject(pc, aMethodObj)) == 77), - (nExts == 1) - && ((fetchByteofObject(pc - 1, aMethodObj)) == 2))) + return (((descriptor->generator)) == genPushConstantNilBytecode ? 1 : 0); } Modified: branches/Cog/nsspursrc/vm/cogit.h =================================================================== --- branches/Cog/nsspursrc/vm/cogit.h 2015-02-02 02:24:35 UTC (rev 3245) +++ branches/Cog/nsspursrc/vm/cogit.h 2015-02-04 23:48:12 UTC (rev 3246) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.1025 uuid: 1a29f456-a8e2-4312-a391-8e2cdb0430ee + CCodeGenerator VMMaker.oscog-eem.1039 uuid: 931d69b1-7be3-42dd-8833-1ba325d2b5f2 */ Modified: branches/Cog/nsspursrc/vm/cointerp.c =================================================================== --- branches/Cog/nsspursrc/vm/cointerp.c 2015-02-02 02:24:35 UTC (rev 3245) +++ branches/Cog/nsspursrc/vm/cointerp.c 2015-02-04 23:48:12 UTC (rev 3246) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1035 uuid: 33a34378-0618-40c7-8fbb-c467fb40fc57 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1041 uuid: 07a9d555-3a71-4774-a5f2-04a2ee09a74e from - CoInterpreter VMMaker.oscog-eem.1035 uuid: 33a34378-0618-40c7-8fbb-c467fb40fc57 + CoInterpreter VMMaker.oscog-eem.1041 uuid: 07a9d555-3a71-4774-a5f2-04a2ee09a74e */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1035 uuid: 33a34378-0618-40c7-8fbb-c467fb40fc57 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1041 uuid: 07a9d555-3a71-4774-a5f2-04a2ee09a74e " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -949,7 +949,7 @@ static void expungeFromClassTable(sqInt aBehavior) NoDbgRegParms; sqInt falseObject(void); sqInt fetchByteofObject(sqInt byteIndex, sqInt objOop); -static sqInt fetchClassOfNonImm(sqInt objOop) NoDbgRegParms; +static sqInt fetchClassOfNonImm(sqInt objOop) NoDbgRegParms NeverInline; sqInt fetchClassOf(sqInt oop); static sqInt fetchClassTagOfNonImm(sqInt obj) NoDbgRegParms; sqInt fetchLong32ofObject(sqInt fieldIndex, sqInt oop); @@ -1083,7 +1083,7 @@ static void markAndTraceObjStackandContents(sqInt stackOrNil, sqInt markAndTraceContents) NoDbgRegParms; void markAndTrace(sqInt objOop); static sqInt markInactiveEphemerons(void); -static void markObjects(sqInt objectsShouldBeUnmarked) NoDbgRegParms NeverInline; +static void markObjects(sqInt objectsShouldBeUnmarkedAndUnmarkedClassesShouldBeExpunged) NoDbgRegParms NeverInline; static void markWeaklingsAndMarkAndFireEphemerons(void); sqInt maybeSplObj(sqInt index); static sqInt moveARunOfObjectsStartingAtupTo(usqInt startAddress, usqInt limit) NoDbgRegParms; @@ -1366,7 +1366,6 @@ EXPORT(void) primitiveEventProcessingControl(void); sqInt primitiveIndexOfMethodheader(sqInt theMethod, sqInt methodHeader); sqInt primitiveIndexOf(sqInt methodPointer); -static sqInt primitiveObjectperformwithArgumentslookedUpIn(sqInt actualReceiver, sqInt selector, sqInt argumentArray, sqInt lookupClass) NoDbgRegParms; static void printActivationNameForSelectorstartClass(sqInt aSelector, sqInt startClass) NoDbgRegParms; static void printActivationNameForreceiverisBlockfirstTemporary(sqInt aMethod, sqInt anObject, sqInt isBlock, sqInt maybeMessage) NoDbgRegParms; void printAllStacks(void); @@ -1526,10 +1525,10 @@ #endif _iss char * stackPointer; _iss sqInt primFailCode; -_iss sqInt nilObj; _iss char * framePointer; _iss usqInt method; _iss StackPage * stackPage; +_iss sqInt nilObj; _iss sqInt specialObjectsOop; _iss sqInt bytecodeSetSelector; _iss sqInt argumentCount; @@ -1538,7 +1537,6 @@ _iss usqInt instructionPointer; _iss usqInt newMethod; _iss sqInt messageSelector; -_iss sqInt hiddenRootsObj; _iss usqInt newSpaceLimit; _iss StackPage * pages; _iss char * stackBasePlus1; @@ -1547,6 +1545,7 @@ _iss usqInt newSpaceStart; _iss SpurSegmentInfo * segments; _iss sqInt trueObj; +_iss sqInt hiddenRootsObj; _iss sqInt needGCFlag; _iss sqInt falseObj; _iss usqInt totalFreeOldSpace; @@ -1557,11 +1556,11 @@ _iss usqInt scavengeThreshold; _iss sqInt remapBufferCount; _iss sqInt * freeLists; +_iss sqInt classTableFirstPage; _iss char * stackLimit; _iss sqInt rememberedSetSize; _iss sqInt tempOop; _iss sqInt * rememberedSet; -_iss sqInt classTableFirstPage; _iss usqInt freeListsMask; _iss sqInt profileProcess; _iss sqInt profileSemaphore; @@ -1725,9 +1724,9 @@ #endif #endif static void (*primitiveFunctionPointer)(); +sqInt checkForLeaks; sqInt maxLiteralCountForCompile = MaxLiteralCountForCompile /* 60 */; jmp_buf reenterInterpreter; /* private export */; -sqInt checkForLeaks; sqInt checkAllocFiller; sqInt breakSelectorLength = MinSmallInteger; sqInt inIOProcessEvents; @@ -2326,7 +2325,7 @@ /*20*/ 0, 0, 0,-1,-1,-1,-1,-1,-1, 0, 0, 0, 0, 0,-1,-1,-1, 0, 0, 0, /*40*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, /*60*/ 0, 0, 1,-1,-1,-1,-1,-1, 0, 0,-1,-1, 0, 1, 1, 0, 0, 0, 0, 0, -/*80*/ -1,-1,-1, 0, 1,-1, 1, 0, 1,-1,-1, 0, 0, 0, 0,-1,-1,-1, 0, 0, +/*80*/ -1,-1,-1, 0,-1,-1, 1, 0, 1,-1,-1, 0, 0, 0, 0,-1,-1,-1, 0, 0, /*100*/ 1, 2, 0, 3,-1, 1,-1,-1,-1,-1, 0, 0,-1,-1,-1, 1, 1,-1, 1, 0, /*120*/ -1, 1,-1,-1, 0,-1, 0, 0, 0,-1,-1,-1, 1, 0, 0,-1, 0,-1,-1,-1, /*140*/ -1, 1,-1, 1, 0, 0,-1,-1, 0, 0,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, @@ -2353,7 +2352,7 @@ /*560*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, 0, 0, 0,-1,-1 }; char expensiveAsserts = 0; -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.1035"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.1041"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -5103,7 +5102,7 @@ if (!((byteAt((localFP + FoxIFrameFlags) + 3)) != 0)) { goto commonCallerReturn; - goto l250; + goto l227; } closure = longAt(localFP + (frameStackedReceiverOffsetNumArgs(((((usqInt)(longAt(localFP + FoxMethod)))) < (startOfMemory()) ? ((mframeCogMethod(localFP))->cmNumArgs) @@ -5156,10 +5155,10 @@ : (byteAt((localFP + FoxIFrameFlags) + 2)) != 0)) { assert(isContext(frameContext(localFP))); ourContext = longAt(localFP + FoxThisContext); - goto l254; + goto l231; } ourContext = marryFrameSP(localFP, localSP); - l254: /* end ensureFrameIsMarried:SP: */; + l231: /* end ensureFrameIsMarried:SP: */; /* begin internalPush: */ longAtPointerput((localSP -= BytesPerOop), ourContext); /* begin internalPush: */ @@ -5168,7 +5167,7 @@ GIV(argumentCount) = 1; goto normalSend; /* return self */ - goto l250; + goto l227; } if (unwindContextOrNilOrZero != 0) { /* begin internalAboutToReturn:through: */ @@ -5178,10 +5177,10 @@ : (byteAt((localFP + FoxIFrameFlags) + 2)) != 0)) { assert(isContext(frameContext(localFP))); ourContext1 = longAt(localFP + FoxThisContext); - goto l251; + goto l228; } ourContext1 = marryFrameSP(localFP, localSP); - l251: /* end ensureFrameIsMarried:SP: */; + l228: /* end ensureFrameIsMarried:SP: */; /* begin internalPush: */ longAtPointerput((localSP -= BytesPerOop), ourContext1); /* begin internalPush: */ @@ -5192,7 +5191,7 @@ GIV(argumentCount) = 2; goto normalSend; /* return self */ - goto l250; + goto l227; } contextToReturnTo = null; if (((longAt((home + BaseHeaderSize) + (SenderIndex << (shiftForWord())))) & 1)) { @@ -5249,10 +5248,10 @@ : (byteAt((localFP + FoxIFrameFlags) + 2)) != 0)) { assert(isContext(frameContext(localFP))); ourContext2 = longAt(localFP + FoxThisContext); - goto l253; + goto l230; } ourContext2 = marryFrameSP(localFP, localSP); - l253: /* end ensureFrameIsMarried:SP: */; + l230: /* end ensureFrameIsMarried:SP: */; /* begin internalPush: */ longAtPointerput((localSP -= BytesPerOop), ourContext2); /* begin internalPush: */ @@ -5261,7 +5260,7 @@ GIV(argumentCount) = 1; goto normalSend; /* return self */ - goto l250; + goto l227; } } assert(pageListIsWellFormed()); @@ -5380,11 +5379,11 @@ GIV(framePointer) = localFP; ceEnterCogCodePopReceiverReg(); - goto l252; + goto l229; } localIP = pointerForOop(longAt(localFP + FoxIFSavedIP)); } - l252: /* end maybeReturnToMachineCodeFrame */; + l229: /* end maybeReturnToMachineCodeFrame */; /* begin setMethod: */ assert((((usqInt)(longAt(localFP + FoxMethod)))) >= (startOfMemory())); GIV(method) = longAt(localFP + FoxMethod); @@ -5398,7 +5397,7 @@ longAtPointerput(localSP, localReturnValue); } - l250: /* end case */; + l227: /* end case */; break; case 121: /* returnTrue */ @@ -5517,27 +5516,27 @@ fp = (thePage->headFP); if (fp == theFP) { frameAbove = 0; - goto l257; + goto l234; } while (((callerFP = frameCallerFP(fp))) != 0) { if (callerFP == theFP) { frameAbove = fp; - goto l257; + goto l234; } fp = callerFP; } error("did not find theFP in stack page"); frameAbove = 0; - l257: /* end findFrameAbove:inPage: */; + l234: /* end findFrameAbove:inPage: */; /* begin newStackPage */ lruOrFree = ((mostRecentlyUsedPage())->nextPage); if (isFree(lruOrFree)) { newPage = lruOrFree; - goto l258; + goto l235; } divorceFramesIn(lruOrFree); newPage = lruOrFree; - l258: /* end newStackPage */; + l235: /* end newStackPage */; assert(newPage == GIV(stackPage)); moveFramesInthroughtoPage(thePage, frameAbove, newPage); markStackPageMostRecentlyUsed(newPage); @@ -5561,7 +5560,7 @@ longAtput((sp2 = GIV(stackPointer) - BytesPerWord), GIV(instructionPointer)); GIV(stackPointer) = sp2; ceSendAborttonumArgs(longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (SelectorCannotReturn << (shiftForWord()))), contextToReturnFrom, 1); - goto l256; + goto l233; } GIV(instructionPointer) = 0; thePage = makeBaseFrameFor(contextToReturnTo); @@ -5599,7 +5598,8 @@ GIV(framePointer) = localFP; ceEnterCogCodePopReceiverReg(); - goto l256; + null; + goto l233; } @@ Diff output truncated at 50000 characters. @@

1 0

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

05 Feb '15

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.1041.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.1041 Author: eem Time: 4 February 2015, 3:39:14.587 pm UUID: 07a9d555-3a71-4774-a5f2-04a2ee09a74e Ancestors: VMMaker.oscog-eem.1040 Like V3's, Spur's fetchClassOf: also needs to be inlineable in ifs. =============== Diff against VMMaker.oscog-eem.1040 =============== Item was changed: ----- Method: SpurMemoryManager>>fetchClassOf: (in category 'object access') ----- fetchClassOf: oop | tagBits | + ^(tagBits := oop bitAnd: self tagMask) ~= 0 + ifTrue: [self fetchPointer: tagBits ofObject: classTableFirstPage] + ifFalse: [self fetchClassOfNonImm: oop]! - (tagBits := oop bitAnd: self tagMask) ~= 0 ifTrue: - [^self fetchPointer: tagBits ofObject: classTableFirstPage]. - ^self fetchClassOfNonImm: oop!

1 0

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

05 Feb '15

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.1040.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.1040 Author: eem Time: 4 February 2015, 3:32:10.769 pm UUID: be108ef5-00a3-425b-b228-16515cc447c7 Ancestors: VMMaker.oscog-eem.1039 Fix slip in new primitiveObject:perform:withArguments:lookedUpIn: =============== Diff against VMMaker.oscog-eem.1039 =============== Item was changed: ----- Method: StackInterpreter>>primitiveObject:perform:withArguments:lookedUpIn: (in category 'control primitives') ----- primitiveObject: actualReceiver perform: selector withArguments: argumentArray lookedUpIn: lookupClassOrNil "Common routine used by perform:withArgs:, perform:withArgs:inSuperclass:, object:perform:withArgs:inClass: et al. Answer nil on success. NOTE: The case of doesNotUnderstand: is not a failure to perform. The only failures are arg types and consistency of argumentCount. Since we're in the stack VM we can assume there is space to push the arguments provided they are within limits (max argument count is 15). We can therefore deal with the arbitrary amount of state to remove from the stack (lookup class, selector, mirror receiver) and arbitrary argument orders by deferring popping anything until we know whether the send has succeeded. So on failure we merely have to remove the actual receiver and arguments pushed, and on success we have to slide the actual receiver and arguments down to replace the original ones." <inline: true> | arraySize performArgCount delta | (objectMemory isArray: argumentArray) ifFalse: [^self primitiveFailFor: PrimErrBadArgument]. "Check if number of arguments is reasonable; MaxNumArgs isn't available so just use LargeContextSize" arraySize := objectMemory numSlotsOf: argumentArray. arraySize > LargeContextSlots ifTrue: [^self primitiveFailFor: PrimErrBadNumArgs]. performArgCount := argumentCount. "Push newMethod to save it in case of failure, then push the actual receiver and args out of the array." self push: newMethod. self push: actualReceiver. "Copy the arguments to the stack, and execute" 1 to: arraySize do: [:index| self push: (objectMemory fetchPointer: index - 1 ofObject: argumentArray)]. argumentCount := arraySize. messageSelector := selector. self sendBreakpoint: messageSelector receiver: actualReceiver. self printSends ifTrue: [self printActivationNameForSelector: messageSelector startClass: (lookupClassOrNil isNil + ifTrue: [objectMemory fetchClassOf: actualReceiver] - ifTrue: [objectMemory classForClassTag: lkupClassTag] ifFalse: [lookupClassOrNil]); cr]. self findNewMethodInClassTag: (lookupClassOrNil isNil ifTrue: [objectMemory fetchClassTagOf: actualReceiver] ifFalse: [objectMemory classTagForClass: lookupClassOrNil]). "Only test CompiledMethods for argument count - any other objects playacting as CMs will have to take their chances" ((objectMemory isOopCompiledMethod: newMethod) and: [(self argumentCountOf: newMethod) ~= argumentCount]) ifTrue: ["Restore the state by popping all those array entries and pushing back the selector and array, and fail" self pop: arraySize + 1. newMethod := self popStack. ^self primitiveFailFor: PrimErrBadNumArgs]. "Cannot fail this primitive from here-on. Slide the actual receiver and arguments down to replace the perform arguments and saved newMethod and then execute the new method. Use argumentCount not arraySize because an MNU may have changed it." delta := objectMemory wordSize * (performArgCount + 2). "+2 = receiver + saved newMethod" argumentCount * objectMemory wordSize to: 0 by: objectMemory wordSize negated do: [:offset| stackPages longAt: stackPointer + offset + delta put: (stackPages longAt: stackPointer + offset)]. self pop: performArgCount + 2. self executeNewMethod. self initPrimCall. "Recursive xeq affects primErrorCode" ^nil!

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

Vm-dev February 2015