Refactor snapshots pieces to include a section for loading instructions into the heap of a regular …

runtime/tools/create_snapshot_bin.py

 #!/usr/bin/env python
 #
 # Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 # for details. All rights reserved. Use of this source code is governed by a
 # BSD-style license that can be found in the LICENSE file.
 
 """Script to create snapshot bin file."""
 
 import getopt
 import optparse
@@ skipping 14 matching lines @@
       action="store", type="string",
       help="path to snapshot generator executable")
   result.add_option("--vm_output_bin",
       action="store", type="string",
       help="output file name into which vm isolate snapshot in binary form " +
            "is generated")
   result.add_option("--output_bin",
       action="store", type="string",
       help="output file name into which isolate snapshot in binary form " +
            "is generated")
-  result.add_option("--instructions_bin",
-      action="store", type="string",
-      help="output file name into which instructions snapshot in assembly " +
-           "form is generated")
   result.add_option("--embedder_entry_points_manifest",
       action="store", type="string",
       help="input manifest with the vm entry points in a precompiled snapshot")
   result.add_option("--script",
       action="store", type="string",
       help="Dart script for which snapshot is to be generated")
   result.add_option("--package_root",
       action="store", type="string",
       help="path used to resolve package: imports.")
   result.add_option("--packages",
@@ skipping 64 matching lines @@
 
   # Pass along the package_root if there is one.
   if options.package_root:
     script_args.append(''.join([ "--package_root=", options.package_root]))
 
   # Pass along the packages if there is one.
   if options.packages:
     script_args.append(''.join([ "--packages=", options.packages]))
 
   # First setup the vm isolate and regular isolate snapshot output filename.
-  script_args.append(''.join([ "--vm_isolate_snapshot=",
-                               options.vm_output_bin ]))
-  script_args.append(''.join([ "--isolate_snapshot=", options.output_bin ]))
-
-  # Setup the instuctions snapshot output filename
-  if options.instructions_bin:
-    script_args.append(''.join([ "--instructions_snapshot=",
-                                 options.instructions_bin ]))
+  script_args.append(''.join([ "--vm_snapshot_data=", options.vm_output_bin ]))
+  script_args.append(''.join([ "--isolate_snapshot_data=", options.output_bin ]))
 
   # Specify the embedder entry points snapshot
   if options.embedder_entry_points_manifest:
     script_args.append(''.join([ "--embedder_entry_points_manifest=",
                                  options.embedder_entry_points_manifest ]))
 
   # Next setup all url mapping options specified.
   for url_arg in options.url_mapping:
     url_mapping_argument = ''.join(["--url_mapping=", url_arg ])
     script_args.append(url_mapping_argument)
@@ skipping 11 matching lines @@
     return -1
 
   # Success, update timestamp file.
   CreateTimestampFile(options)
 
   return 0
 
 
 if __name__ == '__main__':
   sys.exit(Main())