Vm-dev March 2011

vm-dev@lists.squeakfoundation.org

43 participants
133 discussions

[commit] r2373 - Integrate David Graham's FreeBSD patches.
by commits＠squeakvm.org 21 Mar '11

21 Mar '11

Author: eliot Date: 2011-03-21 10:48:42 -0700 (Mon, 21 Mar 2011) New Revision: 2373 Modified: branches/Cog/platforms/Cross/plugins/SqueakFFIPrims/sqFFIPlugin.c branches/Cog/platforms/unix/plugins/SqueakFFIPrims/ffi-config branches/Cog/platforms/unix/vm/sqUnixMain.c Log: Integrate David Graham's FreeBSD patches. Modified: branches/Cog/platforms/Cross/plugins/SqueakFFIPrims/sqFFIPlugin.c =================================================================== --- branches/Cog/platforms/Cross/plugins/SqueakFFIPrims/sqFFIPlugin.c 2011-03-20 16:51:29 UTC (rev 2372) +++ branches/Cog/platforms/Cross/plugins/SqueakFFIPrims/sqFFIPlugin.c 2011-03-21 17:48:42 UTC (rev 2373) @@ -10,7 +10,7 @@ *****************************************************************************/ #include <stdio.h> -#if !WIN32 +#if !WIN32 && !__FreeBSD__ # include <alloca.h> #endif #include <string.h> Modified: branches/Cog/platforms/unix/plugins/SqueakFFIPrims/ffi-config =================================================================== --- branches/Cog/platforms/unix/plugins/SqueakFFIPrims/ffi-config 2011-03-20 16:51:29 UTC (rev 2372) +++ branches/Cog/platforms/unix/plugins/SqueakFFIPrims/ffi-config 2011-03-21 17:48:42 UTC (rev 2373) @@ -39,6 +39,7 @@ case ${abi} in linux) abi=sysv;; + freebsd) abi=sysv;; darwin*) abi=darwin;; *) abi=libffi; lib="-lffi";; esac Modified: branches/Cog/platforms/unix/vm/sqUnixMain.c =================================================================== --- branches/Cog/platforms/unix/vm/sqUnixMain.c 2011-03-20 16:51:29 UTC (rev 2372) +++ branches/Cog/platforms/unix/vm/sqUnixMain.c 2011-03-21 17:48:42 UTC (rev 2373) @@ -60,6 +60,9 @@ # include <execinfo.h> # define BACKTRACE_DEPTH 64 #endif +#if __FreeBSD__ +# include <sys/ucontext.h> +#endif #if defined(__alpha__) && defined(__osf__) # include <sys/sysinfo.h> @@ -777,6 +780,9 @@ # elif __linux__ && __i386__ void *fp = (void *)(uap ? uap->uc_mcontext.gregs[REG_EBP]: 0); void *sp = (void *)(uap ? uap->uc_mcontext.gregs[REG_ESP]: 0); +# elif __FreeBSD__ && __i386__ + void *fp = (void *)(uap ? uap->uc_mcontext.mc_ebp: 0); + void *sp = (void *)(uap ? uap->uc_mcontext.mc_esp: 0); # else # error need to implement extracting pc from a ucontext_t on this system # endif

1 0

VM Maker: CMakeVMMaker-IgorStasenko.46.mcz
by squeak-dev-noreply＠lists.squeakfoundation.org 21 Mar '11

21 Mar '11

Igor Stasenko uploaded a new version of CMakeVMMaker to project VM Maker: http://www.squeaksource.com/VMMaker/CMakeVMMaker-IgorStasenko.46.mcz ==================== Summary ==================== Name: CMakeVMMaker-IgorStasenko.46 Author: IgorStasenko Time: 20 March 2011, 3:35:26 am UUID: 45d81363-5bd3-1b48-ae91-40a4dfeaea83 Ancestors: CMakeVMMaker-IgorStasenko.45 - fix for incorrect line ends conversion for generating sources under Win32, which confuses the compiler. (a real fix would be to use modern streams , not CrLfFileStream)

2 1

VM Maker: VMMaker-oscog-IgorStasenko.53.mcz
by squeak-dev-noreply＠lists.squeakfoundation.org 21 Mar '11

