[Vm-dev] [commit][3670] Format the VM Simulation Workspace in the sequence-of-blocks style so that

[commits at squeakvm.org]

Revision: 3670
Author:   eliot
Date:     2016-04-08 10:20:32 -0700 (Fri, 08 Apr 2016)
Log Message:
-----------
Format the VM Simulation Workspace in the sequence-of-blocks style so that
syntax highlighting works.
Make the README generator write the correct info for dpiAware on Windows
depending on the flavour of the month for the Manifest files.

Modified Paths:
--------------
    branches/Cog/image/VM Simulation Workspace.text
    branches/Cog/scripts/uploadvms

Modified: branches/Cog/image/VM Simulation Workspace.text
===================================================================
--- branches/Cog/image/VM Simulation Workspace.text	2016-04-05 18:42:16 UTC (rev 3669)
+++ branches/Cog/image/VM Simulation Workspace.text	2016-04-08 17:20:32 UTC (rev 3670)
@@ -1,22 +1,22 @@
-("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 |
+"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").
 "cos initializeThreadSupport."
 cos desiredNumStackPages: 8.
 cos openOn: 'spurreader.image'.
-cos openAsMorph; run)
+cos openAsMorph; run].
 
-("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 |
+"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)
+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 |
+"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."
 cos desiredNumStackPages: 8.
@@ -37,15 +37,16 @@
 "cos cogit
 	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."
+cos openAsMorph; run].
 
-SimpleStackBasedCogit genAndDis: SequenceableCollection>>#indexOf:startingAt:ifAbsent:
+"See what code the JIT generates for as method in the current image. Disassembly to transcript."
 
-StackToRegisterMappingCogit genAndDis: SequenceableCollection>>#indexOf:startingAt:ifAbsent:
+[SimpleStackBasedCogit genAndDis: SequenceableCollection>>#indexOf:startingAt:ifAbsent:].
 
-SistaStackToRegisterMappingCogit genAndDis: SequenceableCollection>>#indexOf:startingAt:ifAbsent:
+[StackToRegisterMappingCogit genAndDis: SequenceableCollection>>#indexOf:startingAt:ifAbsent:].
 
-StackToRegisterMappingCogit
+[SistaStackToRegisterMappingCogit genAndDis: SequenceableCollection>>#indexOf:startingAt:ifAbsent:].
+
+[StackToRegisterMappingCogit
 	genAndDis: SequenceableCollection>>#indexOf:startingAt:ifAbsent:
-	options: #(ObjectMemory Spur32BitCoMemoryManager ISA ARMv5)
+	options: #(ObjectMemory Spur32BitCoMemoryManager ISA ARMv5)].
\ No newline at end of file

Modified: branches/Cog/scripts/uploadvms
===================================================================
--- branches/Cog/scripts/uploadvms	2016-04-05 18:42:16 UTC (rev 3669)
+++ branches/Cog/scripts/uploadvms	2016-04-08 17:20:32 UTC (rev 3670)
@@ -234,13 +234,26 @@
         ulimit -r 2
         exec setuidgid <account> ./coglinuxht/squeak -vm display-null -vm sound-null squeak.image
 
+THEEND
+if grep -s '<dpiAware>true</dpiAware>'; then
+cat <<THEEND >>../history/README.$REV
      Windows
      The Windows VMs are "dpiAware", which means that by default the display is
      not scaled and display pixels are mapped 1 to 1 to the screen.  If this
      behaviour is not desired you can enable scaling by either editing the
-     relevant manifest file (e.g.  Squeak.exe.manifest), changing the "true" in
+     relevant manifest file (e.g. Squeak.exe.manifest), changing the "true" in
      <dpiAware>true</dpiAware> to "false", or simply deleting the manifest file.
 THEEND
+else
+cat <<THEEND >>../history/README.$REV
+     Windows
+     The Windows VMs are not "dpiAware", which means that by default the display
+     is scaled and display pixels are not directly mapped to screen pixels.  If
+     this behaviour is not desired you can disable scaling by editing the VM's
+     manifest file (e.g. Squeak.exe.manifest), changing the "false" in
+     <dpiAware>false</dpiAware> to "true", or simply deleting the manifest file.
+THEEND
+fi
 	echo getting svn log
 	svn log ../platforms/Cross/vm/sqSCCSVersion.h >>../history/README.$REV
 	vi ../history/README.$REV