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

runtime/vm/unit_test.h

 // Copyright (c) 2011, 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.
 
 #ifndef RUNTIME_VM_UNIT_TEST_H_
 #define RUNTIME_VM_UNIT_TEST_H_
 
 #include "include/dart_native_api.h"
 
 #include "platform/globals.h"
@@ skipping 224 matching lines @@
 
 namespace dart {
 
 // Forward declarations.
 class Assembler;
 class CodeGenerator;
 class VirtualMemory;
 
 
 namespace bin {
-// vm_isolate_snapshot_buffer points to a snapshot for the vm isolate if we
-// link in a snapshot otherwise it is initialized to NULL.
-extern const uint8_t* vm_isolate_snapshot_buffer;
-
-// isolate_snapshot_buffer points to a snapshot for an isolate if we link in a
-// snapshot otherwise it is initialized to NULL.
-extern const uint8_t* core_isolate_snapshot_buffer;
+// Snapshot pieces if we link in a snapshot, otherwise initialized to NULL.
+extern const uint8_t* vm_snapshot_data;
+extern const uint8_t* vm_snapshot_instructions;
+extern const uint8_t* core_isolate_snapshot_data;
+extern const uint8_t* core_isolate_snapshot_instructions;
 }
 
 
 class TestCaseBase {
  public:
   explicit TestCaseBase(const char* name);
   virtual ~TestCaseBase() {}
 
   const char* name() const { return name_; }
 
@@ skipping 27 matching lines @@
                                     bool finalize = true);
   static Dart_Handle LoadCoreTestScript(const char* script,
                                         Dart_NativeEntryResolver resolver);
   static Dart_Handle lib();
   static const char* url() { return USER_TEST_URI; }
   static Dart_Isolate CreateTestIsolateFromSnapshot(uint8_t* buffer,
                                                     const char* name = NULL) {
     return CreateIsolate(buffer, name);
   }
   static Dart_Isolate CreateTestIsolate(const char* name = NULL) {
-    return CreateIsolate(bin::core_isolate_snapshot_buffer, name);
+    return CreateIsolate(bin::core_isolate_snapshot_data, name);
   }
   static Dart_Handle library_handler(Dart_LibraryTag tag,
                                      Dart_Handle library,
                                      Dart_Handle url);
   static char* BigintToHexValue(Dart_CObject* bigint);
 
   virtual void Run();
 
   // Sets |script| to be the source used at next reload.
   static void SetReloadTestScript(const char* script);
@@ skipping 306 matching lines @@
   ~SetFlagScope() { *flag_ = original_value_; }
 
  private:
   T* flag_;
   T original_value_;
 };
 
 }  // namespace dart
 
 #endif  // RUNTIME_VM_UNIT_TEST_H_