Merge pull request #25 from nervosnetwork/fix-469

Fix build for nervosnetwork/ckb-vm#469

Author: xxuejie

binary/src/asm64.rs

@@ -1,7 +1,7 @@
 use ckb_vm::{
     machine::{
-        asm::{AsmCoreMachine, AsmMachine},
-        DefaultMachineBuilder, VERSION2,
+        asm::{AsmCoreMachine, AsmDefaultMachineBuilder, AsmMachine},
+        DefaultMachineRunner, SupportMachine, VERSION2,
     },
     ISA_A, ISA_B, ISA_IMC, ISA_MOP,
 };
@@ -13,12 +13,12 @@ fn main() {
     let code = std::fs::read(args[0].clone()).unwrap().into();
     let args = args.into_iter().map(|a| Ok(a.into()));
 
-    let asm_core = AsmCoreMachine::new(
+    let asm_core = <AsmCoreMachine as SupportMachine>::new(
         ISA_IMC | ISA_A | ISA_B | ISA_MOP,
         VERSION2,
         u64::max_value(),
     );
-    let core = DefaultMachineBuilder::new(asm_core).build();
+    let core = AsmDefaultMachineBuilder::new(asm_core).build();
     let mut machine = AsmMachine::new(core);
     machine.load_program(&code, args).unwrap();
     let result = machine.run();

binary/src/interpreter32.rs

@@ -1,5 +1,8 @@
 use ckb_vm::{
-    machine::{trace::TraceMachine, DefaultCoreMachine, DefaultMachineBuilder, VERSION2},
+    machine::{
+        trace::TraceMachine, DefaultCoreMachine, DefaultMachineRunner, RustDefaultMachineBuilder,
+        SupportMachine, VERSION2,
+    },
     memory::wxorx::WXorXMemory,
     SparseMemory, ISA_A, ISA_B, ISA_IMC, ISA_MOP,
 };
@@ -16,7 +19,7 @@ fn main() {
         VERSION2,
         u64::MAX,
     );
-    let mut machine = TraceMachine::new(DefaultMachineBuilder::new(core_machine).build());
+    let mut machine = TraceMachine::new(RustDefaultMachineBuilder::new(core_machine).build());
     machine.load_program(&code, args).unwrap();
     let result = machine.run();
     if result != Ok(0) {

binary/src/interpreter64.rs

@@ -1,5 +1,8 @@
 use ckb_vm::{
-    machine::{trace::TraceMachine, DefaultCoreMachine, DefaultMachineBuilder, VERSION2},
+    machine::{
+        trace::TraceMachine, DefaultCoreMachine, DefaultMachineRunner, RustDefaultMachineBuilder,
+        SupportMachine, VERSION2,
+    },
     memory::wxorx::WXorXMemory,
     SparseMemory, ISA_A, ISA_B, ISA_IMC, ISA_MOP,
 };
@@ -16,7 +19,7 @@ fn main() {
         VERSION2,
         u64::MAX,
     );
-    let mut machine = TraceMachine::new(DefaultMachineBuilder::new(core_machine).build());
+    let mut machine = TraceMachine::new(RustDefaultMachineBuilder::new(core_machine).build());
     machine.load_program(&code, args).unwrap();
     let result = machine.run();
     if result != Ok(0) {