Vm-dev July 2010

vm-dev@lists.squeakfoundation.org

45 participants
94 discussions

[commit] r2237 - The getFile macro needs to cast its result to FILE * at least for FreeBSD.
by commits＠squeakvm.org 16 Jul '10

16 Jul '10

Author: eliot Date: 2010-07-16 09:57:08 -0700 (Fri, 16 Jul 2010) New Revision: 2237 Modified: branches/Cog/platforms/Cross/plugins/FilePlugin/sqFilePluginBasicPrims.c Log: The getFile macro needs to cast its result to FILE * at least for FreeBSD. Modified: branches/Cog/platforms/Cross/plugins/FilePlugin/sqFilePluginBasicPrims.c =================================================================== --- branches/Cog/platforms/Cross/plugins/FilePlugin/sqFilePluginBasicPrims.c 2010-07-16 15:22:23 UTC (rev 2236) +++ branches/Cog/platforms/Cross/plugins/FilePlugin/sqFilePluginBasicPrims.c 2010-07-16 16:57:08 UTC (rev 2237) @@ -111,7 +111,7 @@ return file; } #else -# define getFile(f) ((f)->file) +# define getFile(f) ((FILE *)((f)->file)) #endif #if DOUBLE_WORD_ALIGNMENT

2 1

VM Maker: VMMaker-oscog.22.mcz
by squeak-dev-noreply＠lists.squeakfoundation.org 16 Jul '10

16 Jul '10

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://www.squeaksource.com/VMMaker/VMMaker-oscog.22.mcz ==================== Summary ==================== Name: VMMaker-oscog.22 Author: eem Time: 15 July 2010, 6:36:24 am UUID: 3720c759-295d-4183-b86d-651155593f83 Ancestors: VMMaker-oscog.21 CogVM: Safer long-running primitive monitoring (i.e. avoid races when remapping the longRunningPrimitiveCheckMethod) Make the interpreter's include of malloc.h specific to WIN32.

1 0

[commit] r2238 - Update the HowToBuild guides with better info on building the BochsIA32Plugin.
by commits＠squeakvm.org 16 Jul '10

16 Jul '10

Author: eliot Date: 2010-07-16 10:22:52 -0700 (Fri, 16 Jul 2010) New Revision: 2238 Modified: branches/Cog/cygwinbuild/HowToBuild branches/Cog/macbuild/HowToBuild branches/Cog/unixbuild/HowToBuild Log: Update the HowToBuild guides with better info on building the BochsIA32Plugin. Modified: branches/Cog/cygwinbuild/HowToBuild =================================================================== --- branches/Cog/cygwinbuild/HowToBuild 2010-07-16 16:57:08 UTC (rev 2237) +++ branches/Cog/cygwinbuild/HowToBuild 2010-07-16 17:22:52 UTC (rev 2238) @@ -20,3 +20,17 @@ Caution: if you previously used the mingw gnutools approach, you probably have a path to that 2.x gcc in your Windows PATH. Make sure that 'which gcc' in cygwin is the cygwin gcc 3.4.x not the MinGW gcc 2.95.x (try gcc -v). + + +3a. If you want to get the Cog VM simulator working you'll need to build the +BochsIA32Plugin/BochsIA32Plugin.xcodeproj project and to build that you'll +need to first build bochs. WARNING: No one has tried to build the plugin on +Win32. You are on your own but your efforts will be warmly welcomed. +First check-out the processor simulator source tree containing Bochs: + svn co http://www.squeakvm.org/svn/squeak/branches/Cog/processors +Then build (on the Mac the following works) + $ cd ROOT/processors/IA32/bochs + $ ./conf.COG + $ ./makeem + $ cd ROOT/macbuild/BochsIA32Plugin + $ xcodebuild Modified: branches/Cog/macbuild/HowToBuild =================================================================== --- branches/Cog/macbuild/HowToBuild 2010-07-16 16:57:08 UTC (rev 2237) +++ branches/Cog/macbuild/HowToBuild 2010-07-16 17:22:52 UTC (rev 2238) @@ -20,7 +20,10 @@ 3a. If you want to get the Cog VM simulator working you'll need to build the BochsIA32Plugin/BochsIA32Plugin.xcodeproj project and to build that you'll -need to first build bochs. +need to first build bochs. First check-out the processor simulator source tree +containing Bochs: + svn co http://www.squeakvm.org/svn/squeak/branches/Cog/processors +Then build using $ cd ROOT/processors/IA32/bochs $ ./conf.COG $ ./makeem Modified: branches/Cog/unixbuild/HowToBuild =================================================================== --- branches/Cog/unixbuild/HowToBuild 2010-07-16 16:57:08 UTC (rev 2237) +++ branches/Cog/unixbuild/HowToBuild 2010-07-16 17:22:52 UTC (rev 2238) @@ -23,3 +23,17 @@ SCHED_OTHER (unlike e.g. Mac OS X) and doesn't appear to allow changing the policy to one that does (e.g. SCHED_RR). So for now we use the itimer scheme. See platforms/unix/vm/sqUnixHeartbeat.c + +3c. If you want to get the Cog VM simulator working you'll need to build the +BochsIA32Plugin/BochsIA32Plugin.xcodeproj project and to build that you'll +need to first build bochs. First check-out the processor simulator source tree +containing Bochs: + svn co http://www.squeakvm.org/svn/squeak/branches/Cog/processors +Then build using the following, which works on Mac OS and is hence likely to +work on linux: + $ cd ROOT/processors/IA32/bochs + $ ./conf.COG + $ ./makeem + $ cd ROOT/macbuild/BochsIA32Plugin + $ xcodebuild +

1 0

[commit] r2236 - OSCogVM source as per VMMaker-oscog.23. Take alloca from stddef.h; malloc.h is
by commits＠squeakvm.org 16 Jul '10

16 Jul '10

Author: eliot Date: 2010-07-16 08:22:23 -0700 (Fri, 16 Jul 2010) New Revision: 2236 Modified: branches/Cog/image/VMMaker-Squeak4.1.changes branches/Cog/image/VMMaker-Squeak4.1.image Log: OSCogVM source as per VMMaker-oscog.23. Take alloca from stddef.h; malloc.h is an anachronism. Safer long-running primitive method code. FreeBSD-friendly mutex initialization in the unix heartbeat (I hope). Modified: branches/Cog/image/VMMaker-Squeak4.1.changes =================================================================== --- branches/Cog/image/VMMaker-Squeak4.1.changes 2010-07-16 14:57:02 UTC (rev 2235) +++ branches/Cog/image/VMMaker-Squeak4.1.changes 2010-07-16 15:22:23 UTC (rev 2236) @@ -120674,4 +120674,304 @@ excluding:#(BrokenPlugin IA32ABIPluginSimulator SlangTestPlugin TestOSAPlugin FFIPlugin ReentrantARMFFIPlugin ReentrantFFIPlugin ReentrantPPCBEFFIPlugin)! -----QUIT----{13 July 2010 . 5:53:45 pm} VMMaker-Squeak4.1.image priorSource: 4893204! \ No newline at end of file +----QUIT----{13 July 2010 . 5:53:45 pm} VMMaker-Squeak4.1.image priorSource: 4893204! + +----STARTUP----{15 July 2010 . 4:36:32 pm} as /Users/eliot/Cog/oscog/Cog.squeakvm.org/image/VMMaker-Squeak4.1.image! + +!StackInterpreter class methodsFor: 'translation' stamp: 'eem 7/15/2010 16:29' prior: 37654127! +declareCVarsIn: aCCodeGenerator + aCCodeGenerator + addHeaderFile:'#if defined(WIN32)\# include <malloc.h> /* for alloca under MSVC */\#endif' withCRs; + addHeaderFile:'<setjmp.h>'; + addHeaderFile:'"sqMemoryFence.h"'; + addHeaderFile:'"dispdbg.h"'. + aCCodeGenerator + var: #interpreterVersion + declareC: 'const char *interpreterVersion = "Croquet Closure Stack VM [', + (aCCodeGenerator shortMonticelloDescriptionForClass: self),']"'. + aCCodeGenerator + var: #interpreterProxy type: #'struct VirtualMachine*'. + aCCodeGenerator + declareVar: #sendTrace type: 'volatile int'; + declareVar: #byteCount type: 'unsigned long'. + "These need to be pointers or unsigned." + self declareC: #(instructionPointer method newMethod) + as: #usqInt + in: aCCodeGenerator. + "These are all pointers; char * because Slang has no support for C pointer arithmetic." + self declareC: #(localIP localSP localFP stackPointer framePointer stackLimit stackMemory) + as: #'char *' + in: aCCodeGenerator. + self declareC: #(stackPage overflowedPage) + as: #'StackPage *' + in: aCCodeGenerator. + aCCodeGenerator removeVariable: 'stackPages'. "this is an implicit receiver in the translated code." + aCCodeGenerator + var: #methodCache + declareC: 'long methodCache[MethodCacheSize + 1 /* ', (MethodCacheSize + 1) printString, ' */]'. + aCCodeGenerator + var: #atCache + declareC: 'sqInt atCache[AtCacheTotalSize + 1 /* ', (AtCacheTotalSize + 1) printString, ' */]'. + aCCodeGenerator + var: #primitiveTable + declareC: 'void (*primitiveTable[MaxPrimitiveIndex + 2 /* ', (MaxPrimitiveIndex +2) printString, ' */])(void) = ', self primitiveTableString. + self primitiveTable do: + [:symbolOrNot| + (symbolOrNot isSymbol + and: [symbolOrNot ~~ #primitiveFail]) ifTrue: + [(aCCodeGenerator methodNamed: symbolOrNot) ifNotNil: + [:tMethod| tMethod returnType: #void]]]. + aCCodeGenerator + var: #primitiveFunctionPointer + declareC: 'void (*primitiveFunctionPointer)()'. + aCCodeGenerator + var: #externalPrimitiveTable + declareC: 'void (*externalPrimitiveTable[MaxExternalPrimitiveTableSize + 1 /* ', (MaxExternalPrimitiveTableSize + 1) printString, ' */])(void)'. + aCCodeGenerator var: #showSurfaceFn type: #'void *'. + aCCodeGenerator + var: #jmpBuf + declareC: 'jmp_buf jmpBuf[MaxJumpBuf + 1 /* ', (MaxJumpBuf + 1) printString, ' */]'. + aCCodeGenerator + var: #suspendedCallbacks + declareC: 'usqInt suspendedCallbacks[MaxJumpBuf + 1 /* ', (MaxJumpBuf + 1) printString, ' */]'. + aCCodeGenerator + var: #suspendedMethods + declareC: 'usqInt suspendedMethods[MaxJumpBuf + 1 /* ', (MaxJumpBuf + 1) printString, ' */]'. + aCCodeGenerator + var: #interruptCheckChain + declareC: 'void (*interruptCheckChain)(void) = 0'. + aCCodeGenerator + var: #breakSelector type: #'char *'; + var: #breakSelectorLength + declareC: 'sqInt breakSelectorLength = -1'. + + self declareC: #(nextPollUsecs nextWakeupUsecs longRunningPrimitiveGCUsecs + longRunningPrimitiveStartUsecs longRunningPrimitiveStopUsecs) + as: #usqLong + in: aCCodeGenerator. + aCCodeGenerator var: #nextProfileTick type: #sqLong! ! +!VMClass methodsFor: 'simulation support' stamp: 'eem 7/7/2010 12:04'! +sqLowLevelMFence + <doNotGenerate> + "A no-op in the simulator"! ! +!StackInterpreter methodsFor: 'primitive support' stamp: 'eem 7/8/2010 10:58' prior: 37429536! +checkForLongRunningPrimitive + "Called from forceInterruptCheckFromHeartbeat. If the system has been running + the same primitive on two successive heartbeats then signal profileMethod." + <inline: true> + longRunningPrimitiveCheckSemaphore isNil ifTrue: + [^nil]. + (longRunningPrimitiveStartUsecs > 0 + and: [longRunningPrimitiveCheckMethod = newMethod + and: [longRunningPrimitiveCheckSequenceNumber = statCheckForEvents]]) ifTrue: + [longRunningPrimitiveStopUsecs := self ioUTCMicroseconds. + self assert: longRunningPrimitiveStopUsecs > longRunningPrimitiveStartUsecs. + ^nil]. + "See traceProfileState & mapProfileState." + longRunningPrimitiveStopUsecs = 0 ifTrue: + [longRunningPrimitiveCheckSequenceNumber := statCheckForEvents. + longRunningPrimitiveCheckMethod := newMethod. + longRunningPrimitiveStartUsecs := self ioUTCMicroseconds. + self sqLowLevelMFence]! ! +!StackInterpreter methodsFor: 'object memory support' stamp: 'eem 7/8/2010 10:54' prior: 37415469! +mapProfileState + profileProcess := self remap: profileProcess. + profileMethod := self remap: profileMethod. + profileSemaphore := self remap: profileSemaphore. + "The longRunningPrimitiveCheckMethod (LRPCM) is sampled in an interrupt. Be very careful with it. + If longRunningPrimitiveCheckSequenceNumber (LRPCSN) = statCheckForEvents then LRPCM has + been recenty sampled and could be mapped or not, but it must be newMethod and we can simply + copy newMethod. If LRPCSN ~= statCheckForEvents then LRPCM must be some extant object and + needs to be remapped." + self sqLowLevelMFence. + longRunningPrimitiveCheckMethod ~= nil ifTrue: + [longRunningPrimitiveCheckMethod := + longRunningPrimitiveCheckSequenceNumber = statCheckForEvents + ifTrue: [newMethod] + ifFalse: [self remap: longRunningPrimitiveCheckMethod]. + self sqLowLevelMFence]. + longRunningPrimitiveCheckSemaphore ~= nil ifTrue: + [longRunningPrimitiveCheckSemaphore := self remap: longRunningPrimitiveCheckSemaphore]! ! +!StackInterpreter methodsFor: 'process primitives' stamp: 'eem 7/7/2010 12:00' prior: 37627131! +primitiveLongRunningPrimitive + "Primitive. Answer an Array with the current long-running primitive method identified by + the heartbeat, the minimum number of milliseconds it was active for, and the milliseconds + of GC activity there-in, or nil if none. Since the longRunningPrimitiveCheckMethod is + sampled at interrupt time be careful to validate it before returning it." + <export: true> + | lrpcm result primms gcms | + self methodArgumentCount = 0 ifFalse: + [^self primitiveFail]. + self sqLowLevelMFence. + (longRunningPrimitiveStopUsecs > longRunningPrimitiveStartUsecs "a hit" + and: [(lrpcm := longRunningPrimitiveCheckMethod) ~= nil "there is a method" + and: [(self addressCouldBeObj: lrpcm) "method looks valid" + and: [(self isFreeObject: lrpcm) not + and: [(self isCompiledMethod: lrpcm)]]]]) + ifTrue: [result := self instantiateClass: (self splObj: ClassArray) indexableSize: 3. + primms := (longRunningPrimitiveStopUsecs - longRunningPrimitiveStartUsecs) + 500 // 1000. + + gcms := longRunningPrimitiveGCUsecs + 500 // 1000. + self storePointer: 0 ofObject: result withValue: lrpcm. + self storePointerUnchecked: 1 ofObject: result withValue: (self integerObjectOf: primms). + self storePointerUnchecked: 2 ofObject: result withValue: (self integerObjectOf: gcms)] + ifFalse: [result := nilObj]. + self pop: 1 thenPush: result. + self voidLongRunningPrimitive: 'get'! ! +!StackInterpreter methodsFor: 'object memory support' stamp: 'eem 7/8/2010 10:57' prior: 37427924! +traceProfileState + self markAndTrace: profileProcess. + self markAndTrace: profileMethod. + self markAndTrace: profileSemaphore. + + "The longRunningPrimitiveCheckMethod (LRPCM) is sampled in an interrupt. Be very careful with it. + If longRunningPrimitiveCheckSequenceNumber (LRPCSN) = statCheckForEvents then LRPCM has + been recenty sampled, but it must be newMethod and we don't need to trace it twice. If LRPCSN + ~= statCheckForEvents then LRPCM must be some extant object and needs to be traced." + self sqLowLevelMFence. + (longRunningPrimitiveCheckMethod ~= nil + and: [longRunningPrimitiveCheckSequenceNumber ~= statCheckForEvents]) ifTrue: + [self markAndTrace: longRunningPrimitiveCheckMethod]. + longRunningPrimitiveCheckSemaphore ~= nil ifTrue: + [self markAndTrace: longRunningPrimitiveCheckSemaphore]! ! +!StackInterpreter methodsFor: 'primitive support' stamp: 'eem 7/7/2010 12:19' prior: 37448462! +voidLongRunningPrimitive: reason + "Void the state associated with the long-running primitive check. + This is done when a new semaphore is installed or when it appears + that is longRunningPrimitiveCheckMethod is invalid, e.g. because it + has eben sampled in the middle of a GC." + <var: #reason type: #'char *'> + <inline: false> + longRunningPrimitiveCheckMethod := nil. + longRunningPrimitiveCheckSequenceNumber = 0. "not strictly necessary but prevents this being inlined into checkForLongRunningPrimitive" + longRunningPrimitiveStartUsecs := + longRunningPrimitiveStopUsecs := 0. + longRunningPrimitiveSignalUndelivered := true. + self sqLowLevelMFence! ! + +| user pw | +Utilities setAuthorInitials. +user := UIManager default request: 'Unix user name'. +pw := UIManager default requestPassword: 'Monticello password'. +MCHttpRepository allSubInstancesDo: [ : rep | + rep user: user; + password: pw ]! + +"VMMaker"! +!StackInterpreter class methodsFor: 'translation' stamp: 'eem 7/15/2010 18:41' prior: 38469466! +declareCVarsIn: aCCodeGenerator + aCCodeGenerator + addHeaderFile:'<stddef.h> /* for e.g. alloca */'; + addHeaderFile:'<setjmp.h>'; + addHeaderFile:'"sqMemoryFence.h"'; + addHeaderFile:'"dispdbg.h"'. + aCCodeGenerator + var: #interpreterVersion + declareC: 'const char *interpreterVersion = "Croquet Closure Stack VM [', + (aCCodeGenerator shortMonticelloDescriptionForClass: self),']"'. + aCCodeGenerator + var: #interpreterProxy type: #'struct VirtualMachine*'. + aCCodeGenerator + declareVar: #sendTrace type: 'volatile int'; + declareVar: #byteCount type: 'unsigned long'. + "These need to be pointers or unsigned." + self declareC: #(instructionPointer method newMethod) + as: #usqInt + in: aCCodeGenerator. + "These are all pointers; char * because Slang has no support for C pointer arithmetic." + self declareC: #(localIP localSP localFP stackPointer framePointer stackLimit stackMemory) + as: #'char *' + in: aCCodeGenerator. + self declareC: #(stackPage overflowedPage) + as: #'StackPage *' + in: aCCodeGenerator. + aCCodeGenerator removeVariable: 'stackPages'. "this is an implicit receiver in the translated code." + aCCodeGenerator + var: #methodCache + declareC: 'long methodCache[MethodCacheSize + 1 /* ', (MethodCacheSize + 1) printString, ' */]'. + aCCodeGenerator + var: #atCache + declareC: 'sqInt atCache[AtCacheTotalSize + 1 /* ', (AtCacheTotalSize + 1) printString, ' */]'. + aCCodeGenerator + var: #primitiveTable + declareC: 'void (*primitiveTable[MaxPrimitiveIndex + 2 /* ', (MaxPrimitiveIndex +2) printString, ' */])(void) = ', self primitiveTableString. + self primitiveTable do: + [:symbolOrNot| + (symbolOrNot isSymbol + and: [symbolOrNot ~~ #primitiveFail]) ifTrue: + [(aCCodeGenerator methodNamed: symbolOrNot) ifNotNil: + [:tMethod| tMethod returnType: #void]]]. + aCCodeGenerator + var: #primitiveFunctionPointer + declareC: 'void (*primitiveFunctionPointer)()'. + aCCodeGenerator + var: #externalPrimitiveTable + declareC: 'void (*externalPrimitiveTable[MaxExternalPrimitiveTableSize + 1 /* ', (MaxExternalPrimitiveTableSize + 1) printString, ' */])(void)'. + aCCodeGenerator var: #showSurfaceFn type: #'void *'. + aCCodeGenerator + var: #jmpBuf + declareC: 'jmp_buf jmpBuf[MaxJumpBuf + 1 /* ', (MaxJumpBuf + 1) printString, ' */]'. + aCCodeGenerator + var: #suspendedCallbacks + declareC: 'usqInt suspendedCallbacks[MaxJumpBuf + 1 /* ', (MaxJumpBuf + 1) printString, ' */]'. + aCCodeGenerator + var: #suspendedMethods + declareC: 'usqInt suspendedMethods[MaxJumpBuf + 1 /* ', (MaxJumpBuf + 1) printString, ' */]'. + aCCodeGenerator + var: #interruptCheckChain + declareC: 'void (*interruptCheckChain)(void) = 0'. + aCCodeGenerator + var: #breakSelector type: #'char *'; + var: #breakSelectorLength + declareC: 'sqInt breakSelectorLength = -1'. + + self declareC: #(nextPollUsecs nextWakeupUsecs longRunningPrimitiveGCUsecs + longRunningPrimitiveStartUsecs longRunningPrimitiveStopUsecs) + as: #usqLong + in: aCCodeGenerator. + aCCodeGenerator var: #nextProfileTick type: #sqLong! ! + +VMMaker + generate: CoInterpreter + to: (FileDirectory default / '../src') fullName + platformDir: (FileDirectory default / '../platforms') fullName + excluding:#(BrokenPlugin IA32ABIPluginSimulator SlangTestPlugin TestOSAPlugin + FFIPlugin ReentrantARMFFIPlugin ReentrantFFIPlugin ReentrantPPCBEFFIPlugin)! + +----QUIT----{15 July 2010 . 6:44:15 pm} VMMaker-Squeak4.1.image priorSource: 4914731! + +----STARTUP----{15 July 2010 . 7:43:34 pm} as /Users/eliot/Cog/oscog/Cog.squeakvm.org/image/VMMaker-Squeak4.1.image! + + +| user pw | +Utilities setAuthorInitials. +user := UIManager default request: 'Unix user name'. +pw := UIManager default requestPassword: 'Monticello password'. +MCHttpRepository allSubInstancesDo: [ : rep | + rep user: user; + password: pw ]! + +"VMMaker"! + +| user pw | +Utilities setAuthorInitials. +user := UIManager default request: 'Unix user name'. +pw := UIManager default requestPassword: 'Monticello password'. +MCHttpRepository allSubInstancesDo: [ : rep | + rep user: user; + password: pw ]! + +VMMaker + generate: CoInterpreter + to: (FileDirectory default / '../src') fullName + platformDir: (FileDirectory default / '../platforms') fullName + excluding:#(BrokenPlugin IA32ABIPluginSimulator SlangTestPlugin TestOSAPlugin + FFIPlugin ReentrantARMFFIPlugin ReentrantFFIPlugin ReentrantPPCBEFFIPlugin)! + +VMMaker + generate: StackInterpreter + to: (FileDirectory default / '../stacksrc') fullName + platformDir: (FileDirectory default / '../platforms') fullName + excluding: (InterpreterPlugin withAllSubclasses collect: [:ea| ea name])! + +----QUIT----{15 July 2010 . 8:09:58 pm} VMMaker-Squeak4.1.image priorSource: 4927113! \ No newline at end of file Modified: branches/Cog/image/VMMaker-Squeak4.1.image =================================================================== (Binary files differ)

