Vm-dev October 2014

vm-dev@lists.squeakfoundation.org

38 participants
133 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

Nw Cog VMs available
by Eliot Miranda 31 Oct '14

31 Oct '14

...at http://www.mirandabanda.org/files/Cog/VM/VM.r3120/. These contain a few important bug fixes to Spur which will increase stability. CogVM binaries as per VMMaker.oscog-eem.916 Spur: Reimplement deriving the accessorDepth and retrying primitives on primitive failure machinery. Always take the primitive index from newMethod (setting newMethod to a SmallInteger for primitiveDoPrimitiveWithArgs. Have the Cogit always set primitiveFunctionPointer and newMethod for the retry. Add isNonInteger(Non)Immediate: and use it in several of the integer conversion routines that were missing code to exclude Character immediates, with fatal consequences. With these changes the Pharo 4 test suite runs without crashing on the latest Pharo Spur boot image. Fix processWeakSurvivor: so that it answers whether a weak object refers to a young object. The old version only scanned weak fields, ignoring refs to young objs from strong fields. Move check for valid classes from findClassOfMethod: forReceiver: into findClassContainingMethod:startingAt:, hence making findClassOfMethod:forReceiver: et al more robust. Implement safe access to contexts and methods when creating image segments (since internally married contexts and jitted methods have hidden state encoded in odd ways). As a result: Fix baaad bug in SpurMemoryManager>>lastPointerOf: for contexts, caused by transcription from (New)ObjectMemory where the method works on a wing and a prayer because BaseHeaderSize = BytesPerOop. And I can't be arsed to fix it. Fix baaad bug in accessibleObjectAfter: and add an assert to primitiveNextObject to catch similar bugs. Can now enumerate objects in new space, which will sort-of work, but code should really use allObjects. Will fix at the image level as time allows. Eliminate isInSurvivorSpace: in favour of the identical isInPastSpace:. All: Refactor decoding of context instruction pointers so there is only one copy of the code. -- best, Eliot

1 0

[commit][3120] CogVM source as per VMMaker.oscog-eem.916
by commits＠squeakvm.org 31 Oct '14

31 Oct '14

