Vm-dev September 2014

vm-dev@lists.squeakfoundation.org

25 participants
90 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

[commit][3087] CogVM source as per VMMaker.oscog-eem.889
by commits＠squeakvm.org 30 Sep '14

30 Sep '14

Revision: 3087 Author: eliot Date: 2014-09-30 16:39:10 -0700 (Tue, 30 Sep 2014) Log Message: ----------- CogVM source as per VMMaker.oscog-eem.889 Fix the assert fail caused by a frameless method with an unaccessed temp. Move the assert check to genPushTemporaryVariable:. Modified Paths: -------------- branches/Cog/nscogsrc/vm/cogit.c branches/Cog/nscogsrc/vm/cogit.h branches/Cog/nsspursrc/vm/cogit.c branches/Cog/nsspursrc/vm/cogit.h branches/Cog/sistasrc/vm/cogit.c branches/Cog/sistasrc/vm/cogit.h branches/Cog/spursistasrc/vm/cogit.c branches/Cog/spursistasrc/vm/cogit.h branches/Cog/spursrc/vm/cogit.c branches/Cog/spursrc/vm/cogit.h branches/Cog/src/vm/cogit.c branches/Cog/src/vm/cogit.h Property Changed: ---------------- branches/Cog/platforms/Cross/vm/sqSCCSVersion.h Modified: branches/Cog/nscogsrc/vm/cogit.c =================================================================== --- branches/Cog/nscogsrc/vm/cogit.c 2014-09-30 17:23:24 UTC (rev 3086) +++ branches/Cog/nscogsrc/vm/cogit.c 2014-09-30 23:39:10 UTC (rev 3087) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.888 uuid: e58fb0f2-df49-4ac0-8e84-48499470b5f6 + CCodeGenerator VMMaker.oscog-eem.889 uuid: f7ca0f83-4116-4c07-8307-3c23f8f5600a from - StackToRegisterMappingCogit VMMaker.oscog-eem.888 uuid: e58fb0f2-df49-4ac0-8e84-48499470b5f6 + StackToRegisterMappingCogit VMMaker.oscog-eem.889 uuid: f7ca0f83-4116-4c07-8307-3c23f8f5600a */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.888 uuid: e58fb0f2-df49-4ac0-8e84-48499470b5f6 " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.889 uuid: f7ca0f83-4116-4c07-8307-3c23f8f5600a " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -12553,7 +12553,7 @@ { sqInt *address; sqInt *address1; - usqInt cacheAddress; + sqInt cacheAddress; sqInt cacheTag; sqInt cacheTag1; sqInt cacheTagMarked; @@ -12723,7 +12723,7 @@ static sqInt markYoungObjectspcmethod(sqInt annotation, char *mcpc, sqInt cogMethod) { - usqInt cacheAddress; + sqInt cacheAddress; sqInt cacheTag; sqInt cacheTag1; sqInt class; @@ -13814,7 +13814,7 @@ static sqInt remapIfObjectRefpchasYoung(sqInt annotation, char *mcpc, sqInt hasYoungPtr) { - usqInt cacheAddress; + sqInt cacheAddress; sqInt cacheTag; sqInt cacheTag1; sqInt entryPoint; @@ -14583,7 +14583,7 @@ static void voidImplicitReceiverCacheAt(sqInt mcpc) { - usqInt cacheAddress; + sqInt cacheAddress; assert(NumOopsPerIRC == 2); cacheAddress = (((usqInt)mcpc)) + (jumpShortByteSize(backEnd)); @@ -20888,9 +20888,16 @@ return ssPushRegister(SendNumArgsReg); } + +/* If a frameless method (not a block), only argument temps can be accessed. + This is assured by the use of needsFrameIfMod16GENumArgs: in pushTemp. */ + static sqInt genPushTemporaryVariable(sqInt index) { + assert(inBlock + || (needsFrame + || (index < methodOrBlockNumArgs))); return ssPushDesc(simStack[index]); } @@ -21829,7 +21836,7 @@ } -/* The register receiver (he closure itself) and args are pushed by the +/* The register receiver (the closure itself) and args are pushed by the closure value primitive(s) and hence a frameless block has all arguments and copied values pushed to the stack. However, @@ -21849,7 +21856,6 @@ (optStatus.isReceiverResultRegLive = 1); (optStatus.ssEntry = (&simSelf)); assert(methodOrBlockNumTemps >= methodOrBlockNumArgs); - assert((numRegArgs()) <= 2); for (i = 0; i < methodOrBlockNumTemps; i += 1) { desc = simStackAt(i); (desc->type = SSBaseOffset); @@ -21874,8 +21880,7 @@ (simSelf.registerr = ReceiverResultReg); (optStatus.isReceiverResultRegLive = 1); (optStatus.ssEntry = (&simSelf)); - assert((methodOrBlockNumTemps == methodOrBlockNumArgs) - || (isQuickPrimitiveIndex(primitiveIndex))); + assert(methodOrBlockNumTemps >= methodOrBlockNumArgs); assert((numRegArgs()) <= 2); if (((methodOrBlockNumArgs >= 1) && (methodOrBlockNumArgs <= 1))) { desc = simStackAt(0); Modified: branches/Cog/nscogsrc/vm/cogit.h =================================================================== --- branches/Cog/nscogsrc/vm/cogit.h 2014-09-30 17:23:24 UTC (rev 3086) +++ branches/Cog/nscogsrc/vm/cogit.h 2014-09-30 23:39:10 UTC (rev 3087) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.888 uuid: e58fb0f2-df49-4ac0-8e84-48499470b5f6 + CCodeGenerator VMMaker.oscog-eem.889 uuid: f7ca0f83-4116-4c07-8307-3c23f8f5600a */ Modified: branches/Cog/nsspursrc/vm/cogit.c =================================================================== --- branches/Cog/nsspursrc/vm/cogit.c 2014-09-30 17:23:24 UTC (rev 3086) +++ branches/Cog/nsspursrc/vm/cogit.c 2014-09-30 23:39:10 UTC (rev 3087) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.888 uuid: e58fb0f2-df49-4ac0-8e84-48499470b5f6 + CCodeGenerator VMMaker.oscog-eem.889 uuid: f7ca0f83-4116-4c07-8307-3c23f8f5600a from - StackToRegisterMappingCogit VMMaker.oscog-eem.888 uuid: e58fb0f2-df49-4ac0-8e84-48499470b5f6 + StackToRegisterMappingCogit VMMaker.oscog-eem.889 uuid: f7ca0f83-4116-4c07-8307-3c23f8f5600a */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.888 uuid: e58fb0f2-df49-4ac0-8e84-48499470b5f6 " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.889 uuid: f7ca0f83-4116-4c07-8307-3c23f8f5600a " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -22693,9 +22693,16 @@ return ssPushRegister(SendNumArgsReg); } + +/* If a frameless method (not a block), only argument temps can be accessed. + This is assured by the use of needsFrameIfMod16GENumArgs: in pushTemp. */ + static sqInt genPushTemporaryVariable(sqInt index) { + assert(inBlock + || (needsFrame + || (index < methodOrBlockNumArgs))); return ssPushDesc(simStack[index]); } @@ -23637,7 +23644,7 @@ } -/* The register receiver (he closure itself) and args are pushed by the +/* The register receiver (the closure itself) and args are pushed by the closure value primitive(s) and hence a frameless block has all arguments and copied values pushed to the stack. However, @@ -23657,7 +23664,6 @@ (optStatus.isReceiverResultRegLive = 1); (optStatus.ssEntry = (&simSelf)); assert(methodOrBlockNumTemps >= methodOrBlockNumArgs); - assert((numRegArgs()) <= 2); for (i = 0; i < methodOrBlockNumTemps; i += 1) { desc = simStackAt(i); (desc->type = SSBaseOffset); @@ -23682,8 +23688,7 @@ (simSelf.registerr = ReceiverResultReg); (optStatus.isReceiverResultRegLive = 1); (optStatus.ssEntry = (&simSelf)); - assert((methodOrBlockNumTemps == methodOrBlockNumArgs) - || (isQuickPrimitiveIndex(primitiveIndex))); + assert(methodOrBlockNumTemps >= methodOrBlockNumArgs); assert((numRegArgs()) <= 2); if (((methodOrBlockNumArgs >= 1) && (methodOrBlockNumArgs <= 2))) { desc = simStackAt(0); Modified: branches/Cog/nsspursrc/vm/cogit.h =================================================================== --- branches/Cog/nsspursrc/vm/cogit.h 2014-09-30 17:23:24 UTC (rev 3086) +++ branches/Cog/nsspursrc/vm/cogit.h 2014-09-30 23:39:10 UTC (rev 3087) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.888 uuid: e58fb0f2-df49-4ac0-8e84-48499470b5f6 + CCodeGenerator VMMaker.oscog-eem.889 uuid: f7ca0f83-4116-4c07-8307-3c23f8f5600a */ Property changes on: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h ___________________________________________________________________ Modified: checkindate - Tue Sep 30 10:22:20 PDT 2014 + Tue Sep 30 16:39:14 PDT 2014 Modified: branches/Cog/sistasrc/vm/cogit.c =================================================================== --- branches/Cog/sistasrc/vm/cogit.c 2014-09-30 17:23:24 UTC (rev 3086) +++ branches/Cog/sistasrc/vm/cogit.c 2014-09-30 23:39:10 UTC (rev 3087) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.888 uuid: e58fb0f2-df49-4ac0-8e84-48499470b5f6 + CCodeGenerator VMMaker.oscog-eem.889 uuid: f7ca0f83-4116-4c07-8307-3c23f8f5600a from - SistaStackToRegisterMappingCogit VMMaker.oscog-eem.888 uuid: e58fb0f2-df49-4ac0-8e84-48499470b5f6 + SistaStackToRegisterMappingCogit VMMaker.oscog-eem.889 uuid: f7ca0f83-4116-4c07-8307-3c23f8f5600a */ -static char __buildInfo[] = "SistaStackToRegisterMappingCogit VMMaker.oscog-eem.888 uuid: e58fb0f2-df49-4ac0-8e84-48499470b5f6 " __DATE__ ; +static char __buildInfo[] = "SistaStackToRegisterMappingCogit VMMaker.oscog-eem.889 uuid: f7ca0f83-4116-4c07-8307-3c23f8f5600a " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -21669,9 +21669,16 @@ return ssPushRegister(SendNumArgsReg); } + +/* If a frameless method (not a block), only argument temps can be accessed. + This is assured by the use of needsFrameIfMod16GENumArgs: in pushTemp. */ + static sqInt genPushTemporaryVariable(sqInt index) { + assert(inBlock + || (needsFrame + || (index < methodOrBlockNumArgs))); return ssPushDesc(simStack[index]); } @@ -22377,7 +22384,7 @@ } -/* The register receiver (he closure itself) and args are pushed by the +/* The register receiver (the closure itself) and args are pushed by the closure value primitive(s) and hence a frameless block has all arguments and copied values pushed to the stack. However, @@ -22397,7 +22404,6 @@ (optStatus.isReceiverResultRegLive = 1); (optStatus.ssEntry = (&simSelf)); assert(methodOrBlockNumTemps >= methodOrBlockNumArgs); - assert((numRegArgs()) <= 2); for (i = 0; i < methodOrBlockNumTemps; i += 1) { desc = simStackAt(i); (desc->type = SSBaseOffset); @@ -22422,8 +22428,7 @@ (simSelf.registerr = ReceiverResultReg); (optStatus.isReceiverResultRegLive = 1); (optStatus.ssEntry = (&simSelf)); - assert((methodOrBlockNumTemps == methodOrBlockNumArgs) - || (isQuickPrimitiveIndex(primitiveIndex))); + assert(methodOrBlockNumTemps >= methodOrBlockNumArgs); assert((numRegArgs()) <= 2); if (((methodOrBlockNumArgs >= 1) && (methodOrBlockNumArgs <= 1))) { desc = simStackAt(0); Modified: branches/Cog/sistasrc/vm/cogit.h =================================================================== --- branches/Cog/sistasrc/vm/cogit.h 2014-09-30 17:23:24 UTC (rev 3086) +++ branches/Cog/sistasrc/vm/cogit.h 2014-09-30 23:39:10 UTC (rev 3087) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.888 uuid: e58fb0f2-df49-4ac0-8e84-48499470b5f6 + CCodeGenerator VMMaker.oscog-eem.889 uuid: f7ca0f83-4116-4c07-8307-3c23f8f5600a */ Modified: branches/Cog/spursistasrc/vm/cogit.c =================================================================== --- branches/Cog/spursistasrc/vm/cogit.c 2014-09-30 17:23:24 UTC (rev 3086) +++ branches/Cog/spursistasrc/vm/cogit.c 2014-09-30 23:39:10 UTC (rev 3087) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.888 uuid: e58fb0f2-df49-4ac0-8e84-48499470b5f6 + CCodeGenerator VMMaker.oscog-eem.889 uuid: f7ca0f83-4116-4c07-8307-3c23f8f5600a from - SistaStackToRegisterMappingCogit VMMaker.oscog-eem.888 uuid: e58fb0f2-df49-4ac0-8e84-48499470b5f6 + SistaStackToRegisterMappingCogit VMMaker.oscog-eem.889 uuid: f7ca0f83-4116-4c07-8307-3c23f8f5600a */ -static char __buildInfo[] = "SistaStackToRegisterMappingCogit VMMaker.oscog-eem.888 uuid: e58fb0f2-df49-4ac0-8e84-48499470b5f6 " __DATE__ ; +static char __buildInfo[] = "SistaStackToRegisterMappingCogit VMMaker.oscog-eem.889 uuid: f7ca0f83-4116-4c07-8307-3c23f8f5600a " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -23184,9 +23184,16 @@ return ssPushRegister(SendNumArgsReg); } + +/* If a frameless method (not a block), only argument temps can be accessed. + This is assured by the use of needsFrameIfMod16GENumArgs: in pushTemp. */ + static sqInt genPushTemporaryVariable(sqInt index) { + assert(inBlock + || (needsFrame + || (index < methodOrBlockNumArgs))); return ssPushDesc(simStack[index]); } @@ -23895,7 +23902,7 @@ } -/* The register receiver (he closure itself) and args are pushed by the +/* The register receiver (the closure itself) and args are pushed by the closure value primitive(s) and hence a frameless block has all arguments and copied values pushed to the stack. However, @@ -23915,7 +23922,6 @@ (optStatus.isReceiverResultRegLive = 1); (optStatus.ssEntry = (&simSelf)); assert(methodOrBlockNumTemps >= methodOrBlockNumArgs); - assert((numRegArgs()) <= 2); for (i = 0; i < methodOrBlockNumTemps; i += 1) { desc = simStackAt(i); (desc->type = SSBaseOffset); @@ -23940,8 +23946,7 @@ (simSelf.registerr = ReceiverResultReg); (optStatus.isReceiverResultRegLive = 1); (optStatus.ssEntry = (&simSelf)); - assert((methodOrBlockNumTemps == methodOrBlockNumArgs) - || (isQuickPrimitiveIndex(primitiveIndex))); + assert(methodOrBlockNumTemps >= methodOrBlockNumArgs); assert((numRegArgs()) <= 2); if (((methodOrBlockNumArgs >= 1) && (methodOrBlockNumArgs <= 2))) { desc = simStackAt(0); Modified: branches/Cog/spursistasrc/vm/cogit.h =================================================================== --- branches/Cog/spursistasrc/vm/cogit.h 2014-09-30 17:23:24 UTC (rev 3086) +++ branches/Cog/spursistasrc/vm/cogit.h 2014-09-30 23:39:10 UTC (rev 3087) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.888 uuid: e58fb0f2-df49-4ac0-8e84-48499470b5f6 + CCodeGenerator VMMaker.oscog-eem.889 uuid: f7ca0f83-4116-4c07-8307-3c23f8f5600a */ Modified: branches/Cog/spursrc/vm/cogit.c =================================================================== --- branches/Cog/spursrc/vm/cogit.c 2014-09-30 17:23:24 UTC (rev 3086) +++ branches/Cog/spursrc/vm/cogit.c 2014-09-30 23:39:10 UTC (rev 3087) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.888 uuid: e58fb0f2-df49-4ac0-8e84-48499470b5f6 + CCodeGenerator VMMaker.oscog-eem.889 uuid: f7ca0f83-4116-4c07-8307-3c23f8f5600a from - StackToRegisterMappingCogit VMMaker.oscog-eem.888 uuid: e58fb0f2-df49-4ac0-8e84-48499470b5f6 + StackToRegisterMappingCogit VMMaker.oscog-eem.889 uuid: f7ca0f83-4116-4c07-8307-3c23f8f5600a */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.888 uuid: e58fb0f2-df49-4ac0-8e84-48499470b5f6 " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.889 uuid: f7ca0f83-4116-4c07-8307-3c23f8f5600a " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -20745,9 +20745,16 @@ return ssPushRegister(SendNumArgsReg); } + +/* If a frameless method (not a block), only argument temps can be accessed. + This is assured by the use of needsFrameIfMod16GENumArgs: in pushTemp. */ + static sqInt genPushTemporaryVariable(sqInt index) { + assert(inBlock + || (needsFrame + || (index < methodOrBlockNumArgs))); return ssPushDesc(simStack[index]); } @@ -21640,7 +21647,7 @@ } -/* The register receiver (he closure itself) and args are pushed by the +/* The register receiver (the closure itself) and args are pushed by the closure value primitive(s) and hence a frameless block has all arguments and copied values pushed to the stack. However, @@ -21660,7 +21667,6 @@ (optStatus.isReceiverResultRegLive = 1); (optStatus.ssEntry = (&simSelf)); assert(methodOrBlockNumTemps >= methodOrBlockNumArgs); - assert((numRegArgs()) <= 2); for (i = 0; i < methodOrBlockNumTemps; i += 1) { desc = simStackAt(i); (desc->type = SSBaseOffset); @@ -21685,8 +21691,7 @@ (simSelf.registerr = ReceiverResultReg); (optStatus.isReceiverResultRegLive = 1); (optStatus.ssEntry = (&simSelf)); - assert((methodOrBlockNumTemps == methodOrBlockNumArgs) - || (isQuickPrimitiveIndex(primitiveIndex))); + assert(methodOrBlockNumTemps >= methodOrBlockNumArgs); assert((numRegArgs()) <= 2); if (((methodOrBlockNumArgs >= 1) && (methodOrBlockNumArgs <= 2))) { desc = simStackAt(0); Modified: branches/Cog/spursrc/vm/cogit.h =================================================================== --- branches/Cog/spursrc/vm/cogit.h 2014-09-30 17:23:24 UTC (rev 3086) +++ branches/Cog/spursrc/vm/cogit.h 2014-09-30 23:39:10 UTC (rev 3087) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.888 uuid: e58fb0f2-df49-4ac0-8e84-48499470b5f6 + CCodeGenerator VMMaker.oscog-eem.889 uuid: f7ca0f83-4116-4c07-8307-3c23f8f5600a */ Modified: branches/Cog/src/vm/cogit.c =================================================================== --- branches/Cog/src/vm/cogit.c 2014-09-30 17:23:24 UTC (rev 3086) +++ branches/Cog/src/vm/cogit.c 2014-09-30 23:39:10 UTC (rev 3087) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.888 uuid: e58fb0f2-df49-4ac0-8e84-48499470b5f6 + CCodeGenerator VMMaker.oscog-eem.889 uuid: f7ca0f83-4116-4c07-8307-3c23f8f5600a from - StackToRegisterMappingCogit VMMaker.oscog-eem.888 uuid: e58fb0f2-df49-4ac0-8e84-48499470b5f6 + StackToRegisterMappingCogit VMMaker.oscog-eem.889 uuid: f7ca0f83-4116-4c07-8307-3c23f8f5600a */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.888 uuid: e58fb0f2-df49-4ac0-8e84-48499470b5f6 " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.889 uuid: f7ca0f83-4116-4c07-8307-3c23f8f5600a " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -19329,9 +19329,16 @@ return ssPushRegister(SendNumArgsReg); } + +/* If a frameless method (not a block), only argument temps can be accessed. + This is assured by the use of needsFrameIfMod16GENumArgs: in pushTemp. */ + static sqInt genPushTemporaryVariable(sqInt index) { + assert(inBlock + || (needsFrame + || (index < methodOrBlockNumArgs))); return ssPushDesc(simStack[index]); } @@ -20221,7 +20228,7 @@ } -/* The register receiver (he closure itself) and args are pushed by the +/* The register receiver (the closure itself) and args are pushed by the closure value primitive(s) and hence a frameless block has all arguments and copied values pushed to the stack. However, @@ -20241,7 +20248,6 @@ (optStatus.isReceiverResultRegLive = 1); (optStatus.ssEntry = (&simSelf)); assert(methodOrBlockNumTemps >= methodOrBlockNumArgs); - assert((numRegArgs()) <= 2); for (i = 0; i < methodOrBlockNumTemps; i += 1) { desc = simStackAt(i); (desc->type = SSBaseOffset); @@ -20266,8 +20272,7 @@ (simSelf.registerr = ReceiverResultReg); (optStatus.isReceiverResultRegLive = 1); (optStatus.ssEntry = (&simSelf)); - assert((methodOrBlockNumTemps == methodOrBlockNumArgs) - || (isQuickPrimitiveIndex(primitiveIndex))); + assert(methodOrBlockNumTemps >= methodOrBlockNumArgs); assert((numRegArgs()) <= 2); if (((methodOrBlockNumArgs >= 1) && (methodOrBlockNumArgs <= 1))) { desc = simStackAt(0); Modified: branches/Cog/src/vm/cogit.h =================================================================== --- branches/Cog/src/vm/cogit.h 2014-09-30 17:23:24 UTC (rev 3086) +++ branches/Cog/src/vm/cogit.h 2014-09-30 23:39:10 UTC (rev 3087) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.888 uuid: e58fb0f2-df49-4ac0-8e84-48499470b5f6 + CCodeGenerator VMMaker.oscog-eem.889 uuid: f7ca0f83-4116-4c07-8307-3c23f8f5600a */