21 Mar '11

Igor Stasenko uploaded a new version of VMMaker to project VM Maker: http://www.squeaksource.com/VMMaker/VMMaker-oscog-IgorStasenko.53.mcz ==================== Summary ==================== Name: VMMaker-oscog-IgorStasenko.53 Author: IgorStasenko Time: 20 March 2011, 11:40:20 pm UUID: fb4c7e81-ea2e-1b45-a461-e382537797a0 Ancestors: VMMaker-oscog.52, VMMaker-oscog.52 - republish overridden package + merge oscog.52

1 0

#flushCache with MethoWrappers in CogVM
by Mariano Martinez Peck 20 Mar '11

20 Mar '11

Hi Eliot. I am implementing some kind of MethodWrappes/ObjectsAsMethod, whihc basically use the #run:with:in trick. My question is that I am not sure how to implement #flushCache in my wrappers. This method is called by MethodDictionary>>#at:put: when I want to put back the original CompiledMethod. MyClass methodDict at: #foo put: MyWrapper withMethod: (MyClass>>#foo). ... MyClass methodDict at: #foo put: wrapper wrappedMethod -> here it sends #flushCache to my wrapper instance. In the StandardVM, I realised that at that moment, there is an entry in the cache that has selector: #foo, method: my wrapped instance, class: MyClass, etc... So, to flush this, I have to options: MyWrappers>>flushCache self wrappedMethod selector flushCache or.... MyWrappers>>flushCache <primitive: 116> this is because "self" will be found in the entry as "method" in the cache table... So, first, are my assumptions correct? Now, in cog I am not sure if both solutions are still valid. If I see CoInterpreterPrimitives>> primitiveFlushCacheByMethod you do at the end: (self methodHasCogMethod: oldMethod) ifTrue: [cogit unlinkSendsTo: (self cogMethodOf: oldMethod)] and methodHasCogMethod: aMethodOop <api> self assert: (objectMemory isNonIntegerObject: aMethodOop). ^self isCogMethodReference: (self rawHeaderOf: aMethodOop) So, it is not safe if the method is something different than a compiled method. Is that correct? should I flush the cache entering by selector instead? which is the safe way to clean the cache in this case? thanks Mariano

2 4

[commit] r2372 - OSCogVM source as per VMMaker-oscog.52.
by commits＠squeakvm.org 20 Mar '11

20 Mar '11

