Vm-dev April 2014

vm-dev@lists.squeakfoundation.org

39 participants
112 discussions

VM Maker: VMMaker.oscog-djm.682.mcz
by commits＠source.squeak.org 20 Apr '14

20 Apr '14

Douglas McPherson uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-djm.682.mcz ==================== Summary ==================== Name: VMMaker.oscog-djm.682 Author: djm Time: 19 April 2014, 5:59:52.572 pm UUID: e7def840-4cc1-464d-a20e-29498ae5a99a Ancestors: VMMaker.oscog-eem.681 ThreadedARMFFIPlugin - make progress on passing and returning structs but there are still outstanding bugs - 22/23 existing FFI tests pass, but there are many new tests yet to include to stress combined register and stack usage for parameter passing =============== Diff against VMMaker.oscog-eem.681 =============== Item was changed: ----- Method: ThreadedARMFFIPlugin>>dispatchFunctionPointer:with:with:with:with: (in category 'callout support') ----- dispatchFunctionPointer: aFunctionPointer with: int1 with: int2 with: int3 with: int4 "In C aFunctionPointer is void (*aFunctionPointer)(int, int, int, int)" <cmacro: '(aFunctionPointer, int1, int2, int3, int4) (aFunctionPointer)(int1, int2, int3, int4)'> + ^self + perform: aFunctionPointer + with: int1 + with: int2 + with: int3 + with: int4! - ^self perform: aFunctionPointer! Item was changed: ----- Method: ThreadedARMFFIPlugin>>ffiCalloutTo:SpecOnStack:in: (in category 'callout support') ----- ffiCalloutTo: procAddr SpecOnStack: specOnStack in: calloutState <var: #procAddr type: #'void *'> <var: #calloutState type: #'CalloutState *'> "Go out, call this guy and create the return value. This *must* be inlined because of the alloca of the outgoing stack frame in ffiCall:WithFlags:NumArgs:Args:AndTypes:" | myThreadIndex atomicType floatRet intRet | <var: #floatRet type: #double> <var: #intRet type: #usqLong> <inline: true> self cppIf: COGMTVM ifTrue: [(calloutState callFlags anyMask: FFICallFlagThreaded) ifTrue: [myThreadIndex := interpreterProxy disownVM: 0]]. - self msg: 'calling out to C function'. - self registerArgsSlop + self cStackAlignment > 0 ifTrue: [self setsp: calloutState argVector]. calloutState floatRegisterIndex > 0 ifTrue: [self dummyFloatFunction: ((self cCoerceSimple: (self addressOf: (calloutState floatRegisters at: 0)) to: 'double *') at: 0) with: ((self cCoerceSimple: (self addressOf: (calloutState floatRegisters at: 2)) to: 'double *') at: 0) with: ((self cCoerceSimple: (self addressOf: (calloutState floatRegisters at: 4)) to: 'double *') at: 0) with: ((self cCoerceSimple: (self addressOf: (calloutState floatRegisters at: 6)) to: 'double *') at: 0) with: ((self cCoerceSimple: (self addressOf: (calloutState floatRegisters at: 8)) to: 'double *') at: 0) with: ((self cCoerceSimple: (self addressOf: (calloutState floatRegisters at: 10)) to: 'double *') at: 0) with: ((self cCoerceSimple: (self addressOf: (calloutState floatRegisters at: 12)) to: 'double *') at: 0) with: ((self cCoerceSimple: (self addressOf: (calloutState floatRegisters at: 14)) to: 'double *') at: 0) ]. atomicType := self atomicTypeOf: calloutState ffiRetHeader. atomicType = FFITypeSingleFloat ifTrue: [floatRet := self dispatchFunctionPointer: (self cCoerceSimple: procAddr to: 'float (*)(int, int, int, int)') with: (calloutState integerRegisters at: 0) with: (calloutState integerRegisters at: 1) with: (calloutState integerRegisters at: 2) with: (calloutState integerRegisters at: 3)]. atomicType = FFITypeDoubleFloat ifTrue: [floatRet := self dispatchFunctionPointer: (self cCoerceSimple: procAddr to: 'double (*)(int, int, int, int)') with: (calloutState integerRegisters at: 0) with: (calloutState integerRegisters at: 1) with: (calloutState integerRegisters at: 2) with: (calloutState integerRegisters at: 3)] ifFalse: [intRet := self dispatchFunctionPointer: (self cCoerceSimple: procAddr to: 'usqLong (*)(int, int, int, int)') with: (calloutState integerRegisters at: 0) with: (calloutState integerRegisters at: 1) with: (calloutState integerRegisters at: 2) with: (calloutState integerRegisters at: 3)]. "undo any callee argument pops because it may confuse stack management with the alloca." (self isCalleePopsConvention: calloutState callFlags) ifTrue: [self setsp: calloutState argVector]. self cppIf: COGMTVM ifTrue: [(calloutState callFlags anyMask: FFICallFlagThreaded) ifTrue: [interpreterProxy ownVM: myThreadIndex]]. "Note: Order is important here since FFIFlagPointer + FFIFlagStructure is used to represent 'typedef void* VoidPointer' and VoidPointer must be returned as pointer *not* as struct." (calloutState ffiRetHeader anyMask: FFIFlagPointer) ifTrue: [^self ffiReturnPointer: intRet ofType: (self ffiReturnType: specOnStack) in: calloutState]. (calloutState ffiRetHeader anyMask: FFIFlagStructure) ifTrue: [^self ffiReturnStruct: intRet ofType: (self ffiReturnType: specOnStack) in: calloutState]. (atomicType = FFITypeSingleFloat or: [atomicType = FFITypeDoubleFloat]) ifTrue: [^interpreterProxy methodReturnValue: (interpreterProxy floatObjectOf: floatRet)]. ^interpreterProxy methodReturnValue: (self ffiCreateIntegralResultOop: intRet ofAtomicType: atomicType in: calloutState)! Item was changed: ----- Method: ThreadedARMFFIPlugin>>ffiPushStructure:ofSize:typeSpec:ofLength:in: (in category 'marshalling') ----- ffiPushStructure: pointer ofSize: structSize typeSpec: argSpec ofLength: argSpecSize in: calloutState <var: #pointer type: #'void *'> <var: #argSpec type: #'sqInt *'> <var: #calloutState type: #'CalloutState *'> <inline: true> + | availableRegisterSpace stackPartSize roundedSize | + + availableRegisterSpace := (NumIntRegArgs - calloutState integerRegisterIndex) * 4. + stackPartSize := structSize. + availableRegisterSpace > 0 + ifTrue: + [structSize <= availableRegisterSpace + ifTrue: + ["all in registers" + stackPartSize = 0. + self + mem: (self cCoerceSimple: (self addressOf: (calloutState integerRegisters at: calloutState integerRegisterIndex)) to: 'void *') + cp: pointer + y: structSize. + calloutState integerRegisterIndex: calloutState integerRegisterIndex + (structSize + 3 bitShift: -2) ] + ifFalse: + ["some in registers rest on stack" + stackPartSize := structSize - availableRegisterSpace. + self + mem: (self cCoerceSimple: (self addressOf: (calloutState integerRegisters at: calloutState integerRegisterIndex)) to: 'void *') + cp: pointer + y: availableRegisterSpace. + calloutState integerRegisterIndex: NumIntRegArgs]]. + + stackPartSize > 0 + ifTrue: + [roundedSize := stackPartSize + 3 bitClear: 3. + calloutState currentArg + roundedSize > calloutState limit ifTrue: + [^FFIErrorCallFrameTooBig]. + self mem: calloutState currentArg cp: (self addressOf: ((self cCoerceSimple: pointer to: 'char *') at: availableRegisterSpace)) y: stackPartSize. + calloutState currentArg: calloutState currentArg + roundedSize]. + - self shouldBeImplemented. ^0! Item was removed: - ----- Method: ThreadedARMFFIPlugin>>ffiPushUnsignedLong:in: (in category 'marshalling') ----- - ffiPushUnsignedLong: value in: calloutState - <var: #calloutState type: #'CalloutState *'> - <inline: true> - self shouldBeImplemented. - ^0! Item was changed: ----- Method: ThreadedARMFFIPlugin>>returnStructInRegisters: (in category 'marshalling') ----- returnStructInRegisters: returnStructSize "Answer if a struct result of a given size is returned in memory or not." + ^returnStructSize <= 4! - ^false!

1 0

[commit][2897] Change build script to use package-cache if files ahve already been downloaded .
by commits＠squeakvm.org 19 Apr '14

