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

runtime/vm/benchmark_test.h

 // 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.
 
 #ifndef RUNTIME_VM_BENCHMARK_TEST_H_
 #define RUNTIME_VM_BENCHMARK_TEST_H_
 
 #include "include/dart_api.h"
 
 #include "vm/dart.h"
 #include "vm/globals.h"
 #include "vm/heap.h"
 #include "vm/isolate.h"
 #include "vm/object.h"
 #include "vm/zone.h"
 
 namespace dart {
 
 DECLARE_FLAG(int, code_heap_size);
 DECLARE_FLAG(int, old_gen_growth_space_ratio);
 
 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;
 }
 
 // The BENCHMARK macros are used for benchmarking a specific functionality
 // of the VM.
 #define BENCHMARK_HELPER(name, kind)                                           \
   void Dart_Benchmark##name(Benchmark* benchmark);                             \
   static Benchmark kRegister##name(Dart_Benchmark##name, #name, kind);         \
   static void Dart_BenchmarkHelper##name(Benchmark* benchmark,                 \
                                          Thread* thread);                      \
   void Dart_Benchmark##name(Benchmark* benchmark) {                            \
@@ skipping 35 matching lines @@
     tail_ = this;
   }
 
   // Accessors.
   const char* name() const { return name_; }
   const char* score_kind() const { return score_kind_; }
   void set_score(int64_t value) { score_ = value; }
   int64_t score() const { return score_; }
   Isolate* isolate() const { return reinterpret_cast<Isolate*>(isolate_); }
 
-  Dart_Isolate CreateIsolate(const uint8_t* buffer);
+  Dart_Isolate CreateIsolate(const uint8_t* snapshot_data,
+                             const uint8_t* snapshot_instructions);
 
   void Run() { (*run_)(this); }
   void RunBenchmark();
 
   static void RunAll(const char* executable);
   static void SetExecutable(const char* arg) { executable_ = arg; }
   static const char* Executable() { return executable_; }
 
  private:
   static Benchmark* first_;
   static Benchmark* tail_;
   static const char* executable_;
 
   RunEntry* const run_;
   const char* name_;
   const char* score_kind_;
   int64_t score_;
   Dart_Isolate isolate_;
   Benchmark* next_;
 
   DISALLOW_COPY_AND_ASSIGN(Benchmark);
 };
 
 
 class BenchmarkIsolateScope {
  public:
   explicit BenchmarkIsolateScope(Benchmark* benchmark) : benchmark_(benchmark) {
-    benchmark_->CreateIsolate(bin::core_isolate_snapshot_buffer);
+    benchmark_->CreateIsolate(bin::core_isolate_snapshot_data,
+                              bin::core_isolate_snapshot_instructions);
     Dart_EnterScope();  // Create a Dart API scope for unit benchmarks.
   }
   ~BenchmarkIsolateScope() {
     Dart_ExitScope();  // Exit the Dart API scope created for unit tests.
     ASSERT(benchmark_->isolate() == Isolate::Current());
     Dart_ShutdownIsolate();
     benchmark_ = NULL;
   }
   Benchmark* benchmark() const { return benchmark_; }
 
  private:
   Benchmark* benchmark_;
 
   DISALLOW_COPY_AND_ASSIGN(BenchmarkIsolateScope);
 };
 
 }  // namespace dart
 
 #endif  // RUNTIME_VM_BENCHMARK_TEST_H_