1 0

VM Maker: BytecodeSets.spur-eem.15.mcz
by commits＠source.squeak.org 30 Sep '14

30 Sep '14

Eliot Miranda uploaded a new version of BytecodeSets to project VM Maker: http://source.squeak.org/VMMaker/BytecodeSets.spur-eem.15.mcz ==================== Summary ==================== Name: BytecodeSets.spur-eem.15 Author: eem Time: 30 September 2014, 3:54:47.356 pm UUID: 9baec05d-42fa-4382-90ad-48df531f2651 Ancestors: BytecodeSets.spur-eem.14 Fix a bug in EncoderForNewsqueakV4's selectorToSendOrItselfFor:in:at:. Implement selectorToSendOrItselfFor:in:at: for SistaV1. =============== Diff against BytecodeSets.spur-eem.14 =============== Item was changed: ----- Method: EncoderForNewsqueakV4 class>>selectorToSendOrItselfFor:in:at: (in category 'instruction stream support') ----- selectorToSendOrItselfFor: anInstructionStream in: method at: pc "If anInstructionStream is at a send bytecode then answer the send's selector, otherwise answer anInstructionStream itself. The rationale for answering anInstructionStream instead of, say, nil, is that potentially any existing object can be used as a selector, but since anInstructionStream postdates the method, it can't be one of them. The compilcation is that for convenience we assume the pc could be pointing to the raw send bytecode after its extensions, or at the extension preceeding the raw send bytecode. 80-95 0101 i i i i Send Arithmetic Message #iiii 96-111 0110 i i i i Send Special Message #iiii 112-127 0111 i i i i Send Literal Selector #iiii With 0 Arguments 128-143 1000 i i i i Send Literal Selector #iiii With 1 Argument 144-159 1001 i i i i Send Literal Selector #iiii With 2 Arguments 160-175 1010 i i i i Send To Absent Implicit Receiver Literal Selector #iiii With 0 Arguments 224 11100000 aaaaaaaa Extend A (Ext A = Ext A prev * 256 + Ext A) 225 11100001 sbbbbbbb Extend B (Ext B = Ext B prev * 256 + Ext B) 238 11101110 i i i i i j j j Send Literal Selector #iiiii (+ Extend A * 32) with jjj (+ Extend B * 8) Arguments 239 11101111 i i i i i j j j Send To Superclass Literal Selector #iiiii (+ Extend A * 32) with jjj (+ Extend B * 8) Arguments 240 11110000 i i i i i j j j Send To Absent Implicit Receiver Literal Selector #iiiii (+ Extend A * 32) with jjj (+ Extend B * 8) Arguments 241 11110001 i i i i i j j j Send To Absent Dynamic Superclass Literal Selector #iiiii (+ Extend A * 32) with jjj (+ Extend B * 8) Arguments" | byte | byte := method at: pc. byte < 80 ifTrue: [^anInstructionStream]. byte <= 175 ifTrue: ["special byte or short send" ^byte >= 112 ifTrue: [method literalAt: (byte bitAnd: 15) + 1] ifFalse: [Smalltalk specialSelectorAt: byte - 79]]. byte < 238 ifTrue: [(byte >= 224 and: [byte <= 225]) ifTrue: [^self extensionsAt: pc in: method into: + [:extA :extB :nExtBytes| | byteAfter index | + byteAfter := method at: pc + nExtBytes. - [:extA :extB :delta| | byteAfter index | - byteAfter := method at: pc + delta. (byteAfter >= 238 and: [byteAfter <= 241]) ifTrue: + [index := ((method at: pc + nExtBytes + 1) bitShift: -3) + (extA bitShift: 5). - [index := ((method at: pc + delta + 1) bitShift: -3) + (extA bitShift: 5). method literalAt: index + 1] ifFalse: [anInstructionStream]]]. ^anInstructionStream]. byte > 241 ifTrue: [^anInstructionStream]. "they could be extended..." ^self extensionsAt: pc in: method into: + [:extA :extB :nExtBytes| | index | - [:extA :extB| | index | index := ((method at: pc + 1) bitShift: -3) + (extA bitShift: 5). method literalAt: index + 1]! Item was added: + ----- Method: EncoderForSistaV1 class>>selectorToSendOrItselfFor:in:at: (in category 'instruction stream support') ----- + selectorToSendOrItselfFor: anInstructionStream in: method at: pc + "If anInstructionStream is at a send bytecode then answer the send's selector, + otherwise answer anInstructionStream itself. The rationale for answering + anInstructionStream instead of, say, nil, is that potentially any existing object + can be used as a selector, but since anInstructionStream postdates the method, + it can't be one of them. + + The compilcation is that for convenience we assume the pc could be + pointing to the raw send bytecode after its extensions, or at the extension + preceeding the raw send bytecode. + 96-111 0110 iiii Send Arithmetic Message #iiii #(#+ #- #< #> #'<=' #'>=' #= #'~=' #* #/ #'\\' #@ #bitShift: #'//' #bitAnd: #bitOr:) + 112-119 01110 iii Send Special Message #iii #(#at: #at:put: #size #next #nextPut: #atEnd #'==' class) + 120 01111000 UNASSIGNED (was: blockCopy:) + 121 01111001 Send Special Message #value + 122-123 0111101 i Send Special Message #i #(#value: #do:) + 124-127 011111 ii Send Special Message #ii #(#new #new: #x #y)) + 128-143 1000 iiii Send Literal Selector #iiii With 0 Argument + 144-159 1001 iiii Send Literal Selector #iiii With 1 Arguments + 160-175 1010 iiii Send Literal Selector #iiii With 2 Arguments + * 224 11100000 aaaaaaaa Extend A (Ext A = Ext A prev * 256 + Ext A) + * 225 11100001 bbbbbbbb Extend B (Ext B = Ext B prev * 256 + Ext B) + ** 234 11101010 iiiiijjj Send Literal Selector #iiiii (+ Extend A * 32) with jjj (+ Extend B * 8) Arguments + ** 235 11101011 iiiiijjj Send To Superclass Literal Selector #iiiii (+ Extend A * 32) with jjj (+ Extend B * 8) Arguments" + + | byte | + byte := method at: pc. + byte < 96 ifTrue: + [^anInstructionStream]. + byte <= 175 ifTrue: + ["special byte or short send" + ^byte >= 128 + ifTrue: [method literalAt: (byte bitAnd: 15) + 1] + ifFalse: [Smalltalk specialSelectorAt: byte - 79]]. + byte < 234 ifTrue: "need to check for either extension cuz order of extensions is not restricted. so extB could preceed extA" + [(byte >= 224 and: [byte <= 225]) ifTrue: + [^self extensionsAt: pc in: method into: + [:extA :extB :nExtBytes| | byteAfter index | + byteAfter := method at: pc + nExtBytes. + (byteAfter >= 234 and: [byteAfter <= 235]) + ifTrue: + [index := ((method at: pc + nExtBytes + 1) bitShift: -3) + (extA bitShift: 5). + method literalAt: index + 1] + ifFalse: [anInstructionStream]]]. + ^anInstructionStream]. + byte > 235 ifTrue: + [^anInstructionStream]. + ^method literalAt: ((method at: pc + 1) bitShift: -3) + 1!