19 Apr '14

Revision: 2897 Author: eliot Date: 2014-04-19 09:23:44 -0700 (Sat, 19 Apr 2014) Log Message: ----------- Change build script to use package-cache if files ahve already been downloaded. Add compatibility for the multiple bytecode support the Cog assumes that is not yet in Squeak. Modified Paths: -------------- branches/Cog/image/BuildSqueak45Image.st Added Paths: ----------- branches/Cog/image/CompiledMethod-usesAlternateBytecodeSet.st Modified: branches/Cog/image/BuildSqueak45Image.st =================================================================== --- branches/Cog/image/BuildSqueak45Image.st 2014-04-18 19:29:01 UTC (rev 2896) +++ branches/Cog/image/BuildSqueak45Image.st 2014-04-19 16:23:44 UTC (rev 2897) @@ -22,7 +22,8 @@ sort: [:a :b| a second <= b second]. #( 'FT2Constants.st' - 'Object-performwithwithwithwithwith.st' ) do: + 'Object-performwithwithwithwithwith.st' + 'CompiledMethod-usesAlternateBytecodeSet.st' ) do: [:fileName| (FileDirectory default fileNamed: fileName) fileIn]. load do: @@ -32,7 +33,9 @@ [:package| | latestVersion | latestVersion := (repository versionNamesForPackageNamed: package) first. [| version | - version := repository versionNamed: latestVersion. + version := ((MCCacheRepository default includesVersionNamed: latestVersion) + ifTrue: [MCCacheRepository default] + ifFalse: [repository]) versionNamed: latestVersion. version load. version workingCopy repositoryGroup addRepository: repository] on: Warning @@ -45,4 +48,8 @@ #( 'Workspace' 'Slang Test Workspace' 'VM Simulation Workspace' ) do: [:textFileName| (StringHolder new contents: (FileDirectory default fileNamed: textFileName, '.text') contentsOfEntireFile) - openLabel: textFileName] + openLabel: textFileName]. + +World findATranscript: nil. + +Smalltalk snapshot: true andQuit: true Added: branches/Cog/image/CompiledMethod-usesAlternateBytecodeSet.st =================================================================== --- branches/Cog/image/CompiledMethod-usesAlternateBytecodeSet.st (rev 0) +++ branches/Cog/image/CompiledMethod-usesAlternateBytecodeSet.st 2014-04-19 16:23:44 UTC (rev 2897) @@ -0,0 +1,6 @@ +'From Squeak4.1 of 17 April 2010 [latest update: #9957] on 18 April 2014 at 4:13:49 pm'! + +!CompiledMethod methodsFor: 'testing' stamp: 'eliot 10/16/2012 15:12'! +usesAlternateBytecodeSet + "(CompiledMethod >> #usesAlternateBytecodeSet) usesAlternateBytecodeSet" + ^self signFlag! !

1 0

[commit][2896] Update to name the script by the squeak version and no longer define hex8.
by commits＠squeakvm.org 18 Apr '14

18 Apr '14