Author: eliot Date: 2011-03-20 09:51:29 -0700 (Sun, 20 Mar 2011) New Revision: 2372 Modified: branches/Cog/image/VMMaker-Squeak4.1.changes branches/Cog/image/VMMaker-Squeak4.1.image branches/Cog/src/vm/cointerp.c branches/Cog/src/vm/gcc3x-cointerp.c Log: OSCogVM source as per VMMaker-oscog.52. Fix primitiveFlushCacheByMethod for objects-as-methods. Modified: branches/Cog/image/VMMaker-Squeak4.1.changes =================================================================== --- branches/Cog/image/VMMaker-Squeak4.1.changes 2011-03-19 04:43:06 UTC (rev 2371) +++ branches/Cog/image/VMMaker-Squeak4.1.changes 2011-03-20 16:51:29 UTC (rev 2372) @@ -176680,4 +176680,35 @@ toFile: nil]. FileStream writeSourceCodeFrom: internalStream baseName: fileName isSt: true useHtml: false]! ! -----QUIT----{16 March 2011 . 12:38:02 pm} VMMaker-Squeak4.1.image priorSource: 7280958! \ No newline at end of file +----QUIT----{16 March 2011 . 12:38:02 pm} VMMaker-Squeak4.1.image priorSource: 7280958! + +----STARTUP----{20 March 2011 . 9:21:20 am} as /Users/eliot/Cog/oscog/Cog.squeakvm.org/image/VMMaker-Squeak4.1.image! + + +'From Squeak4.1 of 17 April 2010 [latest update: #9957] on 20 March 2011 at 9:28:42 am'! +!CoInterpreterPrimitives methodsFor: 'system control primitives' stamp: 'eem 3/20/2011 09:28' prior: 34750917! +primitiveFlushCacheByMethod + "The receiver is a compiledMethod. Clear all entries in the method lookup cache that + refer to this method, presumably because it has been redefined, overridden or removed. + Override to flush appropriate machine code caches also." + | probe oldMethod primIdx | + oldMethod := self stackTop. + probe := 0. + 1 to: MethodCacheEntries do: + [:i | + (methodCache at: probe + MethodCacheMethod) = oldMethod ifTrue: + [methodCache at: probe + MethodCacheSelector put: 0]. + probe := probe + MethodCacheEntrySize]. + (self isOopCompiledMethod: oldMethod) ifTrue: + [primIdx := self primitiveIndexOf: oldMethod. + primIdx = PrimitiveExternalCallIndex ifTrue: + ["It's primitiveExternalCall" + self flushExternalPrimitiveOf: oldMethod]. + (self methodHasCogMethod: oldMethod) ifTrue: + [cogit unlinkSendsTo: (self cogMethodOf: oldMethod)]]! ! + +----End fileIn of /Users/eliot/Cog/CoInterpreterPrimitives-primitiveFlushCacheByMethod.st----! + +"VMMaker"! + +----QUIT----{20 March 2011 . 9:46:19 am} VMMaker-Squeak4.1.image priorSource: 7282422! \ No newline at end of file Modified: branches/Cog/image/VMMaker-Squeak4.1.image =================================================================== (Binary files differ) Modified: branches/Cog/src/vm/cointerp.c =================================================================== --- branches/Cog/src/vm/cointerp.c 2011-03-19 04:43:06 UTC (rev 2371) +++ branches/Cog/src/vm/cointerp.c 2011-03-20 16:51:29 UTC (rev 2372) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker-oscog.51 uuid: d213bf61-5898-475b-8a5c-e4a9bdad2415 + CCodeGeneratorGlobalStructure VMMaker-oscog.52 uuid: 1241a856-8570-4725-a069-a6d3d8a8a222 from - CoInterpreter VMMaker-oscog.51 uuid: d213bf61-5898-475b-8a5c-e4a9bdad2415 + CoInterpreter VMMaker-oscog.52 uuid: 1241a856-8570-4725-a069-a6d3d8a8a222 */ -static char __buildInfo[] = "CoInterpreter VMMaker-oscog.51 uuid: d213bf61-5898-475b-8a5c-e4a9bdad2415 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker-oscog.52 uuid: 1241a856-8570-4725-a069-a6d3d8a8a222 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -1863,7 +1863,7 @@ /* 575 */ (void (*)(void))0, 0 }; static void (*externalPrimitiveTable[MaxExternalPrimitiveTableSize + 1 /* 4097 */])(void); -const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker-oscog.51]"; +const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker-oscog.52]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; static volatile int sendTrace; @@ -28496,15 +28496,18 @@ } probe += MethodCacheEntrySize; } - /* begin primitiveIndexOf: */ - primBits = (((usqInt) (headerOf(oldMethod))) >> 1) & 268435967; - primIdx = (primBits & 511) + (((usqInt) primBits) >> 19); - if (primIdx == PrimitiveExternalCallIndex) { - flushExternalPrimitiveOf(oldMethod); + if (((oldMethod & 1) == 0) + && (((((usqInt) (longAt(oldMethod))) >> 8) & 15) >= 12)) { + /* begin primitiveIndexOf: */ + primBits = (((usqInt) (headerOf(oldMethod))) >> 1) & 268435967; + primIdx = (primBits & 511) + (((usqInt) primBits) >> 19); + if (primIdx == PrimitiveExternalCallIndex) { + flushExternalPrimitiveOf(oldMethod); + } + if (methodHasCogMethod(oldMethod)) { + unlinkSendsTo(cogMethodOf(oldMethod)); + } } - if (methodHasCogMethod(oldMethod)) { - unlinkSendsTo(cogMethodOf(oldMethod)); - } } Modified: branches/Cog/src/vm/gcc3x-cointerp.c =================================================================== --- branches/Cog/src/vm/gcc3x-cointerp.c 2011-03-19 04:43:06 UTC (rev 2371) +++ branches/Cog/src/vm/gcc3x-cointerp.c 2011-03-20 16:51:29 UTC (rev 2372) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker-oscog.51 uuid: d213bf61-5898-475b-8a5c-e4a9bdad2415 + CCodeGeneratorGlobalStructure VMMaker-oscog.52 uuid: 1241a856-8570-4725-a069-a6d3d8a8a222 from - CoInterpreter VMMaker-oscog.51 uuid: d213bf61-5898-475b-8a5c-e4a9bdad2415 + CoInterpreter VMMaker-oscog.52 uuid: 1241a856-8570-4725-a069-a6d3d8a8a222 */ -static char __buildInfo[] = "CoInterpreter VMMaker-oscog.51 uuid: d213bf61-5898-475b-8a5c-e4a9bdad2415 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker-oscog.52 uuid: 1241a856-8570-4725-a069-a6d3d8a8a222 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -1866,7 +1866,7 @@ /* 575 */ (void (*)(void))0, 0 }; static void (*externalPrimitiveTable[MaxExternalPrimitiveTableSize + 1 /* 4097 */])(void); -const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker-oscog.51]"; +const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker-oscog.52]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; static volatile int sendTrace; @@ -28500,15 +28500,18 @@ } probe += MethodCacheEntrySize; } - /* begin primitiveIndexOf: */ - primBits = (((usqInt) (headerOf(oldMethod))) >> 1) & 268435967; - primIdx = (primBits & 511) + (((usqInt) primBits) >> 19); - if (primIdx == PrimitiveExternalCallIndex) { - flushExternalPrimitiveOf(oldMethod); + if (((oldMethod & 1) == 0) + && (((((usqInt) (longAt(oldMethod))) >> 8) & 15) >= 12)) { + /* begin primitiveIndexOf: */ + primBits = (((usqInt) (headerOf(oldMethod))) >> 1) & 268435967; + primIdx = (primBits & 511) + (((usqInt) primBits) >> 19); + if (primIdx == PrimitiveExternalCallIndex) { + flushExternalPrimitiveOf(oldMethod); + } + if (methodHasCogMethod(oldMethod)) { + unlinkSendsTo(cogMethodOf(oldMethod)); + } } - if (methodHasCogMethod(oldMethod)) { - unlinkSendsTo(cogMethodOf(oldMethod)); - } }