1 0

VM Maker: VMMaker.oscog-eem.889.mcz
by commits＠source.squeak.org 30 Sep '14

30 Sep '14

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.889.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.889 Author: eem Time: 30 September 2014, 3:29:12.712 pm UUID: f7ca0f83-4116-4c07-8307-3c23f8f5600a Ancestors: VMMaker.oscog-eem.888 Fix the assert fail caused by a frameless method with an unaccessed temp. Move the assert check to genPushTemporaryVariable:. =============== Diff against VMMaker.oscog-eem.888 =============== Item was changed: ----- Method: StackToRegisterMappingCogit>>genPushTemporaryVariable: (in category 'bytecode generators') ----- genPushTemporaryVariable: index + "If a frameless method (not a block), only argument temps can be accessed. + This is assured by the use of needsFrameIfMod16GENumArgs: in pushTemp." + self assert: (inBlock or: [needsFrame or: [index < methodOrBlockNumArgs]]). ^self ssPushDesc: (simStack at: index)! Item was changed: ----- Method: StackToRegisterMappingCogit>>initSimStackForFramelessBlock: (in category 'simulation stack') ----- initSimStackForFramelessBlock: startpc + "The register receiver (the closure itself) and args are pushed by the closure value primitive(s) - "The register receiver (he closure itself) and args are pushed by the closure value primitive(s) and hence a frameless block has all arguments and copied values pushed to the stack. However, the method receiver (self) is put in the ReceiverResultRegister by the block entry." | desc | <var: #desc type: #'CogSimStackEntry *'> simSelf type: SSRegister; spilled: false; annotateUse: false; register: ReceiverResultReg. optStatus isReceiverResultRegLive: true; ssEntry: (self addressOf: simSelf). self assert: methodOrBlockNumTemps >= methodOrBlockNumArgs. - self assert: self numRegArgs <= 2. 0 to: methodOrBlockNumTemps - 1 do: [:i| desc := self simStackAt: i. desc type: SSBaseOffset; spilled: true; annotateUse: false; register: SPReg; offset: ((methodOrBlockNumTemps - i) * BytesPerWord); bcptr: startpc]. simSpillBase := simStackPtr := methodOrBlockNumTemps - 1! Item was changed: ----- Method: StackToRegisterMappingCogit>>initSimStackForFramelessMethod: (in category 'simulation stack') ----- initSimStackForFramelessMethod: startpc | desc | <var: #desc type: #'CogSimStackEntry *'> simSelf type: SSRegister; spilled: false; annotateUse: false; register: ReceiverResultReg. optStatus isReceiverResultRegLive: true; ssEntry: (self addressOf: simSelf). + self assert: methodOrBlockNumTemps >= methodOrBlockNumArgs. - self assert: (methodOrBlockNumTemps = methodOrBlockNumArgs - or: [coInterpreter isQuickPrimitiveIndex: primitiveIndex]). self assert: self numRegArgs <= 2. (methodOrBlockNumArgs between: 1 and: self numRegArgs) ifTrue: [desc := self simStackAt: 0. desc type: SSRegister; spilled: false; annotateUse: false; register: Arg0Reg; bcptr: startpc. methodOrBlockNumArgs > 1 ifTrue: [desc := self simStackAt: 1. desc type: SSRegister; spilled: false; annotateUse: false; register: Arg1Reg; bcptr: startpc]] ifFalse: [0 to: methodOrBlockNumArgs - 1 do: [:i| desc := self simStackAt: i. desc type: SSBaseOffset; register: SPReg; spilled: true; annotateUse: false; offset: ((methodOrBlockNumArgs - i) * BytesPerWord); bcptr: startpc]]. simSpillBase := simStackPtr := methodOrBlockNumArgs - 1!