2 1

[commit] r2235 - OSCogVM source as per VMMaker-oscog.23. Take alloca from stddef.h; malloc.h is
by commits＠squeakvm.org 16 Jul '10

16 Jul '10

Author: eliot Date: 2010-07-16 07:57:02 -0700 (Fri, 16 Jul 2010) New Revision: 2235 Modified: branches/Cog/platforms/unix/vm/sqUnixHeartbeat.c branches/Cog/src/vm/cointerp.c branches/Cog/src/vm/cointerp.h branches/Cog/src/vm/gcc3x-cointerp.c branches/Cog/src/vm/interp.h branches/Cog/stacksrc/vm/gcc3x-interp.c branches/Cog/stacksrc/vm/interp.c branches/Cog/stacksrc/vm/interp.h Log: OSCogVM source as per VMMaker-oscog.23. Take alloca from stddef.h; malloc.h is an anachronism. Safer long-running primitive method code. FreeBSD-friendly mutex initialization in the unix heartbeat (I hope). Modified: branches/Cog/platforms/unix/vm/sqUnixHeartbeat.c =================================================================== --- branches/Cog/platforms/unix/vm/sqUnixHeartbeat.c 2010-07-14 01:10:33 UTC (rev 2234) +++ branches/Cog/platforms/unix/vm/sqUnixHeartbeat.c 2010-07-16 14:57:02 UTC (rev 2235) @@ -375,13 +375,18 @@ (void)nanosleep(&naptime, 0); } -/* N.B. This is laziness. If needed on other than linux one would have to - * initializea mutexattr with PTHREAD_ERRORCHECK_MUTEX type. We require - * the errr check because we're lazy in preventing multiple attempts at - * locking yield_mutex in yieldToHighPriorityTickerThread. +/* We require the error check because we're lazy in preventing multiple + * attempts at locking yield_mutex in yieldToHighPriorityTickerThread. */ -static pthread_mutex_t yield_sync = PTHREAD_ERRORCHECK_MUTEX_INITIALIZER_NP; -static pthread_mutex_t yield_mutex = PTHREAD_ERRORCHECK_MUTEX_INITIALIZER_NP; +#if defined(PTHREAD_ERRORCHECK_MUTEX_INITIALIZER_NP) +# define THE_MUTEX_INITIALIZER PTHREAD_ERRORCHECK_MUTEX_INITIALIZER_NP +#elif defined(PTHREAD_ERRORCHECK_MUTEX_INITIALIZER) +# define THE_MUTEX_INITIALIZER PTHREAD_ERRORCHECK_MUTEX_INITIALIZER +#else +# define THE_MUTEX_INITIALIZER PTHREAD_MUTEX_INITIALIZER +#endif +static pthread_mutex_t yield_sync = THE_MUTEX_INITIALIZER; +static pthread_mutex_t yield_mutex = THE_MUTEX_INITIALIZER; static pthread_cond_t yield_cond = PTHREAD_COND_INITIALIZER; /* Private to sqTicker.c ioSynchronousCheckForEvents */ Modified: branches/Cog/src/vm/cointerp.c =================================================================== --- branches/Cog/src/vm/cointerp.c 2010-07-14 01:10:33 UTC (rev 2234) +++ branches/Cog/src/vm/cointerp.c 2010-07-16 14:57:02 UTC (rev 2235) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker-oscog.20 uuid: 528a9b5e-293c-4fac-9430-1eabdb0d278d + CCodeGeneratorGlobalStructure VMMaker-oscog.23 uuid: 1a50a139-43f0-421d-bc43-590dd9343bc4 from - CoInterpreter VMMaker-oscog.20 uuid: 528a9b5e-293c-4fac-9430-1eabdb0d278d + CoInterpreter VMMaker-oscog.23 uuid: 1a50a139-43f0-421d-bc43-590dd9343bc4 */ -static char __buildInfo[] = "CoInterpreter VMMaker-oscog.20 uuid: 528a9b5e-293c-4fac-9430-1eabdb0d278d " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker-oscog.23 uuid: 1a50a139-43f0-421d-bc43-590dd9343bc4 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -15,8 +15,9 @@ #endif #include "sq.h" -#include <malloc.h> /* for alloca under MSVC */ +#include <stddef.h> /* for e.g. alloca */ #include <setjmp.h> +#include "sqMemoryFence.h" #include "dispdbg.h" #include "sqCogStackAlignment.h" #include "cogmethod.h" @@ -1097,11 +1098,10 @@ _iss sqInt needGCFlag; _iss sqInt profileProcess; _iss usqInt scavengeThreshold; -_iss sqInt longRunningPrimitiveCheckMethod; _iss sqInt numStackPages; _iss sqInt profileMethod; -_iss usqInt fwdTableNext; _iss unsigned char primTraceLogIndex; +_iss usqInt fwdTableNext; _iss sqInt jmpDepth; _iss sqInt longRunningPrimitiveCheckSemaphore; _iss usqInt compStart; @@ -1114,8 +1114,10 @@ _iss sqInt preemptionYields; _iss sqInt cogCompiledCodeCompactionCalledFor; _iss sqInt highestRunnableProcessPriority; +_iss sqInt longRunningPrimitiveCheckMethod; _iss usqLong longRunningPrimitiveStartUsecs; _iss usqLong longRunningPrimitiveStopUsecs; +_iss sqInt statCheckForEvents; _iss sqInt statGrowMemory; _iss sqInt statMarkCount; _iss sqInt lastCoggableInterpretedBlockMethod; @@ -1131,7 +1133,6 @@ _iss sqInt pendingFinalizationSignals; _iss sqInt shrinkThreshold; _iss char * stackBasePlus1; -_iss sqInt statCheckForEvents; _iss sqInt statShrinkMemory; _iss sqInt bytesPerPage; _iss sqInt cogCodeSize; @@ -1145,6 +1146,7 @@ _iss sqInt edenBytes; _iss sqInt forceTenureFlag; _iss sqInt interruptPending; +_iss sqInt longRunningPrimitiveCheckSequenceNumber; _iss sqInt signalLowSpace; _iss sqInt statForceInterruptCheck; _iss usqLong statFullGCUsecs; @@ -1174,7 +1176,6 @@ _iss sqInt gcBiasToGrowGCLimit; _iss sqInt gcSemaphoreIndex; _iss sqInt imageFloatsBigEndian; -_iss sqInt longRunningPrimitiveCheckSequenceNumber; _iss sqInt longRunningPrimitiveSignalUndelivered; _iss usqLong nextPollUsecs; _iss StackPage * overflowedPage; @@ -1815,7 +1816,7 @@ /* 575 */ (void (*)(void))0, 0 }; static void (*externalPrimitiveTable[MaxExternalPrimitiveTableSize + 1 /* 4097 */])(void); -const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker-oscog.20]"; +const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker-oscog.23]"; static volatile int sendTrace; sqInt suppressHeartbeatFlag; @@ -16556,9 +16557,10 @@ goto l1; } if (GIV(longRunningPrimitiveStopUsecs) == 0) { + GIV(longRunningPrimitiveCheckSequenceNumber) = GIV(statCheckForEvents); GIV(longRunningPrimitiveCheckMethod) = GIV(newMethod); GIV(longRunningPrimitiveStartUsecs) = ioUTCMicroseconds(); - GIV(longRunningPrimitiveCheckSequenceNumber) = GIV(statCheckForEvents); + sqLowLevelMFence(); } l1: /* end checkForLongRunningPrimitive */; if (GIV(deferSmash)) { @@ -19866,7 +19868,6 @@ mapPointersInObjectsFromto(sqInt memStart, sqInt memEnd) { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt aMethodObj; - sqInt fwdBlock; sqInt i; sqInt i1; sqInt i2; @@ -19874,7 +19875,6 @@ sqInt oop; sqInt oop1; sqInt probe; - sqInt targetObj; /* begin mapInterpreterOops */ VM_LABEL(0mapInterpreterOops); @@ -19904,37 +19904,22 @@ GIV(newMethod) = remap(GIV(newMethod)); GIV(lkupClass) = remap(GIV(lkupClass)); /* begin mapProfileState */ - VM_LABEL(0mapProfileState); GIV(profileProcess) = remap(GIV(profileProcess)); GIV(profileMethod) = remap(GIV(profileMethod)); - /* Since the longRunningPrimitiveCheckMethod is sampled at interrupt time it may be invalid. - Be very careful with it. */ + /* The longRunningPrimitiveCheckMethod (LRPCM) is sampled in an interrupt. Be very careful with it. + If longRunningPrimitiveCheckSequenceNumber (LRPCSN) = statCheckForEvents then LRPCM has + been recenty sampled and could be mapped or not, but it must be newMethod and we can simply + copy newMethod. If LRPCSN ~= statCheckForEvents then LRPCM must be some extant object and + needs to be remapped. */ GIV(profileSemaphore) = remap(GIV(profileSemaphore)); - if ((GIV(longRunningPrimitiveCheckMethod) != null) - && (((GIV(longRunningPrimitiveCheckMethod) & 1) == 0) - && (((longAt(GIV(longRunningPrimitiveCheckMethod))) & MarkBit) != 0))) { - - /* If it is invalid at this point we'd better nil it. */ - - fwdBlock = ((longAt(GIV(longRunningPrimitiveCheckMethod))) & AllButMarkBitAndTypeMask) << 1; - if (((((usqInt) fwdBlock)) > (((usqInt) GIV(endOfMemory)))) - && (((((usqInt) fwdBlock)) <= (((usqInt) GIV(fwdTableNext)))) - && ((fwdBlock & 3) == 0))) { - targetObj = longAt(fwdBlock); - if (((targetObj & 3) == 0) - && (((((usqInt)targetObj)) >= heapBase) - && ((((usqInt)targetObj)) < GIV(freeStart)))) { - GIV(longRunningPrimitiveCheckMethod) = targetObj; - } - else { - voidLongRunningPrimitive("bad *fwd"); - } - } - else { - voidLongRunningPrimitive("bad fwd->"); - } + sqLowLevelMFence(); + if (GIV(longRunningPrimitiveCheckMethod) != null) { + GIV(longRunningPrimitiveCheckMethod) = (GIV(longRunningPrimitiveCheckSequenceNumber) == GIV(statCheckForEvents) + ? GIV(newMethod) + : remap(GIV(longRunningPrimitiveCheckMethod))); + sqLowLevelMFence(); } if (GIV(longRunningPrimitiveCheckSemaphore) != null) { GIV(longRunningPrimitiveCheckSemaphore) = remap(GIV(longRunningPrimitiveCheckSemaphore)); @@ -20243,9 +20228,9 @@ markAndTrace(GIV(profileProcess)); markAndTrace(GIV(profileMethod)); markAndTrace(GIV(profileSemaphore)); + sqLowLevelMFence(); if ((GIV(longRunningPrimitiveCheckMethod) != null) - && ((!(((longAt(GIV(longRunningPrimitiveCheckMethod))) & TypeMask) == HeaderTypeFree)) - && (((((usqInt) (longAt(GIV(longRunningPrimitiveCheckMethod)))) >> 8) & 15) >= 12))) { + && (GIV(longRunningPrimitiveCheckSequenceNumber) != GIV(statCheckForEvents))) { markAndTrace(GIV(longRunningPrimitiveCheckMethod)); } if (GIV(longRunningPrimitiveCheckSemaphore) != null) { @@ -32040,6 +32025,7 @@ primitiveLongRunningPrimitive(void) { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt gcms; + sqInt lrpcm; sqInt primms; sqInt result; char *sp; @@ -32051,22 +32037,23 @@ } return; } + sqLowLevelMFence(); if ((GIV(longRunningPrimitiveStopUsecs) > GIV(longRunningPrimitiveStartUsecs)) - && ((GIV(longRunningPrimitiveCheckMethod) != null) - && ((((GIV(longRunningPrimitiveCheckMethod) & 3) == 0) - && (((((usqInt)GIV(longRunningPrimitiveCheckMethod))) >= heapBase) - && (((((usqInt)GIV(longRunningPrimitiveCheckMethod))) < GIV(freeStart)) - && (((longAt(GIV(longRunningPrimitiveCheckMethod))) & TypeMask) != HeaderTypeGC)))) - && ((!(((longAt(GIV(longRunningPrimitiveCheckMethod))) & TypeMask) == HeaderTypeFree)) - && (((((usqInt) (longAt(GIV(longRunningPrimitiveCheckMethod)))) >> 8) & 15) >= 12))))) { + && ((((lrpcm = GIV(longRunningPrimitiveCheckMethod))) != null) + && ((((lrpcm & 3) == 0) + && (((((usqInt)lrpcm)) >= heapBase) + && (((((usqInt)lrpcm)) < GIV(freeStart)) + && (((longAt(lrpcm)) & TypeMask) != HeaderTypeGC)))) + && ((!(((longAt(lrpcm)) & TypeMask) == HeaderTypeFree)) + && (((((usqInt) (longAt(lrpcm))) >> 8) & 15) >= 12))))) { result = instantiateClassindexableSize(longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassArray << ShiftForWord)), 3); primms = ((GIV(longRunningPrimitiveStopUsecs) - GIV(longRunningPrimitiveStartUsecs)) + 500) / 1000; gcms = (GIV(longRunningPrimitiveGCUsecs) + 500) / 1000; /* begin storePointer:ofObject:withValue: */ if ((((usqInt) result)) < (((usqInt) GIV(youngStart)))) { - possibleRootStoreIntovalue(result, GIV(longRunningPrimitiveCheckMethod)); + possibleRootStoreIntovalue(result, lrpcm); } - longAtput((result + BaseHeaderSize) + (0 << ShiftForWord), GIV(longRunningPrimitiveCheckMethod)); + longAtput((result + BaseHeaderSize) + (0 << ShiftForWord), lrpcm); longAtput((result + BaseHeaderSize) + (1 << ShiftForWord), ((primms << 1) | 1)); longAtput((result + BaseHeaderSize) + (2 << ShiftForWord), ((gcms << 1) | 1)); } @@ -44144,6 +44131,7 @@ GIV(longRunningPrimitiveCheckSequenceNumber) == 0; GIV(longRunningPrimitiveStartUsecs) = GIV(longRunningPrimitiveStopUsecs) = 0; GIV(longRunningPrimitiveSignalUndelivered) = 1; + sqLowLevelMFence(); } Modified: branches/Cog/src/vm/cointerp.h =================================================================== --- branches/Cog/src/vm/cointerp.h 2010-07-14 01:10:33 UTC (rev 2234) +++ branches/Cog/src/vm/cointerp.h 2010-07-16 14:57:02 UTC (rev 2235) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker-oscog.20 uuid: 528a9b5e-293c-4fac-9430-1eabdb0d278d + CCodeGeneratorGlobalStructure VMMaker-oscog.23 uuid: 1a50a139-43f0-421d-bc43-590dd9343bc4 */ Modified: branches/Cog/src/vm/gcc3x-cointerp.c =================================================================== --- branches/Cog/src/vm/gcc3x-cointerp.c 2010-07-14 01:10:33 UTC (rev 2234) +++ branches/Cog/src/vm/gcc3x-cointerp.c 2010-07-16 14:57:02 UTC (rev 2235) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker-oscog.20 uuid: 528a9b5e-293c-4fac-9430-1eabdb0d278d + CCodeGeneratorGlobalStructure VMMaker-oscog.23 uuid: 1a50a139-43f0-421d-bc43-590dd9343bc4 from - CoInterpreter VMMaker-oscog.20 uuid: 528a9b5e-293c-4fac-9430-1eabdb0d278d + CoInterpreter VMMaker-oscog.23 uuid: 1a50a139-43f0-421d-bc43-590dd9343bc4 */ -static char __buildInfo[] = "CoInterpreter VMMaker-oscog.20 uuid: 528a9b5e-293c-4fac-9430-1eabdb0d278d " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker-oscog.23 uuid: 1a50a139-43f0-421d-bc43-590dd9343bc4 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -18,8 +18,9 @@ #endif #include "sqGnu.h" -#include <malloc.h> /* for alloca under MSVC */ +#include <stddef.h> /* for e.g. alloca */ #include <setjmp.h> +#include "sqMemoryFence.h" #include "dispdbg.h" #include "sqCogStackAlignment.h" #include "cogmethod.h" @@ -1100,11 +1101,10 @@ _iss sqInt needGCFlag; _iss sqInt profileProcess; _iss usqInt scavengeThreshold; -_iss sqInt longRunningPrimitiveCheckMethod; _iss sqInt numStackPages; _iss sqInt profileMethod; -_iss usqInt fwdTableNext; _iss unsigned char primTraceLogIndex; +_iss usqInt fwdTableNext; _iss sqInt jmpDepth; _iss sqInt longRunningPrimitiveCheckSemaphore; _iss usqInt compStart; @@ -1117,8 +1117,10 @@ _iss sqInt preemptionYields; _iss sqInt cogCompiledCodeCompactionCalledFor; _iss sqInt highestRunnableProcessPriority; +_iss sqInt longRunningPrimitiveCheckMethod; _iss usqLong longRunningPrimitiveStartUsecs; _iss usqLong longRunningPrimitiveStopUsecs; +_iss sqInt statCheckForEvents; _iss sqInt statGrowMemory; _iss sqInt statMarkCount; _iss sqInt lastCoggableInterpretedBlockMethod; @@ -1134,7 +1136,6 @@ _iss sqInt pendingFinalizationSignals; _iss sqInt shrinkThreshold; _iss char * stackBasePlus1; -_iss sqInt statCheckForEvents; _iss sqInt statShrinkMemory; _iss sqInt bytesPerPage; _iss sqInt cogCodeSize; @@ -1148,6 +1149,7 @@ _iss sqInt edenBytes; _iss sqInt forceTenureFlag; _iss sqInt interruptPending; +_iss sqInt longRunningPrimitiveCheckSequenceNumber; _iss sqInt signalLowSpace; _iss sqInt statForceInterruptCheck; _iss usqLong statFullGCUsecs; @@ -1177,7 +1179,6 @@ _iss sqInt gcBiasToGrowGCLimit; _iss sqInt gcSemaphoreIndex; _iss sqInt imageFloatsBigEndian; -_iss sqInt longRunningPrimitiveCheckSequenceNumber; _iss sqInt longRunningPrimitiveSignalUndelivered; _iss usqLong nextPollUsecs; _iss StackPage * overflowedPage; @@ -1818,7 +1819,7 @@ /* 575 */ (void (*)(void))0, 0 }; static void (*externalPrimitiveTable[MaxExternalPrimitiveTableSize + 1 /* 4097 */])(void); -const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker-oscog.20]"; +const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker-oscog.23]"; static volatile int sendTrace; sqInt suppressHeartbeatFlag; @@ -16560,9 +16561,10 @@ goto l1; } if (GIV(longRunningPrimitiveStopUsecs) == 0) { + GIV(longRunningPrimitiveCheckSequenceNumber) = GIV(statCheckForEvents); GIV(longRunningPrimitiveCheckMethod) = GIV(newMethod); GIV(longRunningPrimitiveStartUsecs) = ioUTCMicroseconds(); - GIV(longRunningPrimitiveCheckSequenceNumber) = GIV(statCheckForEvents); + sqLowLevelMFence(); } l1: /* end checkForLongRunningPrimitive */; if (GIV(deferSmash)) { @@ -19870,7 +19872,6 @@ mapPointersInObjectsFromto(sqInt memStart, sqInt memEnd) { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt aMethodObj; - sqInt fwdBlock; sqInt i; sqInt i1; sqInt i2; @@ -19878,7 +19879,6 @@ sqInt oop; sqInt oop1; sqInt probe; - sqInt targetObj; /* begin mapInterpreterOops */ VM_LABEL(0mapInterpreterOops); @@ -19908,37 +19908,22 @@ GIV(newMethod) = remap(GIV(newMethod)); GIV(lkupClass) = remap(GIV(lkupClass)); /* begin mapProfileState */ - VM_LABEL(0mapProfileState); GIV(profileProcess) = remap(GIV(profileProcess)); GIV(profileMethod) = remap(GIV(profileMethod)); - /* Since the longRunningPrimitiveCheckMethod is sampled at interrupt time it may be invalid. - Be very careful with it. */ + /* The longRunningPrimitiveCheckMethod (LRPCM) is sampled in an interrupt. Be very careful with it. + If longRunningPrimitiveCheckSequenceNumber (LRPCSN) = statCheckForEvents then LRPCM has + been recenty sampled and could be mapped or not, but it must be newMethod and we can simply + copy newMethod. If LRPCSN ~= statCheckForEvents then LRPCM must be some extant object and + needs to be remapped. */ GIV(profileSemaphore) = remap(GIV(profileSemaphore)); - if ((GIV(longRunningPrimitiveCheckMethod) != null) - && (((GIV(longRunningPrimitiveCheckMethod) & 1) == 0) - && (((longAt(GIV(longRunningPrimitiveCheckMethod))) & MarkBit) != 0))) { - - /* If it is invalid at this point we'd better nil it. */ - - fwdBlock = ((longAt(GIV(longRunningPrimitiveCheckMethod))) & AllButMarkBitAndTypeMask) << 1; - if (((((usqInt) fwdBlock)) > (((usqInt) GIV(endOfMemory)))) - && (((((usqInt) fwdBlock)) <= (((usqInt) GIV(fwdTableNext)))) - && ((fwdBlock & 3) == 0))) { - targetObj = longAt(fwdBlock); - if (((targetObj & 3) == 0) - && (((((usqInt)targetObj)) >= heapBase) - && ((((usqInt)targetObj)) < GIV(freeStart)))) { - GIV(longRunningPrimitiveCheckMethod) = targetObj; - } - else { - voidLongRunningPrimitive("bad *fwd"); - } - } - else { - voidLongRunningPrimitive("bad fwd->"); - } + sqLowLevelMFence(); + if (GIV(longRunningPrimitiveCheckMethod) != null) { + GIV(longRunningPrimitiveCheckMethod) = (GIV(longRunningPrimitiveCheckSequenceNumber) == GIV(statCheckForEvents) + ? GIV(newMethod) + : remap(GIV(longRunningPrimitiveCheckMethod))); + sqLowLevelMFence(); } if (GIV(longRunningPrimitiveCheckSemaphore) != null) { GIV(longRunningPrimitiveCheckSemaphore) = remap(GIV(longRunningPrimitiveCheckSemaphore)); @@ -20247,9 +20232,9 @@ markAndTrace(GIV(profileProcess)); markAndTrace(GIV(profileMethod)); markAndTrace(GIV(profileSemaphore)); + sqLowLevelMFence(); if ((GIV(longRunningPrimitiveCheckMethod) != null) - && ((!(((longAt(GIV(longRunningPrimitiveCheckMethod))) & TypeMask) == HeaderTypeFree)) - && (((((usqInt) (longAt(GIV(longRunningPrimitiveCheckMethod)))) >> 8) & 15) >= 12))) { + && (GIV(longRunningPrimitiveCheckSequenceNumber) != GIV(statCheckForEvents))) { markAndTrace(GIV(longRunningPrimitiveCheckMethod)); } if (GIV(longRunningPrimitiveCheckSemaphore) != null) { @@ -32044,6 +32029,7 @@ primitiveLongRunningPrimitive(void) { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt gcms; + sqInt lrpcm; sqInt primms; sqInt result; char *sp; @@ -32055,22 +32041,23 @@ } return; } + sqLowLevelMFence(); if ((GIV(longRunningPrimitiveStopUsecs) > GIV(longRunningPrimitiveStartUsecs)) - && ((GIV(longRunningPrimitiveCheckMethod) != null) - && ((((GIV(longRunningPrimitiveCheckMethod) & 3) == 0) - && (((((usqInt)GIV(longRunningPrimitiveCheckMethod))) >= heapBase) - && (((((usqInt)GIV(longRunningPrimitiveCheckMethod))) < GIV(freeStart)) - && (((longAt(GIV(longRunningPrimitiveCheckMethod))) & TypeMask) != HeaderTypeGC)))) - && ((!(((longAt(GIV(longRunningPrimitiveCheckMethod))) & TypeMask) == HeaderTypeFree)) - && (((((usqInt) (longAt(GIV(longRunningPrimitiveCheckMethod)))) >> 8) & 15) >= 12))))) { + && ((((lrpcm = GIV(longRunningPrimitiveCheckMethod))) != null) + && ((((lrpcm & 3) == 0) + && (((((usqInt)lrpcm)) >= heapBase) + && (((((usqInt)lrpcm)) < GIV(freeStart)) + && (((longAt(lrpcm)) & TypeMask) != HeaderTypeGC)))) + && ((!(((longAt(lrpcm)) & TypeMask) == HeaderTypeFree)) + && (((((usqInt) (longAt(lrpcm))) >> 8) & 15) >= 12))))) { result = instantiateClassindexableSize(longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassArray << ShiftForWord)), 3); primms = ((GIV(longRunningPrimitiveStopUsecs) - GIV(longRunningPrimitiveStartUsecs)) + 500) / 1000; gcms = (GIV(longRunningPrimitiveGCUsecs) + 500) / 1000; /* begin storePointer:ofObject:withValue: */ if ((((usqInt) result)) < (((usqInt) GIV(youngStart)))) { - possibleRootStoreIntovalue(result, GIV(longRunningPrimitiveCheckMethod)); + possibleRootStoreIntovalue(result, lrpcm); } - longAtput((result + BaseHeaderSize) + (0 << ShiftForWord), GIV(longRunningPrimitiveCheckMethod)); + longAtput((result + BaseHeaderSize) + (0 << ShiftForWord), lrpcm); longAtput((result + BaseHeaderSize) + (1 << ShiftForWord), ((primms << 1) | 1)); longAtput((result + BaseHeaderSize) + (2 << ShiftForWord), ((gcms << 1) | 1)); } @@ -44148,6 +44135,7 @@ GIV(longRunningPrimitiveCheckSequenceNumber) == 0; GIV(longRunningPrimitiveStartUsecs) = GIV(longRunningPrimitiveStopUsecs) = 0; GIV(longRunningPrimitiveSignalUndelivered) = 1; + sqLowLevelMFence(); } Modified: branches/Cog/src/vm/interp.h =================================================================== --- branches/Cog/src/vm/interp.h 2010-07-14 01:10:33 UTC (rev 2234) +++ branches/Cog/src/vm/interp.h 2010-07-16 14:57:02 UTC (rev 2235) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker-oscog.20 uuid: 528a9b5e-293c-4fac-9430-1eabdb0d278d + CCodeGeneratorGlobalStructure VMMaker-oscog.23 uuid: 1a50a139-43f0-421d-bc43-590dd9343bc4 */ #define COGVM 1 Modified: branches/Cog/stacksrc/vm/gcc3x-interp.c =================================================================== --- branches/Cog/stacksrc/vm/gcc3x-interp.c 2010-07-14 01:10:33 UTC (rev 2234) +++ branches/Cog/stacksrc/vm/gcc3x-interp.c 2010-07-16 14:57:02 UTC (rev 2235) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker-oscog.20 uuid: 528a9b5e-293c-4fac-9430-1eabdb0d278d + CCodeGeneratorGlobalStructure VMMaker-oscog.23 uuid: 1a50a139-43f0-421d-bc43-590dd9343bc4 from - StackInterpreter VMMaker-oscog.20 uuid: 528a9b5e-293c-4fac-9430-1eabdb0d278d + StackInterpreter VMMaker-oscog.23 uuid: 1a50a139-43f0-421d-bc43-590dd9343bc4 */ -static char __buildInfo[] = "StackInterpreter VMMaker-oscog.20 uuid: 528a9b5e-293c-4fac-9430-1eabdb0d278d " __DATE__ ; +static char __buildInfo[] = "StackInterpreter VMMaker-oscog.23 uuid: 1a50a139-43f0-421d-bc43-590dd9343bc4 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -18,8 +18,9 @@ #endif #include "sqGnu.h" -#include <malloc.h> /* for alloca under MSVC */ +#include <stddef.h> /* for e.g. alloca */ #include <setjmp.h> +#include "sqMemoryFence.h" #include "dispdbg.h" #include "sqMemoryAccess.h" @@ -916,7 +917,6 @@ _iss usqInt memoryLimit; _iss StackPage * mostRecentlyUsedPage; _iss sqInt needGCFlag; -_iss sqInt longRunningPrimitiveCheckMethod; _iss usqInt scavengeThreshold; _iss usqInt fwdTableNext; _iss sqInt jmpDepth; @@ -933,8 +933,10 @@ _iss sqInt preemptionYields; _iss sqInt profileMethod; _iss sqInt highestRunnableProcessPriority; +_iss sqInt longRunningPrimitiveCheckMethod; _iss usqLong longRunningPrimitiveStartUsecs; _iss usqLong longRunningPrimitiveStopUsecs; +_iss sqInt statCheckForEvents; _iss sqInt statGrowMemory; _iss sqInt statMarkCount; _iss sqInt lastMethodCacheProbeWrite; @@ -946,7 +948,6 @@ _iss sqInt metaclassSizeBytes; _iss sqInt pendingFinalizationSignals; _iss sqInt shrinkThreshold; -_iss sqInt statCheckForEvents; _iss sqInt statShrinkMemory; _iss usqInt fwdTableLast; _iss usqLong gcStartUsecs; @@ -956,6 +957,7 @@ _iss sqInt edenBytes; _iss sqInt forceTenureFlag; _iss sqInt interruptPending; +_iss sqInt longRunningPrimitiveCheckSequenceNumber; _iss sqInt signalLowSpace; _iss sqInt statForceInterruptCheck; _iss usqLong statFullGCUsecs; @@ -983,7 +985,6 @@ _iss sqInt gcBiasToGrowGCLimit; _iss sqInt gcSemaphoreIndex; _iss sqInt imageFloatsBigEndian; -_iss sqInt longRunningPrimitiveCheckSequenceNumber; _iss sqInt longRunningPrimitiveSignalUndelivered; _iss usqLong nextPollUsecs; _iss StackPage * overflowedPage; @@ -1614,7 +1615,7 @@ 0 }; char * breakSelector; sqInt breakSelectorLength = -1; -const char *interpreterVersion = "Croquet Closure Stack VM [StackInterpreter VMMaker-oscog.20]"; +const char *interpreterVersion = "Croquet Closure Stack VM [StackInterpreter VMMaker-oscog.23]"; static volatile int sendTrace; sqInt suppressHeartbeatFlag; @@ -13501,9 +13502,10 @@ goto l1; } if (GIV(longRunningPrimitiveStopUsecs) == 0) { + GIV(longRunningPrimitiveCheckSequenceNumber) = GIV(statCheckForEvents); GIV(longRunningPrimitiveCheckMethod) = GIV(newMethod); GIV(longRunningPrimitiveStartUsecs) = ioUTCMicroseconds(); - GIV(longRunningPrimitiveCheckSequenceNumber) = GIV(statCheckForEvents); + sqLowLevelMFence(); } l1: /* end checkForLongRunningPrimitive */; forceInterruptCheck(); @@ -16275,14 +16277,12 @@ mapPointersInObjectsFromto(sqInt memStart, sqInt memEnd) { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt aMethodObj; - sqInt fwdBlock; sqInt i; sqInt i1; sqInt i2; sqInt oop; sqInt oop1; sqInt probe; - sqInt targetObj; /* begin mapInterpreterOops */ VM_LABEL(0mapInterpreterOops); @@ -16309,37 +16309,22 @@ GIV(newMethod) = remap(GIV(newMethod)); GIV(lkupClass) = remap(GIV(lkupClass)); /* begin mapProfileState */ - VM_LABEL(0mapProfileState); GIV(profileProcess) = remap(GIV(profileProcess)); GIV(profileMethod) = remap(GIV(profileMethod)); - /* Since the longRunningPrimitiveCheckMethod is sampled at interrupt time it may be invalid. - Be very careful with it. */ + /* The longRunningPrimitiveCheckMethod (LRPCM) is sampled in an interrupt. Be very careful with it. + If longRunningPrimitiveCheckSequenceNumber (LRPCSN) = statCheckForEvents then LRPCM has + been recenty sampled and could be mapped or not, but it must be newMethod and we can simply + copy newMethod. If LRPCSN ~= statCheckForEvents then LRPCM must be some extant object and + needs to be remapped. */ GIV(profileSemaphore) = remap(GIV(profileSemaphore)); - if ((GIV(longRunningPrimitiveCheckMethod) != null) - && (((GIV(longRunningPrimitiveCheckMethod) & 1) == 0) - && (((longAt(GIV(longRunningPrimitiveCheckMethod))) & MarkBit) != 0))) { - - /* If it is invalid at this point we'd better nil it. */ - - fwdBlock = ((longAt(GIV(longRunningPrimitiveCheckMethod))) & AllButMarkBitAndTypeMask) << 1; - if (((((usqInt) fwdBlock)) > (((usqInt) GIV(endOfMemory)))) - && (((((usqInt) fwdBlock)) <= (((usqInt) GIV(fwdTableNext)))) - && ((fwdBlock & 3) == 0))) { - targetObj = longAt(fwdBlock); - if (((targetObj & 3) == 0) - && (((((usqInt)targetObj)) >= memory) - && ((((usqInt)targetObj)) < GIV(freeStart)))) { - GIV(longRunningPrimitiveCheckMethod) = targetObj; - } - else { - voidLongRunningPrimitive("bad *fwd"); - } - } - else { - voidLongRunningPrimitive("bad fwd->"); - } + sqLowLevelMFence(); + if (GIV(longRunningPrimitiveCheckMethod) != null) { + GIV(longRunningPrimitiveCheckMethod) = (GIV(longRunningPrimitiveCheckSequenceNumber) == GIV(statCheckForEvents) + ? GIV(newMethod) + : remap(GIV(longRunningPrimitiveCheckMethod))); + sqLowLevelMFence(); } if (GIV(longRunningPrimitiveCheckSemaphore) != null) { GIV(longRunningPrimitiveCheckSemaphore) = remap(GIV(longRunningPrimitiveCheckSemaphore)); @@ -16552,9 +16537,9 @@ markAndTrace(GIV(profileProcess)); markAndTrace(GIV(profileMethod)); markAndTrace(GIV(profileSemaphore)); + sqLowLevelMFence(); if ((GIV(longRunningPrimitiveCheckMethod) != null) - && ((!(((longAt(GIV(longRunningPrimitiveCheckMethod))) & TypeMask) == HeaderTypeFree)) - && (((((usqInt) (longAt(GIV(longRunningPrimitiveCheckMethod)))) >> 8) & 15) >= 12))) { + && (GIV(longRunningPrimitiveCheckSequenceNumber) != GIV(statCheckForEvents))) { markAndTrace(GIV(longRunningPrimitiveCheckMethod)); } if (GIV(longRunningPrimitiveCheckSemaphore) != null) { @@ -27870,6 +27855,7 @@ primitiveLongRunningPrimitive(void) { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt gcms; + sqInt lrpcm; sqInt primms; sqInt result; char *sp; @@ -27881,22 +27867,23 @@ } return; } + sqLowLevelMFence(); if ((GIV(longRunningPrimitiveStopUsecs) > GIV(longRunningPrimitiveStartUsecs)) - && ((GIV(longRunningPrimitiveCheckMethod) != null) - && ((((GIV(longRunningPrimitiveCheckMethod) & 3) == 0) - && (((((usqInt)GIV(longRunningPrimitiveCheckMethod))) >= memory) - && (((((usqInt)GIV(longRunningPrimitiveCheckMethod))) < GIV(freeStart)) - && (((longAt(GIV(longRunningPrimitiveCheckMethod))) & TypeMask) != HeaderTypeGC)))) - && ((!(((longAt(GIV(longRunningPrimitiveCheckMethod))) & TypeMask) == HeaderTypeFree)) - && (((((usqInt) (longAt(GIV(longRunningPrimitiveCheckMethod)))) >> 8) & 15) >= 12))))) { + && ((((lrpcm = GIV(longRunningPrimitiveCheckMethod))) != null) + && ((((lrpcm & 3) == 0) + && (((((usqInt)lrpcm)) >= memory) + && (((((usqInt)lrpcm)) < GIV(freeStart)) + && (((longAt(lrpcm)) & TypeMask) != HeaderTypeGC)))) + && ((!(((longAt(lrpcm)) & TypeMask) == HeaderTypeFree)) + && (((((usqInt) (longAt(lrpcm))) >> 8) & 15) >= 12))))) { result = instantiateClassindexableSize(longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassArray << ShiftForWord)), 3); primms = ((GIV(longRunningPrimitiveStopUsecs) - GIV(longRunningPrimitiveStartUsecs)) + 500) / 1000; gcms = (GIV(longRunningPrimitiveGCUsecs) + 500) / 1000; /* begin storePointer:ofObject:withValue: */ if ((((usqInt) result)) < (((usqInt) GIV(youngStart)))) { - possibleRootStoreIntovalue(result, GIV(longRunningPrimitiveCheckMethod)); + possibleRootStoreIntovalue(result, lrpcm); } - longAtput((result + BaseHeaderSize) + (0 << ShiftForWord), GIV(longRunningPrimitiveCheckMethod)); + longAtput((result + BaseHeaderSize) + (0 << ShiftForWord), lrpcm); longAtput((result + BaseHeaderSize) + (1 << ShiftForWord), ((primms << 1) | 1)); longAtput((result + BaseHeaderSize) + (2 << ShiftForWord), ((gcms << 1) | 1)); } @@ -38779,6 +38766,7 @@ GIV(longRunningPrimitiveCheckSequenceNumber) == 0; GIV(longRunningPrimitiveStartUsecs) = GIV(longRunningPrimitiveStopUsecs) = 0; GIV(longRunningPrimitiveSignalUndelivered) = 1; + sqLowLevelMFence(); } Modified: branches/Cog/stacksrc/vm/interp.c =================================================================== --- branches/Cog/stacksrc/vm/interp.c 2010-07-14 01:10:33 UTC (rev 2234) +++ branches/Cog/stacksrc/vm/interp.c 2010-07-16 14:57:02 UTC (rev 2235) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker-oscog.20 uuid: 528a9b5e-293c-4fac-9430-1eabdb0d278d + CCodeGeneratorGlobalStructure VMMaker-oscog.23 uuid: 1a50a139-43f0-421d-bc43-590dd9343bc4 from - StackInterpreter VMMaker-oscog.20 uuid: 528a9b5e-293c-4fac-9430-1eabdb0d278d + StackInterpreter VMMaker-oscog.23 uuid: 1a50a139-43f0-421d-bc43-590dd9343bc4 */ -static char __buildInfo[] = "StackInterpreter VMMaker-oscog.20 uuid: 528a9b5e-293c-4fac-9430-1eabdb0d278d " __DATE__ ; +static char __buildInfo[] = "StackInterpreter VMMaker-oscog.23 uuid: 1a50a139-43f0-421d-bc43-590dd9343bc4 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -15,8 +15,9 @@ #endif #include "sq.h" -#include <malloc.h> /* for alloca under MSVC */ +#include <stddef.h> /* for e.g. alloca */ #include <setjmp.h> +#include "sqMemoryFence.h" #include "dispdbg.h" #include "sqMemoryAccess.h" @@ -913,7 +914,6 @@ _iss usqInt memoryLimit; _iss StackPage * mostRecentlyUsedPage; _iss sqInt needGCFlag; -_iss sqInt longRunningPrimitiveCheckMethod; _iss usqInt scavengeThreshold; _iss usqInt fwdTableNext; _iss sqInt jmpDepth; @@ -930,8 +930,10 @@ _iss sqInt preemptionYields; _iss sqInt profileMethod; _iss sqInt highestRunnableProcessPriority; +_iss sqInt longRunningPrimitiveCheckMethod; _iss usqLong longRunningPrimitiveStartUsecs; _iss usqLong longRunningPrimitiveStopUsecs; +_iss sqInt statCheckForEvents; _iss sqInt statGrowMemory; _iss sqInt statMarkCount; _iss sqInt lastMethodCacheProbeWrite; @@ -943,7 +945,6 @@ _iss sqInt metaclassSizeBytes; _iss sqInt pendingFinalizationSignals; _iss sqInt shrinkThreshold; -_iss sqInt statCheckForEvents; _iss sqInt statShrinkMemory; _iss usqInt fwdTableLast; _iss usqLong gcStartUsecs; @@ -953,6 +954,7 @@ _iss sqInt edenBytes; _iss sqInt forceTenureFlag; _iss sqInt interruptPending; +_iss sqInt longRunningPrimitiveCheckSequenceNumber; _iss sqInt signalLowSpace; _iss sqInt statForceInterruptCheck; _iss usqLong statFullGCUsecs; @@ -980,7 +982,6 @@ _iss sqInt gcBiasToGrowGCLimit; _iss sqInt gcSemaphoreIndex; _iss sqInt imageFloatsBigEndian; -_iss sqInt longRunningPrimitiveCheckSequenceNumber; _iss sqInt longRunningPrimitiveSignalUndelivered; _iss usqLong nextPollUsecs; _iss StackPage * overflowedPage; @@ -1611,7 +1612,7 @@ 0 }; char * breakSelector; sqInt breakSelectorLength = -1; -const char *interpreterVersion = "Croquet Closure Stack VM [StackInterpreter VMMaker-oscog.20]"; +const char *interpreterVersion = "Croquet Closure Stack VM [StackInterpreter VMMaker-oscog.23]"; static volatile int sendTrace; sqInt suppressHeartbeatFlag; @@ -13497,9 +13498,10 @@ goto l1; } if (GIV(longRunningPrimitiveStopUsecs) == 0) { + GIV(longRunningPrimitiveCheckSequenceNumber) = GIV(statCheckForEvents); GIV(longRunningPrimitiveCheckMethod) = GIV(newMethod); GIV(longRunningPrimitiveStartUsecs) = ioUTCMicroseconds(); - GIV(longRunningPrimitiveCheckSequenceNumber) = GIV(statCheckForEvents); + sqLowLevelMFence(); } l1: /* end checkForLongRunningPrimitive */; forceInterruptCheck(); @@ -16271,14 +16273,12 @@ mapPointersInObjectsFromto(sqInt memStart, sqInt memEnd) { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt aMethodObj; - sqInt fwdBlock; sqInt i; sqInt i1; sqInt i2; sqInt oop; sqInt oop1; sqInt probe; - sqInt targetObj; /* begin mapInterpreterOops */ VM_LABEL(0mapInterpreterOops); @@ -16305,37 +16305,22 @@ GIV(newMethod) = remap(GIV(newMethod)); GIV(lkupClass) = remap(GIV(lkupClass)); /* begin mapProfileState */ - VM_LABEL(0mapProfileState); GIV(profileProcess) = remap(GIV(profileProcess)); GIV(profileMethod) = remap(GIV(profileMethod)); - /* Since the longRunningPrimitiveCheckMethod is sampled at interrupt time it may be invalid. - Be very careful with it. */ + /* The longRunningPrimitiveCheckMethod (LRPCM) is sampled in an interrupt. Be very careful with it. + If longRunningPrimitiveCheckSequenceNumber (LRPCSN) = statCheckForEvents then LRPCM has + been recenty sampled and could be mapped or not, but it must be newMethod and we can simply + copy newMethod. If LRPCSN ~= statCheckForEvents then LRPCM must be some extant object and + needs to be remapped. */ GIV(profileSemaphore) = remap(GIV(profileSemaphore)); - if ((GIV(longRunningPrimitiveCheckMethod) != null) - && (((GIV(longRunningPrimitiveCheckMethod) & 1) == 0) - && (((longAt(GIV(longRunningPrimitiveCheckMethod))) & MarkBit) != 0))) { - - /* If it is invalid at this point we'd better nil it. */ - - fwdBlock = ((longAt(GIV(longRunningPrimitiveCheckMethod))) & AllButMarkBitAndTypeMask) << 1; - if (((((usqInt) fwdBlock)) > (((usqInt) GIV(endOfMemory)))) - && (((((usqInt) fwdBlock)) <= (((usqInt) GIV(fwdTableNext)))) - && ((fwdBlock & 3) == 0))) { - targetObj = longAt(fwdBlock); - if (((targetObj & 3) == 0) - && (((((usqInt)targetObj)) >= memory) - && ((((usqInt)targetObj)) < GIV(freeStart)))) { - GIV(longRunningPrimitiveCheckMethod) = targetObj; - } - else { - voidLongRunningPrimitive("bad *fwd"); - } - } - else { - voidLongRunningPrimitive("bad fwd->"); - } + sqLowLevelMFence(); + if (GIV(longRunningPrimitiveCheckMethod) != null) { + GIV(longRunningPrimitiveCheckMethod) = (GIV(longRunningPrimitiveCheckSequenceNumber) == GIV(statCheckForEvents) + ? GIV(newMethod) + : remap(GIV(longRunningPrimitiveCheckMethod))); + sqLowLevelMFence(); } if (GIV(longRunningPrimitiveCheckSemaphore) != null) { GIV(longRunningPrimitiveCheckSemaphore) = remap(GIV(longRunningPrimitiveCheckSemaphore)); @@ -16548,9 +16533,9 @@ markAndTrace(GIV(profileProcess)); markAndTrace(GIV(profileMethod)); markAndTrace(GIV(profileSemaphore)); + sqLowLevelMFence(); if ((GIV(longRunningPrimitiveCheckMethod) != null) - && ((!(((longAt(GIV(longRunningPrimitiveCheckMethod))) & TypeMask) == HeaderTypeFree)) - && (((((usqInt) (longAt(GIV(longRunningPrimitiveCheckMethod)))) >> 8) & 15) >= 12))) { + && (GIV(longRunningPrimitiveCheckSequenceNumber) != GIV(statCheckForEvents))) { markAndTrace(GIV(longRunningPrimitiveCheckMethod)); } if (GIV(longRunningPrimitiveCheckSemaphore) != null) { @@ -27866,6 +27851,7 @@ primitiveLongRunningPrimitive(void) { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt gcms; + sqInt lrpcm; sqInt primms; sqInt result; char *sp; @@ -27877,22 +27863,23 @@ } return; } + sqLowLevelMFence(); if ((GIV(longRunningPrimitiveStopUsecs) > GIV(longRunningPrimitiveStartUsecs)) - && ((GIV(longRunningPrimitiveCheckMethod) != null) - && ((((GIV(longRunningPrimitiveCheckMethod) & 3) == 0) - && (((((usqInt)GIV(longRunningPrimitiveCheckMethod))) >= memory) - && (((((usqInt)GIV(longRunningPrimitiveCheckMethod))) < GIV(freeStart)) - && (((longAt(GIV(longRunningPrimitiveCheckMethod))) & TypeMask) != HeaderTypeGC)))) - && ((!(((longAt(GIV(longRunningPrimitiveCheckMethod))) & TypeMask) == HeaderTypeFree)) - && (((((usqInt) (longAt(GIV(longRunningPrimitiveCheckMethod)))) >> 8) & 15) >= 12))))) { + && ((((lrpcm = GIV(longRunningPrimitiveCheckMethod))) != null) + && ((((lrpcm & 3) == 0) + && (((((usqInt)lrpcm)) >= memory) + && (((((usqInt)lrpcm)) < GIV(freeStart)) + && (((longAt(lrpcm)) & TypeMask) != HeaderTypeGC)))) + && ((!(((longAt(lrpcm)) & TypeMask) == HeaderTypeFree)) + && (((((usqInt) (longAt(lrpcm))) >> 8) & 15) >= 12))))) { result = instantiateClassindexableSize(longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassArray << ShiftForWord)), 3); primms = ((GIV(longRunningPrimitiveStopUsecs) - GIV(longRunningPrimitiveStartUsecs)) + 500) / 1000; gcms = (GIV(longRunningPrimitiveGCUsecs) + 500) / 1000; /* begin storePointer:ofObject:withValue: */ if ((((usqInt) result)) < (((usqInt) GIV(youngStart)))) { - possibleRootStoreIntovalue(result, GIV(longRunningPrimitiveCheckMethod)); + possibleRootStoreIntovalue(result, lrpcm); } - longAtput((result + BaseHeaderSize) + (0 << ShiftForWord), GIV(longRunningPrimitiveCheckMethod)); + longAtput((result + BaseHeaderSize) + (0 << ShiftForWord), lrpcm); longAtput((result + BaseHeaderSize) + (1 << ShiftForWord), ((primms << 1) | 1)); longAtput((result + BaseHeaderSize) + (2 << ShiftForWord), ((gcms << 1) | 1)); } @@ -38775,6 +38762,7 @@ GIV(longRunningPrimitiveCheckSequenceNumber) == 0; GIV(longRunningPrimitiveStartUsecs) = GIV(longRunningPrimitiveStopUsecs) = 0; GIV(longRunningPrimitiveSignalUndelivered) = 1; + sqLowLevelMFence(); } Modified: branches/Cog/stacksrc/vm/interp.h =================================================================== --- branches/Cog/stacksrc/vm/interp.h 2010-07-14 01:10:33 UTC (rev 2234) +++ branches/Cog/stacksrc/vm/interp.h 2010-07-16 14:57:02 UTC (rev 2235) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker-oscog.20 uuid: 528a9b5e-293c-4fac-9430-1eabdb0d278d + CCodeGeneratorGlobalStructure VMMaker-oscog.23 uuid: 1a50a139-43f0-421d-bc43-590dd9343bc4 */ #define STACKVM 1

