Vm-dev October 2014

vm-dev@lists.squeakfoundation.org

38 participants
133 discussions

[commit][3089] update ARM mvm etc files to include cleaner fastblt building
by commits＠squeakvm.org 03 Oct '14

03 Oct '14

Revision: 3089 Author: rowledge Date: 2014-10-02 17:06:43 -0700 (Thu, 02 Oct 2014) Log Message: ----------- update ARM mvm etc files to include cleaner fastblt building Modified Paths: -------------- branches/Cog/build.linux32ARMv6/makeall Modified: branches/Cog/build.linux32ARMv6/makeall =================================================================== --- branches/Cog/build.linux32ARMv6/makeall 2014-10-03 00:04:54 UTC (rev 3088) +++ branches/Cog/build.linux32ARMv6/makeall 2014-10-03 00:06:43 UTC (rev 3089) @@ -1,6 +1,6 @@ #!/bin/bash trap 'exit 2' HUP INT PIPE TERM -for d in newspeak.cog.* newspeak.stack.* squeak.*; do +for d in squeak.*; do if test -d "$d"; then (cd $d;./makeallclean "$@") else

1 0

[commit][3088] update ARM mvm etc files to include cleaner fastblt building
by commits＠squeakvm.org 03 Oct '14

03 Oct '14

