Vm-dev December 2014

vm-dev@lists.squeakfoundation.org

33 participants
160 discussions

ffi-test-main.c fails on FreeBSD
by Gary Dunn 12 Aug '16

12 Aug '16

In conjunction with getting Open Cobalt running on FreeBSD I have been looking into the problems with SqueakFFIPrims on FreeBSD and have reached a point that is beyond my understanding. I am not sure if the fix should come from the VM side or the FreeBSD port maintainer. I needed to get source code back into the ports tree so I did a make in /usr/ports/lang/squeak. I already had the 3.9 tarball, so that just repopulated the source and did the initial build. In the "files" folder I found patch files typical for a FreeBSD port. These patch source files from a generic tarball to work with FreeBSD. The one of interest was patch-platforms__unix__plugins__SqueakFFIPrims__ffi-config which contains ----x-----x----- --- platforms/unix/plugins/SqueakFFIPrims/ffi-config.org Wed Apr 26 20:27:53 2006 +++ platforms/unix/plugins/SqueakFFIPrims/ffi-config Wed Apr 26 20:29:00 2006 @@ -39,6 +39,7 @@ case ${abi} in linux) abi=sysv;; + freebsd*) abi=sysv;; darwin*) abi=darwin;; *) abi=libffi; lib="-lffi";; esac -----x-----x----- I then had the folder work/Squeak-3.9-7/platforms/unix/plugins/SqueakFFIPrims In it is a file 00README which explains how to test FFI. It says to run ffi-test-config but I have no such file. It says to type "make" to build a test suite but the build failed. It says to try with make CPU=any ABI=libffi LIB=-lffi which also failed. I traced the problem to the gcc search paths for includes and libraries -- turns out FreeBSD only searches /usr/include and /usr/lib when the required files are in /usr/local/include and /usr/local/lib. After some fiddling I finally had a "main" to test. It failed: ffi-test-main.c failed at line 361. Here is a bit from that file, ending with line 361: ffiInitialize(); for (ul= 0; ul < 15; ++ul) ffiPushSingleFloat(fa[ul]); GO(FFITypeSingleFloat, many); f= ffiReturnFloatValue(); ffiCleanup(); CHECK(f - ff < FLT_EPSILON); I worked out the CHECK macro but could not find what FLT_EPSILON is. At that point I decided to stop and come to you for help. Where do I go from here? -- Gary Dunn, Honolulu osp(a)aloha.com http://openslate.net/ http://e9erust.blogspot.com/ Sent from Slate001

5 8

Do we have the new primitive?? [WAS] Re: [Pharo-project] IdentitySet but using #hash rather than #identityHash ?
by Mariano Martinez Peck 16 Dec '15

16 Dec '15

> All I can say is that I am impressed by the numbers it is really much >> faster. >> I still don't understand why I send this email with a subject say >> IdentitySet because what I really need is a fast/large IdentityDictionary >> :( Anyway, there's a place where we can use this LargeIdentitySet in Fuel >> I think). >> >> So Levente, you say this is not possible to adapt this for dictionary? >> can >> we contact Eliot to provide such a primitive? >> > > As promised, I uploaded my LargeIdentityDictionary implementation to > http://leves.web.elte.hu/**squeak/**LargeIdentityDictionary.st<http://leves.web.elte.hu/squeak/LargeIdentityDictionary.st>. > The numbers will be a bit worse compared to LargeIdentitySet, because of > the lack of the primitive, but it's still 2-3x faster than other solutions > (IdentityDictionary, PluggableIdentityDictionary, subclassing, etc). I'm > about to propose this primitive with other improvements on the vm-dev list. > > Hi Eliot/Levente. What is the status of this? Do we have already the new primitive? If true, how can we adapt LargeIdentitySet to use such new primitive? Thanks! > > Levente > > >> thanks >> >> On Fri, Dec 16, 2011 at 3:28 PM, Levente Uzonyi <leves(a)elte.hu> wrote: >> >> On Fri, 16 Dec 2011, Henrik Sperre Johansen wrote: >>> >>> On 16.12.2011 03:26, Levente Uzonyi wrote: >>> >>>> >>>> >>>>> How about my numbers? :) >>>>> >>>>> "Preallocate objects, so we won't count gc time." >>>>> n := 1000000. >>>>> objects := Array new: n streamContents: [ :stream | >>>>> n timesRepeat: [ stream nextPut: Object new ] ]. >>>>> >>>>> set := IdentitySet new: n. >>>>> Smalltalk garbageCollect. >>>>> [1 to: n do: [ :i | set add: (objects at: i) ] ] timeToRun. "4949" >>>>> >>>>> set := LargeIdentitySet new. >>>>> Smalltalk garbageCollect. >>>>> [1 to: n do: [ :i | set add: (objects at: i) ] ] timeToRun. "331" >>>>> >>>>> set := (PluggableSet new: n) >>>>> hashBlock: [ :object | object identityHash * 4096 + object class >>>>> identityHash * 64 ]; "Change this to #basicIdentityHash in Pharo" >>>>> equalBlock: [ :a :b | a == b ]; >>>>> yourself. >>>>> Smalltalk garbageCollect. >>>>> [1 to: n do: [ :i | set add: (objects at: i) ] ] timeToRun. "5511" >>>>> >>>>> >>>>> I also have a LargeIdentityDictionary, which is relatively fast, but >>>>> not >>>>> as fast as LargeIdentitySet, because (for some unknown reason) we don't >>>>> have a primitive that could support it. If we had a primitive like >>>>> primitive 132 which would return the index of the element if found or >>>>> 0 if >>>>> not, then we could have a really fast LargeIdentityDictionary. >>>>> >>>>> >>>>> Levente >>>>> >>>>> Hehe yes, if writing a version fully exploiting the limited range, >>>> that's >>>> probably the approach I would go for as well. >>>> (IAssuming it's the version at http://leves.web.elte.hu/** >>>> squeak/LargeIdentitySet.st<htt**p://leves.web.elte.hu/squeak/** >>>> LargeIdentitySet.st<http://leves.web.elte.hu/squeak/LargeIdentitySet.st> >>>> > >>>> ) >>>> >>>> Mariano commented in the version at http://www.squeaksource.com/** >>>> FuelExperiments <http://www.squeaksource.com/**FuelExperiments<http://www.squeaksource.com/FuelExperiments>> >>>> that it's >>>> >>>> slow for them, which I guess is due to not adopting #identityHash calls >>>> to >>>> #basicIdentityHash calls for Pharo: >>>> ((0 to: 4095) collect: [:each | each << 22 \\ 4096 ]) asSet size -> 1 >>>> So it basically uses 1 bucket instead of 4096... Whoops. :) >>>> >>>> Uploaded a new version to the MC repository which is adapted for Pharo, >>>> on the same machine my numbers were taken from, it does the same test >>>> as I >>>> used above in 871 ms. (181 with preallocation). >>>> >>>> >>> Cool. One more thing: in Squeak the method using primitive 132 directly >>> was renamed to #instVarsInclude:, so now #pointsTo: works as expected. If >>> this was also added to Pharo, then the #pointsTo: sends should be changed >>> to #instVarsInclude:, otherwise Array can be reported as included even if >>> it wasn't added. >>> I'll upload my LargeIdentityDictionary implementation to the same place >>> this evening, since it's still 2-3 factor faster than other solutionts >>> and >>> there seem to be demand for it. >>> >>> >>> Levente >>> >>> >>> Cheers, >>>> Henry >>>> >>>> >>>> >>>> >>> >> >> -- >> Mariano >> http://marianopeck.wordpress.**com <http://marianopeck.wordpress.com> >> >> > -- Mariano http://marianopeck.wordpress.com

4 12

Maintainer of FFI-Package
by Nicolai Hess 12 Sep '15

12 Sep '15

Who is the maintainer of the FFI-Package for Squeak and/or Pharo ? I especially interested in the FFI-Unix examples and the state on working FFI on linux for current squeak release (AFAIK it does not work with "squeak all in one" 4.5) regards Nicolai

3 9

Long path name support added for win32
by Marcel Taeumel 15 May '15

15 May '15

sqWin32FilePrims.c <http://forum.world.st/file/n4796045/sqWin32FilePrims.c> Hi! :) I added support for long path names according to the hint given here: http://msdn.microsoft.com/en-us/library/windows/desktop/aa365247%28v=vs.85%… Just prepending "\\?\" in that case. Further limitations may have to be investigated. ;) Eliot, could you add this to the VM trunk? Best, Marcel -- View this message in context: http://forum.world.st/Long-path-name-support-added-for-win32-tp4796045.html Sent from the Squeak VM mailing list archive at Nabble.com.

5 9

VM Platform contribution (Plan9)
by Alex Franchuk 12 Jan '15

12 Jan '15

Hello all, I'm at a stage of stability in my port of Squeak to the Plan9 operating system. I was wondering who I should contact, or where I should go, to either submit my work or get access to the SVN repository of platforms hosted at squeakvm.org. It didn't quite seem like the sort of thing that should be put on the Mantis bug tracker, but I could be wrong. Any push in the right direction would be much appreciated! Thanks, Alex

4 15

Spur support for restricted memory footprint
by Chris Muller 08 Jan '15

08 Jan '15

Hi Eliot, today I was working and remembered that you asked me to post a reminder request about the ability to restrict a Spur VM's memory expansion via -mmap or -memory parameters. It can be useful when you want to prevent an image from being able to consume more resources from the machine than you want.

3 2

Potential problems with 64bit spur large SmallInteger comparison
by Nicolas Cellier 01 Jan '15

01 Jan '15

One of the problem I foresee is this one: 1.0e17 >= 100000000000000001 indeed, the (generated) primitive currently convert the SmallInteger to double, and this one is true: 1.0e17 >= 100000000000000001 asFloat In 32 bit Spur/COG with 30 bit max magnitude, it was OK because every conversion SmallInteger -> Double was exact - like all integer in the range [-2^53,2^53] - see Float class>>maxExactInteger In 64 bits Spur, this might not be the case anymore since some SmallInteger exceed this range... So the (generated) primitive must be protected with some range test.

5 11

[commit][3202] CogVM source as per VMMaker.oscog-eem.1004
by commits＠squeakvm.org 31 Dec '14

31 Dec '14

