[Vm-dev] [commit][3279] Add image/buildspurtrunkvmmakerimage.
sh to build a Spur VMMaker image starting
commits at squeakvm.org
commits at squeakvm.org
Wed Mar 18 00:01:34 UTC 2015
Revision: 3279
Author: eliot
Date: 2015-03-17 17:01:30 -0700 (Tue, 17 Mar 2015)
Log Message:
-----------
Add image/buildspurtrunkvmmakerimage.sh to build a Spur VMMaker image starting
from the latest Spur image on mirandabanda.org.
Add image/buildspurtrunkreaderimage.sh to build a simple REPL image suitable
for VMMaker development in the simulator.
Update image/getGoodSpurVM.sh et al to use the 3268 VMs.
Nuke the .deps directories in processors/ARM/gdb-7.6.
Update processors/ARM/mac/BUILDarmsim.sh to clone processors/ARM/gdb-7.6.
Make the GdbARMPlugin as part of the build.macos32x86/squeak.cog.v3 build.
Modified Paths:
--------------
branches/Cog/build.macos32x86/squeak.cog.v3/makevm
branches/Cog/image/README
branches/Cog/image/VM Simulation Workspace.text
branches/Cog/image/buildspurtrunkimage.sh
branches/Cog/image/buildspurtrunkvmmakerimage.sh
branches/Cog/image/getGoodCogVM.sh
branches/Cog/image/getGoodSpurNsvm.sh
branches/Cog/image/getGoodSpurVM.sh
branches/Cog/processors/ARM/README
branches/Cog/processors/ARM/gdb-7.6/sim/arm/armos.c
branches/Cog/processors/ARM/mac/BUILDarmsim.sh
Added Paths:
-----------
branches/Cog/build.macos32x86/squeak.cog.v3/GdbARMPlugin/
branches/Cog/image/BuildSqueakSpurTrunkVMMakerImage.st
branches/Cog/image/LoadReader.st
branches/Cog/image/StartReader.st
branches/Cog/image/UpdateSqueakTrunkImage.st
branches/Cog/image/UpdateSqueakTrunkImageAndMorphFloat.st
branches/Cog/image/buildspurtrunkreaderimage.sh
branches/Cog/image/ensureSqueakV41sources.sh
branches/Cog/image/getlatestspurtrunkimage.sh
Removed Paths:
-------------
branches/Cog/image/UpdateSqueakTrunkImage.st
branches/Cog/processors/ARM/gdb-7.6/opcodes/.deps/
branches/Cog/processors/ARM/gdb-7.6/sim/arm/.deps/
branches/Cog/processors/ARM/gdb-7.6/sim/common/.deps/
Property Changed:
----------------
branches/Cog/build.macos32x86/squeak.cog.spur/GdbARMPlugin/
Property changes on: branches/Cog/build.macos32x86/squeak.cog.spur/GdbARMPlugin
___________________________________________________________________
Added: svn:ignore
+ build
Property changes on: branches/Cog/build.macos32x86/squeak.cog.v3/GdbARMPlugin
___________________________________________________________________
Added: svn:ignore
+ build
Modified: branches/Cog/build.macos32x86/squeak.cog.v3/makevm
===================================================================
--- branches/Cog/build.macos32x86/squeak.cog.v3/makevm 2015-03-17 20:58:58 UTC (rev 3278)
+++ branches/Cog/build.macos32x86/squeak.cog.v3/makevm 2015-03-18 00:01:30 UTC (rev 3279)
@@ -125,6 +125,18 @@
echo "not building BochsIA32Plugin; support libraries unavailable"
fi
+# Build the GdbARMPlugin
+# N.B. To build the plugin you also have to build the gdb ARM sim libraries in
+# ../../processors/ARM/mac.
+if test -f ../../processors/ARM/mac/gdb-7.6/opcodes/libopcodes.a; then
+echo GdbARMPlugin xcodebuild -configuration $XCD_BUILD_CONFIGURATION -project GdbARMPlugin/GdbARMPlugin.xcodeproj
+xcodebuild -configuration $XCD_BUILD_CONFIGURATION -project GdbARMPlugin/GdbARMPlugin.xcodeproj
+rm -rf "$DEST/Contents/Resources/GdbARMPlugin.bundle"
+cp -R GdbARMPlugin/build/$XCD_BUILD_CONFIGURATION/GdbARMPlugin.bundle "$DEST/Contents/Resources"
+else
+echo "not building GdbARMPlugin; support libraries unavailable"
+fi
+
# Build the UnixOSProcessPlugin
echo UnixOSProcessPlugin xcodebuild -configuration $XCD_BUILD_CONFIGURATION -project UnixOSProcessPlugin/UnixOSProcessPlugin.xcodeproj
xcodebuild -configuration $XCD_BUILD_CONFIGURATION -project UnixOSProcessPlugin/UnixOSProcessPlugin.xcodeproj
Copied: branches/Cog/image/BuildSqueakSpurTrunkVMMakerImage.st (from rev 3216, branches/Cog/image/BuildSqueak45VMMakerImage.st)
===================================================================
--- branches/Cog/image/BuildSqueakSpurTrunkVMMakerImage.st (rev 0)
+++ branches/Cog/image/BuildSqueakSpurTrunkVMMakerImage.st 2015-03-18 00:01:30 UTC (rev 3279)
@@ -0,0 +1,77 @@
+| manifest load |
+manifest := #( ('http://source.squeak.org/FFI' 1 ('FFI-Pools' 'FFI-Kernel'))
+ ('http://source.squeak.org/VMMaker' 6 ('Balloon-Engine-Pools' 'BytecodeSets.spur' 'VMMaker.oscog' 'CogCompatibility' 'Cog' 'CogTools' 'ImageFormat'))
+ ('http://ss3.gemstone.com/ss/MethodMassage' 3 ('MethodMassage' 'MethodMassageCompatibility'))
+ ('http://www.squeaksource.com/AioPlugin' 7 ('VMConstruction-Plugins-AioPlugin'))
+ ('http://www.squeaksource.com/Alien' 0 ('Alien'))
+ "('http://www.squeaksource.com/FreeTypePlus' 5 ('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/rb' 5 ('AST-Core' 'AST-Semantic' 'AST-Tests-Core' 'AST-Tests-Semantic' 'Refactoring-Changes' 'Refactoring-Core' 'Refactoring-Environment' 'Refactoring-Tests-Changes' 'Refactoring-Tests-Core' 'Refactoring-Tests-Environment'))
+ ('http://www.squeaksource.com/Speech' 2 ('SharedPool-Speech' ))
+ ('http://www.squeaksource.com/XDCP' 9 ('VMConstruction-Plugins-XDisplayControlPlugin' ))).
+
+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].
+
+Character instSize > 0 ifTrue:
+ [#('callPrimitiveShimForV3.st') do:
+ [:fileName| (FileDirectory default fileNamed: fileName) fileIn]].
+
+#( "'FT2Constants.st'"
+ 'Object-performwithwithwithwithwith.st' ) do:
+ [:fileName| (FileDirectory default fileNamed: fileName) fileIn].
+
+load do:
+ [:tuple|
+ [:repository :order :packages|
+ packages do:
+ [:package| | latestVersion |
+ "We need to filter-out branches of unbranched packages."
+ latestVersion := (repository versionNamesForPackageNamed: package) detect:
+ [:versionName| (versionName at: package size + 1) = $-].
+ [| version |
+ version := ((MCCacheRepository default includesVersionNamed: latestVersion)
+ ifTrue: [MCCacheRepository default]
+ ifFalse: [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].
+
+World findATranscript: nil.
+
+#( 'Workspace' 'VM Simulation Workspace' 'Slang Test Workspace' ) reverse do:
+ [:textFileName|
+ (StringHolder new contents: (FileDirectory default fileNamed: textFileName, '.text') contentsOfEntireFile)
+ openLabel: textFileName].
+
+(Utilities classPool at: #CommonRequestStrings) ifNotNil:
+ [:crs|
+ crs contents: crs contents, '\-\VMMaker generateConfiguration\VMMaker generateAllConfigurationsUnderVersionControl\VMClass openCogMultiWindowBrowser\VMClass openObjectMemoriesInterpretersBrowser\VMClass openSpurMultiWindowBrowser' withCRs].
+
+CodeHolder useMultiWindowBrowsers: true.
+
+#('Cog' 'CogTools' 'VMMaker') do:
+ [:pkg|
+ (PackageInfo named: pkg) classes do:
+ [:c|
+ c organization sortCategories.
+ c class organization sortCategories]].
+StackInterpreter withAllSubclasses do:
+ [:sic| sic reorganizeAsISeeFit].
+
+Smalltalk snapshot: true andQuit: true
Added: branches/Cog/image/LoadReader.st
===================================================================
--- branches/Cog/image/LoadReader.st (rev 0)
+++ branches/Cog/image/LoadReader.st 2015-03-18 00:01:30 UTC (rev 3279)
@@ -0,0 +1,22 @@
+| repository package latestVersion |
+repository := MCHttpRepository
+ location: 'http://source.squeak.org/VMMaker'
+ user: 'squeak'
+ password: 'squeak'.
+package := 'CogTools-Listener'.
+"We need to filter-out branches of unbranched packages."
+latestVersion := (repository versionNamesForPackageNamed: package) detect:
+ [:versionName| (versionName at: package size + 1) = $-].
+[| version |
+version := ((MCCacheRepository default includesVersionNamed: latestVersion)
+ ifTrue: [MCCacheRepository default]
+ ifFalse: [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].
+
+Smalltalk snapshot: true andQuit: true
Modified: branches/Cog/image/README
===================================================================
--- branches/Cog/image/README 2015-03-17 20:58:58 UTC (rev 3278)
+++ branches/Cog/image/README 2015-03-18 00:01:30 UTC (rev 3279)
@@ -1,4 +1,8 @@
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.
+
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.
Added: branches/Cog/image/StartReader.st
===================================================================
--- branches/Cog/image/StartReader.st (rev 0)
+++ branches/Cog/image/StartReader.st 2015-03-18 00:01:30 UTC (rev 3279)
@@ -0,0 +1,6 @@
+Transcript clear.
+Smalltalk snapshot: true andQuit: true.
+[[Processor activeProcess bindToThreadId: 2]
+ on: Error
+ do: [:ex|].
+ StdioListener new run] forkAt: Processor activePriority + 1
Deleted: branches/Cog/image/UpdateSqueakTrunkImage.st
===================================================================
--- branches/Cog/image/UpdateSqueakTrunkImage.st 2015-03-17 20:58:58 UTC (rev 3278)
+++ branches/Cog/image/UpdateSqueakTrunkImage.st 2015-03-18 00:01:30 UTC (rev 3279)
@@ -1,8 +0,0 @@
-"Change the update stream to trunk, update, then build as per 4.5"
-[MCMcmUpdater
- defaultUpdateURL: 'http://source.squeak.org/trunk';
- updateFromServer] valueSupplyingAnswer: true.
-
-(FileStream oldFileNamed: 'MorphFloat.st') fileIn.
-
-Smalltalk snapshot: true andQuit: true
Added: branches/Cog/image/UpdateSqueakTrunkImage.st
===================================================================
--- branches/Cog/image/UpdateSqueakTrunkImage.st (rev 0)
+++ branches/Cog/image/UpdateSqueakTrunkImage.st 2015-03-18 00:01:30 UTC (rev 3279)
@@ -0,0 +1,5 @@
+"Simply update, assuming the update stream is set correctly."
+
+[MCMcmUpdater updateFromServer] valueSupplyingAnswer: true.
+
+Smalltalk snapshot: true andQuit: true
Copied: branches/Cog/image/UpdateSqueakTrunkImageAndMorphFloat.st (from rev 3216, branches/Cog/image/UpdateSqueakTrunkImage.st)
===================================================================
--- branches/Cog/image/UpdateSqueakTrunkImageAndMorphFloat.st (rev 0)
+++ branches/Cog/image/UpdateSqueakTrunkImageAndMorphFloat.st 2015-03-18 00:01:30 UTC (rev 3279)
@@ -0,0 +1,8 @@
+"Change the update stream to trunk, update, then build as per 4.5"
+[MCMcmUpdater
+ defaultUpdateURL: 'http://source.squeak.org/trunk';
+ updateFromServer] valueSupplyingAnswer: true.
+
+(FileStream oldFileNamed: 'MorphFloat.st') fileIn.
+
+Smalltalk snapshot: true andQuit: true
Modified: branches/Cog/image/VM Simulation Workspace.text
===================================================================
--- branches/Cog/image/VM Simulation Workspace.text 2015-03-17 20:58:58 UTC (rev 3278)
+++ branches/Cog/image/VM Simulation Workspace.text 2015-03-18 00:01:30 UTC (rev 3279)
@@ -1,5 +1,15 @@
-("Run the VM simulator on an image (by default the Squeak 4.5 image:)"
+("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 |
+cos := CogVMSimulator newWithOptions: #(Cogit StackToRegisterMappingCogit "SimpleStackBasedCogit"
+ ObjectMemory Spur32BitCoMemoryManager
+ "ISA ARMV5" "ISA IA32").
+"cos initializeThreadSupport."
+cos desiredNumStackPages: 8.
+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."
+| cos proc opts |
cos := CogVMSimulator newWithOptions: #(Cogit StackToRegisterMappingCogit "SimpleStackBasedCogit").
"cos initializeThreadSupport."
cos desiredNumStackPages: 8.
@@ -32,4 +42,4 @@
StackToRegisterMappingCogit
genAndDis: SequenceableCollection>>#indexOf:startingAt:ifAbsent:
- options: #(ObjectMemory Spur32BitCoMemoryManager)
+ options: #(ObjectMemory Spur32BitCoMemoryManager ISA ARMV5)
Modified: branches/Cog/image/buildspurtrunkimage.sh
===================================================================
--- branches/Cog/image/buildspurtrunkimage.sh 2015-03-17 20:58:58 UTC (rev 3278)
+++ branches/Cog/image/buildspurtrunkimage.sh 2015-03-18 00:01:30 UTC (rev 3279)
@@ -1,4 +1,5 @@
#!/bin/sh
+# This is (in a way) obsoleted by getlatestspurtrunkimage.sh
. ./envvars.sh
./getsqueak45.sh
. ./getGoodCogVM.sh
Added: branches/Cog/image/buildspurtrunkreaderimage.sh
===================================================================
--- branches/Cog/image/buildspurtrunkreaderimage.sh (rev 0)
+++ branches/Cog/image/buildspurtrunkreaderimage.sh 2015-03-18 00:01:30 UTC (rev 3279)
@@ -0,0 +1,21 @@
+#!/bin/sh
+# Build a Spur image that starts up in a simple REPL, which is
+# really useful for VMMaker simulation testing.
+. ./envvars.sh
+
+if [ ! -f trunk46-spur.image -o ! -f trunk46-spur.changes ]; then
+ ./getlatestspurtrunkimage.sh
+fi
+
+./ensureSqueakV41sources.sh
+
+cp -p trunk46-spur.image spurreader.image
+cp -p trunk46-spur.changes spurreader.changes
+
+. ./getGoodSpurVM.sh
+
+echo $VM spurreader.image LoadReader.st
+$VM spurreader.image LoadReader.st
+
+echo $VM spurreader.image StartReader.st
+$VM spurreader.image StartReader.st
Property changes on: branches/Cog/image/buildspurtrunkreaderimage.sh
___________________________________________________________________
Added: svn:executable
+ *
Modified: branches/Cog/image/buildspurtrunkvmmakerimage.sh
===================================================================
--- branches/Cog/image/buildspurtrunkvmmakerimage.sh 2015-03-17 20:58:58 UTC (rev 3278)
+++ branches/Cog/image/buildspurtrunkvmmakerimage.sh 2015-03-18 00:01:30 UTC (rev 3279)
@@ -2,12 +2,18 @@
. ./envvars.sh
if [ ! -f trunk46-spur.image -o ! -f trunk46-spur.changes ]; then
- ./buildspurtrunkimage.sh
+ ./getlatestspurtrunkimage.sh
fi
+
+./ensureSqueakV41sources.sh
+
cp -p trunk46-spur.image SpurVMMaker.image
cp -p trunk46-spur.changes SpurVMMaker.changes
. ./getGoodSpurVM.sh
-echo $VM SpurVMMaker.image BuildSqueak45VMMakerImage.st
-$VM SpurVMMaker.image BuildSqueak45VMMakerImage.st
+echo $VM SpurVMMaker.image UpdateSqueakTrunkImage.st
+$VM SpurVMMaker.image UpdateSqueakTrunkImage.st
+
+echo $VM SpurVMMaker.image BuildSqueakSpurTrunkVMMakerImage.st
+$VM SpurVMMaker.image BuildSqueakSpurTrunkVMMakerImage.st
Added: branches/Cog/image/ensureSqueakV41sources.sh
===================================================================
--- branches/Cog/image/ensureSqueakV41sources.sh (rev 0)
+++ branches/Cog/image/ensureSqueakV41sources.sh 2015-03-18 00:01:30 UTC (rev 3279)
@@ -0,0 +1,8 @@
+#!/bin/bash
+test -f SqueakV41.sources && exit 0
+if [ -f ../sources/SqueakV41.sources ]; then
+ ln ../sources/SqueakV41.sources .
+ exit 0
+fi
+geturl http://ftp.squeak.org/sources_files/SqueakV41.sources.gz
+gunzip SqueakV41.sources.gz
Property changes on: branches/Cog/image/ensureSqueakV41sources.sh
___________________________________________________________________
Added: svn:executable
+ *
Modified: branches/Cog/image/getGoodCogVM.sh
===================================================================
--- branches/Cog/image/getGoodCogVM.sh 2015-03-17 20:58:58 UTC (rev 3278)
+++ branches/Cog/image/getGoodCogVM.sh 2015-03-18 00:01:30 UTC (rev 3279)
@@ -1,32 +1,32 @@
#!/bin/sh
-# Sets the VM env var to the r3104 Cog VM for the current platform.
+# Sets the VM env var to the r3268 Cog VM for the current platform.
# will download and install the VM in this directory if necessary.
-TAG=14.41.3104
-REV=3104
-LCBINDIR=4.0-3104
+TAG=15.10.3268
+REV=3268
+LCBINDIR=4.0-3268
URL=http://www.mirandabanda.org/files/Cog/VM/VM.r$REV/
. ./envvars.sh
case "$OS" in
Darwin) get_vm_from_tar \
- Cog.app/Contents/MacOS/Squeak 87bccfaa11dafb2c8c16850cbd021fb2 \
- Cog.app-$TAG.tgz 3e75109726f0970a4e0e61869d1be212
+ Cog.app/Contents/MacOS/Squeak 18b8c3dc580175d8868fc344a7a95906 \
+ Cog.app-$TAG.tgz 02e5a264b75d8acefe18f41b968281ec
VM=Cog.app/Contents/MacOS/Squeak;;
Linux)
if expr $OSREL \> 2.6.12; then
get_vm_from_tar \
- coglinuxht/lib/squeak/$LCBINDIR/squeak 706c5ffb7023bd0a9a43d7b6c847df73 \
- coglinuxht-$TAG.tgz 9d09d5420139535a07af343418ee9985
+ coglinuxht/lib/squeak/$LCBINDIR/squeak 389b8f9f2ad00e11ddcd44afeb53a39d \
+ coglinuxht-$TAG.tgz c7559e6ac6771d746139c83f06245072
else
get_vm_from_tar \
- coglinux/lib/squeak/$LCBINDIR/squeak 1c7188ef81af887abd84b159af52bdaf \
- coglinux-$TAG.tgz d67b929fbbd20542abb62aaf8cc8cbca
+ coglinux/lib/squeak/$LCBINDIR/squeak 8287d559a685cd126b6f77695c25b220 \
+ coglinux-$TAG.tgz 41d1f31a723ed131232312b544430f36
fi;;
CYGWIN*) get_vm_from_zip \
- cogwin/SqueakConsole.exe a68530a6d08d2d043eb16ecb932b7383 \
- cogwin-$TAG.zip a66ba06907bdfdde191b1bf45a495cd2
+ cogwin/SqueakConsole.exe 76821340c77c1e8b43840872eb92f89f \
+ cogwin-$TAG.zip 93c057fb51fc3db82e7cbf39a19496f4
VM=cogwin/SqueakConsole.exe;;
*) echo "don't know how to run Squeak on your system. bailing out." 1>&2; exit 2
esac
Modified: branches/Cog/image/getGoodSpurNsvm.sh
===================================================================
--- branches/Cog/image/getGoodSpurNsvm.sh 2015-03-17 20:58:58 UTC (rev 3278)
+++ branches/Cog/image/getGoodSpurNsvm.sh 2015-03-18 00:01:30 UTC (rev 3279)
@@ -1,26 +1,26 @@
#!/bin/sh
-# Sets the VM env var to the r3105 Newspeak Spur VM for the current platform.
+# Sets the VM env var to the r3268 Newspeak Spur VM for the current platform.
# will download and install the VM in this directory if necessary.
-TAG=14.41.3105
-REV=3105
-LSBINDIR=5.0-3105
+TAG=15.10.3268
+REV=3268
+LSBINDIR=5.0-3268
URL=http://www.mirandabanda.org/files/Cog/VM/VM.r$REV/
. ./envvars.sh
case "$OS" in
Darwin) get_vm_from_tar \
- "Newspeak Spur Virtual Machine.app/Contents/MacOS/Newspeak Virtual Machine" b9b6885517bb1ddcc33f1f042b66fc2f \
- "Newspeak Spur Virtual Machine.app-$TAG.tgz" 516e07fcdd4987ceaa9ce2a1452dc6ce
+ "Newspeak Spur Virtual Machine.app/Contents/MacOS/Newspeak Virtual Machine" ea1cfd302b5ae8605bab46398ad28f7e \
+ "Newspeak Spur Virtual Machine.app-$TAG.tgz" c58a21bc7ffb3438579ec44f38694140
VM="Newspeak Spur Virtual Machine.app/Contents/MacOS/Newspeak Virtual Machine";;
Linux) get_vm_from_tar \
nsvmspurlinuxht/lib/nsvm/$LSBINDIR/nsvm \
- nsvmspurlinuxht-$TAG.tgz 6e8cb761b039cc754887fa88a78cf5f7
+ nsvmspurlinuxht-$TAG.tgz 9aeb16c69e87f6dd1b648bf666ed2042
VM=nsvmspurlinuxht/nsvm;;
CYGWIN*) get_vm_from_zip \
- nsvmspurwin/nsvmConsole.exe f89c87da16fe250063d3b3623b868e33 \
- nsvmspurwin-$TAG.zip 763b6c882f65a573c7615eb53f2b3aa7
+ nsvmspurwin/nsvmConsole.exe 9dfd02a8ea55465d449cb82aa73a4f1d \
+ nsvmspurwin-$TAG.zip b399741939f826e95f987278840b846d
VM=nsvmspurwin/nsvmConsole.exe;;
*) echo "don't know how to run nsvm on your system. bailing out." 1>&2; exit 2
esac
Modified: branches/Cog/image/getGoodSpurVM.sh
===================================================================
--- branches/Cog/image/getGoodSpurVM.sh 2015-03-17 20:58:58 UTC (rev 3278)
+++ branches/Cog/image/getGoodSpurVM.sh 2015-03-18 00:01:30 UTC (rev 3279)
@@ -1,26 +1,26 @@
#!/bin/sh
-# Sets the VM env var to the r3105 Cog Spur VM for the current platform.
+# Sets the VM env var to the r3268 Cog Spur VM for the current platform.
# will download and install the VM in this directory if necessary.
-TAG=14.41.3105
-REV=3105
-LSBINDIR=5.0-3105
+TAG=15.10.3268
+REV=3268
+LSBINDIR=5.0-3268
URL=http://www.mirandabanda.org/files/Cog/VM/VM.r$REV/
. ./envvars.sh
case "$OS" in
Darwin) get_vm_from_tar \
- CogSpur.app/Contents/MacOS/Squeak 13b57f63961b57045300785c8e116a56 \
- CogSpur.app-$TAG.tgz dae4205b5790577d0190c0c05f9548d0
+ CogSpur.app/Contents/MacOS/Squeak 208143bb3195626fb1894f22848e9139 \
+ CogSpur.app-$TAG.tgz 4b7d0968102a9bf2d60d4b2c85a54243
VM=CogSpur.app/Contents/MacOS/Squeak;;
Linux) get_vm_from_tar \
- cogspurlinuxht/lib/squeak/$LSBINDIR/squeak 795aee1bd9a3d21eb1d02ecabf23b53a \
- cogspurlinuxht-$TAG.tgz fa3c82f64d6b9ea38618a1a60df8bb50
+ cogspurlinuxht/lib/squeak/$LSBINDIR/squeak 544bec4d35b0e3d11df7f1452c79d5f5 \
+ cogspurlinuxht-$TAG.tgz 0b0e8451025d7bd00c33645ce3d1b6d1
VM=cogspurlinuxht/squeak;;
CYGWIN*) get_vm_from_zip \
- cogspurwin/SqueakConsole.exe 7e33a679a9125743460894498308a612 \
- cogspurwin-$TAG.zip 015eb95c8850d2aade5d731e3cd617d8
+ cogspurwin/SqueakConsole.exe 7f8658b9aebb9edeaaa0eab1c8cf5b3b \
+ cogspurwin-$TAG.zip a6fac7266bce08f91953433e51e2b94c
VM=cogspurwin/SqueakConsole.exe;;
*) echo "don't know how to run Squeak on your system. bailing out." 1>&2; exit 2
esac
Added: branches/Cog/image/getlatestspurtrunkimage.sh
===================================================================
--- branches/Cog/image/getlatestspurtrunkimage.sh (rev 0)
+++ branches/Cog/image/getlatestspurtrunkimage.sh 2015-03-18 00:01:30 UTC (rev 3279)
@@ -0,0 +1,5 @@
+#!/bin/bash
+. ./envvars.sh
+
+geturl http://www.mirandabanda.org/files/Cog/SpurImages/trunk46-spur.image
+geturl http://www.mirandabanda.org/files/Cog/SpurImages/trunk46-spur.changes
Property changes on: branches/Cog/image/getlatestspurtrunkimage.sh
___________________________________________________________________
Added: svn:executable
+ *
Modified: branches/Cog/processors/ARM/README
===================================================================
--- branches/Cog/processors/ARM/README 2015-03-17 20:58:58 UTC (rev 3278)
+++ branches/Cog/processors/ARM/README 2015-03-18 00:01:30 UTC (rev 3279)
@@ -1,9 +1,6 @@
-To build the GdbARMPlugin on linux (currently only supported on linux) get
-gdb-7.6, e.g. from http://www.gnu.org/software/gdb/download/gdb-7.6.tar.gz
-Unpack it here so one obtains platforms/ARM/gdb-7.6
+To build the GdbARMPlugin on linux (currently only supported on linux & 32-bit
+Mac OS X) make sure you have binutils and libiberty installed. e.g.
-Then make sure you have binutils and libiberty installed. e.g.
-
CentOS configuration for binutils and libiberty
yum install buinutils-devel
yum install compat-gcc-34
@@ -11,6 +8,8 @@
Ubuntu configuration for binutils and libiberty
sudo apt-get install binutils-dev libiberty-dev
+The gdb-7.6 here is a subtly modified version of, um, gdb-7.6.
+
Then
cd gdb-7.6/opcodes # i.e. processors/ARM/gdb-7.6/opcodes
Modified: branches/Cog/processors/ARM/gdb-7.6/sim/arm/armos.c
===================================================================
--- branches/Cog/processors/ARM/gdb-7.6/sim/arm/armos.c 2015-03-17 20:58:58 UTC (rev 3278)
+++ branches/Cog/processors/ARM/gdb-7.6/sim/arm/armos.c 2015-03-18 00:01:30 UTC (rev 3279)
@@ -457,7 +457,7 @@
// TPR - This is the SWI number which is returned by our memory interface
// if there is an instruction fetch for an illegal address.
// this #define stolen from GdbARMPlugin.h and ought to be done better
- #define InstructionPrefetchError 5
+# define InstructionPrefetchError 5
state->Emulate = STOP;
state->EndCondition = InstructionPrefetchError;
Modified: branches/Cog/processors/ARM/mac/BUILDarmsim.sh
===================================================================
--- branches/Cog/processors/ARM/mac/BUILDarmsim.sh 2015-03-17 20:58:58 UTC (rev 3278)
+++ branches/Cog/processors/ARM/mac/BUILDarmsim.sh 2015-03-18 00:01:30 UTC (rev 3279)
@@ -3,14 +3,8 @@
# gdb-7.6/opcodes/libopcodes.a
# gdb-7.6/sim/arm/libsim.a
-test -d gdb-7.6 || unzip ../ARM-gdb-7.6.zip
+test -d gdb-7.6 || svn export ../gdb-7.6
-#TARGET='--target=arm-linux'
-#BUILD='--build=i386-apple-darwin9'
-#CFLAGS='CFLAGS=\"-arch i386 -g -O2\"'
-#LDFLAGS='LDFLAGS=\"-arch i386\"'
-#./configure "$TARGET" "$BUILD" "$CFLAGS" "$LDFLAGS"
-
ln -s ../../binutils-2.25/bfd/bfd.h gdb-7.6/bfd/bfd.h
ln -s ../../binutils-2.25/bfd/config.h gdb-7.6/bfd/config.h
libtool -V >gdb-7.6/bfd/libtool-soversion
More information about the Vm-dev
mailing list