[Vm-dev] [commit][3286] Small tweaks to VMMakewr image build scripts and readmes, including a checksum

[commits at squeakvm.org]

Revision: 3286
Author:   eliot
Date:     2015-03-23 19:11:16 -0700 (Mon, 23 Mar 2015)
Log Message:
-----------
Small tweaks to VMMakewr image build scripts and readmes, including a checksum
for the SPur trunk images.

Modified Paths:
--------------
    branches/Cog/image/README
    branches/Cog/image/VM Simulation Workspace.text
    branches/Cog/image/getlatestspurtrunkimage.sh
    branches/Cog/image/uploadspurimage.sh

Modified: branches/Cog/image/README
===================================================================
--- branches/Cog/image/README	2015-03-24 00:36:07 UTC (rev 3285)
+++ branches/Cog/image/README	2015-03-24 02:11:16 UTC (rev 3286)
@@ -1,11 +1,12 @@
 This directory contains scripts that can buld various VMMaker and Spur images.
 As of early 2015 the default VMMaker build script is
-	buildspurvmmakerimage.sh
-and it builds a Spur VMMaker image.
+	buildspurtrunkvmmakerimage.sh
+and it builds a Spur VMMaker image, called SpurVMMaker.image.
+The buildspurtrunkreader.sh script builds a Spur image containing a simple REPL
+that is convenient for testing in the simulator, called spurreader.image.
 
 The standard Cog VMMaker image is built loading the latest VMMaker.oscog and Cog
-packages, plus support packages, into an updated Squeak trunk image.
-You can build this image using buildsqueaktrunkvmmakerimage.sh.
+packages, plus support packages, into an updated Squeak Spur trunk image.
 Once you start-up the image various workspaces contain useful expressions to
 run the simulator, test slang output and so on.  The "do..." menu off the main
 screen menu also contains expressions to generate VM sources.

Modified: branches/Cog/image/VM Simulation Workspace.text
===================================================================
--- branches/Cog/image/VM Simulation Workspace.text	2015-03-24 00:36:07 UTC (rev 3285)
+++ branches/Cog/image/VM Simulation Workspace.text	2015-03-24 02:11:16 UTC (rev 3286)
@@ -1,5 +1,5 @@
-("Run the VM simulator on a Spur image (by default the Spur trunk 4.6 image, complex options are in the Cog example below)"
-| cos proc opts |
+("Run the Cog VM simulator on a Spur image (by default the Spur trunk 4.6 image, complex options are in the Cog example below)"
+| cos |
 cos := CogVMSimulator newWithOptions: #(Cogit StackToRegisterMappingCogit "SimpleStackBasedCogit"
 										ObjectMemory Spur32BitCoMemoryManager
 										"ISA ARMV5" "ISA IA32").
@@ -8,7 +8,14 @@
 cos openOn: 'spurreader.image'.
 cos openAsMorph; run)
 
-("Run the VM simulator on a Cog image (by default the Squeak 4.5 image:).  Note the plethora of optional debug features in comments."
+("Run the Stack VM simulator on a Spur image (by default the Spur trunk 4.6 image, complex options are in the Cog example below)"
+| cos |
+cos := StackInterpreterSimulator newWithOptions: #(ObjectMemory Spur32BitMemoryManager).
+cos desiredNumStackPages: 8.
+cos openOn: 'spurreader.image'.
+cos openAsMorph; run)
+
+("Run the Cog VM simulator on a Cog image (by default the Squeak 4.5 image:).  Note the plethora of optional debug features in comments."
 | cos proc opts |
 cos := CogVMSimulator newWithOptions: #(Cogit StackToRegisterMappingCogit "SimpleStackBasedCogit").
 "cos initializeThreadSupport."
@@ -31,7 +38,6 @@
 	cog: 16rAB0B28 + cos startOfMemory
 	selector: 16r31F280 + cos startOfMemory." "e.g. jit a specific method without simulating"
 cos openAsMorph; run)
-
 ("See what code the JIT generates for as method in the current image. Disassembly to transcript."
 
 SimpleStackBasedCogit genAndDis: SequenceableCollection>>#indexOf:startingAt:ifAbsent:
Modified: branches/Cog/image/getlatestspurtrunkimage.sh
===================================================================
--- branches/Cog/image/getlatestspurtrunkimage.sh	2015-03-24 00:36:07 UTC (rev 3285)
+++ branches/Cog/image/getlatestspurtrunkimage.sh	2015-03-24 02:11:16 UTC (rev 3286)
@@ -3,3 +3,6 @@
 
 geturl http://www.mirandabanda.org/files/Cog/SpurImages/trunk46-spur.image
 geturl http://www.mirandabanda.org/files/Cog/SpurImages/trunk46-spur.changes
+geturl http://www.mirandabanda.org/files/Cog/SpurImages/trunk46-spur.sum
+
+cksum trunk46-spur.changes trunk46-spur.image | diff - trunk46-spur.sum >/dev/null && ls -l trunk46-spur.image trunk46-spur.changes || echo image and/or changes have wrong checksum 1>&2

Modified: branches/Cog/image/uploadspurimage.sh
===================================================================
--- branches/Cog/image/uploadspurimage.sh	2015-03-24 00:36:07 UTC (rev 3285)
+++ branches/Cog/image/uploadspurimage.sh	2015-03-24 02:11:16 UTC (rev 3286)
@@ -9,16 +9,17 @@
 
 test "$1" = -here || cd `dirname $0`
 echo uploading trunk46-spur from `pwd`
+cksum $BASENAME.[ci]* >$BASENAME.sum
 
 DIR=$RemoteRoot/$DATE
 echo ssh -x $RemoteUser mkdir $DIR
 ssh -x $RemoteUser mkdir $DIR
-echo scp -p $BASENAME.image $BASENAME.changes "$@" $RemoteUser:$DIR
+echo scp -p $BASENAME.image $BASENAME.changes $BASENAME.sum "$@" $RemoteUser:$DIR
 scp -p $BASENAME.image $BASENAME.changes "$@" $RemoteUser:$DIR
 echo ssh $RemoteUser chmod a-w $DIR/* \\\; ls -al $DIR
 ssh $RemoteUser chmod a-w $DIR/* \; ls -al $DIR
 echo ssh $RemoteUser rm $RemoteRoot/{$BASENAME.image,$BASENAME.changes}
 ssh $RemoteUser rm $RemoteRoot/{$BASENAME.image,$BASENAME.changes}
 echo ssh $RemoteUser cd $RemoteRoot \\\; ln -s $DATE/{$BASENAME.image,$BASENAME.changes} .
-ssh $RemoteUser cd $RemoteRoot \; ln -s $DATE/{$BASENAME.image,$BASENAME.changes} .
+ssh $RemoteUser cd $RemoteRoot \; ln -s $DATE/{$BASENAME.image,$BASENAME.changes,$BASENAME.sum} .
 ssh $RemoteUser ls -l $RemoteRoot $RemoteRoot/$DATE