Move code around

src/rust/codegen.rs

@@ -1,4 +1,3 @@
-use cpu::BitSize;
 use cpu2::cpu::{
     FLAG_CARRY, FLAG_OVERFLOW, FLAG_SIGN, FLAG_ZERO, TLB_GLOBAL, TLB_HAS_CODE, TLB_NO_USER,
     TLB_READONLY, TLB_VALID,
@@ -382,6 +381,26 @@ enum GenSafeWriteValue<'a> {
     TwoI64s(&'a WasmLocalI64, &'a WasmLocalI64),
 }
 
+#[derive(Copy, Clone, Eq, PartialEq)]
+pub enum BitSize {
+    BYTE,
+    WORD,
+    DWORD,
+    QWORD,
+    DQWORD,
+}
+impl BitSize {
+    pub fn bytes(&self) -> u32 {
+        match self {
+            BitSize::BYTE => 1,
+            BitSize::WORD => 2,
+            BitSize::DWORD => 4,
+            BitSize::QWORD => 8,
+            BitSize::DQWORD => 16,
+        }
+    }
+}
+
 pub fn gen_safe_write8(ctx: &mut JitContext, address_local: &WasmLocal, value_local: &WasmLocal) {
     gen_safe_write(
         ctx,

src/rust/cpu.rs

@@ -18,26 +18,6 @@ mod unsafe_cpu {
     }
 }
 
-#[derive(Copy, Clone, Eq, PartialEq)]
-pub enum BitSize {
-    BYTE,
-    WORD,
-    DWORD,
-    QWORD,
-    DQWORD,
-}
-impl BitSize {
-    pub fn bytes(&self) -> u32 {
-        match self {
-            BitSize::BYTE => 1,
-            BitSize::WORD => 2,
-            BitSize::DWORD => 4,
-            BitSize::QWORD => 8,
-            BitSize::DQWORD => 16,
-        }
-    }
-}
-
 pub fn read8(addr: u32) -> u8 { unsafe { cpu2::memory::read8(addr) as u8 } }
 pub fn read16(addr: u32) -> u16 { unsafe { cpu2::memory::read16(addr) as u16 } }
 pub fn read32(addr: u32) -> u32 { unsafe { cpu2::memory::read32s(addr) as u32 } }

src/rust/jit_instructions.rs

@@ -1,7 +1,7 @@
 #![allow(non_snake_case)]
 
 use codegen;
-use cpu::BitSize;
+use codegen::BitSize;
 use cpu2::cpu::{
     FLAGS_ALL, FLAGS_DEFAULT, FLAGS_MASK, FLAG_ADJUST, FLAG_CARRY, FLAG_DIRECTION, FLAG_INTERRUPT,
     FLAG_OVERFLOW, FLAG_SUB, OPSIZE_8, OPSIZE_16, OPSIZE_32,