1 0

Cog Unix/Cog MacOS now should not crash while running Pharo tests
by Igor Stasenko 20 Mar '11

20 Mar '11

.. of course it needs to be verified. Cog Mac Carbon [1] build past #10 and Cog Unix [2] build past #46 using latest Eliot's update. Note that built VMs are not MT-enabled (using a CoInterpreter class instead of CoInterpreterMT). (we should decide if we create new jobs on Hudson for MT-enabled VMs or just change existing ones to use new class). Please, go to Hudson, download and play with new VMs. Let me know if there's everything alright. [1] https://pharo-ic.lille.inria.fr/hudson/view/Cog/job/Cog%20Mac%20Carbon/ [2] https://pharo-ic.lille.inria.fr/hudson/job/Cog%20Unix/ -- Best regards, Igor Stasenko AKA sig.

2 1

VM Maker: CMakeVMMaker-IgorStasenko.45.mcz
by squeak-dev-noreply＠lists.squeakfoundation.org 20 Mar '11

20 Mar '11

Igor Stasenko uploaded a new version of CMakeVMMaker to project VM Maker: http://www.squeaksource.com/VMMaker/CMakeVMMaker-IgorStasenko.45.mcz ==================== Summary ==================== Name: CMakeVMMaker-IgorStasenko.45 Author: IgorStasenko Time: 20 March 2011, 12:14:58 am UUID: b80fb594-630c-4778-8d21-64915ba3f2fb Ancestors: CMakeVMMaker-IgorStasenko.44 added configurations for building MT-enabled VMs: - MTCogMacOSConfig (works) - MTCogUnixConfig (works) MTCocoaIOSCogJitConfig requires Esteban's attention (some sources need to be ported from Mac OS dir to IOS dir)

1 0

Multi-threaded Cog on Ubuntu
by Igor Stasenko 20 Mar '11