Revision: 3120 Author: eliot Date: 2014-10-31 12:13:28 -0700 (Fri, 31 Oct 2014) Log Message: ----------- CogVM source as per VMMaker.oscog-eem.916 Spur: Reimplement deriving the accessorDepth and retrying primitives on primitive failure machinery. Always take the primitive index from newMethod (setting newMethod to a SmallInteger for primitiveDoPrimitiveWithArgs. Have the Cogit always set primitiveFunctionPointer and newMethod for the retry. Add isNonInteger(Non)Immediate: and use it in several of the integer conversion routines that were missing code to exclude Character immediates, with fatal consequences. With these changes the Pharo 4 test suite runs without crashing on the latest Pharo Spur boot image. 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/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-10-31 19:11:22 UTC (rev 3119) +++ branches/Cog/nscogsrc/vm/cogit.c 2014-10-31 19:13:28 UTC (rev 3120) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.911 uuid: 39c7bff8-ff88-43a5-88bc-cbbdb206cbcd + CCodeGenerator VMMaker.oscog-eem.916 uuid: 79925bdf-769f-446f-8532-f04f0e2f11ae from - StackToRegisterMappingCogit VMMaker.oscog-eem.911 uuid: 39c7bff8-ff88-43a5-88bc-cbbdb206cbcd + StackToRegisterMappingCogit VMMaker.oscog-eem.916 uuid: 79925bdf-769f-446f-8532-f04f0e2f11ae */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.911 uuid: 39c7bff8-ff88-43a5-88bc-cbbdb206cbcd " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.916 uuid: 79925bdf-769f-446f-8532-f04f0e2f11ae " __DATE__ ; char *__cogitBuildInfo = __buildInfo; Modified: branches/Cog/nscogsrc/vm/cogit.h =================================================================== --- branches/Cog/nscogsrc/vm/cogit.h 2014-10-31 19:11:22 UTC (rev 3119) +++ branches/Cog/nscogsrc/vm/cogit.h 2014-10-31 19:13:28 UTC (rev 3120) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.911 uuid: 39c7bff8-ff88-43a5-88bc-cbbdb206cbcd + CCodeGenerator VMMaker.oscog-eem.916 uuid: 79925bdf-769f-446f-8532-f04f0e2f11ae */ Modified: branches/Cog/nscogsrc/vm/cointerp.c =================================================================== --- branches/Cog/nscogsrc/vm/cointerp.c 2014-10-31 19:11:22 UTC (rev 3119) +++ branches/Cog/nscogsrc/vm/cointerp.c 2014-10-31 19:13:28 UTC (rev 3120) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.914 uuid: bda96e1c-f22e-4b32-9ee1-620740e1fec5 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.916 uuid: 79925bdf-769f-446f-8532-f04f0e2f11ae from - CoInterpreter VMMaker.oscog-eem.914 uuid: bda96e1c-f22e-4b32-9ee1-620740e1fec5 + CoInterpreter VMMaker.oscog-eem.916 uuid: 79925bdf-769f-446f-8532-f04f0e2f11ae */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.914 uuid: bda96e1c-f22e-4b32-9ee1-620740e1fec5 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.916 uuid: 79925bdf-769f-446f-8532-f04f0e2f11ae " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -275,7 +275,6 @@ #define NilObject 0 #define OldBecameNewFlag 4 #define PrimCallCollectsProfileSamples 8 -#define PrimCallDoNotJIT 32 #define PrimCallMayCallBack 4 #define PrimCallNeedsNewMethod 1 #define PrimCallNeedsPrimitiveFunction 2 @@ -1338,32 +1337,33 @@ _iss char * stackBasePlus1; _iss sqInt trueObj; _iss sqInt falseObj; -_iss sqInt remapBufferCount; _iss sqInt bytesPerPage; _iss sqInt traceLogIndex; +_iss sqInt remapBufferCount; _iss usqInt reserveStart; _iss char * stackLimit; _iss sqInt rootTableCount; _iss usqInt memoryLimit; -_iss usqInt endOfMemory; _iss usqInt scavengeThreshold; +_iss usqInt endOfMemory; _iss unsigned char primTraceLogIndex; _iss StackPage * mostRecentlyUsedPage; _iss sqInt numStackPages; +_iss sqInt tempOop; _iss sqInt needGCFlag; _iss sqInt profileProcess; +_iss sqLong nextProfileTick; _iss sqInt jmpDepth; _iss sqInt longRunningPrimitiveCheckSemaphore; -_iss sqLong nextProfileTick; _iss sqInt profileSemaphore; _iss sqInt profileMethod; _iss usqInt fwdTableNext; -_iss sqInt tempOop; _iss sqInt longRunningPrimitiveCheckMethod; _iss usqInt compStart; _iss sqInt extraRootCount; _iss sqInt classNameIndex; _iss sqInt statGrowMemory; +_iss sqInt tempOop2; _iss sqInt weakRootCount; _iss sqInt growHeadroom; _iss sqInt lastMethodCacheProbeWrite; @@ -2087,7 +2087,7 @@ /* 574 */ (void (*)(void))0, /* 575 */ (void (*)(void))0, 0 }; -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.914"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.916"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -5351,6 +5351,7 @@ primTraceLogIndex(GIV(primTraceLogIndex) + 1); } assert(!(isOopForwarded(stackValue(GIV(argumentCount))))); + assert((remapBufferCount()) == 0); nArgs = GIV(argumentCount); savedStackPointer = GIV(stackPointer); savedFramePointer = GIV(framePointer); @@ -5358,8 +5359,8 @@ /* begin initPrimCall */ GIV(primFailCode) = 0; dispatchFunctionPointer(primitiveFunctionPointer); - assert((remapBufferCount()) == 0); - + /* begin maybeRetryFailureDueToForwarding */ + ; /* begin maybeFailForLastObjectOverwrite */ if (checkAllocFiller) { if (((freeStart()) < GIV(scavengeThreshold)) @@ -16984,6 +16985,7 @@ primTraceLogIndex(GIV(primTraceLogIndex) + 1); } assert(!(isOopForwarded(stackValue(GIV(argumentCount))))); + assert((remapBufferCount()) == 0); nArgs = GIV(argumentCount); savedStackPointer = GIV(stackPointer); savedFramePointer = GIV(framePointer); @@ -16991,8 +16993,8 @@ /* begin initPrimCall */ GIV(primFailCode) = 0; dispatchFunctionPointer(primitiveFunctionPointer); - assert((remapBufferCount()) == 0); - + /* begin maybeRetryFailureDueToForwarding */ + ; /* begin maybeFailForLastObjectOverwrite */ if (checkAllocFiller) { if (((freeStart()) < GIV(scavengeThreshold)) @@ -18295,30 +18297,25 @@ primitivePropertyFlags(sqInt primIndex) { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt baseFlags; - void (*functionPointer)(void); + sqInt baseFlags1; - /* begin functionPointerFor:inClass: */ - functionPointer = ((void (*)(void)) ((primIndex > MaxPrimitiveIndex - ? 0 - : primitiveTable[primIndex]))); - - baseFlags = (GIV(profileSemaphore) != GIV(nilObj) + /* begin primitivePropertyFlagsForV3: */ + baseFlags1 = (GIV(profileSemaphore) != GIV(nilObj) ? PrimCallNeedsNewMethod + PrimCallCollectsProfileSamples : 0); - if (GIV(longRunningPrimitiveCheckSemaphore) != null) { - baseFlags = baseFlags | PrimCallNeedsNewMethod; + if (!(GIV(longRunningPrimitiveCheckSemaphore) == null)) { + baseFlags1 = baseFlags1 | PrimCallNeedsNewMethod; } - if ((functionPointer == primitiveExternalCall) - || (functionPointer == primitiveCalloutToFFI)) { + null; + if ((primIndex == 117) + || (primIndex == 120)) { /* For callbacks */ - baseFlags = baseFlags | ((PrimCallNeedsNewMethod + PrimCallNeedsPrimitiveFunction) + PrimCallMayCallBack); - if (checkAllocFiller) { - baseFlags = baseFlags | CheckAllocationFillerAfterPrimCall; - } + baseFlags1 = baseFlags1 | ((PrimCallNeedsNewMethod + PrimCallNeedsPrimitiveFunction) + PrimCallMayCallBack); } - return baseFlags; + return baseFlags1; + } void * @@ -20161,6 +20158,7 @@ primTraceLogIndex(GIV(primTraceLogIndex) + 1); } assert(!(isOopForwarded(stackValue(GIV(argumentCount))))); + assert((remapBufferCount()) == 0); nArgs = GIV(argumentCount); savedStackPointer = GIV(stackPointer); savedFramePointer = GIV(framePointer); @@ -20168,8 +20166,8 @@ /* begin initPrimCall */ GIV(primFailCode) = 0; dispatchFunctionPointer(primitiveFunctionPointer); - assert((remapBufferCount()) == 0); - + /* begin maybeRetryFailureDueToForwarding */ + ; /* begin maybeFailForLastObjectOverwrite */ if (checkAllocFiller) { if (((freeStart()) < GIV(scavengeThreshold)) @@ -22823,6 +22821,7 @@ if (ok) { return 1; } + /* begin primitiveFail */ if (!GIV(primFailCode)) { GIV(primFailCode) = 1; @@ -22909,6 +22908,7 @@ } return ((usqLong) smallIntValue); } + /* begin isClassOfNonImm:equalTo:compactClassIndex: */ assert(!((oop & 1))); ccIndex1 = (((usqInt) (longAt(oop))) >> (compactClassFieldLSB())) & 0x1F; @@ -22999,9 +22999,7 @@ } return value; } - else { - ; - } + /* begin isClassOfNonImm:equalTo:compactClassIndex: */ assert(!((oop & 1))); ccIndex = (((usqInt) (longAt(oop))) >> (compactClassFieldLSB())) & 0x1F; @@ -23050,6 +23048,7 @@ } return (oop >> 1); } + /* begin isClassOfNonImm:equalTo:compactClassIndex: */ assert(!((oop & 1))); ccIndex = (((usqInt) (longAt(oop))) >> (compactClassFieldLSB())) & 0x1F; @@ -23104,6 +23103,7 @@ } return value; } + /* begin isClassOfNonImm:equalTo:compactClassIndex: */ assert(!((oop & 1))); ccIndex = (((usqInt) (longAt(oop))) >> (compactClassFieldLSB())) & 0x1F; @@ -30037,6 +30037,7 @@ size = value; goto l1; } + /* begin isClassOfNonImm:equalTo:compactClassIndex: */ assert(!((oop1 & 1))); ccIndex = (((usqInt) (longAt(oop1))) >> (compactClassFieldLSB())) & 0x1F; @@ -33834,6 +33835,7 @@ if ((oop & 1)) { return (oop >> 1); } + /* begin isClassOfNonImm:equalTo:compactClassIndex: */ assert(!((oop & 1))); ccIndex1 = (((usqInt) (longAt(oop))) >> (compactClassFieldLSB())) & 0x1F; @@ -33920,6 +33922,7 @@ if ((oop & 1)) { return ((sqLong) ((oop >> 1))); } + /* begin isClassOfNonImm:equalTo:compactClassIndex: */ assert(!((oop & 1))); ccIndex1 = (((usqInt) (longAt(oop))) >> (compactClassFieldLSB())) & 0x1F; @@ -34025,6 +34028,7 @@ if ((oop & 1)) { return (oop >> 1); } + /* begin isClassOfNonImm:equalTo:compactClassIndex: */ assert(!((oop & 1))); ccIndex1 = (((usqInt) (longAt(oop))) >> (compactClassFieldLSB())) & 0x1F; @@ -43718,6 +43722,11 @@ ok = 0; } } + if (!(GIV(tempOop2) == 0)) { + if (!(checkOopIntegritynamed(GIV(tempOop2), "tempOop2"))) { + ok = 0; + } + } for (i = 1; i <= GIV(jmpDepth); i += 1) { if (!(checkOopIntegritynamedindex(GIV(suspendedCallbacks)[i], "suspendedCallbacks", i))) { ok = 0; @@ -45417,6 +45426,9 @@ do { assert(!(isForwarded(currClass))); + if (!(addressCouldBeClassObj(currClass))) { + return GIV(nilObj); + } classDict = longAt((currClass + BaseHeaderSize) + (MethodDictionaryIndex << ShiftForWord)); assert(!(isForwarded(classDict))); /* begin numSlotsOf: */ @@ -45445,7 +45457,6 @@ findClassOfMethodforReceiver(sqInt meth, sqInt rcvr) { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt ccIndex; - sqInt mclass; sqInt rclass; if ((((rcvr & 1)) @@ -45454,16 +45465,13 @@ && (((((usqInt)rcvr)) < GIV(freeStart)) && (((longAt(rcvr)) & TypeMask) != HeaderTypeGC))))) && (!0)) { - rclass = ((rcvr & 1) + rclass = findClassContainingMethodstartingAt(meth, ((rcvr & 1) ? longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassSmallInteger << ShiftForWord)) : (((ccIndex = (((usqInt) (longAt(rcvr))) >> (compactClassFieldLSB())) & 0x1F)) == 0 ? (longAt(rcvr - BaseHeaderSize)) & AllButTypeMask - : longAt(((longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (CompactClasses << ShiftForWord))) + BaseHeaderSize) + ((ccIndex - 1) << ShiftForWord)))); - if (addressCouldBeClassObj(rclass)) { - rclass = findClassContainingMethodstartingAt(meth, rclass); - if (rclass != GIV(nilObj)) { - return rclass; - } + : longAt(((longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (CompactClasses << ShiftForWord))) + BaseHeaderSize) + ((ccIndex - 1) << ShiftForWord))))); + if (rclass != GIV(nilObj)) { + return rclass; } } if (!((((meth & 3) == 0) @@ -45473,10 +45481,6 @@ && (((((usqInt) (longAt(meth))) >> (instFormatFieldLSB())) & 15) >= 12))) { return GIV(nilObj); } - mclass = safeMethodClassOf(meth); - if (addressCouldBeClassObj(mclass)) { - return GIV(nilObj); - } return findClassContainingMethodstartingAt(meth, safeMethodClassOf(meth)); } @@ -47370,6 +47374,12 @@ && (((longAt(GIV(tempOop))) & MarkBit) != 0)))) { GIV(tempOop) = remapObj(GIV(tempOop)); } + if ((GIV(tempOop2) != 0) + && (((GIV(tempOop2) & 1) == 0) + && (((GIV(tempOop2) & 1) == 0) + && (((longAt(GIV(tempOop2))) & MarkBit) != 0)))) { + GIV(tempOop2) = remapObj(GIV(tempOop2)); + } } @@ -47435,6 +47445,9 @@ if (!(GIV(tempOop) == 0)) { markAndTrace(GIV(tempOop)); } + if (!(GIV(tempOop2) == 0)) { + markAndTrace(GIV(tempOop2)); + } for (i = 1, iLimiT = (remapBufferCount()); i <= iLimiT; i += 1) { oop = GIV(remapBuffer)[i]; if (!((oop & 1))) { @@ -48511,7 +48524,6 @@ sqInt ccIndex1; sqInt ccIndex2; sqInt classObj; - sqInt mclass; sqInt methClass; sqInt methodSel; sqInt rclass; @@ -48526,17 +48538,14 @@ && (((((usqInt)anObject)) < GIV(freeStart)) && (((longAt(anObject)) & TypeMask) != HeaderTypeGC))))) && (!0)) { - rclass = ((anObject & 1) + rclass = findClassContainingMethodstartingAt(aMethod, ((anObject & 1) ? longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassSmallInteger << ShiftForWord)) : (((ccIndex2 = (((usqInt) (longAt(anObject))) >> (compactClassFieldLSB())) & 0x1F)) == 0 ? (longAt(anObject - BaseHeaderSize)) & AllButTypeMask - : longAt(((longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (CompactClasses << ShiftForWord))) + BaseHeaderSize) + ((ccIndex2 - 1) << ShiftForWord)))); - if (addressCouldBeClassObj(rclass)) { - rclass = findClassContainingMethodstartingAt(aMethod, rclass); - if (rclass != GIV(nilObj)) { - methClass = rclass; - goto l1; - } + : longAt(((longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (CompactClasses << ShiftForWord))) + BaseHeaderSize) + ((ccIndex2 - 1) << ShiftForWord))))); + if (rclass != GIV(nilObj)) { + methClass = rclass; + goto l1; } } if (!((((aMethod & 3) == 0) @@ -48547,11 +48556,6 @@ methClass = GIV(nilObj); goto l1; } - mclass = safeMethodClassOf(aMethod); - if (addressCouldBeClassObj(mclass)) { - methClass = GIV(nilObj); - goto l1; - } methClass = findClassContainingMethodstartingAt(aMethod, safeMethodClassOf(aMethod)); l1: /* end findClassOfMethod:forReceiver: */; methodSel = findSelectorOfMethod(aMethod); @@ -51594,6 +51598,7 @@ } return value; } + /* begin isClassOfNonImm:equalTo:compactClassIndex: */ assert(!((integerPointer & 1))); ccIndex = (((usqInt) (longAt(integerPointer))) >> (compactClassFieldLSB())) & 0x1F; @@ -51640,6 +51645,7 @@ if ((integerPointer & 1)) { return (integerPointer >> 1); } + /* begin isClassOfNonImm:equalTo:compactClassIndex: */ assert(!((integerPointer & 1))); ccIndex1 = (((usqInt) (longAt(integerPointer))) >> (compactClassFieldLSB())) & 0x1F; @@ -53421,7 +53427,6 @@ sqInt argumentArray; sqInt arraySize; sqInt ccIndex; - sqInt ctxtRcvr; sqInt firstBytecode; sqInt fmt; sqInt fmt1; @@ -53437,14 +53442,10 @@ sqInt methodHeader; sqInt moduleLength; sqInt moduleName; - sqInt oop; - sqInt oop1; - sqInt oop2; - sqInt oop3; - sqInt oop4; - sqInt oop5; - sqInt oop6; - sqInt oop7; + sqInt object; + sqInt object1; + sqInt object2; + sqInt object3; sqInt primBits; sqInt primRcvr; char *sp; @@ -53461,6 +53462,10 @@ sqInt sz2; sqInt top; sqInt top1; + sqInt valuePointer; + sqInt valuePointer1; + sqInt valuePointer2; + sqInt valuePointer3; argumentArray = longAt(GIV(stackPointer)); methodArg = longAt(GIV(stackPointer) + (2 * BytesPerWord)); @@ -53608,40 +53613,25 @@ (GIV(primFailCode) = -1); return; } - /* begin pushRemappableOop: */ - oop = (argumentArray = popStack()); - assert(addressCouldBeOop(oop)); - GIV(remapBuffer)[(GIV(remapBufferCount) += 1)] = oop; - if (!(GIV(remapBufferCount) <= RemapBufferSize)) { - error("remapBuffer overflow"); - } - /* begin pushRemappableOop: */ - oop1 = (primRcvr = popStack()); - assert(addressCouldBeOop(oop1)); - GIV(remapBuffer)[(GIV(remapBufferCount) += 1)] = oop1; - if (!(GIV(remapBufferCount) <= RemapBufferSize)) { - error("remapBuffer overflow"); - } - /* begin pushRemappableOop: */ + GIV(tempOop) = eeInstantiateClassIndexformatnumSlots(ClassArrayCompactIndex, 2, 4); + /* begin storePointerUnchecked:ofObject:withValue: */ + valuePointer = (argumentArray = popStack()); + longAtput((GIV(tempOop) + BaseHeaderSize) + (0 << ShiftForWord), valuePointer); + /* begin storePointerUnchecked:ofObject:withValue: */ + valuePointer1 = (primRcvr = popStack()); + longAtput((GIV(tempOop) + BaseHeaderSize) + (1 << ShiftForWord), valuePointer1); + /* begin storePointerUnchecked:ofObject:withValue: */ /* begin popStack */ top = longAt(GIV(stackPointer)); GIV(stackPointer) += BytesPerWord; - oop2 = top; - assert(addressCouldBeOop(oop2)); - GIV(remapBuffer)[(GIV(remapBufferCount) += 1)] = oop2; - if (!(GIV(remapBufferCount) <= RemapBufferSize)) { - error("remapBuffer overflow"); - } - /* begin pushRemappableOop: */ + valuePointer2 = top; + longAtput((GIV(tempOop) + BaseHeaderSize) + (2 << ShiftForWord), valuePointer2); + /* begin storePointerUnchecked:ofObject:withValue: */ /* begin popStack */ top1 = longAt(GIV(stackPointer)); GIV(stackPointer) += BytesPerWord; - oop3 = top1; - assert(addressCouldBeOop(oop3)); - GIV(remapBuffer)[(GIV(remapBufferCount) += 1)] = oop3; - if (!(GIV(remapBufferCount) <= RemapBufferSize)) { - error("remapBuffer overflow"); - } + valuePointer3 = top1; + longAtput((GIV(tempOop) + BaseHeaderSize) + (3 << ShiftForWord), valuePointer3); /* begin push: */ longAtput((sp5 = GIV(stackPointer) - BytesPerWord), primRcvr); GIV(stackPointer) = sp5; @@ -53652,6 +53642,7 @@ GIV(stackPointer) = sp; } /* begin callExternalPrimitive: */ + ; dispatchFunctionPointer(addr); /* begin maybeFailForLastObjectOverwrite */ if (checkAllocFiller) { @@ -53660,22 +53651,7 @@ GIV(primFailCode) = PrimErrWritePastObject; } } - /* begin popRemappableOop */ - oop4 = GIV(remapBuffer)[GIV(remapBufferCount)]; - GIV(remapBufferCount) -= 1; - ctxtRcvr = oop4; - /* begin popRemappableOop */ - oop5 = GIV(remapBuffer)[GIV(remapBufferCount)]; - GIV(remapBufferCount) -= 1; - methodArg = oop5; - /* begin popRemappableOop */ - oop6 = GIV(remapBuffer)[GIV(remapBufferCount)]; - GIV(remapBufferCount) -= 1; - primRcvr = oop6; - /* begin popRemappableOop */ - oop7 = GIV(remapBuffer)[GIV(remapBufferCount)]; - GIV(remapBufferCount) -= 1; - argumentArray = oop7; + if (GIV(primFailCode)) { /* If primitive failed, then restore state for failure code */ @@ -53684,16 +53660,20 @@ GIV(stackPointer) += (arraySize + 1) * BytesPerWord; null; /* begin push: */ - longAtput((sp1 = GIV(stackPointer) - BytesPerWord), ctxtRcvr); + object = longAt((GIV(tempOop) + BaseHeaderSize) + (3 << ShiftForWord)); + longAtput((sp1 = GIV(stackPointer) - BytesPerWord), object); GIV(stackPointer) = sp1; /* begin push: */ - longAtput((sp2 = GIV(stackPointer) - BytesPerWord), methodArg); + object1 = longAt((GIV(tempOop) + BaseHeaderSize) + (2 << ShiftForWord)); + longAtput((sp2 = GIV(stackPointer) - BytesPerWord), object1); GIV(stackPointer) = sp2; /* begin push: */ - longAtput((sp3 = GIV(stackPointer) - BytesPerWord), primRcvr); + object2 = longAt((GIV(tempOop) + BaseHeaderSize) + (1 << ShiftForWord)); + longAtput((sp3 = GIV(stackPointer) - BytesPerWord), object2); GIV(stackPointer) = sp3; /* begin push: */ - longAtput((sp4 = GIV(stackPointer) - BytesPerWord), argumentArray); + object3 = longAt((GIV(tempOop) + BaseHeaderSize) + (0 << ShiftForWord)); + longAtput((sp4 = GIV(stackPointer) - BytesPerWord), object3); GIV(stackPointer) = sp4; /* Hack. A nil prim error code (primErrorCode = 1) is interpreted by the image @@ -53716,9 +53696,12 @@ sqInt index; sqInt integerPointer; sqInt nArgs; + sqInt nArgs1; sqInt primIdx; char *savedFramePointer; + char *savedFramePointer1; char *savedStackPointer; + char *savedStackPointer1; char *sp; char *sp1; char *sp2; @@ -53778,6 +53761,7 @@ ? 0 : primitiveTable[primIdx]))); if (primitiveFunctionPointer == 0) { + primitiveFunctionPointer = primitiveDoPrimitiveWithArgs; /* begin primitiveFail */ if (!GIV(primFailCode)) { GIV(primFailCode) = 1; @@ -53811,15 +53795,16 @@ primTraceLogIndex(GIV(primTraceLogIndex) + 1); } assert(!(isOopForwarded(stackValue(GIV(argumentCount))))); - nArgs = GIV(argumentCount); - savedStackPointer = GIV(stackPointer); - savedFramePointer = GIV(framePointer); + assert((remapBufferCount()) == 0); + nArgs1 = GIV(argumentCount); + savedStackPointer1 = GIV(stackPointer); + savedFramePointer1 = GIV(framePointer); /* begin initPrimCall */ GIV(primFailCode) = 0; dispatchFunctionPointer(primitiveFunctionPointer); - assert((remapBufferCount()) == 0); - + /* begin maybeRetryFailureDueToForwarding */ + ; /* begin maybeFailForLastObjectOverwrite */ if (checkAllocFiller) { if (((freeStart()) < GIV(scavengeThreshold)) @@ -53829,14 +53814,14 @@ } if (FailImbalancedPrimitives && ((!GIV(primFailCode)) - && ((GIV(framePointer) == savedFramePointer) + && ((GIV(framePointer) == savedFramePointer1) && (!((((usqInt)(longAt(GIV(framePointer) + FoxMethod)))) < (startOfMemory())))))) { /* Don't fail if primitive has done something radical, e.g. perform: */ - if (GIV(stackPointer) != (savedStackPointer + (nArgs * BytesPerWord))) { + if (GIV(stackPointer) != (savedStackPointer1 + (nArgs1 * BytesPerWord))) { flag("Would be nice to make this a message send of e.g. unbalancedPrimitive to the current process or context"); - GIV(stackPointer) = savedStackPointer; + GIV(stackPointer) = savedStackPointer1; failUnbalancedPrimitive(); } } @@ -53844,6 +53829,7 @@ checkProfileTick(GIV(newMethod)); } !GIV(primFailCode); + if (GIV(primFailCode)) { /* If primitive failed, then restore state for failure code */ @@ -53859,6 +53845,7 @@ /* begin push: */ longAtput((sp2 = GIV(stackPointer) - BytesPerWord), GIV(tempOop)); GIV(stackPointer) = sp2; + primitiveFunctionPointer = primitiveDoPrimitiveWithArgs; GIV(argumentCount) = 2; } GIV(tempOop) = 0; @@ -54104,6 +54091,7 @@ if (addr != 0) { rewriteMethodCacheEntryForExternalPrimitiveToFunction(addr); /* begin callExternalPrimitive: */ + ; dispatchFunctionPointer(addr); /* begin maybeFailForLastObjectOverwrite */ if (checkAllocFiller) { @@ -54112,6 +54100,8 @@ GIV(primFailCode) = PrimErrWritePastObject; } } + /* begin maybeRetryFailureDueToForwarding */ + ; return; } (GIV(primFailCode) = PrimErrNamedInternal); @@ -54196,6 +54186,7 @@ if (index >= 0) { rewriteMethodCacheEntryForExternalPrimitiveToFunction(addr); /* begin callExternalPrimitive: */ + ; dispatchFunctionPointer(addr); /* begin maybeFailForLastObjectOverwrite */ if (checkAllocFiller) { @@ -54204,6 +54195,8 @@ GIV(primFailCode) = PrimErrWritePastObject; } } + /* begin maybeRetryFailureDueToForwarding */ + ; } else { Modified: branches/Cog/nscogsrc/vm/cointerp.h =================================================================== --- branches/Cog/nscogsrc/vm/cointerp.h 2014-10-31 19:11:22 UTC (rev 3119) +++ branches/Cog/nscogsrc/vm/cointerp.h 2014-10-31 19:13:28 UTC (rev 3120) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.914 uuid: bda96e1c-f22e-4b32-9ee1-620740e1fec5 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.916 uuid: 79925bdf-769f-446f-8532-f04f0e2f11ae */ Modified: branches/Cog/nscogsrc/vm/gcc3x-cointerp.c =================================================================== --- branches/Cog/nscogsrc/vm/gcc3x-cointerp.c 2014-10-31 19:11:22 UTC (rev 3119) +++ branches/Cog/nscogsrc/vm/gcc3x-cointerp.c 2014-10-31 19:13:28 UTC (rev 3120) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.914 uuid: bda96e1c-f22e-4b32-9ee1-620740e1fec5 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.916 uuid: 79925bdf-769f-446f-8532-f04f0e2f11ae from - CoInterpreter VMMaker.oscog-eem.914 uuid: bda96e1c-f22e-4b32-9ee1-620740e1fec5 + CoInterpreter VMMaker.oscog-eem.916 uuid: 79925bdf-769f-446f-8532-f04f0e2f11ae */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.914 uuid: bda96e1c-f22e-4b32-9ee1-620740e1fec5 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.916 uuid: 79925bdf-769f-446f-8532-f04f0e2f11ae " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -278,7 +278,6 @@ #define NilObject 0 #define OldBecameNewFlag 4 #define PrimCallCollectsProfileSamples 8 -#define PrimCallDoNotJIT 32 #define PrimCallMayCallBack 4 #define PrimCallNeedsNewMethod 1 #define PrimCallNeedsPrimitiveFunction 2 @@ -1341,32 +1340,33 @@ _iss char * stackBasePlus1; _iss sqInt trueObj; _iss sqInt falseObj; -_iss sqInt remapBufferCount; _iss sqInt bytesPerPage; _iss sqInt traceLogIndex; +_iss sqInt remapBufferCount; _iss usqInt reserveStart; _iss char * stackLimit; _iss sqInt rootTableCount; _iss usqInt memoryLimit; -_iss usqInt endOfMemory; _iss usqInt scavengeThreshold; +_iss usqInt endOfMemory; _iss unsigned char primTraceLogIndex; _iss StackPage * mostRecentlyUsedPage; _iss sqInt numStackPages; +_iss sqInt tempOop; _iss sqInt needGCFlag; _iss sqInt profileProcess; +_iss sqLong nextProfileTick; _iss sqInt jmpDepth; _iss sqInt longRunningPrimitiveCheckSemaphore; -_iss sqLong nextProfileTick; _iss sqInt profileSemaphore; _iss sqInt profileMethod; _iss usqInt fwdTableNext; -_iss sqInt tempOop; _iss sqInt longRunningPrimitiveCheckMethod; _iss usqInt compStart; _iss sqInt extraRootCount; _iss sqInt classNameIndex; _iss sqInt statGrowMemory; +_iss sqInt tempOop2; _iss sqInt weakRootCount; _iss sqInt growHeadroom; _iss sqInt lastMethodCacheProbeWrite; @@ -2090,7 +2090,7 @@ /* 574 */ (void (*)(void))0, /* 575 */ (void (*)(void))0, 0 }; -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.914"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.916"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -5360,6 +5360,7 @@ primTraceLogIndex(GIV(primTraceLogIndex) + 1); } assert(!(isOopForwarded(stackValue(GIV(argumentCount))))); + assert((remapBufferCount()) == 0); nArgs = GIV(argumentCount); savedStackPointer = GIV(stackPointer); savedFramePointer = GIV(framePointer); @@ -5367,8 +5368,8 @@ /* begin initPrimCall */ GIV(primFailCode) = 0; dispatchFunctionPointer(primitiveFunctionPointer); - assert((remapBufferCount()) == 0); - + /* begin maybeRetryFailureDueToForwarding */ + ; /* begin maybeFailForLastObjectOverwrite */ if (checkAllocFiller) { if (((freeStart()) < GIV(scavengeThreshold)) @@ -16993,6 +16994,7 @@ primTraceLogIndex(GIV(primTraceLogIndex) + 1); } assert(!(isOopForwarded(stackValue(GIV(argumentCount))))); + assert((remapBufferCount()) == 0); nArgs = GIV(argumentCount); savedStackPointer = GIV(stackPointer); savedFramePointer = GIV(framePointer); @@ -17000,8 +17002,8 @@ /* begin initPrimCall */ GIV(primFailCode) = 0; dispatchFunctionPointer(primitiveFunctionPointer); - assert((remapBufferCount()) == 0); - + /* begin maybeRetryFailureDueToForwarding */ + ; /* begin maybeFailForLastObjectOverwrite */ if (checkAllocFiller) { if (((freeStart()) < GIV(scavengeThreshold)) @@ -18304,30 +18306,25 @@ primitivePropertyFlags(sqInt primIndex) { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt baseFlags; - void (*functionPointer)(void); + sqInt baseFlags1; - /* begin functionPointerFor:inClass: */ - functionPointer = ((void (*)(void)) ((primIndex > MaxPrimitiveIndex - ? 0 - : primitiveTable[primIndex]))); - - baseFlags = (GIV(profileSemaphore) != GIV(nilObj) + /* begin primitivePropertyFlagsForV3: */ + baseFlags1 = (GIV(profileSemaphore) != GIV(nilObj) ? PrimCallNeedsNewMethod + PrimCallCollectsProfileSamples : 0); - if (GIV(longRunningPrimitiveCheckSemaphore) != null) { - baseFlags = baseFlags | PrimCallNeedsNewMethod; + if (!(GIV(longRunningPrimitiveCheckSemaphore) == null)) { + baseFlags1 = baseFlags1 | PrimCallNeedsNewMethod; } - if ((functionPointer == primitiveExternalCall) - || (functionPointer == primitiveCalloutToFFI)) { + null; + if ((primIndex == 117) + || (primIndex == 120)) { /* For callbacks */ - baseFlags = baseFlags | ((PrimCallNeedsNewMethod + PrimCallNeedsPrimitiveFunction) + PrimCallMayCallBack); - if (checkAllocFiller) { - baseFlags = baseFlags | CheckAllocationFillerAfterPrimCall; - } + baseFlags1 = baseFlags1 | ((PrimCallNeedsNewMethod + PrimCallNeedsPrimitiveFunction) + PrimCallMayCallBack); } - return baseFlags; + return baseFlags1; + } void * @@ -20170,6 +20167,7 @@ primTraceLogIndex(GIV(primTraceLogIndex) + 1); } assert(!(isOopForwarded(stackValue(GIV(argumentCount))))); + assert((remapBufferCount()) == 0); nArgs = GIV(argumentCount); savedStackPointer = GIV(stackPointer); savedFramePointer = GIV(framePointer); @@ -20177,8 +20175,8 @@ /* begin initPrimCall */ GIV(primFailCode) = 0; dispatchFunctionPointer(primitiveFunctionPointer); - assert((remapBufferCount()) == 0); - + /* begin maybeRetryFailureDueToForwarding */ + ; /* begin maybeFailForLastObjectOverwrite */ if (checkAllocFiller) { if (((freeStart()) < GIV(scavengeThreshold)) @@ -22832,6 +22830,7 @@ if (ok) { return 1; } + /* begin primitiveFail */ if (!GIV(primFailCode)) { GIV(primFailCode) = 1; @@ -22918,6 +22917,7 @@ } return ((usqLong) smallIntValue); } + /* begin isClassOfNonImm:equalTo:compactClassIndex: */ assert(!((oop & 1))); ccIndex1 = (((usqInt) (longAt(oop))) >> (compactClassFieldLSB())) & 0x1F; @@ -23008,9 +23008,7 @@ } return value; } - else { - ; - } + /* begin isClassOfNonImm:equalTo:compactClassIndex: */ assert(!((oop & 1))); ccIndex = (((usqInt) (longAt(oop))) >> (compactClassFieldLSB())) & 0x1F; @@ -23059,6 +23057,7 @@ } return (oop >> 1); } + /* begin isClassOfNonImm:equalTo:compactClassIndex: */ assert(!((oop & 1))); ccIndex = (((usqInt) (longAt(oop))) >> (compactClassFieldLSB())) & 0x1F; @@ -23113,6 +23112,7 @@ } return value; } + /* begin isClassOfNonImm:equalTo:compactClassIndex: */ assert(!((oop & 1))); ccIndex = (((usqInt) (longAt(oop))) >> (compactClassFieldLSB())) & 0x1F; @@ -30046,6 +30046,7 @@ size = value; goto l1; } + /* begin isClassOfNonImm:equalTo:compactClassIndex: */ assert(!((oop1 & 1))); ccIndex = (((usqInt) (longAt(oop1))) >> (compactClassFieldLSB())) & 0x1F; @@ -33843,6 +33844,7 @@ if ((oop & 1)) { return (oop >> 1); } + /* begin isClassOfNonImm:equalTo:compactClassIndex: */ assert(!((oop & 1))); ccIndex1 = (((usqInt) (longAt(oop))) >> (compactClassFieldLSB())) & 0x1F; @@ -33929,6 +33931,7 @@ if ((oop & 1)) { return ((sqLong) ((oop >> 1))); } + /* begin isClassOfNonImm:equalTo:compactClassIndex: */ assert(!((oop & 1))); ccIndex1 = (((usqInt) (longAt(oop))) >> (compactClassFieldLSB())) & 0x1F; @@ -34034,6 +34037,7 @@ if ((oop & 1)) { return (oop >> 1); } + /* begin isClassOfNonImm:equalTo:compactClassIndex: */ assert(!((oop & 1))); ccIndex1 = (((usqInt) (longAt(oop))) >> (compactClassFieldLSB())) & 0x1F; @@ -43727,6 +43731,11 @@ ok = 0; } } + if (!(GIV(tempOop2) == 0)) { + if (!(checkOopIntegritynamed(GIV(tempOop2), "tempOop2"))) { + ok = 0; + } + } for (i = 1; i <= GIV(jmpDepth); i += 1) { if (!(checkOopIntegritynamedindex(GIV(suspendedCallbacks)[i], "suspendedCallbacks", i))) { ok = 0; @@ -45426,6 +45435,9 @@ do { assert(!(isForwarded(currClass))); + if (!(addressCouldBeClassObj(currClass))) { + return GIV(nilObj); + } classDict = longAt((currClass + BaseHeaderSize) + (MethodDictionaryIndex << ShiftForWord)); assert(!(isForwarded(classDict))); /* begin numSlotsOf: */ @@ -45454,7 +45466,6 @@ findClassOfMethodforReceiver(sqInt meth, sqInt rcvr) { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt ccIndex; - sqInt mclass; sqInt rclass; if ((((rcvr & 1)) @@ -45463,16 +45474,13 @@ && (((((usqInt)rcvr)) < GIV(freeStart)) && (((longAt(rcvr)) & TypeMask) != HeaderTypeGC))))) && (!0)) { - rclass = ((rcvr & 1) + rclass = findClassContainingMethodstartingAt(meth, ((rcvr & 1) ? longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassSmallInteger << ShiftForWord)) : (((ccIndex = (((usqInt) (longAt(rcvr))) >> (compactClassFieldLSB())) & 0x1F)) == 0 ? (longAt(rcvr - BaseHeaderSize)) & AllButTypeMask - : longAt(((longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (CompactClasses << ShiftForWord))) + BaseHeaderSize) + ((ccIndex - 1) << ShiftForWord)))); - if (addressCouldBeClassObj(rclass)) { - rclass = findClassContainingMethodstartingAt(meth, rclass); - if (rclass != GIV(nilObj)) { - return rclass; - } + : longAt(((longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (CompactClasses << ShiftForWord))) + BaseHeaderSize) + ((ccIndex - 1) << ShiftForWord))))); + if (rclass != GIV(nilObj)) { + return rclass; } } if (!((((meth & 3) == 0) @@ -45482,10 +45490,6 @@ && (((((usqInt) (longAt(meth))) >> (instFormatFieldLSB())) & 15) >= 12))) { return GIV(nilObj); } - mclass = safeMethodClassOf(meth); - if (addressCouldBeClassObj(mclass)) { - return GIV(nilObj); - } return findClassContainingMethodstartingAt(meth, safeMethodClassOf(meth)); } @@ -47379,6 +47383,12 @@ && (((longAt(GIV(tempOop))) & MarkBit) != 0)))) { GIV(tempOop) = remapObj(GIV(tempOop)); } + if ((GIV(tempOop2) != 0) + && (((GIV(tempOop2) & 1) == 0) + && (((GIV(tempOop2) & 1) == 0) + && (((longAt(GIV(tempOop2))) & MarkBit) != 0)))) { + GIV(tempOop2) = remapObj(GIV(tempOop2)); + } } @@ -47444,6 +47454,9 @@ if (!(GIV(tempOop) == 0)) { markAndTrace(GIV(tempOop)); } + if (!(GIV(tempOop2) == 0)) { + markAndTrace(GIV(tempOop2)); + } for (i = 1, iLimiT = (remapBufferCount()); i <= iLimiT; i += 1) { oop = GIV(remapBuffer)[i]; if (!((oop & 1))) { @@ -48520,7 +48533,6 @@ sqInt ccIndex1; sqInt ccIndex2; sqInt classObj; - sqInt mclass; sqInt methClass; sqInt methodSel; sqInt rclass; @@ -48535,17 +48547,14 @@ && (((((usqInt)anObject)) < GIV(freeStart)) && (((longAt(anObject)) & TypeMask) != HeaderTypeGC))))) && (!0)) { - rclass = ((anObject & 1) + rclass = findClassContainingMethodstartingAt(aMethod, ((anObject & 1) ? longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassSmallInteger << ShiftForWord)) : (((ccIndex2 = (((usqInt) (longAt(anObject))) >> (compactClassFieldLSB())) & 0x1F)) == 0 ? (longAt(anObject - BaseHeaderSize)) & AllButTypeMask - : longAt(((longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (CompactClasses << ShiftForWord))) + BaseHeaderSize) + ((ccIndex2 - 1) << ShiftForWord)))); - if (addressCouldBeClassObj(rclass)) { - rclass = findClassContainingMethodstartingAt(aMethod, rclass); - if (rclass != GIV(nilObj)) { - methClass = rclass; - goto l1; - } + : longAt(((longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (CompactClasses << ShiftForWord))) + BaseHeaderSize) + ((ccIndex2 - 1) << ShiftForWord))))); + if (rclass != GIV(nilObj)) { + methClass = rclass; + goto l1; } } if (!((((aMethod & 3) == 0) @@ -48556,11 +48565,6 @@ methClass = GIV(nilObj); goto l1; } - mclass = safeMethodClassOf(aMethod); - if (addressCouldBeClassObj(mclass)) { - methClass = GIV(nilObj); - goto l1; - } methClass = findClassContainingMethodstartingAt(aMethod, safeMethodClassOf(aMethod)); l1: /* end findClassOfMethod:forReceiver: */; methodSel = findSelectorOfMethod(aMethod); @@ -51603,6 +51607,7 @@ } return value; } + /* begin isClassOfNonImm:equalTo:compactClassIndex: */ assert(!((integerPointer & 1))); ccIndex = (((usqInt) (longAt(integerPointer))) >> (compactClassFieldLSB())) & 0x1F; @@ -51649,6 +51654,7 @@ if ((integerPointer & 1)) { return (integerPointer >> 1); } + /* begin isClassOfNonImm:equalTo:compactClassIndex: */ assert(!((integerPointer & 1))); ccIndex1 = (((usqInt) (longAt(integerPointer))) >> (compactClassFieldLSB())) & 0x1F; @@ -53430,7 +53436,6 @@ sqInt argumentArray; sqInt arraySize; sqInt ccIndex; - sqInt ctxtRcvr; sqInt firstBytecode; sqInt fmt; sqInt fmt1; @@ -53446,14 +53451,10 @@ sqInt methodHeader; sqInt moduleLength; sqInt moduleName; - sqInt oop; - sqInt oop1; - sqInt oop2; - sqInt oop3; - sqInt oop4; - sqInt oop5; - sqInt oop6; - sqInt oop7; + sqInt object; + sqInt object1; + sqInt object2; + sqInt object3; sqInt primBits; sqInt primRcvr; char *sp; @@ -53470,6 +53471,10 @@ sqInt sz2; sqInt top; sqInt top1; + sqInt valuePointer; + sqInt valuePointer1; + sqInt valuePointer2; + sqInt valuePointer3; argumentArray = longAt(GIV(stackPointer)); methodArg = longAt(GIV(stackPointer) + (2 * BytesPerWord)); @@ -53617,40 +53622,25 @@ (GIV(primFailCode) = -1); return; } - /* begin pushRemappableOop: */ - oop = (argumentArray = popStack()); - assert(addressCouldBeOop(oop)); - GIV(remapBuffer)[(GIV(remapBufferCount) += 1)] = oop; - if (!(GIV(remapBufferCount) <= RemapBufferSize)) { - error("remapBuffer overflow"); - } - /* begin pushRemappableOop: */ - oop1 = (primRcvr = popStack()); - assert(addressCouldBeOop(oop1)); - GIV(remapBuffer)[(GIV(remapBufferCount) += 1)] = oop1; - if (!(GIV(remapBufferCount) <= RemapBufferSize)) { - error("remapBuffer overflow"); - } - /* begin pushRemappableOop: */ + GIV(tempOop) = eeInstantiateClassIndexformatnumSlots(ClassArrayCompactIndex, 2, 4); + /* begin storePointerUnchecked:ofObject:withValue: */ + valuePointer = (argumentArray = popStack()); + longAtput((GIV(tempOop) + BaseHeaderSize) + (0 << ShiftForWord), valuePointer); + /* begin storePointerUnchecked:ofObject:withValue: */ + valuePointer1 = (primRcvr = popStack()); + longAtput((GIV(tempOop) + BaseHeaderSize) + (1 << ShiftForWord), valuePointer1); + /* begin storePointerUnchecked:ofObject:withValue: */ /* begin popStack */ top = longAt(GIV(stackPointer)); GIV(stackPointer) += BytesPerWord; - oop2 = top; - assert(addressCouldBeOop(oop2)); - GIV(remapBuffer)[(GIV(remapBufferCount) += 1)] = oop2; - if (!(GIV(remapBufferCount) <= RemapBufferSize)) { - error("remapBuffer overflow"); - } - /* begin pushRemappableOop: */ + valuePointer2 = top; + longAtput((GIV(tempOop) + BaseHeaderSize) + (2 << ShiftForWord), valuePointer2); + /* begin storePointerUnchecked:ofObject:withValue: */ /* begin popStack */ top1 = longAt(GIV(stackPointer)); GIV(stackPointer) += BytesPerWord; - oop3 = top1; - assert(addressCouldBeOop(oop3)); - GIV(remapBuffer)[(GIV(remapBufferCount) += 1)] = oop3; - if (!(GIV(remapBufferCount) <= RemapBufferSize)) { - error("remapBuffer overflow"); - } + valuePointer3 = top1; + longAtput((GIV(tempOop) + BaseHeaderSize) + (3 << ShiftForWord), valuePointer3); /* begin push: */ longAtput((sp5 = GIV(stackPointer) - BytesPerWord), primRcvr); GIV(stackPointer) = sp5; @@ -53661,6 +53651,7 @@ GIV(stackPointer) = sp; } /* begin callExternalPrimitive: */ + ; dispatchFunctionPointer(addr); /* begin maybeFailForLastObjectOverwrite */ if (checkAllocFiller) { @@ -53669,22 +53660,7 @@ GIV(primFailCode) = PrimErrWritePastObject; } } - /* begin popRemappableOop */ - oop4 = GIV(remapBuffer)[GIV(remapBufferCount)]; - GIV(remapBufferCount) -= 1; - ctxtRcvr = oop4; - /* begin popRemappableOop */ - oop5 = GIV(remapBuffer)[GIV(remapBufferCount)]; - GIV(remapBufferCount) -= 1; - methodArg = oop5; - /* begin popRemappableOop */ - oop6 = GIV(remapBuffer)[GIV(remapBufferCount)]; - GIV(remapBufferCount) -= 1; - primRcvr = oop6; - /* begin popRemappableOop */ - oop7 = GIV(remapBuffer)[GIV(remapBufferCount)]; - GIV(remapBufferCount) -= 1; - argumentArray = oop7; + if (GIV(primFailCode)) { /* If primitive failed, then restore state for failure code */ @@ -53693,16 +53669,20 @@ GIV(stackPointer) += (arraySize + 1) * BytesPerWord; null; /* begin push: */ - longAtput((sp1 = GIV(stackPointer) - BytesPerWord), ctxtRcvr); + object = longAt((GIV(tempOop) + BaseHeaderSize) + (3 << ShiftForWord)); + longAtput((sp1 = GIV(stackPointer) - BytesPerWord), object); GIV(stackPointer) = sp1; /* begin push: */ - longAtput((sp2 = GIV(stackPointer) - BytesPerWord), methodArg); + object1 = longAt((GIV(tempOop) + BaseHeaderSize) + (2 << ShiftForWord)); + longAtput((sp2 = GIV(stackPointer) - BytesPerWord), object1); GIV(stackPointer) = sp2; /* begin push: */ - longAtput((sp3 = GIV(stackPointer) - BytesPerWord), primRcvr); + object2 = longAt((GIV(tempOop) + BaseHeaderSize) + (1 << ShiftForWord)); + longAtput((sp3 = GIV(stackPointer) - BytesPerWord), object2); GIV(stackPointer) = sp3; /* begin push: */ - longAtput((sp4 = GIV(stackPointer) - BytesPerWord), argumentArray); + object3 = longAt((GIV(tempOop) + BaseHeaderSize) + (0 << ShiftForWord)); + longAtput((sp4 = GIV(stackPointer) - BytesPerWord), object3); GIV(stackPointer) = sp4; /* Hack. A nil prim error code (primErrorCode = 1) is interpreted by the image @@ -53725,9 +53705,12 @@ sqInt index; sqInt integerPointer; sqInt nArgs; + sqInt nArgs1; sqInt primIdx; char *savedFramePointer; + char *savedFramePointer1; char *savedStackPointer; + char *savedStackPointer1; char *sp; char *sp1; char *sp2; @@ -53787,6 +53770,7 @@ ? 0 : primitiveTable[primIdx]))); if (primitiveFunctionPointer == 0) { + primitiveFunctionPointer = primitiveDoPrimitiveWithArgs; /* begin primitiveFail */ if (!GIV(primFailCode)) { GIV(primFailCode) = 1; @@ -53820,15 +53804,16 @@ primTraceLogIndex(GIV(primTraceLogIndex) + 1); } assert(!(isOopForwarded(stackValue(GIV(argumentCount))))); - nArgs = GIV(argumentCount); - savedStackPointer = GIV(stackPointer); - savedFramePointer = GIV(framePointer); + assert((remapBufferCount()) == 0); + nArgs1 = GIV(argumentCount); + savedStackPointer1 = GIV(stackPointer); + savedFramePointer1 = GIV(framePointer); /* begin initPrimCall */ GIV(primFailCode) = 0; dispatchFunctionPointer(primitiveFunctionPointer); - assert((remapBufferCount()) == 0); - + /* begin maybeRetryFailureDueToForwarding */ + ; /* begin maybeFailForLastObjectOverwrite */ if (checkAllocFiller) { if (((freeStart()) < GIV(scavengeThreshold)) @@ -53838,14 +53823,14 @@ } if (FailImbalancedPrimitives && ((!GIV(primFailCode)) - && ((GIV(framePointer) == savedFramePointer) + && ((GIV(framePointer) == savedFramePointer1) && (!((((usqInt)(longAt(GIV(framePointer) + FoxMethod)))) < (startOfMemory())))))) { /* Don't fail if primitive has done something radical, e.g. perform: */ - if (GIV(stackPointer) != (savedStackPointer + (nArgs * BytesPerWord))) { + if (GIV(stackPointer) != (savedStackPointer1 + (nArgs1 * BytesPerWord))) { flag("Would be nice to make this a message send of e.g. unbalancedPrimitive to the current process or context"); - GIV(stackPointer) = savedStackPointer; + GIV(stackPointer) = savedStackPointer1; failUnbalancedPrimitive(); } } @@ -53853,6 +53838,7 @@ checkProfileTick(GIV(newMethod)); } !GIV(primFailCode); + if (GIV(primFailCode)) { /* If primitive failed, then restore state for failure code */ @@ -53868,6 +53854,7 @@ /* begin push: */ longAtput((sp2 = GIV(stackPointer) - BytesPerWord), GIV(tempOop)); GIV(stackPointer) = sp2; + primitiveFunctionPointer = primitiveDoPrimitiveWithArgs; GIV(argumentCount) = 2; } GIV(tempOop) = 0; @@ -54113,6 +54100,7 @@ if (addr != 0) { rewriteMethodCacheEntryForExternalPrimitiveToFunction(addr); /* begin callExternalPrimitive: */ + ; dispatchFunctionPointer(addr); /* begin maybeFailForLastObjectOverwrite */ if (checkAllocFiller) { @@ -54121,6 +54109,8 @@ GIV(primFailCode) = PrimErrWritePastObject; } } + /* begin maybeRetryFailureDueToForwarding */ + ; return; } (GIV(primFailCode) = PrimErrNamedInternal); @@ -54205,6 +54195,7 @@ if (index >= 0) { rewriteMethodCacheEntryForExternalPrimitiveToFunction(addr); /* begin callExternalPrimitive: */ + ; dispatchFunctionPointer(addr); /* begin maybeFailForLastObjectOverwrite */ if (checkAllocFiller) { @@ -54213,6 +54204,8 @@ GIV(primFailCode) = PrimErrWritePastObject; } } + /* begin maybeRetryFailureDueToForwarding */ + ; } else { Modified: branches/Cog/nsspursrc/vm/cogit.c =================================================================== --- branches/Cog/nsspursrc/vm/cogit.c 2014-10-31 19:11:22 UTC (rev 3119) +++ branches/Cog/nsspursrc/vm/cogit.c 2014-10-31 19:13:28 UTC (rev 3120) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.911 uuid: 39c7bff8-ff88-43a5-88bc-cbbdb206cbcd + CCodeGenerator VMMaker.oscog-eem.916 uuid: 79925bdf-769f-446f-8532-f04f0e2f11ae from - StackToRegisterMappingCogit VMMaker.oscog-eem.911 uuid: 39c7bff8-ff88-43a5-88bc-cbbdb206cbcd + StackToRegisterMappingCogit VMMaker.oscog-eem.916 uuid: 79925bdf-769f-446f-8532-f04f0e2f11ae */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.911 uuid: 39c7bff8-ff88-43a5-88bc-cbbdb206cbcd " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.916 uuid: 79925bdf-769f-446f-8532-f04f0e2f11ae " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -18332,18 +18332,16 @@ /* If primIndex has an accessorDepth, check for primitive failure and call - ceCheckForAndFollowForwardedPrimitiveStateFor:. If ceCheck.... answers + ceCheckForAndFollowForwardedPrimitiveState if so If ceCheck.... answers true, retry the primitive. */ static sqInt maybeCompileRetryonPrimitiveFail(AbstractInstruction *retryInst, sqInt primIndex) { - sqInt accessorDepth; sqInt address; AbstractInstruction *jmp; - accessorDepth = accessorDepthForPrimitiveIndex(primIndex); - if (accessorDepth < 0) { + if ((accessorDepthForPrimitiveIndex(primIndex)) < 0) { return 0; } /* begin MoveAw:R: */ @@ -18353,7 +18351,7 @@ genoperandoperand(CmpCqR, 0, TempReg); /* begin JumpZero: */ jmp = genoperand(JumpZero, ((sqInt)0)); - compileCallFornumArgsargargargargresultRegsaveRegs(ceCheckForAndFollowForwardedPrimitiveStateFor, 1, primIndex, null, null, null, TempReg, 0); + compileCallFornumArgsargargargargresultRegsaveRegs(ceCheckForAndFollowForwardedPrimitiveState, 0, null, null, null, null, TempReg, 0); /* begin CmpCq:R: */ genoperandoperand(CmpCqR, 0, TempReg); /* begin JumpNonZero: */ Modified: branches/Cog/nsspursrc/vm/cogit.h =================================================================== --- branches/Cog/nsspursrc/vm/cogit.h 2014-10-31 19:11:22 UTC (rev 3119) +++ branches/Cog/nsspursrc/vm/cogit.h 2014-10-31 19:13:28 UTC (rev 3120) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.911 uuid: 39c7bff8-ff88-43a5-88bc-cbbdb206cbcd + CCodeGenerator VMMaker.oscog-eem.916 uuid: 79925bdf-769f-446f-8532-f04f0e2f11ae */ Modified: branches/Cog/nsspursrc/vm/cointerp.c =================================================================== --- branches/Cog/nsspursrc/vm/cointerp.c 2014-10-31 19:11:22 UTC (rev 3119) +++ branches/Cog/nsspursrc/vm/cointerp.c 2014-10-31 19:13:28 UTC (rev 3120) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.915 uuid: 4159cf52-4807-4416-9da6-1c46ec5b9f10 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.916 uuid: 79925bdf-769f-446f-8532-f04f0e2f11ae from - CoInterpreter VMMaker.oscog-eem.915 uuid: 4159cf52-4807-4416-9da6-1c46ec5b9f10 + CoInterpreter VMMaker.oscog-eem.916 uuid: 79925bdf-769f-446f-8532-f04f0e2f11ae */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.915 uuid: 4159cf52-4807-4416-9da6-1c46ec5b9f10 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.916 uuid: 79925bdf-769f-446f-8532-f04f0e2f11ae " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -288,7 +288,6 @@ #define ObjStackTopx 0 #define OldBecameNewFlag 4 #define PrimCallCollectsProfileSamples 8 -#define PrimCallDoNotJIT 32 #define PrimCallMayCallBack 4 #define PrimCallNeedsNewMethod 1 #define PrimCallNeedsPrimitiveFunction 2 @@ -409,7 +408,7 @@ sqInt ceActiveContext(void); sqInt ceBaseFrameReturn(sqInt returnValue); sqInt ceCannotResume(void); -sqInt ceCheckForAndFollowForwardedPrimitiveStateFor(sqInt primIndex); +sqInt ceCheckForAndFollowForwardedPrimitiveState(void); void ceCheckForInterrupts(void); void ceCheckProfileTick(void); sqInt ceContextinstVar(sqInt maybeContext, sqInt slotIndex); @@ -544,6 +543,7 @@ static sqInt returntoExecutive(sqInt returnValue, sqInt inInterpreter) NoDbgRegParms; static void rewriteMethodCacheEntryForExternalPrimitiveToFunction(void (*localPrimAddress)(void)) NoDbgRegParms; static sqInt roomToPushNArgs(sqInt n) NoDbgRegParms; +static sqInt saneFunctionPointerForFailureOfPrimIndex(sqInt primIndex) NoDbgRegParms; EXPORT(sqInt) sendInvokeCallbackContext(VMCallbackContext *vmCallbackContext); EXPORT(sqInt) sendInvokeCallbackStackRegistersJmpbuf(sqInt thunkPtr, sqInt stackPtr, sqInt regsPtr, sqInt jmpBufPtr); static sqInt shortPrintFrame(char *theFP) NoDbgRegParms; @@ -791,7 +791,6 @@ long signedMachineIntegerValueOf(sqInt oop); usqInt sizeOfAlienData(sqInt oop); void * startOfAlienData(sqInt oop); -static sqInt successful(void); sqInt success(sqInt successBoolean); static sqInt addressIsInPage(StackPage * self_in_addressIsInPage, char *address) NoDbgRegParms; static sqInt isFree(StackPage * self_in_isFree) NoDbgRegParms; @@ -1213,7 +1212,7 @@ sqInt checkAllAccessibleObjectsOkay(void); static sqInt checkDeliveryOfLongRunningPrimitiveSignal(void); sqInt checkedIntegerValueOf(sqInt intOop); -static sqInt checkForAndFollowForwardedPrimitiveStateFor(sqInt primIndex) NoDbgRegParms; +static sqInt checkForAndFollowForwardedPrimitiveState(void); static sqInt checkForEventsMayContextSwitch(sqInt mayContextSwitch) NoDbgRegParms; static sqInt checkImageVersionFromstartingAt(sqImageFile f, squeakFileOffsetType imageOffset) NoDbgRegParms; static sqInt checkInterpreterIntegrity(void); @@ -1522,8 +1521,8 @@ _iss sqInt argumentCount; _iss sqInt markStack; _iss usqInt instructionPointer; +_iss sqInt messageSelector; _iss usqInt newMethod; -_iss sqInt messageSelector; _iss sqInt hiddenRootsObj; _iss usqInt newSpaceLimit; _iss StackPage * pages; @@ -1535,37 +1534,38 @@ _iss sqInt needGCFlag; _iss sqInt trueObj; _iss sqInt falseObj; -_iss sqInt remapBufferCount; _iss usqInt totalFreeOldSpace; _iss usqInt pastSpaceStart; _iss sqInt bytesPerPage; _iss sqInt numSegments; _iss sqInt traceLogIndex; _iss usqInt scavengeThreshold; +_iss sqInt remapBufferCount; _iss char * stackLimit; _iss sqInt * freeLists; _iss sqInt rememberedSetSize; +_iss sqInt tempOop; _iss sqInt * rememberedSet; _iss usqInt freeListsMask; _iss sqInt profileProcess; _iss sqInt classTableFirstPage; +_iss unsigned char primTraceLogIndex; +_iss sqInt profileSemaphore; _iss sqInt longRunningPrimitiveCheckSemaphore; -_iss sqInt profileSemaphore; _iss SpurContiguousObjStack unscannedEphemerons; _iss usqInt firstFreeChunk; -_iss unsigned char primTraceLogIndex; _iss sqInt profileMethod; @@ Diff output truncated at 50000 characters. @@

1 0

[commit][3119] Rescue the win32 build after the ARM fast bitblt changes.
by commits＠squeakvm.org 31 Oct '14

31 Oct '14

Revision: 3119 Author: eliot Date: 2014-10-31 12:11:22 -0700 (Fri, 31 Oct 2014) Log Message: ----------- Rescue the win32 build after the ARM fast bitblt changes. Added Paths: ----------- trunk/platforms/win32/plugins/BitBltPlugin/ trunk/platforms/win32/plugins/BitBltPlugin/Makefile Added: trunk/platforms/win32/plugins/BitBltPlugin/Makefile =================================================================== --- trunk/platforms/win32/plugins/BitBltPlugin/Makefile (rev 0) +++ trunk/platforms/win32/plugins/BitBltPlugin/Makefile 2014-10-31 19:11:22 UTC (rev 3119) @@ -0,0 +1,10 @@ +# Override to avoid files in platforms/Cross/plugins/BitBltPlugin. +# Fails if one redefines VPATH and then includes ../../Makefile.plugin. Grrr... + +WIN32DIR:= $(PLATDIR)/win32/plugins/$(LIBNAME) +MAKERDIR:= $(PLUGINSRCDIR)/plugins/$(LIBNAME) +OBJDIR:= $(BASEDIR)/$(BUILD)/$(LIBNAME) + +%: + $(MAKE) -f ../../Makefile.plugin VPATH="$(MAKERDIR) $(WIN32DIR) $(OBJDIR)" \ + CROSSSRC="" $@

1 0

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

31 Oct '14

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.916.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.916 Author: eem Time: 31 October 2014, 12:03:13.052 pm UUID: 79925bdf-769f-446f-8532-f04f0e2f11ae Ancestors: VMMaker.oscog-eem.915 Spur: Reimplement deriving the accessorDepth and retrying primitives on primitive failure machinery. Always take the primitive index from newMethod (setting newMethod to a SmallInteger for primitiveDoPrimitiveWithArgs. Have the Cogit always set primitiveFunctionPointer and newMethod for the retry, Add isNonInteger(Non)Immediate: and use it in several of the integer conversion routines that were missing code to exclude Character immediates, with fatal consequences. With these changes the Pharo 4 test suite runs without crashing on the latest Pharo Spur boot image. =============== Diff against VMMaker.oscog-eem.915 =============== Item was changed: ----- Method: CoInterpreter>>ceActivateFailingPrimitiveMethod: (in category 'enilopmarts') ----- ceActivateFailingPrimitiveMethod: aPrimitiveMethod "An external call or FFI primitive has failed. Build the frame and activate as appropriate. Enter either the interpreter or machine code depending on whether aPrimitiveMethod has been or is still cogged. Note that we could always interpret but want the efficiency of executing machine code if it is available." <api> | methodHeader | self assert: primFailCode ~= 0. self assert: newMethod = aPrimitiveMethod. "If we're on Spur, check for forwarders and retry, returning if successful the second time around." (objectMemory hasSpurMemoryManagerAPI + and: [self checkForAndFollowForwardedPrimitiveState]) ifTrue: - and: [(objectMemory isOopCompiledMethod: newMethod) - and: [self checkForAndFollowForwardedPrimitiveState]]) ifTrue: [self initPrimCall. self cCode: [self dispatchFunctionPointer: primitiveFunctionPointer] inSmalltalk: [| evaluable | evaluable := primitiveFunctionPointer isInteger ifTrue: [cogit simulatedTrampolines at: primitiveFunctionPointer] ifFalse: [primitiveFunctionPointer]. evaluable isMessageSend ifTrue: [self assert: evaluable receiver == self] ifFalse: [self assert: evaluable isBlock]. evaluable value]. self successful ifTrue: [^self]]. methodHeader := self rawHeaderOf: aPrimitiveMethod. (self isCogMethodReference: methodHeader) ifTrue: [self activateCoggedNewMethod: false] ifFalse: [self activateNewMethod]! Item was added: + ----- Method: CoInterpreter>>ceCheckForAndFollowForwardedPrimitiveState (in category 'cog jit support') ----- + ceCheckForAndFollowForwardedPrimitiveState + "In Spur a primitive may fail due to encountering a forwarder. + On failure check the accessorDepth for the primitive and + if non-negative scan the args to the depth, following any + forwarders. Answer if any are found so the prim can be retried." + <api> + <option: #SpurObjectMemory> + ^self cCode: [self checkForAndFollowForwardedPrimitiveState] + inSmalltalk: [(self checkForAndFollowForwardedPrimitiveState) + ifTrue: [1] + ifFalse: [0]]! Item was removed: - ----- Method: CoInterpreter>>ceCheckForAndFollowForwardedPrimitiveStateFor: (in category 'cog jit support') ----- - ceCheckForAndFollowForwardedPrimitiveStateFor: primIndex - "In Spur a primitive may fail due to encountering a forwarder. - On failure check the accessorDepth for the primitive and - if non-negative scan the args to the depth, following any - forwarders. Answer if any are found so the prim can be retried." - <api> - <option: #SpurObjectMemory> - ^self cCode: [self checkForAndFollowForwardedPrimitiveStateFor: primIndex] - inSmalltalk: [(self checkForAndFollowForwardedPrimitiveStateFor: primIndex) - ifTrue: [1] - ifFalse: [0]]! Item was changed: ----- Method: CoInterpreter>>primitivePropertyFlags: (in category 'cog jit support') ----- primitivePropertyFlags: primIndex <api> "Answer any special requirements of the given primitive" + objectMemory hasSpurMemoryManagerAPI + ifTrue: [^self primitivePropertyFlagsForSpur: primIndex] + ifFalse: [^self primitivePropertyFlagsForV3: primIndex]! - | baseFlags functionPointer | - <var: #functionPointer declareC: 'void (*functionPointer)(void)'> - functionPointer := self functionPointerFor: primIndex inClass: nil. - - "The complications of following forwarding pointers in machine code on failures - of primitives called indirectly through primitiveDoNamedPrimitiveWithArgs are not - worth dealing with, as primitiveDoNamedPrimitiveWithArgs is used only in debugging." - (objectMemory hasSpurMemoryManagerAPI - and: [functionPointer = #primitiveDoNamedPrimitiveWithArgs]) ifTrue: - [^PrimCallDoNotJIT]. - - baseFlags := profileSemaphore ~= objectMemory nilObject - ifTrue: [PrimCallNeedsNewMethod + PrimCallCollectsProfileSamples] - ifFalse: [0]. - - longRunningPrimitiveCheckSemaphore ~= nil ifTrue: - [baseFlags := baseFlags bitOr: PrimCallNeedsNewMethod]. - - (functionPointer == #primitiveExternalCall - or: [functionPointer == #primitiveCalloutToFFI]) ifTrue: "For callbacks" - [baseFlags := baseFlags bitOr: PrimCallNeedsNewMethod + PrimCallNeedsPrimitiveFunction + PrimCallMayCallBack. - checkAllocFiller ifTrue: - [baseFlags := baseFlags bitOr: CheckAllocationFillerAfterPrimCall]]. - - ^baseFlags! Item was added: + ----- Method: CoInterpreter>>primitivePropertyFlagsForSpur: (in category 'cog jit support') ----- + primitivePropertyFlagsForSpur: primIndex + <inline: true> + "Answer any special requirements of the given primitive. Spur always needs to set + primitiveFunctionPointer and newMethod so primitives can retry on failure due to forwarders." + | baseFlags | + baseFlags := PrimCallNeedsPrimitiveFunction + PrimCallNeedsNewMethod. + profileSemaphore ~= objectMemory nilObject ifTrue: + [baseFlags := baseFlags bitOr: PrimCallCollectsProfileSamples]. + + self cCode: [] inSmalltalk: [#(primitiveExternalCall primitiveCalloutToFFI)]. "For senders..." + (primIndex == 117 "#primitiveExternalCall" + or: [primIndex == 120 "#primitiveCalloutToFFI"]) ifTrue: "For callbacks" + [baseFlags := baseFlags bitOr: PrimCallMayCallBack. + checkAllocFiller ifTrue: + [baseFlags := baseFlags bitOr: CheckAllocationFillerAfterPrimCall]]. + + ^baseFlags! Item was added: + ----- Method: CoInterpreter>>primitivePropertyFlagsForV3: (in category 'cog jit support') ----- + primitivePropertyFlagsForV3: primIndex + <inline: true> + "Answer any special requirements of the given primitive" + | baseFlags | + baseFlags := profileSemaphore ~= objectMemory nilObject + ifTrue: [PrimCallNeedsNewMethod + PrimCallCollectsProfileSamples] + ifFalse: [0]. + + longRunningPrimitiveCheckSemaphore ifNotNil: + [baseFlags := baseFlags bitOr: PrimCallNeedsNewMethod]. + + self cCode: [] inSmalltalk: [#(primitiveExternalCall primitiveCalloutToFFI)]. "For senders..." + (primIndex == 117 "#primitiveExternalCall" + or: [primIndex == 120 "#primitiveCalloutToFFI"]) ifTrue: "For callbacks" + [baseFlags := baseFlags bitOr: PrimCallNeedsNewMethod + PrimCallNeedsPrimitiveFunction + PrimCallMayCallBack]. + + ^baseFlags! Item was added: + ----- Method: CoInterpreter>>saneFunctionPointerForFailureOfPrimIndex: (in category 'primitive support') ----- + saneFunctionPointerForFailureOfPrimIndex: primIndex + ^instructionPointer >= objectMemory nilObject asUnsignedInteger + ifTrue: + [super saneFunctionPointerForFailureOfPrimIndex: primIndex] + ifFalse: + [self + cCode: + [primitiveFunctionPointer = (self functionPointerFor: primIndex + inClass: objectMemory nilObject)] + inSmalltalk: + [(primitiveFunctionPointer isInteger + ifTrue: + [(cogit lookupAddress: primitiveFunctionPointer) + endsWith: (self functionPointerFor: primIndex + inClass: objectMemory nilObject)] + ifFalse: + [primitiveFunctionPointer = (self functionPointerFor: primIndex + inClass: objectMemory nilObject)])]]! Item was changed: ----- Method: CoInterpreterMT>>markAndTraceInterpreterOops: (in category 'object memory support') ----- markAndTraceInterpreterOops: fullGCFlag "Mark and trace all oops in the interpreter's state." "Assume: All traced variables contain valid oops. N.B. Don't trace messageSelector and lkupClass; these are ephemeral, live only during message lookup and because createActualMessageTo will not cause a GC these cannot change during message lookup." | oop | <var: #vmThread type: #'CogVMThread *'> "Must mark stack pages first to initialize the per-page trace flags for full garbage collect before any subsequent tracing." self markAndTraceStackPages: fullGCFlag. self markAndTraceTraceLog. self markAndTracePrimTraceLog. objectMemory markAndTrace: objectMemory specialObjectsOop. "also covers nilObj, trueObj, falseObj, and compact classes" (objectMemory isImmediate: newMethod) ifFalse: [objectMemory markAndTrace: newMethod]. self traceProfileState. tempOop = 0 ifFalse: [objectMemory markAndTrace: tempOop]. + tempOop2 = 0 ifFalse: [objectMemory markAndTrace: tempOop2]. 1 to: objectMemory remapBufferCount do: [:i| oop := objectMemory remapBuffer at: i. (objectMemory isIntegerObject: oop) ifFalse: [objectMemory markAndTrace: oop]]. "Callback support - trace suspended callback list - will be made per-thread soon" 1 to: jmpDepth do: [:i| oop := suspendedCallbacks at: i. (objectMemory isIntegerObject: oop) ifFalse: [objectMemory markAndTrace: oop]. oop := suspendedMethods at: i. (objectMemory isIntegerObject: oop) ifFalse: [objectMemory markAndTrace: oop]]. "Per-thread state; trace each thread's own newMethod and stack of awol processes." 1 to: cogThreadManager getNumThreads do: [:i| | vmThread | vmThread := cogThreadManager vmThreadAt: i. vmThread state notNil ifTrue: [vmThread newMethodOrNull notNil ifTrue: [objectMemory markAndTrace: vmThread newMethodOrNull]. 0 to: vmThread awolProcIndex - 1 do: [:j| objectMemory markAndTrace: (vmThread awolProcesses at: j)]]]! Item was added: + ----- Method: CogObjectRepresentation>>maybeCompileRetry:onPrimitiveFail:primPropertyFlags: (in category 'primitive generators') ----- + maybeCompileRetry: retryInst onPrimitiveFail: primIndex primPropertyFlags: flags + <var: #retryInst type: #'AbstractInstruction *'> + "Object representations with lazy forwarding will want to check for + forwarding pointers on primitive failure and retry the primitive if found. + By default do nothing."! Item was changed: ----- Method: CogObjectRepresentationForSpur>>maybeCompileRetry:onPrimitiveFail: (in category 'primitive generators') ----- maybeCompileRetry: retryInst onPrimitiveFail: primIndex <var: #retryInst type: #'AbstractInstruction *'> "If primIndex has an accessorDepth, check for primitive failure and call + ceCheckForAndFollowForwardedPrimitiveState if so If ceCheck.... answers - ceCheckForAndFollowForwardedPrimitiveStateFor:. If ceCheck.... answers true, retry the primitive." + | jmp | - | accessorDepth jmp | <var: #jmp type: #'AbstractInstruction *'> + (coInterpreter accessorDepthForPrimitiveIndex: primIndex) < 0 ifTrue: - accessorDepth := coInterpreter accessorDepthForPrimitiveIndex: primIndex. - accessorDepth < 0 ifTrue: [^0]. cogit MoveAw: coInterpreter primFailCodeAddress R: TempReg. cogit CmpCq: 0 R: TempReg. jmp := cogit JumpZero: 0. cogit + compileCallFor: #ceCheckForAndFollowForwardedPrimitiveState + numArgs: 0 - compileCallFor: #ceCheckForAndFollowForwardedPrimitiveStateFor: - numArgs: 1 - arg: primIndex arg: nil arg: nil arg: nil + arg: nil resultReg: TempReg saveRegs: false. cogit CmpCq: 0 R: TempReg. cogit JumpNonZero: retryInst. jmp jmpTarget: cogit Label. ^0! Item was changed: ----- Method: CogVMSimulator>>callExternalPrimitive: (in category 'plugin support') ----- callExternalPrimitive: mapIndex | entry | entry := self pluginEntryFor: mapIndex. + "Spur needs the primitiveFunctionPointer to be set correctly + for accurate following of forwarders on primitive failure." + objectMemory hasSpurMemoryManagerAPI ifTrue: + [primitiveFunctionPointer := entry at: 2]. ^(entry at: 1) perform: (entry at: 2)! Item was changed: ----- Method: InterpreterPrimitives>>isNegativeIntegerValueOf: (in category 'primitive support') ----- isNegativeIntegerValueOf: oop "Answer true if integer object is negative. Fail if object pointed by oop i not an integer." | ok smallInt | + (objectMemory isIntegerObject: oop) ifTrue: + [smallInt := objectMemory integerValueOf: oop. + ^smallInt < 0]. + + (objectMemory isNonIntegerNonImmediate: oop) ifTrue: + [ok := objectMemory isClassOfNonImm: oop + equalTo: (objectMemory splObj: ClassLargePositiveInteger) + compactClassIndex: ClassLargePositiveIntegerCompactIndex. + ok ifTrue: [^false]. + + ok := objectMemory isClassOfNonImm: oop + equalTo: (objectMemory splObj: ClassLargeNegativeInteger) + compactClassIndex: ClassLargeNegativeIntegerCompactIndex. + ok ifTrue: [^true]]. - (objectMemory isIntegerObject: oop) - ifTrue: - [smallInt := objectMemory integerValueOf: oop. - ^smallInt < 0]. - - ok := objectMemory isClassOfNonImm: oop - equalTo: (objectMemory splObj: ClassLargePositiveInteger) - compactClassIndex: ClassLargePositiveIntegerCompactIndex. - ok ifTrue: [^false]. - - ok := objectMemory isClassOfNonImm: oop - equalTo: (objectMemory splObj: ClassLargeNegativeInteger) - compactClassIndex: ClassLargeNegativeIntegerCompactIndex. - ok ifTrue: [^true]. self primitiveFail. ^false! Item was changed: ----- Method: InterpreterPrimitives>>magnitude64BitValueOf: (in category 'primitive support') ----- magnitude64BitValueOf: oop "Convert the given object into an integer value. The object may be either a positive SmallInteger or a eight-byte LargeInteger." | sz value ok smallIntValue | <returnTypeC: #usqLong> <var: #value type: #usqLong> (objectMemory isIntegerObject: oop) ifTrue: [smallIntValue := (objectMemory integerValueOf: oop). smallIntValue < 0 ifTrue: [smallIntValue := 0 - smallIntValue]. ^self cCoerce: smallIntValue to: #usqLong]. + (objectMemory isNonIntegerImmediate: oop) ifTrue: + [^self primitiveFail]. + ok := objectMemory isClassOfNonImm: oop equalTo: (objectMemory splObj: ClassLargePositiveInteger) compactClassIndex: ClassLargePositiveIntegerCompactIndex. ok ifFalse: [ok := objectMemory isClassOfNonImm: oop equalTo: (objectMemory splObj: ClassLargeNegativeInteger) compactClassIndex: ClassLargeNegativeIntegerCompactIndex. ok ifFalse: [^self primitiveFail]]. sz := objectMemory lengthOf: oop. sz > (self sizeof: #sqLong) ifTrue: [^self primitiveFail]. value := 0. 0 to: sz - 1 do: [:i | value := value + ((self cCoerce: (objectMemory fetchByte: i ofObject: oop) to: #sqLong) << (i*8))]. ^value! Item was changed: ----- Method: InterpreterPrimitives>>positive32BitValueOf: (in category 'primitive support') ----- positive32BitValueOf: oop "Convert the given object into an integer value. The object may be either a positive SmallInteger or a four-byte LargePositiveInteger." <returnTypeC: #usqInt> | value ok | + (objectMemory isIntegerObject: oop) ifTrue: + [value := objectMemory integerValueOf: oop. + value < 0 ifTrue: [self primitiveFail. value := 0]. + ^value]. - (objectMemory isIntegerObject: oop) - ifTrue: - [value := objectMemory integerValueOf: oop. - value < 0 ifTrue: [self primitiveFail. value := 0]. - ^value] - ifFalse: - [(objectMemory hasSpurMemoryManagerAPI - and: [objectMemory isImmediate: oop]) ifTrue: - [self primitiveFail. - ^0]]. + (objectMemory isNonIntegerImmediate: oop) ifTrue: + [self primitiveFail. + ^0]. + ok := objectMemory isClassOfNonImm: oop equalTo: (objectMemory splObj: ClassLargePositiveInteger) compactClassIndex: ClassLargePositiveIntegerCompactIndex. (ok and: [(objectMemory lengthOf: oop) = 4]) ifFalse: [self primitiveFail. ^0]. ^(objectMemory fetchByte: 0 ofObject: oop) + ((objectMemory fetchByte: 1 ofObject: oop) << 8) + ((objectMemory fetchByte: 2 ofObject: oop) << 16) + ((objectMemory fetchByte: 3 ofObject: oop) << 24)! Item was changed: ----- Method: InterpreterPrimitives>>positive64BitValueOf: (in category 'primitive support') ----- positive64BitValueOf: oop "Convert the given object into an integer value. The object may be either a positive SmallInteger or an eight-byte LargePositiveInteger." <returnTypeC: #usqLong> | sz value ok | <var: #value type: #usqLong> (objectMemory isIntegerObject: oop) ifTrue: [(objectMemory integerValueOf: oop) < 0 ifTrue: [^self primitiveFail]. ^objectMemory integerValueOf: oop]. + (objectMemory isNonIntegerImmediate: oop) ifTrue: + [self primitiveFail. + ^0]. + ok := objectMemory isClassOfNonImm: oop equalTo: (objectMemory splObj: ClassLargePositiveInteger) compactClassIndex: ClassLargePositiveIntegerCompactIndex. (ok and: [(sz := objectMemory lengthOf: oop) <= (self sizeof: #sqLong)]) ifFalse: [^self primitiveFail]. value := 0. 0 to: sz - 1 do: [:i | value := value + ((self cCoerce: (objectMemory fetchByte: i ofObject: oop) to: #usqLong) << (i*8))]. ^value! Item was changed: ----- Method: InterpreterPrimitives>>positiveMachineIntegerValueOf: (in category 'primitive support') ----- positiveMachineIntegerValueOf: oop "Answer a value of an integer in address range, i.e up to the size of a machine word. The object may be either a positive SmallInteger or a LargePositiveInteger of size <= word size." <returnTypeC: #'unsigned long'> <inline: true> "only two callers & one is primitiveNewWithArg" | value bs ok | (objectMemory isIntegerObject: oop) ifTrue: [value := objectMemory integerValueOf: oop. value < 0 ifTrue: [^self primitiveFail]. ^value]. + (objectMemory isNonIntegerImmediate: oop) ifTrue: + [^self primitiveFail]. + ok := objectMemory isClassOfNonImm: oop equalTo: (objectMemory splObj: ClassLargePositiveInteger) compactClassIndex: ClassLargePositiveIntegerCompactIndex. (ok and: [(bs := objectMemory lengthOf: oop) <= (self sizeof: #'unsigned long')]) ifFalse: [^self primitiveFail]. ((self sizeof: #'unsigned long') = 8 and: [bs > 4]) ifTrue: [^ (objectMemory fetchByte: 0 ofObject: oop) + ((objectMemory fetchByte: 1 ofObject: oop) << 8) + ((objectMemory fetchByte: 2 ofObject: oop) << 16) + ((objectMemory fetchByte: 3 ofObject: oop) << 24) + ((objectMemory fetchByte: 4 ofObject: oop) << 32) + ((objectMemory fetchByte: 5 ofObject: oop) << 40) + ((objectMemory fetchByte: 6 ofObject: oop) << 48) + ((objectMemory fetchByte: 7 ofObject: oop) << 56)]. ^ (objectMemory fetchByte: 0 ofObject: oop) + ((objectMemory fetchByte: 1 ofObject: oop) << 8) + ((objectMemory fetchByte: 2 ofObject: oop) << 16) + ((objectMemory fetchByte: 3 ofObject: oop) << 24)! Item was changed: ----- Method: InterpreterPrimitives>>signed32BitValueOf: (in category 'primitive support') ----- signed32BitValueOf: oop "Convert the given object into an integer value. The object may be either a positive SmallInteger or a four-byte LargeInteger." | value negative ok | <inline: false> <returnTypeC: #int> <var: #value type: #int> (objectMemory isIntegerObject: oop) ifTrue: [^objectMemory integerValueOf: oop]. + (objectMemory isNonIntegerImmediate: oop) ifTrue: + [^self primitiveFail]. + ok := objectMemory isClassOfNonImm: oop equalTo: (objectMemory splObj: ClassLargePositiveInteger) compactClassIndex: ClassLargePositiveIntegerCompactIndex. ok ifTrue: [negative := false] ifFalse: [negative := true. ok := objectMemory isClassOfNonImm: oop equalTo: (objectMemory splObj: ClassLargeNegativeInteger) compactClassIndex: ClassLargeNegativeIntegerCompactIndex. ok ifFalse: [^self primitiveFail]]. (objectMemory lengthOf: oop) > 4 ifTrue: [^self primitiveFail]. value := (objectMemory fetchByte: 0 ofObject: oop) + ((objectMemory fetchByte: 1 ofObject: oop) << 8) + ((objectMemory fetchByte: 2 ofObject: oop) << 16) + ((objectMemory fetchByte: 3 ofObject: oop) << 24). self cCode: [] inSmalltalk: [(value anyMask: 16r80000000) ifTrue: [value := value - 16r100000000]]. "Filter out values out of range for the signed interpretation such as 16rFFFFFFFF (positive w/ bit 32 set) and -16rFFFFFFFF (negative w/ bit 32 set). Since the sign is implicit in the class we require that the high bit of the magnitude is not set which is a simple test here. Note that we have to handle the most negative 32-bit value -2147483648 specially." value < 0 ifTrue: [self assert: (self sizeof: value) == 4. "Don't fail for -16r80000000/-2147483648 Alas the simple (negative and: [value - 1 > 0]) isn't adequate since in C the result of signed integer overflow is undefined and hence under optimization this may fail. The shift, however, is well-defined." (negative and: [0 = (self cCode: [value << 1] inSmalltalk: [value << 1 bitAnd: (1 << 32) - 1])]) ifTrue: [^value]. ^self primitiveFail]. ^negative ifTrue: [0 - value] ifFalse: [value]! Item was changed: ----- Method: InterpreterPrimitives>>signed64BitValueOf: (in category 'primitive support') ----- signed64BitValueOf: oop "Convert the given object into an integer value. The object may be either a positive SmallInteger or a eight-byte LargeInteger." | sz value negative ok | <inline: false> <returnTypeC: #sqLong> <var: #value type: #sqLong> (objectMemory isIntegerObject: oop) ifTrue: [^self cCoerce: (objectMemory integerValueOf: oop) to: #sqLong]. + (objectMemory isNonIntegerImmediate: oop) ifTrue: + [^self primitiveFail]. + ok := objectMemory isClassOfNonImm: oop equalTo: (objectMemory splObj: ClassLargePositiveInteger) compactClassIndex: ClassLargePositiveIntegerCompactIndex. ok ifTrue: [negative := false] ifFalse: [negative := true. ok := objectMemory isClassOfNonImm: oop equalTo: (objectMemory splObj: ClassLargeNegativeInteger) compactClassIndex: ClassLargeNegativeIntegerCompactIndex. ok ifFalse: [^self primitiveFail]]. sz := objectMemory lengthOf: oop. sz > (self sizeof: #sqLong) ifTrue: [^self primitiveFail]. value := 0. 0 to: sz - 1 do: [:i | value := value + ((self cCoerce: (objectMemory fetchByte: i ofObject: oop) to: #sqLong) << (i*8))]. "Filter out values out of range for the signed interpretation such as 16rFFFFFFFF... (positive w/ bit 64 set) and -16rFFFFFFFF... (negative w/ bit 64 set). Since the sign is implicit in the class we require that the high bit of the magnitude is not set which is a simple test here. Note that we have to handle the most negative 64-bit value -9223372036854775808 specially." self cCode: [] inSmalltalk: [(value anyMask: 16r8000000000000000) ifTrue: [value := value - 16r10000000000000000]]. value < 0 ifTrue: [self cCode: [self assert: (self sizeof: value) == 8. self assert: (self sizeof: value << 1) == 8]. "Don't fail for -9223372036854775808/-16r8000000000000000. Alas the simple (negative and: [value - 1 > 0]) isn't adequate since in C the result of signed integer overflow is undefined and hence under optimization this may fail. The shift, however, is well-defined." (negative and: [0 = (self cCode: [value << 1] inSmalltalk: [value << 1 bitAnd: (1 << 64) - 1])]) ifTrue: [^value]. ^self primitiveFail]. ^negative ifTrue:[0 - value] ifFalse:[value]! Item was changed: ----- Method: InterpreterPrimitives>>signedMachineIntegerValueOf: (in category 'primitive support') ----- signedMachineIntegerValueOf: oop "Answer a signed value of an integer up to the size of a machine word. The object may be either a positive SmallInteger or a LargeInteger of size <= word size." <returnTypeC: #'long'> | negative ok bs value bits | <var: #value type: #long> (objectMemory isIntegerObject: oop) ifTrue: [^objectMemory integerValueOf: oop]. + (objectMemory isNonIntegerImmediate: oop) ifTrue: + [^self primitiveFail]. + ok := objectMemory isClassOfNonImm: oop equalTo: (objectMemory splObj: ClassLargePositiveInteger) compactClassIndex: ClassLargePositiveIntegerCompactIndex. ok ifTrue: [negative := false] ifFalse: [negative := true. ok := objectMemory isClassOfNonImm: oop equalTo: (objectMemory splObj: ClassLargeNegativeInteger) compactClassIndex: ClassLargeNegativeIntegerCompactIndex. ok ifFalse: [^self primitiveFail]]. (bs := objectMemory lengthOf: oop) > (self sizeof: #'unsigned long') ifTrue: [^self primitiveFail]. ((self sizeof: #'unsigned long') = 8 and: [bs > 4]) ifTrue: [value := (objectMemory fetchByte: 0 ofObject: oop) + ((objectMemory fetchByte: 1 ofObject: oop) << 8) + ((objectMemory fetchByte: 2 ofObject: oop) << 16) + ((objectMemory fetchByte: 3 ofObject: oop) << 24) + ((objectMemory fetchByte: 4 ofObject: oop) << 32) + ((objectMemory fetchByte: 5 ofObject: oop) << 40) + ((objectMemory fetchByte: 6 ofObject: oop) << 48) + ((objectMemory fetchByte: 7 ofObject: oop) << 56)] ifFalse: [value := (objectMemory fetchByte: 0 ofObject: oop) + ((objectMemory fetchByte: 1 ofObject: oop) << 8) + ((objectMemory fetchByte: 2 ofObject: oop) << 16) + ((objectMemory fetchByte: 3 ofObject: oop) << 24)]. self cCode: [] inSmalltalk: [bits := (self sizeof: #long) * 8. (value bitShift: 1 - bits) > 0 ifTrue: [value := value - (1 bitShift: bits)]]. value < 0 ifTrue: ["Don't fail for -16r80000000[00000000]. Alas the simple (negative and: [value - 1 > 0]) isn't adequate since in C the result of signed integer overflow is undefined and hence under optimization this may fail. The shift, however, is well-defined." (negative and: [0 = (self cCode: [value << 1] inSmalltalk: [value << 1 bitAnd: (1 << bits) - 1])]) ifTrue: [^value]. ^self primitiveFail]. ^negative ifTrue: [0 - value] ifFalse: [value]! Item was added: + ----- Method: ObjectMemory>>isNonIntegerImmediate: (in category 'interpreter access') ----- + isNonIntegerImmediate: oop + "ObjectMemory only has integer immedates" + <inline: true> + ^false! Item was added: + ----- Method: ObjectMemory>>isNonIntegerNonImmediate: (in category 'interpreter access') ----- + isNonIntegerNonImmediate: oop + "ObjectMemory only has integer immedates" + <inline: true> + ^true! Item was added: + ----- Method: SpurMemoryManager>>isNonIntegerImmediate: (in category 'object testing') ----- + isNonIntegerImmediate: oop + <inline: true> + ^self isImmediate: oop! Item was added: + ----- Method: SpurMemoryManager>>isNonIntegerNonImmediate: (in category 'object testing') ----- + isNonIntegerNonImmediate: oop + <inline: true> + ^self isNonImmediate: oop! Item was changed: InterpreterPrimitives subclass: #StackInterpreter + instanceVariableNames: 'currentBytecode bytecodeSetSelector localFP localIP localSP stackLimit stackPage stackPages method instructionPointer stackPointer framePointer localReturnValue extA extB primitiveFunctionPointer methodCache atCache lkupClassTag lkupClass methodDictLinearSearchLimit highestRunnableProcessPriority nextWakeupUsecs nextPollUsecs inIOProcessEvents interruptKeycode interruptPending savedWindowSize imageHeaderFlags fullScreenFlag deferDisplayUpdates pendingFinalizationSignals extraVMMemory interpreterProxy showSurfaceFn primitiveTable primitiveAccessorDepthTable externalPrimitiveTable externalPrimitiveTableFirstFreeIndex overflowedPage extraFramesToMoveOnOverflow globalSessionID jmpBuf jmpDepth suspendedCallbacks suspendedMethods numStackPages desiredNumStackPages desiredEdenBytes classNameIndex thisClassIndex metaclassNumSlots interruptCheckChain suppressHeartbeatFlag breakSelector breakSelectorLength longRunningPrimitiveCheckMethod longRunningPrimitiveCheckSemaphore longRunningPrimitiveStartUsecs longRunningPrimitiveStopUsecs longRunningPrimitiveGCUsecs longRunningPrimitiveCheckSequenceNumber longRunningPrimitiveSignalUndelivered checkAllocFiller tempOop tempOop2 theUnknownShort the2ndUnknownShort imageFloatsBigEndian maxExtSemTabSizeSet lastMethodCacheProbeWrite gcSemaphoreIndex classByteArrayCompactIndex statForceInterruptCheck statStackOverflow statStackPageDivorce statCheckForEvents statProcessSwitch statIOProcessEvents statPendingFinalizationSignals' - instanceVariableNames: 'currentBytecode bytecodeSetSelector localFP localIP localSP stackLimit stackPage stackPages method instructionPointer stackPointer framePointer localReturnValue extA extB primitiveFunctionPointer methodCache atCache lkupClassTag lkupClass methodDictLinearSearchLimit highestRunnableProcessPriority nextWakeupUsecs nextPollUsecs inIOProcessEvents interruptKeycode interruptPending savedWindowSize imageHeaderFlags fullScreenFlag deferDisplayUpdates pendingFinalizationSignals extraVMMemory interpreterProxy showSurfaceFn primitiveTable primitiveAccessorDepthTable externalPrimitiveTable externalPrimitiveTableFirstFreeIndex overflowedPage extraFramesToMoveOnOverflow globalSessionID jmpBuf jmpDepth suspendedCallbacks suspendedMethods numStackPages desiredNumStackPages desiredEdenBytes classNameIndex thisClassIndex metaclassNumSlots interruptCheckChain suppressHeartbeatFlag breakSelector breakSelectorLength longRunningPrimitiveCheckMethod longRunningPrimitiveCheckSemaphore longRunningPrimitiveStartUsecs longRunningPrimitiveStopUsecs longRunningPrimitiveGCUsecs longRunningPrimitiveCheckSequenceNumber longRunningPrimitiveSignalUndelivered checkAllocFiller tempOop theUnknownShort the2ndUnknownShort imageFloatsBigEndian maxExtSemTabSizeSet lastMethodCacheProbeWrite gcSemaphoreIndex classByteArrayCompactIndex statForceInterruptCheck statStackOverflow statStackPageDivorce statCheckForEvents statProcessSwitch statIOProcessEvents statPendingFinalizationSignals' classVariableNames: 'AltBytecodeEncoderClassName AltLongStoreBytecode AtCacheEntries AtCacheFixedFields AtCacheFmt AtCacheMask AtCacheOop AtCacheSize AtCacheTotalSize AtPutBase BytecodeEncoderClassName BytecodeTable CacheProbeMax DirBadPath DirEntryFound DirNoMoreEntries DumpStackOnLowSpace EnclosingMixinIndex EnclosingObjectIndex FailImbalancedPrimitives HeaderFlagBitPosition LongStoreBytecode MaxExternalPrimitiveTableSize MaxJumpBuf MaxPrimitiveIndex MaxQuickPrimitiveIndex MixinIndex PrimitiveExternalCallIndex PrimitiveTable StackPageReachedButUntraced StackPageTraceInvalid StackPageTraced StackPageUnreached' poolDictionaries: 'VMBasicConstants VMMethodCacheConstants VMObjectIndices VMSpurObjectRepresentationConstants VMSqueakClassIndices VMSqueakV3BytecodeConstants VMSqueakV3ObjectRepresentationConstants VMStackFrameOffsets' category: 'VMMaker-Interpreter'! !StackInterpreter commentStamp: 'eem 9/11/2013 18:30' prior: 0! This class is a complete implementation of the Smalltalk-80 virtual machine, derived originally from the Blue Book specification but quite different in some areas. This VM supports Closures but *not* old-style BlockContexts. It has been modernized with 32-bit pointers, better management of Contexts (see next item), and attention to variable use that allows the CCodeGenerator (qv) to keep, eg, the instruction pointer and stack pointer in registers as well as keeping most simple variables in a global array that seems to improve performance for most platforms. The VM does not use Contexts directly. Instead Contexts serve as proxies for a more conventional stack format that is invisible to the image. There is considerable explanation at http://www.mirandabanda.org/cogblog/2009/01/14/under-cover-contexts-and-the…. The VM maintains a fixed-size stack zone divided into pages, each page being capable of holding several method/block activations. A send establishes a new frame in the current stack page, a return returns to the previous frame. This eliminates allocation/deallocation of contexts and the moving of receiver and arguments from caller to callee on each send/return. Contexts are created lazily when an activation needs a context (creating a block, explicit use of thisContext, access to sender when sender is a frame, or linking of stack pages together). Contexts are either conventional and heap-resident ("single") or "married" and serve as proxies for their corresponding frame or "widowed", meaning that their spouse frame has been returned from (died). A married context is specially marked (more details in the code) and refers to its frame. Likewise a married frame is specially marked and refers to its context. In addition to SmallInteger arithmetic and Floats, the VM supports logic on 32-bit PositiveLargeIntegers, thus allowing it to simulate itself much more effectively than would otherwise be the case. NOTE: Here follows a list of things to be borne in mind when working on this code, or when making changes for the future. 1. There are a number of things that should be done the next time we plan to release a completely incompatible image format. These include unifying the instanceSize field of the class format word -- see instantiateClass:indexableSize:, and unifying the bits of the method primitive index (if we decide we need more than 512, after all) -- see primitiveIndexOf:. Also, contexts should be given a special format code (see next item). 2. There are several fast checks for contexts (see isContextHeader: and isMethodContextHeader:) which will fail if the compact class indices of BlockContext or MethodContext change. This is necessary because the oops may change during a compaction when the oops are being adjusted. It's important to be aware of this when writing a new image using the SystemTracer. A better solution would be to reserve one of the format codes for Contexts only. An even better solution is to eliminate compact classes altogether (see 6.). 3. We have made normal files tolerant to size and positions up to 32 bits. This has not been done for async files, since they are still experimental. The code in size, at: and at:put: should work with sizes and indices up to 31 bits, although I have not tested it (di 12/98); it might or might not work with 32-bit sizes. [Late news, the support has been extended to 64-bit file sizes]. 4. Note that 0 is used in a couple of places as an impossible oop. This should be changed to a constant that really is impossible (or perhaps there is code somewhere that guarantees it --if so it should be put in this comment). The places include the method cache and the at cache. 5. Moving to a 2 bit immediate tag and having immediate Characters is a good choice for Unicode and the JIT. We can still have 31-bit SmallIntegers by allowing two tag patterns for SmallInteger. 6. If Eliot Miranda's 2 word header scheme is acceptable in terms of footprint (we estimate about a 10% increase in image size with about 35 reclaimed by better representation of CompiledMethod - loss of MethodProperties) then the in-line cache for the JIT is simplified, class access is faster and header access is the same in 32-bit and full 64-bit images. [Late breaking news, the 2-word header scheme is more compact, by over 2%]. See SpurMemorymanager's class comment.! Item was changed: ----- Method: StackInterpreter>>callExternalPrimitive: (in category 'plugin primitive support') ----- callExternalPrimitive: functionID "Call the external plugin function identified. In the VM this is an address; see StackInterpreterSimulator for its version." <var: #functionID declareC: 'void (*functionID)()'> + "Spur needs the primitiveFunctionPointer to be set correctly + for accurate following of forwarders on primitive failure." + objectMemory hasSpurMemoryManagerAPI ifTrue: + [primitiveFunctionPointer := functionID]. self dispatchFunctionPointer: functionID. self maybeFailForLastObjectOverwrite.! Item was changed: ----- Method: StackInterpreter>>checkForAndFollowForwardedPrimitiveState (in category 'primitive support') ----- checkForAndFollowForwardedPrimitiveState + "In Spur a primitive may fail due to encountering a forwarder. On failure, + check the accessorDepth for the primitive and if non-negative scan the + args to the depth, following any forwarders. Answer if any are found so + the prim can be retried. The primitive index is derived from newMethod. + If the primitive is 118, then primitiveDoPrimitiveWithArgs sets newMethod + to a SmallInteger whose value is the primitive it is evaluating." - "In Spur a primitive may fail due to encountering a forwarder. - On failure check the accessorDepth for the primitive and - if non-negative scan the args to the depth, following any - forwarders. Answer if any are found so the prim can be retried." <option: #SpurObjectMemory> + | primIndex accessorDepth found | + self assert: self failed. + found := false. + primIndex := (objectMemory isIntegerObject: newMethod) + ifTrue: [objectMemory integerValueOf: newMethod] + ifFalse: + [self assert: argumentCount = (self argumentCountOf: newMethod). + self primitiveIndexOf: newMethod]. + accessorDepth := primitiveAccessorDepthTable at: primIndex. + "For the method-executing primitives, failure could have been in those primitives or the + primitives of the methods they execute. Find out which failed by seeing what is in effect." + ((primIndex = 117 and: [primitiveFunctionPointer ~~ #primitiveExternalCall]) + or: [primIndex = 218 and: [primitiveFunctionPointer ~~ #primitiveDoNamedPrimitiveWithArgs]]) + ifTrue: + [accessorDepth := self primitiveAccessorDepthForExternalPrimitiveMethod: newMethod] + ifFalse: + [self assert: (self saneFunctionPointerForFailureOfPrimIndex: primIndex)]. + accessorDepth >= 0 ifTrue: + [0 to: argumentCount do: + [:index| | oop | + oop := self stackValue: index. + (objectMemory isNonImmediate: oop) ifTrue: + [(objectMemory isForwarded: oop) ifTrue: + [self assert: index < argumentCount. "receiver should have been caught at send time." + found := true. + oop := objectMemory followForwarded: oop. + self stackValue: index put: oop]. + ((objectMemory hasPointerFields: oop) + and: [objectMemory followForwardedObjectFields: oop toDepth: accessorDepth]) ifTrue: + [found := true]]]]. + ^found! - ^self checkForAndFollowForwardedPrimitiveStateFor: (self primitiveIndexOf: newMethod)! Item was removed: - ----- Method: StackInterpreter>>checkForAndFollowForwardedPrimitiveStateFor: (in category 'primitive support') ----- - checkForAndFollowForwardedPrimitiveStateFor: primIndex - "In Spur a primitive may fail due to encountering a forwarder. - On failure check the accessorDepth for the primitive and - if non-negative scan the args to the depth, following any - forwarders. Answer if any are found so the prim can be retried." - <option: #SpurObjectMemory> - | accessorDepth found | - self assert: self successful not. - found := false. - accessorDepth := primitiveAccessorDepthTable at: primIndex. - "For the method-executing primitives, failure could have been in those primitives or the - primitives of the methods they execute. find out which failed by seeing what is in effect." - primIndex caseOf: { - [117] -> - [primitiveFunctionPointer ~~ #primitiveExternalCall ifTrue: - [accessorDepth := self primitiveAccessorDepthForExternalPrimitiveMethod: newMethod]. - self assert: argumentCount = (self argumentCountOf: newMethod)]. - [118] -> "with tryPrimitive:withArgs: the argument count has nothing to do with newMethod's, so no arg count assert." - [self assert: primitiveFunctionPointer = (self functionPointerFor: primIndex inClass: objectMemory nilObject)]. - [218] -> - [primitiveFunctionPointer ~~ #primitiveDoNamedPrimitiveWithArgs ifTrue: - [accessorDepth := self primitiveAccessorDepthForExternalPrimitiveMethod: newMethod]. - self assert: argumentCount = (self argumentCountOf: newMethod)]. } - otherwise: - ["functionPointer should have been set, unless we're in machine code" - instructionPointer > objectMemory nilObject ifTrue: - [self assert: primitiveFunctionPointer = (self functionPointerFor: primIndex inClass: objectMemory nilObject). - self assert: argumentCount = (self argumentCountOf: newMethod)]]. - accessorDepth >= 0 ifTrue: - [0 to: argumentCount do: - [:index| | oop | - oop := self stackValue: index. - (objectMemory isNonImmediate: oop) ifTrue: - [(objectMemory isForwarded: oop) ifTrue: - [self assert: index < argumentCount. "receiver should have been caught at send time." - found := true. - oop := objectMemory followForwarded: oop. - self stackValue: index put: oop]. - ((objectMemory hasPointerFields: oop) - and: [objectMemory followForwardedObjectFields: oop toDepth: accessorDepth]) ifTrue: - [found := true]]]]. - ^found! Item was changed: ----- Method: StackInterpreter>>checkInterpreterIntegrity (in category 'object memory support') ----- checkInterpreterIntegrity "Perform an integrity/leak check using the heapMap. Assume clearLeakMapAndMapAccessibleObjects has set a bit at each object's header. Check that all oops in the interpreter's state points to a header. Answer if all checks pass." | ok | ok := true. (objectMemory checkOopIntegrity: objectMemory specialObjectsOop named: 'specialObjectsOop')ifFalse: [ok := false]. "No longer check messageSelector; it is ephemeral, not living beyond message lookup. (objectMemory isNonImmediate: messageSelector) ifTrue: [(objectMemory checkOopIntegrity: messageSelector named: 'messageSelector')ifFalse: [ok := false]]." (objectMemory checkOopIntegrity: newMethod named: 'newMethod')ifFalse: [ok := false]. "No longer check lkupClass; it is ephemeral, not living beyond message lookup. (objectMemory checkOopIntegrity: lkupClass named: 'lkupClass')ifFalse: [ok := false]." (objectMemory checkOopIntegrity: profileProcess named: 'profileProcess')ifFalse: [ok := false]. (objectMemory checkOopIntegrity: profileMethod named: 'profileMethod')ifFalse: [ok := false]. (objectMemory checkOopIntegrity: profileSemaphore named: 'profileSemaphore')ifFalse: [ok := false]. tempOop = 0 ifFalse: [(objectMemory checkOopIntegrity: tempOop named: 'tempOop')ifFalse: [ok := false]]. + tempOop2 = 0 ifFalse: + [(objectMemory checkOopIntegrity: tempOop2 named: 'tempOop2')ifFalse: + [ok := false]]. "Callback support - check suspended callback list" 1 to: jmpDepth do: [:i| (objectMemory checkOopIntegrity: (suspendedCallbacks at: i) named: 'suspendedCallbacks' index: i) ifFalse: [ok := false]. (objectMemory checkOopIntegrity: (suspendedMethods at: i) named: 'suspendedMethods' index: i) ifFalse: [ok := false]]. self checkLogIntegrity ifFalse: [ok := false]. ^ok! Item was changed: ----- Method: StackInterpreter>>checkOkayInterpreterObjects: (in category 'debug support') ----- checkOkayInterpreterObjects: writeBack <api> | ok oopOrZero oop | ok := true. ok := ok & (self checkOkayFields: objectMemory nilObject). ok := ok & (self checkOkayFields: objectMemory falseObject). ok := ok & (self checkOkayFields: objectMemory trueObject). ok := ok & (self checkOkayFields: objectMemory specialObjectsOop). ok := ok & (self checkOkayFields: messageSelector). ok := ok & (self checkOkayFields: newMethod). ok := ok & (self checkOkayFields: lkupClass). 0 to: MethodCacheEntries - 1 by: MethodCacheEntrySize do: [ :i | oopOrZero := methodCache at: i + MethodCacheSelector. oopOrZero = 0 ifFalse: [ok := ok & (self checkOkayFields: (methodCache at: i + MethodCacheSelector)). objectMemory hasSpurMemoryManagerAPI ifFalse: [ok := ok & (self checkOkayFields: (methodCache at: i + MethodCacheClass))]. ok := ok & (self checkOkayFields: (methodCache at: i + MethodCacheMethod))]]. 1 to: objectMemory remapBufferCount do: [ :i | oop := objectMemory remapBuffer at: i. + (objectMemory isImmediate: oop) ifFalse: - (objectMemory isIntegerObject: oop) ifFalse: [ok := ok & (self checkOkayFields: oop)]]. ok := ok & (self checkOkayStackZone: writeBack). ^ok! Item was changed: ----- Method: StackInterpreter>>initialize (in category 'initialization') ----- initialize "Here we can initialize the variables C initializes to zero. #initialize methods do /not/ get translated." checkAllocFiller := false. "must preceed initializeObjectMemory:" primFailCode := 0. stackLimit := 0. "This is also the initialization flag for the stack system." stackPage := overflowedPage := 0. extraFramesToMoveOnOverflow := 0. bytecodeSetSelector := 0. highestRunnableProcessPriority := 0. nextProfileTick := 0. nextPollUsecs := 0. nextWakeupUsecs := 0. + tempOop := tempOop2 := theUnknownShort := 0. - tempOop := theUnknownShort := 0. interruptPending := false. inIOProcessEvents := 0. fullScreenFlag := 0. deferDisplayUpdates := false. pendingFinalizationSignals := statPendingFinalizationSignals := 0. globalSessionID := 0. jmpDepth := 0. longRunningPrimitiveStartUsecs := longRunningPrimitiveStopUsecs := 0. maxExtSemTabSizeSet := false. statForceInterruptCheck := statStackOverflow := statCheckForEvents := statProcessSwitch := statIOProcessEvents := statStackPageDivorce := 0! Item was changed: ----- Method: StackInterpreter>>mapInterpreterOops (in category 'object memory support') ----- mapInterpreterOops "Map all oops in the interpreter's state to their new values during garbage collection or a become: operation." "Assume: All traced variables contain valid oops." <inline: false> self mapStackPages. self mapMachineCode: self getGCMode. self mapTraceLogs. self mapVMRegisters. self mapProfileState. self remapCallbackState. (tempOop ~= 0 and: [objectMemory shouldRemapOop: tempOop]) ifTrue: + [tempOop := objectMemory remapObj: tempOop]. + (tempOop2 ~= 0 + and: [objectMemory shouldRemapOop: tempOop2]) ifTrue: + [tempOop2 := objectMemory remapObj: tempOop2]! - [tempOop := objectMemory remapObj: tempOop]! Item was changed: ----- Method: StackInterpreter>>markAndTraceInterpreterOops: (in category 'object memory support') ----- markAndTraceInterpreterOops: fullGCFlag "Mark and trace all oops in the interpreter's state." "Assume: All traced variables contain valid oops. N.B. Don't trace messageSelector and lkupClass; these are ephemeral, live only during message lookup and because createActualMessageTo will not cause a GC these cannot change during message lookup." | oop | "Must mark stack pages first to initialize the per-page trace flags for full garbage collect before any subsequent tracing." self markAndTraceStackPages: fullGCFlag. self markAndTraceTraceLog. self markAndTracePrimTraceLog. objectMemory markAndTrace: objectMemory specialObjectsOop. "also covers nilObj, trueObj, falseObj, and compact classes" (objectMemory isImmediate: newMethod) ifFalse: [objectMemory markAndTrace: newMethod]. self traceProfileState. tempOop = 0 ifFalse: [objectMemory markAndTrace: tempOop]. + tempOop2 = 0 ifFalse: [objectMemory markAndTrace: tempOop2]. 1 to: objectMemory remapBufferCount do: [:i | oop := objectMemory remapBuffer at: i. (objectMemory isIntegerObject: oop) ifFalse: [objectMemory markAndTrace: oop]]. "Callback support - trace suspended callback list" 1 to: jmpDepth do:[:i| oop := suspendedCallbacks at: i. (objectMemory isIntegerObject: oop) ifFalse:[objectMemory markAndTrace: oop]. oop := suspendedMethods at: i. (objectMemory isIntegerObject: oop) ifFalse:[objectMemory markAndTrace: oop]. ]! Item was added: + ----- Method: StackInterpreter>>maybeRetryFailureDueToForwarding (in category 'primitive support') ----- + maybeRetryFailureDueToForwarding + "In Spur a primitive may fail due to encountering a forwarder. On failure, check + the accessorDepth for the primitive and if non-negative scan the args to the + depth, following any forwarders. Retry the primitive if any are found." + <inline: true> + (objectMemory hasSpurMemoryManagerAPI + and: [self failed + and: [self checkForAndFollowForwardedPrimitiveState]]) ifTrue: + [self initPrimCall. + self dispatchFunctionPointer: primitiveFunctionPointer]! Item was changed: ----- Method: StackInterpreter>>objectArg: (in category 'plugin primitive support') ----- objectArg: index "Like #stackObjectValue: but access method arguments left-to-right" | oop | oop := self methodArg: index. oop = 0 ifTrue:[^0]. "methodArg: failed" + (objectMemory isImmediate: oop) ifTrue: [self primitiveFail. ^ nil]. - (objectMemory isIntegerObject: oop) ifTrue: [self primitiveFail. ^ nil]. ^oop! Item was changed: ----- Method: StackInterpreter>>okayInterpreterObjects (in category 'debug support') ----- okayInterpreterObjects | oopOrZero oop | self okayFields: objectMemory nilObject. self okayFields: objectMemory falseObject. self okayFields: objectMemory trueObject. self okayFields: objectMemory specialObjectsOop. self okayFields: messageSelector. self okayFields: newMethod. self okayFields: lkupClass. 0 to: MethodCacheEntries - 1 by: MethodCacheEntrySize do: [ :i | oopOrZero := methodCache at: i + MethodCacheSelector. oopOrZero = 0 ifFalse: [ self okayFields: (methodCache at: i + MethodCacheSelector). self okayFields: (methodCache at: i + MethodCacheClass). self okayFields: (methodCache at: i + MethodCacheMethod). ]. ]. 1 to: objectMemory remapBufferCount do: [ :i | oop := objectMemory remapBuffer at: i. + (objectMemory isImmediate: oop) ifFalse: [ - (objectMemory isIntegerObject: oop) ifFalse: [ self okayFields: oop. ]. ]. self okayStackZone.! Item was added: + ----- Method: StackInterpreter>>saneFunctionPointerForFailureOfPrimIndex: (in category 'primitive support') ----- + saneFunctionPointerForFailureOfPrimIndex: primIndex + ^primitiveFunctionPointer = (self functionPointerFor: primIndex inClass: objectMemory nilObject)! Item was changed: ----- Method: StackInterpreter>>slowPrimitiveResponse (in category 'primitive support') ----- slowPrimitiveResponse "Invoke a normal (non-quick) primitive. Called under the assumption that primFunctionPointer has been preloaded." | nArgs savedFramePointer savedStackPointer | <inline: true> <asmLabel: false> <var: #savedFramePointer type: #'char *'> <var: #savedStackPointer type: #'char *'> self assert: (objectMemory isOopForwarded: (self stackValue: argumentCount)) not. + self assert: objectMemory remapBufferCount = 0. FailImbalancedPrimitives ifTrue: [nArgs := argumentCount. savedStackPointer := stackPointer. savedFramePointer := framePointer]. self initPrimCall. self dispatchFunctionPointer: primitiveFunctionPointer. + self maybeRetryFailureDueToForwarding. - "In Spur a primitive may fail due to encountering a forwarder. - On failure check the accessorDepth for the primitive and - if non-negative scan the args to the depth, following any - forwarders. Retry the primitive if any are found." - objectMemory hasSpurMemoryManagerAPI - ifTrue: - [(self successful not - and: [(objectMemory isOopCompiledMethod: newMethod) - and: [self checkForAndFollowForwardedPrimitiveState]]) ifTrue: - [self initPrimCall. - self dispatchFunctionPointer: primitiveFunctionPointer]] - ifFalse: - [self assert: objectMemory remapBufferCount = 0]. self maybeFailForLastObjectOverwrite. (FailImbalancedPrimitives and: [self successful and: [framePointer = savedFramePointer and: [(self isMachineCodeFrame: framePointer) not]]]) ifTrue:"Don't fail if primitive has done something radical, e.g. perform:" [stackPointer ~= (savedStackPointer + (nArgs * BytesPerWord)) ifTrue: [self flag: 'Would be nice to make this a message send of e.g. unbalancedPrimitive to the current process or context'. "This is necessary but insufficient; the result may still have been written to the stack. At least we'll know something is wrong." stackPointer := savedStackPointer. self failUnbalancedPrimitive]]. "If we are profiling, take accurate primitive measures" nextProfileTick > 0 ifTrue: [self checkProfileTick: newMethod]. ^self successful! Item was changed: ----- Method: StackInterpreterPrimitives>>primitiveDoNamedPrimitiveWithArgs (in category 'plugin primitives') ----- primitiveDoNamedPrimitiveWithArgs "Simulate an primitiveExternalCall invocation (e.g. for the Debugger). Do not cache anything. e.g. ContextPart>>tryNamedPrimitiveIn: aCompiledMethod for: aReceiver withArgs: arguments" | argumentArray arraySize methodArg methodHeader moduleName functionName moduleLength functionLength + spec addr primRcvr isArray | - spec addr primRcvr ctxtRcvr isArray | <var: #addr declareC: 'void (*addr)()'> argumentArray := self stackTop. methodArg := self stackValue: 2. ((objectMemory isArray: argumentArray) and: [objectMemory isOopCompiledMethod: methodArg]) ifFalse: [^self primitiveFailFor: -2]. "invalid args" arraySize := objectMemory numSlotsOf: argumentArray. (self roomToPushNArgs: arraySize) ifFalse: [^self primitiveFailFor: -2]. "invalid args" methodHeader := objectMemory methodHeaderOf: methodArg. (objectMemory literalCountOfMethodHeader: methodHeader) > 2 ifFalse: [^self primitiveFailFor: -3]. "invalid methodArg state" spec := objectMemory fetchPointer: 1 "first literal" ofObject: methodArg. isArray := self isInstanceOfClassArray: spec. (isArray and: [(objectMemory lengthOf: spec) = 4 and: [(self primitiveIndexOfMethod: methodArg header: methodHeader) = 117]]) ifFalse: [^self primitiveFailFor: -3]. "invalid methodArg state" (self argumentCountOfMethodHeader: methodHeader) = arraySize ifFalse: [^self primitiveFailFor: -2]. "invalid args (Array args wrong size)" "The function has not been loaded yet. Fetch module and function name." moduleName := objectMemory fetchPointer: 0 ofObject: spec. moduleName = objectMemory nilObject ifTrue: [moduleLength := 0] ifFalse: [self success: (objectMemory isBytes: moduleName). moduleLength := objectMemory lengthOf: moduleName. self cCode: '' inSmalltalk: [ (#('FloatArrayPlugin' 'Matrix2x3Plugin') includes: (self stringOf: moduleName)) "??" ifTrue: [moduleLength := 0 "Cause all of these to fail"]]]. functionName := objectMemory fetchPointer: 1 ofObject: spec. self success: (objectMemory isBytes: functionName). functionLength := objectMemory lengthOf: functionName. self successful ifFalse: [^self primitiveFailFor: -3]. "invalid methodArg state" addr := self ioLoadExternalFunction: functionName + BaseHeaderSize OfLength: functionLength FromModule: moduleName + BaseHeaderSize OfLength: moduleLength. addr = 0 ifTrue: [^self primitiveFailFor: -1]. "could not find function; answer generic failure (see below)" "Cannot fail this primitive from now on. Can only fail the external primitive." + tempOop := objectMemory + eeInstantiateClassIndex: ClassArrayCompactIndex + format: objectMemory arrayFormat + numSlots: (objectMemory hasSpurMemoryManagerAPI + ifTrue: [5] + ifFalse: [4]). + objectMemory + storePointerUnchecked: 0 ofObject: tempOop withValue: (argumentArray := self popStack); + storePointerUnchecked: 1 ofObject: tempOop withValue: (primRcvr := self popStack); + storePointerUnchecked: 2 ofObject: tempOop withValue: self popStack; "the method" + storePointerUnchecked: 3 ofObject: tempOop withValue: self popStack. "the context receiver" - objectMemory pushRemappableOop: (argumentArray := self popStack). - objectMemory pushRemappableOop: (primRcvr := self popStack). - objectMemory pushRemappableOop: self popStack. "the method" - objectMemory pushRemappableOop: self popStack. "the context receiver" self push: primRcvr. "replace context receiver with actual receiver" argumentCount := arraySize. 1 to: arraySize do: [:index| self push: (objectMemory fetchPointer: index - 1 ofObject: argumentArray)]. + objectMemory hasSpurMemoryManagerAPI + ifTrue: + [objectMemory storePointerUnchecked: 4 ofObject: tempOop withValue: newMethod. + newMethod := methodArg. + self callExternalPrimitive: addr. "On Spur, sets primitiveFunctionPointer" + self maybeRetryFailureDueToForwarding. + newMethod := objectMemory fetchPointer: 4 ofObject: tempOop] + ifFalse: + [self callExternalPrimitive: addr]. - self callExternalPrimitive: addr. - ctxtRcvr := objectMemory popRemappableOop. - methodArg := objectMemory popRemappableOop. - primRcvr := objectMemory popRemappableOop. - argumentArray := objectMemory popRemappableOop. self successful ifFalse: "If primitive failed, then restore state for failure code" [self pop: arraySize + 1. + self push: (objectMemory fetchPointer: 3 ofObject: tempOop). + self push: (objectMemory fetchPointer: 2 ofObject: tempOop). + self push: (objectMemory fetchPointer: 1 ofObject: tempOop). + self push: (objectMemory fetchPointer: 0 ofObject: tempOop). - self push: ctxtRcvr. - self push: methodArg. - self push: primRcvr. - self push: argumentArray. argumentCount := 3. "Hack. A nil prim error code (primErrorCode = 1) is interpreted by the image as meaning this primitive is not implemented. So to pass back nil as an error code we use -1 to indicate generic failure." primFailCode = 1 ifTrue: [primFailCode := -1]]! Item was changed: ----- Method: StackInterpreterPrimitives>>primitiveDoPrimitiveWithArgs (in category 'control primitives') ----- primitiveDoPrimitiveWithArgs | argumentArray arraySize index primIdx | argumentArray := self stackTop. (objectMemory isArray: argumentArray) ifFalse: [^self primitiveFail]. arraySize := objectMemory numSlotsOf: argumentArray. self success: (self roomToPushNArgs: arraySize). primIdx := self stackIntegerValue: 1. self successful ifFalse: [^self primitiveFail]. "invalid args" primitiveFunctionPointer := self functionPointerFor: primIdx inClass: nil. primitiveFunctionPointer = 0 ifTrue: + [primitiveFunctionPointer := #primitiveDoPrimitiveWithArgs. + ^self primitiveFail]. - [^self primitiveFail]. "Pop primIndex and argArray, then push args in place..." self pop: 2. argumentCount := arraySize. index := 1. [index <= argumentCount] whileTrue: [self push: (objectMemory fetchPointer: index - 1 ofObject: argumentArray). index := index + 1]. self isPrimitiveFunctionPointerAnIndex ifTrue: [self externalQuickPrimitiveResponse. ^nil]. "We use tempOop instead of pushRemappableOop:/popRemappableOop here because in the Cogit primitiveEnterCriticalSection, primitiveSignal, primitiveResume et al longjmp back to either the interpreter or machine code, depending on the process activated. So if we're executing one of these primitives control won't actually return here and the matching popRemappableOop: wouldn't occur, potentially overflowing the remap buffer. While recursion could occur (nil tryPrimitive: 118 withArgs: #(111 #())) it counts as shooting oneself in the foot." tempOop := argumentArray. "prim might alloc/gc" "Run the primitive (sets primFailCode)" + + objectMemory hasSpurMemoryManagerAPI + ifTrue: + [tempOop2 := newMethod. + newMethod := objectMemory integerObjectOf: primIdx. + self slowPrimitiveResponse. + newMethod := tempOop2. + tempOop2 := 0] + ifFalse: + [self slowPrimitiveResponse]. - self slowPrimitiveResponse. self successful ifFalse: "If primitive failed, then restore state for failure code" [self pop: arraySize. self pushInteger: primIdx. self push: tempOop. + primitiveFunctionPointer := #primitiveDoPrimitiveWithArgs. argumentCount := 2]. tempOop := 0! Item was changed: ----- Method: StackInterpreterPrimitives>>primitiveExternalCall (in category 'plugin primitives') ----- primitiveExternalCall "Call an external primitive. External primitive methods first literals are an array of * The module name (String | Symbol) * The function name (String | Symbol) * The session ID (SmallInteger) [OBSOLETE] (or in Spur, the accessorDepth) * The function index (Integer) in the externalPrimitiveTable For fast interpreter dispatch in subsequent invocations the primitiveFunctionPointer in the method cache is rewritten, either to the function itself, or to zero if the external function is not found. This allows for fast responses as long as the method stays in the cache. The cache rewrite relies on lastMethodCacheProbeWrite which is set in addNewMethodToCache:. Now that the VM flushes function addresses from its tables, the session ID is obsolete, but it is kept for backward compatibility. Also, a failed lookup is reported specially. If a method has been looked up and not been found, the function address is stored as -1 (i.e., the SmallInteger -1 to distinguish from 16rFFFFFFFF which may be returned from lookup), and the primitive fails with PrimErrNotFound." | lit addr moduleName functionName moduleLength functionLength accessorDepth index | <var: #addr declareC: 'void (*addr)()'> "Fetch the first literal of the method" (objectMemory literalCountOf: newMethod) > 0 ifFalse: [^self primitiveFailFor: PrimErrBadMethod]. lit := self literal: 0 ofMethod: newMethod. "Check if it's an array of length 4" ((objectMemory isArray: lit) and: [(objectMemory lengthOf: lit) = 4]) ifFalse: [^self primitiveFailFor: PrimErrBadMethod]. "Look at the function index in case it has been loaded before" index := objectMemory fetchPointer: 3 ofObject: lit. (objectMemory isIntegerObject: index) ifFalse: [^self primitiveFailFor: PrimErrBadMethod]. index := objectMemory integerValueOf: index. "Check if we have already looked up the function and failed." index < 0 ifTrue: ["Function address was not found in this session, Void the primitive function." self rewriteMethodCacheEntryForExternalPrimitiveToFunction: 0. ^self primitiveFailFor: PrimErrNotFound]. "Try to call the function directly" (index > 0 and: [index <= MaxExternalPrimitiveTableSize]) ifTrue: [addr := externalPrimitiveTable at: index - 1. addr ~= 0 ifTrue: [self rewriteMethodCacheEntryForExternalPrimitiveToFunction: (self cCode: 'addr' inSmalltalk: [1000 + index]). + self callExternalPrimitive: addr. "On Spur, sets primitiveFunctionPointer" + self maybeRetryFailureDueToForwarding. - self callExternalPrimitive: addr. ^nil]. "if we get here, then an index to the external prim was kept on the ST side although the underlying prim table was already flushed" ^self primitiveFailFor: PrimErrNamedInternal]. "Clean up session id and external primitive index" objectMemory storePointerUnchecked: 2 ofObject: lit withValue: ConstZero. objectMemory storePointerUnchecked: 3 ofObject: lit withValue: ConstZero. "The function has not been loaded yet. Fetch module and function name." moduleName := objectMemory fetchPointer: 0 ofObject: lit. moduleName = objectMemory nilObject ifTrue: [moduleLength := 0] ifFalse: [(objectMemory isBytes: moduleName) ifFalse: [self primitiveFailFor: PrimErrBadMethod]. moduleLength := objectMemory lengthOf: moduleName]. functionName := objectMemory fetchPointer: 1 ofObject: lit. (objectMemory isBytes: functionName) ifFalse: [self primitiveFailFor: PrimErrBadMethod]. functionLength := objectMemory lengthOf: functionName. + "Spur needs to know the primitive's accessorDepth which is stored in the last slot of the first literal." objectMemory hasSpurMemoryManagerAPI ifTrue: [addr := self ioLoadExternalFunction: functionName + BaseHeaderSize OfLength: functionLength FromModule: moduleName + BaseHeaderSize OfLength: moduleLength AccessorDepthInto: (self addressOf: accessorDepth put: [:val| accessorDepth := val]). addr = 0 ifTrue: [index := -1] ifFalse: "add the function to the external primitive table" [index := self addToExternalPrimitiveTable: addr. objectMemory storePointerUnchecked: 2 ofObject: lit withValue: (objectMemory integerObjectOf: accessorDepth)]] ifFalse: [addr := self ioLoadExternalFunction: functionName + BaseHeaderSize OfLength: functionLength FromModule: moduleName + BaseHeaderSize OfLength: moduleLength. addr = 0 ifTrue: [index := -1] ifFalse: "add the function to the external primitive table" [index := self addToExternalPrimitiveTable: addr]]. "Store the index (or -1 if failure) back in the literal" objectMemory storePointerUnchecked: 3 ofObject: lit withValue: (objectMemory integerObjectOf: index). "If the function has been successfully loaded cache and call it" index >= 0 ifTrue: [self rewriteMethodCacheEntryForExternalPrimitiveToFunction: (self cCode: [addr] inSmalltalk: [1000 + index]). + self callExternalPrimitive: addr. + self maybeRetryFailureDueToForwarding] - self callExternalPrimitive: addr] ifFalse: "Otherwise void the primitive function and fail" [self rewriteMethodCacheEntryForExternalPrimitiveToFunction: 0. self assert: (objectMemory fetchPointer: 2 ofObject: lit) = ConstZero. self primitiveFailFor: PrimErrNotFound]! Item was changed: ----- Method: StackInterpreterSimulator>>callExternalPrimitive: (in category 'plugin support') ----- callExternalPrimitive: mapIndex | entry | + entry := self pluginEntryFor: mapIndex. + "Spur needs the primitiveFunctionPointer to be set correctly + for accurate following of forwarders on primitive failure." + objectMemory hasSpurMemoryManagerAPI ifTrue: + [primitiveFunctionPointer := entry at: 2]. + ^(entry at: 1) perform: (entry at: 2)! - entry := mappedPluginEntries at: (mapIndex > 1000 - ifTrue: [externalPrimitiveTable at: mapIndex - 1001] - ifFalse: [mapIndex]). - ^(entry at: 1) perform: (entry at: 2).! Item was added: + ----- Method: StackInterpreterSimulator>>pluginEntryFor: (in category 'plugin support') ----- + pluginEntryFor: mapIndex + ^mappedPluginEntries at: (mapIndex > 1000 + ifTrue: [externalPrimitiveTable at: mapIndex - 1001] + ifFalse: [mapIndex])! Item was added: + ----- Method: VMMaker class>>generateAllSpurConfigurationsUnderVersionControl (in category 'configurations') ----- + generateAllSpurConfigurationsUnderVersionControl + self generateNewspeakSpurStackVM; + generateSqueakSpurStackVM; + generateNewspeakSpurCogVM; + generateSqueakSpurCogVM; + generateSqueakSpurCogSistaVM!

1 0

[commit][3103] Add ARMV7 defines for various support files.
by commits＠squeakvm.org 31 Oct '14

31 Oct '14

Revision: 3103 Author: eliot Date: 2014-10-13 14:24:18 -0700 (Mon, 13 Oct 2014) Log Message: ----------- Add ARMV7 defines for various support files. Modified Paths: -------------- branches/Cog/platforms/Cross/vm/sqAtomicOps.h branches/Cog/platforms/Cross/vm/sqMemoryFence.h branches/Cog/platforms/unix/vm/sqUnixHeartbeat.c branches/Cog/platforms/unix/vm/sqUnixITimerHeartbeat.c branches/Cog/platforms/unix/vm/sqUnixITimerTickerHeartbeat.c Property Changed: ---------------- branches/Cog/platforms/Cross/vm/sqSCCSVersion.h Modified: branches/Cog/platforms/Cross/vm/sqAtomicOps.h =================================================================== --- branches/Cog/platforms/Cross/vm/sqAtomicOps.h 2014-10-13 20:51:55 UTC (rev 3102) +++ branches/Cog/platforms/Cross/vm/sqAtomicOps.h 2014-10-13 21:24:18 UTC (rev 3103) @@ -137,7 +137,7 @@ # endif /* __SSE2__ */ # else /* TARGET_OS_IS_IPHONE elif x86 variants etc */ -#if defined(__arm__) && defined(__ARM_ARCH_6__) +#if defined(__arm__) && (defined(__ARM_ARCH_6__) || defined(__ARM_ARCH_7A__)) /* tpr - this is code intended for the Raspberry Pi Raspbian OS * We'll experimentally trust in our MMU to keep 64bit accesses atomic */ #define get64(var) \ @@ -177,7 +177,7 @@ #endif #elif defined TARGET_OS_IS_IPHONE #define sqAtomicAddConst(var,n) OSAtomicAdd32(n,&var) -#elif defined(__arm__) && defined(__ARM_ARCH_6__) +#elif defined(__arm__) && (defined(__ARM_ARCH_6__) || defined(__ARM_ARCH_7A__)) /* tpr - this is code intended for the Raspberry Pi Raspbian OS */ /* We'll experimentally use the gcc inbuilt functions detailed in * http://gcc.gnu.org/onlinedocs/gcc-4.1.2/gcc/Atomic-Builtins.html @@ -230,7 +230,7 @@ # define sqCompareAndSwap(var,old,new) OSAtomicCompareAndSwap32(old, new, &var) # define sqCompareAndSwapRes(var,old,new,res) res = var; OSAtomicCompareAndSwap32(old, new, &var) -#elif defined(__arm__) && defined(__ARM_ARCH_6__) +#elif defined(__arm__) && (defined(__ARM_ARCH_6__) || defined(__ARM_ARCH_7A__)) /* tpr - this is code intended for the Raspberry Pi Raspbian OS */ /* We'll experimentally use the gcc inbuilt functions detailed in * http://gcc.gnu.org/onlinedocs/gcc-4.1.2/gcc/Atomic-Builtins.html */ Modified: branches/Cog/platforms/Cross/vm/sqMemoryFence.h =================================================================== --- branches/Cog/platforms/Cross/vm/sqMemoryFence.h 2014-10-13 20:51:55 UTC (rev 3102) +++ branches/Cog/platforms/Cross/vm/sqMemoryFence.h 2014-10-13 21:24:18 UTC (rev 3103) @@ -47,7 +47,7 @@ # define sqLowLevelMFence() asm volatile ("mfence") # endif #else -# if defined(TARGET_OS_IS_IPHONE) || (defined(__arm__) && defined(__ARM_ARCH_6__)) +# if defined(TARGET_OS_IS_IPHONE) || (defined(__arm__) && (defined(__ARM_ARCH_6__) || defined(__ARM_ARCH_7A__))) # define sqLowLevelMFence() __sync_synchronize() # elif !defined(sqLowLevelMFence) extern void sqLowLevelMFence(void); Property changes on: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h ___________________________________________________________________ Modified: checkindate - Mon Oct 13 13:50:53 PDT 2014 + Mon Oct 13 14:24:26 PDT 2014 Modified: branches/Cog/platforms/unix/vm/sqUnixHeartbeat.c =================================================================== --- branches/Cog/platforms/unix/vm/sqUnixHeartbeat.c 2014-10-13 20:51:55 UTC (rev 3102) +++ branches/Cog/platforms/unix/vm/sqUnixHeartbeat.c 2014-10-13 21:24:18 UTC (rev 3103) @@ -164,7 +164,7 @@ || defined(i486) || defined(__i486) || defined (__i486__) \ || defined(intel) || defined(x86) || defined(i86pc) ) __asm__ __volatile__ ("rdtsc" : "=A"(value)); -#elif defined(__arm__) && defined(__ARM_ARCH_6__) +#elif defined(__arm__) && (defined(__ARM_ARCH_6__) || defined(__ARM_ARCH_7A__)) /* tpr - do nothing for now; needs input from eliot to decide further */ #else # error "no high res clock defined" Modified: branches/Cog/platforms/unix/vm/sqUnixITimerHeartbeat.c =================================================================== --- branches/Cog/platforms/unix/vm/sqUnixITimerHeartbeat.c 2014-10-13 20:51:55 UTC (rev 3102) +++ branches/Cog/platforms/unix/vm/sqUnixITimerHeartbeat.c 2014-10-13 21:24:18 UTC (rev 3103) @@ -164,7 +164,7 @@ || defined(i486) || defined(__i486) || defined (__i486__) \ || defined(intel) || defined(x86) || defined(i86pc) ) __asm__ __volatile__ ("rdtsc" : "=A"(value)); -#elif defined(__arm__) && defined(__ARM_ARCH_6__) +#elif defined(__arm__) && (defined(__ARM_ARCH_6__) || defined(__ARM_ARCH_7A__)) /* tpr - do nothing for now; needs input from eliot to decide further */ #else # error "no high res clock defined" Modified: branches/Cog/platforms/unix/vm/sqUnixITimerTickerHeartbeat.c =================================================================== --- branches/Cog/platforms/unix/vm/sqUnixITimerTickerHeartbeat.c 2014-10-13 20:51:55 UTC (rev 3102) +++ branches/Cog/platforms/unix/vm/sqUnixITimerTickerHeartbeat.c 2014-10-13 21:24:18 UTC (rev 3103) @@ -157,7 +157,7 @@ || defined(i486) || defined(__i486) || defined (__i486__) \ || defined(intel) || defined(x86) || defined(i86pc) ) __asm__ __volatile__ ("rdtsc" : "=A"(value)); -#elif defined(__arm__) && defined(__ARM_ARCH_6__) +#elif defined(__arm__) && (defined(__ARM_ARCH_6__) || defined(__ARM_ARCH_7A__)) /* tpr - do nothing for now; needs input from eliot to decide further */ #else # error "no high res clock defined"

6 6

[commit][3118] CogVM source as per VMMaker.oscog-eem.915
by commits＠squeakvm.org 31 Oct '14

31 Oct '14

Revision: 3118 Author: eliot Date: 2014-10-30 17:33:06 -0700 (Thu, 30 Oct 2014) Log Message: ----------- CogVM source as per VMMaker.oscog-eem.915 Spur: Fix processWeakSurvivor: so that it answers whether a weak object refers to a young object. The old version only scanned weak fields, igoring refs to young objs from strong fields. Move check for valid classes from findClassOfMethod: forReceiver: into findClassContainingMethod:startingAt:, hence making findClassOfMethod:forReceiver: et al more robust. Modified Paths: -------------- branches/Cog/nsspursrc/vm/cointerp.c branches/Cog/nsspursrc/vm/cointerp.h branches/Cog/nsspursrc/vm/gcc3x-cointerp.c branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c branches/Cog/nsspurstacksrc/vm/interp.c branches/Cog/spursistasrc/vm/cointerp.c branches/Cog/spursistasrc/vm/cointerp.h branches/Cog/spursistasrc/vm/gcc3x-cointerp.c branches/Cog/spursrc/vm/cointerp.c branches/Cog/spursrc/vm/cointerp.h branches/Cog/spursrc/vm/gcc3x-cointerp.c branches/Cog/spurstacksrc/vm/gcc3x-interp.c branches/Cog/spurstacksrc/vm/interp.c Property Changed: ---------------- branches/Cog/platforms/Cross/vm/sqSCCSVersion.h Modified: branches/Cog/nsspursrc/vm/cointerp.c =================================================================== --- branches/Cog/nsspursrc/vm/cointerp.c 2014-10-29 23:58:59 UTC (rev 3117) +++ branches/Cog/nsspursrc/vm/cointerp.c 2014-10-31 00:33:06 UTC (rev 3118) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.914 uuid: bda96e1c-f22e-4b32-9ee1-620740e1fec5 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.915 uuid: 4159cf52-4807-4416-9da6-1c46ec5b9f10 from - CoInterpreter VMMaker.oscog-eem.914 uuid: bda96e1c-f22e-4b32-9ee1-620740e1fec5 + CoInterpreter VMMaker.oscog-eem.915 uuid: 4159cf52-4807-4416-9da6-1c46ec5b9f10 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.914 uuid: bda96e1c-f22e-4b32-9ee1-620740e1fec5 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.915 uuid: 4159cf52-4807-4416-9da6-1c46ec5b9f10 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -966,7 +966,6 @@ sqInt firstShortFormat(void); sqInt fixedFieldsFieldWidth(void); sqInt fixedFieldsOfClassFormatMask(void); -static sqInt fixedFieldsOfClassFormat(sqInt classFormat) NoDbgRegParms; static sqInt fixedFieldsOfformatlength(sqInt objOop, sqInt fmt, sqInt wordLength) NoDbgRegParms; static sqInt fixFollowedFieldofObjectwithInitialValue(sqInt fieldIndex, sqInt anObject, sqInt initialValue) NoDbgRegParms NeverInline; static sqInt followFieldofObject(sqInt fieldIndex, sqInt anObject) NoDbgRegParms; @@ -1548,8 +1547,8 @@ _iss sqInt rememberedSetSize; _iss sqInt * rememberedSet; _iss usqInt freeListsMask; -_iss sqInt classTableFirstPage; _iss sqInt profileProcess; +_iss sqInt classTableFirstPage; _iss sqInt longRunningPrimitiveCheckSemaphore; _iss sqInt profileSemaphore; _iss SpurContiguousObjStack unscannedEphemerons; @@ -2338,7 +2337,7 @@ /*540*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, /*560*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, 0, 0, 0,-1,-1 }; -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.914"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.915"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -42649,9 +42648,14 @@ static sqInt processWeakSurvivor(sqInt weakObj) { DECL_MAYBE_SQ_GLOBAL_STRUCT + sqInt classFormat; + sqInt classIndex; + sqInt classPointer; + sqInt classTablePage; sqInt hasYoungReferents; sqInt i; sqInt iLimiT; + sqInt numStrongSlots; sqInt referent; sqInt referent1; sqInt weakObjShouldMourn; @@ -42660,7 +42664,41 @@ /* N.B. generateToByDoLimitExpression:negative:on: guards against (unsigned)0 - 1 going +ve */ weakObjShouldMourn = (hasYoungReferents = 0); - for (i = (fixedFieldsOfClassFormat(formatOfClass(fetchClassOfNonImm(weakObj)))), iLimiT = ((numSlotsOf(weakObj)) - 1); i <= iLimiT; i += 1) { + /* begin fixedFieldsOfClassFormat: */ + /* begin formatOfClass: */ + /* begin fetchClassOfNonImm: */ + classIndex = (longAt(weakObj)) & 0x3FFFFF; + if (classIndex <= 0x1F) { + if (classIndex == 0x1F) { + classPointer = weakObj; + goto l1; + } + if (classIndex == 8) { + classPointer = GIV(nilObj); + goto l1; + } + } + assert(classIndex >= (arrayClassIndexPun())); + /* begin classOrNilAtIndex: */ + assert((classIndex <= (tagMask())) + || (classIndex >= (arrayClassIndexPun()))); + classTablePage = longAt((GIV(hiddenRootsObj) + BaseHeaderSize) + ((((usqInt) classIndex) >> 10) << 2)); + if (classTablePage == GIV(nilObj)) { + classPointer = GIV(nilObj); + goto l1; + } + classPointer = longAt((classTablePage + BaseHeaderSize) + ((classIndex & ((1 << 10) - 1)) << 2)); +l1: /* end fetchClassOfNonImm: */; + classFormat = ((longAt((classPointer + BaseHeaderSize) + (InstanceSpecificationIndex << 2))) >> 1); + numStrongSlots = classFormat & ((1 << 16) - 1); + for (i = 0; i < numStrongSlots; i += 1) { + referent = longAt((weakObj + BaseHeaderSize) + (i << 2)); + if (((referent & 3) == 0) + && (isYoungObject(referent))) { + hasYoungReferents = 1; + } + } + for (i = numStrongSlots, iLimiT = ((numSlotsOf(weakObj)) - 1); i <= iLimiT; i += 1) { /* Referent could be forwarded due to scavenging or a become:, don't assume. */ @@ -48672,12 +48710,6 @@ } static sqInt -fixedFieldsOfClassFormat(sqInt classFormat) -{ - return classFormat & ((1 << 16) - 1); -} - -static sqInt fixedFieldsOfformatlength(sqInt objOop, sqInt fmt, sqInt wordLength) { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt class; @@ -65472,6 +65504,9 @@ } do { assert(!(isForwarded(currClass))); + if (!(addressCouldBeClassObj(currClass))) { + return GIV(nilObj); + } /* begin noFixupFollowField:ofObject: */ objOop1 = longAt((currClass + BaseHeaderSize) + (MethodDictionaryIndex << 2)); if (((objOop1 & 3) == 0) @@ -65539,59 +65574,21 @@ sqInt findClassOfMethodforReceiver(sqInt meth, sqInt rcvr) { DECL_MAYBE_SQ_GLOBAL_STRUCT - sqInt classIndex; - sqInt classTablePage; - sqInt mclass; sqInt rclass; - sqInt tagBits; if ((((rcvr & 3) != 0) || (addressCouldBeObj(rcvr))) && (!(((rcvr & 3) == 0) && (((longAt(rcvr)) & 0x3FFFFF) == 8)))) { - /* begin fetchClassOf: */ - if (((tagBits = rcvr & 3)) != 0) { - rclass = longAt((GIV(classTableFirstPage) + BaseHeaderSize) + (tagBits << 2)); - goto l1; + rclass = findClassContainingMethodstartingAt(meth, fetchClassOf(rcvr)); + if (rclass != GIV(nilObj)) { + return rclass; } - /* begin fetchClassOfNonImm: */ - classIndex = (longAt(rcvr)) & 0x3FFFFF; - if (classIndex <= 0x1F) { - if (classIndex == 0x1F) { - rclass = rcvr; - goto l1; - } - if (classIndex == 8) { - rclass = GIV(nilObj); - goto l1; - } - } - assert(classIndex >= (arrayClassIndexPun())); - /* begin classOrNilAtIndex: */ - assert((classIndex <= (tagMask())) - || (classIndex >= (arrayClassIndexPun()))); - classTablePage = longAt((GIV(hiddenRootsObj) + BaseHeaderSize) + ((((usqInt) classIndex) >> 10) << 2)); - if (classTablePage == GIV(nilObj)) { - rclass = GIV(nilObj); - goto l1; - } - rclass = longAt((classTablePage + BaseHeaderSize) + ((classIndex & ((1 << 10) - 1)) << 2)); - l1: /* end fetchClassOf: */; - if (addressCouldBeClassObj(rclass)) { - rclass = findClassContainingMethodstartingAt(meth, rclass); - if (rclass != GIV(nilObj)) { - return rclass; - } - } } if (!((addressCouldBeObj(meth)) && (((((usqInt) (longAt(meth))) >> 24) & 0x1F) >= 24))) { return GIV(nilObj); } - mclass = safeMethodClassOf(meth); - if (addressCouldBeClassObj(mclass)) { - return GIV(nilObj); - } return findClassContainingMethodstartingAt(meth, safeMethodClassOf(meth)); } @@ -69075,14 +69072,10 @@ static void printActivationNameForreceiverisBlockfirstTemporary(sqInt aMethod, sqInt anObject, sqInt isBlock, sqInt maybeMessage) { DECL_MAYBE_SQ_GLOBAL_STRUCT - sqInt classIndex; sqInt classObj; - sqInt classTablePage; - sqInt mclass; sqInt methClass; sqInt methodSel; sqInt rclass; - sqInt tagBits; if (isBlock) { print("[] in "); @@ -69092,52 +69085,17 @@ || (addressCouldBeObj(anObject))) && (!(((anObject & 3) == 0) && (((longAt(anObject)) & 0x3FFFFF) == 8)))) { - /* begin fetchClassOf: */ - if (((tagBits = anObject & 3)) != 0) { - rclass = longAt((GIV(classTableFirstPage) + BaseHeaderSize) + (tagBits << 2)); - goto l2; + rclass = findClassContainingMethodstartingAt(aMethod, fetchClassOf(anObject)); + if (rclass != GIV(nilObj)) { + methClass = rclass; + goto l1; } - /* begin fetchClassOfNonImm: */ - classIndex = (longAt(anObject)) & 0x3FFFFF; - if (classIndex <= 0x1F) { - if (classIndex == 0x1F) { - rclass = anObject; - goto l2; - } - if (classIndex == 8) { - rclass = GIV(nilObj); - goto l2; - } - } - assert(classIndex >= (arrayClassIndexPun())); - /* begin classOrNilAtIndex: */ - assert((classIndex <= (tagMask())) - || (classIndex >= (arrayClassIndexPun()))); - classTablePage = longAt((GIV(hiddenRootsObj) + BaseHeaderSize) + ((((usqInt) classIndex) >> 10) << 2)); - if (classTablePage == GIV(nilObj)) { - rclass = GIV(nilObj); - goto l2; - } - rclass = longAt((classTablePage + BaseHeaderSize) + ((classIndex & ((1 << 10) - 1)) << 2)); - l2: /* end fetchClassOf: */; - if (addressCouldBeClassObj(rclass)) { - rclass = findClassContainingMethodstartingAt(aMethod, rclass); - if (rclass != GIV(nilObj)) { - methClass = rclass; - goto l1; - } - } } if (!((addressCouldBeObj(aMethod)) && (((((usqInt) (longAt(aMethod))) >> 24) & 0x1F) >= 24))) { methClass = GIV(nilObj); goto l1; } - mclass = safeMethodClassOf(aMethod); - if (addressCouldBeClassObj(mclass)) { - methClass = GIV(nilObj); - goto l1; - } methClass = findClassContainingMethodstartingAt(aMethod, safeMethodClassOf(aMethod)); l1: /* end findClassOfMethod:forReceiver: */; methodSel = findSelectorOfMethod(aMethod); Modified: branches/Cog/nsspursrc/vm/cointerp.h =================================================================== --- branches/Cog/nsspursrc/vm/cointerp.h 2014-10-29 23:58:59 UTC (rev 3117) +++ branches/Cog/nsspursrc/vm/cointerp.h 2014-10-31 00:33:06 UTC (rev 3118) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.914 uuid: bda96e1c-f22e-4b32-9ee1-620740e1fec5 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.915 uuid: 4159cf52-4807-4416-9da6-1c46ec5b9f10 */ Modified: branches/Cog/nsspursrc/vm/gcc3x-cointerp.c =================================================================== --- branches/Cog/nsspursrc/vm/gcc3x-cointerp.c 2014-10-29 23:58:59 UTC (rev 3117) +++ branches/Cog/nsspursrc/vm/gcc3x-cointerp.c 2014-10-31 00:33:06 UTC (rev 3118) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.914 uuid: bda96e1c-f22e-4b32-9ee1-620740e1fec5 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.915 uuid: 4159cf52-4807-4416-9da6-1c46ec5b9f10 from - CoInterpreter VMMaker.oscog-eem.914 uuid: bda96e1c-f22e-4b32-9ee1-620740e1fec5 + CoInterpreter VMMaker.oscog-eem.915 uuid: 4159cf52-4807-4416-9da6-1c46ec5b9f10 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.914 uuid: bda96e1c-f22e-4b32-9ee1-620740e1fec5 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.915 uuid: 4159cf52-4807-4416-9da6-1c46ec5b9f10 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -969,7 +969,6 @@ sqInt firstShortFormat(void); sqInt fixedFieldsFieldWidth(void); sqInt fixedFieldsOfClassFormatMask(void); -static sqInt fixedFieldsOfClassFormat(sqInt classFormat) NoDbgRegParms; static sqInt fixedFieldsOfformatlength(sqInt objOop, sqInt fmt, sqInt wordLength) NoDbgRegParms; static sqInt fixFollowedFieldofObjectwithInitialValue(sqInt fieldIndex, sqInt anObject, sqInt initialValue) NoDbgRegParms NeverInline; static sqInt followFieldofObject(sqInt fieldIndex, sqInt anObject) NoDbgRegParms; @@ -1551,8 +1550,8 @@ _iss sqInt rememberedSetSize; _iss sqInt * rememberedSet; _iss usqInt freeListsMask; -_iss sqInt classTableFirstPage; _iss sqInt profileProcess; +_iss sqInt classTableFirstPage; _iss sqInt longRunningPrimitiveCheckSemaphore; _iss sqInt profileSemaphore; _iss SpurContiguousObjStack unscannedEphemerons; @@ -2341,7 +2340,7 @@ /*540*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, /*560*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, 0, 0, 0,-1,-1 }; -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.914"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.915"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -42658,9 +42657,14 @@ static sqInt processWeakSurvivor(sqInt weakObj) { DECL_MAYBE_SQ_GLOBAL_STRUCT + sqInt classFormat; + sqInt classIndex; + sqInt classPointer; + sqInt classTablePage; sqInt hasYoungReferents; sqInt i; sqInt iLimiT; + sqInt numStrongSlots; sqInt referent; sqInt referent1; sqInt weakObjShouldMourn; @@ -42669,7 +42673,41 @@ /* N.B. generateToByDoLimitExpression:negative:on: guards against (unsigned)0 - 1 going +ve */ weakObjShouldMourn = (hasYoungReferents = 0); - for (i = (fixedFieldsOfClassFormat(formatOfClass(fetchClassOfNonImm(weakObj)))), iLimiT = ((numSlotsOf(weakObj)) - 1); i <= iLimiT; i += 1) { + /* begin fixedFieldsOfClassFormat: */ + /* begin formatOfClass: */ + /* begin fetchClassOfNonImm: */ + classIndex = (longAt(weakObj)) & 0x3FFFFF; + if (classIndex <= 0x1F) { + if (classIndex == 0x1F) { + classPointer = weakObj; + goto l1; + } + if (classIndex == 8) { + classPointer = GIV(nilObj); + goto l1; + } + } + assert(classIndex >= (arrayClassIndexPun())); + /* begin classOrNilAtIndex: */ + assert((classIndex <= (tagMask())) + || (classIndex >= (arrayClassIndexPun()))); + classTablePage = longAt((GIV(hiddenRootsObj) + BaseHeaderSize) + ((((usqInt) classIndex) >> 10) << 2)); + if (classTablePage == GIV(nilObj)) { + classPointer = GIV(nilObj); + goto l1; + } + classPointer = longAt((classTablePage + BaseHeaderSize) + ((classIndex & ((1 << 10) - 1)) << 2)); +l1: /* end fetchClassOfNonImm: */; + classFormat = ((longAt((classPointer + BaseHeaderSize) + (InstanceSpecificationIndex << 2))) >> 1); + numStrongSlots = classFormat & ((1 << 16) - 1); + for (i = 0; i < numStrongSlots; i += 1) { + referent = longAt((weakObj + BaseHeaderSize) + (i << 2)); + if (((referent & 3) == 0) + && (isYoungObject(referent))) { + hasYoungReferents = 1; + } + } + for (i = numStrongSlots, iLimiT = ((numSlotsOf(weakObj)) - 1); i <= iLimiT; i += 1) { /* Referent could be forwarded due to scavenging or a become:, don't assume. */ @@ -48681,12 +48719,6 @@ } static sqInt -fixedFieldsOfClassFormat(sqInt classFormat) -{ - return classFormat & ((1 << 16) - 1); -} - -static sqInt fixedFieldsOfformatlength(sqInt objOop, sqInt fmt, sqInt wordLength) { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt class; @@ -65481,6 +65513,9 @@ } do { assert(!(isForwarded(currClass))); + if (!(addressCouldBeClassObj(currClass))) { + return GIV(nilObj); + } /* begin noFixupFollowField:ofObject: */ objOop1 = longAt((currClass + BaseHeaderSize) + (MethodDictionaryIndex << 2)); if (((objOop1 & 3) == 0) @@ -65548,59 +65583,21 @@ sqInt findClassOfMethodforReceiver(sqInt meth, sqInt rcvr) { DECL_MAYBE_SQ_GLOBAL_STRUCT - sqInt classIndex; - sqInt classTablePage; - sqInt mclass; sqInt rclass; - sqInt tagBits; if ((((rcvr & 3) != 0) || (addressCouldBeObj(rcvr))) && (!(((rcvr & 3) == 0) && (((longAt(rcvr)) & 0x3FFFFF) == 8)))) { - /* begin fetchClassOf: */ - if (((tagBits = rcvr & 3)) != 0) { - rclass = longAt((GIV(classTableFirstPage) + BaseHeaderSize) + (tagBits << 2)); - goto l1; + rclass = findClassContainingMethodstartingAt(meth, fetchClassOf(rcvr)); + if (rclass != GIV(nilObj)) { + return rclass; } - /* begin fetchClassOfNonImm: */ - classIndex = (longAt(rcvr)) & 0x3FFFFF; - if (classIndex <= 0x1F) { - if (classIndex == 0x1F) { - rclass = rcvr; - goto l1; - } - if (classIndex == 8) { - rclass = GIV(nilObj); - goto l1; - } - } - assert(classIndex >= (arrayClassIndexPun())); - /* begin classOrNilAtIndex: */ - assert((classIndex <= (tagMask())) - || (classIndex >= (arrayClassIndexPun()))); - classTablePage = longAt((GIV(hiddenRootsObj) + BaseHeaderSize) + ((((usqInt) classIndex) >> 10) << 2)); - if (classTablePage == GIV(nilObj)) { - rclass = GIV(nilObj); - goto l1; - } - rclass = longAt((classTablePage + BaseHeaderSize) + ((classIndex & ((1 << 10) - 1)) << 2)); - l1: /* end fetchClassOf: */; - if (addressCouldBeClassObj(rclass)) { - rclass = findClassContainingMethodstartingAt(meth, rclass); - if (rclass != GIV(nilObj)) { - return rclass; - } - } } if (!((addressCouldBeObj(meth)) && (((((usqInt) (longAt(meth))) >> 24) & 0x1F) >= 24))) { return GIV(nilObj); } - mclass = safeMethodClassOf(meth); - if (addressCouldBeClassObj(mclass)) { - return GIV(nilObj); - } return findClassContainingMethodstartingAt(meth, safeMethodClassOf(meth)); } @@ -69084,14 +69081,10 @@ static void printActivationNameForreceiverisBlockfirstTemporary(sqInt aMethod, sqInt anObject, sqInt isBlock, sqInt maybeMessage) { DECL_MAYBE_SQ_GLOBAL_STRUCT - sqInt classIndex; sqInt classObj; - sqInt classTablePage; - sqInt mclass; sqInt methClass; sqInt methodSel; sqInt rclass; - sqInt tagBits; if (isBlock) { print("[] in "); @@ -69101,52 +69094,17 @@ || (addressCouldBeObj(anObject))) && (!(((anObject & 3) == 0) && (((longAt(anObject)) & 0x3FFFFF) == 8)))) { - /* begin fetchClassOf: */ - if (((tagBits = anObject & 3)) != 0) { - rclass = longAt((GIV(classTableFirstPage) + BaseHeaderSize) + (tagBits << 2)); - goto l2; + rclass = findClassContainingMethodstartingAt(aMethod, fetchClassOf(anObject)); + if (rclass != GIV(nilObj)) { + methClass = rclass; + goto l1; } - /* begin fetchClassOfNonImm: */ - classIndex = (longAt(anObject)) & 0x3FFFFF; - if (classIndex <= 0x1F) { - if (classIndex == 0x1F) { - rclass = anObject; - goto l2; - } - if (classIndex == 8) { - rclass = GIV(nilObj); - goto l2; - } - } - assert(classIndex >= (arrayClassIndexPun())); - /* begin classOrNilAtIndex: */ - assert((classIndex <= (tagMask())) - || (classIndex >= (arrayClassIndexPun()))); - classTablePage = longAt((GIV(hiddenRootsObj) + BaseHeaderSize) + ((((usqInt) classIndex) >> 10) << 2)); - if (classTablePage == GIV(nilObj)) { - rclass = GIV(nilObj); - goto l2; - } - rclass = longAt((classTablePage + BaseHeaderSize) + ((classIndex & ((1 << 10) - 1)) << 2)); - l2: /* end fetchClassOf: */; - if (addressCouldBeClassObj(rclass)) { - rclass = findClassContainingMethodstartingAt(aMethod, rclass); - if (rclass != GIV(nilObj)) { - methClass = rclass; - goto l1; - } - } } if (!((addressCouldBeObj(aMethod)) && (((((usqInt) (longAt(aMethod))) >> 24) & 0x1F) >= 24))) { methClass = GIV(nilObj); goto l1; } - mclass = safeMethodClassOf(aMethod); - if (addressCouldBeClassObj(mclass)) { - methClass = GIV(nilObj); - goto l1; - } methClass = findClassContainingMethodstartingAt(aMethod, safeMethodClassOf(aMethod)); l1: /* end findClassOfMethod:forReceiver: */; methodSel = findSelectorOfMethod(aMethod); Modified: branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c =================================================================== --- branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c 2014-10-29 23:58:59 UTC (rev 3117) +++ branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c 2014-10-31 00:33:06 UTC (rev 3118) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.914 uuid: bda96e1c-f22e-4b32-9ee1-620740e1fec5 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.915 uuid: 4159cf52-4807-4416-9da6-1c46ec5b9f10 from - StackInterpreter VMMaker.oscog-eem.914 uuid: bda96e1c-f22e-4b32-9ee1-620740e1fec5 + StackInterpreter VMMaker.oscog-eem.915 uuid: 4159cf52-4807-4416-9da6-1c46ec5b9f10 */ -static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.914 uuid: bda96e1c-f22e-4b32-9ee1-620740e1fec5 " __DATE__ ; +static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.915 uuid: 4159cf52-4807-4416-9da6-1c46ec5b9f10 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -716,7 +716,6 @@ sqInt firstShortFormat(void); sqInt fixedFieldsFieldWidth(void); sqInt fixedFieldsOfClassFormatMask(void); -static sqInt fixedFieldsOfClassFormat(sqInt classFormat) NoDbgRegParms; static sqInt fixedFieldsOfformatlength(sqInt objOop, sqInt fmt, sqInt wordLength) NoDbgRegParms; static sqInt fixFollowedFieldofObjectwithInitialValue(sqInt fieldIndex, sqInt anObject, sqInt initialValue) NoDbgRegParms NeverInline; static sqInt followFieldofObject(sqInt fieldIndex, sqInt anObject) NoDbgRegParms; @@ -1347,8 +1346,8 @@ _iss sqInt bytesPerPage; _iss usqInt freeListsMask; _iss sqInt profileProcess; -_iss sqInt classTableFirstPage; _iss SpurContiguousObjStack unscannedEphemerons; +_iss sqInt classTableFirstPage; _iss usqInt firstFreeChunk; _iss sqInt profileMethod; _iss StackPage * mostRecentlyUsedPage; @@ -2086,7 +2085,7 @@ 0 }; char * breakSelector; sqInt breakSelectorLength = -1; -const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscog-eem.914"; +const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscog-eem.915"; volatile int sendTrace; sqInt suppressHeartbeatFlag; @@ -28707,9 +28706,14 @@ static sqInt processWeakSurvivor(sqInt weakObj) { DECL_MAYBE_SQ_GLOBAL_STRUCT + sqInt classFormat; + sqInt classIndex; + sqInt classPointer; + sqInt classTablePage; sqInt hasYoungReferents; sqInt i; sqInt iLimiT; + sqInt numStrongSlots; sqInt referent; sqInt referent1; sqInt weakObjShouldMourn; @@ -28718,7 +28722,41 @@ /* N.B. generateToByDoLimitExpression:negative:on: guards against (unsigned)0 - 1 going +ve */ weakObjShouldMourn = (hasYoungReferents = 0); - for (i = (fixedFieldsOfClassFormat(formatOfClass(fetchClassOfNonImm(weakObj)))), iLimiT = ((numSlotsOf(weakObj)) - 1); i <= iLimiT; i += 1) { + /* begin fixedFieldsOfClassFormat: */ + /* begin formatOfClass: */ + /* begin fetchClassOfNonImm: */ + classIndex = (longAt(weakObj)) & 0x3FFFFF; + if (classIndex <= 0x1F) { + if (classIndex == 0x1F) { + classPointer = weakObj; + goto l1; + } + if (classIndex == 8) { + classPointer = GIV(nilObj); + goto l1; + } + } + assert(classIndex >= (arrayClassIndexPun())); + /* begin classOrNilAtIndex: */ + assert((classIndex <= (tagMask())) + || (classIndex >= (arrayClassIndexPun()))); + classTablePage = longAt((GIV(hiddenRootsObj) + BaseHeaderSize) + ((((usqInt) classIndex) >> 10) << 2)); + if (classTablePage == GIV(nilObj)) { + classPointer = GIV(nilObj); + goto l1; + } + classPointer = longAt((classTablePage + BaseHeaderSize) + ((classIndex & ((1 << 10) - 1)) << 2)); +l1: /* end fetchClassOfNonImm: */; + classFormat = ((longAt((classPointer + BaseHeaderSize) + (InstanceSpecificationIndex << 2))) >> 1); + numStrongSlots = classFormat & ((1 << 16) - 1); + for (i = 0; i < numStrongSlots; i += 1) { + referent = longAt((weakObj + BaseHeaderSize) + (i << 2)); + if (((referent & 3) == 0) + && (isYoungObject(referent))) { + hasYoungReferents = 1; + } + } + for (i = numStrongSlots, iLimiT = ((numSlotsOf(weakObj)) - 1); i <= iLimiT; i += 1) { /* Referent could be forwarded due to scavenging or a become:, don't assume. */ @@ -34747,12 +34785,6 @@ } static sqInt -fixedFieldsOfClassFormat(sqInt classFormat) -{ - return classFormat & ((1 << 16) - 1); -} - -static sqInt fixedFieldsOfformatlength(sqInt objOop, sqInt fmt, sqInt wordLength) { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt class; @@ -51624,6 +51656,9 @@ } do { assert(!(isForwarded(currClass))); + if (!(addressCouldBeClassObj(currClass))) { + return GIV(nilObj); + } /* begin noFixupFollowField:ofObject: */ objOop1 = longAt((currClass + BaseHeaderSize) + (MethodDictionaryIndex << 2)); if (((objOop1 & 3) == 0) @@ -51691,59 +51726,21 @@ sqInt findClassOfMethodforReceiver(sqInt meth, sqInt rcvr) { DECL_MAYBE_SQ_GLOBAL_STRUCT - sqInt classIndex; - sqInt classTablePage; - sqInt mclass; sqInt rclass; - sqInt tagBits; if ((((rcvr & 3) != 0) || (addressCouldBeObj(rcvr))) && (!(((rcvr & 3) == 0) && (((longAt(rcvr)) & 0x3FFFFF) == 8)))) { - /* begin fetchClassOf: */ - if (((tagBits = rcvr & 3)) != 0) { - rclass = longAt((GIV(classTableFirstPage) + BaseHeaderSize) + (tagBits << 2)); - goto l1; + rclass = findClassContainingMethodstartingAt(meth, fetchClassOf(rcvr)); + if (rclass != GIV(nilObj)) { + return rclass; } - /* begin fetchClassOfNonImm: */ - classIndex = (longAt(rcvr)) & 0x3FFFFF; - if (classIndex <= 0x1F) { - if (classIndex == 0x1F) { - rclass = rcvr; - goto l1; - } - if (classIndex == 8) { - rclass = GIV(nilObj); - goto l1; - } - } - assert(classIndex >= (arrayClassIndexPun())); - /* begin classOrNilAtIndex: */ - assert((classIndex <= (tagMask())) - || (classIndex >= (arrayClassIndexPun()))); - classTablePage = longAt((GIV(hiddenRootsObj) + BaseHeaderSize) + ((((usqInt) classIndex) >> 10) << 2)); - if (classTablePage == GIV(nilObj)) { - rclass = GIV(nilObj); - goto l1; - } - rclass = longAt((classTablePage + BaseHeaderSize) + ((classIndex & ((1 << 10) - 1)) << 2)); - l1: /* end fetchClassOf: */; - if (addressCouldBeClassObj(rclass)) { - rclass = findClassContainingMethodstartingAt(meth, rclass); - if (rclass != GIV(nilObj)) { - return rclass; - } - } } if (!((addressCouldBeObj(meth)) && (((((usqInt) (longAt(meth))) >> 24) & 0x1F) >= 24))) { return GIV(nilObj); } - mclass = safeMethodClassOf(meth); - if (addressCouldBeClassObj(mclass)) { - return GIV(nilObj); - } return findClassContainingMethodstartingAt(meth, safeMethodClassOf(meth)); } @@ -57452,14 +57449,10 @@ static void printActivationNameForreceiverisBlockfirstTemporary(sqInt aMethod, sqInt anObject, sqInt isBlock, sqInt maybeMessage) { DECL_MAYBE_SQ_GLOBAL_STRUCT - sqInt classIndex; sqInt classObj; - sqInt classTablePage; - sqInt mclass; sqInt methClass; sqInt methodSel; sqInt rclass; - sqInt tagBits; if (isBlock) { print("[] in "); @@ -57469,52 +57462,17 @@ || (addressCouldBeObj(anObject))) && (!(((anObject & 3) == 0) && (((longAt(anObject)) & 0x3FFFFF) == 8)))) { - /* begin fetchClassOf: */ - if (((tagBits = anObject & 3)) != 0) { - rclass = longAt((GIV(classTableFirstPage) + BaseHeaderSize) + (tagBits << 2)); - goto l2; + rclass = findClassContainingMethodstartingAt(aMethod, fetchClassOf(anObject)); + if (rclass != GIV(nilObj)) { + methClass = rclass; + goto l1; } - /* begin fetchClassOfNonImm: */ - classIndex = (longAt(anObject)) & 0x3FFFFF; - if (classIndex <= 0x1F) { - if (classIndex == 0x1F) { - rclass = anObject; - goto l2; - } - if (classIndex == 8) { - rclass = GIV(nilObj); - goto l2; - } - } - assert(classIndex >= (arrayClassIndexPun())); - /* begin classOrNilAtIndex: */ - assert((classIndex <= (tagMask())) - || (classIndex >= (arrayClassIndexPun()))); - classTablePage = longAt((GIV(hiddenRootsObj) + BaseHeaderSize) + ((((usqInt) classIndex) >> 10) << 2)); - if (classTablePage == GIV(nilObj)) { - rclass = GIV(nilObj); - goto l2; - } - rclass = longAt((classTablePage + BaseHeaderSize) + ((classIndex & ((1 << 10) - 1)) << 2)); - l2: /* end fetchClassOf: */; - if (addressCouldBeClassObj(rclass)) { - rclass = findClassContainingMethodstartingAt(aMethod, rclass); - if (rclass != GIV(nilObj)) { - methClass = rclass; - goto l1; - } - } } if (!((addressCouldBeObj(aMethod)) && (((((usqInt) (longAt(aMethod))) >> 24) & 0x1F) >= 24))) { methClass = GIV(nilObj); goto l1; } - mclass = safeMethodClassOf(aMethod); - if (addressCouldBeClassObj(mclass)) { - methClass = GIV(nilObj); - goto l1; - } methClass = findClassContainingMethodstartingAt(aMethod, safeMethodClassOf(aMethod)); l1: /* end findClassOfMethod:forReceiver: */; methodSel = findSelectorOfMethod(aMethod); Modified: branches/Cog/nsspurstacksrc/vm/interp.c =================================================================== --- branches/Cog/nsspurstacksrc/vm/interp.c 2014-10-29 23:58:59 UTC (rev 3117) +++ branches/Cog/nsspurstacksrc/vm/interp.c 2014-10-31 00:33:06 UTC (rev 3118) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.914 uuid: bda96e1c-f22e-4b32-9ee1-620740e1fec5 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.915 uuid: 4159cf52-4807-4416-9da6-1c46ec5b9f10 from - StackInterpreter VMMaker.oscog-eem.914 uuid: bda96e1c-f22e-4b32-9ee1-620740e1fec5 + StackInterpreter VMMaker.oscog-eem.915 uuid: 4159cf52-4807-4416-9da6-1c46ec5b9f10 */ -static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.914 uuid: bda96e1c-f22e-4b32-9ee1-620740e1fec5 " __DATE__ ; +static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.915 uuid: 4159cf52-4807-4416-9da6-1c46ec5b9f10 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -713,7 +713,6 @@ sqInt firstShortFormat(void); sqInt fixedFieldsFieldWidth(void); sqInt fixedFieldsOfClassFormatMask(void); -static sqInt fixedFieldsOfClassFormat(sqInt classFormat) NoDbgRegParms; static sqInt fixedFieldsOfformatlength(sqInt objOop, sqInt fmt, sqInt wordLength) NoDbgRegParms; static sqInt fixFollowedFieldofObjectwithInitialValue(sqInt fieldIndex, sqInt anObject, sqInt initialValue) NoDbgRegParms NeverInline; static sqInt followFieldofObject(sqInt fieldIndex, sqInt anObject) NoDbgRegParms; @@ -1344,8 +1343,8 @@ _iss sqInt bytesPerPage; _iss usqInt freeListsMask; _iss sqInt profileProcess; -_iss sqInt classTableFirstPage; _iss SpurContiguousObjStack unscannedEphemerons; +_iss sqInt classTableFirstPage; _iss usqInt firstFreeChunk; _iss sqInt profileMethod; _iss StackPage * mostRecentlyUsedPage; @@ -2083,7 +2082,7 @@ 0 }; char * breakSelector; sqInt breakSelectorLength = -1; -const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscog-eem.914"; +const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscog-eem.915"; volatile int sendTrace; sqInt suppressHeartbeatFlag; @@ -28698,9 +28697,14 @@ static sqInt processWeakSurvivor(sqInt weakObj) { DECL_MAYBE_SQ_GLOBAL_STRUCT + sqInt classFormat; + sqInt classIndex; + sqInt classPointer; + sqInt classTablePage; sqInt hasYoungReferents; sqInt i; sqInt iLimiT; + sqInt numStrongSlots; sqInt referent; sqInt referent1; sqInt weakObjShouldMourn; @@ -28709,7 +28713,41 @@ /* N.B. generateToByDoLimitExpression:negative:on: guards against (unsigned)0 - 1 going +ve */ weakObjShouldMourn = (hasYoungReferents = 0); - for (i = (fixedFieldsOfClassFormat(formatOfClass(fetchClassOfNonImm(weakObj)))), iLimiT = ((numSlotsOf(weakObj)) - 1); i <= iLimiT; i += 1) { + /* begin fixedFieldsOfClassFormat: */ + /* begin formatOfClass: */ + /* begin fetchClassOfNonImm: */ + classIndex = (longAt(weakObj)) & 0x3FFFFF; + if (classIndex <= 0x1F) { + if (classIndex == 0x1F) { + classPointer = weakObj; + goto l1; + } + if (classIndex == 8) { + classPointer = GIV(nilObj); + goto l1; + } + } + assert(classIndex >= (arrayClassIndexPun())); + /* begin classOrNilAtIndex: */ + assert((classIndex <= (tagMask())) + || (classIndex >= (arrayClassIndexPun()))); + classTablePage = longAt((GIV(hiddenRootsObj) + BaseHeaderSize) + ((((usqInt) classIndex) >> 10) << 2)); + if (classTablePage == GIV(nilObj)) { + classPointer = GIV(nilObj); + goto l1; + } + classPointer = longAt((classTablePage + BaseHeaderSize) + ((classIndex & ((1 << 10) - 1)) << 2)); +l1: /* end fetchClassOfNonImm: */; + classFormat = ((longAt((classPointer + BaseHeaderSize) + (InstanceSpecificationIndex << 2))) >> 1); + numStrongSlots = classFormat & ((1 << 16) - 1); + for (i = 0; i < numStrongSlots; i += 1) { + referent = longAt((weakObj + BaseHeaderSize) + (i << 2)); + if (((referent & 3) == 0) + && (isYoungObject(referent))) { + hasYoungReferents = 1; + } + } + for (i = numStrongSlots, iLimiT = ((numSlotsOf(weakObj)) - 1); i <= iLimiT; i += 1) { /* Referent could be forwarded due to scavenging or a become:, don't assume. */ @@ -34738,12 +34776,6 @@ } static sqInt -fixedFieldsOfClassFormat(sqInt classFormat) -{ - return classFormat & ((1 << 16) - 1); -} - -static sqInt fixedFieldsOfformatlength(sqInt objOop, sqInt fmt, sqInt wordLength) { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt class; @@ -51615,6 +51647,9 @@ } do { assert(!(isForwarded(currClass))); + if (!(addressCouldBeClassObj(currClass))) { + return GIV(nilObj); + } /* begin noFixupFollowField:ofObject: */ objOop1 = longAt((currClass + BaseHeaderSize) + (MethodDictionaryIndex << 2)); if (((objOop1 & 3) == 0) @@ -51682,59 +51717,21 @@ sqInt findClassOfMethodforReceiver(sqInt meth, sqInt rcvr) { DECL_MAYBE_SQ_GLOBAL_STRUCT - sqInt classIndex; - sqInt classTablePage; - sqInt mclass; sqInt rclass; - sqInt tagBits; if ((((rcvr & 3) != 0) || (addressCouldBeObj(rcvr))) && (!(((rcvr & 3) == 0) && (((longAt(rcvr)) & 0x3FFFFF) == 8)))) { - /* begin fetchClassOf: */ - if (((tagBits = rcvr & 3)) != 0) { - rclass = longAt((GIV(classTableFirstPage) + BaseHeaderSize) + (tagBits << 2)); - goto l1; + rclass = findClassContainingMethodstartingAt(meth, fetchClassOf(rcvr)); + if (rclass != GIV(nilObj)) { + return rclass; } - /* begin fetchClassOfNonImm: */ - classIndex = (longAt(rcvr)) & 0x3FFFFF; - if (classIndex <= 0x1F) { - if (classIndex == 0x1F) { - rclass = rcvr; - goto l1; - } - if (classIndex == 8) { - rclass = GIV(nilObj); - goto l1; - } - } - assert(classIndex >= (arrayClassIndexPun())); - /* begin classOrNilAtIndex: */ - assert((classIndex <= (tagMask())) - || (classIndex >= (arrayClassIndexPun()))); - classTablePage = longAt((GIV(hiddenRootsObj) + BaseHeaderSize) + ((((usqInt) classIndex) >> 10) << 2)); - if (classTablePage == GIV(nilObj)) { - rclass = GIV(nilObj); - goto l1; - } - rclass = longAt((classTablePage + BaseHeaderSize) + ((classIndex & ((1 << 10) - 1)) << 2)); - l1: /* end fetchClassOf: */; - if (addressCouldBeClassObj(rclass)) { - rclass = findClassContainingMethodstartingAt(meth, rclass); - if (rclass != GIV(nilObj)) { - return rclass; - } - } } if (!((addressCouldBeObj(meth)) && (((((usqInt) (longAt(meth))) >> 24) & 0x1F) >= 24))) { return GIV(nilObj); } - mclass = safeMethodClassOf(meth); - if (addressCouldBeClassObj(mclass)) { - return GIV(nilObj); - } return findClassContainingMethodstartingAt(meth, safeMethodClassOf(meth)); } @@ -57443,14 +57440,10 @@ static void printActivationNameForreceiverisBlockfirstTemporary(sqInt aMethod, sqInt anObject, sqInt isBlock, sqInt maybeMessage) { DECL_MAYBE_SQ_GLOBAL_STRUCT - sqInt classIndex; sqInt classObj; - sqInt classTablePage; - sqInt mclass; sqInt methClass; sqInt methodSel; sqInt rclass; - sqInt tagBits; if (isBlock) { print("[] in "); @@ -57460,52 +57453,17 @@ || (addressCouldBeObj(anObject))) && (!(((anObject & 3) == 0) && (((longAt(anObject)) & 0x3FFFFF) == 8)))) { - /* begin fetchClassOf: */ - if (((tagBits = anObject & 3)) != 0) { - rclass = longAt((GIV(classTableFirstPage) + BaseHeaderSize) + (tagBits << 2)); - goto l2; + rclass = findClassContainingMethodstartingAt(aMethod, fetchClassOf(anObject)); + if (rclass != GIV(nilObj)) { + methClass = rclass; + goto l1; } - /* begin fetchClassOfNonImm: */ - classIndex = (longAt(anObject)) & 0x3FFFFF; - if (classIndex <= 0x1F) { - if (classIndex == 0x1F) { - rclass = anObject; - goto l2; - } - if (classIndex == 8) { - rclass = GIV(nilObj); - goto l2; - } - } - assert(classIndex >= (arrayClassIndexPun())); - /* begin classOrNilAtIndex: */ - assert((classIndex <= (tagMask())) - || (classIndex >= (arrayClassIndexPun()))); - classTablePage = longAt((GIV(hiddenRootsObj) + BaseHeaderSize) + ((((usqInt) classIndex) >> 10) << 2)); - if (classTablePage == GIV(nilObj)) { - rclass = GIV(nilObj); - goto l2; - } - rclass = longAt((classTablePage + BaseHeaderSize) + ((classIndex & ((1 << 10) - 1)) << 2)); - l2: /* end fetchClassOf: */; - if (addressCouldBeClassObj(rclass)) { - rclass = findClassContainingMethodstartingAt(aMethod, rclass); - if (rclass != GIV(nilObj)) { - methClass = rclass; - goto l1; - } - } } if (!((addressCouldBeObj(aMethod)) && (((((usqInt) (longAt(aMethod))) >> 24) & 0x1F) >= 24))) { methClass = GIV(nilObj); goto l1; } - mclass = safeMethodClassOf(aMethod); - if (addressCouldBeClassObj(mclass)) { - methClass = GIV(nilObj); - goto l1; - } methClass = findClassContainingMethodstartingAt(aMethod, safeMethodClassOf(aMethod)); l1: /* end findClassOfMethod:forReceiver: */; methodSel = findSelectorOfMethod(aMethod); Property changes on: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h ___________________________________________________________________ Modified: checkindate - Wed Oct 29 16:57:58 PDT 2014 + Thu Oct 30 17:32:32 PDT 2014 Modified: branches/Cog/spursistasrc/vm/cointerp.c =================================================================== --- branches/Cog/spursistasrc/vm/cointerp.c 2014-10-29 23:58:59 UTC (rev 3117) +++ branches/Cog/spursistasrc/vm/cointerp.c 2014-10-31 00:33:06 UTC (rev 3118) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.914 uuid: bda96e1c-f22e-4b32-9ee1-620740e1fec5 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.915 uuid: 4159cf52-4807-4416-9da6-1c46ec5b9f10 from - CoInterpreter VMMaker.oscog-eem.914 uuid: bda96e1c-f22e-4b32-9ee1-620740e1fec5 + CoInterpreter VMMaker.oscog-eem.915 uuid: 4159cf52-4807-4416-9da6-1c46ec5b9f10 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.914 uuid: bda96e1c-f22e-4b32-9ee1-620740e1fec5 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.915 uuid: 4159cf52-4807-4416-9da6-1c46ec5b9f10 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -965,7 +965,6 @@ sqInt firstShortFormat(void); sqInt fixedFieldsFieldWidth(void); sqInt fixedFieldsOfClassFormatMask(void); -static sqInt fixedFieldsOfClassFormat(sqInt classFormat) NoDbgRegParms; static sqInt fixedFieldsOfClass(sqInt objOop) NoDbgRegParms; static sqInt fixedFieldsOfformatlength(sqInt objOop, sqInt fmt, sqInt wordLength) NoDbgRegParms; static sqInt fixFollowedFieldofObjectwithInitialValue(sqInt fieldIndex, sqInt anObject, sqInt initialValue) NoDbgRegParms NeverInline; @@ -1542,8 +1541,8 @@ _iss sqInt * freeLists; _iss sqInt rememberedSetSize; _iss sqInt * rememberedSet; -_iss sqInt classTableFirstPage; _iss usqInt freeListsMask; +_iss sqInt classTableFirstPage; _iss sqInt profileProcess; _iss sqInt longRunningPrimitiveCheckSemaphore; _iss sqInt profileSemaphore; @@ -2333,7 +2332,7 @@ /*540*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, /*560*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, 0, 0, 0,-1,-1 }; -const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreterPrimitives VMMaker.oscog-eem.914]"; +const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreterPrimitives VMMaker.oscog-eem.915]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -42958,9 +42957,14 @@ static sqInt processWeakSurvivor(sqInt weakObj) { DECL_MAYBE_SQ_GLOBAL_STRUCT + sqInt classFormat; + sqInt classIndex; + sqInt classPointer; + sqInt classTablePage; sqInt hasYoungReferents; sqInt i; sqInt iLimiT; + sqInt numStrongSlots; sqInt referent; sqInt referent1; sqInt weakObjShouldMourn; @@ -42969,7 +42973,41 @@ /* N.B. generateToByDoLimitExpression:negative:on: guards against (unsigned)0 - 1 going +ve */ weakObjShouldMourn = (hasYoungReferents = 0); - for (i = (fixedFieldsOfClassFormat(formatOfClass(fetchClassOfNonImm(weakObj)))), iLimiT = ((numSlotsOf(weakObj)) - 1); i <= iLimiT; i += 1) { + /* begin fixedFieldsOfClassFormat: */ + /* begin formatOfClass: */ + /* begin fetchClassOfNonImm: */ + classIndex = (longAt(weakObj)) & 0x3FFFFF; + if (classIndex <= 0x1F) { + if (classIndex == 0x1F) { + classPointer = weakObj; + goto l1; + } + if (classIndex == 8) { + classPointer = GIV(nilObj); + goto l1; + } + } + assert(classIndex >= (arrayClassIndexPun())); + /* begin classOrNilAtIndex: */ + assert((classIndex <= (tagMask())) + || (classIndex >= (arrayClassIndexPun()))); + classTablePage = longAt((GIV(hiddenRootsObj) + BaseHeaderSize) + ((((usqInt) classIndex) >> 10) << 2)); + if (classTablePage == GIV(nilObj)) { + classPointer = GIV(nilObj); + goto l1; + } + classPointer = longAt((classTablePage + BaseHeaderSize) + ((classIndex & ((1 << 10) - 1)) << 2)); +l1: /* end fetchClassOfNonImm: */; + classFormat = ((longAt((classPointer + BaseHeaderSize) + (InstanceSpecificationIndex << 2))) >> 1); + numStrongSlots = classFormat & ((1 << 16) - 1); + for (i = 0; i < numStrongSlots; i += 1) { + referent = longAt((weakObj + BaseHeaderSize) + (i << 2)); + if (((referent & 3) == 0) + && (isYoungObject(referent))) { + hasYoungReferents = 1; + } + } + for (i = numStrongSlots, iLimiT = ((numSlotsOf(weakObj)) - 1); i <= iLimiT; i += 1) { /* Referent could be forwarded due to scavenging or a become:, don't assume. */ @@ -48981,12 +49019,6 @@ } static sqInt -fixedFieldsOfClassFormat(sqInt classFormat) -{ - return classFormat & ((1 << 16) - 1); -} - -static sqInt fixedFieldsOfClass(sqInt objOop) { return (((longAt((objOop + BaseHeaderSize) + (InstanceSpecificationIndex << 2))) >> 1)) & ((1 << 16) - 1); @@ -65650,6 +65682,9 @@ } do { assert(!(isForwarded(currClass))); + if (!(addressCouldBeClassObj(currClass))) { + return GIV(nilObj); + } /* begin noFixupFollowField:ofObject: */ objOop1 = longAt((currClass + BaseHeaderSize) + (MethodDictionaryIndex << 2)); if (((objOop1 & 3) == 0) @@ -65717,59 +65752,21 @@ sqInt findClassOfMethodforReceiver(sqInt meth, sqInt rcvr) { DECL_MAYBE_SQ_GLOBAL_STRUCT - sqInt classIndex; - sqInt classTablePage; - sqInt mclass; sqInt rclass; - sqInt tagBits; if ((((rcvr & 3) != 0) || (addressCouldBeObj(rcvr))) && (!(((rcvr & 3) == 0) && (((longAt(rcvr)) & 0x3FFFFF) == 8)))) { - /* begin fetchClassOf: */ - if (((tagBits = rcvr & 3)) != 0) { - rclass = longAt((GIV(classTableFirstPage) + BaseHeaderSize) + (tagBits << 2)); - goto l1; + rclass = findClassContainingMethodstartingAt(meth, fetchClassOf(rcvr)); + if (rclass != GIV(nilObj)) { + return rclass; } - /* begin fetchClassOfNonImm: */ - classIndex = (longAt(rcvr)) & 0x3FFFFF; - if (classIndex <= 0x1F) { - if (classIndex == 0x1F) { - rclass = rcvr; - goto l1; - } - if (classIndex == 8) { - rclass = GIV(nilObj); - goto l1; - } - } - assert(classIndex >= (arrayClassIndexPun())); - /* begin classOrNilAtIndex: */ - assert((classIndex <= (tagMask())) - || (classIndex >= (arrayClassIndexPun()))); - classTablePage = longAt((GIV(hiddenRootsObj) + BaseHeaderSize) + ((((usqInt) classIndex) >> 10) << 2)); - if (classTablePage == GIV(nilObj)) { - rclass = GIV(nilObj); - goto l1; - } - rclass = longAt((classTablePage + BaseHeaderSize) + ((classIndex & ((1 << 10) - 1)) << 2)); - l1: /* end fetchClassOf: */; - if (addressCouldBeClassObj(rclass)) { - rclass = findClassContainingMethodstartingAt(meth, rclass); - if (rclass != GIV(nilObj)) { - return rclass; - } - } } if (!((addressCouldBeObj(meth)) && (((((usqInt) (longAt(meth))) >> 24) & 0x1F) >= 24))) { return GIV(nilObj); } - mclass = safeMethodClassOf(meth); - if (addressCouldBeClassObj(mclass)) { - return GIV(nilObj); - } return findClassContainingMethodstartingAt(meth, safeMethodClassOf(meth)); } @@ -69257,14 +69254,10 @@ static void printActivationNameForreceiverisBlockfirstTemporary(sqInt aMethod, sqInt anObject, sqInt isBlock, sqInt maybeMessage) { DECL_MAYBE_SQ_GLOBAL_STRUCT - sqInt classIndex; sqInt classObj; - sqInt classTablePage; - sqInt mclass; sqInt methClass; sqInt methodSel; sqInt rclass; - sqInt tagBits; if (isBlock) { print("[] in "); @@ -69274,52 +69267,17 @@ || (addressCouldBeObj(anObject))) && (!(((anObject & 3) == 0) && (((longAt(anObject)) & 0x3FFFFF) == 8)))) { - /* begin fetchClassOf: */ - if (((tagBits = anObject & 3)) != 0) { - rclass = longAt((GIV(classTableFirstPage) + BaseHeaderSize) + (tagBits << 2)); - goto l2; + rclass = findClassContainingMethodstartingAt(aMethod, fetchClassOf(anObject)); + if (rclass != GIV(nilObj)) { + methClass = rclass; + goto l1; } - /* begin fetchClassOfNonImm: */ - classIndex = (longAt(anObject)) & 0x3FFFFF; - if (classIndex <= 0x1F) { - if (classIndex == 0x1F) { - rclass = anObject; - goto l2; - } - if (classIndex == 8) { - rclass = GIV(nilObj); - goto l2; - } - } - assert(classIndex >= (arrayClassIndexPun())); - /* begin classOrNilAtIndex: */ - assert((classIndex <= (tagMask())) - || (classIndex >= (arrayClassIndexPun()))); - classTablePage = longAt((GIV(hiddenRootsObj) + BaseHeaderSize) + ((((usqInt) classIndex) >> 10) << 2)); - if (classTablePage == GIV(nilObj)) { - rclass = GIV(nilObj); - goto l2; - } - rclass = longAt((classTablePage + BaseHeaderSize) + ((classIndex & ((1 << 10) - 1)) << 2)); - l2: /* end fetchClassOf: */; - if (addressCouldBeClassObj(rclass)) { - rclass = findClassContainingMethodstartingAt(aMethod, rclass); - if (rclass != GIV(nilObj)) { - methClass = rclass; - goto l1; - } - } } if (!((addressCouldBeObj(aMethod)) && (((((usqInt) (longAt(aMethod))) >> 24) & 0x1F) >= 24))) { methClass = GIV(nilObj); goto l1; } - mclass = safeMethodClassOf(aMethod); - if (addressCouldBeClassObj(mclass)) { - methClass = GIV(nilObj); - goto l1; - } methClass = findClassContainingMethodstartingAt(aMethod, safeMethodClassOf(aMethod)); l1: /* end findClassOfMethod:forReceiver: */; methodSel = findSelectorOfMethod(aMethod); Modified: branches/Cog/spursistasrc/vm/cointerp.h =================================================================== --- branches/Cog/spursistasrc/vm/cointerp.h 2014-10-29 23:58:59 UTC (rev 3117) +++ branches/Cog/spursistasrc/vm/cointerp.h 2014-10-31 00:33:06 UTC (rev 3118) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.914 uuid: bda96e1c-f22e-4b32-9ee1-620740e1fec5 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.915 uuid: 4159cf52-4807-4416-9da6-1c46ec5b9f10 */ Modified: branches/Cog/spursistasrc/vm/gcc3x-cointerp.c =================================================================== --- branches/Cog/spursistasrc/vm/gcc3x-cointerp.c 2014-10-29 23:58:59 UTC (rev 3117) +++ branches/Cog/spursistasrc/vm/gcc3x-cointerp.c 2014-10-31 00:33:06 UTC (rev 3118) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.914 uuid: bda96e1c-f22e-4b32-9ee1-620740e1fec5 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.915 uuid: 4159cf52-4807-4416-9da6-1c46ec5b9f10 from - CoInterpreter VMMaker.oscog-eem.914 uuid: bda96e1c-f22e-4b32-9ee1-620740e1fec5 + CoInterpreter VMMaker.oscog-eem.915 uuid: 4159cf52-4807-4416-9da6-1c46ec5b9f10 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.914 uuid: bda96e1c-f22e-4b32-9ee1-620740e1fec5 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.915 uuid: 4159cf52-4807-4416-9da6-1c46ec5b9f10 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -968,7 +968,6 @@ sqInt firstShortFormat(void); sqInt fixedFieldsFieldWidth(void); sqInt fixedFieldsOfClassFormatMask(void); -static sqInt fixedFieldsOfClassFormat(sqInt classFormat) NoDbgRegParms; static sqInt fixedFieldsOfClass(sqInt objOop) NoDbgRegParms; static sqInt fixedFieldsOfformatlength(sqInt objOop, sqInt fmt, sqInt wordLength) NoDbgRegParms; static sqInt fixFollowedFieldofObjectwithInitialValue(sqInt fieldIndex, sqInt anObject, sqInt initialValue) NoDbgRegParms NeverInline; @@ -1545,8 +1544,8 @@ _iss sqInt * freeLists; _iss sqInt rememberedSetSize; _iss sqInt * rememberedSet; -_iss sqInt classTableFirstPage; _iss usqInt freeListsMask; +_iss sqInt classTableFirstPage; _iss sqInt profileProcess; _iss sqInt longRunningPrimitiveCheckSemaphore; _iss sqInt profileSemaphore; @@ -2336,7 +2335,7 @@ /*540*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, /*560*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, 0, 0, 0,-1,-1 }; -const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreterPrimitives VMMaker.oscog-eem.914]"; +const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreterPrimitives VMMaker.oscog-eem.915]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -42967,9 +42966,14 @@ static sqInt processWeakSurvivor(sqInt weakObj) { DECL_MAYBE_SQ_GLOBAL_STRUCT + sqInt classFormat; + sqInt classIndex; + sqInt classPointer; + sqInt classTablePage; sqInt hasYoungReferents; sqInt i; sqInt iLimiT; + sqInt numStrongSlots; sqInt referent; sqInt referent1; sqInt weakObjShouldMourn; @@ -42978,7 +42982,41 @@ /* N.B. generateToByDoLimitExpression:negative:on: guards against (unsigned)0 - 1 going +ve */ weakObjShouldMourn = (hasYoungReferents = 0); - for (i = (fixedFieldsOfClassFormat(formatOfClass(fetchClassOfNonImm(weakObj)))), iLimiT = ((numSlotsOf(weakObj)) - 1); i <= iLimiT; i += 1) { + /* begin fixedFieldsOfClassFormat: */ + /* begin formatOfClass: */ + /* begin fetchClassOfNonImm: */ + classIndex = (longAt(weakObj)) & 0x3FFFFF; + if (classIndex <= 0x1F) { + if (classIndex == 0x1F) { + classPointer = weakObj; + goto l1; + } + if (classIndex == 8) { + classPointer = GIV(nilObj); + goto l1; + } + } + assert(classIndex >= (arrayClassIndexPun())); + /* begin classOrNilAtIndex: */ + assert((classIndex <= (tagMask())) + || (classIndex >= (arrayClassIndexPun()))); + classTablePage = longAt((GIV(hiddenRootsObj) + BaseHeaderSize) + ((((usqInt) classIndex) >> 10) << 2)); + if (classTablePage == GIV(nilObj)) { + classPointer = GIV(nilObj); + goto l1; + } + classPointer = longAt((classTablePage + BaseHeaderSize) + ((classIndex & ((1 << 10) - 1)) << 2)); +l1: /* end fetchClassOfNonImm: */; + classFormat = ((longAt((classPointer + BaseHeaderSize) + (InstanceSpecificationIndex << 2))) >> 1); + numStrongSlots = classFormat & ((1 << 16) - 1); + for (i = 0; i < numStrongSlots; i += 1) { + referent = longAt((weakObj + BaseHeaderSize) + (i << 2)); + if (((referent & 3) == 0) + && (isYoungObject(referent))) { + hasYoungReferents = 1; + } + } + for (i = numStrongSlots, iLimiT = ((numSlotsOf(weakObj)) - 1); i <= iLimiT; i += 1) { /* Referent could be forwarded due to scavenging or a become:, don't assume. */ @@ -48990,12 +49028,6 @@ } static sqInt -fixedFieldsOfClassFormat(sqInt classFormat) -{ - return classFormat & ((1 << 16) - 1); -} - -static sqInt fixedFieldsOfClass(sqInt objOop) { return (((longAt((objOop + BaseHeaderSize) + (InstanceSpecificationIndex << 2))) >> 1)) & ((1 << 16) - 1); @@ -65659,6 +65691,9 @@ } do { assert(!(isForwarded(currClass))); + if (!(addressCouldBeClassObj(currClass))) { + return GIV(nilObj); + } /* begin noFixupFollowField:ofObject: */ objOop1 = longAt((currClass + BaseHeaderSize) + (MethodDictionaryIndex << 2)); if (((objOop1 & 3) == 0) @@ -65726,59 +65761,21 @@ sqInt findClassOfMethodforReceiver(sqInt meth, sqInt rcvr) { DECL_MAYBE_SQ_GLOBAL_STRUCT @@ Diff output truncated at 50000 characters. @@

1 0

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

31 Oct '14

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.915.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.915 Author: eem Time: 30 October 2014, 5:02:22.109 pm UUID: 4159cf52-4807-4416-9da6-1c46ec5b9f10 Ancestors: VMMaker.oscog-eem.914 Fix processWeakSurvivor: so that it answers whether a weak object refers to a young object. The old version only scanned weak fields, igoring refs to young objs from strong fields. Move check for valid classes from findClassOfMethod: forReceiver: into findClassContainingMethod:startingAt:, hence making findClassOfMethod:forReceiver: et al more robust. =============== Diff against VMMaker.oscog-eem.914 =============== Item was changed: ----- Method: SpurGenerationScavenger>>processWeakSurvivor: (in category 'weakness and ephemerality') ----- processWeakSurvivor: weakObj "Process a weak survivor on the weakList. Those of its fields which have not survived the scavenge should be nilled, and if any are, the coInterpreter should be informed via signalFinalization:.. Answer if the weakObj has any young referents." + | weakObjShouldMourn hasYoungReferents numStrongSlots | - | weakObjShouldMourn hasYoungReferents | weakObjShouldMourn := hasYoungReferents := false. "N.B. generateToByDoLimitExpression:negative:on: guards against (unsigned)0 - 1 going +ve" + numStrongSlots := manager numFixedSlotsOf: weakObj. + 0 to: numStrongSlots - 1 do: + [:i| | referent | + referent := manager fetchPointer: i ofObject: weakObj. + ((manager isNonImmediate: referent) + and: [manager isYoungObject: referent]) ifTrue: + [hasYoungReferents := true]]. + numStrongSlots - (manager numFixedSlotsOf: weakObj) to: (manager numSlotsOf: weakObj) - 1 do: [:i| | referent | referent := manager fetchPointer: i ofObject: weakObj. "Referent could be forwarded due to scavenging or a become:, don't assume." (manager isNonImmediate: referent) ifTrue: [(manager isForwarded: referent) ifTrue: [referent := manager followForwarded: referent. "weakObj is either young or already in remembered table; no need to check" self assert: ((manager isReallyYoungObject: weakObj) or: [manager isRemembered: weakObj]).. manager storePointerUnchecked: i ofObject: weakObj withValue: referent]. (self isMaybeOldScavengeSurvivor: referent) ifTrue: [(manager isYoungObject: referent) ifTrue: [hasYoungReferents := true]] ifFalse: [weakObjShouldMourn := true. manager storePointerUnchecked: i ofObject: weakObj withValue: manager nilObject]]]. weakObjShouldMourn ifTrue: [coInterpreter signalFinalization: weakObj]. ^hasYoungReferents! Item was changed: ----- Method: StackInterpreter>>findClassContainingMethod:startingAt: (in category 'debug support') ----- findClassContainingMethod: meth startingAt: classObj | currClass classDict classDictSize methodArray i | (objectMemory isOopForwarded: classObj) ifTrue: [currClass := objectMemory followForwarded: classObj] ifFalse: [currClass := classObj]. [self assert: (objectMemory isForwarded: currClass) not. + (self addressCouldBeClassObj: currClass) ifFalse: + [^objectMemory nilObject]. classDict := objectMemory noFixupFollowField: MethodDictionaryIndex ofObject: currClass. self assert: (objectMemory isForwarded: classDict) not. classDictSize := objectMemory numSlotsOf: classDict. classDictSize > MethodArrayIndex ifTrue: [methodArray := objectMemory noFixupFollowField: MethodArrayIndex ofObject: classDict. self assert: (objectMemory isForwarded: methodArray) not. i := 0. [i < (classDictSize - SelectorStart)] whileTrue: [meth = (objectMemory noFixupFollowField: i ofObject: methodArray) ifTrue: [^currClass]. i := i + 1]]. currClass := self noFixupSuperclassOf: currClass. currClass = objectMemory nilObject] whileFalse. ^currClass "method not found in superclass chain"! Item was changed: ----- Method: StackInterpreter>>findClassOfMethod:forReceiver: (in category 'debug support') ----- findClassOfMethod: meth forReceiver: rcvr - | rclass mclass | ((objectMemory addressCouldBeOop: rcvr) and: [(objectMemory isOopForwarded: rcvr) not]) ifTrue: + [| rclass | + rclass := self + findClassContainingMethod: meth + startingAt: (objectMemory fetchClassOf: rcvr). + rclass ~= objectMemory nilObject ifTrue: + [^rclass]]. - [rclass := objectMemory fetchClassOf: rcvr. - (self addressCouldBeClassObj: rclass) ifTrue: - [rclass := self findClassContainingMethod: meth startingAt: rclass. - rclass ~= objectMemory nilObject ifTrue: - [^rclass]]]. ((objectMemory addressCouldBeObj: meth) and: [objectMemory isCompiledMethod: meth]) ifFalse: [^objectMemory nilObject]. + ^self + findClassContainingMethod: meth + startingAt: (self safeMethodClassOf: meth)! - mclass := self safeMethodClassOf: meth. - (self addressCouldBeClassObj: mclass) ifTrue: - [^objectMemory nilObject]. - ^self findClassContainingMethod: meth startingAt: (self safeMethodClassOf: meth)!

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