Revision: 3202 Author: eliot Date: 2014-12-31 14:38:14 -0800 (Wed, 31 Dec 2014) Log Message: ----------- CogVM source as per VMMaker.oscog-eem.1004 Send cannotReturn for sideways return attemps when there's an unwind-protect. Old code would erroneously answer unwind-protect even if home could'nt be found. e.g. This should raise cannot return: | b | b := [ ^ 42 ]. [ [b value] ensure: [1] ] fork. Processor yield just as this does: | b | b := [ ^ 42 ]. [ b value ] fork. Processor yield Speed up non-local return processing by using the fact that 98% of the time returns are within the same page. The search for the home context following finding an unwind is unnecessary iff the home is married and on the same page. Refactor commonReturn to eiminate CoInterpreter's version, moving the divergence into maybeReturnToMachineCodeFrame. Ensure search for home through the block's closure uses followField:ofObject:. (related) Revisit the Sista bug fix for followed contexts during scavenging in VMMaker.oscog-eem.913 of 24 October 2014. Split isWidowedContext: into a more careful version, isWidowedContextDuringGC: for use only during scavenging. Sista: Added code for inline primitive comparison. 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 2014-12-31 22:28:20 UTC (rev 3201) +++ branches/Cog/nscogsrc/vm/cogit.c 2014-12-31 22:38:14 UTC (rev 3202) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.1001 uuid: fef56678-07b1-4fca-8300-17d6afc0c6e4 + CCodeGenerator VMMaker.oscog-eem.1004 uuid: 132642b3-ab26-4957-82a4-8aa19b60f188 from - StackToRegisterMappingCogit VMMaker.oscog-eem.1001 uuid: fef56678-07b1-4fca-8300-17d6afc0c6e4 + StackToRegisterMappingCogit VMMaker.oscog-eem.1004 uuid: 132642b3-ab26-4957-82a4-8aa19b60f188 */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1001 uuid: fef56678-07b1-4fca-8300-17d6afc0c6e4 " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1004 uuid: 132642b3-ab26-4957-82a4-8aa19b60f188 " __DATE__ ; char *__cogitBuildInfo = __buildInfo; Modified: branches/Cog/nscogsrc/vm/cogit.h =================================================================== --- branches/Cog/nscogsrc/vm/cogit.h 2014-12-31 22:28:20 UTC (rev 3201) +++ branches/Cog/nscogsrc/vm/cogit.h 2014-12-31 22:38:14 UTC (rev 3202) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.1001 uuid: fef56678-07b1-4fca-8300-17d6afc0c6e4 + CCodeGenerator VMMaker.oscog-eem.1004 uuid: 132642b3-ab26-4957-82a4-8aa19b60f188 */ Modified: branches/Cog/nscogsrc/vm/cointerp.c =================================================================== --- branches/Cog/nscogsrc/vm/cointerp.c 2014-12-31 22:28:20 UTC (rev 3201) +++ branches/Cog/nscogsrc/vm/cointerp.c 2014-12-31 22:38:14 UTC (rev 3202) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1001 uuid: fef56678-07b1-4fca-8300-17d6afc0c6e4 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1004 uuid: 132642b3-ab26-4957-82a4-8aa19b60f188 from - CoInterpreter VMMaker.oscog-eem.1001 uuid: fef56678-07b1-4fca-8300-17d6afc0c6e4 + CoInterpreter VMMaker.oscog-eem.1004 uuid: 132642b3-ab26-4957-82a4-8aa19b60f188 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1001 uuid: fef56678-07b1-4fca-8300-17d6afc0c6e4 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1004 uuid: 132642b3-ab26-4957-82a4-8aa19b60f188 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -1081,9 +1081,9 @@ static char * findFrameAboveinPage(char *theFP, StackPage *thePage) NoDbgRegParms; static sqInt findHomeForContext(sqInt aContext) NoDbgRegParms; static sqInt findMethodWithPrimitiveFromContextUpToContext(sqInt primitive, sqInt senderContext, sqInt homeContext) NoDbgRegParms; -static sqInt findMethodWithPrimitiveFromFPUpToContext(sqInt primitive, char *startFP, sqInt homeContext) NoDbgRegParms; sqInt findSelectorOfMethod(sqInt methArg); static char * findSPOfon(char *theFP, StackPage *thePage) NoDbgRegParms; +static sqInt findUnwindThroughContext(sqInt homeContext) NoDbgRegParms; double floatArg(sqInt index); sqInt followLiteralofMethod(sqInt offset, sqInt methodPointer); sqInt forceInterruptCheck(void); @@ -1127,6 +1127,7 @@ sqInt isReadMediatedContextInstVarIndex(sqInt index); static sqInt isSingleContext(sqInt aContext) NoDbgRegParms; static sqInt isStillMarriedContext(sqInt aContext) NoDbgRegParms; +static sqInt isWidowedContextDuringGC(sqInt aOnceMarriedContext) NoDbgRegParms; static sqInt isWidowedContext(sqInt aOnceMarriedContext) NoDbgRegParms; sqInt isWriteMediatedContextInstVarIndex(sqInt index); sqInt isKindOfClass(sqInt oop, sqInt aClass); @@ -1341,8 +1342,8 @@ _iss sqInt bytecodeSetSelector; _iss usqInt freeStart; _iss sqInt argumentCount; +_iss sqInt nilObj; _iss usqInt instructionPointer; -_iss sqInt nilObj; _iss usqInt newMethod; _iss sqInt messageSelector; _iss usqInt youngStart; @@ -2100,7 +2101,7 @@ /* 574 */ (void (*)(void))0, /* 575 */ (void (*)(void))0, 0 }; -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.1001"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.1004"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -4324,7 +4325,6 @@ char *callerFP; sqInt closure; sqInt contextToReturnTo; - sqInt ctxtOrNilOrZero; sqInt currentCtx; char *frameToReturnTo; sqInt home; @@ -4343,7 +4343,6 @@ char *theFP; char *theFP1; char *theFP2; - sqInt theMethod; StackPage *thePage; StackPage *thePage1; StackPage *thePage2; @@ -4382,23 +4381,12 @@ (GIV(stackPage)->headFP = localFP); (GIV(stackPage)->headSP = localSP); assert(pageListIsWellFormed()); - /* begin internalFindUnwindThroughContext: */ /* begin externalizeIPandSP */ assert((((usqInt)localIP)) != (ceReturnToInterpreterPC())); GIV(instructionPointer) = oopForPointer(localIP); GIV(stackPointer) = localSP; GIV(framePointer) = localFP; - /* begin findUnwindThroughContext: */ - ctxtOrNilOrZero = findMethodWithPrimitiveFromFPUpToContext(198, GIV(framePointer), home); - if (ctxtOrNilOrZero == 0) { - theMethod = longAt((home + BaseHeaderSize) + (MethodIndex << (shiftForWord()))); - if ((primitiveIndexOfMethodheader(theMethod, methodHeaderOf(theMethod))) == 198) { - unwindContextOrNilOrZero = home; - goto l296; - } - } - unwindContextOrNilOrZero = ctxtOrNilOrZero; - l296: /* end internalFindUnwindThroughContext: */; + unwindContextOrNilOrZero = findUnwindThroughContext(home); if (unwindContextOrNilOrZero == GIV(nilObj)) { /* error: can't find home on chain; cannot return */ @@ -4540,10 +4528,11 @@ assert((callerContextOrNil2 == (nilObject())) || (isContext(callerContextOrNil2))); currentCtx = callerContextOrNil2; - assert(isContext(currentCtx)); freeStackPage(GIV(stackPage)); - while (!((((longAt((currentCtx + BaseHeaderSize) + (SenderIndex << (shiftForWord())))) & 1)) - && ((stackPageFor((theFP = frameOfMarriedContext(currentCtx)))) == newPage))) { + while (1) { + assert(isContext(currentCtx)); + if ((((longAt((currentCtx + BaseHeaderSize) + (SenderIndex << (shiftForWord())))) & 1)) + && ((stackPageFor((theFP = frameOfMarriedContext(currentCtx)))) == newPage)) break; if (((longAt((currentCtx + BaseHeaderSize) + (SenderIndex << (shiftForWord())))) & 1)) { /* begin stackPageFor: */ /* begin stackPageAt: */ @@ -4593,6 +4582,9 @@ localFP = (GIV(stackPage)->headFP); } if (localFP == frameToReturnTo) { + + /* pop the saved IP, push the return value and continue. */ + localIP = pointerForOop(longAtPointer(localSP)); } else { @@ -4605,6 +4597,7 @@ localIP = pointerForOop(longAt(callerFP + FoxCallerSavedIP)); localSP = (frameCallerSP(callerFP)) - BytesPerWord; } + /* begin maybeReturnToMachineCodeFrame */ if ((((usqInt)localIP)) < (startOfMemory())) { if ((((usqInt)localIP)) != (ceReturnToInterpreterPC())) { @@ -4625,11 +4618,11 @@ GIV(framePointer) = localFP; ceEnterCogCodePopReceiverReg(); - goto l294; + goto l296; } localIP = pointerForOop(longAt(localFP + FoxIFSavedIP)); } - longAtPointerput(localSP, localReturnValue); + l296: /* end maybeReturnToMachineCodeFrame */; /* begin setMethod: */ assert((((usqInt)(longAt(localFP + FoxMethod)))) >= (startOfMemory())); GIV(method) = longAt(localFP + FoxMethod); @@ -4641,7 +4634,7 @@ /* begin fetchNextBytecode */ currentBytecode = (byteAtPointer(++localIP)) + GIV(bytecodeSetSelector); - /* return self */ + longAtPointerput(localSP, localReturnValue); } l294: /* end case */; break; @@ -4844,7 +4837,6 @@ GIV(framePointer) = localFP; ceEnterCogCodePopReceiverReg(); - null; goto l300; } localIP = pointerForOop(longAt(localFP + FoxIFSavedIP)); @@ -4862,7 +4854,7 @@ /* begin fetchNextBytecode */ currentBytecode = (byteAtPointer(++localIP)) + GIV(bytecodeSetSelector); - null; + /* return self */ l300: /* end baseFrameReturn */; goto l299; } @@ -14486,7 +14478,6 @@ char *callerFP; sqInt closure; sqInt contextToReturnTo; - sqInt ctxtOrNilOrZero; sqInt currentCtx; char *frameToReturnTo; sqInt home; @@ -14517,7 +14508,6 @@ char *theFP3; char *theFP4; char *theFP5; - sqInt theMethod; StackPage *thePage; StackPage *thePage1; StackPage *thePage2; @@ -14558,17 +14548,7 @@ (GIV(stackPage)->headFP = GIV(framePointer)); (GIV(stackPage)->headSP = GIV(stackPointer)); assert(pageListIsWellFormed()); - /* begin findUnwindThroughContext: */ - ctxtOrNilOrZero = findMethodWithPrimitiveFromFPUpToContext(198, GIV(framePointer), home); - if (ctxtOrNilOrZero == 0) { - theMethod = longAt((home + BaseHeaderSize) + (MethodIndex << (shiftForWord()))); - if ((primitiveIndexOfMethodheader(theMethod, methodHeaderOf(theMethod))) == 198) { - unwindContextOrNilOrZero = home; - goto l3; - } - } - unwindContextOrNilOrZero = ctxtOrNilOrZero; -l3: /* end findUnwindThroughContext: */; + unwindContextOrNilOrZero = findUnwindThroughContext(home); if (unwindContextOrNilOrZero == GIV(nilObj)) { /* error: can't find home on chain; cannot return */ @@ -14607,10 +14587,10 @@ : (byteAt((theFP5 + FoxIFrameFlags) + 2)) != 0)) { assert(isContext(frameContext(theFP5))); ourContext1 = longAt(theFP5 + FoxThisContext); - goto l4; + goto l3; } ourContext1 = marryFrameSP(theFP5, theSP2); - l4: /* end ensureFrameIsMarried:SP: */; + l3: /* end ensureFrameIsMarried:SP: */; /* begin push: */ longAtput((sp4 = GIV(stackPointer) - BytesPerWord), ourContext1); GIV(stackPointer) = sp4; @@ -45886,8 +45866,18 @@ static sqInt findMethodWithPrimitiveFromContextUpToContext(sqInt primitive, sqInt senderContext, sqInt homeContext) { DECL_MAYBE_SQ_GLOBAL_STRUCT + sqInt callerContextOrNil; + sqInt index; + sqInt senderContext1; + sqInt senderOop; + char *startFP; sqInt theContext; + char *theFP; + char *theFPAbove; sqInt theMethod; + sqInt theMethod1; + StackPage *thePage; + char *theSP; assert((senderContext == (nilObject())) || (isContext(senderContext))); @@ -45902,7 +45892,8 @@ if (theContext == homeContext) { return 0; } - if ((longAt((theContext + BaseHeaderSize) + (ClosureIndex << (shiftForWord())))) == GIV(nilObj)) { + if (!((primitive == 0) + || ((longAt((theContext + BaseHeaderSize) + (ClosureIndex << (shiftForWord())))) != GIV(nilObj)))) { theMethod = longAt((theContext + BaseHeaderSize) + (MethodIndex << (shiftForWord()))); if ((primitiveIndexOfMethodheader(theMethod, methodHeaderOf(theMethod))) == primitive) { return theContext; @@ -45913,27 +45904,12 @@ if (isWidowedContext(theContext)) { return GIV(nilObj); } - return findMethodWithPrimitiveFromFPUpToContext(primitive, frameOfMarriedContext(theContext), homeContext); -} - - -/* See findUnwindThroughContext:. Alas this is mutually recursive with - findMethodWithPrimitive:FromContext:ThroughContext: instead of iterative. - We're doing the simplest thing that could possibly work. Niceties can - wait. */ - -static sqInt -findMethodWithPrimitiveFromFPUpToContext(sqInt primitive, char *startFP, sqInt homeContext) -{ DECL_MAYBE_SQ_GLOBAL_STRUCT - sqInt callerContextOrNil; - sqInt index; - sqInt senderContext; - char *theFP; - char *theFPAbove; - sqInt theMethod; - StackPage *thePage; - char *theSP; - + /* begin findMethodWithPrimitive:FromFP:UpToContext: */ + /* begin frameOfMarriedContext: */ + senderOop = longAt((theContext + BaseHeaderSize) + (SenderIndex << (shiftForWord()))); + /* begin withoutSmallIntegerTags: */ + assert((senderOop & 1)); + startFP = pointerForOop(senderOop - 1); theFP = startFP; theFPAbove = startFP; do { @@ -45943,13 +45919,14 @@ && (homeContext == (longAt(theFP + FoxThisContext)))) { return 0; } - if (!(((((usqInt)(longAt(theFP + FoxMethod)))) < (startOfMemory()) + if (!((primitive == 0) + || (((((usqInt)(longAt(theFP + FoxMethod)))) < (startOfMemory()) ? ((longAt(theFP + FoxMethod)) & MFMethodFlagIsBlockFlag) != 0 - : (byteAt((theFP + FoxIFrameFlags) + 3)) != 0))) { - theMethod = ((((usqInt)(longAt(theFP + FoxMethod)))) < (startOfMemory()) + : (byteAt((theFP + FoxIFrameFlags) + 3)) != 0)))) { + theMethod1 = ((((usqInt)(longAt(theFP + FoxMethod)))) < (startOfMemory()) ? ((mframeHomeMethod(theFP))->methodObject) : longAt(theFP + FoxMethod)); - if ((primitiveIndexOfMethodheader(theMethod, methodHeaderOf(theMethod))) == primitive) { + if ((primitiveIndexOfMethodheader(theMethod1, methodHeaderOf(theMethod1))) == primitive) { if (theFP == theFPAbove) { theSP = findSPOfon(theFP, stackPageFor(theFP)); } @@ -45986,12 +45963,12 @@ assert(addressCouldBeObj(callerContextOrNil)); assert((callerContextOrNil == (nilObject())) || (isContext(callerContextOrNil))); - senderContext = callerContextOrNil; - if (!(((senderContext & 1) == 0) - && (((((usqInt) (longAt(senderContext))) >> (compactClassFieldLSB())) & 0x1F) == ClassMethodContextCompactIndex))) { + senderContext1 = callerContextOrNil; + if (!(((senderContext1 & 1) == 0) + && (((((usqInt) (longAt(senderContext1))) >> (compactClassFieldLSB())) & 0x1F) == ClassMethodContextCompactIndex))) { return GIV(nilObj); } - return findMethodWithPrimitiveFromContextUpToContext(primitive, senderContext, homeContext); + return findMethodWithPrimitiveFromContextUpToContext(primitive, senderContext1, homeContext); } sqInt @@ -46104,6 +46081,118 @@ } +/* Search for either an unwind-protect (activation of method with primitive + 198) or homeContext along the sender chain, which ever is found first. + Return values: + 0 home context was found on sender chain with no intervening + unwind-protects nilObj home context could not be found => cannotReturn + context the context of an intervening unwind-protect implies home context + was found */ +/* Almost always (98%) the home is on the same page. */ + +static sqInt +findUnwindThroughContext(sqInt homeContext) +{ DECL_MAYBE_SQ_GLOBAL_STRUCT + sqInt callerContextOrNil; + sqInt ctxtOrNilOrZero; + sqInt index; + sqInt onSamePage; + sqInt senderContext; + char *theFP; + char *theFPAbove; + sqInt theMethod; + sqInt theMethod1; + StackPage *thePage; + char *theSP; + + + /* Since nothing changes we don't need to internalize. */ + + onSamePage = ((((longAt((homeContext + BaseHeaderSize) + (SenderIndex << (shiftForWord())))) & 1)) + && (!(isWidowedContext(homeContext)))) + && ((pageIndexFor(GIV(framePointer))) == (pageIndexFor(frameOfMarriedContext(homeContext)))); + /* begin findMethodWithPrimitive:FromFP:UpToContext: */ + theFP = GIV(framePointer); + theFPAbove = GIV(framePointer); + do { + if ((((((usqInt)(longAt(theFP + FoxMethod)))) < (startOfMemory()) + ? ((longAt(theFP + FoxMethod)) & MFMethodFlagHasContextFlag) != 0 + : (byteAt((theFP + FoxIFrameFlags) + 2)) != 0)) + && (homeContext == (longAt(theFP + FoxThisContext)))) { + ctxtOrNilOrZero = 0; + goto l1; + } + if (!((198 == 0) + || (((((usqInt)(longAt(theFP + FoxMethod)))) < (startOfMemory()) + ? ((longAt(theFP + FoxMethod)) & MFMethodFlagIsBlockFlag) != 0 + : (byteAt((theFP + FoxIFrameFlags) + 3)) != 0)))) { + theMethod1 = ((((usqInt)(longAt(theFP + FoxMethod)))) < (startOfMemory()) + ? ((mframeHomeMethod(theFP))->methodObject) + : longAt(theFP + FoxMethod)); + if ((primitiveIndexOfMethodheader(theMethod1, methodHeaderOf(theMethod1))) == 198) { + if (theFP == theFPAbove) { + theSP = findSPOfon(theFP, stackPageFor(theFP)); + } + else { + /* begin frameCallerStackPointer: */ + assert(!(isBaseFrame(theFPAbove))); + theSP = (theFPAbove + (frameStackedReceiverOffsetNumArgs(((((usqInt)(longAt(theFPAbove + FoxMethod)))) < (startOfMemory()) + ? ((mframeCogMethod(theFPAbove))->cmNumArgs) + : byteAt((theFPAbove + FoxIFrameFlags) + 1))))) + BytesPerWord; + } + /* begin ensureFrameIsMarried:SP: */ + if (((((usqInt)(longAt(theFP + FoxMethod)))) < (startOfMemory()) + ? ((longAt(theFP + FoxMethod)) & MFMethodFlagHasContextFlag) != 0 + : (byteAt((theFP + FoxIFrameFlags) + 2)) != 0)) { + assert(isContext(frameContext(theFP))); + ctxtOrNilOrZero = longAt(theFP + FoxThisContext); + goto l1; + } + ctxtOrNilOrZero = marryFrameSP(theFP, theSP); + goto l1; + } + } + theFPAbove = theFP; + /* begin frameCallerFP: */ + theFP = pointerForOop(longAt(theFP + FoxSavedFP)); + } while(theFP != 0); + /* begin frameCallerContext: */ + assert(isBaseFrame(theFPAbove)); + /* begin stackPageFor: */ + /* begin stackPageAt: */ + /* begin pageIndexFor: */ + assert((((((char *) theFPAbove)) >= (GIV(stackBasePlus1) - 1)) && ((((char *) theFPAbove)) <= (((char *) GIV(pages)))))); + index = pageIndexForstackBasePlus1bytesPerPage(theFPAbove, GIV(stackBasePlus1), GIV(bytesPerPage)); + thePage = stackPageAtpages(index, GIV(pages)); + callerContextOrNil = longAt((thePage->baseAddress)); + assert(addressCouldBeObj(callerContextOrNil)); + assert((callerContextOrNil == (nilObject())) + || (isContext(callerContextOrNil))); + senderContext = callerContextOrNil; + if (!(((senderContext & 1) == 0) + && (((((usqInt) (longAt(senderContext))) >> (compactClassFieldLSB())) & 0x1F) == ClassMethodContextCompactIndex))) { + ctxtOrNilOrZero = GIV(nilObj); + goto l1; + } + ctxtOrNilOrZero = findMethodWithPrimitiveFromContextUpToContext(198, senderContext, homeContext); +l1: /* end findMethodWithPrimitive:FromFP:UpToContext: */; + if (onSamePage + || (ctxtOrNilOrZero == 0)) { + theMethod = longAt((homeContext + BaseHeaderSize) + (MethodIndex << (shiftForWord()))); + if ((primitiveIndexOfMethodheader(theMethod, methodHeaderOf(theMethod))) == 198) { + return homeContext; + } + return 0; + } + if (!(ctxtOrNilOrZero == GIV(nilObj))) { + if ((findMethodWithPrimitiveFromContextUpToContext(0, ctxtOrNilOrZero, homeContext)) == GIV(nilObj)) { + return GIV(nilObj); + } + } + return ctxtOrNilOrZero; +} + + /* Like #stackFloatValue: but access method arguments left-to-right */ double @@ -46861,11 +46950,27 @@ } -/* See if the argument is married to a live frame or not. - If it is not, turn it into a bereaved single context. */ +/* See if the argument is married to a live frame or not. i.e. see if there + is a matching + frame whose frameContext field is aOnceMarriedContext, or a forwarder to + it. If aOnceMarriedContext is not married to a live frame, turn it into a + bereaved single context. + This version is for use during scavenging when stack references may be + forwarded. Following what appear to be references to forwarded objects on + the stack is dangerous; + an instruction ponter may be correctly aligned and may point to bytes that + just happen + to look like a forwarder. So it is only safe to follow fields that we know + are frameContext + fields; hence the stack page is walked to check that aOnceMarriedContext + is pointing to + a live frame. This only has to happen during scavenging because after a + become: all + frameContext fields have been followed and so there is no need to follow + forwarders. */ static sqInt -isWidowedContext(sqInt aOnceMarriedContext) +isWidowedContextDuringGC(sqInt aOnceMarriedContext) { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt anInteger; sqInt index; @@ -46925,6 +47030,69 @@ } +/* See if the argument is married to a live frame or not. + If it is not, turn it into a bereaved single context. This version is safe + for use + only when no frameContext fields may be forwarded (as maybe the case + when scavenging). Post become: all frameContext fields are followed, and + hence nrmally no following of frameCOtext fields is necessary. But during + a scavenge one must use isWidowedContextDuringGC:. */ + +static sqInt +isWidowedContext(sqInt aOnceMarriedContext) +{ DECL_MAYBE_SQ_GLOBAL_STRUCT + sqInt anInteger; + sqInt index; + sqInt senderOop; + char *shouldBeFrameCallerField; + char *theFrame; + StackPage *thePage; + + assert((isContext(aOnceMarriedContext)) + && (isMarriedOrWidowedContext(aOnceMarriedContext))); + /* begin frameOfMarriedContext: */ + senderOop = longAt((aOnceMarriedContext + BaseHeaderSize) + (SenderIndex << (shiftForWord()))); + /* begin withoutSmallIntegerTags: */ + assert((senderOop & 1)); + theFrame = pointerForOop(senderOop - 1); + /* begin stackPageFor: */ + /* begin stackPageAt: */ + /* begin pageIndexFor: */ + assert((((((char *) theFrame)) >= (GIV(stackBasePlus1) - 1)) && ((((char *) theFrame)) <= (((char *) GIV(pages)))))); + index = pageIndexForstackBasePlus1bytesPerPage(theFrame, GIV(stackBasePlus1), GIV(bytesPerPage)); + thePage = stackPageAtpages(index, GIV(pages)); + if (!((isFree(thePage)) + || (theFrame < ((thePage->headFP))))) { + + /* The frame pointer is within the bounds of a live page. + Now check if it matches a frame. */ + + /* begin withoutSmallIntegerTags: */ + anInteger = longAt((aOnceMarriedContext + BaseHeaderSize) + (InstructionPointerIndex << (shiftForWord()))); + assert((anInteger & 1)); + shouldBeFrameCallerField = pointerForOop(anInteger - 1); + if (((frameCallerFP(theFrame)) == shouldBeFrameCallerField) + && (((((usqInt)(longAt(theFrame + FoxMethod)))) < (startOfMemory()) + ? ((longAt(theFrame + FoxMethod)) & MFMethodFlagHasContextFlag) != 0 + : (byteAt((theFrame + FoxIFrameFlags) + 2)) != 0))) { + assert(!(((isFrameonPage(theFrame, thePage)) + && (isForwarded(frameContext(theFrame)))))); + if ((longAt(theFrame + FoxThisContext)) == aOnceMarriedContext) { + + /* It is still married! */ + + return 0; + } + } + } + /* begin markContextAsDead: */ + assert(isContext(aOnceMarriedContext)); + longAtput((aOnceMarriedContext + BaseHeaderSize) + (SenderIndex << (shiftForWord())), GIV(nilObj)); + longAtput((aOnceMarriedContext + BaseHeaderSize) + (InstructionPointerIndex << (shiftForWord())), GIV(nilObj)); + return 1; +} + + /* Wrining any inst vars of a context must take account of potentially married contexts and set the state in the frame. Inst vars in subclasses don't need @@ -51516,7 +51684,7 @@ StackPage *thePage; if ((((longAt((aContext + BaseHeaderSize) + (SenderIndex << (shiftForWord())))) & 1)) - && (!(isWidowedContext(aContext)))) { + && (!(isWidowedContextDuringGC(aContext)))) { /* begin stackPageFor: */ /* begin frameOfMarriedContext: */ senderOop = longAt((aContext + BaseHeaderSize) + (SenderIndex << (shiftForWord()))); @@ -54883,12 +55051,21 @@ primitiveFindNextUnwindContext(void) { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt calleeContext; + sqInt callerContextOrNil; sqInt handlerOrNilOrZero; + sqInt index; + sqInt senderContext; sqInt senderOop; char *sp; sqInt startContext; + char *startFP; sqInt stopContext; char *theFP; + char *theFP1; + char *theFPAbove; + sqInt theMethod; + StackPage *thePage; + char *theSP; stopContext = longAt(GIV(stackPointer)); calleeContext = longAt(GIV(stackPointer) + (1 * BytesPerWord)); @@ -54924,7 +55101,73 @@ handlerOrNilOrZero = findMethodWithPrimitiveFromContextUpToContext(198, frameCallerContext(theFP), stopContext); } else { - handlerOrNilOrZero = findMethodWithPrimitiveFromFPUpToContext(198, frameCallerFP(theFP), stopContext); + /* begin findMethodWithPrimitive:FromFP:UpToContext: */ + /* begin frameCallerFP: */ + startFP = pointerForOop(longAt(theFP + FoxSavedFP)); + theFP1 = startFP; + theFPAbove = startFP; + do { + if ((((((usqInt)(longAt(theFP1 + FoxMethod)))) < (startOfMemory()) + ? ((longAt(theFP1 + FoxMethod)) & MFMethodFlagHasContextFlag) != 0 + : (byteAt((theFP1 + FoxIFrameFlags) + 2)) != 0)) + && (stopContext == (longAt(theFP1 + FoxThisContext)))) { + handlerOrNilOrZero = 0; + goto l1; + } + if (!((198 == 0) + || (((((usqInt)(longAt(theFP1 + FoxMethod)))) < (startOfMemory()) + ? ((longAt(theFP1 + FoxMethod)) & MFMethodFlagIsBlockFlag) != 0 + : (byteAt((theFP1 + FoxIFrameFlags) + 3)) != 0)))) { + theMethod = ((((usqInt)(longAt(theFP1 + FoxMethod)))) < (startOfMemory()) + ? ((mframeHomeMethod(theFP1))->methodObject) + : longAt(theFP1 + FoxMethod)); + if ((primitiveIndexOfMethodheader(theMethod, methodHeaderOf(theMethod))) == 198) { + if (theFP1 == theFPAbove) { + theSP = findSPOfon(theFP1, stackPageFor(theFP1)); + } + else { + /* begin frameCallerStackPointer: */ + assert(!(isBaseFrame(theFPAbove))); + theSP = (theFPAbove + (frameStackedReceiverOffsetNumArgs(((((usqInt)(longAt(theFPAbove + FoxMethod)))) < (startOfMemory()) + ? ((mframeCogMethod(theFPAbove))->cmNumArgs) + : byteAt((theFPAbove + FoxIFrameFlags) + 1))))) + BytesPerWord; + } + /* begin ensureFrameIsMarried:SP: */ + if (((((usqInt)(longAt(theFP1 + FoxMethod)))) < (startOfMemory()) + ? ((longAt(theFP1 + FoxMethod)) & MFMethodFlagHasContextFlag) != 0 + : (byteAt((theFP1 + FoxIFrameFlags) + 2)) != 0)) { + assert(isContext(frameContext(theFP1))); + handlerOrNilOrZero = longAt(theFP1 + FoxThisContext); + goto l1; + } + handlerOrNilOrZero = marryFrameSP(theFP1, theSP); + goto l1; + } + } + theFPAbove = theFP1; + /* begin frameCallerFP: */ + theFP1 = pointerForOop(longAt(theFP1 + FoxSavedFP)); + } while(theFP1 != 0); + /* begin frameCallerContext: */ + assert(isBaseFrame(theFPAbove)); + /* begin stackPageFor: */ + /* begin stackPageAt: */ + /* begin pageIndexFor: */ + assert((((((char *) theFPAbove)) >= (GIV(stackBasePlus1) - 1)) && ((((char *) theFPAbove)) <= (((char *) GIV(pages)))))); + index = pageIndexForstackBasePlus1bytesPerPage(theFPAbove, GIV(stackBasePlus1), GIV(bytesPerPage)); + thePage = stackPageAtpages(index, GIV(pages)); + callerContextOrNil = longAt((thePage->baseAddress)); + assert(addressCouldBeObj(callerContextOrNil)); + assert((callerContextOrNil == (nilObject())) + || (isContext(callerContextOrNil))); + senderContext = callerContextOrNil; + if (!(((senderContext & 1) == 0) + && (((((usqInt) (longAt(senderContext))) >> (compactClassFieldLSB())) & 0x1F) == ClassMethodContextCompactIndex))) { + handlerOrNilOrZero = GIV(nilObj); + goto l1; + } + handlerOrNilOrZero = findMethodWithPrimitiveFromContextUpToContext(198, senderContext, stopContext); + l1: /* end findMethodWithPrimitive:FromFP:UpToContext: */; } } else { Modified: branches/Cog/nscogsrc/vm/cointerp.h =================================================================== --- branches/Cog/nscogsrc/vm/cointerp.h 2014-12-31 22:28:20 UTC (rev 3201) +++ branches/Cog/nscogsrc/vm/cointerp.h 2014-12-31 22:38:14 UTC (rev 3202) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1001 uuid: fef56678-07b1-4fca-8300-17d6afc0c6e4 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1004 uuid: 132642b3-ab26-4957-82a4-8aa19b60f188 */ Modified: branches/Cog/nscogsrc/vm/gcc3x-cointerp.c =================================================================== --- branches/Cog/nscogsrc/vm/gcc3x-cointerp.c 2014-12-31 22:28:20 UTC (rev 3201) +++ branches/Cog/nscogsrc/vm/gcc3x-cointerp.c 2014-12-31 22:38:14 UTC (rev 3202) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1001 uuid: fef56678-07b1-4fca-8300-17d6afc0c6e4 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1004 uuid: 132642b3-ab26-4957-82a4-8aa19b60f188 from - CoInterpreter VMMaker.oscog-eem.1001 uuid: fef56678-07b1-4fca-8300-17d6afc0c6e4 + CoInterpreter VMMaker.oscog-eem.1004 uuid: 132642b3-ab26-4957-82a4-8aa19b60f188 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1001 uuid: fef56678-07b1-4fca-8300-17d6afc0c6e4 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1004 uuid: 132642b3-ab26-4957-82a4-8aa19b60f188 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -1084,9 +1084,9 @@ static char * findFrameAboveinPage(char *theFP, StackPage *thePage) NoDbgRegParms; static sqInt findHomeForContext(sqInt aContext) NoDbgRegParms; static sqInt findMethodWithPrimitiveFromContextUpToContext(sqInt primitive, sqInt senderContext, sqInt homeContext) NoDbgRegParms; -static sqInt findMethodWithPrimitiveFromFPUpToContext(sqInt primitive, char *startFP, sqInt homeContext) NoDbgRegParms; sqInt findSelectorOfMethod(sqInt methArg); static char * findSPOfon(char *theFP, StackPage *thePage) NoDbgRegParms; +static sqInt findUnwindThroughContext(sqInt homeContext) NoDbgRegParms; double floatArg(sqInt index); sqInt followLiteralofMethod(sqInt offset, sqInt methodPointer); sqInt forceInterruptCheck(void); @@ -1130,6 +1130,7 @@ sqInt isReadMediatedContextInstVarIndex(sqInt index); static sqInt isSingleContext(sqInt aContext) NoDbgRegParms; static sqInt isStillMarriedContext(sqInt aContext) NoDbgRegParms; +static sqInt isWidowedContextDuringGC(sqInt aOnceMarriedContext) NoDbgRegParms; static sqInt isWidowedContext(sqInt aOnceMarriedContext) NoDbgRegParms; sqInt isWriteMediatedContextInstVarIndex(sqInt index); sqInt isKindOfClass(sqInt oop, sqInt aClass); @@ -1344,8 +1345,8 @@ _iss sqInt bytecodeSetSelector; _iss usqInt freeStart; _iss sqInt argumentCount; +_iss sqInt nilObj; _iss usqInt instructionPointer; -_iss sqInt nilObj; _iss usqInt newMethod; _iss sqInt messageSelector; _iss usqInt youngStart; @@ -2103,7 +2104,7 @@ /* 574 */ (void (*)(void))0, /* 575 */ (void (*)(void))0, 0 }; -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.1001"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.1004"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -4333,7 +4334,6 @@ char *callerFP; sqInt closure; sqInt contextToReturnTo; - sqInt ctxtOrNilOrZero; sqInt currentCtx; char *frameToReturnTo; sqInt home; @@ -4352,7 +4352,6 @@ char *theFP; char *theFP1; char *theFP2; - sqInt theMethod; StackPage *thePage; StackPage *thePage1; StackPage *thePage2; @@ -4391,23 +4390,12 @@ (GIV(stackPage)->headFP = localFP); (GIV(stackPage)->headSP = localSP); assert(pageListIsWellFormed()); - /* begin internalFindUnwindThroughContext: */ /* begin externalizeIPandSP */ assert((((usqInt)localIP)) != (ceReturnToInterpreterPC())); GIV(instructionPointer) = oopForPointer(localIP); GIV(stackPointer) = localSP; GIV(framePointer) = localFP; - /* begin findUnwindThroughContext: */ - ctxtOrNilOrZero = findMethodWithPrimitiveFromFPUpToContext(198, GIV(framePointer), home); - if (ctxtOrNilOrZero == 0) { - theMethod = longAt((home + BaseHeaderSize) + (MethodIndex << (shiftForWord()))); - if ((primitiveIndexOfMethodheader(theMethod, methodHeaderOf(theMethod))) == 198) { - unwindContextOrNilOrZero = home; - goto l296; - } - } - unwindContextOrNilOrZero = ctxtOrNilOrZero; - l296: /* end internalFindUnwindThroughContext: */; + unwindContextOrNilOrZero = findUnwindThroughContext(home); if (unwindContextOrNilOrZero == GIV(nilObj)) { /* error: can't find home on chain; cannot return */ @@ -4549,10 +4537,11 @@ assert((callerContextOrNil2 == (nilObject())) || (isContext(callerContextOrNil2))); currentCtx = callerContextOrNil2; - assert(isContext(currentCtx)); freeStackPage(GIV(stackPage)); - while (!((((longAt((currentCtx + BaseHeaderSize) + (SenderIndex << (shiftForWord())))) & 1)) - && ((stackPageFor((theFP = frameOfMarriedContext(currentCtx)))) == newPage))) { + while (1) { + assert(isContext(currentCtx)); + if ((((longAt((currentCtx + BaseHeaderSize) + (SenderIndex << (shiftForWord())))) & 1)) + && ((stackPageFor((theFP = frameOfMarriedContext(currentCtx)))) == newPage)) break; if (((longAt((currentCtx + BaseHeaderSize) + (SenderIndex << (shiftForWord())))) & 1)) { /* begin stackPageFor: */ /* begin stackPageAt: */ @@ -4602,6 +4591,9 @@ localFP = (GIV(stackPage)->headFP); } if (localFP == frameToReturnTo) { + + /* pop the saved IP, push the return value and continue. */ + localIP = pointerForOop(longAtPointer(localSP)); } else { @@ -4614,6 +4606,7 @@ localIP = pointerForOop(longAt(callerFP + FoxCallerSavedIP)); localSP = (frameCallerSP(callerFP)) - BytesPerWord; } + /* begin maybeReturnToMachineCodeFrame */ if ((((usqInt)localIP)) < (startOfMemory())) { if ((((usqInt)localIP)) != (ceReturnToInterpreterPC())) { @@ -4634,11 +4627,11 @@ GIV(framePointer) = localFP; ceEnterCogCodePopReceiverReg(); - goto l294; + goto l296; } localIP = pointerForOop(longAt(localFP + FoxIFSavedIP)); } - longAtPointerput(localSP, localReturnValue); + l296: /* end maybeReturnToMachineCodeFrame */; /* begin setMethod: */ assert((((usqInt)(longAt(localFP + FoxMethod)))) >= (startOfMemory())); GIV(method) = longAt(localFP + FoxMethod); @@ -4650,7 +4643,7 @@ /* begin fetchNextBytecode */ currentBytecode = (byteAtPointer(++localIP)) + GIV(bytecodeSetSelector); - /* return self */ + longAtPointerput(localSP, localReturnValue); } l294: /* end case */; BREAK; @@ -4853,7 +4846,6 @@ GIV(framePointer) = localFP; ceEnterCogCodePopReceiverReg(); - null; goto l300; } localIP = pointerForOop(longAt(localFP + FoxIFSavedIP)); @@ -4871,7 +4863,7 @@ /* begin fetchNextBytecode */ currentBytecode = (byteAtPointer(++localIP)) + GIV(bytecodeSetSelector); - null; + /* return self */ l300: /* end baseFrameReturn */; goto l299; } @@ -14495,7 +14487,6 @@ char *callerFP; sqInt closure; sqInt contextToReturnTo; - sqInt ctxtOrNilOrZero; sqInt currentCtx; char *frameToReturnTo; sqInt home; @@ -14526,7 +14517,6 @@ char *theFP3; char *theFP4; char *theFP5; - sqInt theMethod; StackPage *thePage; StackPage *thePage1; StackPage *thePage2; @@ -14567,17 +14557,7 @@ (GIV(stackPage)->headFP = GIV(framePointer)); (GIV(stackPage)->headSP = GIV(stackPointer)); assert(pageListIsWellFormed()); - /* begin findUnwindThroughContext: */ - ctxtOrNilOrZero = findMethodWithPrimitiveFromFPUpToContext(198, GIV(framePointer), home); - if (ctxtOrNilOrZero == 0) { - theMethod = longAt((home + BaseHeaderSize) + (MethodIndex << (shiftForWord()))); - if ((primitiveIndexOfMethodheader(theMethod, methodHeaderOf(theMethod))) == 198) { - unwindContextOrNilOrZero = home; - goto l3; - } - } - unwindContextOrNilOrZero = ctxtOrNilOrZero; -l3: /* end findUnwindThroughContext: */; + unwindContextOrNilOrZero = findUnwindThroughContext(home); if (unwindContextOrNilOrZero == GIV(nilObj)) { /* error: can't find home on chain; cannot return */ @@ -14616,10 +14596,10 @@ : (byteAt((theFP5 + FoxIFrameFlags) + 2)) != 0)) { assert(isContext(frameContext(theFP5))); ourContext1 = longAt(theFP5 + FoxThisContext); - goto l4; + goto l3; } ourContext1 = marryFrameSP(theFP5, theSP2); - l4: /* end ensureFrameIsMarried:SP: */; + l3: /* end ensureFrameIsMarried:SP: */; /* begin push: */ longAtput((sp4 = GIV(stackPointer) - BytesPerWord), ourContext1); GIV(stackPointer) = sp4; @@ -45895,8 +45875,18 @@ static sqInt findMethodWithPrimitiveFromContextUpToContext(sqInt primitive, sqInt senderContext, sqInt homeContext) { DECL_MAYBE_SQ_GLOBAL_STRUCT + sqInt callerContextOrNil; + sqInt index; + sqInt senderContext1; + sqInt senderOop; + char *startFP; sqInt theContext; + char *theFP; + char *theFPAbove; sqInt theMethod; + sqInt theMethod1; + StackPage *thePage; + char *theSP; assert((senderContext == (nilObject())) || (isContext(senderContext))); @@ -45911,7 +45901,8 @@ if (theContext == homeContext) { return 0; } - if ((longAt((theContext + BaseHeaderSize) + (ClosureIndex << (shiftForWord())))) == GIV(nilObj)) { + if (!((primitive == 0) + || ((longAt((theContext + BaseHeaderSize) + (ClosureIndex << (shiftForWord())))) != GIV(nilObj)))) { theMethod = longAt((theContext + BaseHeaderSize) + (MethodIndex << (shiftForWord()))); if ((primitiveIndexOfMethodheader(theMethod, methodHeaderOf(theMethod))) == primitive) { return theContext; @@ -45922,27 +45913,12 @@ if (isWidowedContext(theContext)) { return GIV(nilObj); } - return findMethodWithPrimitiveFromFPUpToContext(primitive, frameOfMarriedContext(theContext), homeContext); -} - - -/* See findUnwindThroughContext:. Alas this is mutually recursive with - findMethodWithPrimitive:FromContext:ThroughContext: instead of iterative. - We're doing the simplest thing that could possibly work. Niceties can - wait. */ - -static sqInt -findMethodWithPrimitiveFromFPUpToContext(sqInt primitive, char *startFP, sqInt homeContext) -{ DECL_MAYBE_SQ_GLOBAL_STRUCT - sqInt callerContextOrNil; - sqInt index; - sqInt senderContext; - char *theFP; - char *theFPAbove; - sqInt theMethod; - StackPage *thePage; - char *theSP; - + /* begin findMethodWithPrimitive:FromFP:UpToContext: */ + /* begin frameOfMarriedContext: */ + senderOop = longAt((theContext + BaseHeaderSize) + (SenderIndex << (shiftForWord()))); + /* begin withoutSmallIntegerTags: */ + assert((senderOop & 1)); + startFP = pointerForOop(senderOop - 1); theFP = startFP; theFPAbove = startFP; do { @@ -45952,13 +45928,14 @@ && (homeContext == (longAt(theFP + FoxThisContext)))) { return 0; } - if (!(((((usqInt)(longAt(theFP + FoxMethod)))) < (startOfMemory()) + if (!((primitive == 0) + || (((((usqInt)(longAt(theFP + FoxMethod)))) < (startOfMemory()) ? ((longAt(theFP + FoxMethod)) & MFMethodFlagIsBlockFlag) != 0 - : (byteAt((theFP + FoxIFrameFlags) + 3)) != 0))) { - theMethod = ((((usqInt)(longAt(theFP + FoxMethod)))) < (startOfMemory()) + : (byteAt((theFP + FoxIFrameFlags) + 3)) != 0)))) { + theMethod1 = ((((usqInt)(longAt(theFP + FoxMethod)))) < (startOfMemory()) ? ((mframeHomeMethod(theFP))->methodObject) : longAt(theFP + FoxMethod)); - if ((primitiveIndexOfMethodheader(theMethod, methodHeaderOf(theMethod))) == primitive) { + if ((primitiveIndexOfMethodheader(theMethod1, methodHeaderOf(theMethod1))) == primitive) { if (theFP == theFPAbove) { theSP = findSPOfon(theFP, stackPageFor(theFP)); } @@ -45995,12 +45972,12 @@ assert(addressCouldBeObj(callerContextOrNil)); assert((callerContextOrNil == (nilObject())) || (isContext(callerContextOrNil))); - senderContext = callerContextOrNil; - if (!(((senderContext & 1) == 0) - && (((((usqInt) (longAt(senderContext))) >> (compactClassFieldLSB())) & 0x1F) == ClassMethodContextCompactIndex))) { + senderContext1 = callerContextOrNil; + if (!(((senderContext1 & 1) == 0) + && (((((usqInt) (longAt(senderContext1))) >> (compactClassFieldLSB())) & 0x1F) == ClassMethodContextCompactIndex))) { return GIV(nilObj); } - return findMethodWithPrimitiveFromContextUpToContext(primitive, senderContext, homeContext); + return findMethodWithPrimitiveFromContextUpToContext(primitive, senderContext1, homeContext); } sqInt @@ -46113,6 +46090,118 @@ } +/* Search for either an unwind-protect (activation of method with primitive + 198) or homeContext along the sender chain, which ever is found first. + Return values: + 0 home context was found on sender chain with no intervening + unwind-protects nilObj home context could not be found => cannotReturn + context the context of an intervening unwind-protect implies home context + was found */ +/* Almost always (98%) the home is on the same page. */ + +static sqInt +findUnwindThroughContext(sqInt homeContext) +{ DECL_MAYBE_SQ_GLOBAL_STRUCT + sqInt callerContextOrNil; + sqInt ctxtOrNilOrZero; + sqInt index; + sqInt onSamePage; + sqInt senderContext; + char *theFP; + char *theFPAbove; + sqInt theMethod; + sqInt theMethod1; + StackPage *thePage; + char *theSP; + + + /* Since nothing changes we don't need to internalize. */ + + onSamePage = ((((longAt((homeContext + BaseHeaderSize) + (SenderIndex << (shiftForWord())))) & 1)) + && (!(isWidowedContext(homeContext)))) + && ((pageIndexFor(GIV(framePointer))) == (pageIndexFor(frameOfMarriedContext(homeContext)))); + /* begin findMethodWithPrimitive:FromFP:UpToContext: */ + theFP = GIV(framePointer); + theFPAbove = GIV(framePointer); + do { + if ((((((usqInt)(longAt(theFP + FoxMethod)))) < (startOfMemory()) + ? ((longAt(theFP + FoxMethod)) & MFMethodFlagHasContextFlag) != 0 + : (byteAt((theFP + FoxIFrameFlags) + 2)) != 0)) + && (homeContext == (longAt(theFP + FoxThisContext)))) { + ctxtOrNilOrZero = 0; + goto l1; + } + if (!((198 == 0) + || (((((usqInt)(longAt(theFP + FoxMethod)))) < (startOfMemory()) + ? ((longAt(theFP + FoxMethod)) & MFMethodFlagIsBlockFlag) != 0 + : (byteAt((theFP + FoxIFrameFlags) + 3)) != 0)))) { + theMethod1 = ((((usqInt)(longAt(theFP + FoxMethod)))) < (startOfMemory()) + ? ((mframeHomeMethod(theFP))->methodObject) + : longAt(theFP + FoxMethod)); + if ((primitiveIndexOfMethodheader(theMethod1, methodHeaderOf(theMethod1))) == 198) { + if (theFP == theFPAbove) { + theSP = findSPOfon(theFP, stackPageFor(theFP)); + } + else { + /* begin frameCallerStackPointer: */ + assert(!(isBaseFrame(theFPAbove))); + theSP = (theFPAbove + (frameStackedReceiverOffsetNumArgs(((((usqInt)(longAt(theFPAbove + FoxMethod)))) < (startOfMemory()) + ? ((mframeCogMethod(theFPAbove))->cmNumArgs) + : byteAt((theFPAbove + FoxIFrameFlags) + 1))))) + BytesPerWord; + } + /* begin ensureFrameIsMarried:SP: */ + if (((((usqInt)(longAt(theFP + FoxMethod)))) < (startOfMemory()) + ? ((longAt(theFP + FoxMethod)) & MFMethodFlagHasContextFlag) != 0 + : (byteAt((theFP + FoxIFrameFlags) + 2)) != 0)) { + assert(isContext(frameContext(theFP))); + ctxtOrNilOrZero = longAt(theFP + FoxThisContext); + goto l1; + } + ctxtOrNilOrZero = marryFrameSP(theFP, theSP); + goto l1; + } + } + theFPAbove = theFP; + /* begin frameCallerFP: */ + theFP = pointerForOop(longAt(theFP + FoxSavedFP)); + } while(theFP != 0); + /* begin frameCallerContext: */ + assert(isBaseFrame(theFPAbove)); + /* begin stackPageFor: */ + /* begin stackPageAt: */ + /* begin pageIndexFor: */ + assert((((((char *) theFPAbove)) >= (GIV(stackBasePlus1) - 1)) && ((((char *) theFPAbove)) <= (((char *) GIV(pages)))))); + index = pageIndexForstackBasePlus1bytesPerPage(theFPAbove, GIV(stackBasePlus1), GIV(bytesPerPage)); + thePage = stackPageAtpages(index, GIV(pages)); + callerContextOrNil = longAt((thePage->baseAddress)); + assert(addressCouldBeObj(callerContextOrNil)); + assert((callerContextOrNil == (nilObject())) + || (isContext(callerContextOrNil))); + senderContext = callerContextOrNil; + if (!(((senderContext & 1) == 0) + && (((((usqInt) (longAt(senderContext))) >> (compactClassFieldLSB())) & 0x1F) == ClassMethodContextCompactIndex))) { + ctxtOrNilOrZero = GIV(nilObj); + goto l1; + } + ctxtOrNilOrZero = findMethodWithPrimitiveFromContextUpToContext(198, senderContext, homeContext); +l1: /* end findMethodWithPrimitive:FromFP:UpToContext: */; + if (onSamePage + || (ctxtOrNilOrZero == 0)) { + theMethod = longAt((homeContext + BaseHeaderSize) + (MethodIndex << (shiftForWord()))); + if ((primitiveIndexOfMethodheader(theMethod, methodHeaderOf(theMethod))) == 198) { + return homeContext; + } + return 0; + } + if (!(ctxtOrNilOrZero == GIV(nilObj))) { + if ((findMethodWithPrimitiveFromContextUpToContext(0, ctxtOrNilOrZero, homeContext)) == GIV(nilObj)) { + return GIV(nilObj); + } + } + return ctxtOrNilOrZero; +} + + /* Like #stackFloatValue: but access method arguments left-to-right */ double @@ -46870,11 +46959,27 @@ } -/* See if the argument is married to a live frame or not. - If it is not, turn it into a bereaved single context. */ +/* See if the argument is married to a live frame or not. i.e. see if there + is a matching + frame whose frameContext field is aOnceMarriedContext, or a forwarder to + it. If aOnceMarriedContext is not married to a live frame, turn it into a + bereaved single context. + This version is for use during scavenging when stack references may be + forwarded. Following what appear to be references to forwarded objects on + the stack is dangerous; + an instruction ponter may be correctly aligned and may point to bytes that + just happen + to look like a forwarder. So it is only safe to follow fields that we know + are frameContext + fields; hence the stack page is walked to check that aOnceMarriedContext + is pointing to + a live frame. This only has to happen during scavenging because after a + become: all + frameContext fields have been followed and so there is no need to follow + forwarders. */ static sqInt -isWidowedContext(sqInt aOnceMarriedContext) +isWidowedContextDuringGC(sqInt aOnceMarriedContext) { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt anInteger; sqInt index; @@ -46934,6 +47039,69 @@ } +/* See if the argument is married to a live frame or not. + If it is not, turn it into a bereaved single context. This version is safe + for use + only when no frameContext fields may be forwarded (as maybe the case + when scavenging). Post become: all frameContext fields are followed, and + hence nrmally no following of frameCOtext fields is necessary. But during + a scavenge one must use isWidowedContextDuringGC:. */ + +static sqInt +isWidowedContext(sqInt aOnceMarriedContext) +{ DECL_MAYBE_SQ_GLOBAL_STRUCT + sqInt anInteger; + sqInt index; + sqInt senderOop; + char *shouldBeFrameCallerField; + char *theFrame; + StackPage *thePage; + + assert((isContext(aOnceMarriedContext)) + && (isMarriedOrWidowedContext(aOnceMarriedContext))); + /* begin frameOfMarriedContext: */ + senderOop = longAt((aOnceMarriedContext + BaseHeaderSize) + (SenderIndex << (shiftForWord()))); + /* begin withoutSmallIntegerTags: */ + assert((senderOop & 1)); + theFrame = pointerForOop(senderOop - 1); + /* begin stackPageFor: */ + /* begin stackPageAt: */ + /* begin pageIndexFor: */ + assert((((((char *) theFrame)) >= (GIV(stackBasePlus1) - 1)) && ((((char *) theFrame)) <= (((char *) GIV(pages)))))); + index = pageIndexForstackBasePlus1bytesPerPage(theFrame, GIV(stackBasePlus1), GIV(bytesPerPage)); + thePage = stackPageAtpages(index, GIV(pages)); + if (!((isFree(thePage)) + || (theFrame < ((thePage->headFP))))) { + + /* The frame pointer is within the bounds of a live page. + Now check if it matches a frame. */ + + /* begin withoutSmallIntegerTags: */ + anInteger = longAt((aOnceMarriedContext + BaseHeaderSize) + (InstructionPointerIndex << (shiftForWord()))); + assert((anInteger & 1)); + shouldBeFrameCallerField = pointerForOop(anInteger - 1); + if (((frameCallerFP(theFrame)) == shouldBeFrameCallerField) + && (((((usqInt)(longAt(theFrame + FoxMethod)))) < (startOfMemory()) + ? ((longAt(theFrame + FoxMethod)) & MFMethodFlagHasContextFlag) != 0 + : (byteAt((theFrame + FoxIFrameFlags) + 2)) != 0))) { + assert(!(((isFrameonPage(theFrame, thePage)) + && (isForwarded(frameContext(theFrame)))))); + if ((longAt(theFrame + FoxThisContext)) == aOnceMarriedContext) { + + /* It is still married! */ + + return 0; + } + } + } + /* begin markContextAsDead: */ + assert(isContext(aOnceMarriedContext)); + longAtput((aOnceMarriedContext + BaseHeaderSize) + (SenderIndex << (shiftForWord())), GIV(nilObj)); + longAtput((aOnceMarriedContext + BaseHeaderSize) + (InstructionPointerIndex << (shiftForWord())), GIV(nilObj)); + return 1; +} + + /* Wrining any inst vars of a context must take account of potentially married contexts and set the state in the frame. Inst vars in subclasses don't need @@ -51525,7 +51693,7 @@ StackPage *thePage; if ((((longAt((aContext + BaseHeaderSize) + (SenderIndex << (shiftForWord())))) & 1)) - && (!(isWidowedContext(aContext)))) { + && (!(isWidowedContextDuringGC(aContext)))) { /* begin stackPageFor: */ /* begin frameOfMarriedContext: */ senderOop = longAt((aContext + BaseHeaderSize) + (SenderIndex << (shiftForWord()))); @@ -54892,12 +55060,21 @@ primitiveFindNextUnwindContext(void) { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt calleeContext; + sqInt callerContextOrNil; sqInt handlerOrNilOrZero; + sqInt index; + sqInt senderContext; sqInt senderOop; char *sp; sqInt startContext; + char *startFP; sqInt stopContext; char *theFP; + char *theFP1; + char *theFPAbove; + sqInt theMethod; + StackPage *thePage; + char *theSP; stopContext = longAt(GIV(stackPointer)); calleeContext = longAt(GIV(stackPointer) + (1 * BytesPerWord)); @@ -54933,7 +55110,73 @@ handlerOrNilOrZero = findMethodWithPrimitiveFromContextUpToContext(198, frameCallerContext(theFP), stopContext); } else { - handlerOrNilOrZero = findMethodWithPrimitiveFromFPUpToContext(198, frameCallerFP(theFP), stopContext); + /* begin findMethodWithPrimitive:FromFP:UpToContext: */ + /* begin frameCallerFP: */ + startFP = pointerForOop(longAt(theFP + FoxSavedFP)); + theFP1 = startFP; + theFPAbove = startFP; + do { + if ((((((usqInt)(longAt(theFP1 + FoxMethod)))) < (startOfMemory()) + ? ((longAt(theFP1 + FoxMethod)) & MFMethodFlagHasContextFlag) != 0 + : (byteAt((theFP1 + FoxIFrameFlags) + 2)) != 0)) + && (stopContext == (longAt(theFP1 + FoxThisContext)))) { + handlerOrNilOrZero = 0; + goto l1; + } + if (!((198 == 0) + || (((((usqInt)(longAt(theFP1 + FoxMethod)))) < (startOfMemory()) + ? ((longAt(theFP1 + FoxMethod)) & MFMethodFlagIsBlockFlag) != 0 + : (byteAt((theFP1 + FoxIFrameFlags) + 3)) != 0)))) { + theMethod = ((((usqInt)(longAt(theFP1 + FoxMethod)))) < (startOfMemory()) + ? ((mframeHomeMethod(theFP1))->methodObject) + : longAt(theFP1 + FoxMethod)); + if ((primitiveIndexOfMethodheader(theMethod, methodHeaderOf(theMethod))) == 198) { + if (theFP1 == theFPAbove) { + theSP = findSPOfon(theFP1, stackPageFor(theFP1)); + } + else { + /* begin frameCallerStackPointer: */ + assert(!(isBaseFrame(theFPAbove))); + theSP = (theFPAbove + (frameStackedReceiverOffsetNumArgs(((((usqInt)(longAt(theFPAbove + FoxMethod)))) < (startOfMemory()) + ? ((mframeCogMethod(theFPAbove))->cmNumArgs) + : byteAt((theFPAbove + FoxIFrameFlags) + 1))))) + BytesPerWord; @@ Diff output truncated at 50000 characters. @@

1 0

[commit][3201] Correct the volatile decls.
by commits＠squeakvm.org 31 Dec '14

31 Dec '14

Revision: 3201 Author: eliot Date: 2014-12-31 14:28:20 -0800 (Wed, 31 Dec 2014) Log Message: ----------- Correct the volatile decls. C makes the rules, not me. Modified Paths: -------------- trunk/platforms/Cross/plugins/IA32ABI/ppc32abicc.c Property Changed: ---------------- trunk/platforms/Cross/plugins/sqPluginsSCCSVersion.h Modified: trunk/platforms/Cross/plugins/IA32ABI/ppc32abicc.c =================================================================== --- trunk/platforms/Cross/plugins/IA32ABI/ppc32abicc.c 2014-12-30 23:44:16 UTC (rev 3200) +++ trunk/platforms/Cross/plugins/IA32ABI/ppc32abicc.c 2014-12-31 22:28:20 UTC (rev 3201) @@ -132,7 +132,7 @@ long gpRegCount = 0; long fpRegCount = 0; volatile long long longReturnValue; -volatile char *longReturnValueLocation = (char*) &longReturnValue; +char *volatile longReturnValueLocation = (char*) &longReturnValue; volatile double floatReturnValue; volatile double *floatReturnValueLocation = &floatReturnValue; @@ -208,7 +208,7 @@ thunkEntry(void *thunkp, long *stackp) { jmp_buf trampoline; - volatile CallBackReturnSpec *rs; + CallBackReturnSpec * volatile rs; if (sizeof(int) != sizeof(rs)) { perror("setjmp cannot return a pointer; reimplement!\n"); Property changes on: trunk/platforms/Cross/plugins/sqPluginsSCCSVersion.h ___________________________________________________________________ Modified: checkindate - Fri Dec 12 17:06:09 PST 2014 + Wed Dec 31 14:28:47 PST 2014

1 0

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

31 Dec '14

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.1004.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.1004 Author: eem Time: 31 December 2014, 2:21:00.125 pm UUID: 132642b3-ab26-4957-82a4-8aa19b60f188 Ancestors: VMMaker.oscog-cb.1003 Revisit the bug fix for followed contexts during scavenging in VMMaker.oscog-eem.913 of 24 October 2014. Split isWidowedContext: into a more careful version, isWidowedContextDuringGC: for use only during scavenging. Speed up non-local return processing by using the fact that 98% of the time returns are within the same page. The search for the home context following finding an unwind is unnecessary iff the home is married and on the same page. Refactor commonReturn to eiminate CoInterpreter's version, moving the divergence into maybeReturnToMachineCodeFrame. Makew sure the search for the home through the block's closure uses followField:ofObject:. Fix a slip in genBinaryInlineComparison:opFalse:destReg:. Nuke erroneous instance-side versions of initializeFrameIndices (editing blunders). Typos. =============== Diff against VMMaker.oscog-cb.1003 =============== Item was changed: ----- Method: CoInterpreter>>ceNonLocalReturn: (in category 'trampolines') ----- ceNonLocalReturn: returnValue <api> | closure home unwindContextOrNilOrZero ourContext frameToReturnTo contextToReturnTo theFP callerFP newPage | <var: #frameToReturnTo type: #'char *'> <var: #theFP type: #'char *'> <var: #callerFP type: #'char *'> <var: #newPage type: #'StackPage *'> <var: #thePage type: #'StackPage *'> "self shortPrintFrameAndCallers: framePointer. self printOop: returnValue. self halt." self assert: (self isMachineCodeFrame: framePointer). self assert: (self frameIsBlockActivation: framePointer). "Since this is a block activation the closure is on the stack above any args and the frame." closure := self pushedReceiverOrClosureOfFrame: framePointer. home := nil. "Walk the closure's lexical chain to find the context or frame to return from (home)." [closure ~= objectMemory nilObject] whileTrue: + [home := objectMemory followField: ClosureOuterContextIndex ofObject: closure. + closure := objectMemory followField: ClosureIndex ofObject: home]. - [home := objectMemory fetchPointer: ClosureOuterContextIndex ofObject: closure. - closure := objectMemory fetchPointer: ClosureIndex ofObject: home]. "home is to be returned from provided there is no unwind-protect activation between this frame and home's sender. Search for an unwind. findUnwindThroughContext: will answer either the context for an unwind-protect activation or nilObj if the sender cannot be found or 0 if no unwind is found but the sender is. We must update the current page's headFrame pointers to enable the search to identify widowed contexts correctly." self externalWriteBackHeadFramePointers. unwindContextOrNilOrZero := self findUnwindThroughContext: home. unwindContextOrNilOrZero = objectMemory nilObject ifTrue: ["error: can't find home on chain; cannot return" ourContext := self ensureFrameIsMarried: framePointer SP: stackPointer. ^self externalCannotReturn: returnValue from: ourContext]. unwindContextOrNilOrZero ~= 0 ifTrue: [^self externalAboutToReturn: returnValue through: unwindContextOrNilOrZero]. "Now we know home is on the sender chain. We could be returning to either a context or a frame. Find out which." contextToReturnTo := nil. (self isMarriedOrWidowedContext: home) ifTrue: [self assert: (self checkIsStillMarriedContext: home currentFP: framePointer). theFP := self frameOfMarriedContext: home. (self isBaseFrame: theFP) ifTrue: [contextToReturnTo := self frameCallerContext: theFP] ifFalse: [frameToReturnTo := self frameCallerFP: theFP]] ifFalse: [contextToReturnTo := objectMemory fetchPointer: SenderIndex ofObject: home. ((objectMemory isContext: contextToReturnTo) and: [self isMarriedOrWidowedContext: contextToReturnTo]) ifTrue: [self assert: (self checkIsStillMarriedContext: contextToReturnTo currentFP: framePointer). frameToReturnTo := self frameOfMarriedContext: contextToReturnTo. contextToReturnTo := nil]]. "If returning to a context we must make a frame for it unless it is dead." contextToReturnTo ~= nil ifTrue: [frameToReturnTo := self establishFrameForContextToReturnTo: contextToReturnTo. frameToReturnTo == 0 ifTrue: ["error: home's sender is dead; cannot return" ourContext := self ensureFrameIsMarried: framePointer SP: stackPointer. ^self externalCannotReturn: returnValue from: ourContext]]. "Now we have a frame to return to. If it is on a different page we must free intervening pages and nil out intervening contexts. We must free intervening stack pages because if we leave the pages to be divorced then their contexts will be divorced with intact senders and instruction pointers. This code is similar to primitiveTerminateTo." self assert: stackPages pageListIsWellFormed. newPage := stackPages stackPageFor: frameToReturnTo. newPage ~~ stackPage ifTrue: [| currentCtx thePage nextCntx | currentCtx := self frameCallerContext: stackPage baseFP. self assert: (objectMemory isContext: currentCtx). stackPages freeStackPage: stackPage. [self assert: (objectMemory isContext: currentCtx). (self isMarriedOrWidowedContext: currentCtx) and: [(stackPages stackPageFor: (theFP := self frameOfMarriedContext: currentCtx)) = newPage]] whileFalse: [(self isMarriedOrWidowedContext: currentCtx) ifTrue: [thePage := stackPages stackPageFor: theFP. currentCtx := self frameCallerContext: thePage baseFP. stackPages freeStackPage: thePage] ifFalse: [nextCntx := objectMemory fetchPointer: SenderIndex ofObject: currentCtx. self markContextAsDead: currentCtx. currentCtx := nextCntx]]. self setStackPageAndLimit: newPage. stackPointer := stackPage headSP. framePointer := stackPage headFP]. "Two cases. Returning to the top frame or an interior frame. The top frame has its instruction pointer on top of stack. An interior frame has its instruction pointer in the caller frame. We need to peel back any frames on the page until we get to the correct frame." self flag: 'currently caller pushes result'. "(in machine code)" framePointer = frameToReturnTo ifTrue: [instructionPointer := self popStack] ifFalse: [[callerFP := framePointer. framePointer := self frameCallerFP: framePointer. framePointer ~~ frameToReturnTo] whileTrue. instructionPointer := (self frameCallerSavedIP: callerFP) asUnsignedInteger. stackPointer := (self frameCallerSP: callerFP)]. ^self return: returnValue toExecutive: false! Item was removed: - ----- Method: CoInterpreter>>commonReturn (in category 'return bytecodes') ----- - commonReturn - "Do an ^-return (return form method), perhaps checking for unwinds if this is a block activation. - Note: Assumed to be inlined into the dispatch loop." - - <sharedCodeNamed: 'commonReturn' inCase: #returnReceiver> - | closure home unwindContextOrNilOrZero frameToReturnTo contextToReturnTo theFP callerFP newPage | - <var: #frameToReturnTo type: #'char *'> - <var: #theFP type: #'char *'> - <var: #callerFP type: #'char *'> - <var: #newPage type: #'StackPage *'> - <var: #thePage type: #'StackPage *'> - - "If this is a method simply return to the sender/caller." - (self frameIsBlockActivation: localFP) ifFalse: - [^self commonCallerReturn]. - - "Since this is a block activation the closure is on the stack above any args and the frame." - closure := self pushedReceiverOrClosureOfFrame: localFP. - - home := nil. - "Walk the closure's lexical chain to find the context or frame to return from (home)." - [closure ~= objectMemory nilObject] whileTrue: - [home := objectMemory fetchPointer: ClosureOuterContextIndex ofObject: closure. - closure := objectMemory fetchPointer: ClosureIndex ofObject: home]. - "home is to be returned from provided there is no unwind-protect activation between - this frame and home's sender. Search for an unwind. findUnwindThroughContext: - will answer either the context for an unwind-protect activation or nilObj if the sender - cannot be found or 0 if no unwind is found but the sender is. We must update the - current page's headFrame pointers to enable the search to identify widowed contexts - correctly." - self writeBackHeadFramePointers. - unwindContextOrNilOrZero := self internalFindUnwindThroughContext: home. - unwindContextOrNilOrZero = objectMemory nilObject ifTrue: - ["error: can't find home on chain; cannot return" - ^self internalCannotReturn: localReturnValue]. - unwindContextOrNilOrZero ~= 0 ifTrue: - [^self internalAboutToReturn: localReturnValue through: unwindContextOrNilOrZero]. - - "Now we know home is on the sender chain. - We could be returning to either a context or a frame. Find out which." - contextToReturnTo := nil. - (self isMarriedOrWidowedContext: home) - ifTrue: - [self assert: (self checkIsStillMarriedContext: home currentFP: localFP). - theFP := self frameOfMarriedContext: home. - (self isBaseFrame: theFP) - ifTrue: - [contextToReturnTo := self frameCallerContext: theFP] - ifFalse: - [frameToReturnTo := self frameCallerFP: theFP]] - ifFalse: - [contextToReturnTo := objectMemory fetchPointer: SenderIndex ofObject: home. - ((objectMemory isContext: contextToReturnTo) - and: [self isMarriedOrWidowedContext: contextToReturnTo]) ifTrue: - [self assert: (self checkIsStillMarriedContext: contextToReturnTo currentFP: localFP). - frameToReturnTo := self frameOfMarriedContext: contextToReturnTo. - contextToReturnTo := nil]]. - - "If returning to a context we must make a frame for it unless it is dead." - contextToReturnTo ~= nil ifTrue: - [frameToReturnTo := self establishFrameForContextToReturnTo: contextToReturnTo. - frameToReturnTo == 0 ifTrue: - ["error: home's sender is dead; cannot return" - ^self internalCannotReturn: localReturnValue]]. - - "Now we have a frame to return to. If it is on a different page we must free intervening pages and - nil out intervening contexts. We must free intervening stack pages because if we leave the pages - to be divorced then their contexts will be divorced with intact senders and instruction pointers. This - code is similar to primitiveTerminateTo. We must move any frames on itervening pages above the - frame linked to because these may be in use, e.g. via co-routining (see baseFrameReturn)." - self assert: stackPages pageListIsWellFormed. - newPage := stackPages stackPageFor: frameToReturnTo. - newPage ~~ stackPage ifTrue: - [| currentCtx thePage nextCntx | - currentCtx := self frameCallerContext: stackPage baseFP. - self assert: (objectMemory isContext: currentCtx). - stackPages freeStackPage: stackPage. - [(self isMarriedOrWidowedContext: currentCtx) - and: [(stackPages stackPageFor: (theFP := self frameOfMarriedContext: currentCtx)) = newPage]] whileFalse: - [(self isMarriedOrWidowedContext: currentCtx) - ifTrue: - [thePage := stackPages stackPageFor: theFP. - theFP ~= thePage headFP ifTrue: - ["Since we've just deallocated a page we know that newStackPage won't deallocate an existing one." - self moveFramesIn: thePage through: (self findFrameAbove: theFP inPage: thePage) toPage: self newStackPage]. - currentCtx := self frameCallerContext: thePage baseFP. - stackPages freeStackPage: thePage] - ifFalse: - [nextCntx := objectMemory fetchPointer: SenderIndex ofObject: currentCtx. - self markContextAsDead: currentCtx. - currentCtx := nextCntx]]. - self setStackPageAndLimit: newPage. - localSP := stackPage headSP. - localFP := stackPage headFP]. - - "Two cases. Returning to the top frame on a new page or an interior frame on the current page. - The top frame has its instruction pointer on top of stack. An interior frame has its instruction pointer - in the caller frame. We need to peel back any frames on the page until we get to the correct frame." - - localFP = frameToReturnTo - ifTrue: - [localIP := self pointerForOop: self internalStackTop] - ifFalse: - [[callerFP := localFP. - localFP := self frameCallerFP: localFP. - localFP ~~ frameToReturnTo] whileTrue. - localIP := self frameCallerSavedIP: callerFP. - localSP := (self frameCallerSP: callerFP) - objectMemory wordSize]. - localIP asUnsignedInteger < objectMemory startOfMemory ifTrue: - [localIP asUnsignedInteger ~= cogit ceReturnToInterpreterPC ifTrue: - ["localIP in the cog method zone indicates a return to machine code." - ^self returnToMachineCodeFrame]. - localIP := self pointerForOop: (self iframeSavedIP: localFP)]. - "pop the saved IP, push the return value and continue." - self internalStackTopPut: localReturnValue. - self setMethod: (self iframeMethod: localFP). - ^self fetchNextBytecode! Item was removed: - ----- Method: CoInterpreter>>initializeFrameIndices (in category 'as yet unclassified') ----- - initializeFrameIndices - "Format of a stack frame. Word-sized indices relative to the frame pointer. - Terminology - Frames are either single (have no context) or married (have a context). - Contexts are either single (exist on the heap), married (have a context) or widowed (had a frame that has exited). - Stacks grow down: - - receiver for method activations/closure for block activations - arg0 - ... - argN - caller's saved ip/this stackPage (for a base frame) - fp-> saved fp - method - context (initialized to nil) - frame flags (interpreter only) - saved method ip (initialized to 0; interpreter only) - receiver - first temp - ... - sp-> Nth temp - - In an interpreter frame - frame flags holds - the backward jump count (see ifBackwardsCheckForEvents) - the number of arguments (since argument temporaries are above the frame) - the flag for a block activation - and the flag indicating if the context field is valid (whether the frame is married). - saved method ip holds the saved method ip when the callee frame is a machine code frame. - This is because the saved method ip is actually the ceReturnToInterpreterTrampoline address. - In a machine code frame - the flag indicating if the context is valid is the least significant bit of the method pointer - the flag for a block activation is the next most significant bit of the method pointer - - Interpreter frames are distinguished from method frames by the method field which will - be a pointer into the heap for an interpreter frame and a pointer into the method zone for - a machine code frame. - - The first frame in a stack page is the baseFrame and is marked as such by a saved fp being its stackPage, - in which case the first word on the stack is the caller context (possibly hybrid) beneath the base frame." - - | fxCallerSavedIP fxSavedFP fxMethod fxIFrameFlags fxThisContext fxIFReceiver fxMFReceiver fxIFSavedIP | - fxCallerSavedIP := 1. - fxSavedFP := 0. - fxMethod := -1. - fxThisContext := -2. - fxIFrameFlags := -3. "Can find numArgs, needed for fast temp access. args are above fxCallerSavedIP. - Can find ``is block'' bit - Can find ``has context'' bit" - fxIFSavedIP := -4. - fxIFReceiver := -5. - fxMFReceiver := -3. - - "For debugging nil out values that differ in the StackInterpreter." - FrameSlots := #undeclared. - IFrameSlots := fxCallerSavedIP - fxIFReceiver + 1. - MFrameSlots := fxCallerSavedIP - fxMFReceiver + 1. - - FoxCallerSavedIP := fxCallerSavedIP * objectMemory wordSize. - "In Cog a base frame's caller context is stored on the first word of the stack page." - FoxCallerContext := #undeclared. - FoxSavedFP := fxSavedFP * objectMemory wordSize. - FoxMethod := fxMethod * objectMemory wordSize. - FoxThisContext := fxThisContext * objectMemory wordSize. - FoxFrameFlags := #undeclared. - FoxIFrameFlags := fxIFrameFlags * objectMemory wordSize. - FoxIFSavedIP := fxIFSavedIP * objectMemory wordSize. - FoxReceiver := #undeclared. - FoxIFReceiver := fxIFReceiver * objectMemory wordSize. - FoxMFReceiver := fxMFReceiver * objectMemory wordSize. - - "N.B. There is room for one more flag given the current 8 byte alignment of methods (which - is at least needed to distinguish the checked and uncecked entry points by their alignment." - MFMethodFlagHasContextFlag := 1. - MFMethodFlagIsBlockFlag := 2. - MFMethodFlagFrameIsMarkedFlag := 4. "for pathTo:using:followWeak:" - MFMethodFlagsMask := MFMethodFlagHasContextFlag + MFMethodFlagIsBlockFlag + MFMethodFlagFrameIsMarkedFlag. - MFMethodMask := (MFMethodFlagsMask + 1) negated! Item was added: + ----- Method: CoInterpreter>>maybeReturnToMachineCodeFrame (in category 'return bytecodes') ----- + maybeReturnToMachineCodeFrame + "If the frame we're returning to is a machine code one, then return to it. + Otherwise, if it's an interpreter frame, load the saved ip." + <inline: true> + localIP asUnsignedInteger < objectMemory startOfMemory ifTrue: + [localIP asUnsignedInteger ~= cogit ceReturnToInterpreterPC ifTrue: + ["localIP in the cog method zone indicates a return to machine code." + ^self returnToMachineCodeFrame]. + localIP := self pointerForOop: (self iframeSavedIP: localFP)]! Item was changed: ----- Method: CogObjectRepresentationFor32BitSpur>>genGetNumBytesOf:into: (in category 'compile abstract instructions') ----- genGetNumBytesOf: srcReg into: destReg "Get the size in byte-sized slots of the object in srcReg into destReg. srcReg may equal destReg. destReg <- numSlots << self shiftForWord - (fmt bitAnd: 3). Assumes the object in srcReg has a byte format, i.e. 16 to 23 or 24 to 31 " <var: #jmp type: #'AbstractInstruction'> | jmp | self genGetRawSlotSizeOfNonImm: srcReg into: TempReg. cogit CmpCq: objectMemory numSlotsMask R: TempReg. jmp := cogit JumpLess: 0. cogit MoveMw: objectMemory wordSize negated r: srcReg R: destReg. jmp jmpTarget: (cogit LogicalShiftLeftCq: objectMemory shiftForWord R: destReg). + "Now: destReg = numSlots << shiftForWord" - "Now: TempReg = numSlots << shiftForWord" cogit MoveMw: 0 r: srcReg R: TempReg. cogit LogicalShiftRightCq: objectMemory formatShift R: TempReg. cogit AndCq: objectMemory wordSize - 1 R: TempReg. "Now: fmt bitAnd: 3 in TempReg" cogit SubR: TempReg R: destReg. ^0! Item was changed: ----- Method: StackInterpreter>>commonReturn (in category 'return bytecodes') ----- commonReturn + "Do an ^-return (return from method), checking for unwinds if this is a block activation. - "Do an ^-return (return form method), perhaps checking for unwinds if this is a block activation. Note: Assumed to be inlined into the dispatch loop." <sharedCodeInCase: #returnReceiver> | closure home unwindContextOrNilOrZero frameToReturnTo contextToReturnTo theFP callerFP newPage | <var: #frameToReturnTo type: #'char *'> <var: #theFP type: #'char *'> <var: #callerFP type: #'char *'> <var: #newPage type: #'StackPage *'> <var: #thePage type: #'StackPage *'> "If this is a method simply return to the sender/caller." (self frameIsBlockActivation: localFP) ifFalse: [^self commonCallerReturn]. "Since this is a block activation the closure is on the stack above any args and the frame." closure := self pushedReceiverOrClosureOfFrame: localFP. home := nil. "Walk the closure's lexical chain to find the context or frame to return from (home)." [closure ~= objectMemory nilObject] whileTrue: + [home := objectMemory followField: ClosureOuterContextIndex ofObject: closure. + closure := objectMemory followField: ClosureIndex ofObject: home]. - [home := objectMemory fetchPointer: ClosureOuterContextIndex ofObject: closure. - closure := objectMemory fetchPointer: ClosureIndex ofObject: home]. "home is to be returned from provided there is no unwind-protect activation between this frame and home's sender. Search for an unwind. findUnwindThroughContext: will answer either the context for an unwind-protect activation or nilObj if the sender cannot be found or 0 if no unwind is found but the sender is. We must update the current page's headFrame pointers to enable the search to identify widowed contexts correctly." self writeBackHeadFramePointers. + self externalizeIPandSP. + unwindContextOrNilOrZero := self findUnwindThroughContext: home. - unwindContextOrNilOrZero := self internalFindUnwindThroughContext: home. unwindContextOrNilOrZero = objectMemory nilObject ifTrue: ["error: can't find home on chain; cannot return" ^self internalCannotReturn: localReturnValue]. unwindContextOrNilOrZero ~= 0 ifTrue: [^self internalAboutToReturn: localReturnValue through: unwindContextOrNilOrZero]. "Now we know home is on the sender chain. We could be returning to either a context or a frame. Find out which." contextToReturnTo := nil. (self isMarriedOrWidowedContext: home) ifTrue: [self assert: (self checkIsStillMarriedContext: home currentFP: localFP). theFP := self frameOfMarriedContext: home. (self isBaseFrame: theFP) ifTrue: [contextToReturnTo := self frameCallerContext: theFP] ifFalse: [frameToReturnTo := self frameCallerFP: theFP]] ifFalse: [contextToReturnTo := objectMemory fetchPointer: SenderIndex ofObject: home. ((objectMemory isContext: contextToReturnTo) and: [self isMarriedOrWidowedContext: contextToReturnTo]) ifTrue: [self assert: (self checkIsStillMarriedContext: contextToReturnTo currentFP: localFP). frameToReturnTo := self frameOfMarriedContext: contextToReturnTo. contextToReturnTo := nil]]. "If returning to a context we must make a frame for it unless it is dead." contextToReturnTo ~= nil ifTrue: [frameToReturnTo := self establishFrameForContextToReturnTo: contextToReturnTo. frameToReturnTo == 0 ifTrue: ["error: home's sender is dead; cannot return" ^self internalCannotReturn: localReturnValue]]. "Now we have a frame to return to. If it is on a different page we must free intervening pages and nil out intervening contexts. We must free intervening stack pages because if we leave the pages to be divorced then their contexts will be divorced with intact senders and instruction pointers. This code is similar to primitiveTerminateTo. We must move any frames on itervening pages above the frame linked to because these may be in use, e.g. via co-routining (see baseFrameReturn)." self assert: stackPages pageListIsWellFormed. newPage := stackPages stackPageFor: frameToReturnTo. newPage ~~ stackPage ifTrue: [| currentCtx thePage nextCntx | currentCtx := self frameCallerContext: stackPage baseFP. - self assert: (objectMemory isContext: currentCtx). stackPages freeStackPage: stackPage. [self assert: (objectMemory isContext: currentCtx). (self isMarriedOrWidowedContext: currentCtx) and: [(stackPages stackPageFor: (theFP := self frameOfMarriedContext: currentCtx)) = newPage]] whileFalse: [(self isMarriedOrWidowedContext: currentCtx) ifTrue: [thePage := stackPages stackPageFor: theFP. theFP ~= thePage headFP ifTrue: ["Since we've just deallocated a page we know that newStackPage won't deallocate an existing one." self moveFramesIn: thePage through: (self findFrameAbove: theFP inPage: thePage) toPage: self newStackPage]. currentCtx := self frameCallerContext: thePage baseFP. stackPages freeStackPage: thePage] ifFalse: [nextCntx := objectMemory fetchPointer: SenderIndex ofObject: currentCtx. self markContextAsDead: currentCtx. currentCtx := nextCntx]]. self setStackPageAndLimit: newPage. localSP := stackPage headSP. localFP := stackPage headFP]. "Two cases. Returning to the top frame on a new page or an interior frame on the current page. The top frame has its instruction pointer on top of stack. An interior frame has its instruction pointer in the caller frame. We need to peel back any frames on the page until we get to the correct frame." localFP = frameToReturnTo ifTrue: "pop the saved IP, push the return value and continue." [localIP := self pointerForOop: self internalStackTop] ifFalse: [[callerFP := localFP. localFP := self frameCallerFP: localFP. localFP ~~ frameToReturnTo] whileTrue. localIP := self frameCallerSavedIP: callerFP. localSP := (self frameCallerSP: callerFP) - objectMemory wordSize]. + self maybeReturnToMachineCodeFrame. self setMethod: (self frameMethod: localFP). self fetchNextBytecode. self internalStackTopPut: localReturnValue! Item was changed: ----- Method: StackInterpreter>>findMethodWithPrimitive:FromContext:UpToContext: (in category 'handler search') ----- findMethodWithPrimitive: primitive FromContext: senderContext UpToContext: homeContext "See findUnwindThroughContext:. Alas this is mutually recursive with findMethodWithPrimitive:FromFP:SP:ThroughContext: instead of iterative. We're doing the simplest thing that could possibly work. Niceties can wait." + <inline: false> | theContext theMethod | self assert: (senderContext = objectMemory nilObject or: [objectMemory isContext: senderContext]). self assert: (homeContext = objectMemory nilObject or: [objectMemory isContext: homeContext]). theContext := senderContext. [theContext = objectMemory nilObject ifTrue: [^theContext]. self isMarriedOrWidowedContext: theContext] whileFalse: [theContext = homeContext ifTrue: [^0]. (primitive = 0 or: [(objectMemory fetchPointer: ClosureIndex ofObject: theContext) ~= objectMemory nilObject]) ifFalse: [theMethod := objectMemory fetchPointer: MethodIndex ofObject: theContext. (self primitiveIndexOf: theMethod) = primitive ifTrue: [^theContext]]. theContext := objectMemory fetchPointer: SenderIndex ofObject: theContext]. (self isWidowedContext: theContext) ifTrue: [^objectMemory nilObject]. ^self findMethodWithPrimitive: primitive FromFP: (self frameOfMarriedContext: theContext) UpToContext: homeContext! Item was changed: ----- Method: StackInterpreter>>findMethodWithPrimitive:FromFP:UpToContext: (in category 'handler search') ----- findMethodWithPrimitive: primitive FromFP: startFP UpToContext: homeContext "See findUnwindThroughContext:. Alas this is mutually recursive with findMethodWithPrimitive:FromContext:ThroughContext: instead of iterative. We're doing the simplest thing that could possibly work. Niceties can wait." + <inline: true> | theFP theFPAbove theSP theMethod senderContext | <var: #startFP type: #'char *'> <var: #theFP type: #'char *'> <var: #theFPAbove type: #'char *'> <var: #theSP type: #'char *'> theFP := startFP. theFPAbove := startFP. [((self frameHasContext: theFP) and: [homeContext = (self frameContext: theFP)]) ifTrue: [^0]. (primitive = 0 or: [self frameIsBlockActivation: theFP]) ifFalse: [theMethod := self frameMethodObject: theFP. (self primitiveIndexOf: theMethod) = primitive ifTrue: [theFP = theFPAbove ifTrue: [theSP := self findSPOf: theFP on: (stackPages stackPageFor: theFP)] ifFalse: [theSP := self frameCallerStackPointer: theFPAbove]. ^self ensureFrameIsMarried: theFP SP: theSP]]. theFPAbove := theFP. theFP := self frameCallerFP: theFP. theFP ~= 0] whileTrue. senderContext := self frameCallerContext: theFPAbove. (objectMemory isContext: senderContext) ifFalse: [^objectMemory nilObject]. ^self findMethodWithPrimitive: primitive FromContext: senderContext UpToContext: homeContext! Item was changed: ----- Method: StackInterpreter>>findUnwindThroughContext: (in category 'return bytecodes') ----- findUnwindThroughContext: homeContext "Search for either an unwind-protect (activation of method with primitive 198) or homeContext along the sender chain, which ever is found first. Return values: 0 home context was found on sender chain with no intervening unwind-protects nilObj home context could not be found => cannotReturn context the context of an intervening unwind-protect implies home context was found" + | onSamePage ctxtOrNilOrZero theMethod | + "Almost always (98%) the home is on the same page." + onSamePage := (self isStillMarriedContext: homeContext) + and: [(stackPages pageIndexFor: framePointer) = (stackPages pageIndexFor: (self frameOfMarriedContext: homeContext))]. - | ctxtOrNilOrZero theMethod | "Since nothing changes we don't need to internalize." ctxtOrNilOrZero := self findMethodWithPrimitive: 198 FromFP: framePointer UpToContext: homeContext. + (onSamePage or: [ctxtOrNilOrZero = 0]) ifTrue: - ctxtOrNilOrZero = 0 ifTrue: [theMethod := objectMemory fetchPointer: MethodIndex ofObject: homeContext. (self primitiveIndexOf: theMethod) = 198 ifTrue: [^homeContext]. ^0]. + "Found an unwind. Can the home context be found also?" ctxtOrNilOrZero = objectMemory nilObject ifFalse: [(self findMethodWithPrimitive: 0 FromContext: ctxtOrNilOrZero UpToContext: homeContext) = objectMemory nilObject ifTrue: [^objectMemory nilObject]]. ^ctxtOrNilOrZero! Item was removed: - ----- Method: StackInterpreter>>initializeFrameIndices (in category 'as yet unclassified') ----- - initializeFrameIndices - "Format of a stack frame. Word-sized indices relative to the frame pointer. - Terminology - Frames are either single (have no context) or married (have a context). - Contexts are either single (exist on the heap), married (have a context) or widowed (had a frame that has exited). - Stacks grow down: - - receiver for method activations/closure for block activations - arg0 - ... - argN - caller's method ip/base frame's sender context - fp-> saved fp - method - frame flags - context (uninitialized) - receiver - first temp - ... - sp-> Nth temp - - frame flags holds the number of arguments (since argument temporaries are above the frame) - the flag for a block activation - and the flag indicating if the context field is valid (whether the frame is married). - - The first frame in a stack page is the baseFrame and is marked as such by a null saved fp, - in which case the saved method ip is actually the context (possibly hybrid) beneath the base frame" - - | fxCallerSavedIP fxSavedFP fxMethod fxFrameFlags fxThisContext fxReceiver | - fxCallerSavedIP := 1. - fxSavedFP := 0. - fxMethod := -1. - fxFrameFlags := -2. "Can find numArgs, needed for fast temp access. args are above fxCallerSavedIP. - Can find ``is block'' bit - Can find ``has context'' bit" - fxThisContext := -3. - fxReceiver := -4. - - FrameSlots := fxCallerSavedIP - fxReceiver + 1. - - FoxCallerSavedIP := fxCallerSavedIP * objectMemory wordSize. - "In base frames the caller saved ip field holds the caller context." - FoxCallerContext := FoxCallerSavedIP. - FoxSavedFP := fxSavedFP * objectMemory wordSize. - FoxMethod := fxMethod * objectMemory wordSize. - FoxFrameFlags := fxFrameFlags * objectMemory wordSize. - FoxThisContext := fxThisContext * objectMemory wordSize. - FoxReceiver := fxReceiver * objectMemory wordSize! Item was removed: - ----- Method: StackInterpreter>>internalFindUnwindThroughContext: (in category 'return bytecodes') ----- - internalFindUnwindThroughContext: homeContext - "Search for either an unwind-protect (activation of method with primitive 198) - or homeContext along the sender chain, which ever is found first. If homeContext - is not found answer nilObj, indicating cannotReturn:. If homeContext is found - answer 0. If homeContext is itself an unwind-protect answer the context, not 0." - self externalizeIPandSP. - ^self findUnwindThroughContext: homeContext! Item was added: + ----- Method: StackInterpreter>>isStillMarriedContextDuringGC: (in category 'frame access') ----- + isStillMarriedContextDuringGC: aContext + "Answer if aContext is married or widowed and still married. + If a context is widowed then turn it into a single dead context. + This version is for use during scavenging when stack references may be forwarded. + Following what appear to be references to forwarded objects on the stack is dangerous; + an instruction ponter may be correctly aligned and may point to bytes that just happen + to look like a forwarder. So it is only safe to follow fields that we know are frameContext + fields; hence the stack page is walked to check that aOnceMarriedContext is pointing to + a live frame. This only has to happen during scavenging because after a become: all + frameContext fields have been followed and so there is no need to follow forwarders." + ^(self isMarriedOrWidowedContext: aContext) + and: [(self isWidowedContextDuringGC: aContext) not]! Item was changed: ----- Method: StackInterpreter>>isWidowedContext: (in category 'frame access') ----- isWidowedContext: aOnceMarriedContext "See if the argument is married to a live frame or not. + If it is not, turn it into a bereaved single context. This version is safe for use + only when no frameContext fields may be forwarded (as maybe the case + when scavenging). Post become: all frameContext fields are followed, and + hence nrmally no following of frameCOtext fields is necessary. But during + a scavenge one must use isWidowedContextDuringGC:." + | theFrame thePage shouldBeFrameCallerField | + <var: #theFrame type: #'char *'> - If it is not, turn it into a bereaved single context." - | maybeFrame thePage shouldBeFrameCallerField maybeFrameCtxt | - <var: #maybeFrame type: #'char *'> <var: #thePage type: #'StackPage *'> <var: #shouldBeFrameCallerField type: #'char *'> self assert: ((objectMemory isContext: aOnceMarriedContext) and: [self isMarriedOrWidowedContext: aOnceMarriedContext]). + theFrame := self frameOfMarriedContext: aOnceMarriedContext. + thePage := stackPages stackPageFor: theFrame. - maybeFrame := self frameOfMarriedContext: aOnceMarriedContext. - thePage := stackPages stackPageFor: maybeFrame. ((stackPages isFree: thePage) + or: [theFrame < thePage headFP]) ifFalse: - or: [maybeFrame < thePage headFP]) ifFalse: ["The frame pointer is within the bounds of a live page. Now check if it matches a frame." shouldBeFrameCallerField := self withoutSmallIntegerTags: (objectMemory fetchPointer: InstructionPointerIndex ofObject: aOnceMarriedContext). + ((self frameCallerFP: theFrame) = shouldBeFrameCallerField + and: [self frameHasContext: theFrame]) ifTrue: + [self deny: (((self isFrame: theFrame onPage: thePage)) + and: [objectMemory isForwarded: (self frameContext: theFrame)]). + (self frameContext: theFrame) = aOnceMarriedContext ifTrue: "It is still married!!" - ((self frameCallerFP: maybeFrame) = shouldBeFrameCallerField - and: [self frameHasContext: maybeFrame]) ifTrue: - [maybeFrameCtxt := self frameContext: maybeFrame. - "On Spur we need to follow the context to check for a match, but since the VM is - only speculating about maybeFrame being a frame, and only speculating about - maybeContext being a context, we need to be sure before we can safely follow." - (objectMemory hasSpurMemoryManagerAPI - and: [(self isFrame: maybeFrame onPage: thePage) - and: [objectMemory isForwarded: maybeFrameCtxt]]) ifTrue: - [maybeFrameCtxt := objectMemory followForwarded: maybeFrameCtxt. - self setFrameContext: maybeFrame to: maybeFrameCtxt]. - maybeFrameCtxt = aOnceMarriedContext ifTrue: "It is still married!!" [^false]]]. "It is out of range or doesn't match the frame's context. It is widowed. Time to wear black." self markContextAsDead: aOnceMarriedContext. ^true! Item was added: + ----- Method: StackInterpreter>>isWidowedContextDuringGC: (in category 'frame access') ----- + isWidowedContextDuringGC: aOnceMarriedContext + "See if the argument is married to a live frame or not. i.e. see if there is a matching + frame whose frameContext field is aOnceMarriedContext, or a forwarder to it. + If aOnceMarriedContext is not married to a live frame, turn it into a bereaved single context. + This version is for use during scavenging when stack references may be forwarded. + Following what appear to be references to forwarded objects on the stack is dangerous; + an instruction ponter may be correctly aligned and may point to bytes that just happen + to look like a forwarder. So it is only safe to follow fields that we know are frameContext + fields; hence the stack page is walked to check that aOnceMarriedContext is pointing to + a live frame. This only has to happen during scavenging because after a become: all + frameContext fields have been followed and so there is no need to follow forwarders." + | maybeFrame thePage shouldBeFrameCallerField maybeFrameCtxt | + <var: #maybeFrame type: #'char *'> + <var: #thePage type: #'StackPage *'> + <var: #shouldBeFrameCallerField type: #'char *'> + self assert: ((objectMemory isContext: aOnceMarriedContext) + and: [self isMarriedOrWidowedContext: aOnceMarriedContext]). + maybeFrame := self frameOfMarriedContext: aOnceMarriedContext. + thePage := stackPages stackPageFor: maybeFrame. + ((stackPages isFree: thePage) + or: [maybeFrame < thePage headFP]) ifFalse: + ["The frame pointer is within the bounds of a live page. + Now check if it matches a frame." + shouldBeFrameCallerField := self withoutSmallIntegerTags: + (objectMemory + fetchPointer: InstructionPointerIndex + ofObject: aOnceMarriedContext). + ((self frameCallerFP: maybeFrame) = shouldBeFrameCallerField + and: [self frameHasContext: maybeFrame]) ifTrue: + [maybeFrameCtxt := self frameContext: maybeFrame. + "On Spur we need to follow the context to check for a match, but since the VM is + only speculating about maybeFrame being a frame, and only speculating about + maybeContext being a context, we need to be sure before we can safely follow." + (objectMemory hasSpurMemoryManagerAPI + and: [(self isFrame: maybeFrame onPage: thePage) + and: [objectMemory isForwarded: maybeFrameCtxt]]) ifTrue: + [maybeFrameCtxt := objectMemory followForwarded: maybeFrameCtxt. + self setFrameContext: maybeFrame to: maybeFrameCtxt]. + maybeFrameCtxt = aOnceMarriedContext ifTrue: "It is still married!!" + [^false]]]. + "It is out of range or doesn't match the frame's context. + It is widowed. Time to wear black." + self markContextAsDead: aOnceMarriedContext. + ^true! Item was added: + ----- Method: StackInterpreter>>maybeReturnToMachineCodeFrame (in category 'return bytecodes') ----- + maybeReturnToMachineCodeFrame + "Hook for the CoInterpreter to return to machine-code or + load the saved IP. This is a nop in the StackInterpreter."! Item was changed: ----- Method: StackInterpreter>>setTraceFlagOnContextsFramesPageIfNeeded: (in category 'object memory support') ----- setTraceFlagOnContextsFramesPageIfNeeded: aContext | thePage | <inline: false> <var: #thePage type: #'StackPage *'> + (self isStillMarriedContextDuringGC: aContext) ifTrue: - (self isStillMarriedContext: aContext) ifTrue: [thePage := stackPages stackPageFor: (self frameOfMarriedContext: aContext). self assert: (thePage trace between: StackPageUnreached and: StackPageTraced). thePage trace = StackPageUnreached ifTrue: [thePage trace: StackPageReachedButUntraced]]! Item was changed: ----- Method: StackToRegisterMappingCogit>>genBinaryInlineComparison:opFalse:destReg: (in category 'inline primitive generators') ----- genBinaryInlineComparison: opTrue opFalse: opFalse destReg: destReg "Inlined comparison. opTrue = jump for true and opFalse = jump for false" | nextPC branchDescriptor nExts | nextPC := bytecodePC + 3. + nExts := 0. [branchDescriptor := self generatorAt: (objectMemory fetchByte: nextPC ofObject: methodObj) + (byte0 bitAnd: 256). + branchDescriptor isExtension] whileTrue: + [nExts := nExts + 1. + nextPC := nextPC + branchDescriptor numBytes]. - nExts := 0. - branchDescriptor isExtension] whileTrue: - [nExts := nExts + 1. - nextPC := nextPC + branchDescriptor numBytes]. (branchDescriptor isBranchTrue or: [branchDescriptor isBranchFalse]) + ifTrue: "This is the path where the inlined comparison is followed immediately by a branch" + [| targetBytecodePC postBranchPC | + targetBytecodePC := nextPC + + branchDescriptor numBytes + + (self spanFor: branchDescriptor at: nextPC exts: nExts in: methodObj). + postBranchPC := nextPC + branchDescriptor numBytes. + self ssPushConstant: objectMemory trueObject. "dummy object" + self gen: (branchDescriptor isBranchTrue ifTrue: [opTrue] ifFalse: [opFalse]) + operand: (self ensureNonMergeFixupAt: targetBytecodePC - initialPC) asUnsignedInteger. + self Jump: (self ensureNonMergeFixupAt: postBranchPC - initialPC)] + ifFalse: "This is the path where the inlined comparison is *not* followed immediately by a branch" + [| condJump jump | - ifTrue: [ - "This is the path where the inlined comparison is followed immediatly by a branch" - | targetBytecodePC postBranchPC | - targetBytecodePC := nextPC - + branchDescriptor numBytes - + (self spanFor: branchDescriptor at: nextPC exts: nExts in: methodObj). - postBranchPC := nextPC + branchDescriptor numBytes. - self ssPushConstant: objectMemory trueObject. "dummy object" - self gen: (branchDescriptor isBranchTrue ifTrue: [opTrue] ifFalse: [opFalse]) - operand: (self ensureNonMergeFixupAt: targetBytecodePC - initialPC) asUnsignedInteger. - self Jump: (self ensureNonMergeFixupAt: postBranchPC - initialPC). - ] - ifFalse: [ - "This is the path where the inlined comparison is *not* followed immediatly by a branch" - | condJump jump | condJump := self gen: opTrue operand: 0. self annotate: (self MoveCw: objectMemory falseObject R: destReg) objRef: objectMemory falseObject. jump := self Jump: 0. condJump jmpTarget: (self annotate: (self MoveCw: objectMemory trueObject R: destReg) objRef: objectMemory trueObject). + jump jmpTarget: self Label]. - jump jmpTarget: self Label ]. ^ 0!

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

Vm-dev December 2014