Revision: 2896 Author: eliot Date: 2014-04-18 12:29:01 -0700 (Fri, 18 Apr 2014) Log Message: ----------- Update to name the script by the squeak version and no longer define hex8. Added Paths: ----------- branches/Cog/image/BuildSqueak45Image.st branches/Cog/image/buildsqueak45image.sh Removed Paths: ------------- branches/Cog/image/BuildImage.st branches/Cog/image/Integer-hex8.st branches/Cog/image/buildimage.sh Deleted: branches/Cog/image/BuildImage.st =================================================================== --- branches/Cog/image/BuildImage.st 2014-04-17 22:54:20 UTC (rev 2895) +++ branches/Cog/image/BuildImage.st 2014-04-18 19:29:01 UTC (rev 2896) @@ -1,49 +0,0 @@ -| loadables load | -loadables := #( ('http://source.squeak.org/FFI' 1 ('FFI-Pools' 'FFI-Kernel')) - ('http://source.squeak.org/VMMaker' 5 ('Balloon-Engine-Pools' 'VMMaker.oscog' 'Cog' 'CogTools')) - ('http://ss3.gemstone.com/ss/MethodMassage' 3 ('MethodMassage' 'MethodMassageCompatibility')) - ('http://www.squeaksource.com/AioPlugin' 6 ('VMConstruction-Plugins-AioPlugin')) - ('http://www.squeaksource.com/Alien' 0 ('Alien')) - "('http://www.squeaksource.com/FreeTypePlus' 7 ('FreeType')) can't load this. it is toxic to Squeak 4.5" - ('http://www.squeaksource.com/FreetypePlugin' 8 ('Freetype-Plugin')) - ('http://www.squeaksource.com/OSProcess' 4 ('OSProcess')) - ('http://www.squeaksource.com/OSProcessPlugin' 9 ('VMConstruction-Plugins-OSProcessPlugin.oscog')) - ('http://www.squeaksource.com/Speech' 2 ('SharedPool-Speech' ))). - -load := (loadables collect: - [:tuple| - [:path :order :packages| | repository | - repository := MCHttpRepository - location: path - user: 'squeak' - password: 'squeak'. - MCRepositoryGroup default addRepository: repository. - {repository. order. packages}] valueWithArguments: tuple]) - sort: [:a :b| a second <= b second]. - -#( 'FT2Constants.st' - 'Object-performwithwithwithwithwith.st' - 'Integer-hex8.st' ) do: - [:fileName| (FileDirectory default fileNamed: fileName) fileIn]. - -load do: - [:tuple| - [:repository :order :packages| - packages do: - [:package| | latestVersion | - latestVersion := (repository versionNamesForPackageNamed: package) first. - [| version | - version := repository versionNamed: latestVersion. - version load. - version workingCopy repositoryGroup addRepository: repository] - on: Warning - do: [:ex| - (ex messageText beginsWith: 'This package depends on the following classes') ifFalse: - [ex pass]. - ex resume]] - ] valueWithArguments: tuple]. - -#( 'Workspace' 'Slang Test Workspace' 'VM Simulation Workspace' ) do: - [:textFileName| - (StringHolder new contents: (FileDirectory default fileNamed: textFileName, '.text') contentsOfEntireFile) - openLabel: textFileName] Copied: branches/Cog/image/BuildSqueak45Image.st (from rev 2895, branches/Cog/image/BuildImage.st) =================================================================== --- branches/Cog/image/BuildSqueak45Image.st (rev 0) +++ branches/Cog/image/BuildSqueak45Image.st 2014-04-18 19:29:01 UTC (rev 2896) @@ -0,0 +1,48 @@ +| manifest load | +manifest := #( ('http://source.squeak.org/FFI' 1 ('FFI-Pools' 'FFI-Kernel')) + ('http://source.squeak.org/VMMaker' 5 ('Balloon-Engine-Pools' 'VMMaker.oscog' 'Cog' 'CogTools')) + ('http://ss3.gemstone.com/ss/MethodMassage' 3 ('MethodMassage' 'MethodMassageCompatibility')) + ('http://www.squeaksource.com/AioPlugin' 6 ('VMConstruction-Plugins-AioPlugin')) + ('http://www.squeaksource.com/Alien' 0 ('Alien')) + "('http://www.squeaksource.com/FreeTypePlus' 7 ('FreeType')) can't load this. it is toxic to Squeak 4.5" + ('http://www.squeaksource.com/FreetypePlugin' 8 ('Freetype-Plugin')) + ('http://www.squeaksource.com/OSProcess' 4 ('OSProcess')) + ('http://www.squeaksource.com/OSProcessPlugin' 9 ('VMConstruction-Plugins-OSProcessPlugin.oscog')) + ('http://www.squeaksource.com/Speech' 2 ('SharedPool-Speech' ))). + +load := (manifest collect: + [:tuple| + [:path :order :packages| | repository | + repository := MCHttpRepository + location: path + user: 'squeak' + password: 'squeak'. + MCRepositoryGroup default addRepository: repository. + {repository. order. packages}] valueWithArguments: tuple]) + sort: [:a :b| a second <= b second]. + +#( 'FT2Constants.st' + 'Object-performwithwithwithwithwith.st' ) do: + [:fileName| (FileDirectory default fileNamed: fileName) fileIn]. + +load do: + [:tuple| + [:repository :order :packages| + packages do: + [:package| | latestVersion | + latestVersion := (repository versionNamesForPackageNamed: package) first. + [| version | + version := repository versionNamed: latestVersion. + version load. + version workingCopy repositoryGroup addRepository: repository] + on: Warning + do: [:ex| + (ex messageText beginsWith: 'This package depends on the following classes') ifFalse: + [ex pass]. + ex resume]]] + valueWithArguments: tuple]. + +#( 'Workspace' 'Slang Test Workspace' 'VM Simulation Workspace' ) do: + [:textFileName| + (StringHolder new contents: (FileDirectory default fileNamed: textFileName, '.text') contentsOfEntireFile) + openLabel: textFileName] Deleted: branches/Cog/image/Integer-hex8.st =================================================================== --- branches/Cog/image/Integer-hex8.st 2014-04-17 22:54:20 UTC (rev 2895) +++ branches/Cog/image/Integer-hex8.st 2014-04-18 19:29:01 UTC (rev 2896) @@ -1,14 +0,0 @@ -'From Squeak4.1 of 17 April 2010 [latest update: #9957] on 22 January 2014 at 5:02:45 pm'! - -!Integer methodsFor: 'printing' stamp: 'eem 5/21/2010 11:09'! -hex8 - "Print the receiver in base 16 with prefixed base, using at least 8 digits. - DO NOT CHANGE THIS!! The Cog VMMaker depends on this. - Consider using storeStringBase: 16 length: 11 padded: true instead." - "16r3333 hex8" - | hex | - hex := self hex. "16rNNN" - ^hex size < 11 - ifTrue: [hex copyReplaceFrom: 4 to: 3 - with: ('00000000' copyFrom: 1 to: 11-hex size)] - ifFalse: [hex]! ! Deleted: branches/Cog/image/buildimage.sh =================================================================== --- branches/Cog/image/buildimage.sh 2014-04-17 22:54:20 UTC (rev 2895) +++ branches/Cog/image/buildimage.sh 2014-04-18 19:29:01 UTC (rev 2896) @@ -1,34 +0,0 @@ -#!/bin/bash -SQUEAK45APP=Squeak-4.5-All-in-One.app -SQUEAK45RESOURCES=$SQUEAK45APP/Contents/Resources -SQUEAK45=$SQUEAK45RESOURCES/Squeak4.5-13680 - -if [ "`md5 -q \"$SQUEAK45\".image`" != 1d0d4320224b741da1f56c6871963702 ]; then - ZIP=Squeak-4.5-All-in-One.zip - if [ "`md5 -q $ZIP`" != b90e0303ab61e928a5d997b22d18b468 ] - then - wget --help >/dev/null || (echo 'could not find wget. you can find instructions on how to install it on google.' 1>&2; exit 1) - wget -c http://ftp.squeak.org/4.5/$ZIP - fi - unzip --help >/dev/null || (echo 'could not find unzip. you can find instructions on how to install it on google.' 1>&2; exit 1) - unzip $ZIP -fi -test -f SqueakV41.sources || ln $SQUEAK45RESOURCES/SqueakV41.sources . -cp -p $SQUEAK45.image CogVMMaker.image -cp -p $SQUEAK45.changes CogVMMaker.changes - -OS=`uname -s` -CPU=`uname -m` - -case $OS in -Darwin) VM="$SQUEAK45APP/Contents/MacOS/Squeak";; -CYGWIN*) VM="$SQUEAK45APP/SqueakConsole.exe";; -Linux) if [ "$CPU" = x86_64 ]; then - CPU=i686 - echo Running 32-bit Squeak on a 64-bit System. Hope the 32-bit runtime libraries are installed ... - fi - VM="$APP/Contents/$OS-$CPU/bin/squeak";; -*) echo "don't know how to run Squeak on your system. bailing out." 1>&2; exit 2 -esac - -exec "$VM" CogVMMaker.image BuildImage.st Copied: branches/Cog/image/buildsqueak45image.sh (from rev 2895, branches/Cog/image/buildimage.sh) =================================================================== --- branches/Cog/image/buildsqueak45image.sh (rev 0) +++ branches/Cog/image/buildsqueak45image.sh 2014-04-18 19:29:01 UTC (rev 2896) @@ -0,0 +1,34 @@ +#!/bin/bash +SQUEAK45APP=Squeak-4.5-All-in-One.app +SQUEAK45RESOURCES=$SQUEAK45APP/Contents/Resources +SQUEAK45=$SQUEAK45RESOURCES/Squeak4.5-13680 + +if [ "`md5 -q \"$SQUEAK45\".image`" != 1d0d4320224b741da1f56c6871963702 ]; then + ZIP=Squeak-4.5-All-in-One.zip + if [ "`md5 -q $ZIP`" != b90e0303ab61e928a5d997b22d18b468 ] + then + wget --help >/dev/null || (echo 'could not find wget. you can find instructions on how to install it on google.' 1>&2; exit 1) + wget -c http://ftp.squeak.org/4.5/$ZIP + fi + unzip --help >/dev/null || (echo 'could not find unzip. you can find instructions on how to install it on google.' 1>&2; exit 1) + unzip $ZIP +fi +test -f SqueakV41.sources || ln $SQUEAK45RESOURCES/SqueakV41.sources . +cp -p $SQUEAK45.image CogVMMaker.image +cp -p $SQUEAK45.changes CogVMMaker.changes + +OS=`uname -s` +CPU=`uname -m` + +case $OS in +Darwin) VM="$SQUEAK45APP/Contents/MacOS/Squeak";; +CYGWIN*) VM="$SQUEAK45APP/SqueakConsole.exe";; +Linux) if [ "$CPU" = x86_64 ]; then + CPU=i686 + echo Running 32-bit Squeak on a 64-bit System. Hope the 32-bit runtime libraries are installed ... + fi + VM="$APP/Contents/$OS-$CPU/bin/squeak";; +*) echo "don't know how to run Squeak on your system. bailing out." 1>&2; exit 2 +esac + +exec "$VM" CogVMMaker.image BuildSqueak45Image.st

1 0

VM Maker: VMMaker.oscog-eem.681.mcz
by commits＠source.squeak.org 18 Apr '14