Revision: 3088 Author: rowledge Date: 2014-10-02 17:04:54 -0700 (Thu, 02 Oct 2014) Log Message: ----------- update ARM mvm etc files to include cleaner fastblt building Modified Paths: -------------- branches/Cog/build.linux32ARMv6/squeak.stack.v3/build/mvm branches/Cog/build.linux32ARMv6/squeak.stack.v3/build.assert/mvm branches/Cog/build.linux32ARMv6/squeak.stack.v3/build.assert/plugins.ext branches/Cog/build.linux32ARMv6/squeak.stack.v3/build.assert/plugins.int branches/Cog/build.linux32ARMv6/squeak.stack.v3/build.debug/mvm branches/Cog/build.linux32ARMv6/squeak.stack.v3/build.debug/plugins.ext branches/Cog/build.linux32ARMv6/squeak.stack.v3/build.debug/plugins.int Modified: branches/Cog/build.linux32ARMv6/squeak.stack.v3/build/mvm =================================================================== --- branches/Cog/build.linux32ARMv6/squeak.stack.v3/build/mvm 2014-09-30 23:39:10 UTC (rev 3087) +++ branches/Cog/build.linux32ARMv6/squeak.stack.v3/build/mvm 2014-10-03 00:04:54 UTC (rev 3088) @@ -22,7 +22,7 @@ --without-vm-display-fbdev --without-npsqueak \ CC="gcc " \ CXX="g++ " \ - CFLAGS="$OPT -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -DI_REALLY_DONT_CARE_HOW_UNSAFE_THIS_IS" \ + CFLAGS="$OPT -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -DENABLE_FAST_BLT -DI_REALLY_DONT_CARE_HOW_UNSAFE_THIS_IS" \ LIBS="-lpthread -luuid" \ LDFLAGS=-Wl,-z,now rm -f vm/sqUnixMain.o # nuke version info Modified: branches/Cog/build.linux32ARMv6/squeak.stack.v3/build.assert/mvm =================================================================== --- branches/Cog/build.linux32ARMv6/squeak.stack.v3/build.assert/mvm 2014-09-30 23:39:10 UTC (rev 3087) +++ branches/Cog/build.linux32ARMv6/squeak.stack.v3/build.assert/mvm 2014-10-03 00:04:54 UTC (rev 3088) @@ -1,6 +1,6 @@ #!/bin/bash # assert Stack VM with VM profiler and threaded heartbeat -INSTALLDIR=assert/stklinuxht +INSTALLDIR=assert/stklinuxhtARM OPT="-g3 -O1 -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer -DDEBUGVM=0" if [ $# -ge 1 ]; then @@ -16,13 +16,13 @@ test -f config.h || ../../../platforms/unix/config/configure \ --with-src=stacksrc --with-plugins=src/plugins --disable-cogit \ --without-vm-display-fbdev --without-npsqueak \ - CC="gcc -m32" \ - CXX="g++ -m32" \ - CFLAGS="$OPT -msse2 -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64" \ + CC="gcc " \ + CXX="g++ " \ + CFLAGS="$OPT -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -DENABLE_FAST_BLT -DI_REALLY_DONT_CARE_HOW_UNSAFE_THIS_IS" \ LIBS="-lpthread -luuid" \ LDFLAGS=-Wl,-z,now rm -f vm/sqUnixMain.o # nuke version info rm -rf ../../../products/$INSTALLDIR # prefer make install prefix=`readlink -f \`pwd\`/../../../products/$INSTALLDIR` -# but older linux readlinks lack the -f flag +# but older linux readlinks lack the -f flag and Raspbian lacks `readlinks` make install prefix=`(cd ../../../;pwd)`/products/$INSTALLDIR 2>&1 | tee LOG Modified: branches/Cog/build.linux32ARMv6/squeak.stack.v3/build.assert/plugins.ext =================================================================== --- branches/Cog/build.linux32ARMv6/squeak.stack.v3/build.assert/plugins.ext 2014-09-30 23:39:10 UTC (rev 3087) +++ branches/Cog/build.linux32ARMv6/squeak.stack.v3/build.assert/plugins.ext 2014-10-03 00:04:54 UTC (rev 3088) @@ -1,8 +1,5 @@ # Copied, perhaps edited, from ../../src/examplePlugins.ext EXTERNAL_PLUGINS = \ -B3DAcceleratorPlugin \ -SqueakFFIPrims \ -SqueakSSL \ LocalePlugin \ UnixOSProcessPlugin \ UUIDPlugin \ Modified: branches/Cog/build.linux32ARMv6/squeak.stack.v3/build.assert/plugins.int =================================================================== --- branches/Cog/build.linux32ARMv6/squeak.stack.v3/build.assert/plugins.int 2014-09-30 23:39:10 UTC (rev 3087) +++ branches/Cog/build.linux32ARMv6/squeak.stack.v3/build.assert/plugins.int 2014-10-03 00:04:54 UTC (rev 3088) @@ -15,7 +15,6 @@ FilePlugin \ FloatArrayPlugin \ FloatMathPlugin \ -IA32ABI \ JoystickTabletPlugin \ JPEGReaderPlugin \ JPEGReadWriter2Plugin \ Modified: branches/Cog/build.linux32ARMv6/squeak.stack.v3/build.debug/mvm =================================================================== --- branches/Cog/build.linux32ARMv6/squeak.stack.v3/build.debug/mvm 2014-09-30 23:39:10 UTC (rev 3087) +++ branches/Cog/build.linux32ARMv6/squeak.stack.v3/build.debug/mvm 2014-10-03 00:04:54 UTC (rev 3088) @@ -1,6 +1,6 @@ #!/bin/bash # debug Stack VM with VM profiler and threaded heartbeat -INSTALLDIR=debug/stklinuxht +INSTALLDIR=debug/stklinuxhtARM OPT="-g3 -O0 -DDEBUGVM=1" if [ $# -ge 1 ]; then @@ -15,14 +15,14 @@ esac test -f config.h || ../../../platforms/unix/config/configure \ --with-src=stacksrc --with-plugins=src/plugins --disable-cogit \ - --without-vm-display-fbdev --without-npsqueak \ - CC="gcc -m32" \ - CXX="g++ -m32" \ - CFLAGS="$OPT -msse2 -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64" \ + --without-vm-display-fbdev --without-npsqueak\ + CC="gcc " \ + CXX="g++ " \ + CFLAGS="$OPT -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -DENABLE_FAST_BLT -DI_REALLY_DONT_CARE_HOW_UNSAFE_THIS_IS" \ LIBS="-lpthread -luuid" \ LDFLAGS=-Wl,-z,now rm -f vm/sqUnixMain.o # nuke version info rm -rf ../../../products/$INSTALLDIR # prefer make install prefix=`readlink -f \`pwd\`/../../../products/$INSTALLDIR` -# but older linux readlinks lack the -f flag +# but older linux readlinks lack the -f flag and Raspbian lacks `readlinks` make install prefix=`(cd ../../../;pwd)`/products/$INSTALLDIR 2>&1 | tee LOG Modified: branches/Cog/build.linux32ARMv6/squeak.stack.v3/build.debug/plugins.ext =================================================================== --- branches/Cog/build.linux32ARMv6/squeak.stack.v3/build.debug/plugins.ext 2014-09-30 23:39:10 UTC (rev 3087) +++ branches/Cog/build.linux32ARMv6/squeak.stack.v3/build.debug/plugins.ext 2014-10-03 00:04:54 UTC (rev 3088) @@ -1,9 +1,7 @@ # Copied, perhaps edited, from ../../src/examplePlugins.ext EXTERNAL_PLUGINS = \ -B3DAcceleratorPlugin \ -SqueakFFIPrims \ -SqueakSSL \ LocalePlugin \ UnixOSProcessPlugin \ UUIDPlugin \ +UnicodePlugin \ XDisplayControlPlugin Modified: branches/Cog/build.linux32ARMv6/squeak.stack.v3/build.debug/plugins.int =================================================================== --- branches/Cog/build.linux32ARMv6/squeak.stack.v3/build.debug/plugins.int 2014-09-30 23:39:10 UTC (rev 3087) +++ branches/Cog/build.linux32ARMv6/squeak.stack.v3/build.debug/plugins.int 2014-10-03 00:04:54 UTC (rev 3088) @@ -15,7 +15,6 @@ FilePlugin \ FloatArrayPlugin \ FloatMathPlugin \ -IA32ABI \ JoystickTabletPlugin \ JPEGReaderPlugin \ JPEGReadWriter2Plugin \

1 0

