Fixes the build of the CLI tool. (#224)

solana-labs · Nov 13, 2021 · aa79a37 · aa79a37
1 parent 7ceff45
commit aa79a37
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/cli/Cargo.lock b/cli/Cargo.lock
diff --git a/cli/src/main.rs b/cli/src/main.rs
@@ -1,13 +1,15 @@
 use clap::{App, Arg};
 use solana_rbpf::{
     assembler::assemble,
-    ebpf,
-    memory_region::{MemoryMapping, MemoryRegion},
+    memory_region::MemoryMapping,
     static_analysis::Analysis,
     syscalls::Result,
     user_error::UserError,
     verifier::check,
-    vm::{Config, DynamicAnalysis, EbpfVm, Executable, SyscallObject, SyscallRegistry, TestInstructionMeter},
+    vm::{
+        Config, DynamicAnalysis, EbpfVm, Executable, SyscallObject, SyscallRegistry,
+        TestInstructionMeter,
+    },
 };
 use std::{fs::File, io::Read, path::Path};
 
@@ -185,16 +187,15 @@ fn main() {
             .parse::<u64>()
             .unwrap(),
     };
-    let heap = vec![
+    let mut heap = vec![
         0_u8;
         matches
             .value_of("memory")
             .unwrap()
             .parse::<usize>()
             .unwrap()
     ];
-    let heap_region = MemoryRegion::new_from_slice(&heap, ebpf::MM_HEAP_START, 0, true);
-    let mut vm = EbpfVm::new(executable.as_ref(), &mut mem, &[heap_region]).unwrap();
+    let mut vm = EbpfVm::new(executable.as_ref(), &mut mem, &mut heap).unwrap();
     for (hash, name) in analysis.executable.get_syscall_symbols() {
         vm.bind_syscall_context_object(Box::new(MockSyscall { name: name.clone() }), Some(*hash))
             .unwrap();