18 Apr '14

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.681.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.681 Author: eem Time: 18 April 2014, 11:58:58.489 am UUID: c98fb038-0467-4bd9-9aea-1284afc12ffb Ancestors: VMMaker.oscog-eem.680 VMMaker: Make the location of the source tree used by the configurations a variable. This jives with the new image dir buildsqueak45image.sh scheme. Move hex8 into the VMMaker package. =============== Diff against VMMaker.oscog-eem.680 =============== Item was added: + ----- Method: Integer>>hex8 (in category '*VMMaker-printing') ----- + hex8 + "Print the receiver in base 16 with prefixed base, using at least 8 digits. + DO NOT CHANGE THIS!! The Cog VMMaker depends on this. + Consider using storeStringBase: 16 length: 11 padded: true instead." + "16r3333 hex8" + | hex | + hex := self hex. "16rNNN" + ^hex size < 11 + ifTrue: [hex copyReplaceFrom: 4 to: 3 + with: ('00000000' copyFrom: 1 to: 11-hex size)] + ifFalse: [hex]! Item was changed: ----- Method: VMMaker class>>generateNewspeakCogVM (in category 'configurations') ----- generateNewspeakCogVM ^VMMaker generate: CoInterpreter and: StackToRegisterMappingCogit with: #( NewspeakVM true MULTIPLEBYTECODESETS true) + to: (FileDirectory default pathFromURI: self sourceTree, '/nscogsrc') + platformDir: (FileDirectory default pathFromURI: self sourceTree, '/platforms') - to: (FileDirectory default pathFromURI: 'oscogvm/nscogsrc') - platformDir: (FileDirectory default pathFromURI: 'oscogvm/platforms') including:#( AsynchFilePlugin BMPReadWriterPlugin BalloonEnginePlugin BitBltSimulation DeflatePlugin DSAPlugin DropPlugin FileCopyPlugin FilePlugin FloatArrayPlugin FloatMathPlugin ImmX11Plugin JPEGReadWriter2Plugin JPEGReaderPlugin LargeIntegersPlugin Matrix2x3Plugin MiscPrimitivePlugin NewsqueakIA32ABIPlugin RePlugin SecurityPlugin SocketPlugin SoundPlugin SqueakSSLPlugin SurfacePlugin ThreadedIA32FFIPlugin UUIDPlugin UnixOSProcessPlugin VMProfileLinuxSupportPlugin VMProfileMacSupportPlugin Win32OSProcessPlugin)! Item was changed: ----- Method: VMMaker class>>generateNewspeakInterpreterVM (in category 'configurations') ----- generateNewspeakInterpreterVM ^VMMaker generate: NewspeakInterpreter + to: (FileDirectory default pathFromURI: self sourceTree, '/nssrc') + platformDir: (FileDirectory default pathFromURI: self sourceTree, '/platforms') - to: (FileDirectory default pathFromURI: 'oscogvm/nssrc') - platformDir: (FileDirectory default pathFromURI: 'oscogvm/platforms') including:#( AsynchFilePlugin BMPReadWriterPlugin BalloonEnginePlugin BitBltSimulation DeflatePlugin DSAPlugin DropPlugin FileCopyPlugin FilePlugin FloatArrayPlugin FloatMathPlugin ImmX11Plugin JPEGReadWriter2Plugin JPEGReaderPlugin LargeIntegersPlugin Matrix2x3Plugin MiscPrimitivePlugin NewsqueakIA32ABIPlugin RePlugin SecurityPlugin SocketPlugin SoundPlugin SqueakSSLPlugin SurfacePlugin UUIDPlugin UnixOSProcessPlugin VMProfileLinuxSupportPlugin VMProfileMacSupportPlugin Win32OSProcessPlugin)! Item was changed: ----- Method: VMMaker class>>generateNewspeakSpurCogVM (in category 'configurations') ----- generateNewspeakSpurCogVM "No primitives since we can use those for the Cog Newspeak VM" ^VMMaker generate: CoInterpreter and: StackToRegisterMappingCogit with: #( ObjectMemory Spur32BitCoMemoryManager MULTIPLEBYTECODESETS true NewspeakVM true) + to: (FileDirectory default pathFromURI: self sourceTree, '/nsspursrc') + platformDir: (FileDirectory default pathFromURI: self sourceTree, '/platforms') - to: (FileDirectory default pathFromURI: 'oscogvm/nsspursrc') - platformDir: (FileDirectory default pathFromURI: 'oscogvm/platforms') including:#()! Item was changed: ----- Method: VMMaker class>>generateNewspeakSpurStackVM (in category 'configurations') ----- generateNewspeakSpurStackVM "No primitives since we can use those for the Cog Newspeak VM" ^VMMaker generate: StackInterpreter with: #( ObjectMemory Spur32BitMemoryManager MULTIPLEBYTECODESETS true NewspeakVM true) + to: (FileDirectory default directoryNamed: self sourceTree, '/nsspurstacksrc') fullName + platformDir: (FileDirectory default directoryNamed: self sourceTree, '/platforms') fullName - to: (FileDirectory default directoryNamed: 'oscogvm/nsspurstacksrc') fullName - platformDir: (FileDirectory default directoryNamed: 'oscogvm/platforms') fullName including: #()! Item was changed: ----- Method: VMMaker class>>generateNewspeakStackVM (in category 'configurations') ----- generateNewspeakStackVM "No primitives since we can use those for the Cog Newspeak VM" ^VMMaker generate: StackInterpreter with: #(NewspeakVM true MULTIPLEBYTECODESETS true) + to: (FileDirectory default pathFromURI: self sourceTree, '/nsstacksrc') + platformDir: (FileDirectory default pathFromURI: self sourceTree, '/platforms') - to: (FileDirectory default pathFromURI: 'oscogvm/nsstacksrc') - platformDir: (FileDirectory default pathFromURI: 'oscogvm/platforms') including: #()! Item was changed: ----- Method: VMMaker class>>generateSqueakCogSistaVM (in category 'configurations') ----- generateSqueakCogSistaVM "No primitives since we can use those for the Cog VM" ^VMMaker generate: CoInterpreter and: SistaStackToRegisterMappingCogit + to: (FileDirectory default pathFromURI: self sourceTree, '/sistasrc') + platformDir: (FileDirectory default pathFromURI: self sourceTree, '/platforms') - to: (FileDirectory default pathFromURI: 'oscogvm/sistasrc') - platformDir: (FileDirectory default pathFromURI: 'oscogvm/platforms') including: #()! Item was changed: ----- Method: VMMaker class>>generateSqueakSpurCogSistaVM (in category 'configurations') ----- generateSqueakSpurCogSistaVM "No primitives since we can use those for the Cog VM" ^VMMaker generate: CoInterpreter and: SistaStackToRegisterMappingCogit with: #(ObjectMemory Spur32BitCoMemoryManager) + to: (FileDirectory default pathFromURI: self sourceTree, '/spursistasrc') + platformDir: (FileDirectory default pathFromURI: self sourceTree, '/platforms') - to: (FileDirectory default pathFromURI: 'oscogvm/spursistasrc') - platformDir: (FileDirectory default pathFromURI: 'oscogvm/platforms') including:#()! Item was changed: ----- Method: VMMaker class>>generateSqueakSpurCogVM (in category 'configurations') ----- generateSqueakSpurCogVM "No primitives since we can use those for the Cog VM" ^VMMaker generate: CoInterpreter and: StackToRegisterMappingCogit with: #( ObjectMemory Spur32BitCoMemoryManager) + to: (FileDirectory default pathFromURI: self sourceTree, '/spursrc') + platformDir: (FileDirectory default pathFromURI: self sourceTree, '/platforms') - to: (FileDirectory default pathFromURI: 'oscogvm/spursrc') - platformDir: (FileDirectory default pathFromURI: 'oscogvm/platforms') including:#()! Item was changed: ----- Method: VMMaker class>>generateSqueakSpurStackVM (in category 'configurations') ----- generateSqueakSpurStackVM "No primitives since we can use those for the Cog VM" ^VMMaker generate: StackInterpreter with: #(ObjectMemory Spur32BitMemoryManager) + to: (FileDirectory default directoryNamed: self sourceTree, '/spurstacksrc') fullName + platformDir: (FileDirectory default directoryNamed: self sourceTree, '/platforms') fullName - to: (FileDirectory default directoryNamed: 'oscogvm/spurstacksrc') fullName - platformDir: (FileDirectory default directoryNamed: 'oscogvm/platforms') fullName including: #()! Item was changed: ----- Method: VMMaker class>>generateSqueakStackVM (in category 'configurations') ----- generateSqueakStackVM "No primitives since we can use those for the Cog VM" ^VMMaker generate: StackInterpreter + to: (FileDirectory default directoryNamed: self sourceTree, '/stacksrc') fullName + platformDir: (FileDirectory default directoryNamed: self sourceTree, '/platforms') fullName - to: (FileDirectory default directoryNamed: 'oscogvm/stacksrc') fullName - platformDir: (FileDirectory default directoryNamed: 'oscogvm/platforms') fullName including: #()! Item was changed: ----- Method: VMMaker class>>initialize (in category 'initialisation') ----- initialize "VMMaker initialize" DirNames := Dictionary new. + DirNames + at: #coreVMDir put: 'vm'; - DirNames at: #coreVMDir put: 'vm'; at: #platformsDir put: 'platforms'; at: #pluginsDir put: 'plugins'; + at: #sourceDir put: 'src'. + + "Try and decide where the Cog source tree is. Two configurations are likely. + One is that the VMMaker image is running in the image directory in the + source tree and hence everything will be at '..'. + Another is where the source tree is at the same level as the VMMaker image, + in which case it is likely called oscogvm or Cog." + #('../platforms' 'oscogvm/platforms' 'Cog/platforms') + with: #('../' 'oscogvm' 'Cog') + do: [:dir :path| + (FileDirectory default directoryExists: dir) ifTrue: + [DirNames at: #sourceTree put: path. + ^self]]! - at: #sourceDir put: 'src'! Item was added: + ----- Method: VMMaker class>>sourceTree (in category 'accessing') ----- + sourceTree + ^DirNames at: #sourceTree!

1 0

[commit][2895] Saner CogVMMaker image building.
by commits＠squeakvm.org 18 Apr '14

18 Apr '14