20 Mar '11

Hi, Eliot. I just built fresh MT-enabled Cog VM on ubuntu box. On startup it prints following messages into stdout: sig@sig-VirtualBox:~/vmbuild/build/results$ ./Cog ~/macHome/projects/pharo/Pharo-1.3/Cog-Tester.image warning, processHasThreadId flag is unset; cannot function as a threaded VM if so. warning: Process doesn't have threadId; VM will not thread warning: Process doesn't have threadId; VM will not thread warning: Process doesn't have threadId; VM will not thread warning: Process doesn't have threadId; VM will not thread warning: Process doesn't have threadId; VM will not thread warning: Process doesn't have threadId; VM will not thread warning: Process doesn't have threadId; VM will not thread warning: Process doesn't have threadId; VM will not thread warning: Process doesn't have threadId; VM will not thread warning: Process doesn't have threadId; VM will not thread Is there everything fine, or something got wrong? -- Best regards, Igor Stasenko AKA sig.

2 2

[commit] r2371 - Add missing ioMilliSleep defs for unix & win32
by commits＠squeakvm.org 19 Mar '11

19 Mar '11

Author: eliot Date: 2011-03-18 21:43:06 -0700 (Fri, 18 Mar 2011) New Revision: 2371 Modified: branches/Cog/platforms/unix/vm/sqPlatformSpecific.h branches/Cog/platforms/win32/vm/sqPlatformSpecific.h Log: Add missing ioMilliSleep defs for unix & win32 Modified: branches/Cog/platforms/unix/vm/sqPlatformSpecific.h =================================================================== --- branches/Cog/platforms/unix/vm/sqPlatformSpecific.h 2011-03-18 23:10:49 UTC (rev 2370) +++ branches/Cog/platforms/unix/vm/sqPlatformSpecific.h 2011-03-19 04:43:06 UTC (rev 2371) @@ -85,6 +85,7 @@ # define ioSetThreadLocalThreadIndex(v) (pthread_setspecific(tltiIndex,(void*)(v))) # define ioOSThreadIsAlive(thread) (pthread_kill(thread,0) == 0) # define ioTransferTimeslice() sched_yield() +# define ioMilliSleep(ms) usleep((ms) * 1000) # endif /* COGMTVM */ #endif /* STACKVM */ Modified: branches/Cog/platforms/win32/vm/sqPlatformSpecific.h =================================================================== --- branches/Cog/platforms/win32/vm/sqPlatformSpecific.h 2011-03-18 23:10:49 UTC (rev 2370) +++ branches/Cog/platforms/win32/vm/sqPlatformSpecific.h 2011-03-19 04:43:06 UTC (rev 2371) @@ -100,6 +100,7 @@ # define ioGetThreadLocalThreadIndex() ((long)TlsGetValue(tltiIndex)) # define ioSetThreadLocalThreadIndex(v) (TlsSetValue(tltiIndex,(void*)(v))) # define ioTransferTimeslice() Sleep(0) +# define ioMilliSleep(ms) Sleep(ms) # endif /* COGMTVM */ #endif /* STACKVM */

1 0

VM Automated builds update 2
by Igor Stasenko 19 Mar '11

19 Mar '11

Finally i finished with overhaul - merging Esteban's code (from his branch) - merging Eliot's oscog VMMaker packages with our little mods and producing VMMaker-oscog.52.mcz. Please, use it for further development.. Merging same things over and over again is not fun. The new MT-enabled VMs are still not there.. there are some mistakes preventing it from building. Good news: - Hudson are now able to build Cocoa-based Cog VMs (https://pharo-ic.lille.inria.fr/hudson/view/Cog/job/Cog%20Mac%20Cocoa/) which is based on CMake configuration made by Esteban a bit later i will add a Hudson job to build Stack-Cocoa VM as well. P.S. just out of curiosity Camilo proposed to try and build VM using clang .. And it works after very little adjustment. See the CLANGCocoaIOSCogStackConfig -- Best regards, Igor Stasenko AKA sig.

1 1

← Newer
1
2
3
4
5
6
7
8
9
...
14
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

Vm-dev March 2011