1 0

Re: [Vm-dev] [squeak-dev] Maintainer of FFI-Package
by Eliot Miranda 30 Sep '14

30 Sep '14

Hi Annick, On Mon, Sep 29, 2014 at 5:30 AM, Annick Fron <list(a)afceurope.com> wrote: > Hi, > > > I have recently made some experiments with pharo and FFI, and I have ran > into problems with callbacks. > I am using linux 32 bits. > First question : when calling a dynamic library is it necessary that it > exports all symbols ? What if symbols are noted « U » (undefined) ? > If you have undefined symbols in an external library, they need to be resoled by the VM or other libraries loaded in the system. If any are not resolved the library will fail to load. > 2) On one of my callbacks got the message « callback failed to own the VM > » . Have you any idea of where it comes from ? > Yes. This means you're trying to callback from a different thread than the VM thread. hat isn't supported yet. > 3) If the callback is called in a different thread, is it a problem ? > Yes. 4) On Pharo I have an error on the following : is it incorrect ? It is a 64 > bits problem ? > Using FFI Linux examples. > > testGetOurWindowLocation > "self new testGetOurWindowLocation" > > | display ourWindow aParent anX anY aWidth aHeight aBorderWidth aDepth | > display := X11Display XOpenDisplay: nil. > ourWindow := display ourWindow. > (Alien lookup: 'XGetGeometry' inLibrary: 'X11') > primFFICallResult: nil > withArguments: > {display. > ourWindow. > (aParent := Alien new: 4). > (anX := Alien new: 4). > (anY := Alien new: 4). > (aWidth := Alien new: 4). > (aHeight := Alien new: 4). > (aBorderWidth := Alien new: 4). > (aDepth := Alien new: 4)}. > (anX unsignedLongAt: 1) inspect > What's the error you get? Annick > Le 28 sept. 2014 à 21:44, David T. Lewis <lewis(a)mail.msen.com> a écrit : > > > On Sun, Sep 28, 2014 at 09:04:59AM -0400, David T. Lewis wrote: > >> > >> On Sun, Sep 28, 2014 at 11:19:30AM +0200, Nicolai Hess wrote: > >>> 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) > >>> > >> > >> The FFI package, including the FFI-Unix examples that you mention, is at > >> http://source.squeak.org/FFI. > >> > >> The primary author was Andreas Raab. Eliot Miranda is the most recent > >> contributor, and he is probably the most knowledgeable in this area. > >> Currently, the Squeak core developers (those with commit rights to > Squeak > >> trunk) have commit rights to the FFI project, and can make updates as > needed. > >> > >> The FFI examples for Unix work with the old FFI plugin, which is still > >> present in the interpreter VM. The active development of Squeak FFI is > >> taking place in Cog, and I'm not sure if the old FFI examples work with > >> the newer plugins (which would be present in the Squeak all-in-one). > >> The FFI plugin in the interpreter VM (i.e. trunk VMMaker) needs to be > >> updated, and presumably the FFI examples may need some updates as well. > > > > A small but important correction: For the old plugin (currently in the > > interpreter VM), FFI works only for a 32-bit VM. It also works for a > 64-bit > > VM, but only if the patches in http://bugs.squeak.org/view.php?id=7237 > have > > been applied (in other words, if you compiled it yourself and included > > those patches). > > > > This is mainly of historical interest, although it is possible that some > > of the 64-bit patches will prove helpful for the newer FFI plugin. But > > the emphasis now should be on Eliot's more recent FFI work. > > > > Dave > > > > > > > -- best, Eliot