Revision: 2895 Author: eliot Date: 2014-04-17 15:54:20 -0700 (Thu, 17 Apr 2014) Log Message: ----------- Saner CogVMMaker image building. buildimage.sh is a fully automated script to build from Squeak 4.5. There's still some crap: - I need to cleave FT2Constants from the Freetype package. - use of hex8 should be eliminated in favour of e.g. VMClass>>hex8: - perform:with:with:with:with:with: belongs in the base. Modified Paths: -------------- branches/Cog/image/Slang Test Workspace.text branches/Cog/image/VM Simulation Workspace.text branches/Cog/image/Workspace.text Added Paths: ----------- branches/Cog/image/BuildImage.st branches/Cog/image/FT2Constants.st branches/Cog/image/Object-performwithwithwithwithwith.st branches/Cog/image/buildimage.sh Removed Paths: ------------- branches/Cog/image/CogTrunk43.changes branches/Cog/image/CogTrunk43.image branches/Cog/image/NecessaryImageChangesForCogToWork.1.cs branches/Cog/image/Parser-initPatternreturn.st branches/Cog/image/Translated Primitives.st branches/Cog/image/sanity-check Property Changed: ---------------- branches/Cog/image/ Property changes on: branches/Cog/image ___________________________________________________________________ Modified: svn:ignore - prefs special-dirs package-cache SqueakDebug.log + CogVMMaker.* Squeak-4.5-All-in-One.* SqueakDebug.log SqueakV41.sources __MACOSX crash.dmp package-cache prefs special-dirs Added: branches/Cog/image/BuildImage.st =================================================================== --- branches/Cog/image/BuildImage.st (rev 0) +++ branches/Cog/image/BuildImage.st 2014-04-17 22:54:20 UTC (rev 2895) @@ -0,0 +1,49 @@ +| loadables load | +loadables := #( ('http://source.squeak.org/FFI' 1 ('FFI-Pools' 'FFI-Kernel')) + ('http://source.squeak.org/VMMaker' 5 ('Balloon-Engine-Pools' 'VMMaker.oscog' 'Cog' 'CogTools')) + ('http://ss3.gemstone.com/ss/MethodMassage' 3 ('MethodMassage' 'MethodMassageCompatibility')) + ('http://www.squeaksource.com/AioPlugin' 6 ('VMConstruction-Plugins-AioPlugin')) + ('http://www.squeaksource.com/Alien' 0 ('Alien')) + "('http://www.squeaksource.com/FreeTypePlus' 7 ('FreeType')) can't load this. it is toxic to Squeak 4.5" + ('http://www.squeaksource.com/FreetypePlugin' 8 ('Freetype-Plugin')) + ('http://www.squeaksource.com/OSProcess' 4 ('OSProcess')) + ('http://www.squeaksource.com/OSProcessPlugin' 9 ('VMConstruction-Plugins-OSProcessPlugin.oscog')) + ('http://www.squeaksource.com/Speech' 2 ('SharedPool-Speech' ))). + +load := (loadables collect: + [:tuple| + [:path :order :packages| | repository | + repository := MCHttpRepository + location: path + user: 'squeak' + password: 'squeak'. + MCRepositoryGroup default addRepository: repository. + {repository. order. packages}] valueWithArguments: tuple]) + sort: [:a :b| a second <= b second]. + +#( 'FT2Constants.st' + 'Object-performwithwithwithwithwith.st' + 'Integer-hex8.st' ) do: + [:fileName| (FileDirectory default fileNamed: fileName) fileIn]. + +load do: + [:tuple| + [:repository :order :packages| + packages do: + [:package| | latestVersion | + latestVersion := (repository versionNamesForPackageNamed: package) first. + [| version | + version := repository versionNamed: latestVersion. + version load. + version workingCopy repositoryGroup addRepository: repository] + on: Warning + do: [:ex| + (ex messageText beginsWith: 'This package depends on the following classes') ifFalse: + [ex pass]. + ex resume]] + ] valueWithArguments: tuple]. + +#( 'Workspace' 'Slang Test Workspace' 'VM Simulation Workspace' ) do: + [:textFileName| + (StringHolder new contents: (FileDirectory default fileNamed: textFileName, '.text') contentsOfEntireFile) + openLabel: textFileName] Deleted: branches/Cog/image/CogTrunk43.changes =================================================================== --- branches/Cog/image/CogTrunk43.changes 2014-04-14 22:32:11 UTC (rev 2894) +++ branches/Cog/image/CogTrunk43.changes 2014-04-17 22:54:20 UTC (rev 2895) @@ -1,592972 +0,0 @@ @@ Diff output truncated at 50000 characters. @@

2 1

VM Maker: VMMaker.oscog-eem.680.mcz
by commits＠source.squeak.org 18 Apr '14

