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

runtime/vm/dart.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_DART_H_
 #define RUNTIME_VM_DART_H_
 
 #include "include/dart_api.h"
 #include "vm/allocation.h"
 #include "vm/snapshot.h"
 
 namespace dart {
 
 // Forward declarations.
 class DebugInfo;
 class Isolate;
 class LocalHandle;
 class RawError;
 class ReadOnlyHandles;
 class ThreadPool;
 namespace kernel {
 class Program;
 }
 
 class Dart : public AllStatic {
  public:
-  static char* InitOnce(const uint8_t* vm_isolate_snapshot,
-                        const uint8_t* instructions_snapshot,
-                        const uint8_t* data_snapshot,
+  static char* InitOnce(const uint8_t* vm_snapshot_data,
+                        const uint8_t* vm_snapshot_instructions,
                         Dart_IsolateCreateCallback create,
                         Dart_IsolateShutdownCallback shutdown,
                         Dart_ThreadExitCallback thread_exit,
                         Dart_FileOpenCallback file_open,
                         Dart_FileReadCallback file_read,
                         Dart_FileWriteCallback file_write,
                         Dart_FileCloseCallback file_close,
                         Dart_EntropySource entropy_source,
                         Dart_GetVMServiceAssetsArchive get_service_assets);
   static const char* Cleanup();
 
   static Isolate* CreateIsolate(const char* name_prefix,
                                 const Dart_IsolateFlags& api_flags);
 
   // Initialize an isolate, either from a snapshot, from a Kernel binary, or
   // from SDK library sources.  If the snapshot_buffer is non-NULL,
   // initialize from a snapshot or a Kernel binary depending on the value of
   // from_kernel.  Otherwise, initialize from sources.
-  static RawError* InitializeIsolate(const uint8_t* snapshot_buffer,
+  static RawError* InitializeIsolate(const uint8_t* snapshot_data,
+                                     const uint8_t* snapshot_instructions,
                                      intptr_t snapshot_length,
                                      kernel::Program* kernel_program,
                                      void* data);
   static void RunShutdownCallback();
   static void ShutdownIsolate(Isolate* isolate);
   static void ShutdownIsolate();
 
   static Isolate* vm_isolate() { return vm_isolate_; }
   static ThreadPool* thread_pool() { return thread_pool_; }
 
   static int64_t UptimeMicros();
   static int64_t UptimeMillis() {
     return UptimeMicros() / kMicrosecondsPerMillisecond;
   }
 
   static void set_pprof_symbol_generator(DebugInfo* value) {
     pprof_symbol_generator_ = value;
   }
   static DebugInfo* pprof_symbol_generator() { return pprof_symbol_generator_; }
 
   static LocalHandle* AllocateReadOnlyApiHandle();
   static bool IsReadOnlyApiHandle(Dart_Handle handle);
 
   static uword AllocateReadOnlyHandle();
   static bool IsReadOnlyHandle(uword address);
 
   static const char* FeaturesString(Snapshot::Kind kind);
-
-  static Snapshot::Kind snapshot_kind() { return snapshot_kind_; }
-  static const uint8_t* instructions_snapshot_buffer() {
-    return instructions_snapshot_buffer_;
-  }
-  static void set_instructions_snapshot_buffer(const uint8_t* buffer) {
-    instructions_snapshot_buffer_ = buffer;
-  }
-  static const uint8_t* data_snapshot_buffer() { return data_snapshot_buffer_; }
-  static void set_data_snapshot_buffer(const uint8_t* buffer) {
-    data_snapshot_buffer_ = buffer;
-  }
+  static Snapshot::Kind vm_snapshot_kind() { return vm_snapshot_kind_; }
 
   static Dart_ThreadExitCallback thread_exit_callback() {
     return thread_exit_callback_;
   }
   static void set_thread_exit_callback(Dart_ThreadExitCallback cback) {
     thread_exit_callback_ = cback;
   }
   static void SetFileCallbacks(Dart_FileOpenCallback file_open,
                                Dart_FileReadCallback file_read,
                                Dart_FileWriteCallback file_write,
@@ skipping 26 matching lines @@
 
  private:
   static void WaitForIsolateShutdown();
   static void WaitForApplicationIsolateShutdown();
 
   static Isolate* vm_isolate_;
   static int64_t start_time_micros_;
   static ThreadPool* thread_pool_;
   static DebugInfo* pprof_symbol_generator_;
   static ReadOnlyHandles* predefined_handles_;
-  static Snapshot::Kind snapshot_kind_;
-  static const uint8_t* instructions_snapshot_buffer_;
-  static const uint8_t* data_snapshot_buffer_;
+  static Snapshot::Kind vm_snapshot_kind_;
   static Dart_ThreadExitCallback thread_exit_callback_;
   static Dart_FileOpenCallback file_open_callback_;
   static Dart_FileReadCallback file_read_callback_;
   static Dart_FileWriteCallback file_write_callback_;
   static Dart_FileCloseCallback file_close_callback_;
   static Dart_EntropySource entropy_source_callback_;
 };
 
 }  // namespace dart
 
 #endif  // RUNTIME_VM_DART_H_