1 0

[commit][3086] CogVM source as per VMMaker.oscog-eem.888
by commits＠squeakvm.org 30 Sep '14

30 Sep '14

Revision: 3086 Author: eliot Date: 2014-09-30 10:23:24 -0700 (Tue, 30 Sep 2014) Log Message: ----------- CogVM source as per VMMaker.oscog-eem.888 Fix bug in Cogit>>lookup:for:methodAndErrorSelectorInto: which if cogging a metod found through an MNU would set the cog method's selector to the original selector that was not understood instead of #doesNotUnderstand:. Fix the description of the blockonwarn flag (not blockonwarning). Modified Paths: -------------- branches/Cog/nscogsrc/vm/cogit.c branches/Cog/nscogsrc/vm/cogit.h branches/Cog/nsspursrc/vm/cogit.c branches/Cog/nsspursrc/vm/cogit.h branches/Cog/platforms/Mac OS/vm/sqMacUnixCommandLineInterface.c branches/Cog/platforms/unix/vm/sqUnixMain.c branches/Cog/sistasrc/vm/cogit.c branches/Cog/sistasrc/vm/cogit.h branches/Cog/spursistasrc/vm/cogit.c branches/Cog/spursistasrc/vm/cogit.h branches/Cog/spursrc/vm/cogit.c branches/Cog/spursrc/vm/cogit.h branches/Cog/src/vm/cogit.c branches/Cog/src/vm/cogit.h Property Changed: ---------------- branches/Cog/platforms/Cross/vm/sqSCCSVersion.h Modified: branches/Cog/nscogsrc/vm/cogit.c =================================================================== --- branches/Cog/nscogsrc/vm/cogit.c 2014-09-30 01:16:34 UTC (rev 3085) +++ branches/Cog/nscogsrc/vm/cogit.c 2014-09-30 17:23:24 UTC (rev 3086) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.885 uuid: 292f0a8d-0afa-4943-90fd-be53fb40772a + CCodeGenerator VMMaker.oscog-eem.888 uuid: e58fb0f2-df49-4ac0-8e84-48499470b5f6 from - StackToRegisterMappingCogit VMMaker.oscog-eem.885 uuid: 292f0a8d-0afa-4943-90fd-be53fb40772a + StackToRegisterMappingCogit VMMaker.oscog-eem.888 uuid: e58fb0f2-df49-4ac0-8e84-48499470b5f6 */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.885 uuid: 292f0a8d-0afa-4943-90fd-be53fb40772a " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.888 uuid: e58fb0f2-df49-4ac0-8e84-48499470b5f6 " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -8622,7 +8622,7 @@ /* We assume cog:selector: will *not* reclaim the method zone */ - cogselector(methodOrSelectorIndex, selector); + cogselector(methodOrSelectorIndex, splObj(SelectorDoesNotUnderstand)); } newTargetMethodOrNil = methodOrSelectorIndex; errorSelectorOrNil = SelectorDoesNotUnderstand; @@ -8785,7 +8785,7 @@ /* We assume cog:selector: will *not* reclaim the method zone */ - cogselector(methodOrSelectorIndex, selector); + cogselector(methodOrSelectorIndex, splObj(SelectorDoesNotUnderstand)); } newTargetMethodOrNil = methodOrSelectorIndex; errorSelectorOrNil = SelectorDoesNotUnderstand; @@ -12553,7 +12553,7 @@ { sqInt *address; sqInt *address1; - sqInt cacheAddress; + usqInt cacheAddress; sqInt cacheTag; sqInt cacheTag1; sqInt cacheTagMarked; @@ -12723,7 +12723,7 @@ static sqInt markYoungObjectspcmethod(sqInt annotation, char *mcpc, sqInt cogMethod) { - sqInt cacheAddress; + usqInt cacheAddress; sqInt cacheTag; sqInt cacheTag1; sqInt class; @@ -13814,7 +13814,7 @@ static sqInt remapIfObjectRefpchasYoung(sqInt annotation, char *mcpc, sqInt hasYoungPtr) { - sqInt cacheAddress; + usqInt cacheAddress; sqInt cacheTag; sqInt cacheTag1; sqInt entryPoint; @@ -14583,7 +14583,7 @@ static void voidImplicitReceiverCacheAt(sqInt mcpc) { - sqInt cacheAddress; + usqInt cacheAddress; assert(NumOopsPerIRC == 2); cacheAddress = (((usqInt)mcpc)) + (jumpShortByteSize(backEnd)); Modified: branches/Cog/nscogsrc/vm/cogit.h =================================================================== --- branches/Cog/nscogsrc/vm/cogit.h 2014-09-30 01:16:34 UTC (rev 3085) +++ branches/Cog/nscogsrc/vm/cogit.h 2014-09-30 17:23:24 UTC (rev 3086) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.885 uuid: 292f0a8d-0afa-4943-90fd-be53fb40772a + CCodeGenerator VMMaker.oscog-eem.888 uuid: e58fb0f2-df49-4ac0-8e84-48499470b5f6 */ Modified: branches/Cog/nsspursrc/vm/cogit.c =================================================================== --- branches/Cog/nsspursrc/vm/cogit.c 2014-09-30 01:16:34 UTC (rev 3085) +++ branches/Cog/nsspursrc/vm/cogit.c 2014-09-30 17:23:24 UTC (rev 3086) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.885 uuid: 292f0a8d-0afa-4943-90fd-be53fb40772a + CCodeGenerator VMMaker.oscog-eem.888 uuid: e58fb0f2-df49-4ac0-8e84-48499470b5f6 from - StackToRegisterMappingCogit VMMaker.oscog-eem.885 uuid: 292f0a8d-0afa-4943-90fd-be53fb40772a + StackToRegisterMappingCogit VMMaker.oscog-eem.888 uuid: e58fb0f2-df49-4ac0-8e84-48499470b5f6 */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.885 uuid: 292f0a8d-0afa-4943-90fd-be53fb40772a " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.888 uuid: e58fb0f2-df49-4ac0-8e84-48499470b5f6 " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -8648,7 +8648,7 @@ /* We assume cog:selector: will *not* reclaim the method zone */ - cogselector(methodOrSelectorIndex, selector); + cogselector(methodOrSelectorIndex, splObj(SelectorDoesNotUnderstand)); } newTargetMethodOrNil = methodOrSelectorIndex; errorSelectorOrNil = SelectorDoesNotUnderstand; @@ -8805,7 +8805,7 @@ /* We assume cog:selector: will *not* reclaim the method zone */ - cogselector(methodOrSelectorIndex, selector); + cogselector(methodOrSelectorIndex, splObj(SelectorDoesNotUnderstand)); } newTargetMethodOrNil = methodOrSelectorIndex; errorSelectorOrNil = SelectorDoesNotUnderstand; @@ -12582,7 +12582,7 @@ static sqInt markLiteralspcmethod(sqInt annotation, char *mcpc, sqInt cogMethod) { - usqInt cacheAddress; + sqInt cacheAddress; sqInt cacheTag; sqInt cacheTag1; sqInt class; @@ -13735,7 +13735,7 @@ static sqInt remapIfObjectRefpchasYoung(sqInt annotation, char *mcpc, sqInt hasYoungPtr) { - usqInt cacheAddress; + sqInt cacheAddress; sqInt cacheTag; sqInt cacheTag1; sqInt entryPoint; @@ -14024,7 +14024,7 @@ static sqInt unlinkIfForwardedSendpcignored(sqInt annotation, char *mcpc, sqInt superfluity) { - usqInt cacheAddress; + sqInt cacheAddress; sqInt entryPoint; sqInt sendTable; sqInt *sendTable1; @@ -14611,7 +14611,7 @@ static void voidImplicitReceiverCacheAt(sqInt mcpc) { - usqInt cacheAddress; + sqInt cacheAddress; assert(NumOopsPerIRC == 2); cacheAddress = implicitReceiveCacheAt(backEnd, mcpc); Modified: branches/Cog/nsspursrc/vm/cogit.h =================================================================== --- branches/Cog/nsspursrc/vm/cogit.h 2014-09-30 01:16:34 UTC (rev 3085) +++ branches/Cog/nsspursrc/vm/cogit.h 2014-09-30 17:23:24 UTC (rev 3086) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.885 uuid: 292f0a8d-0afa-4943-90fd-be53fb40772a + CCodeGenerator VMMaker.oscog-eem.888 uuid: e58fb0f2-df49-4ac0-8e84-48499470b5f6 */ Property changes on: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h ___________________________________________________________________ Modified: checkindate - Mon Sep 29 18:15:53 PDT 2014 + Tue Sep 30 10:22:20 PDT 2014 Modified: branches/Cog/platforms/Mac OS/vm/sqMacUnixCommandLineInterface.c =================================================================== --- branches/Cog/platforms/Mac OS/vm/sqMacUnixCommandLineInterface.c 2014-09-30 01:16:34 UTC (rev 3085) +++ branches/Cog/platforms/Mac OS/vm/sqMacUnixCommandLineInterface.c 2014-09-30 17:23:24 UTC (rev 3086) @@ -334,7 +334,7 @@ printf(" -version print version information, then exit\n"); printf(" -blockonerror on error or segv block, not exit. useful for attaching gdb\n"); - printf(" -blockonwarning on warning block, don't warn. useful for attaching gdb\n"); + printf(" -blockonwarn on warning block, don't warn. useful for attaching gdb\n"); } static void printUsageNotes(void) Modified: branches/Cog/platforms/unix/vm/sqUnixMain.c =================================================================== --- branches/Cog/platforms/unix/vm/sqUnixMain.c 2014-09-30 01:16:34 UTC (rev 3085) +++ branches/Cog/platforms/unix/vm/sqUnixMain.c 2014-09-30 17:23:24 UTC (rev 3086) @@ -1520,7 +1520,7 @@ printf(" -reportheadroom report unused stack headroom on exit\n"); #endif printf(" -blockonerror on error or segv block, not exit. useful for attaching gdb\n"); - printf(" -blockonwarning on warning block, don't warn. useful for attaching gdb\n"); + printf(" -blockonwarn on warning block, don't warn. useful for attaching gdb\n"); #if 1 printf("Deprecated:\n"); # if !STACKVM Modified: branches/Cog/sistasrc/vm/cogit.c =================================================================== --- branches/Cog/sistasrc/vm/cogit.c 2014-09-30 01:16:34 UTC (rev 3085) +++ branches/Cog/sistasrc/vm/cogit.c 2014-09-30 17:23:24 UTC (rev 3086) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.885 uuid: 292f0a8d-0afa-4943-90fd-be53fb40772a + CCodeGenerator VMMaker.oscog-eem.888 uuid: e58fb0f2-df49-4ac0-8e84-48499470b5f6 from - SistaStackToRegisterMappingCogit VMMaker.oscog-eem.885 uuid: 292f0a8d-0afa-4943-90fd-be53fb40772a + SistaStackToRegisterMappingCogit VMMaker.oscog-eem.888 uuid: e58fb0f2-df49-4ac0-8e84-48499470b5f6 */ -static char __buildInfo[] = "SistaStackToRegisterMappingCogit VMMaker.oscog-eem.885 uuid: 292f0a8d-0afa-4943-90fd-be53fb40772a " __DATE__ ; +static char __buildInfo[] = "SistaStackToRegisterMappingCogit VMMaker.oscog-eem.888 uuid: e58fb0f2-df49-4ac0-8e84-48499470b5f6 " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -8611,7 +8611,7 @@ /* We assume cog:selector: will *not* reclaim the method zone */ - cogselector(methodOrSelectorIndex, selector); + cogselector(methodOrSelectorIndex, splObj(SelectorDoesNotUnderstand)); } newTargetMethodOrNil = methodOrSelectorIndex; errorSelectorOrNil = SelectorDoesNotUnderstand; @@ -8723,7 +8723,7 @@ /* We assume cog:selector: will *not* reclaim the method zone */ - cogselector(methodOrSelectorIndex, selector); + cogselector(methodOrSelectorIndex, splObj(SelectorDoesNotUnderstand)); } newTargetMethodOrNil = methodOrSelectorIndex; errorSelectorOrNil = SelectorDoesNotUnderstand; Modified: branches/Cog/sistasrc/vm/cogit.h =================================================================== --- branches/Cog/sistasrc/vm/cogit.h 2014-09-30 01:16:34 UTC (rev 3085) +++ branches/Cog/sistasrc/vm/cogit.h 2014-09-30 17:23:24 UTC (rev 3086) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.885 uuid: 292f0a8d-0afa-4943-90fd-be53fb40772a + CCodeGenerator VMMaker.oscog-eem.888 uuid: e58fb0f2-df49-4ac0-8e84-48499470b5f6 */ Modified: branches/Cog/spursistasrc/vm/cogit.c =================================================================== --- branches/Cog/spursistasrc/vm/cogit.c 2014-09-30 01:16:34 UTC (rev 3085) +++ branches/Cog/spursistasrc/vm/cogit.c 2014-09-30 17:23:24 UTC (rev 3086) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.885 uuid: 292f0a8d-0afa-4943-90fd-be53fb40772a + CCodeGenerator VMMaker.oscog-eem.888 uuid: e58fb0f2-df49-4ac0-8e84-48499470b5f6 from - SistaStackToRegisterMappingCogit VMMaker.oscog-eem.885 uuid: 292f0a8d-0afa-4943-90fd-be53fb40772a + SistaStackToRegisterMappingCogit VMMaker.oscog-eem.888 uuid: e58fb0f2-df49-4ac0-8e84-48499470b5f6 */ -static char __buildInfo[] = "SistaStackToRegisterMappingCogit VMMaker.oscog-eem.885 uuid: 292f0a8d-0afa-4943-90fd-be53fb40772a " __DATE__ ; +static char __buildInfo[] = "SistaStackToRegisterMappingCogit VMMaker.oscog-eem.888 uuid: e58fb0f2-df49-4ac0-8e84-48499470b5f6 " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -8637,7 +8637,7 @@ /* We assume cog:selector: will *not* reclaim the method zone */ - cogselector(methodOrSelectorIndex, selector); + cogselector(methodOrSelectorIndex, splObj(SelectorDoesNotUnderstand)); } newTargetMethodOrNil = methodOrSelectorIndex; errorSelectorOrNil = SelectorDoesNotUnderstand; @@ -8751,7 +8751,7 @@ /* We assume cog:selector: will *not* reclaim the method zone */ - cogselector(methodOrSelectorIndex, selector); + cogselector(methodOrSelectorIndex, splObj(SelectorDoesNotUnderstand)); } newTargetMethodOrNil = methodOrSelectorIndex; errorSelectorOrNil = SelectorDoesNotUnderstand; Modified: branches/Cog/spursistasrc/vm/cogit.h =================================================================== --- branches/Cog/spursistasrc/vm/cogit.h 2014-09-30 01:16:34 UTC (rev 3085) +++ branches/Cog/spursistasrc/vm/cogit.h 2014-09-30 17:23:24 UTC (rev 3086) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.885 uuid: 292f0a8d-0afa-4943-90fd-be53fb40772a + CCodeGenerator VMMaker.oscog-eem.888 uuid: e58fb0f2-df49-4ac0-8e84-48499470b5f6 */ Modified: branches/Cog/spursrc/vm/cogit.c =================================================================== --- branches/Cog/spursrc/vm/cogit.c 2014-09-30 01:16:34 UTC (rev 3085) +++ branches/Cog/spursrc/vm/cogit.c 2014-09-30 17:23:24 UTC (rev 3086) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.885 uuid: 292f0a8d-0afa-4943-90fd-be53fb40772a + CCodeGenerator VMMaker.oscog-eem.888 uuid: e58fb0f2-df49-4ac0-8e84-48499470b5f6 from - StackToRegisterMappingCogit VMMaker.oscog-eem.885 uuid: 292f0a8d-0afa-4943-90fd-be53fb40772a + StackToRegisterMappingCogit VMMaker.oscog-eem.888 uuid: e58fb0f2-df49-4ac0-8e84-48499470b5f6 */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.885 uuid: 292f0a8d-0afa-4943-90fd-be53fb40772a " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.888 uuid: e58fb0f2-df49-4ac0-8e84-48499470b5f6 " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -8298,7 +8298,7 @@ /* We assume cog:selector: will *not* reclaim the method zone */ - cogselector(methodOrSelectorIndex, selector); + cogselector(methodOrSelectorIndex, splObj(SelectorDoesNotUnderstand)); } newTargetMethodOrNil = methodOrSelectorIndex; errorSelectorOrNil = SelectorDoesNotUnderstand; @@ -8412,7 +8412,7 @@ /* We assume cog:selector: will *not* reclaim the method zone */ - cogselector(methodOrSelectorIndex, selector); + cogselector(methodOrSelectorIndex, splObj(SelectorDoesNotUnderstand)); } newTargetMethodOrNil = methodOrSelectorIndex; errorSelectorOrNil = SelectorDoesNotUnderstand; Modified: branches/Cog/spursrc/vm/cogit.h =================================================================== --- branches/Cog/spursrc/vm/cogit.h 2014-09-30 01:16:34 UTC (rev 3085) +++ branches/Cog/spursrc/vm/cogit.h 2014-09-30 17:23:24 UTC (rev 3086) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.885 uuid: 292f0a8d-0afa-4943-90fd-be53fb40772a + CCodeGenerator VMMaker.oscog-eem.888 uuid: e58fb0f2-df49-4ac0-8e84-48499470b5f6 */ Modified: branches/Cog/src/vm/cogit.c =================================================================== --- branches/Cog/src/vm/cogit.c 2014-09-30 01:16:34 UTC (rev 3085) +++ branches/Cog/src/vm/cogit.c 2014-09-30 17:23:24 UTC (rev 3086) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.885 uuid: 292f0a8d-0afa-4943-90fd-be53fb40772a + CCodeGenerator VMMaker.oscog-eem.888 uuid: e58fb0f2-df49-4ac0-8e84-48499470b5f6 from - StackToRegisterMappingCogit VMMaker.oscog-eem.885 uuid: 292f0a8d-0afa-4943-90fd-be53fb40772a + StackToRegisterMappingCogit VMMaker.oscog-eem.888 uuid: e58fb0f2-df49-4ac0-8e84-48499470b5f6 */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.885 uuid: 292f0a8d-0afa-4943-90fd-be53fb40772a " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.888 uuid: e58fb0f2-df49-4ac0-8e84-48499470b5f6 " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -8271,7 +8271,7 @@ /* We assume cog:selector: will *not* reclaim the method zone */ - cogselector(methodOrSelectorIndex, selector); + cogselector(methodOrSelectorIndex, splObj(SelectorDoesNotUnderstand)); } newTargetMethodOrNil = methodOrSelectorIndex; errorSelectorOrNil = SelectorDoesNotUnderstand; @@ -8383,7 +8383,7 @@ /* We assume cog:selector: will *not* reclaim the method zone */ - cogselector(methodOrSelectorIndex, selector); + cogselector(methodOrSelectorIndex, splObj(SelectorDoesNotUnderstand)); } newTargetMethodOrNil = methodOrSelectorIndex; errorSelectorOrNil = SelectorDoesNotUnderstand; Modified: branches/Cog/src/vm/cogit.h =================================================================== --- branches/Cog/src/vm/cogit.h 2014-09-30 01:16:34 UTC (rev 3085) +++ branches/Cog/src/vm/cogit.h 2014-09-30 17:23:24 UTC (rev 3086) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.885 uuid: 292f0a8d-0afa-4943-90fd-be53fb40772a + CCodeGenerator VMMaker.oscog-eem.888 uuid: e58fb0f2-df49-4ac0-8e84-48499470b5f6 */