18 Apr '14

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.680.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.680 Author: eem Time: 17 April 2014, 3:31:20.05 pm UUID: 4c5d6723-7644-4b44-92df-0af0ec9b453d Ancestors: VMMaker.oscog-eem.679 Fix a couple of slips in the Simulator;s context access methods. =============== Diff against VMMaker.oscog-eem.679 =============== Item was changed: ----- Method: CogVMSimulator>>externalInstVar:ofContext: (in category 'debugging traps') ----- externalInstVar: offset ofContext: aContext "offset = InstructionPointerIndex ifTrue: [transcript nextPutAll: '==================='; cr. self printContext: 16r1715630. self printCallStackOf: aContext currentFP: framePointer. transcript nextPutAll: '==================='; cr. self halt]." | result | "self shortPrintFrameAndCallers: framePointer. transcript print: byteCount; tab; print: thisContext; cr. self print: offset; cr. self printContext: aContext. (self confirm: 'continue?') ifFalse: [self halt]." + result := super externalInstVar: offset ofContext: aContext. + "(offset = InstructionPointerIndex - "result := super externalInstVar: offset ofContext: aContext. - (offset = InstructionPointerIndex and: [(self stringOf: (self penultimateLiteralOf: (self fetchPointer: MethodIndex ofObject: aContext))) = #indexOf:startingAt:ifAbsent:]) ifTrue: [transcript space; nextPutAll: '^pc '; nextPutAll: result hex. (objectMemory isIntegerObject: result) ifTrue: [transcript space; print: (objectMemory integerValueOf: result)]. transcript tab. self shortPrintContext: aContext]." "offset = StackPointerIndex ifTrue: [transcript nextPutAll: '^stackp ', (self integerValueOf: result) printString; tab. self shortPrintContext: aContext. (#(24205456 24205732) includes: aContext) ifTrue: [(self checkIsStillMarriedContext: aContext currentFP: framePointer) ifTrue: [self printFrame: (self frameOfMarriedContext: aContext) WithSP: (self frameOfMarriedContext: aContext) - 48] ifFalse: [self printContext: aContext]]]." ^result! Item was changed: ----- Method: CogVMSimulator>>instVar:ofContext: (in category 'debugging traps') ----- instVar: offset ofContext: aContext "offset = InstructionPointerIndex ifTrue: [Transcript nextPutAll: '==================='; cr. self printContext: 16r1715630. self printCallStackOf: aContext currentFP: framePointer. Transcript nextPutAll: '==================='; cr. self halt]." | result | "self shortPrintFrameAndCallers: localFP. Transcript print: byteCount; tab; print: thisContext; cr. self print: offset; cr. self printContext: aContext. (self confirm: 'continue?') ifFalse: [self halt]." + result := super instVar: offset ofContext: aContext. + "(offset = InstructionPointerIndex - "result := super instVar: offset ofContext: aContext. - (offset = InstructionPointerIndex and: [(self stringOf: (self penultimateLiteralOf: (self fetchPointer: MethodIndex ofObject: aContext))) = #indexOf:startingAt:ifAbsent:]) ifTrue: [transcript space; nextPutAll: '^pc '; nextPutAll: result hex. (objectMemory isIntegerObject: result) ifTrue: [transcript space; print: (objectMemory integerValueOf: result)]. transcript tab. self shortPrintContext: aContext]." "offset = StackPointerIndex ifTrue: [Transcript nextPutAll: '^stackp ', (self integerValueOf: result) printString; tab. self shortPrintContext: aContext. (#(24205456 24205732) includes: aContext) ifTrue: [(self checkIsStillMarriedContext: aContext currentFP: localFP) ifTrue: [self printFrame: (self frameOfMarriedContext: aContext) WithSP: (self frameOfMarriedContext: aContext) - 48] ifFalse: [self printContext: aContext]]]." ^result!

1 0

VM Maker: VMMaker.oscog-eem.679.mcz
by commits＠source.squeak.org 18 Apr '14

18 Apr '14

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.679.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.679 Author: eem Time: 17 April 2014, 3:03:55.029 pm UUID: 96f3797e-31e4-4c70-bd12-af82bff6fbe5 Ancestors: VMMaker.oscog-djm.678 Slang: Rescue the SimpleStackBasedCogit by avoiding the conflict between the object representation's numRegArgs and the Cogit's numRegArgs by renaming object representation's numRegArgs to preferredNumRegArgs. Rescue running the Slang test workspace expressions before initialization by adding guards in the relevant places. ThreadedARMFFIPlugin: delete an unused method to nuke an Undeclared. =============== Diff against VMMaker.oscog-djm.678 =============== Item was removed: - ----- Method: CogObjectRepresentation>>numRegArgs (in category 'calling convention') ----- - numRegArgs - "Define how many register arguments a StackToRegisterMapngCogit can and should use - with the receiver. The value must be 0, 1 or 2. Note that a SimpleStackBasedCogit always - has 0 register args (although the receiver is passed in a register)." - self subclassResponsibility! Item was added: + ----- Method: CogObjectRepresentation>>preferredNumRegArgs (in category 'calling convention') ----- + preferredNumRegArgs + "Define how many register arguments a StackToRegisterMappingCogit can and should use + with the receiver. The value must be 0, 1 or 2. Note that a SimpleStackBasedCogit always + has 0 register args (although the receiver is passed in a register)." + self subclassResponsibility! Item was removed: - ----- Method: CogObjectRepresentationForSpur>>numRegArgs (in category 'calling convention') ----- - numRegArgs - "The Spur object representation is simple enough that implementing - at:put: is straight-forward and hence 2 register args are worth while." - <api> - ^2! Item was added: + ----- Method: CogObjectRepresentationForSpur>>preferredNumRegArgs (in category 'calling convention') ----- + preferredNumRegArgs + "Define how many register arguments a StackToRegisterMappingCogit can + and should use with the receiver. The value must be 0, 1 or 2. Note that a + SimpleStackBasedCogit always has 0 register args (although the receiver is + passed in a register). The Spur object representation is simple enough that + implementing at:put: is straight-forward and hence 2 register args are worth while." + <inline: true> + ^2! Item was removed: - ----- Method: CogObjectRepresentationForSqueakV3>>numRegArgs (in category 'calling convention') ----- - numRegArgs - "CogObjectRepresentationForSqueakV3 only implements at most 1-arg primitives, because - the complexity of the object representation makes it difficult to implement at:put:, the most - performance-critical 2-argument primitive." - <api> - ^1! Item was added: + ----- Method: CogObjectRepresentationForSqueakV3>>preferredNumRegArgs (in category 'calling convention') ----- + preferredNumRegArgs + "Define how many register arguments a StackToRegisterMappingCogit can + and should use with the receiver. The value must be 0, 1 or 2. Note that a + SimpleStackBasedCogit always has 0 register args (although the receiver is + passed in a register). CogObjectRepresentationForSqueakV3 only implements + at most 1-arg primitives, because the complexity of the object representation + makes it difficult to implement at:put:, the most performance-critical 2-argument + primitive." + <inline: true> + ^1! Item was changed: ----- Method: Cogit class>>declareCVarsIn: (in category 'translation') ----- declareCVarsIn: aCCodeGenerator #( 'coInterpreter' 'objectMemory' 'methodZone' 'objectRepresentation' 'cogBlockMethodSurrogateClass' 'cogMethodSurrogateClass' 'threadManager' 'processor' 'lastNInstructions' 'simulatedAddresses' 'simulatedTrampolines' 'simulatedVariableGetters' 'simulatedVariableSetters' 'printRegisters' 'printInstructions' 'clickConfirm' 'singleStep') do: [:simulationVariableNotNeededForRealVM| aCCodeGenerator removeVariable: simulationVariableNotNeededForRealVM]. NewspeakVM ifFalse: [#( 'dynSuperEntry' 'dynSuperEntryAlignment' 'dynamicSuperSendTrampolines' 'ceImplicitReceiverTrampoline' 'ceExplicitReceiverTrampoline' 'cmDynSuperEntryOffset') do: [:variableNotNeededInNormalVM| aCCodeGenerator removeVariable: variableNotNeededInNormalVM]]. aCCodeGenerator removeConstant: #COGMTVM. "this should be defined at compile time" aCCodeGenerator addHeaderFile:'<stddef.h>'; "for e.g. offsetof" addHeaderFile:'"sqCogStackAlignment.h"'; addHeaderFile:'"cogmethod.h"'; addHeaderFile:'#if COGMTVM'; addHeaderFile:'"cointerpmt.h"'; addHeaderFile:'#else'; addHeaderFile:'"cointerp.h"'; addHeaderFile:'#endif'; addHeaderFile:'"cogit.h"'; addHeaderFile:'"dispdbg.h"'. aCCodeGenerator var: #ceGetSP declareC: 'unsigned long (*ceGetSP)(void)'; var: #ceCaptureCStackPointers declareC: 'void (*ceCaptureCStackPointers)(void)'; var: #ceEnterCogCodePopReceiverReg declareC: 'void (*ceEnterCogCodePopReceiverReg)(void)'; var: #realCEEnterCogCodePopReceiverReg declareC: 'void (*realCEEnterCogCodePopReceiverReg)(void)'; var: #ceEnterCogCodePopReceiverAndClassRegs declareC: 'void (*ceEnterCogCodePopReceiverAndClassRegs)(void)'; var: #realCEEnterCogCodePopReceiverAndClassRegs declareC: 'void (*realCEEnterCogCodePopReceiverAndClassRegs)(void)'; var: #ceFlushICache declareC: 'static void (*ceFlushICache)(unsigned long from, unsigned long to)'; var: #ceCheckFeaturesFunction declareC: 'static unsigned long (*ceCheckFeaturesFunction)(void)'; var: #ceTryLockVMOwner declareC: 'unsigned long (*ceTryLockVMOwner)(void)'; var: #ceUnlockVMOwner declareC: 'void (*ceUnlockVMOwner)(void)'; var: #postCompileHook declareC: 'void (*postCompileHook)(CogMethod *, void *)'; var: #openPICList declareC: 'CogMethod *openPICList = 0'; var: #maxMethodBefore type: #'CogBlockMethod *'. aCCodeGenerator declareVar: 'aMethodLabel' type: #'AbstractInstruction'; "Has to come lexicographically before backEnd & methodLabel" var: #backEnd declareC: 'AbstractInstruction * const backEnd = &aMethodLabel'; var: #methodLabel declareC: 'AbstractInstruction * const methodLabel = &aMethodLabel'; var: #primInvokeLabel type: #'AbstractInstruction *'. self declareC: #(abstractOpcodes stackCheckLabel blockEntryLabel blockEntryNoContextSwitch stackOverflowCall sendMissCall entry noCheckEntry dynSuperEntry mnuCall interpretCall endCPICCase0 endCPICCase1) as: #'AbstractInstruction *' in: aCCodeGenerator. aCCodeGenerator declareVar: #annotations type: #'InstructionAnnotation *'; declareVar: #blockStarts type: #'BlockStart *'; declareVar: #fixups type: #'BytecodeFixup *'. aCCodeGenerator var: #sendTrampolines declareC: 'sqInt sendTrampolines[NumSendTrampolines]'; var: #superSendTrampolines declareC: 'sqInt superSendTrampolines[NumSendTrampolines]'; var: #dynamicSuperSendTrampolines declareC: 'sqInt dynamicSuperSendTrampolines[NumSendTrampolines]'; var: #trampolineAddresses declareC: 'static char *trampolineAddresses[NumTrampolines*2]'; var: #objectReferencesInRuntime declareC: 'static sqInt objectReferencesInRuntime[NumObjRefsInRuntime]'; var: #cePositive32BitIntegerTrampoline declareC: 'static sqInt cePositive32BitIntegerTrampoline'; var: #labelCounter type: #int; var: #traceFlags declareC: 'int traceFlags = 8 /* prim trace log on by default */'; var: #cStackAlignment declareC: 'const int cStackAlignment = STACK_ALIGN_BYTES'. aCCodeGenerator declareVar: #CFramePointer type: #'void *'; declareVar: #CStackPointer type: #'void *'; declareVar: #minValidCallAddress type: #'unsigned long'; declareVar: #debugPrimCallStackOffset type: #'unsigned long'. + aCCodeGenerator vmClass generatorTable ifNotNil: + [:generatorTable| + aCCodeGenerator + var: #generatorTable + declareC: 'BytecodeDescriptor generatorTable[', aCCodeGenerator vmClass generatorTable size, ']' + , (self tableInitializerFor: aCCodeGenerator vmClass generatorTable + in: aCCodeGenerator); + var: #primitiveGeneratorTable + declareC: 'PrimitiveDescriptor primitiveGeneratorTable[MaxCompiledPrimitiveIndex+1]' + , (self tableInitializerFor: aCCodeGenerator vmClass primitiveTable + in: aCCodeGenerator)]. - aCCodeGenerator - var: #generatorTable - declareC: 'BytecodeDescriptor generatorTable[', aCCodeGenerator vmClass generatorTable size, ']' - , (self tableInitializerFor: aCCodeGenerator vmClass generatorTable - in: aCCodeGenerator); - var: #primitiveGeneratorTable - declareC: 'PrimitiveDescriptor primitiveGeneratorTable[MaxCompiledPrimitiveIndex+1]' - , (self tableInitializerFor: aCCodeGenerator vmClass primitiveTable - in: aCCodeGenerator). "In C the abstract opcode names clash with the Smalltak generator syntactic sugar. Most of the syntactic sugar is inlined, but alas some remains. Rename the syntactic sugar to avoid the clash." (self organization listAtCategoryNamed: #'abstract instructions') do: [:s| aCCodeGenerator addSelectorTranslation: s to: 'g', (aCCodeGenerator cFunctionNameFor: s)]. aCCodeGenerator addSelectorTranslation: #halt: to: 'haltmsg'! Item was changed: ----- Method: Cogit class>>tableFunctions (in category 'translation') ----- tableFunctions "self tableFunctions" self getVMMaker ifNotNil: [:vmMaker| vmMaker cogitClass ~= self ifTrue: [^Set new]]. + generatorTable ifNil: + [^Set new]. ^Set new addAll: (generatorTable object collect: [:ea| ea generator]); addAll: (generatorTable object select: [:ea| ea spanFunction notNil] thenCollect: [:ea| ea spanFunction]); addAll: (generatorTable object select: [:ea| ea needsFrameFunction notNil] thenCollect: [:ea| ea needsFrameFunction]); addAll: (primitiveTable object select: [:ea| ea notNil and: [ea primitiveGenerator notNil]] thenCollect: [:ea| ea primitiveGenerator]); addAll: (primitiveTable object select: [:ea| ea notNil and: [ea enabled notNil]] thenCollect: [:ea| ea enabled]); asSortedCollection: [:a :b| a caseInsensitiveLessOrEqual: b]! Item was changed: ----- Method: StackToRegisterMappingCogit class>>declareCVarsIn: (in category 'translation') ----- declareCVarsIn: aCodeGen aCodeGen var: #methodAbortTrampolines declareC: 'sqInt methodAbortTrampolines[4]'; var: #picAbortTrampolines declareC: 'sqInt picAbortTrampolines[4]'; var: #picMissTrampolines declareC: 'sqInt picMissTrampolines[4]'; var: 'ceEnter0ArgsPIC' declareC: 'void (*ceEnter0ArgsPIC)(void)'; var: 'ceEnter1ArgsPIC' declareC: 'void (*ceEnter1ArgsPIC)(void)'; var: 'ceEnter2ArgsPIC' declareC: 'void (*ceEnter2ArgsPIC)(void)'; var: #ceEnterCogCodePopReceiverArg0Regs declareC: 'void (*ceEnterCogCodePopReceiverArg0Regs)(void)'; var: #realCEEnterCogCodePopReceiverArg0Regs declareC: 'void (*realCEEnterCogCodePopReceiverArg0Regs)(void)'; var: #ceEnterCogCodePopReceiverArg1Arg0Regs declareC: 'void (*ceEnterCogCodePopReceiverArg1Arg0Regs)(void)'; var: #realCEEnterCogCodePopReceiverArg1Arg0Regs declareC: 'void (*realCEEnterCogCodePopReceiverArg1Arg0Regs)(void)'; var: 'simStack' declareC: 'CogSimStackEntry simStack[', ((CoInterpreter bindingOf: #LargeContextSize) value * 5 / 4 // BytesPerWord) asString, ']'; var: 'simSelf' type: #CogSimStackEntry; var: #optStatus type: #CogSSOptStatus; - var: 'isPushNilFunction' - declareC: 'sqInt (* const isPushNilFunction)(struct _BytecodeDescriptor *,sqInt,sqInt,sqInt) = ', (aCodeGen cFunctionNameFor: self isPushNilFunction); - var: 'pushNilSizeFunction' - declareC: 'sqInt (* const pushNilSizeFunction)(sqInt) = ', (aCodeGen cFunctionNameFor: self pushNilSizeFunction); var: 'prevBCDescriptor' type: #'BytecodeDescriptor *'. + self isPushNilFunction ifNotNil: + [aCodeGen + var: 'isPushNilFunction' + declareC: 'sqInt (* const isPushNilFunction)(struct _BytecodeDescriptor *,sqInt,sqInt,sqInt) = ', (aCodeGen cFunctionNameFor: self isPushNilFunction); + var: 'pushNilSizeFunction' + declareC: 'sqInt (* const pushNilSizeFunction)(sqInt) = ', (aCodeGen cFunctionNameFor: self pushNilSizeFunction)]. + aCodeGen addSelectorTranslation: #register to: (aCodeGen cFunctionNameFor: 'registerr'); addSelectorTranslation: #register: to: (aCodeGen cFunctionNameFor: 'registerr:')! Item was changed: ----- Method: StackToRegisterMappingCogit>>numRegArgs (in category 'compile abstract instructions') ----- numRegArgs + <api> + ^objectRepresentation preferredNumRegArgs! - <doNotGenerate> - ^objectRepresentation numRegArgs! Item was removed: - ----- Method: ThreadedARMFFIPlugin class>>numRegArgs (in category 'accessing') ----- - numRegArgs - ^NumRegArgs! Item was changed: ----- Method: VMClass class>>initializeMiscConstants (in category 'initialization') ----- initializeMiscConstants "Falsify the `what type of VM is this?' flags that are defined in the various interp.h files, or in the case of VMBIGENDIAN the various sqConfig.h files. Subclass implementations need to include a super initializeMiscConstants" | omc | VMBIGENDIAN class. "Mention this for the benefit of CCodeGenerator>>emitCConstantsOn:" self isInterpreterClass ifTrue: [STACKVM := COGVM := COGMTVM := false]. + initializationOptions ifNil: [self initializationOptions: Dictionary new]. omc := initializationOptions at: #ObjectMemory ifAbsent: nil. initializationOptions at: #SqueakV3ObjectMemory "the good ole default" put: (omc ifNil: [true] ifNotNil: [(Smalltalk at: omc) inheritsFrom: ObjectMemory]); at: #SpurObjectMemory "the new condender" put: (omc ifNil: [false] ifNotNil: [(Smalltalk at: omc) inheritsFrom: SpurMemoryManager]). "Use ifAbsentPut: so that they will get copied back to the VMMaker's options and dead code will likely be eliminated." NewspeakVM := initializationOptions at: #NewspeakVM ifAbsentPut: [false]. MULTIPLEBYTECODESETS := initializationOptions at: #MULTIPLEBYTECODESETS ifAbsentPut: [false]. "N.B. Not yet implemented." IMMUTABILITY := initializationOptions at: #IMMUTABILITY ifAbsentPut: [false]. "These for scripts etc... Usually they should get set by an Interpreter class's initializeMiscConstantsWith:" (initializationOptions includesKey: #STACKVM) ifTrue: [STACKVM := initializationOptions at: #STACKVM]. (initializationOptions includesKey: #COGVM) ifTrue: [COGVM := initializationOptions at: #COGVM]. (initializationOptions includesKey: #COGMTVM) ifTrue: [COGMTVM := initializationOptions at: #COGMTVM]!

1 0

FT2Plugin for Freetype: Freetype-Plugin-eem.69.mcz
by squeak-dev-noreply＠lists.squeakfoundation.org 17 Apr '14

17 Apr '14

Eliot Miranda uploaded a new version of Freetype-Plugin to project FT2Plugin for Freetype: http://www.squeaksource.com/FreetypePlugin/Freetype-Plugin-eem.69.mcz ==================== Summary ==================== Name: Freetype-Plugin-eem.69 Author: eem Time: 17 April 2014, 1:28:11.279 pm UUID: c47f67aa-42bd-4b5e-b452-dd22ec69d43f Ancestors: Freetype-Plugin-eem.68 Oops. Need to use classNamed:, not at:.

1 0

FT2Plugin for Freetype: Freetype-Plugin-eem.68.mcz
by squeak-dev-noreply＠lists.squeakfoundation.org 17 Apr '14

17 Apr '14

Eliot Miranda uploaded a new version of Freetype-Plugin to project FT2Plugin for Freetype: http://www.squeaksource.com/FreetypePlugin/Freetype-Plugin-eem.68.mcz ==================== Summary ==================== Name: Freetype-Plugin-eem.68 Author: eem Time: 17 April 2014, 1:24:31.16 pm UUID: b21dff42-e0d9-493d-bb8b-0830cd6034be Ancestors: Freetype-Plugin-eem.67 Try to make the Frteetype plugin load with only FT2Constants present.

1 0

VM Maker: VMMaker.oscog-djm.678.mcz
by commits＠source.squeak.org 17 Apr '14

17 Apr '14

Douglas McPherson uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-djm.678.mcz ==================== Summary ==================== Name: VMMaker.oscog-djm.678 Author: djm Time: 17 April 2014, 11:34:53.354 am UUID: 33f4c73e-5761-456b-a655-85ed057debfd Ancestors: VMMaker.oscog-djm.677 ThreadedARMFFIPlugin - fix compile problem caused by ffiPushPointer:in: - fix problem mediating between registers and stack after marshalling first 8 byte integer to stack - support backfilling of float registers when marshalling a double leaves an empty register due to alignmnet =============== Diff against VMMaker.oscog-djm.677 =============== Item was changed: ----- Method: ThreadedARMFFIPlugin>>ffiPushDoubleFloat:in: (in category 'marshalling') ----- ffiPushDoubleFloat: value in: calloutState <var: #value type: #double> <var: #calloutState type: #'CalloutState *'> <inline: true> + calloutState floatRegisterIndex < (NumFloatRegArgs - 1) ifTrue: + [(calloutState floatRegisterIndex bitAnd: 1) = 1 + ifTrue: + [calloutState backfillFloatRegisterIndex: calloutState floatRegisterIndex. + calloutState floatRegisterIndex: (calloutState floatRegisterIndex + 1)]. - [calloutState floatRegisterIndex: (calloutState floatRegisterIndex + 1 bitClear: 1). (self cCoerceSimple: (self addressOf: (calloutState floatRegisters at: calloutState floatRegisterIndex)) to: 'double*') at: 0 put: value. calloutState floatRegisterIndex: calloutState floatRegisterIndex + 2] ifFalse: [calloutState currentArg + 8 > calloutState limit ifTrue: [^FFIErrorCallFrameTooBig]. + calloutState floatRegisterIndex: NumFloatRegArgs. interpreterProxy storeFloatAtPointer: calloutState currentArg from: value. calloutState currentArg: calloutState currentArg + 8]. ^0! Item was changed: ----- Method: ThreadedARMFFIPlugin>>ffiPushPointer:in: (in category 'marshalling') ----- + ffiPushPointer: pointer in: calloutState + <var: #pointer type: #'void *'> - ffiPushPointer: value in: calloutState <var: #calloutState type: #'CalloutState *'> <inline: true> calloutState integerRegisterIndex < NumIntRegArgs ifTrue: + [calloutState integerRegisters at: calloutState integerRegisterIndex put: pointer. - [calloutState integerRegisters at: calloutState integerRegisterIndex put: value. calloutState integerRegisterIndex: calloutState integerRegisterIndex + 1] ifFalse: [calloutState currentArg + 4 > calloutState limit ifTrue: [^FFIErrorCallFrameTooBig]. + interpreterProxy longAt: calloutState currentArg put: pointer. - interpreterProxy longAt: calloutState currentArg put: value. calloutState currentArg: calloutState currentArg + 4]. ^0! Item was changed: ----- Method: ThreadedARMFFIPlugin>>ffiPushSignedLongLong:in: (in category 'marshalling') ----- ffiPushSignedLongLong: value in: calloutState <var: #value type: #sqLong> <var: #calloutState type: #'CalloutState *'> <inline: true> calloutState integerRegisterIndex < (NumIntRegArgs - 1) ifTrue: [calloutState integerRegisterIndex: (calloutState integerRegisterIndex + 1 bitClear: 1). calloutState integerRegisters at: calloutState integerRegisterIndex put: (self cCoerceSimple: value to: #usqInt). calloutState integerRegisters at: calloutState integerRegisterIndex + 1 put: (self cCoerceSimple: value >> 32 to: #usqInt). calloutState integerRegisterIndex: calloutState integerRegisterIndex + 2] ifFalse: [calloutState currentArg + 8 > calloutState limit ifTrue: [^FFIErrorCallFrameTooBig]. + calloutState integerRegisterIndex: NumIntRegArgs. interpreterProxy longAt: calloutState currentArg put: (self cCoerceSimple: value to: #usqInt); longAt: calloutState currentArg + 4 put: (self cCoerceSimple: value >> 32 to: #usqInt). calloutState currentArg: calloutState currentArg + 8]. ^0! Item was changed: ----- Method: ThreadedARMFFIPlugin>>ffiPushSingleFloat:in: (in category 'marshalling') ----- ffiPushSingleFloat: value in: calloutState + <var: #value type: #float> <var: #calloutState type: #'CalloutState *'> <inline: true> calloutState floatRegisterIndex < NumFloatRegArgs ifTrue: + [calloutState backfillFloatRegisterIndex > 0 + ifTrue: + [calloutState floatRegisters at: calloutState backfillFloatRegisterIndex put: value. + calloutState backfillFloatRegisterIndex: 0] + ifFalse: + [calloutState floatRegisters at: calloutState floatRegisterIndex put: value. + calloutState floatRegisterIndex: calloutState floatRegisterIndex + 1]] - [calloutState floatRegisters at: calloutState floatRegisterIndex put: (self cCoerceSimple: value to: #'float'). - calloutState floatRegisterIndex: calloutState floatRegisterIndex + 1] ifFalse: [calloutState currentArg + 4 > calloutState limit ifTrue: [^FFIErrorCallFrameTooBig]. interpreterProxy storeSingleFloatAtPointer: calloutState currentArg from: value. calloutState currentArg: calloutState currentArg + 4]. ^0! Item was changed: ----- Method: ThreadedARMFFIPlugin>>ffiPushUnsignedLongLong:in: (in category 'marshalling') ----- ffiPushUnsignedLongLong: value in: calloutState <var: #value type: #usqLong> <var: #calloutState type: #'CalloutState *'> <inline: true> calloutState integerRegisterIndex < (NumIntRegArgs - 1) ifTrue: [calloutState integerRegisterIndex: (calloutState integerRegisterIndex + 1 bitClear: 1). calloutState integerRegisters at: calloutState integerRegisterIndex put: (self cCoerceSimple: value to: #usqInt). calloutState integerRegisters at: calloutState integerRegisterIndex + 1 put: (self cCoerceSimple: value >> 32 to: #usqInt). calloutState integerRegisterIndex: calloutState integerRegisterIndex + 2] ifFalse: [calloutState currentArg + 8 > calloutState limit ifTrue: [^FFIErrorCallFrameTooBig]. + calloutState integerRegisterIndex: NumIntRegArgs. interpreterProxy longAt: calloutState currentArg put: (self cCoerceSimple: value to: #usqInt); longAt: calloutState currentArg + 4 put: (self cCoerceSimple: value >> 32 to: #usqInt). calloutState currentArg: calloutState currentArg + 8]. ^0 ! Item was changed: ThreadedFFICalloutState subclass: #ThreadedFFICalloutStateForARM + instanceVariableNames: 'integerRegisterIndex integerRegisters floatRegisterIndex backfillFloatRegisterIndex floatRegisters' - instanceVariableNames: 'integerRegisterIndex integerRegisters floatRegisterIndex floatRegisters' classVariableNames: '' poolDictionaries: '' category: 'VMMaker-Plugins'! Item was added: + ----- Method: ThreadedFFICalloutStateForARM>>backfillFloatRegisterIndex (in category 'accessing') ----- + backfillFloatRegisterIndex + + ^ backfillFloatRegisterIndex! Item was added: + ----- Method: ThreadedFFICalloutStateForARM>>backfillFloatRegisterIndex: (in category 'accessing') ----- + backfillFloatRegisterIndex: anObject + + ^backfillFloatRegisterIndex := anObject! Item was changed: ----- Method: ThreadedFFICalloutStateForARM>>initialize (in category 'initialize-release') ----- initialize super initialize. integerRegisterIndex := 0. floatRegisterIndex := 0. + backfillFloatRegisterIndex := 0. integerRegisters := CArrayAccessor on: (Array new: ThreadedARMFFIPlugin numIntRegArgs). floatRegisters := CArrayAccessor on: (Array new: ThreadedARMFFIPlugin numFloatRegArgs)!

1 0

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

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

Vm-dev April 2014