1 0

VM more flexible for research?
by Mariano Martinez Peck 15 Jul '10

15 Jul '10

Hi folks. I am a newbie for both research and VM. However, in the little time I have been working on this, I always need some extra bits in the object header to do some experiments. And the problem is that I always have only one :( So I come to the idea of having a more flexible VM for the people that want to experiment with it. The first idea was to remove compact classes. But of course, there may be much more ideas or things to do. What do you think? Cheers Mariano

2 1

Cog segfaults on linux
by Eliot Miranda 15 Jul '10

15 Jul '10

Hi All, today I noticed that the default stack alignment for Cog on linux is only 4 bytes. On Mac OS X x86 it has always been 16 bytes to support SSE 64-bit and 128-bit instructions. I wonder whether this might be anything to do with the random crashes people have seen running Cog on linux. If you have seen random crashes perhaps you could recompile using the attached version of platforms/Cross/vm/sqCogStackAlignment.h and report back. You'll have to do a make reallyclean and repeat the configure command to recompile everything (ok you can also say rm */*o */*a */.libs/*). best Eliot

2 1

[commit] r2233 - iOS don't use USE_INLINE_MEMORY_ACCESSORS for Cog Stack VM iPhone build, slightly faster..
by David T. Lewis 14 Jul '10

14 Jul '10

Commit message blocked due to file size, trimmed version follows. --------- Date: Mon, 12 Jul 2010 17:58:25 -0700 To: vm-dev(a)lists.squeakfoundation.org From: commits(a)squeakvm.org Subject: [commit] r2233 - iOS don't use USE_INLINE_MEMORY_ACCESSORS for Cog Stack VM iPhone build, slightly faster.. Author: johnmci Date: 2010-07-12 17:58:24 -0700 (Mon, 12 Jul 2010) New Revision: 2233 Modified: trunk/platforms/iOS/vm/SqueakPureObjc.xcodeproj/johnmci.mode1v3 trunk/platforms/iOS/vm/SqueakPureObjc.xcodeproj/johnmci.pbxuser trunk/platforms/iOS/vm/SqueakPureObjcCogVM.xcodeproj/johnmci.mode1v3 trunk/platforms/iOS/vm/SqueakPureObjcCogVM.xcodeproj/johnmci.pbxuser trunk/platforms/iOS/vm/SqueakPureObjcCogVM.xcodeproj/project.pbxproj Log: iOS don't use USE_INLINE_MEMORY_ACCESSORS for Cog Stack VM iPhone build, slightly faster.. Modified: trunk/platforms/iOS/vm/SqueakPureObjc.xcodeproj/johnmci.mode1v3 =================================================================== --- trunk/platforms/iOS/vm/SqueakPureObjc.xcodeproj/johnmci.mode1v3 2010-07-11 16:25:43 UTC (rev 2232) +++ trunk/platforms/iOS/vm/SqueakPureObjc.xcodeproj/johnmci.mode1v3 2010-07-13 00:58:24 UTC (rev 2233) <snip>

1 0

VM Maker: VMMaker-oscog.21.mcz
by squeak-dev-noreply＠lists.squeakfoundation.org 14 Jul '10

14 Jul '10

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://www.squeaksource.com/VMMaker/VMMaker-oscog.21.mcz ==================== Summary ==================== Name: VMMaker-oscog.21 Author: eem Time: 13 July 2010, 5:41:07 am UUID: f46d3ba4-c310-454b-9be7-30c6341f4486 Ancestors: VMMaker-oscog.20 ReentrantFFIPlugin: Fix struct return, indexing return type spec corrrectly and not being confused between the struct return size and whether return is via registers or not. Backwards-compatibility access to the ffi error code. Various: use pop:thenPush: in a few places.

1 0

[commit] r2234 - OSCogVM source as per VMMaker-oscog.21. Fix struct return, indexing return type
by commits＠squeakvm.org 14 Jul '10

14 Jul '10

Author: eliot Date: 2010-07-13 18:10:33 -0700 (Tue, 13 Jul 2010) New Revision: 2234 Removed: branches/Cog/platforms/win32/plugins/SqueakFFIPrims/ Modified: branches/Cog/image/VMMaker-Squeak4.1.changes branches/Cog/image/VMMaker-Squeak4.1.image branches/Cog/macbuild/SqueakFFIPrims/SqueakFFI.xcodeproj/project.pbxproj branches/Cog/platforms/Cross/plugins/SqueakFFIPrims/sqFFITestFuncs.c branches/Cog/platforms/unix/plugins/SqueakFFIPrims/Makefile branches/Cog/platforms/unix/plugins/SqueakFFIPrims/Makefile.in branches/Cog/src/plugins/Matrix2x3Plugin/Matrix2x3Plugin.c branches/Cog/src/plugins/SqueakFFIPrims/SqueakFFIPrims.c Log: OSCogVM source as per VMMaker-oscog.21. Fix struct return, indexing return type spec corrrectly and not being confused between the struct return size and whether return is via registers or not. Include the FFI test funcs in the plugin. Backwards-compatibility access to ffi error code. Modified: branches/Cog/image/VMMaker-Squeak4.1.changes =================================================================== --- branches/Cog/image/VMMaker-Squeak4.1.changes 2010-07-13 00:58:24 UTC (rev 2233) +++ branches/Cog/image/VMMaker-Squeak4.1.changes 2010-07-14 01:10:33 UTC (rev 2234) @@ -120192,4 +120192,486 @@ platformDir: (FileDirectory default / '../platforms') fullName excluding: (InterpreterPlugin withAllSubclasses collect: [:ea| ea name])! -----QUIT----{11 July 2010 . 9:11:50 am} VMMaker-Squeak4.1.image priorSource: 4882544! \ No newline at end of file +----QUIT----{11 July 2010 . 9:11:50 am} VMMaker-Squeak4.1.image priorSource: 4882544! + +----STARTUP----{13 July 2010 . 10:02:40 am} as /Users/eliot/Cog/oscog/Cog.squeakvm.org/image/VMMaker-Squeak4.1.image! + + +----QUIT/NOSAVE----{13 July 2010 . 10:03:01 am} VMMaker-Squeak4.1.image priorSource: 4893204! + +----STARTUP----{13 July 2010 . 10:03:58 am} as /Users/eliot/Cog/oscog/Cog.squeakvm.org/image/VMMaker-Squeak4.1.image! + + +----QUIT/NOSAVE----{13 July 2010 . 11:06:14 am} VMMaker-Squeak4.1.image priorSource: 4893204! + +----STARTUP----{13 July 2010 . 5:34:17 pm} as /Users/eliot/Cog/oscog/Cog.squeakvm.org/image/VMMaker-Squeak4.1.image! + +!ReentrantFFIPlugin methodsFor: 'callout support' stamp: 'eem 7/13/2010 16:04' prior: 38422979! +ffiCall: externalFunction ArgArrayOrNil: argArrayOrNil NumArgs: nArgs + "Generic callout. Does the actual work. If argArrayOrNil is nil it takes args from the stack + and the spec from the method. If argArrayOrNil is not nil takes args from argArrayOrNil + and the spec from the receiver." + | flags argTypeArray address argType oop argSpec argClass err theCalloutState calloutState requiredStackSize stackSize allocation result | + <inline: true> + <var: #theCalloutState type: #'CalloutState'> + <var: #calloutState type: #'CalloutState *'> + <var: #allocation type: #'char *'> + + (interpreterProxy is: externalFunction KindOfClass: interpreterProxy classExternalFunction) ifFalse: + [^self ffiFail: FFIErrorNotFunction]. + "Load and check the values in the externalFunction before we call out" + flags := interpreterProxy fetchInteger: ExternalFunctionFlagsIndex ofObject: externalFunction. + interpreterProxy failed ifTrue: + [^self ffiFail: FFIErrorBadArgs]. + argTypeArray := interpreterProxy fetchPointer: ExternalFunctionArgTypesIndex ofObject: externalFunction. + "must be array of arg types" + ((interpreterProxy isArray: argTypeArray) + and: [(interpreterProxy slotSizeOf: argTypeArray) = (nArgs + 1)]) ifFalse: + [^self ffiFail: FFIErrorBadArgs]. + "check if the calling convention is supported" + (self ffiSupportsCallingConvention: flags) ifFalse: + [^self ffiFail: FFIErrorCallType]. + + address := self ffiLoadCalloutAddress: externalFunction. + interpreterProxy failed ifTrue: + [^0 "error code already set by ffiLoadCalloutAddress:"]. + requiredStackSize := self externalFunctionHasStackSizeSlot + ifTrue: [interpreterProxy fetchInteger: ExternalFunctionStackSizeIndex ofObject: externalFunction] + ifFalse: [-1]. + interpreterProxy failed ifTrue: + [^interpreterProxy primitiveFailFor: (argArrayOrNil isNil + ifTrue: [PrimErrBadMethod] + ifFalse: [PrimErrBadReceiver])]. + stackSize := requiredStackSize < 0 ifTrue: [DefaultMaxStackSize] ifFalse: [requiredStackSize]. + self cCode: [] inSmalltalk: [theCalloutState := self class calloutStateClass new]. + calloutState := self addressOf: theCalloutState. + self cCode: [self me: calloutState ms: 0 et: (self sizeof: #CalloutState asSymbol)]. + calloutState callFlags: flags. + "Fetch return type and args" + argType := interpreterProxy fetchPointer: 0 ofObject: argTypeArray. + argSpec := interpreterProxy fetchPointer: 0 ofObject: argType. + argClass := interpreterProxy fetchPointer: 1 ofObject: argType. + (err := self ffiCheckReturn: argSpec With: argClass in: calloutState) ~= 0 ifTrue: + [^self ffiFail: err]. "cannot return" + "alloca the outgoing stack frame, leaving room for register args while marshalling, and including space for the return struct, if any." + allocation := self alloca: stackSize + calloutState structReturnSize + self registerArgsSlop + self cStackAlignment. + self allocaLiesSoUseGetsp ifTrue: + [allocation := self getsp]. + self cStackAlignment ~= 0 ifTrue: + [allocation := self cCoerce: (allocation asUnsignedInteger bitAnd: (self cStackAlignment - 1) bitInvert32) + to: #'char *']. + calloutState + argVector: allocation; + currentArg: allocation + self registerArgsSlop; + limit: allocation + stackSize + self registerArgsSlop. + (calloutState structReturnSize > 0 + and: [self nonRegisterStructReturnIsViaImplicitFirstArgument + and: [(self returnStructInRegisters: calloutState structReturnSize) not]]) ifTrue: + [self ffiPushPointer: calloutState limit in: calloutState]. + 1 to: nArgs do: + [:i| + argType := interpreterProxy fetchPointer: i ofObject: argTypeArray. + argSpec := interpreterProxy fetchPointer: 0 ofObject: argType. + argClass := interpreterProxy fetchPointer: 1 ofObject: argType. + oop := argArrayOrNil isNil + ifTrue: [interpreterProxy stackValue: nArgs - i] + ifFalse: [interpreterProxy fetchPointer: i - 1 ofObject: argArrayOrNil]. + err := self ffiArgument: oop Spec: argSpec Class: argClass in: calloutState. + err ~= 0 ifTrue: + [self cleanupCalloutState: calloutState. + ^self ffiFail: err]]. "coercion failed or out of stack space" + "Failures must be reported back from ffiArgument:Spec:Class:in:. + Should not fail form here on in." + self assert: interpreterProxy failed not. + self ffiLogCallout: externalFunction. + (requiredStackSize < 0 + and: [self externalFunctionHasStackSizeSlot]) ifTrue: + [stackSize := calloutState currentArg - calloutState argVector. + interpreterProxy storeInteger: ExternalFunctionStackSizeIndex ofObject: externalFunction withValue: stackSize]. + "Go out and call this guy" + result := self ffiCalloutTo: address SpecOnStack: argArrayOrNil notNil in: calloutState. + self cleanupCalloutState: calloutState. + ^result! ! +!ReentrantFFIPlugin methodsFor: 'callout support' stamp: 'eem 7/13/2010 15:43' prior: 38358920! +ffiCheckReturn: retSpec With: retClass in: calloutState + <var: #calloutState type: #'CalloutState *'> + "Make sure we can return an object of the given type" + <inline: true> + | ffiRetSpec | + retClass == interpreterProxy nilObject ifFalse:[ + (interpreterProxy includesBehavior: retClass + ThatOf: interpreterProxy classExternalStructure) + ifFalse:[^FFIErrorBadReturn]]. + + (interpreterProxy isWords: retSpec) + ifFalse:[^FFIErrorWrongType]. + (interpreterProxy slotSizeOf: retSpec) = 0 ifTrue:[^FFIErrorWrongType]. + ffiRetSpec := self cCoerce: (interpreterProxy firstIndexableField: retSpec) to: #int. + calloutState ffiRetHeader: (interpreterProxy longAt: ffiRetSpec). + (self isAtomicType: calloutState ffiRetHeader) ifFalse:[ + (retClass == interpreterProxy nilObject) + ifTrue:[^FFIErrorBadReturn]]. + (calloutState ffiRetHeader bitAnd: (FFIFlagPointer bitOr: FFIFlagStructure)) = FFIFlagStructure ifTrue: + [calloutState structReturnSize: (calloutState ffiRetHeader bitAnd: FFIStructSizeMask)]. + ^0! ! +!ReentrantFFIPlugin methodsFor: 'callout support' stamp: 'eem 7/13/2010 14:32' prior: 38362426! +ffiFail: reason + <inline: false> + "Map the FFI error code into a primitive error code. If reason is negative it encodes one of the + standard PrimErr... codes, negated to distinguish it from the FFIError codes. If it is an FFIError... + code then add the size of the primitive error table + 2 to disambiguate it from the PrimErr... codes. + For historic reasons the FFIError codes range from -1 on up hence adding size + 2 maps them to + size of table + 1 on up. This OFFSET IS undone by ExternalFunction class>>externalCallFailedWith:. + Thus we can communicate back both PrimErr.. and FFIError codes. Complex but necessary." + ffiLastError := reason. + ^interpreterProxy primitiveFailFor: + (reason >= FFINoCalloutAvailable + ifTrue: [reason + 2 + (interpreterProxy slotSizeOf: interpreterProxy primitiveErrorTable)] + ifFalse: [reason negated])! ! +!ReentrantFFIPlugin methodsFor: 'primitives' stamp: 'eem 7/10/2010 21:27' prior: 38382066! +primitiveFFIAllocate + "Primitive. Allocate an object on the external heap." + | byteSize addr oop ptr | + <export: true> + <inline: false> + <var: #ptr type:'int *'> + byteSize := interpreterProxy stackIntegerValue: 0. + interpreterProxy failed ifTrue:[^nil]. + addr := self ffiAlloc: byteSize. + addr = 0 ifTrue:[^interpreterProxy primitiveFail]. + oop := interpreterProxy + instantiateClass: interpreterProxy classExternalAddress + indexableSize: 4. + ptr := interpreterProxy firstIndexableField: oop. + ptr at: 0 put: addr. + interpreterProxy pop: 2 thenPush: oop! ! +!ReentrantFFIPlugin methodsFor: 'primitives' stamp: 'eem 7/10/2010 21:27' prior: 38383471! +primitiveFFIDoubleAtPut + "Return a (signed or unsigned) n byte integer from the given byte offset." + | byteOffset rcvr addr floatValue floatOop | + <export: true> + <inline: false> + <var: #floatValue type:'double '> + floatOop := interpreterProxy stackValue: 0. + (interpreterProxy isIntegerObject: floatOop) + ifTrue:[floatValue := self cCoerce: (interpreterProxy integerValueOf: floatOop) to:'double'] + ifFalse:[floatValue := self cCoerce: (interpreterProxy floatValueOf: floatOop) to:'double']. + byteOffset := interpreterProxy stackIntegerValue: 1. + rcvr := interpreterProxy stackObjectValue: 2. + interpreterProxy failed ifTrue:[^0]. + addr := self ffiAddressOf: rcvr startingAt: byteOffset size: 8. + interpreterProxy failed ifTrue:[^0]. + self cCode:'((int*)addr)[0] = ((int*)(&floatValue))[0]'. + self cCode:'((int*)addr)[1] = ((int*)(&floatValue))[1]'. + interpreterProxy pop: 3 thenPush: floatOop! ! +!ReentrantFFIPlugin methodsFor: 'primitives' stamp: 'eem 7/10/2010 21:27' prior: 38385151! +primitiveFFIFloatAtPut + "Return a (signed or unsigned) n byte integer from the given byte offset." + | byteOffset rcvr addr floatValue floatOop | + <export: true> + <inline: false> + <var: #floatValue type:'float '> + floatOop := interpreterProxy stackValue: 0. + (interpreterProxy isIntegerObject: floatOop) + ifTrue:[floatValue := self cCoerce: (interpreterProxy integerValueOf: floatOop) to:'float'] + ifFalse:[floatValue := self cCoerce: (interpreterProxy floatValueOf: floatOop) to:'float']. + byteOffset := interpreterProxy stackIntegerValue: 1. + rcvr := interpreterProxy stackObjectValue: 2. + interpreterProxy failed ifTrue:[^0]. + addr := self ffiAddressOf: rcvr startingAt: byteOffset size: 4. + interpreterProxy failed ifTrue:[^0]. + self cCode:'((int*)addr)[0] = ((int*)(&floatValue))[0]'. + interpreterProxy pop: 3 thenPush: floatOop! ! +!ReentrantFFIPlugin methodsFor: 'primitives' stamp: 'eem 7/13/2010 14:36' prior: 38386896! +primitiveFFIGetLastError + "Primitive. Return the error code from a failed call to the foreign function interface. + This is for backwards-compatibility. Thread-safe access to the error code is via the + primitive error code." + <export: true> + <inline: false> + interpreterProxy pop: 1. + ^interpreterProxy pushInteger: ffiLastError! ! +!ReentrantFFIPlugin methodsFor: 'primitives' stamp: 'eem 7/10/2010 21:28' prior: 38387286! +primitiveFFIIntegerAt + "Return a (signed or unsigned) n byte integer from the given byte offset." + | isSigned byteSize byteOffset rcvr addr value mask | + <export: true> + <inline: false> + isSigned := interpreterProxy booleanValueOf: (interpreterProxy stackValue: 0). + byteSize := interpreterProxy stackIntegerValue: 1. + byteOffset := interpreterProxy stackIntegerValue: 2. + rcvr := interpreterProxy stackObjectValue: 3. + interpreterProxy failed ifTrue:[^0]. + (byteOffset > 0 and:[byteSize = 1 or:[byteSize = 2 or:[byteSize = 4]]]) + ifFalse:[^interpreterProxy primitiveFail]. + addr := self ffiAddressOf: rcvr startingAt: byteOffset size: byteSize. + interpreterProxy failed ifTrue:[^0]. + byteSize < 4 ifTrue:[ + "short/byte" + byteSize = 1 + ifTrue:[value := interpreterProxy byteAt: addr] + ifFalse:[ value := self cCode: '*((short int *) addr)' + inSmalltalk: [interpreterProxy shortAt: addr]]. + isSigned ifTrue:["sign extend value" + mask := 1 << (byteSize * 8 - 1). + value := (value bitAnd: mask-1) - (value bitAnd: mask)]. + "note: byte/short never exceed SmallInteger range" + value := interpreterProxy integerObjectOf: value. + ] ifFalse:[ + "general 32 bit integer" + value := interpreterProxy longAt: addr. + value := isSigned + ifTrue:[interpreterProxy signed32BitIntegerFor: value] + ifFalse:[interpreterProxy positive32BitIntegerFor: value]. + ]. + interpreterProxy pop: 4 thenPush: value! ! +!ReentrantFFIPlugin methodsFor: 'primitives' stamp: 'eem 7/10/2010 21:28' prior: 38388824! +primitiveFFIIntegerAtPut + "Store a (signed or unsigned) n byte integer at the given byte offset." + | isSigned byteSize byteOffset rcvr addr value max valueOop | + <export: true> + <inline: false> + isSigned := interpreterProxy booleanValueOf: (interpreterProxy stackValue: 0). + byteSize := interpreterProxy stackIntegerValue: 1. + valueOop := interpreterProxy stackValue: 2. + byteOffset := interpreterProxy stackIntegerValue: 3. + rcvr := interpreterProxy stackObjectValue: 4. + interpreterProxy failed ifTrue:[^0]. + (byteOffset > 0 and:[byteSize = 1 or:[byteSize = 2 or:[byteSize = 4]]]) + ifFalse:[^interpreterProxy primitiveFail]. + addr := self ffiAddressOf: rcvr startingAt: byteOffset size: byteSize. + interpreterProxy failed ifTrue:[^0]. + isSigned + ifTrue:[value := interpreterProxy signed32BitValueOf: valueOop] + ifFalse:[value := interpreterProxy positive32BitValueOf: valueOop]. + interpreterProxy failed ifTrue:[^0]. + byteSize < 4 ifTrue:[ + isSigned ifTrue:[ + max := 1 << (8 * byteSize - 1). + value >= max ifTrue:[^interpreterProxy primitiveFail]. + value < (0 - max) ifTrue:[^interpreterProxy primitiveFail]. + ] ifFalse:[ + value >= (1 << (8*byteSize)) ifTrue:[^interpreterProxy primitiveFail]. + ]. + "short/byte" + byteSize = 1 + ifTrue:[interpreterProxy byteAt: addr put: value] + ifFalse:[ self cCode: '*((short int *) addr) = value' + inSmalltalk: [interpreterProxy shortAt: addr put: value]]. + ] ifFalse:[interpreterProxy longAt: addr put: value]. + interpreterProxy pop: 5 thenPush: valueOop! ! +!ReentrantIA32FFIPlugin methodsFor: 'callout support' stamp: 'eem 7/13/2010 15:15' prior: 38405543! +ffiReturnStruct: longLongRet ofType: ffiRetType in: calloutState + <var: #longLongRet type: #usqLong> + <var: #calloutState type: #'CalloutState *'> + "Create a structure return value from an external function call. The value as been stored in + alloca'ed space pointed to by the calloutState." + | retOop retClass oop | + <inline: true> + retClass := interpreterProxy fetchPointer: 1 ofObject: ffiRetType. + retOop := interpreterProxy instantiateClass: retClass indexableSize: 0. + interpreterProxy pushRemappableOop: retOop. + oop := interpreterProxy + instantiateClass: interpreterProxy classByteArray + indexableSize: calloutState structReturnSize. + (self returnStructInRegisters: calloutState structReturnSize) + ifTrue: + [self mem: (interpreterProxy firstIndexableField: oop) cp: (self addressOf: longLongRet) y: calloutState structReturnSize] + ifFalse: + [self mem: (interpreterProxy firstIndexableField: oop) cp: calloutState limit y: calloutState structReturnSize]. + retOop := interpreterProxy popRemappableOop. + interpreterProxy storePointer: 0 ofObject: retOop withValue: oop. + ^interpreterProxy methodReturnValue: retOop! ! +!Matrix2x3Plugin methodsFor: 'private' stamp: 'eem 7/10/2010 21:38' prior: 36384095! +roundAndStoreResultPoint: nItemsToPop + "Store the result of a previous operation. + Fail if we cannot represent the result as SmallInteger" + m23ResultX := m23ResultX + 0.5. + m23ResultY := m23ResultY + 0.5. + (self okayIntValue: m23ResultX) ifFalse:[^interpreterProxy primitiveFail]. + (self okayIntValue: m23ResultY) ifFalse:[^interpreterProxy primitiveFail]. + interpreterProxy pop: nItemsToPop thenPush: + (interpreterProxy makePointwithxValue: m23ResultX asInteger + yValue: m23ResultY asInteger)! ! +!Matrix2x3Plugin methodsFor: 'primitives' stamp: 'eem 7/10/2010 21:37' prior: 38210188! +primitiveComposeMatrix + <export: true> + | m1 m2 m3 result | + <inline: false> + <var: #m1 type: #'float *'> + <var: #m2 type: #'float *'> + <var: #m3 type: #'float *'> + self cCode: '' "Make this fail in simulation" + inSmalltalk: [interpreterProxy success: false. ^ nil]. + m3 := self loadArgumentMatrix: (result := interpreterProxy stackObjectValue: 0). + m2 := self loadArgumentMatrix: (interpreterProxy stackObjectValue: 1). + m1 := self loadArgumentMatrix: (interpreterProxy stackObjectValue: 2). + interpreterProxy failed ifTrue:[^nil]. + self matrix2x3ComposeMatrix: m1 with: m2 into: m3. + interpreterProxy pop: 3 thenPush: result! ! +!Matrix2x3Plugin methodsFor: 'primitives' stamp: 'eem 7/10/2010 21:37' prior: 36389583! +primitiveInvertRectInto + | matrix srcOop dstOop originX originY cornerX cornerY minX maxX minY maxY | + <export: true> + <inline: false> + <var: #matrix type:'float *'> + <var: #originX type:'double '> + <var: #originY type:'double '> + <var: #cornerX type:'double '> + <var: #cornerY type:'double '> + <var: #minX type:'double '> + <var: #maxX type:'double '> + <var: #minY type:'double '> + <var: #maxY type:'double '> + + dstOop := interpreterProxy stackObjectValue: 0. + srcOop := interpreterProxy stackObjectValue: 1. + matrix := self loadArgumentMatrix: (interpreterProxy stackObjectValue: 2). + interpreterProxy failed ifTrue:[^nil]. + + (interpreterProxy fetchClassOf: srcOop) = (interpreterProxy fetchClassOf: dstOop) + ifFalse:[^interpreterProxy primitiveFail]. + (interpreterProxy isPointers: srcOop) + ifFalse:[^interpreterProxy primitiveFail]. + (interpreterProxy slotSizeOf: srcOop) = 2 + ifFalse:[^interpreterProxy primitiveFail]. + + "Load top-left point" + self loadArgumentPoint: (interpreterProxy fetchPointer: 0 ofObject: srcOop). + interpreterProxy failed ifTrue:[^nil]. + originX := m23ArgX. + originY := m23ArgY. + self matrix2x3InvertPoint: matrix. + minX := maxX := m23ResultX. + minY := maxY := m23ResultY. + + "Load bottom-right point" + self loadArgumentPoint:(interpreterProxy fetchPointer: 1 ofObject: srcOop). + interpreterProxy failed ifTrue:[^nil]. + cornerX := m23ArgX. + cornerY := m23ArgY. + self matrix2x3InvertPoint: matrix. + minX := minX min: m23ResultX. + maxX := maxX max: m23ResultX. + minY := minY min: m23ResultY. + maxY := maxY max: m23ResultY. + + "Load top-right point" + m23ArgX := cornerX. + m23ArgY := originY. + self matrix2x3InvertPoint: matrix. + minX := minX min: m23ResultX. + maxX := maxX max: m23ResultX. + minY := minY min: m23ResultY. + maxY := maxY max: m23ResultY. + + "Load bottom-left point" + m23ArgX := originX. + m23ArgY := cornerY. + self matrix2x3InvertPoint: matrix. + minX := minX min: m23ResultX. + maxX := maxX max: m23ResultX. + minY := minY min: m23ResultY. + maxY := maxY max: m23ResultY. + + interpreterProxy failed ifFalse:[ + dstOop := self roundAndStoreResultRect: dstOop x0: minX y0: minY x1: maxX y1: maxY]. + interpreterProxy failed ifFalse:[ + interpreterProxy pop: 3 thenPush: dstOop + ]! ! +!Matrix2x3Plugin methodsFor: 'primitives' stamp: 'eem 7/10/2010 21:37' prior: 36393650! +primitiveTransformRectInto + | matrix srcOop dstOop originX originY cornerX cornerY minX maxX minY maxY | + <export: true> + <inline: false> + <var: #matrix type:'float *'> + <var: #originX type:'double '> + <var: #originY type:'double '> + <var: #cornerX type:'double '> + <var: #cornerY type:'double '> + <var: #minX type:'double '> + <var: #maxX type:'double '> + <var: #minY type:'double '> + <var: #maxY type:'double '> + + dstOop := interpreterProxy stackObjectValue: 0. + srcOop := interpreterProxy stackObjectValue: 1. + matrix := self loadArgumentMatrix: (interpreterProxy stackObjectValue: 2). + interpreterProxy failed ifTrue:[^nil]. + + (interpreterProxy fetchClassOf: srcOop) = (interpreterProxy fetchClassOf: dstOop) + ifFalse:[^interpreterProxy primitiveFail]. + (interpreterProxy isPointers: srcOop) + ifFalse:[^interpreterProxy primitiveFail]. + (interpreterProxy slotSizeOf: srcOop) = 2 + ifFalse:[^interpreterProxy primitiveFail]. + + "Load top-left point" + self loadArgumentPoint: (interpreterProxy fetchPointer: 0 ofObject: srcOop). + interpreterProxy failed ifTrue:[^nil]. + originX := m23ArgX. + originY := m23ArgY. + self matrix2x3TransformPoint: matrix. + minX := maxX := m23ResultX. + minY := maxY := m23ResultY. + + "Load bottom-right point" + self loadArgumentPoint:(interpreterProxy fetchPointer: 1 ofObject: srcOop). + interpreterProxy failed ifTrue:[^nil]. + cornerX := m23ArgX. + cornerY := m23ArgY. + self matrix2x3TransformPoint: matrix. + minX := minX min: m23ResultX. + maxX := maxX max: m23ResultX. + minY := minY min: m23ResultY. + maxY := maxY max: m23ResultY. + + "Load top-right point" + m23ArgX := cornerX. + m23ArgY := originY. + self matrix2x3TransformPoint: matrix. + minX := minX min: m23ResultX. + maxX := maxX max: m23ResultX. + minY := minY min: m23ResultY. + maxY := maxY max: m23ResultY. + + "Load bottom-left point" + m23ArgX := originX. + m23ArgY := cornerY. + self matrix2x3TransformPoint: matrix. + minX := minX min: m23ResultX. + maxX := maxX max: m23ResultX. + minY := minY min: m23ResultY. + maxY := maxY max: m23ResultY. + + dstOop := self roundAndStoreResultRect: dstOop x0: minX y0: minY x1: maxX y1: maxY. + interpreterProxy failed ifFalse:[ + interpreterProxy pop: 3 thenPush: dstOop + ]! ! + +| user pw | +Utilities setAuthorInitials. +user := UIManager default request: 'Unix user name'. +pw := UIManager default requestPassword: 'Monticello password'. +MCHttpRepository allSubInstancesDo: [ : rep | + rep user: user; + password: pw ]! + +"VMMaker"! + +| user pw | +Utilities setAuthorInitials. +user := UIManager default request: 'Unix user name'. +pw := UIManager default requestPassword: 'Monticello password'. +MCHttpRepository allSubInstancesDo: [ : rep | + rep user: user; + password: pw ]! + +VMMaker + generate: CoInterpreter + to: (FileDirectory default / '../src') fullName + platformDir: (FileDirectory default / '../platforms') fullName + excluding:#(BrokenPlugin IA32ABIPluginSimulator SlangTestPlugin TestOSAPlugin + FFIPlugin ReentrantARMFFIPlugin ReentrantFFIPlugin ReentrantPPCBEFFIPlugin)! + +----QUIT----{13 July 2010 . 5:53:45 pm} VMMaker-Squeak4.1.image priorSource: 4893204! \ No newline at end of file Modified: branches/Cog/image/VMMaker-Squeak4.1.image =================================================================== (Binary files differ) Modified: branches/Cog/macbuild/SqueakFFIPrims/SqueakFFI.xcodeproj/project.pbxproj =================================================================== --- branches/Cog/macbuild/SqueakFFIPrims/SqueakFFI.xcodeproj/project.pbxproj 2010-07-13 00:58:24 UTC (rev 2233) +++ branches/Cog/macbuild/SqueakFFIPrims/SqueakFFI.xcodeproj/project.pbxproj 2010-07-14 01:10:33 UTC (rev 2234) @@ -11,6 +11,7 @@ 730BD72610AA25350023C110 /* SqueakFFIPrims.c in Sources */ = {isa = PBXBuildFile; fileRef = 730BD72510AA25350023C110 /* SqueakFFIPrims.c */; }; 730BD72810AA26D00023C110 /* sqFFIPlugin.c in Sources */ = {isa = PBXBuildFile; fileRef = 730BD72710AA26D00023C110 /* sqFFIPlugin.c */; }; 730BD73110AA277B0023C110 /* SqueakPlugin.icns in Resources */ = {isa = PBXBuildFile; fileRef = 730BD73010AA277B0023C110 /* SqueakPlugin.icns */; }; + 7386749111ED15E500E5B738 /* sqFFITestFuncs.c in Sources */ = {isa = PBXBuildFile; fileRef = 7386749011ED15E500E5B738 /* sqFFITestFuncs.c */; }; 8D576314048677EA00EA77CD /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0AA1909FFE8422F4C02AAC07 /* CoreFoundation.framework */; }; /* End PBXBuildFile section */ @@ -25,6 +26,7 @@ 730BD72F10AA27590023C110 /* sqVirtualMachine.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = sqVirtualMachine.h; path = ../../platforms/Cross/vm/sqVirtualMachine.h; sourceTree = SOURCE_ROOT; }; 730BD73010AA277B0023C110 /* SqueakPlugin.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; name = SqueakPlugin.icns; path = ../resources/ProjectBuilder/SqueakPlugin.icns; sourceTree = SOURCE_ROOT; }; 733EFEAC10B4D31C00A2FDA5 /* sqFFI.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; name = sqFFI.h; path = ../../platforms/Cross/plugins/SqueakFFIPrims/sqFFI.h; sourceTree = SOURCE_ROOT; }; + 7386749011ED15E500E5B738 /* sqFFITestFuncs.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = sqFFITestFuncs.c; path = ../../platforms/Cross/plugins/SqueakFFIPrims/sqFFITestFuncs.c; sourceTree = SOURCE_ROOT; }; 739A636B10AA442600F87ADB /* sqConfig.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = sqConfig.h; path = "../../platforms/Mac OS/vm/sqConfig.h"; sourceTree = SOURCE_ROOT; }; 739A636C10AA444800F87ADB /* sqPlatformSpecific.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = sqPlatformSpecific.h; path = "../../platforms/Mac OS/vm/sqPlatformSpecific.h"; sourceTree = SOURCE_ROOT; }; 739BEEE011C96C240093BD8A /* sq.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = sq.h; path = ../../platforms/Cross/vm/sq.h; sourceTree = SOURCE_ROOT; }; @@ -76,6 +78,7 @@ 08FB77AFFE84173DC02AAC07 /* Source */ = { isa = PBXGroup; children = ( + 7386749011ED15E500E5B738 /* sqFFITestFuncs.c */, 739BEEE011C96C240093BD8A /* sq.h */, 733EFEAC10B4D31C00A2FDA5 /* sqFFI.h */, 73E2C0B310AA5C4700E80856 /* sqAssert.h */, @@ -157,6 +160,7 @@ 730BD72610AA25350023C110 /* SqueakFFIPrims.c in Sources */, 730BD72810AA26D00023C110 /* sqFFIPlugin.c in Sources */, 458E6DD111C6D5850024C822 /* sqManualSurface.c in Sources */, + 7386749111ED15E500E5B738 /* sqFFITestFuncs.c in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; Modified: branches/Cog/platforms/Cross/plugins/SqueakFFIPrims/sqFFITestFuncs.c =================================================================== --- branches/Cog/platforms/Cross/plugins/SqueakFFIPrims/sqFFITestFuncs.c 2010-07-13 00:58:24 UTC (rev 2233) +++ branches/Cog/platforms/Cross/plugins/SqueakFFIPrims/sqFFITestFuncs.c 2010-07-14 01:10:33 UTC (rev 2234) @@ -6,6 +6,10 @@ /*****************************************************************************/ /*****************************************************************************/ #ifndef NO_FFI_TEST +# include "sq.h" + +# define LONGLONG sqLong /* should be 64 bits */ + typedef struct ffiTestPoint2 { int x; int y; @@ -45,19 +49,19 @@ /* test passing characters */ EXPORT(char) ffiTestChars(char c1, char c2, char c3, char c4) { printf("4 characters came in as\nc1 = %c (%x)\nc2 = %c (%x)\nc3 = %c (%x)\nc4 = %c (%x)\n", c1, c1, c2, c2, c3, c3, c4, c4); - return 'C'; + return c1+c2; } /* test passing shorts */ EXPORT(short) ffiTestShorts(short c1, short c2, short c3, short c4) { printf("4 shorts came in as\ns1 = %d (%x)\ns2 = %d (%x)\ns3 = %d (%x)\ns4 = %d (%x)\n", c1, c1, c2, c2, c3, c3, c4, c4); - return -42; + return c1+c2; } /* test passing ints */ EXPORT(int) ffiTestInts(int c1, int c2, int c3, int c4) { printf("4 ints came in as\ni1 = %d (%x)\ni2 = %d (%x)\ni3 = %d (%x)\ni4 = %d (%x)\n", c1, c1, c2, c2, c3, c3, c4, c4); - return 42; + return c1+c2; } EXPORT(int) ffiTestInts8(int c1, int c2, int c3, int c4, int c5, int c6, int c7, int c8) { Modified: branches/Cog/platforms/unix/plugins/SqueakFFIPrims/Makefile =================================================================== --- branches/Cog/platforms/unix/plugins/SqueakFFIPrims/Makefile 2010-07-13 00:58:24 UTC (rev 2233) +++ branches/Cog/platforms/unix/plugins/SqueakFFIPrims/Makefile 2010-07-14 01:10:33 UTC (rev 2234) @@ -9,7 +9,7 @@ TARGET= SqueakFFIPrims$a -OBJS= SqueakFFIPrims$o sqFFIPlugin$o sqManualSurface$o +OBJS= SqueakFFIPrims$o sqFFIPlugin$o sqManualSurface$o sqFFITestFuncs$o XINCLUDES= [includes] Modified: branches/Cog/platforms/unix/plugins/SqueakFFIPrims/Makefile.in =================================================================== --- branches/Cog/platforms/unix/plugins/SqueakFFIPrims/Makefile.in 2010-07-13 00:58:24 UTC (rev 2233) +++ branches/Cog/platforms/unix/plugins/SqueakFFIPrims/Makefile.in 2010-07-14 01:10:33 UTC (rev 2234) @@ -9,7 +9,7 @@ TARGET= SqueakFFIPrims$a -OBJS= SqueakFFIPrims$o sqFFIPlugin$o sqManualSurface$o +OBJS= SqueakFFIPrims$o sqFFIPlugin$o sqManualSurface$o sqFFITestFuncs$o XINCLUDES= [includes] Modified: branches/Cog/src/plugins/Matrix2x3Plugin/Matrix2x3Plugin.c =================================================================== --- branches/Cog/src/plugins/Matrix2x3Plugin/Matrix2x3Plugin.c 2010-07-13 00:58:24 UTC (rev 2233) +++ branches/Cog/src/plugins/Matrix2x3Plugin/Matrix2x3Plugin.c 2010-07-14 01:10:33 UTC (rev 2234) @@ -1,9 +1,9 @@ /* Automatically generated by - VMPluginCodeGenerator VMMaker-oscog.8 uuid: b336429e-652e-4551-8d38-a00ef67eaa61 + VMPluginCodeGenerator VMMaker-oscog.21 uuid: f46d3ba4-c310-454b-9be7-30c6341f4486 from - Matrix2x3Plugin VMMaker-oscog.8 uuid: b336429e-652e-4551-8d38-a00ef67eaa61 + Matrix2x3Plugin VMMaker-oscog.21 uuid: f46d3ba4-c310-454b-9be7-30c6341f4486 */ -static char __buildInfo[] = "Matrix2x3Plugin VMMaker-oscog.8 uuid: b336429e-652e-4551-8d38-a00ef67eaa61 " __DATE__ ; +static char __buildInfo[] = "Matrix2x3Plugin VMMaker-oscog.21 uuid: f46d3ba4-c310-454b-9be7-30c6341f4486 " __DATE__ ; @@ -37,7 +37,6 @@ #include "sqMemoryAccess.h" - /*** Constants ***/ @@ -76,9 +75,9 @@ static double m23ResultY; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "Matrix2x3Plugin VMMaker-oscog.8 (i)" + "Matrix2x3Plugin VMMaker-oscog.21 (i)" #else - "Matrix2x3Plugin VMMaker-oscog.8 (e)" + "Matrix2x3Plugin VMMaker-oscog.21 (e)" #endif ; @@ -310,8 +309,7 @@ m3[3] = (((float) a21)); m3[4] = (((float) a22)); m3[5] = (((float) a23)); - interpreterProxy->pop(3); - interpreterProxy->push(result); + interpreterProxy->popthenPush(3, result); } EXPORT(sqInt) @@ -352,8 +350,7 @@ interpreterProxy->primitiveFail(); goto l2; } - interpreterProxy->pop(2); - interpreterProxy->push(interpreterProxy->makePointwithxValueyValue(((sqInt)m23ResultX), ((sqInt)m23ResultY))); + interpreterProxy->popthenPush(2, interpreterProxy->makePointwithxValueyValue(((sqInt)m23ResultX), ((sqInt)m23ResultY))); l2: /* end roundAndStoreResultPoint: */; } } @@ -448,8 +445,7 @@ dstOop = roundAndStoreResultRectx0y0x1y1(dstOop, minX, minY, maxX, maxY); } if (!(interpreterProxy->failed())) { - interpreterProxy->pop(3); - interpreterProxy->push(dstOop); + interpreterProxy->popthenPush(3, dstOop); } } @@ -544,8 +540,7 @@ interpreterProxy->primitiveFail(); goto l2; } - interpreterProxy->pop(2); - interpreterProxy->push(interpreterProxy->makePointwithxValueyValue(((sqInt)m23ResultX), ((sqInt)m23ResultY))); + interpreterProxy->popthenPush(2, interpreterProxy->makePointwithxValueyValue(((sqInt)m23ResultX), ((sqInt)m23ResultY))); l2: /* end roundAndStoreResultPoint: */; } @@ -645,8 +640,7 @@ maxY = ((maxY < m23ResultY) ? m23ResultY : maxY); dstOop = roundAndStoreResultRectx0y0x1y1(dstOop, minX, minY, maxX, maxY); if (!(interpreterProxy->failed())) { - interpreterProxy->pop(3); - interpreterProxy->push(dstOop); + interpreterProxy->popthenPush(3, dstOop); } } @@ -666,8 +660,7 @@ && (m23ResultX <= (((double) 1073741823 ))))) { return interpreterProxy->primitiveFail(); } - interpreterProxy->pop(nItemsToPop); - interpreterProxy->push(interpreterProxy->makePointwithxValueyValue(((sqInt)m23ResultX), ((sqInt)m23ResultY))); + interpreterProxy->popthenPush(nItemsToPop, interpreterProxy->makePointwithxValueyValue(((sqInt)m23ResultX), ((sqInt)m23ResultY))); } Modified: branches/Cog/src/plugins/SqueakFFIPrims/SqueakFFIPrims.c =================================================================== --- branches/Cog/src/plugins/SqueakFFIPrims/SqueakFFIPrims.c 2010-07-13 00:58:24 UTC (rev 2233) +++ branches/Cog/src/plugins/SqueakFFIPrims/SqueakFFIPrims.c 2010-07-14 01:10:33 UTC (rev 2234) @@ -1,9 +1,9 @@ /* Automatically generated by - VMPluginCodeGenerator * VMMaker-oscog.19 uuid: e2e1dd83-f427-4df3-a971-aababe804331 + VMPluginCodeGenerator VMMaker-oscog.21 uuid: f46d3ba4-c310-454b-9be7-30c6341f4486 from - ReentrantIA32FFIPlugin * VMMaker-oscog.19 uuid: e2e1dd83-f427-4df3-a971-aababe804331 + ReentrantIA32FFIPlugin VMMaker-oscog.21 uuid: f46d3ba4-c310-454b-9be7-30c6341f4486 */ -static char __buildInfo[] = "ReentrantIA32FFIPlugin * VMMaker-oscog.19 uuid: e2e1dd83-f427-4df3-a971-aababe804331 " __DATE__ ; +static char __buildInfo[] = "ReentrantIA32FFIPlugin VMMaker-oscog.21 uuid: f46d3ba4-c310-454b-9be7-30c6341f4486 " __DATE__ ; @@ -173,7 +173,6 @@ #define PrimErrBadNumArgs 5 #define PrimErrBadReceiver 2 #define PrimErrNoCMemory 10 -#define PrimErrUnsupported 7 /*** Function Prototypes ***/ @@ -220,7 +219,7 @@ static sqInt ffiPushVoidin(sqInt ignored, CalloutState *calloutState); static sqInt ffiReturnCStringFrom(sqInt cPointer); static sqInt ffiReturnPointerofTypein(usqLong retVal, sqInt retType, CalloutState *calloutState); -static sqInt ffiReturnStructofTypein(usqLong longLongRet, sqInt ffiRetClass, CalloutState *calloutState); +static sqInt ffiReturnStructofTypein(usqLong longLongRet, sqInt ffiRetType, CalloutState *calloutState); static sqInt ffiReturnType(sqInt specOnStack); static sqInt ffiSupportsCallingConvention(sqInt aCallingConvention); static sqInt ffiValidateExternalDataAtomicType(sqInt oop, sqInt atomicType); @@ -253,6 +252,7 @@ /*** Variables ***/ static sqInt externalFunctionInstSize; +static sqInt ffiLastError; static sqInt ffiLogEnabled; #ifdef SQUEAK_BUILTIN_PLUGIN @@ -261,9 +261,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "SqueakFFIPrims * VMMaker-oscog.19 (i)" + "SqueakFFIPrims VMMaker-oscog.21 (i)" #else - "SqueakFFIPrims * VMMaker-oscog.19 (e)" + "SqueakFFIPrims VMMaker-oscog.21 (e)" #endif ; @@ -1107,7 +1107,7 @@ sqInt atomicType1; sqInt classOop; char *cString; - sqInt ffiRetClass; + sqInt ffiRetType; double floatRet; sqInt i; usqLong intRet; @@ -1115,6 +1115,7 @@ sqInt oop1; sqInt *ptr; sqInt retClass; + sqInt retClass1; sqInt retOop; sqInt retOop1; sqInt retType; @@ -1150,8 +1151,8 @@ : interpreterProxy->literalofMethod(0, interpreterProxy->primitiveMethod())); argTypes1 = interpreterProxy->fetchPointerofObject(ExternalFunctionArgTypesIndex, specLiteral1); retType = interpreterProxy->fetchPointerofObject(0, argTypes1); - retClass = interpreterProxy->fetchPointerofObject(1, retType); - if (retClass == (interpreterProxy->nilObject())) { + retClass1 = interpreterProxy->fetchPointerofObject(1, retType); + if (retClass1 == (interpreterProxy->nilObject())) { /* begin atomicTypeOf: */ typeSpec1 = (calloutState->ffiRetHeader); atomicType1 = ((usqInt) (typeSpec1 & FFIAtomicTypeMask)) >> FFIAtomicTypeShift; @@ -1190,7 +1191,7 @@ interpreterProxy->storePointerofObjectwithValue(1, retOop1, oop1); return interpreterProxy->methodReturnValue(retOop1); } - interpreterProxy->pushRemappableOop(retClass); + interpreterProxy->pushRemappableOop(retClass1); if (((calloutState->ffiRetHeader)) & FFIFlagStructure) { classOop = interpreterProxy->classByteArray(); } @@ -1203,9 +1204,9 @@ /* return class */ - retClass = interpreterProxy->popRemappableOop(); + retClass1 = interpreterProxy->popRemappableOop(); interpreterProxy->pushRemappableOop(oop1); - retOop1 = interpreterProxy->instantiateClassindexableSize(retClass, 0); + retOop1 = interpreterProxy->instantiateClassindexableSize(retClass1, 0); /* external address */ @@ -1220,8 +1221,9 @@ ? interpreterProxy->stackValue(1) : interpreterProxy->literalofMethod(0, interpreterProxy->primitiveMethod())); argTypes = interpreterProxy->fetchPointerofObject(ExternalFunctionArgTypesIndex, specLiteral); - ffiRetClass = interpreterProxy->fetchPointerofObject(0, argTypes); - retOop = interpreterProxy->instantiateClassindexableSize(ffiRetClass, 0); + ffiRetType = interpreterProxy->fetchPointerofObject(0, argTypes); + retClass = interpreterProxy->fetchPointerofObject(1, ffiRetType); + retOop = interpreterProxy->instantiateClassindexableSize(retClass, 0); interpreterProxy->pushRemappableOop(retOop); oop = interpreterProxy->instantiateClassindexableSize(interpreterProxy->classByteArray(), (calloutState->structReturnSize)); if (returnStructInRegisters((calloutState->structReturnSize))) { @@ -1265,7 +1267,7 @@ sqInt classOop; char *cString; sqInt err; - sqInt ffiRetClass; + sqInt ffiRetType; sqInt flags; double floatRet; sqInt functionName; @@ -1281,6 +1283,7 @@ sqInt requiredStackSize; sqInt result; sqInt retClass; + sqInt retClass1; sqInt retOop; sqInt retOop1; sqInt retType; @@ -1392,7 +1395,8 @@ (calloutState->currentArg = allocation + 0); (calloutState->limit = (allocation + stackSize) + 0); if ((((calloutState->structReturnSize)) > 0) - && (1)) { + && (1 + && (!(returnStructInRegisters((calloutState->structReturnSize)))))) { /* begin ffiPushPointer:in: */ pointer = (calloutState->limit); if ((((calloutState->currentArg)) + 4) > ((calloutState->limit))) { @@ -1458,8 +1462,8 @@ : interpreterProxy->literalofMethod(0, interpreterProxy->primitiveMethod())); argTypes1 = interpreterProxy->fetchPointerofObject(ExternalFunctionArgTypesIndex, specLiteral1); retType = interpreterProxy->fetchPointerofObject(0, argTypes1); - retClass = interpreterProxy->fetchPointerofObject(1, retType); - if (retClass == (interpreterProxy->nilObject())) { + retClass1 = interpreterProxy->fetchPointerofObject(1, retType); + if (retClass1 == (interpreterProxy->nilObject())) { /* begin atomicTypeOf: */ typeSpec1 = (calloutState->ffiRetHeader); atomicType1 = ((usqInt) (typeSpec1 & FFIAtomicTypeMask)) >> FFIAtomicTypeShift; @@ -1501,7 +1505,7 @@ result = interpreterProxy->methodReturnValue(retOop1); goto l5; } - interpreterProxy->pushRemappableOop(retClass); + interpreterProxy->pushRemappableOop(retClass1); if (((calloutState->ffiRetHeader)) & FFIFlagStructure) { classOop = interpreterProxy->classByteArray(); } @@ -1514,9 +1518,9 @@ /* return class */ - retClass = interpreterProxy->popRemappableOop(); + retClass1 = interpreterProxy->popRemappableOop(); interpreterProxy->pushRemappableOop(oop1); - retOop1 = interpreterProxy->instantiateClassindexableSize(retClass, 0); + retOop1 = interpreterProxy->instantiateClassindexableSize(retClass1, 0); /* external address */ @@ -1532,8 +1536,9 @@ ? interpreterProxy->stackValue(1) : interpreterProxy->literalofMethod(0, interpreterProxy->primitiveMethod())); argTypes = interpreterProxy->fetchPointerofObject(ExternalFunctionArgTypesIndex, specLiteral); - ffiRetClass = interpreterProxy->fetchPointerofObject(0, argTypes); - retOop = interpreterProxy->instantiateClassindexableSize(ffiRetClass, 0); + ffiRetType = interpreterProxy->fetchPointerofObject(0, argTypes); + retClass = interpreterProxy->fetchPointerofObject(1, ffiRetType); + retOop = interpreterProxy->instantiateClassindexableSize(retClass, 0); interpreterProxy->pushRemappableOop(retOop); oop2 = interpreterProxy->instantiateClassindexableSize(interpreterProxy->classByteArray(), (calloutState->structReturnSize)); if (returnStructInRegisters((calloutState->structReturnSize))) { @@ -1567,7 +1572,6 @@ static sqInt ffiCheckReturnWithin(sqInt retSpec, sqInt retClass, CalloutState *calloutState) { sqInt ffiRetSpec; - sqInt returnStructSize; if (!(retClass == (interpreterProxy->nilObject()))) { if (!(interpreterProxy->includesBehaviorThatOf(retClass, interpreterProxy->classExternalStructure()))) { @@ -1587,11 +1591,8 @@ return FFIErrorBadReturn; } } - if ((((calloutState->ffiRetHeader)) & (FFIFlagPointer || FFIFlagStructure)) == FFIFlagStructure) { - returnStructSize = ((calloutState->ffiRetHeader)) & FFIStructSizeMask; - if (!(returnStructInRegisters(returnStructSize))) { - (calloutState->structReturnSize = returnStructSize); - } + if ((((calloutState->ffiRetHeader)) & (FFIFlagPointer | FFIFlagStructure)) == FFIFlagStructure) { + (calloutState->structReturnSize = ((calloutState->ffiRetHeader)) & FFIStructSizeMask); } return 0; } @@ -1679,14 +1680,11 @@ size + 2 maps them to size of table + 1 on up. This OFFSET IS undone by ExternalFunction class>>externalCallFailedWith:. Thus we can communicate back both - PrimErr.. and FFIError codes. Complex but necessary. - Do not record the error code because as yet there is no per-process - mechanism to do this, and since - the error is accessible through the primitive errror code there is no - need. */ + PrimErr.. and FFIError codes. Complex but necessary. */ static sqInt ffiFail(sqInt reason) { + ffiLastError = reason; return interpreterProxy->primitiveFailFor((reason >= FFINoCalloutAvailable ? (reason + 2) + (interpreterProxy->slotSizeOf(interpreterProxy->primitiveErrorTable())) : -reason)); @@ -2480,11 +2478,13 @@ alloca'ed space pointed to by the calloutState. */ static sqInt -ffiReturnStructofTypein(usqLong longLongRet, sqInt ffiRetClass, CalloutState *calloutState) { +ffiReturnStructofTypein(usqLong longLongRet, sqInt ffiRetType, CalloutState *calloutState) { sqInt oop; + sqInt retClass; sqInt retOop; - retOop = interpreterProxy->instantiateClassindexableSize(ffiRetClass, 0); + retClass = interpreterProxy->fetchPointerofObject(1, ffiRetType); + retOop = interpreterProxy->instantiateClassindexableSize(retClass, 0); interpreterProxy->pushRemappableOop(retOop); oop = interpreterProxy->instantiateClassindexableSize(interpreterProxy->classByteArray(), (calloutState->structReturnSize)); if (returnStructInRegisters((calloutState->structReturnSize))) { @@ -2666,7 +2666,7 @@ char *cString; sqInt err; sqInt externalFunction; - sqInt ffiRetClass; + sqInt ffiRetType; sqInt flags; double floatRet; sqInt functionName; @@ -2684,6 +2684,7 @@ sqInt requiredStackSize; sqInt result; sqInt retClass; + sqInt retClass1; sqInt retOop; sqInt retOop1; sqInt retType; @@ -2808,7 +2809,8 @@ (calloutState->currentArg = allocation + 0); (calloutState->limit = (allocation + stackSize) + 0); if ((((calloutState->structReturnSize)) > 0) - && (1)) { + && (1 + && (!(returnStructInRegisters((calloutState->structReturnSize)))))) { /* begin ffiPushPointer:in: */ pointer = (calloutState->limit); if ((((calloutState->currentArg)) + 4) > ((calloutState->limit))) { @@ -2875,8 +2877,8 @@ : interpreterProxy->literalofMethod(0, interpreterProxy->primitiveMethod())); argTypes1 = interpreterProxy->fetchPointerofObject(ExternalFunctionArgTypesIndex, specLiteral1); retType = interpreterProxy->fetchPointerofObject(0, argTypes1); - retClass = interpreterProxy->fetchPointerofObject(1, retType); - if (retClass == (interpreterProxy->nilObject())) { + retClass1 = interpreterProxy->fetchPointerofObject(1, retType); + if (retClass1 == (interpreterProxy->nilObject())) { /* begin atomicTypeOf: */ typeSpec1 = (calloutState->ffiRetHeader); atomicType1 = ((usqInt) (typeSpec1 & FFIAtomicTypeMask)) >> FFIAtomicTypeShift; @@ -2918,7 +2920,7 @@ result = interpreterProxy->methodReturnValue(retOop1); goto l6; } - interpreterProxy->pushRemappableOop(retClass); + interpreterProxy->pushRemappableOop(retClass1); if (((calloutState->ffiRetHeader)) & FFIFlagStructure) { classOop = interpreterProxy->classByteArray(); } @@ -2931,9 +2933,9 @@ /* return class */ - retClass = interpreterProxy->popRemappableOop(); + retClass1 = interpreterProxy->popRemappableOop(); interpreterProxy->pushRemappableOop(oop1); - retOop1 = interpreterProxy->instantiateClassindexableSize(retClass, 0); + retOop1 = interpreterProxy->instantiateClassindexableSize(retClass1, 0); /* external address */ @@ -2949,8 +2951,9 @@ ? interpreterProxy->stackValue(1) : interpreterProxy->literalofMethod(0, interpreterProxy->primitiveMethod())); argTypes = interpreterProxy->fetchPointerofObject(ExternalFunctionArgTypesIndex, specLiteral); - ffiRetClass = interpreterProxy->fetchPointerofObject(0, argTypes); - retOop = interpreterProxy->instantiateClassindexableSize(ffiRetClass, 0); + ffiRetType = interpreterProxy->fetchPointerofObject(0, argTypes); + retClass = interpreterProxy->fetchPointerofObject(1, ffiRetType); + retOop = interpreterProxy->instantiateClassindexableSize(retClass, 0); interpreterProxy->pushRemappableOop(retOop); oop2 = interpreterProxy->instantiateClassindexableSize(interpreterProxy->classByteArray(), (calloutState->structReturnSize)); if (returnStructInRegisters((calloutState->structReturnSize))) { @@ -3003,7 +3006,7 @@ char *cString; sqInt err; sqInt externalFunction; - sqInt ffiRetClass; + sqInt ffiRetType; sqInt flags; double floatRet; sqInt functionName; @@ -3020,6 +3023,7 @@ sqInt requiredStackSize; sqInt result; sqInt retClass; + sqInt retClass1; sqInt retOop; sqInt retOop1; sqInt retType; @@ -3147,7 +3151,8 @@ (calloutState->currentArg = allocation + 0); (calloutState->limit = (allocation + stackSize) + 0); if ((((calloutState->structReturnSize)) > 0) - && (1)) { + && (1 + && (!(returnStructInRegisters((calloutState->structReturnSize)))))) { /* begin ffiPushPointer:in: */ pointer = (calloutState->limit); if ((((calloutState->currentArg)) + 4) > ((calloutState->limit))) { @@ -3214,8 +3219,8 @@ : interpreterProxy->literalofMethod(0, interpreterProxy->primitiveMethod())); argTypes1 = interpreterProxy->fetchPointerofObject(ExternalFunctionArgTypesIndex, specLiteral1); retType = interpreterProxy->fetchPointerofObject(0, argTypes1); - retClass = interpreterProxy->fetchPointerofObject(1, retType); - if (retClass == (interpreterProxy->nilObject())) { + retClass1 = interpreterProxy->fetchPointerofObject(1, retType); + if (retClass1 == (interpreterProxy->nilObject())) { /* begin atomicTypeOf: */ typeSpec1 = (calloutState->ffiRetHeader); atomicType1 = ((usqInt) (typeSpec1 & FFIAtomicTypeMask)) >> FFIAtomicTypeShift; @@ -3257,7 +3262,7 @@ result = interpreterProxy->methodReturnValue(retOop1); goto l6; } - interpreterProxy->pushRemappableOop(retClass); + interpreterProxy->pushRemappableOop(retClass1); if (((calloutState->ffiRetHeader)) & FFIFlagStructure) { classOop = interpreterProxy->classByteArray(); } @@ -3270,9 +3275,9 @@ /* return class */ - retClass = interpreterProxy->popRemappableOop(); + retClass1 = interpreterProxy->popRemappableOop(); interpreterProxy->pushRemappableOop(oop1); - retOop1 = interpreterProxy->instantiateClassindexableSize(retClass, 0); + retOop1 = interpreterProxy->instantiateClassindexableSize(retClass1, 0); /* external address */ @@ -3288,8 +3293,9 @@ ? interpreterProxy->stackValue(1) : interpreterProxy->literalofMethod(0, interpreterProxy->primitiveMethod())); argTypes = interpreterProxy->fetchPointerofObject(ExternalFunctionArgTypesIndex, specLiteral); - ffiRetClass = interpreterProxy->fetchPointerofObject(0, argTypes); - retOop = interpreterProxy->instantiateClassindexableSize(ffiRetClass, 0); + ffiRetType = interpreterProxy->fetchPointerofObject(0, argTypes); + retClass = interpreterProxy->fetchPointerofObject(1, ffiRetType); + retOop = interpreterProxy->instantiateClassindexableSize(retClass, 0); interpreterProxy->pushRemappableOop(retOop); oop2 = interpreterProxy->instantiateClassindexableSize(interpreterProxy->classByteArray(), (calloutState->structReturnSize)); if (returnStructInRegisters((calloutState->structReturnSize))) { @@ -3404,8 +3410,7 @@ oop = interpreterProxy->instantiateClassindexableSize(interpreterProxy->classExternalAddress(), 4); ptr = interpreterProxy->firstIndexableField(oop); ptr[0] = addr; - interpreterProxy->pop(2); - return interpreterProxy->push(oop); + interpreterProxy->popthenPush(2, oop); } @@ -3462,8 +3467,7 @@ } ((int*)addr)[0] = ((int*)(&floatValue))[0]; ((int*)addr)[1] = ((int*)(&floatValue))[1]; - interpreterProxy->pop(3); - return interpreterProxy->push(floatOop); + interpreterProxy->popthenPush(3, floatOop); } @@ -3518,8 +3522,7 @@ return 0; } ((int*)addr)[0] = ((int*)(&floatValue))[0]; - interpreterProxy->pop(3); - return interpreterProxy->push(floatOop); + interpreterProxy->popthenPush(3, floatOop); } @@ -3557,12 +3560,14 @@ /* Primitive. Return the error code from a failed call to the foreign function interface. - Always fail. In the thread-enabled FFI access errors via the primitive - error code. */ + This is for backwards-compatibility. Thread-safe access to the error code + is via the + primitive error code. */ EXPORT(sqInt) primitiveFFIGetLastError(void) { - return interpreterProxy->primitiveFailFor(PrimErrUnsupported); + interpreterProxy->pop(1); + return interpreterProxy->pushInteger(ffiLastError); } @@ -3619,15 +3624,11 @@ /* general 32 bit integer */ value = longAt(addr); - if (isSigned) { - value = interpreterProxy->signed32BitIntegerFor(value); - } - else { - value = interpreterProxy->positive32BitIntegerFor(value); - } + value = (isSigned + ? interpreterProxy->signed32BitIntegerFor(value) + : interpreterProxy->positive32BitIntegerFor(value)); } - interpreterProxy->pop(4); - return interpreterProxy->push(value); + interpreterProxy->popthenPush(4, value); } @@ -3696,8 +3697,7 @@ else { longAtput(addr, value); } - interpreterProxy->pop(5); - return interpreterProxy->push(valueOop); + interpreterProxy->popthenPush(5, valueOop); }

1 0

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

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

Vm-dev July 2010