1 0

VM Maker: VMMaker.oscog-eem.888.mcz
by commits＠source.squeak.org 30 Sep '14

30 Sep '14

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.888.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.888 Author: eem Time: 30 September 2014, 9:59:29.051 am UUID: e58fb0f2-df49-4ac0-8e84-48499470b5f6 Ancestors: VMMaker.oscog-eem.887 Fix bug in Cogit>>lookup:for:methodAndErrorSelectorInto: which if cogging a metod found through an MNU would set the cog method's selector to the original selector that was not understood instead of #doesNotUnderstand:. =============== Diff against VMMaker.oscog-eem.887 =============== Item was changed: ----- Method: Cogit>>lookup:for:methodAndErrorSelectorInto: (in category 'in-line cacheing') ----- lookup: selector for: receiver methodAndErrorSelectorInto: binaryBlock "Lookup selector in the class of receiver. If found, evaluate binaryBlock with the method, cogged if appropriate.. If not found, due to MNU, lookup the DNU selector and evaluate binaryBlock with the MNU method, cogged if appropriate.. If not found due to cannot interpret, evaluate binaryBlock with a nil method and the error selector." | methodOrSelectorIndex | <inline: true> methodOrSelectorIndex := coInterpreter lookup: selector receiver: receiver. methodOrSelectorIndex asUnsignedInteger > coInterpreter maxLookupNoMNUErrorCode ifTrue: [(objectMemory isOopCompiledMethod: methodOrSelectorIndex) ifFalse: [^binaryBlock value: methodOrSelectorIndex value: SelectorCannotInterpret]. ((coInterpreter methodHasCogMethod: methodOrSelectorIndex) not and: [coInterpreter methodShouldBeCogged: methodOrSelectorIndex]) ifTrue: ["We assume cog:selector: will *not* reclaim the method zone" self cog: methodOrSelectorIndex selector: selector]. ^binaryBlock value: methodOrSelectorIndex value: nil]. methodOrSelectorIndex = SelectorDoesNotUnderstand ifTrue: [methodOrSelectorIndex := coInterpreter lookup: (objectMemory splObj: SelectorDoesNotUnderstand) receiver: receiver. methodOrSelectorIndex asUnsignedInteger > coInterpreter maxLookupNoMNUErrorCode ifTrue: [self assert: (objectMemory isOopCompiledMethod: methodOrSelectorIndex). ((coInterpreter methodHasCogMethod: methodOrSelectorIndex) not and: [coInterpreter methodShouldBeCogged: methodOrSelectorIndex]) ifTrue: ["We assume cog:selector: will *not* reclaim the method zone" + self cog: methodOrSelectorIndex selector: (objectMemory splObj: SelectorDoesNotUnderstand)]. - self cog: methodOrSelectorIndex selector: selector]. ^binaryBlock value: methodOrSelectorIndex value: SelectorDoesNotUnderstand]. ^binaryBlock value: nil value: SelectorDoesNotUnderstand]. ^binaryBlock value: nil value: methodOrSelectorIndex!

