diff --git a/lib/dynasm-backend/src/codegen_x64_v2.rs b/lib/dynasm-backend/src/codegen_x64_v2.rs
new file mode 100644
index 000000000..6cab89843
--- /dev/null
+++ b/lib/dynasm-backend/src/codegen_x64_v2.rs
@@ -0,0 +1,439 @@
+#![allow(clippy::forget_copy)] // Used by dynasm.
+
+use super::codegen::*;
+use crate::protect_unix;
+use byteorder::{ByteOrder, LittleEndian};
+use dynasmrt::{
+    x64::Assembler, AssemblyOffset, DynamicLabel, DynasmApi, DynasmLabelApi, ExecutableBuffer,
+};
+use std::cell::RefCell;
+use std::ptr::NonNull;
+use std::{any::Any, collections::HashMap, sync::Arc};
+use wasmer_runtime_core::{
+    backend::{FuncResolver, ProtectedCaller, Token, UserTrapper},
+    error::{RuntimeError, RuntimeResult},
+    memory::MemoryType,
+    module::{ModuleInfo, ModuleInner},
+    structures::{Map, TypedIndex},
+    types::{
+        FuncIndex, FuncSig, ImportedMemoryIndex, LocalFuncIndex, LocalGlobalIndex,
+        LocalMemoryIndex, LocalOrImport, MemoryIndex, SigIndex, Type, Value,
+    },
+    units::Pages,
+    vm::{self, ImportBacking, LocalGlobal, LocalMemory, LocalTable},
+};
+use wasmparser::{Operator, Type as WpType};
+use crate::machine::*;
+use crate::emitter_x64::*;
+
+pub struct X64ModuleCodeGenerator {
+    functions: Vec<X64FunctionCode>,
+    signatures: Option<Arc<Map<SigIndex, FuncSig>>>,
+    function_signatures: Option<Arc<Map<FuncIndex, SigIndex>>>,
+    function_labels: Option<HashMap<usize, (DynamicLabel, Option<AssemblyOffset>)>>,
+    assembler: Option<Assembler>,
+    func_import_count: usize,
+}
+
+pub struct X64FunctionCode {
+    signatures: Arc<Map<SigIndex, FuncSig>>,
+    function_signatures: Arc<Map<FuncIndex, SigIndex>>,
+
+    begin_offset: AssemblyOffset,
+    assembler: Option<Assembler>,
+    function_labels: Option<HashMap<usize, (DynamicLabel, Option<AssemblyOffset>)>>,
+    br_table_data: Option<Vec<Vec<usize>>>,
+    returns: Vec<WpType>,
+    locals: Vec<Location>,
+    num_params: usize,
+    value_stack: Vec<Location>,
+    control_stack: Vec<ControlFrame>,
+    machine: Machine,
+    unreachable_depth: usize,
+}
+
+enum FuncPtrInner {}
+#[repr(transparent)]
+#[derive(Copy, Clone, Debug)]
+struct FuncPtr(*const FuncPtrInner);
+unsafe impl Send for FuncPtr {}
+unsafe impl Sync for FuncPtr {}
+
+pub struct X64ExecutionContext {
+    code: ExecutableBuffer,
+    functions: Vec<X64FunctionCode>,
+    signatures: Arc<Map<SigIndex, FuncSig>>,
+    function_signatures: Arc<Map<FuncIndex, SigIndex>>,
+    function_pointers: Vec<FuncPtr>,
+    _br_table_data: Vec<Vec<usize>>,
+    func_import_count: usize,
+}
+
+pub struct X64RuntimeResolver {
+    function_pointers: Vec<FuncPtr>,
+}
+
+#[derive(Debug)]
+pub struct ControlFrame {
+    pub label: DynamicLabel,
+    pub loop_like: bool,
+    pub if_else: IfElseState,
+    pub returns: Vec<WpType>,
+    pub value_stack_depth: usize,
+}
+
+#[derive(Debug, Copy, Clone)]
+pub enum IfElseState {
+    None,
+    If(DynamicLabel),
+    Else,
+}
+
+impl X64ExecutionContext {
+    fn get_runtime_resolver(
+        &self,
+        module_info: &ModuleInfo,
+    ) -> Result<X64RuntimeResolver, CodegenError> {
+        Ok(X64RuntimeResolver {
+            function_pointers: self.function_pointers.clone(),
+        })
+    }
+}
+
+impl FuncResolver for X64RuntimeResolver {
+    fn get(
+        &self,
+        _module: &ModuleInner,
+        _local_func_index: LocalFuncIndex,
+    ) -> Option<NonNull<vm::Func>> {
+        NonNull::new(self.function_pointers[_local_func_index.index() as usize].0 as *mut vm::Func)
+    }
+}
+
+impl ProtectedCaller for X64ExecutionContext {
+    fn call(
+        &self,
+        _module: &ModuleInner,
+        _func_index: FuncIndex,
+        _params: &[Value],
+        _import_backing: &ImportBacking,
+        _vmctx: *mut vm::Ctx,
+        _: Token,
+    ) -> RuntimeResult<Vec<Value>> {
+        unimplemented!()
+    }
+
+    fn get_early_trapper(&self) -> Box<dyn UserTrapper> {
+        pub struct Trapper;
+
+        impl UserTrapper for Trapper {
+            unsafe fn do_early_trap(&self, _data: Box<Any>) -> ! {
+                panic!("do_early_trap");
+            }
+        }
+
+        Box::new(Trapper)
+    }
+}
+
+impl X64ModuleCodeGenerator {
+    pub fn new() -> X64ModuleCodeGenerator {
+        let mut assembler = Assembler::new().unwrap();
+
+        X64ModuleCodeGenerator {
+            functions: vec![],
+            signatures: None,
+            function_signatures: None,
+            function_labels: Some(HashMap::new()),
+            assembler: Some(assembler),
+            func_import_count: 0,
+        }
+    }
+}
+
+impl ModuleCodeGenerator<X64FunctionCode, X64ExecutionContext, X64RuntimeResolver>
+    for X64ModuleCodeGenerator
+{
+    fn check_precondition(&mut self, _module_info: &ModuleInfo) -> Result<(), CodegenError> {
+        Ok(())
+    }
+
+    fn next_function(&mut self) -> Result<&mut X64FunctionCode, CodegenError> {
+        let (mut assembler, mut function_labels, br_table_data) = match self.functions.last_mut() {
+            Some(x) => (
+                x.assembler.take().unwrap(),
+                x.function_labels.take().unwrap(),
+                x.br_table_data.take().unwrap(),
+            ),
+            None => (
+                self.assembler.take().unwrap(),
+                self.function_labels.take().unwrap(),
+                vec![],
+            ),
+        };
+        let begin_offset = assembler.offset();
+        let begin_label_info = function_labels
+            .entry(self.functions.len() + self.func_import_count)
+            .or_insert_with(|| (assembler.new_dynamic_label(), None));
+
+        begin_label_info.1 = Some(begin_offset);
+        let begin_label = begin_label_info.0;
+
+        dynasm!(
+            assembler
+            ; => begin_label
+            //; int 3
+        );
+        let code = X64FunctionCode {
+            signatures: self.signatures.as_ref().unwrap().clone(),
+            function_signatures: self.function_signatures.as_ref().unwrap().clone(),
+
+            begin_offset: begin_offset,
+            assembler: Some(assembler),
+            function_labels: Some(function_labels),
+            br_table_data: Some(br_table_data),
+            returns: vec![],
+            locals: vec![],
+            num_params: 0,
+            value_stack: vec! [],
+            control_stack: vec! [],
+            machine: Machine::new(),
+            unreachable_depth: 0,
+        };
+        self.functions.push(code);
+        Ok(self.functions.last_mut().unwrap())
+    }
+
+    fn finalize(
+        mut self,
+        module_info: &ModuleInfo,
+    ) -> Result<(X64ExecutionContext, X64RuntimeResolver), CodegenError> {
+        let (assembler, mut br_table_data) = match self.functions.last_mut() {
+            Some(x) => (x.assembler.take().unwrap(), x.br_table_data.take().unwrap()),
+            None => {
+                return Err(CodegenError {
+                    message: "no function",
+                });
+            }
+        };
+        let output = assembler.finalize().unwrap();
+
+        for table in &mut br_table_data {
+            for entry in table {
+                *entry = output.ptr(AssemblyOffset(*entry)) as usize;
+            }
+        }
+
+        let function_labels = if let Some(x) = self.functions.last() {
+            x.function_labels.as_ref().unwrap()
+        } else {
+            self.function_labels.as_ref().unwrap()
+        };
+        let mut out_labels: Vec<FuncPtr> = vec![];
+
+        for i in 0..function_labels.len() {
+            let (_, offset) = match function_labels.get(&i) {
+                Some(x) => x,
+                None => {
+                    return Err(CodegenError {
+                        message: "label not found",
+                    });
+                }
+            };
+            let offset = match offset {
+                Some(x) => x,
+                None => {
+                    return Err(CodegenError {
+                        message: "offset is none",
+                    });
+                }
+            };
+            out_labels.push(FuncPtr(output.ptr(*offset) as _));
+        }
+
+        let ctx = X64ExecutionContext {
+            code: output,
+            functions: self.functions,
+            _br_table_data: br_table_data,
+            func_import_count: self.func_import_count,
+            signatures: match self.signatures {
+                Some(x) => x,
+                None => {
+                    return Err(CodegenError {
+                        message: "no signatures",
+                    });
+                }
+            },
+            function_pointers: out_labels,
+            function_signatures: match self.function_signatures {
+                Some(x) => x,
+                None => {
+                    return Err(CodegenError {
+                        message: "no function signatures",
+                    });
+                }
+            },
+        };
+        let resolver = ctx.get_runtime_resolver(module_info)?;
+
+        Ok((ctx, resolver))
+    }
+
+    fn feed_signatures(&mut self, signatures: Map<SigIndex, FuncSig>) -> Result<(), CodegenError> {
+        self.signatures = Some(Arc::new(signatures));
+        Ok(())
+    }
+
+    fn feed_function_signatures(
+        &mut self,
+        assoc: Map<FuncIndex, SigIndex>,
+    ) -> Result<(), CodegenError> {
+        self.function_signatures = Some(Arc::new(assoc));
+        Ok(())
+    }
+
+    fn feed_import_function(&mut self) -> Result<(), CodegenError> {
+        /*
+        let labels = match self.function_labels.as_mut() {
+            Some(x) => x,
+            None => {
+                return Err(CodegenError {
+                    message: "got function import after code",
+                });
+            }
+        };
+        let id = labels.len();
+
+        let assembler = self.assembler.as_mut().unwrap();
+
+        let offset = assembler.offset();
+
+        let label = X64FunctionCode::emit_native_call(
+            self.assembler.as_mut().unwrap(),
+            invoke_import,
+            0,
+            id,
+        );
+        labels.insert(id, (label, Some(offset)));
+
+        self.func_import_count += 1;
+
+        Ok(())
+        */
+        unimplemented!()
+    }
+}
+
+impl X64FunctionCode {
+    fn emit_relaxed_binop<F: FnOnce(&mut Assembler, Size, Location, Location)> (
+        a: &mut Assembler,
+        m: &mut Machine,
+        op: F,
+        sz: Size,
+        src: Location,
+        dst: Location,
+    ) {
+        match (src, dst) {
+            (Location::Memory(_, _), Location::Memory(_, _)) => {
+                let temp = m.acquire_temp_gpr().unwrap();
+                a.emit_mov(sz, src, Location::GPR(temp));
+                op(a, sz, Location::GPR(temp), dst);
+                m.release_temp_gpr(temp);
+            },
+            _ => {
+                op(a, sz, src, dst);
+            }
+        }
+    }
+
+    fn get_param_location(
+        idx: usize
+    ) -> Location {
+        match idx {
+            0 => Location::GPR(GPR::RDI),
+            1 => Location::GPR(GPR::RSI),
+            2 => Location::GPR(GPR::RDX),
+            3 => Location::GPR(GPR::RCX),
+            4 => Location::GPR(GPR::R8),
+            5 => Location::GPR(GPR::R9),
+            _ => Location::Memory(GPR::RBP, (16 + (idx - 6) * 8) as i32),
+        }
+    }
+}
+
+impl FunctionCodeGenerator for X64FunctionCode {
+    fn feed_return(&mut self, ty: WpType) -> Result<(), CodegenError> {
+        self.returns.push(ty);
+        Ok(())
+    }
+
+    fn feed_param(&mut self, ty: WpType) -> Result<(), CodegenError> {
+        // The first parameter location is reserved for vmctx.
+        self.locals.push(Self::get_param_location(
+            self.num_params + 1
+        ));
+        Ok(())
+    }
+
+    fn feed_local(&mut self, ty: WpType, n: usize) -> Result<(), CodegenError> {
+        let a = self.assembler.as_mut().unwrap();
+        let types: Vec<_> = ::std::iter::repeat(ty).take(n).collect();
+        self.machine.acquire_locations(a, &types, true);
+        Ok(())
+    }
+
+    fn begin_body(&mut self) -> Result<(), CodegenError> {
+        let a = self.assembler.as_mut().unwrap();
+        self.control_stack.push(ControlFrame {
+            label: a.get_label(),
+            loop_like: false,
+            if_else: IfElseState::None,
+            returns: self.returns.clone(),
+            value_stack_depth: 0,
+        });
+        Ok(())
+    }
+
+    fn finalize(&mut self) -> Result<(), CodegenError> {
+        let a = self.assembler.as_mut().unwrap();
+        a.emit_ud2();
+        Ok(())
+    }
+    
+    fn feed_opcode(&mut self, op: Operator, module_info: &ModuleInfo) -> Result<(), CodegenError> {
+        let was_unreachable;
+
+        if self.unreachable_depth > 0 {
+            was_unreachable = true;
+            match op {
+                Operator::Block { .. } | Operator::Loop { .. } | Operator::If { .. } => {
+                    self.unreachable_depth += 1;
+                }
+                Operator::End => {
+                    self.unreachable_depth -= 1;
+                }
+                Operator::Else => {
+                    // We are in a reachable true branch
+                    if self.unreachable_depth == 1 {
+                        if let Some(IfElseState::If(_)) = self
+                            .control_stack
+                            .last()
+                            .map(|x| x.if_else)
+                        {
+                            self.unreachable_depth -= 1;
+                        }
+                    }
+                }
+                _ => {}
+            }
+            if self.unreachable_depth > 0 {
+                return Ok(());
+            }
+        } else {
+            was_unreachable = false;
+        }
+
+        let a = self.assembler.as_mut().unwrap();
+        unimplemented!();
+    }
+}
\ No newline at end of file
diff --git a/lib/dynasm-backend/src/emitter_x64.rs b/lib/dynasm-backend/src/emitter_x64.rs
index 91837c189..e3d18b6f0 100644
--- a/lib/dynasm-backend/src/emitter_x64.rs
+++ b/lib/dynasm-backend/src/emitter_x64.rs
@@ -91,6 +91,8 @@ pub trait Emitter {
     fn emit_shl(&mut self, sz: Size, src: Location, dst: Location);
     fn emit_shr(&mut self, sz: Size, src: Location, dst: Location);
     fn emit_sar(&mut self, sz: Size, src: Location, dst: Location);
+
+    fn emit_ud2(&mut self);
 }
 
 macro_rules! unop_gpr {
@@ -389,4 +391,7 @@ impl Emitter for Assembler {
         binop_shift!(sar, self, sz, src, dst, { unreachable!() });
     }
 
+    fn emit_ud2(&mut self) {
+        dynasm!(self ; ud2);
+    }
 }
\ No newline at end of file
diff --git a/lib/dynasm-backend/src/lib.rs b/lib/dynasm-backend/src/lib.rs
index dd36a8d71..b2c8aaf5a 100644
--- a/lib/dynasm-backend/src/lib.rs
+++ b/lib/dynasm-backend/src/lib.rs
@@ -23,6 +23,7 @@ mod protect_unix;
 mod stack;
 mod emitter_x64;
 mod machine;
+mod codegen_x64_v2;
 
 use crate::codegen::{CodegenError, ModuleCodeGenerator};
 use crate::parse::LoadError;