VM Maker: VMMaker-bf.351.mcz
by commits＠source.squeak.org 01 Oct '14

01 Oct '14

Bert Freudenberg uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker-bf.351.mcz ==================== Summary ==================== Name: VMMaker-bf.351 Author: bf Time: 1 October 2014, 10:20:50.38 am UUID: af5fd014-b9f4-4d17-80fa-2abd7b2b263b Ancestors: VMMaker-dtl.350 Do not hard-code ".c" module file extension. =============== Diff against VMMaker-dtl.350 =============== Item was changed: ----- Method: ADPCMCodecPlugin class>>translateInDirectory:doInlining: (in category 'translation') ----- translateInDirectory: directory doInlining: inlineFlag "handle a special case code string rather than generated code" "Not currently hooked into the timeStamp mechanism for VMMaker since this would mean replicating code from InterpreterPlugin; waiting for a more elegant solution to appear. In the meantime this means that this plugin will always get regenerated even if the file is uptodate" | cg aClass | self initialize. cg := self buildCodeGenerator. aClass := Smalltalk at: #ADPCMCodec ifAbsent:[nil]. aClass ifNil:[ Transcript cr; show: 'ADPCMCodec not present in image. Skipping plugin.'. ^self]. cg addMethodsForPrimitives: aClass translatedPrimitives. inlineFlag ifTrue:[ "now remove a few which will be inlined but not pruned" cg pruneMethods: #(indexForDeltaFrom:to: nextBits: nextBits:put:)]. + self storeString: cg generateCodeStringForPrimitives onFileNamed: (directory fullNameFor: self moduleFileName). - self storeString: cg generateCodeStringForPrimitives onFileNamed: (directory fullNameFor: self moduleName, '.c'). ^cg exportedPrimitiveNames asArray ! Item was added: + ----- Method: InterpreterPlugin class>>moduleFileName (in category 'accessing') ----- + moduleFileName + "Answer the file name to generate our source code in" + + ^ self moduleName, self moduleExtension! Item was changed: ----- Method: InterpreterPlugin class>>translateInDirectory:doInlining: (in category 'translation') ----- translateInDirectory: directory doInlining: inlineFlag "This is the default method for writing out sources for a plugin. Several classes need special handling, so look at all implementors of this message" | cg fname fstat | + fname := self moduleFileName. - fname := self moduleName, '.c'. "don't translate if the file is newer than my timeStamp" fstat := directory entryAt: fname ifAbsent:[nil]. fstat ifNotNil:[self timeStamp < fstat modificationTime ifTrue:[^nil]]. self initialize. cg := self buildCodeGenerator. cg storeCodeOnFile: (directory fullNameFor: fname) doInlining: inlineFlag. ^cg exportedPrimitiveNames asArray! Item was changed: ----- Method: MiscPrimitivePlugin class>>translateInDirectory:doInlining: (in category 'translation') ----- translateInDirectory: directory doInlining: inlineFlag "handle a special case code string rather than normal generated code." | cg fname fstat | + fname := self moduleFileName. - fname := self moduleName, '.c'. "don't translate if the file is newer than my timeStamp" fstat := directory entryAt: fname ifAbsent:[nil]. fstat ifNotNil:[self timeStamp < fstat modificationTime ifTrue:[^nil]]. self initialize. cg := self buildCodeGenerator. cg addMethodsForPrimitives: self translatedPrimitives. self storeString: cg generateCodeStringForPrimitives onFileNamed: (directory fullNameFor: fname). ^cg exportedPrimitiveNames asArray ! Item was changed: ----- Method: SmartSyntaxInterpreterPlugin class>>translateDoInlining:locally:debug: (in category 'translation') ----- translateDoInlining: inlineFlag locally: localFlag debug: debugFlag ^ self + translate: self moduleFileName - translate: self moduleName , '.c' doInlining: inlineFlag locally: localFlag debug: debugFlag! Item was changed: ----- Method: SoundGenerationPlugin class>>translateInDirectory:doInlining: (in category 'accessing') ----- translateInDirectory: directory doInlining: inlineFlag "handle a special case code string rather than generated code. NB sqOldSoundsPrims IS NOT FULLY INTEGRATED - it still isn't included in the exports list" | cg aClass | self initialize. cg := self buildCodeGenerator. aClass := Smalltalk at: #AbstractSound ifAbsent:[nil]. aClass ifNil:[ Transcript cr; show: 'AbstractSound not present in image. Skipping plugin.'. ^self]. cg addMethodsForPrimitives: aClass translatedPrimitives. + self storeString: cg generateCodeStringForPrimitives onFileNamed: (directory fullNameFor: self moduleFileName). - self storeString: cg generateCodeStringForPrimitives onFileNamed: (directory fullNameFor: self moduleName, '.c'). "What we need here is some way to derive the prim names from sqOldSoundPrims - or dump it entirely. Perhaps add this class (without then generating the file again) using fake entry points like SurfacePlugin does" ^cg exportedPrimitiveNames asArray !

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

Vm-dev October 2014