1 0

New Cog VMs available
by Eliot Miranda 30 Sep '14

30 Sep '14

... at http://www.mirandabanda.org/files/Cog/VM/VM.r3085/. CogVM binaries as per VMMaker.oscog-eem.887/r3085 Spur: Change become to flush method caches for becommed classes. Changes are to - add a BecameActiveClassFlag to becomeEffectsFlags - refuse to do an in-place become on active classes. - flush the caches before the post-become scan of the class table so that forwarded classes can be spotted. i.e. if a class index in a method cache is that of a forwarded class then it was becommed and the cache entry can be voided. Fix bug in sweepToFollowForwardersForPigCompact which failed to update and answer lowest forwarder. Fixes numForwarders == 0 assert failures. Fix bug with become and class table not removing classes which become causes them to be unhashed. Fix bogus assert fail in synchronousSignal:. Refactor following code into ensureSemaphoreForwardedThroughContext: and fix the assert there-in. Use rawOverflowSlotsOf: in bytesInObject:. Cogit: Make sure voidImplicitReceiverCacheAt: sets codeModified if IRCs are inline. Make sure freeMethod: clears cmRefersToYoung Fix assert in cogitPostGCAction: that would fire erroneously in Spur become. Fix regression in V3 become youngReferrers management in VMMaker.oscog-eem.882. We /must/ prune young referrers if mapObjectReferencesInMachineCodeForBecome removes a cog method from youngReferrers because it may get added back and youngReferrers cannot contain duplicates. Fix potential bug in Spur become argument validation. Check for immediates needs to come /after/ following forwarders since an object can become-forward to an immediate. Fix cPICHasForwardedClass:; this did /not/ enumerate the classIndices in a Spur Closed PIC. Install the callPrimitiveBytecode in the Interpreter's bytecodeDispatchTable on Spur. Modify callPrimitiveBytecode to not invoke unknownBytecode processing if at the first bytecode of a primitive method. Correct sign comparison of instructionPointer in justActivateNewMethod. Relax the validInstructionPointer:inMethod:framePointer: assert to accept any pc in initialPC to self size range now that callPrimitiveBytecode is more forgiving. Speed up primitiveMarkUnwindMethod & primitiveMarkHandlerMethod in the StackInterpreter by setting them to 0 in the primitive table. -- best, Eliot

2 1

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

Vm-dev September 2014