From 063cb4374ad6776ad0f68ecf65cdecf1f304c888 Mon Sep 17 00:00:00 2001
From: Vivian Lim <vivvnlim@gmail.com>
Date: Tue, 24 Dec 2019 14:43:11 -0800
Subject: [PATCH 01/13] WIP comms stuff and trying to make pokemon_rb
 serializable

---
 .vscode/launch.json                          |  4 +-
 Cargo.lock                                   | 25 +++++++++++
 Cargo.toml                                   |  9 ++--
 src/comms.rs                                 | 37 ++++++++++++++++
 examples/sdl2_emulator.rs => src/emulator.rs | 40 ++---------------
 src/main.rs                                  | 45 ++++++++++++++++++++
 src/sync/pokemon_rb.rs                       | 14 ++++++
 7 files changed, 131 insertions(+), 43 deletions(-)
 create mode 100644 src/comms.rs
 rename examples/sdl2_emulator.rs => src/emulator.rs (95%)
 create mode 100644 src/main.rs

diff --git a/.vscode/launch.json b/.vscode/launch.json
index 39c6af3..9cab8e0 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -8,7 +8,7 @@
             "name": "sync: pokeblue",
             "type": "cppvsdbg",
             "request": "launch",
-            "program": "target/debug/examples/sdl2_emulator.exe",
+            "program": "target/debug/ferretro-synced.exe",
             "args": ["--core", "./data/gambatte_libretro.dll", "--rom", "./data/pokeblue.gb", "--state", "./data/pkblue-route1.sav"],
             "stopAtEntry": false,
             "cwd": "${workspaceFolder}",
@@ -22,7 +22,7 @@
             "name": "sync: sonic2",
             "type": "cppvsdbg",
             "request": "launch",
-            "program": "target/debug/examples/sdl2_emulator.exe",
+            "program": "target/debug/ferretro-synced.exe",
             "args": ["--core", "./data/genesis_plus_gx_libretro.dll", "--rom", "./data/sonic2.bin"],
             "stopAtEntry": false,
             "cwd": "${workspaceFolder}",
diff --git a/Cargo.lock b/Cargo.lock
index 88fc1e5..a330b24 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -151,6 +151,8 @@ dependencies = [
  "num-derive 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "num-traits 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)",
  "sdl2 0.32.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_bytes 0.11.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "structopt 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -489,6 +491,27 @@ dependencies = [
 name = "serde"
 version = "1.0.104"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "serde_derive 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "serde_bytes"
+version = "0.11.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "serde_derive"
+version = "1.0.104"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 1.0.11 (registry+https://github.com/rust-lang/crates.io-index)",
+]
 
 [[package]]
 name = "strsim"
@@ -661,6 +684,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum sdl2 0.32.2 (registry+https://github.com/rust-lang/crates.io-index)" = "d051a07231e303f5f719da78cb6f7394f6d5b54f733aef5b0b447804a83edd7b"
 "checksum sdl2-sys 0.32.6 (registry+https://github.com/rust-lang/crates.io-index)" = "34e71125077d297d57e4c1acfe8981b5bdfbf5a20e7b589abfdcb33bf1127f86"
 "checksum serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)" = "414115f25f818d7dfccec8ee535d76949ae78584fc4f79a6f45a904bf8ab4449"
+"checksum serde_bytes 0.11.3 (registry+https://github.com/rust-lang/crates.io-index)" = "325a073952621257820e7a3469f55ba4726d8b28657e7e36653d1c36dc2c84ae"
+"checksum serde_derive 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)" = "128f9e303a5a29922045a830221b8f78ec74a5f544944f3d5984f8ec3895ef64"
 "checksum strsim 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a"
 "checksum structopt 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "30b3a3e93f5ad553c38b3301c8a0a0cec829a36783f6a0c467fc4bf553a5f5bf"
 "checksum structopt-derive 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "ea692d40005b3ceba90a9fe7a78fa8d4b82b0ce627eebbffc329aab850f3410e"
diff --git a/Cargo.toml b/Cargo.toml
index 193f90d..25dc4b0 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -14,9 +14,10 @@ libloading = "^0.5"
 num = "0.2"
 num-derive = "0.3"
 num-traits = "0.2"
-
-[dev-dependencies]
-# example: sdl2_emulator
 sdl2 = "^0.32"
 crossbeam-channel = "^0.4"
-structopt = "^0.3"
\ No newline at end of file
+structopt = "^0.3"
+serde = { version = "1.0.104", features = ["derive"] }
+serde_bytes = "0.11"
+
+[dev-dependencies]
\ No newline at end of file
diff --git a/src/comms.rs b/src/comms.rs
new file mode 100644
index 0000000..d1f6e54
--- /dev/null
+++ b/src/comms.rs
@@ -0,0 +1,37 @@
+use std::path::{Path, PathBuf};
+use std::sync::mpsc::{Sender, Receiver};
+use std::sync::mpsc;
+use std::thread;
+use serde::{Serialize, Deserialize};
+
+pub struct Communication<T> {
+    tx: Sender<T>,
+    rx: Receiver<T>,
+}
+
+impl<T> Communication<T> {
+    pub fn new() -> Box<Self> {
+        let (to_thread, from_main): (Sender<T>, Receiver<T>) = mpsc::channel();
+        let (to_main, from_thread): (Sender<T>, Receiver<T>) = mpsc::channel();
+
+        // let child = thread::spawn(move || {
+        //     let client = WebsocketClient::<T> {
+        //         thread_tx: to_main,
+        //         thread_rx: from_main,
+        //     };
+
+        //     // todo: loop
+        //     println!("listener thread finished");
+        // });
+
+        Box::new(Communication {
+            tx: to_thread,
+            rx: from_thread,
+        })
+    }
+}
+
+struct WebsocketClient<T> {
+    thread_tx: Sender<T>,
+    thread_rx: Receiver<T>,
+}
\ No newline at end of file
diff --git a/examples/sdl2_emulator.rs b/src/emulator.rs
similarity index 95%
rename from examples/sdl2_emulator.rs
rename to src/emulator.rs
index 8aa6e5b..c79ce63 100644
--- a/examples/sdl2_emulator.rs
+++ b/src/emulator.rs
@@ -1,7 +1,3 @@
-extern crate crossbeam_channel;
-extern crate ferretro;
-extern crate sdl2;
-
 use ferretro::retro;
 use ferretro::retro::ffi::{GameGeometry, SystemInfo, SystemAvInfo, MemoryMap};
 use ferretro::retro::constants::{InputIndex, JoypadButton, AnalogAxis, DeviceType};
@@ -13,13 +9,11 @@ use ferretro_synced::sync::pokemon_rb::SyncedPokemonRedBlue;
 
 use std::ffi::CStr;
 use std::io::Read;
-use std::path::{Path, PathBuf};
 use std::pin::Pin;
+use std::path::{Path, PathBuf};
 use std::time::{Duration, Instant};
 use std::convert::TryFrom;
 
-use structopt::StructOpt;
-
 use sdl2::audio::{AudioCallback, AudioFormat, AudioSpec, AudioSpecDesired, AudioDevice};
 use sdl2::controller::{GameController, Button, Axis};
 use sdl2::event::Event;
@@ -27,7 +21,7 @@ use sdl2::keyboard::Keycode;
 use sdl2::rect::Rect;
 use sdl2::render::WindowCanvas;
 
-struct MyEmulator {
+pub struct MyEmulator {
     retro: retro::wrapper::LibretroWrapper,
     core_path: PathBuf,
     sys_path: Option<PathBuf>,
@@ -497,34 +491,6 @@ impl AudioCallback for MySdlAudio {
     }
 }
 
-pub fn main() -> failure::Fallible<()> {
-    let opt: Opt = Opt::from_args();
-    let mut emu = MyEmulator::new(&opt.core, &opt.system);
-    emu.load_game(&opt.rom);
-    match (&opt.state) {
-        Some(s) => emu.load_state(s),
-        None => ()
-    }
-    emu.run();
-
-    Ok(())
-}
-
-#[derive(StructOpt)]
-struct Opt {
-    /// Core module to use.
-    #[structopt(short, long, parse(from_os_str))]
-    core: PathBuf,
-    /// ROM to load using the core.
-    #[structopt(short, long, parse(from_os_str))]
-    rom: PathBuf,
-    /// System directory, often containing BIOS files
-    #[structopt(short, long, parse(from_os_str))]
-    system: Option<PathBuf>,
-    /// Serialized game state to load
-    #[structopt(long, parse(from_os_str))]
-    state: Option<PathBuf>,
-}
 
 fn button_map(retro_button: &JoypadButton) -> Option<Button> {
     match retro_button {
@@ -576,4 +542,4 @@ fn axis_map(index: &InputIndex, axis: &AnalogAxis) -> Axis {
         (InputIndex::Right, AnalogAxis::X) => Axis::RightX,
         (InputIndex::Right, AnalogAxis::Y) => Axis::RightY,
     }
-}
+}
\ No newline at end of file
diff --git a/src/main.rs b/src/main.rs
new file mode 100644
index 0000000..1fe5d77
--- /dev/null
+++ b/src/main.rs
@@ -0,0 +1,45 @@
+extern crate crossbeam_channel;
+extern crate ferretro;
+extern crate sdl2;
+extern crate serde;
+extern crate serde_bytes;
+
+use structopt::StructOpt;
+use std::path::{Path, PathBuf};
+
+mod emulator;
+use emulator::MyEmulator;
+mod comms;
+use comms::Communication;
+
+pub fn main() -> failure::Fallible<()> {
+    let opt: Opt = Opt::from_args();
+    let mut emu = MyEmulator::new(&opt.core, &opt.system);
+    emu.load_game(&opt.rom);
+    match (&opt.state) {
+        Some(s) => emu.load_state(s),
+        None => ()
+    }
+
+    //let mut comms = Communication::new::<ferretro_synced::sync::pokemon_rb::Message>();
+
+    emu.run();
+
+    Ok(())
+}
+
+#[derive(StructOpt)]
+struct Opt {
+    /// Core module to use.
+    #[structopt(short, long, parse(from_os_str))]
+    core: PathBuf,
+    /// ROM to load using the core.
+    #[structopt(short, long, parse(from_os_str))]
+    rom: PathBuf,
+    /// System directory, often containing BIOS files
+    #[structopt(short, long, parse(from_os_str))]
+    system: Option<PathBuf>,
+    /// Serialized game state to load
+    #[structopt(long, parse(from_os_str))]
+    state: Option<PathBuf>,
+}
diff --git a/src/sync/pokemon_rb.rs b/src/sync/pokemon_rb.rs
index 9834751..d5d8439 100644
--- a/src/sync/pokemon_rb.rs
+++ b/src/sync/pokemon_rb.rs
@@ -1,6 +1,7 @@
 use std::default::Default;
 use std::fmt::Display;
 use crate::sync::memory_rw::MemoryRw;
+use serde::{Serialize, Deserialize};
 use ferretro::retro::wrapper::LibretroWrapper; // want LibretroWrapper.api : LibretroApi.get_memory()
 
 #[derive(Default)]
@@ -9,8 +10,14 @@ pub struct SyncedPokemonRedBlue {
     battle_context: BattleContext,
 }
 
+//#[derive(Serialize, Deserialize)]
+pub struct Message {
+    active_pkmn: Box<[u8]>
+}
+
 struct Raw {
     active_pokemon_raw: [u8; 0x27],
+
     player_and_party: [u8; 0x19e],
     pokemon_out: u8,
 }
@@ -40,6 +47,13 @@ impl SyncedPokemonRedBlue {
         println!("{}", result);
         result
     }
+
+    // pub fn get_message<'a>(&self) -> Message {
+    //     Message {
+    //         active_pkmn: Box::from(&self.raw.active_pokemon_raw.clone())
+    //     }
+
+    // }
 }
 
 impl Default for Raw {

From bb558096b2989b0a5d35a6c01afd67a70606dd80 Mon Sep 17 00:00:00 2001
From: Vivian Lim <vivvnlim@gmail.com>
Date: Tue, 24 Dec 2019 15:46:34 -0800
Subject: [PATCH 02/13] wip: add lifetimes to memory stuff

---
 src/emulator.rs        | 28 ++++++++-------
 src/sync/memory_rw.rs  |  4 +--
 src/sync/pokemon_rb.rs | 78 ++++++++++++++++++++++++++++--------------
 3 files changed, 70 insertions(+), 40 deletions(-)

diff --git a/src/emulator.rs b/src/emulator.rs
index c79ce63..32ad758 100644
--- a/src/emulator.rs
+++ b/src/emulator.rs
@@ -21,7 +21,7 @@ use sdl2::keyboard::Keycode;
 use sdl2::rect::Rect;
 use sdl2::render::WindowCanvas;
 
-pub struct MyEmulator {
+pub struct MyEmulator<'emu> {
     retro: retro::wrapper::LibretroWrapper,
     core_path: PathBuf,
     sys_path: Option<PathBuf>,
@@ -51,10 +51,12 @@ pub struct MyEmulator {
     // memory
     memory_map: Vec<MyMemoryMap>,
 
-    synced_pokemonrb: SyncedPokemonRedBlue,
+    synced_pokemonrb: SyncedPokemonRedBlue<'emu>,
+
+    _marker: std::marker::PhantomData<&'emu()>,
 }
 
-impl MyEmulator {
+impl MyEmulator<'static> {
     pub fn new(core_path: impl AsRef<Path>, sys_path: &Option<impl AsRef<Path>>) -> Pin<Box<Self>> {
         let core_path = PathBuf::from(core_path.as_ref());
         let lib = libloading::Library::new(&core_path).unwrap();
@@ -121,6 +123,8 @@ impl MyEmulator {
         let memory_map = Vec::new();
         let synced_pokemonrb = std::default::Default::default();
 
+        let _marker = std::marker::PhantomData::default();
+
         let emu = MyEmulator {
             retro,
             core_path,
@@ -140,6 +144,7 @@ impl MyEmulator {
             pressed_keys,
             memory_map,
             synced_pokemonrb,
+            _marker
         };
         let mut pin_emu = Box::pin(emu);
         retro::wrapper::set_handler(pin_emu.as_mut());
@@ -176,8 +181,8 @@ impl MyEmulator {
                 spf = 1.0 / 60.0;
             }
 
-            let new_data = SyncedPokemonRedBlue::copy_from_emu(self);
-            std::mem::replace(&mut self.synced_pokemonrb, new_data);
+            self.synced_pokemonrb.update_from_emu(self);
+            println!("{}", self.synced_pokemonrb);
 
             Duration::from_secs_f64(spf)
                 .checked_sub(frame_begin.elapsed())
@@ -295,13 +300,13 @@ impl MyEmulator {
     }
 }
 
-impl Drop for MyEmulator {
+impl Drop for MyEmulator<'_> {
     fn drop(&mut self) {
         retro::wrapper::unset_handler();
     }
 }
 
-impl retro::wrapper::Handler for MyEmulator {
+impl retro::wrapper::Handler for MyEmulator<'static> {
     fn libretro_core(&mut self) -> &mut LibretroWrapper {
         &mut self.retro
     }
@@ -454,11 +459,10 @@ impl retro::wrapper::Handler for MyEmulator {
     }
 }
 
-impl MemoryRw for MyEmulator {
-    fn peek_region<T>(&self, offset: usize, bank_switch: usize) -> Option<&T> {
-        let length = std::mem::size_of::<T>();
+impl<'emu> MemoryRw<'emu> for MyEmulator<'emu> {
+    fn peek_region(&self, offset: usize, length: usize, bank_switch: usize) -> Option<&[u8]> {
         match self.find_bank(offset, length, bank_switch) {
-            Some(ptr) => Some(unsafe { &*(ptr as *mut T) }),
+            Some(ptr) => Some(unsafe { std::slice::from_raw_parts::<'emu>(ptr, length) }),
             None => None
         }
     }
@@ -468,7 +472,7 @@ impl MemoryRw for MyEmulator {
     }
 }
 
-struct MyMemoryMap {
+struct MyMemoryMap<> {
     start: usize,
     end: usize,
     pointer: *const std::ffi::c_void,
diff --git a/src/sync/memory_rw.rs b/src/sync/memory_rw.rs
index 52b83ab..a0b3295 100644
--- a/src/sync/memory_rw.rs
+++ b/src/sync/memory_rw.rs
@@ -1,4 +1,4 @@
-pub trait MemoryRw {
-    fn peek_region<T>(&self, offset: usize, bank_switch: usize) -> Option<&T>;
+pub trait MemoryRw<'emu> {
+    fn peek_region(&self, offset: usize, length: usize, bank_switch: usize) -> Option<&[u8]>;
     fn poke_region<T>(&mut self, offset: usize, data: T, bank_switch: usize);
 }
\ No newline at end of file
diff --git a/src/sync/pokemon_rb.rs b/src/sync/pokemon_rb.rs
index d5d8439..bcdc85a 100644
--- a/src/sync/pokemon_rb.rs
+++ b/src/sync/pokemon_rb.rs
@@ -5,8 +5,8 @@ use serde::{Serialize, Deserialize};
 use ferretro::retro::wrapper::LibretroWrapper; // want LibretroWrapper.api : LibretroApi.get_memory()
 
 #[derive(Default)]
-pub struct SyncedPokemonRedBlue {
-    raw: Raw,
+pub struct SyncedPokemonRedBlue<'emu> {
+    raw: Raw<'emu>,
     battle_context: BattleContext,
 }
 
@@ -15,11 +15,29 @@ pub struct Message {
     active_pkmn: Box<[u8]>
 }
 
-struct Raw {
-    active_pokemon_raw: [u8; 0x27],
+struct Raw<'emu> {
+    active_pokemon_raw: EmulatorMemory<'emu>,
+    player_and_party: EmulatorMemory<'emu>,
+    pokemon_out: EmulatorMemory<'emu>,
+}
 
-    player_and_party: [u8; 0x19e],
-    pokemon_out: u8,
+struct EmulatorMemory<'emu> {
+    offset: usize,
+    length: usize,
+    bank_switch: usize,
+    data: Option<&'emu [u8]>,
+}
+
+impl<'emu> EmulatorMemory<'emu> {
+    pub fn get_data<T: MemoryRw<'emu>>(&mut self, emu: &'emu T) -> Option<&'emu [u8]> {
+        match self.data {
+            Some(_) => self.data,
+            None => {
+                self.data = emu.peek_region(self.offset, self.length, self.bank_switch);
+                self.data
+            }
+        }
+    }
 }
 
 struct BattleContext {
@@ -27,25 +45,18 @@ struct BattleContext {
 
 }
 
-impl SyncedPokemonRedBlue {
-    pub fn copy_from_emu<T: MemoryRw>(emu: &T) -> SyncedPokemonRedBlue {
-        let raw = Raw {
-            active_pokemon_raw: *emu.peek_region(0xd009, 0).unwrap_or_else(|| &[0; 0x27]),
-            player_and_party: *emu.peek_region(0xd158, 0).unwrap_or_else(|| &[0; 0x19e]),
-            pokemon_out: *emu.peek_region(0xcc2f, 0).unwrap_or(&0),
-        };
 
+impl<'emu> SyncedPokemonRedBlue<'emu> {
+    pub fn update_from_emu<T: MemoryRw<'emu>>(&mut self, emu: &'emu T) {
         let battle_context = BattleContext {
-            active_pokemon: num::FromPrimitive::from_u8(raw.active_pokemon_raw[0xB]).unwrap_or(Pokemon::Unknown)
+            active_pokemon: match self.raw.active_pokemon_raw.get_data(emu) {
+                Some(d) => num::FromPrimitive::from_u8(d[0xB]).unwrap_or(Pokemon::Unknown),
+                None => Pokemon::Unknown
+            }
         };
 
-        let result = SyncedPokemonRedBlue {
-            raw: raw,
-            battle_context: battle_context,
-        };
+        self.battle_context = battle_context;
 
-        println!("{}", result);
-        result
     }
 
     // pub fn get_message<'a>(&self) -> Message {
@@ -56,12 +67,27 @@ impl SyncedPokemonRedBlue {
     // }
 }
 
-impl Default for Raw {
+impl<'emu> Default for Raw<'emu> {
     fn default() -> Self {
         Raw {
-            active_pokemon_raw: [0; 0x27],
-            player_and_party: [0; 0x19e],
-            pokemon_out: 0,
+            active_pokemon_raw: EmulatorMemory {
+                offset: 0xd009,
+                length: 0x27,
+                bank_switch: 0,
+                data: None,
+            },
+            player_and_party: EmulatorMemory {
+                offset: 0xd158,
+                length: 0x19e,
+                bank_switch: 0,
+                data: None,
+            },
+            pokemon_out: EmulatorMemory {
+                offset: 0xcc2f,
+                length: 0x1,
+                bank_switch: 0,
+                data: None,
+            },
         }
     }
 }
@@ -74,9 +100,9 @@ impl Default for BattleContext {
     }
 }
 
-impl Display for SyncedPokemonRedBlue {
+impl Display for SyncedPokemonRedBlue<'_> {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        write!(f, "active: pk {:?} {:?}", &self.battle_context.active_pokemon, &self.raw.active_pokemon_raw[0xB])
+        write!(f, "active: pk {:?}", &self.battle_context.active_pokemon)
     }
 }
 #[derive(FromPrimitive, Debug)]

From 6b330d64ced4f03bfb5cffbcd4fefb5f686b547a Mon Sep 17 00:00:00 2001
From: Vivian Lim <vivvnlim@gmail.com>
Date: Tue, 24 Dec 2019 16:10:32 -0800
Subject: [PATCH 03/13] finished: use slices instead of fixed-size arrays

---
 src/emulator.rs        | 82 ++++++------------------------------------
 src/sync/memory_rw.rs  | 72 +++++++++++++++++++++++++++++++++++--
 src/sync/pokemon_rb.rs | 35 +++++++++---------
 3 files changed, 96 insertions(+), 93 deletions(-)

diff --git a/src/emulator.rs b/src/emulator.rs
index 32ad758..c95cccf 100644
--- a/src/emulator.rs
+++ b/src/emulator.rs
@@ -4,7 +4,7 @@ use ferretro::retro::constants::{InputIndex, JoypadButton, AnalogAxis, DeviceTyp
 use ferretro::retro::wrapped_types::{ControllerDescription2, InputDescriptor2, InputDeviceId, SubsystemInfo2, Variable2};
 use ferretro::retro::wrapper::LibretroWrapper;
 
-use ferretro_synced::sync::memory_rw::MemoryRw;
+use ferretro_synced::sync::memory_rw::ReadWriteMemoryMap;
 use ferretro_synced::sync::pokemon_rb::SyncedPokemonRedBlue;
 
 use std::ffi::CStr;
@@ -21,7 +21,7 @@ use sdl2::keyboard::Keycode;
 use sdl2::rect::Rect;
 use sdl2::render::WindowCanvas;
 
-pub struct MyEmulator<'emu> {
+pub struct MyEmulator {
     retro: retro::wrapper::LibretroWrapper,
     core_path: PathBuf,
     sys_path: Option<PathBuf>,
@@ -49,14 +49,12 @@ pub struct MyEmulator<'emu> {
     pressed_keys: Vec<Keycode>,
 
     // memory
-    memory_map: Vec<MyMemoryMap>,
+    memory_map: ReadWriteMemoryMap,
 
-    synced_pokemonrb: SyncedPokemonRedBlue<'emu>,
-
-    _marker: std::marker::PhantomData<&'emu()>,
+    synced_pokemonrb: SyncedPokemonRedBlue,
 }
 
-impl MyEmulator<'static> {
+impl MyEmulator {
     pub fn new(core_path: impl AsRef<Path>, sys_path: &Option<impl AsRef<Path>>) -> Pin<Box<Self>> {
         let core_path = PathBuf::from(core_path.as_ref());
         let lib = libloading::Library::new(&core_path).unwrap();
@@ -120,11 +118,9 @@ impl MyEmulator<'static> {
 
         let pressed_keys = Vec::new();
 
-        let memory_map = Vec::new();
+        let memory_map = std::default::Default::default();
         let synced_pokemonrb = std::default::Default::default();
 
-        let _marker = std::marker::PhantomData::default();
-
         let emu = MyEmulator {
             retro,
             core_path,
@@ -144,7 +140,6 @@ impl MyEmulator<'static> {
             pressed_keys,
             memory_map,
             synced_pokemonrb,
-            _marker
         };
         let mut pin_emu = Box::pin(emu);
         retro::wrapper::set_handler(pin_emu.as_mut());
@@ -181,7 +176,7 @@ impl MyEmulator<'static> {
                 spf = 1.0 / 60.0;
             }
 
-            self.synced_pokemonrb.update_from_emu(self);
+            self.synced_pokemonrb.update_from_mem(&self.memory_map);
             println!("{}", self.synced_pokemonrb);
 
             Duration::from_secs_f64(spf)
@@ -278,35 +273,15 @@ impl MyEmulator<'static> {
     }
 
 
-    fn find_bank(&self, offset: usize, length: usize, bank_switch: usize) -> Option<*const std::ffi::c_void> {
-        if self.memory_map.len() == 0 {
-            return None;
-        }
-
-        for item in self.memory_map.iter() {
-            if (item.start <= offset) && (offset < item.end) {
-                if offset + length > item.end {
-                    println!("({:x}, {:x}) overruns ({:x}, {:x}) memory bank.", offset, length, item.start, item.end);
-                    return None;
-                }
-
-                let bank_size = item.end - item.start;
-                let relative_offset = isize::try_from(offset - item.start + (bank_size * bank_switch)).unwrap();
-                return unsafe { Some(item.pointer.offset(relative_offset)) }
-            }
-        }
-        println!("({:x}, {:x}) address range not found in any memory map region.", offset, length);
-        None
-    }
 }
 
-impl Drop for MyEmulator<'_> {
+impl Drop for MyEmulator {
     fn drop(&mut self) {
         retro::wrapper::unset_handler();
     }
 }
 
-impl retro::wrapper::Handler for MyEmulator<'static> {
+impl retro::wrapper::Handler for MyEmulator {
     fn libretro_core(&mut self) -> &mut LibretroWrapper {
         &mut self.retro
     }
@@ -435,48 +410,11 @@ impl retro::wrapper::Handler for MyEmulator<'static> {
     }
 
     fn set_memory_maps(&mut self, memory_map: MemoryMap) -> bool {
-        let mut descs: Vec<MyMemoryMap> = Vec::new();
-        let num_descriptors = isize::try_from(memory_map.num_descriptors).unwrap();
-        for i in 0..num_descriptors {
-            let desc = unsafe { &*memory_map.descriptors.offset(i) };
-            let mut length = desc.len;
-
-            if desc.select > 0 { // FIXME: hack for oversized SRAM eating addr space
-                length = (!desc.select + 1) & 0xffffffff;
-                println!("truncating memory region {:x} from size {:x} to {:x} banks of size {:x}", desc.start, desc.len, desc.len/length, length)
-            }
-
-            descs.push(MyMemoryMap {
-                start: desc.start,
-                end: desc.start + length,
-                pointer: desc.ptr,
-            })
-        }
-
-        self.memory_map = descs;
-
+        self.memory_map.libretro_set_memory_maps(memory_map);
         true
     }
 }
 
-impl<'emu> MemoryRw<'emu> for MyEmulator<'emu> {
-    fn peek_region(&self, offset: usize, length: usize, bank_switch: usize) -> Option<&[u8]> {
-        match self.find_bank(offset, length, bank_switch) {
-            Some(ptr) => Some(unsafe { std::slice::from_raw_parts::<'emu>(ptr, length) }),
-            None => None
-        }
-    }
-
-    fn poke_region<T>(&mut self, offset: usize, data: T, bank_switch: usize) {
-        
-    }
-}
-
-struct MyMemoryMap<> {
-    start: usize,
-    end: usize,
-    pointer: *const std::ffi::c_void,
-}
 
 struct MySdlAudio {
     audio_spec: AudioSpec,
diff --git a/src/sync/memory_rw.rs b/src/sync/memory_rw.rs
index a0b3295..2addfee 100644
--- a/src/sync/memory_rw.rs
+++ b/src/sync/memory_rw.rs
@@ -1,4 +1,70 @@
-pub trait MemoryRw<'emu> {
-    fn peek_region(&self, offset: usize, length: usize, bank_switch: usize) -> Option<&[u8]>;
-    fn poke_region<T>(&mut self, offset: usize, data: T, bank_switch: usize);
+use std::convert::TryFrom;
+use std::default::Default;
+use ferretro::retro::ffi::{MemoryMap};
+
+#[derive(Default)]
+pub struct ReadWriteMemoryMap {
+    regions: Vec<MemoryRegion>,
+}
+
+impl ReadWriteMemoryMap {
+    pub fn peek_region(&self, offset: usize, length: usize, bank_switch: usize) -> Option<&'static [u8]> {
+        match self.find_bank(offset, length, bank_switch) {
+            Some(ptr) => Some(unsafe { std::slice::from_raw_parts(ptr as *const u8, length) }),
+            None => None
+        }
+    }
+
+    pub fn poke_region<T>(&mut self, offset: usize, data: T, bank_switch: usize) {
+        
+    }
+
+    fn find_bank(&self, offset: usize, length: usize, bank_switch: usize) -> Option<*const std::ffi::c_void> {
+        if self.regions.len() == 0 {
+            return None;
+        }
+
+        for item in self.regions.iter() {
+            if (item.start <= offset) && (offset < item.end) {
+                if offset + length > item.end {
+                    println!("({:x}, {:x}) overruns ({:x}, {:x}) memory bank.", offset, length, item.start, item.end);
+                    return None;
+                }
+
+                let bank_size = item.end - item.start;
+                let relative_offset = isize::try_from(offset - item.start + (bank_size * bank_switch)).unwrap();
+                return unsafe { Some(item.pointer.offset(relative_offset)) }
+            }
+        }
+        println!("({:x}, {:x}) address range not found in any memory map region.", offset, length);
+        None
+    }
+
+    pub fn libretro_set_memory_maps(&mut self, memory_map: MemoryMap) {
+        let mut regions: Vec<MemoryRegion> = Vec::new();
+        let num_descriptors = isize::try_from(memory_map.num_descriptors).unwrap();
+        for i in 0..num_descriptors {
+            let region = unsafe { &*memory_map.descriptors.offset(i) };
+            let mut length = region.len;
+
+            if region.select > 0 { // FIXME: hack for oversized SRAM eating addr space
+                length = (!region.select + 1) & 0xffffffff;
+                println!("truncating memory region {:x} from size {:x} to {:x} banks of size {:x}", region.start, region.len, region.len/length, length)
+            }
+
+            regions.push(MemoryRegion {
+                start: region.start,
+                end: region.start + length,
+                pointer: region.ptr,
+            })
+        }
+
+        self.regions = regions;
+    }
+}
+
+struct MemoryRegion {
+    start: usize,
+    end: usize,
+    pointer: *const std::ffi::c_void,
 }
\ No newline at end of file
diff --git a/src/sync/pokemon_rb.rs b/src/sync/pokemon_rb.rs
index bcdc85a..ad62d93 100644
--- a/src/sync/pokemon_rb.rs
+++ b/src/sync/pokemon_rb.rs
@@ -1,12 +1,12 @@
 use std::default::Default;
 use std::fmt::Display;
-use crate::sync::memory_rw::MemoryRw;
+use crate::sync::memory_rw::ReadWriteMemoryMap;
 use serde::{Serialize, Deserialize};
 use ferretro::retro::wrapper::LibretroWrapper; // want LibretroWrapper.api : LibretroApi.get_memory()
 
 #[derive(Default)]
-pub struct SyncedPokemonRedBlue<'emu> {
-    raw: Raw<'emu>,
+pub struct SyncedPokemonRedBlue {
+    raw: Raw,
     battle_context: BattleContext,
 }
 
@@ -15,25 +15,25 @@ pub struct Message {
     active_pkmn: Box<[u8]>
 }
 
-struct Raw<'emu> {
-    active_pokemon_raw: EmulatorMemory<'emu>,
-    player_and_party: EmulatorMemory<'emu>,
-    pokemon_out: EmulatorMemory<'emu>,
+struct Raw {
+    active_pokemon_raw: EmulatorMemory,
+    player_and_party: EmulatorMemory,
+    pokemon_out: EmulatorMemory,
 }
 
-struct EmulatorMemory<'emu> {
+struct EmulatorMemory {
     offset: usize,
     length: usize,
     bank_switch: usize,
-    data: Option<&'emu [u8]>,
+    data: Option<&'static [u8]>,
 }
 
-impl<'emu> EmulatorMemory<'emu> {
-    pub fn get_data<T: MemoryRw<'emu>>(&mut self, emu: &'emu T) -> Option<&'emu [u8]> {
+impl EmulatorMemory {
+    pub fn get_data(&mut self, mem: &ReadWriteMemoryMap) -> Option<&'static [u8]> {
         match self.data {
             Some(_) => self.data,
             None => {
-                self.data = emu.peek_region(self.offset, self.length, self.bank_switch);
+                self.data = mem.peek_region(self.offset, self.length, self.bank_switch);
                 self.data
             }
         }
@@ -42,14 +42,13 @@ impl<'emu> EmulatorMemory<'emu> {
 
 struct BattleContext {
     active_pokemon: Pokemon,
-
 }
 
 
-impl<'emu> SyncedPokemonRedBlue<'emu> {
-    pub fn update_from_emu<T: MemoryRw<'emu>>(&mut self, emu: &'emu T) {
+impl SyncedPokemonRedBlue {
+    pub fn update_from_mem(&mut self, mem: &ReadWriteMemoryMap) {
         let battle_context = BattleContext {
-            active_pokemon: match self.raw.active_pokemon_raw.get_data(emu) {
+            active_pokemon: match self.raw.active_pokemon_raw.get_data(mem) {
                 Some(d) => num::FromPrimitive::from_u8(d[0xB]).unwrap_or(Pokemon::Unknown),
                 None => Pokemon::Unknown
             }
@@ -67,7 +66,7 @@ impl<'emu> SyncedPokemonRedBlue<'emu> {
     // }
 }
 
-impl<'emu> Default for Raw<'emu> {
+impl Default for Raw {
     fn default() -> Self {
         Raw {
             active_pokemon_raw: EmulatorMemory {
@@ -100,7 +99,7 @@ impl Default for BattleContext {
     }
 }
 
-impl Display for SyncedPokemonRedBlue<'_> {
+impl Display for SyncedPokemonRedBlue {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         write!(f, "active: pk {:?}", &self.battle_context.active_pokemon)
     }

From ff18f2d382fc9701f791c5713d6972320809f550 Mon Sep 17 00:00:00 2001
From: Vivian Lim <vivvnlim@gmail.com>
Date: Tue, 24 Dec 2019 16:24:10 -0800
Subject: [PATCH 04/13] r/w slices

---
 src/sync/memory_rw.rs  |  8 ++------
 src/sync/pokemon_rb.rs | 32 +++++++++++++++++++++-----------
 2 files changed, 23 insertions(+), 17 deletions(-)

diff --git a/src/sync/memory_rw.rs b/src/sync/memory_rw.rs
index 2addfee..b88a40a 100644
--- a/src/sync/memory_rw.rs
+++ b/src/sync/memory_rw.rs
@@ -8,17 +8,13 @@ pub struct ReadWriteMemoryMap {
 }
 
 impl ReadWriteMemoryMap {
-    pub fn peek_region(&self, offset: usize, length: usize, bank_switch: usize) -> Option<&'static [u8]> {
+    pub fn get_slice_from_region(&self, offset: usize, length: usize, bank_switch: usize) -> Option<&'static mut [u8]> {
         match self.find_bank(offset, length, bank_switch) {
-            Some(ptr) => Some(unsafe { std::slice::from_raw_parts(ptr as *const u8, length) }),
+            Some(ptr) => Some(unsafe { std::slice::from_raw_parts_mut(ptr as *mut u8, length) }),
             None => None
         }
     }
 
-    pub fn poke_region<T>(&mut self, offset: usize, data: T, bank_switch: usize) {
-        
-    }
-
     fn find_bank(&self, offset: usize, length: usize, bank_switch: usize) -> Option<*const std::ffi::c_void> {
         if self.regions.len() == 0 {
             return None;
diff --git a/src/sync/pokemon_rb.rs b/src/sync/pokemon_rb.rs
index ad62d93..8b3bcca 100644
--- a/src/sync/pokemon_rb.rs
+++ b/src/sync/pokemon_rb.rs
@@ -3,6 +3,7 @@ use std::fmt::Display;
 use crate::sync::memory_rw::ReadWriteMemoryMap;
 use serde::{Serialize, Deserialize};
 use ferretro::retro::wrapper::LibretroWrapper; // want LibretroWrapper.api : LibretroApi.get_memory()
+use crate::num::ToPrimitive;
 
 #[derive(Default)]
 pub struct SyncedPokemonRedBlue {
@@ -25,16 +26,16 @@ struct EmulatorMemory {
     offset: usize,
     length: usize,
     bank_switch: usize,
-    data: Option<&'static [u8]>,
+    slice: Option<&'static mut [u8]>,
 }
 
 impl EmulatorMemory {
-    pub fn get_data(&mut self, mem: &ReadWriteMemoryMap) -> Option<&'static [u8]> {
-        match self.data {
-            Some(_) => self.data,
+    pub fn get_slice(&mut self, mem: &ReadWriteMemoryMap) -> &mut Option<&'static mut [u8]> {
+        match self.slice {
+            Some(_) => &mut self.slice,
             None => {
-                self.data = mem.peek_region(self.offset, self.length, self.bank_switch);
-                self.data
+                self.slice = mem.get_slice_from_region(self.offset, self.length, self.bank_switch);
+                &mut self.slice
             }
         }
     }
@@ -48,12 +49,21 @@ struct BattleContext {
 impl SyncedPokemonRedBlue {
     pub fn update_from_mem(&mut self, mem: &ReadWriteMemoryMap) {
         let battle_context = BattleContext {
-            active_pokemon: match self.raw.active_pokemon_raw.get_data(mem) {
+            active_pokemon: match self.raw.active_pokemon_raw.get_slice(mem) {
                 Some(d) => num::FromPrimitive::from_u8(d[0xB]).unwrap_or(Pokemon::Unknown),
                 None => Pokemon::Unknown
             }
         };
 
+        // test to see that we can indeed write back to the slice
+        // match self.raw.active_pokemon_raw.get_slice(mem){
+        //     Some(s) => {
+        //         s[0xD] = 69
+        //     },
+        //     _ => ()
+        // }
+
+
         self.battle_context = battle_context;
 
     }
@@ -73,19 +83,19 @@ impl Default for Raw {
                 offset: 0xd009,
                 length: 0x27,
                 bank_switch: 0,
-                data: None,
+                slice: None,
             },
             player_and_party: EmulatorMemory {
                 offset: 0xd158,
                 length: 0x19e,
                 bank_switch: 0,
-                data: None,
+                slice: None,
             },
             pokemon_out: EmulatorMemory {
                 offset: 0xcc2f,
                 length: 0x1,
                 bank_switch: 0,
-                data: None,
+                slice: None,
             },
         }
     }
@@ -104,7 +114,7 @@ impl Display for SyncedPokemonRedBlue {
         write!(f, "active: pk {:?}", &self.battle_context.active_pokemon)
     }
 }
-#[derive(FromPrimitive, Debug)]
+#[derive(FromPrimitive, ToPrimitive, Debug)]
 enum Pokemon {
     Unknown = 0x0,
     Abra = 0x94,

From 23f24e1f77eccb802305649ae8cfffd3a5c5e491 Mon Sep 17 00:00:00 2001
From: Vivian Lim <vivvnlim@gmail.com>
Date: Wed, 1 Jan 2020 20:50:59 -0800
Subject: [PATCH 05/13] basic serialization of memory wip

---
 Cargo.lock             |  24 +++++++++
 Cargo.toml             |   1 +
 src/emulator.rs        |   9 ++--
 src/sync/pokemon_rb.rs | 118 +++++++++++++++++++++++++++++++++--------
 4 files changed, 123 insertions(+), 29 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index a330b24..261caca 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -153,6 +153,7 @@ dependencies = [
  "sdl2 0.32.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_bytes 0.11.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_json 1.0.44 (registry+https://github.com/rust-lang/crates.io-index)",
  "structopt 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -169,6 +170,11 @@ dependencies = [
  "unicode-segmentation 1.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "itoa"
+version = "0.4.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "lazy_static"
 version = "1.4.0"
@@ -465,6 +471,11 @@ name = "rustc-demangle"
 version = "0.1.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "ryu"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "sdl2"
 version = "0.32.2"
@@ -513,6 +524,16 @@ dependencies = [
  "syn 1.0.11 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "serde_json"
+version = "1.0.44"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "itoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "ryu 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "strsim"
 version = "0.8.0"
@@ -648,6 +669,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum failure_derive 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "0bc225b78e0391e4b8683440bf2e63c2deeeb2ce5189eab46e2b68c6d3725d08"
 "checksum fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba"
 "checksum heck 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "20564e78d53d2bb135c343b3f47714a56af2061f1c928fdb541dc7b9fdd94205"
+"checksum itoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)" = "501266b7edd0174f8530248f87f99c88fbe60ca4ef3dd486835b8d8d53136f7f"
 "checksum lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
 "checksum libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)" = "d515b1f41455adea1313a4a2ac8a8a477634fbae63cc6100e3aebb207ce61558"
 "checksum libloading 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f2b111a074963af1d37a139918ac6d49ad1d0d5e47f72fd55388619691a7d753"
@@ -681,11 +703,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum rand_xorshift 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cbf7e9e623549b0e21f6e97cf8ecf247c1a8fd2e8a992ae265314300b2455d5c"
 "checksum rdrand 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "678054eb77286b51581ba43620cc911abf02758c91f93f479767aed0f90458b2"
 "checksum rustc-demangle 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)" = "4c691c0e608126e00913e33f0ccf3727d5fc84573623b8d65b2df340b5201783"
+"checksum ryu 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "bfa8506c1de11c9c4e4c38863ccbe02a305c8188e85a05a784c9e11e1c3910c8"
 "checksum sdl2 0.32.2 (registry+https://github.com/rust-lang/crates.io-index)" = "d051a07231e303f5f719da78cb6f7394f6d5b54f733aef5b0b447804a83edd7b"
 "checksum sdl2-sys 0.32.6 (registry+https://github.com/rust-lang/crates.io-index)" = "34e71125077d297d57e4c1acfe8981b5bdfbf5a20e7b589abfdcb33bf1127f86"
 "checksum serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)" = "414115f25f818d7dfccec8ee535d76949ae78584fc4f79a6f45a904bf8ab4449"
 "checksum serde_bytes 0.11.3 (registry+https://github.com/rust-lang/crates.io-index)" = "325a073952621257820e7a3469f55ba4726d8b28657e7e36653d1c36dc2c84ae"
 "checksum serde_derive 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)" = "128f9e303a5a29922045a830221b8f78ec74a5f544944f3d5984f8ec3895ef64"
+"checksum serde_json 1.0.44 (registry+https://github.com/rust-lang/crates.io-index)" = "48c575e0cc52bdd09b47f330f646cf59afc586e9c4e3ccd6fc1f625b8ea1dad7"
 "checksum strsim 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a"
 "checksum structopt 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "30b3a3e93f5ad553c38b3301c8a0a0cec829a36783f6a0c467fc4bf553a5f5bf"
 "checksum structopt-derive 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "ea692d40005b3ceba90a9fe7a78fa8d4b82b0ce627eebbffc329aab850f3410e"
diff --git a/Cargo.toml b/Cargo.toml
index 25dc4b0..82e0187 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -19,5 +19,6 @@ crossbeam-channel = "^0.4"
 structopt = "^0.3"
 serde = { version = "1.0.104", features = ["derive"] }
 serde_bytes = "0.11"
+serde_json = "1.0.44"
 
 [dev-dependencies]
\ No newline at end of file
diff --git a/src/emulator.rs b/src/emulator.rs
index c95cccf..e3d4a71 100644
--- a/src/emulator.rs
+++ b/src/emulator.rs
@@ -49,8 +49,6 @@ pub struct MyEmulator {
     pressed_keys: Vec<Keycode>,
 
     // memory
-    memory_map: ReadWriteMemoryMap,
-
     synced_pokemonrb: SyncedPokemonRedBlue,
 }
 
@@ -119,7 +117,7 @@ impl MyEmulator {
         let pressed_keys = Vec::new();
 
         let memory_map = std::default::Default::default();
-        let synced_pokemonrb = std::default::Default::default();
+        let synced_pokemonrb = SyncedPokemonRedBlue::create(memory_map);
 
         let emu = MyEmulator {
             retro,
@@ -138,7 +136,6 @@ impl MyEmulator {
             gamepad_subsys,
             gamepads,
             pressed_keys,
-            memory_map,
             synced_pokemonrb,
         };
         let mut pin_emu = Box::pin(emu);
@@ -176,7 +173,7 @@ impl MyEmulator {
                 spf = 1.0 / 60.0;
             }
 
-            self.synced_pokemonrb.update_from_mem(&self.memory_map);
+            self.synced_pokemonrb.update_from_mem();
             println!("{}", self.synced_pokemonrb);
 
             Duration::from_secs_f64(spf)
@@ -410,7 +407,7 @@ impl retro::wrapper::Handler for MyEmulator {
     }
 
     fn set_memory_maps(&mut self, memory_map: MemoryMap) -> bool {
-        self.memory_map.libretro_set_memory_maps(memory_map);
+        self.synced_pokemonrb.libretro_set_memory_maps(memory_map);
         true
     }
 }
diff --git a/src/sync/pokemon_rb.rs b/src/sync/pokemon_rb.rs
index 8b3bcca..81bfa59 100644
--- a/src/sync/pokemon_rb.rs
+++ b/src/sync/pokemon_rb.rs
@@ -5,39 +5,46 @@ use serde::{Serialize, Deserialize};
 use ferretro::retro::wrapper::LibretroWrapper; // want LibretroWrapper.api : LibretroApi.get_memory()
 use crate::num::ToPrimitive;
 
-#[derive(Default)]
 pub struct SyncedPokemonRedBlue {
-    raw: Raw,
+    raw: Raw<'static>,
     battle_context: BattleContext,
 }
 
-//#[derive(Serialize, Deserialize)]
+
+#[derive(Serialize, Deserialize)]
 pub struct Message {
-    active_pkmn: Box<[u8]>
+    active_pkmn: Option<Vec<u8>>
 }
 
-struct Raw {
-    active_pokemon_raw: EmulatorMemory,
-    player_and_party: EmulatorMemory,
-    pokemon_out: EmulatorMemory,
+impl From<&Raw<'_>> for Message {
+    fn from(src: &Raw) -> Self {
+        Message {
+            active_pkmn: match &src.active_pokemon_raw.slice {
+                Some(m) => Some(m.to_vec()),
+                None => None
+            }
+        }
+
+    }
 }
 
-struct EmulatorMemory {
+struct Raw<'a> {
+    active_pokemon_raw: EmulatorMemory<'a>,
+    player_and_party: EmulatorMemory<'a>,
+    pokemon_out: EmulatorMemory<'a>,
+    pub memory_map: ReadWriteMemoryMap,
+}
+
+struct EmulatorMemory<'a> {
     offset: usize,
     length: usize,
     bank_switch: usize,
-    slice: Option<&'static mut [u8]>,
+    pub slice: Option<&'a mut [u8]>,
 }
 
-impl EmulatorMemory {
-    pub fn get_slice(&mut self, mem: &ReadWriteMemoryMap) -> &mut Option<&'static mut [u8]> {
-        match self.slice {
-            Some(_) => &mut self.slice,
-            None => {
-                self.slice = mem.get_slice_from_region(self.offset, self.length, self.bank_switch);
-                &mut self.slice
-            }
-        }
+impl EmulatorMemory<'_> {
+    pub fn update_slice(&mut self, map: &ReadWriteMemoryMap) {
+        self.slice = map.get_slice_from_region(self.offset, self.length, self.bank_switch);
     }
 }
 
@@ -47,9 +54,9 @@ struct BattleContext {
 
 
 impl SyncedPokemonRedBlue {
-    pub fn update_from_mem(&mut self, mem: &ReadWriteMemoryMap) {
+    pub fn update_from_mem(&mut self) {
         let battle_context = BattleContext {
-            active_pokemon: match self.raw.active_pokemon_raw.get_slice(mem) {
+            active_pokemon: match &self.raw.active_pokemon_raw.slice {
                 Some(d) => num::FromPrimitive::from_u8(d[0xB]).unwrap_or(Pokemon::Unknown),
                 None => Pokemon::Unknown
             }
@@ -76,8 +83,8 @@ impl SyncedPokemonRedBlue {
     // }
 }
 
-impl Default for Raw {
-    fn default() -> Self {
+impl Raw<'_> {
+    pub fn create(map: ReadWriteMemoryMap) -> Self {
         Raw {
             active_pokemon_raw: EmulatorMemory {
                 offset: 0xd009,
@@ -97,6 +104,7 @@ impl Default for Raw {
                 bank_switch: 0,
                 slice: None,
             },
+            memory_map: map
         }
     }
 }
@@ -114,6 +122,31 @@ impl Display for SyncedPokemonRedBlue {
         write!(f, "active: pk {:?}", &self.battle_context.active_pokemon)
     }
 }
+
+impl SyncedPokemonRedBlue {
+    pub fn create(map: ReadWriteMemoryMap) -> Self {
+        SyncedPokemonRedBlue {
+            raw: Raw::create(map),
+            battle_context: BattleContext::default(),
+        }
+    }
+
+    pub fn libretro_set_memory_maps(&mut self, libretro_memory_map: ferretro::retro::ffi::MemoryMap) {
+        self.raw.libretro_set_memory_maps(libretro_memory_map)
+    }
+}
+
+impl Raw<'_> {
+    pub fn libretro_set_memory_maps(&mut self, libretro_memory_map: ferretro::retro::ffi::MemoryMap) {
+        self.memory_map.libretro_set_memory_maps(libretro_memory_map);
+
+        // update our slices
+        self.active_pokemon_raw.update_slice(&self.memory_map);
+        self.player_and_party.update_slice(&self.memory_map);
+        self.pokemon_out.update_slice(&self.memory_map);
+    }
+}
+
 #[derive(FromPrimitive, ToPrimitive, Debug)]
 enum Pokemon {
     Unknown = 0x0,
@@ -268,4 +301,43 @@ enum Pokemon {
     Wigglytuff = 0x65,
     Zapdos = 0x4B,
     Zubat = 0x6B,
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use serde_json;
+
+    fn build_message(em: &EmulatorMemory) -> Message {
+        Message {
+            active_pkmn: match &em.slice {
+                Some(m) => Some(m.to_vec()),
+                None => None
+            }
+        }
+    }
+
+    #[test]
+    fn serde_mem() -> Result<(), String> {
+        let mut data: [u8; 5] = [1, 2, 3, 4, 5];
+        let b: &mut [u8] = &mut data;
+        let slice = EmulatorMemory {
+            offset: 0,
+            length: 0,
+            bank_switch: 0,
+            slice: Some(b),
+        };
+
+        let message = build_message(&slice);
+
+        let serialized = serde_json::to_string(&message).unwrap();
+
+        println!("serialized data: {}", serialized);
+
+        let deserialized: Message = serde_json::from_str(&serialized).unwrap();
+
+        assert_eq!(deserialized.active_pkmn.unwrap()[0], data[0]);
+        Ok(())
+    }
+
 }
\ No newline at end of file

From 32c4aa99cfa6ae529d3ba2c3d5bd622ce7aa8da3 Mon Sep 17 00:00:00 2001
From: Vivian Lim <vivvnlim@gmail.com>
Date: Wed, 1 Jan 2020 20:54:46 -0800
Subject: [PATCH 06/13] serialize Raw every frame and print it

---
 src/sync/pokemon_rb.rs | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/sync/pokemon_rb.rs b/src/sync/pokemon_rb.rs
index 81bfa59..f0f7cf2 100644
--- a/src/sync/pokemon_rb.rs
+++ b/src/sync/pokemon_rb.rs
@@ -73,6 +73,14 @@ impl SyncedPokemonRedBlue {
 
         self.battle_context = battle_context;
 
+        let message: Message = (&self.raw).into();
+        match serde_json::to_string(&message) {
+            Ok(serialized) => {
+                println!("serialized data: {}", serialized)
+            }
+            Err(_) => ()
+        }
+
     }
 
     // pub fn get_message<'a>(&self) -> Message {

From 96e65048c8ee70a9fb2fbf1b6288aae7e72258b5 Mon Sep 17 00:00:00 2001
From: Vivian Lim <vivvnlim@gmail.com>
Date: Thu, 2 Jan 2020 03:17:39 -0800
Subject: [PATCH 07/13] wip websocket comms

---
 .vscode/launch.json    |  14 +
 Cargo.lock             | 782 +++++++++++++++++++++++++++++++++++++++++
 Cargo.toml             |   1 +
 src/comms.rs           |  37 --
 src/emulator.rs        |   5 +-
 src/main.rs            |   2 -
 src/sync/comms.rs      | 109 ++++++
 src/sync/mod.rs        |   3 +-
 src/sync/pokemon_rb.rs |  47 ++-
 9 files changed, 952 insertions(+), 48 deletions(-)
 delete mode 100644 src/comms.rs
 create mode 100644 src/sync/comms.rs

diff --git a/.vscode/launch.json b/.vscode/launch.json
index 9cab8e0..4cb3dfd 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -18,6 +18,20 @@
             }],
             "externalConsole": false,
         },
+        {
+            "name": "sync: pokeblue 2",
+            "type": "cppvsdbg",
+            "request": "launch",
+            "program": "target/debug/ferretro-synced.exe",
+            "args": ["--core", "./data/gambatte_libretro.dll", "--rom", "./data/pokeblue.gb", "--state", "./data/pkblue-route1.sav"],
+            "stopAtEntry": false,
+            "cwd": "${workspaceFolder}",
+            "environment": [{
+                "name": "RUST_BACKTRACE",
+                "value": "1"
+            }],
+            "externalConsole": false,
+        },
         {
             "name": "sync: sonic2",
             "type": "cppvsdbg",
diff --git a/Cargo.lock b/Cargo.lock
index 261caca..ebf655e 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -42,11 +42,50 @@ dependencies = [
  "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "base64"
+version = "0.9.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "safemem 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "base64"
+version = "0.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "bitflags"
 version = "1.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "byteorder"
+version = "1.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "bytes"
+version = "0.4.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "iovec 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "c2-chacha"
+version = "0.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "ppv-lite86 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "cc"
 version = "1.0.48"
@@ -79,6 +118,20 @@ dependencies = [
  "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "core-foundation"
+version = "0.6.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "core-foundation-sys 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "core-foundation-sys"
+version = "0.6.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "crossbeam-channel"
 version = "0.4.0"
@@ -87,6 +140,15 @@ dependencies = [
  "crossbeam-utils 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "crossbeam-utils"
+version = "0.6.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "crossbeam-utils"
 version = "0.7.0"
@@ -155,13 +217,61 @@ dependencies = [
  "serde_bytes 0.11.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_json 1.0.44 (registry+https://github.com/rust-lang/crates.io-index)",
  "structopt 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "websocket 0.24.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "fnv"
+version = "1.0.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "foreign-types"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "foreign-types-shared 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "foreign-types-shared"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "fuchsia-cprng"
 version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "fuchsia-zircon"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "fuchsia-zircon-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "fuchsia-zircon-sys"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "futures"
+version = "0.1.29"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "getrandom"
+version = "0.1.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
+ "wasi 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "heck"
 version = "0.3.1"
@@ -170,11 +280,74 @@ dependencies = [
  "unicode-segmentation 1.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "hermit-abi"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "httparse"
+version = "1.3.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "hyper"
+version = "0.10.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "base64 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "httparse 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "language-tags 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "mime 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "num_cpus 1.11.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)",
+ "traitobject 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "typeable 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "unicase 1.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "idna"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "unicode-bidi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "unicode-normalization 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "iovec"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "itoa"
 version = "0.4.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "kernel32-sys"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "language-tags"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "lazy_static"
 version = "1.4.0"
@@ -202,6 +375,104 @@ dependencies = [
  "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "lock_api"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "scopeguard 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "log"
+version = "0.3.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "log"
+version = "0.4.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "matches"
+version = "0.1.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "maybe-uninit"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "mime"
+version = "0.2.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "mio"
+version = "0.6.21"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
+ "fuchsia-zircon 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "fuchsia-zircon-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "iovec 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "miow 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "net2 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)",
+ "slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "miow"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "net2 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "ws2_32-sys 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "native-tls"
+version = "0.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "openssl 0.10.26 (registry+https://github.com/rust-lang/crates.io-index)",
+ "openssl-probe 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "openssl-sys 0.9.53 (registry+https://github.com/rust-lang/crates.io-index)",
+ "schannel 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)",
+ "security-framework 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "security-framework-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tempfile 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "net2"
+version = "0.2.33"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "num"
 version = "0.1.42"
@@ -292,6 +563,15 @@ dependencies = [
  "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "num_cpus"
+version = "1.11.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "hermit-abi 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "num_enum"
 version = "0.4.2"
@@ -312,6 +592,75 @@ dependencies = [
  "syn 1.0.11 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "openssl"
+version = "0.10.26"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
+ "foreign-types 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
+ "openssl-sys 0.9.53 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "openssl-probe"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "openssl-sys"
+version = "0.9.53"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cc 1.0.48 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
+ "pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",
+ "vcpkg 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "parking_lot"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "lock_api 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "parking_lot_core 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "parking_lot_core"
+version = "0.6.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
+ "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "smallvec 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "percent-encoding"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "pkg-config"
+version = "0.3.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "ppv-lite86"
+version = "0.2.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "proc-macro-crate"
 version = "0.1.4"
@@ -380,6 +729,18 @@ dependencies = [
  "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "rand"
+version = "0.7.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "getrandom 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand_chacha 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand_hc 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "rand_chacha"
 version = "0.1.1"
@@ -389,6 +750,15 @@ dependencies = [
  "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "rand_chacha"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "c2-chacha 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "rand_core"
 version = "0.3.1"
@@ -402,6 +772,14 @@ name = "rand_core"
 version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "rand_core"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "getrandom 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "rand_hc"
 version = "0.1.0"
@@ -410,6 +788,14 @@ dependencies = [
  "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "rand_hc"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "rand_isaac"
 version = "0.1.1"
@@ -466,16 +852,56 @@ dependencies = [
  "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "redox_syscall"
+version = "0.1.56"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "remove_dir_all"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "rustc-demangle"
 version = "0.1.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "rustc_version"
+version = "0.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "ryu"
 version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "safemem"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "schannel"
+version = "0.1.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "scopeguard"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "sdl2"
 version = "0.32.2"
@@ -498,6 +924,38 @@ dependencies = [
  "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "security-framework"
+version = "0.3.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "core-foundation 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "core-foundation-sys 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
+ "security-framework-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "security-framework-sys"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "core-foundation-sys 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "semver"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "semver-parser"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "serde"
 version = "1.0.104"
@@ -534,6 +992,29 @@ dependencies = [
  "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "sha1"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "slab"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "smallvec"
+version = "0.6.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "maybe-uninit 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "smallvec"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "strsim"
 version = "0.8.0"
@@ -591,6 +1072,19 @@ dependencies = [
  "unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "tempfile"
+version = "3.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)",
+ "remove_dir_all 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "textwrap"
 version = "0.11.0"
@@ -599,6 +1093,95 @@ dependencies = [
  "unicode-width 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "time"
+version = "0.1.42"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
+ "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "tokio-codec"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-io 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "tokio-executor"
+version = "0.1.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "crossbeam-utils 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "tokio-io"
+version = "0.1.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "tokio-reactor"
+version = "0.1.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "crossbeam-utils 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "mio 0.6.21 (registry+https://github.com/rust-lang/crates.io-index)",
+ "num_cpus 1.11.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "parking_lot 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-executor 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-io 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-sync 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "tokio-sync"
+version = "0.1.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "tokio-tcp"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)",
+ "iovec 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "mio 0.6.21 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-io 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-reactor 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "tokio-tls"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)",
+ "native-tls 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-io 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "toml"
 version = "0.5.5"
@@ -607,6 +1190,40 @@ dependencies = [
  "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "traitobject"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "typeable"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "unicase"
+version = "1.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "version_check 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "unicode-bidi"
+version = "0.3.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "unicode-normalization"
+version = "0.1.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "smallvec 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "unicode-segmentation"
 version = "1.6.0"
@@ -627,11 +1244,80 @@ name = "unicode-xid"
 version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "url"
+version = "1.7.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "idna 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "percent-encoding 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "vcpkg"
+version = "0.2.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "vec_map"
 version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "version_check"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "wasi"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "websocket"
+version = "0.24.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)",
+ "hyper 0.10.16 (registry+https://github.com/rust-lang/crates.io-index)",
+ "native-tls 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-codec 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-io 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-reactor 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-tcp 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-tls 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "unicase 1.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "websocket-base 0.24.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "websocket-base"
+version = "0.24.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "base64 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)",
+ "native-tls 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "sha1 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-codec 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-io 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-tcp 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-tls 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "winapi"
+version = "0.2.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "winapi"
 version = "0.3.8"
@@ -641,6 +1327,11 @@ dependencies = [
  "winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "winapi-build"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "winapi-i686-pc-windows-gnu"
 version = "0.4.0"
@@ -651,29 +1342,70 @@ name = "winapi-x86_64-pc-windows-gnu"
 version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "ws2_32-sys"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [metadata]
 "checksum ansi_term 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b"
 "checksum atty 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)" = "1803c647a3ec87095e7ae7acfca019e98de5ec9a7d01343f611cf3152ed71a90"
 "checksum autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "1d49d90015b3c36167a20fe2810c5cd875ad504b39cff3d4eae7977e6b7c1cb2"
 "checksum backtrace 0.3.40 (registry+https://github.com/rust-lang/crates.io-index)" = "924c76597f0d9ca25d762c25a4d369d51267536465dc5064bdf0eb073ed477ea"
 "checksum backtrace-sys 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)" = "5d6575f128516de27e3ce99689419835fce9643a9b215a14d2b5b685be018491"
+"checksum base64 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0b25d992356d2eb0ed82172f5248873db5560c4721f564b13cb5193bda5e668e"
+"checksum base64 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)" = "489d6c0ed21b11d038c31b6ceccca973e65d73ba3bd8ecb9a2babf5546164643"
 "checksum bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693"
+"checksum byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a7c3dd8985a7111efc5c80b44e23ecdd8c007de8ade3b96595387e812b957cf5"
+"checksum bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)" = "206fdffcfa2df7cbe15601ef46c813fce0965eb3286db6b56c583b814b51c81c"
+"checksum c2-chacha 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "214238caa1bf3a496ec3392968969cab8549f96ff30652c9e56885329315f6bb"
 "checksum cc 1.0.48 (registry+https://github.com/rust-lang/crates.io-index)" = "f52a465a666ca3d838ebbf08b241383421412fe7ebb463527bba275526d89f76"
 "checksum cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)" = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822"
 "checksum clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5067f5bb2d80ef5d68b4c87db81601f0b75bca627bc2ef76b141d7b846a3c6d9"
 "checksum cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f"
+"checksum core-foundation 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)" = "25b9e03f145fd4f2bf705e07b900cd41fc636598fe5dc452fd0db1441c3f496d"
+"checksum core-foundation-sys 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "e7ca8a5221364ef15ce201e8ed2f609fc312682a8f4e0e3d4aa5879764e0fa3b"
 "checksum crossbeam-channel 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "acec9a3b0b3559f15aee4f90746c4e5e293b701c0f7d3925d24e01645267b68c"
+"checksum crossbeam-utils 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)" = "04973fa96e96579258a5091af6003abde64af786b860f18622b82e026cca60e6"
 "checksum crossbeam-utils 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ce446db02cdc3165b94ae73111e570793400d0794e46125cc4056c81cbb039f4"
 "checksum derivative 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "942ca430eef7a3806595a6737bc388bf51adb888d3fc0dd1b50f1c170167ee3a"
 "checksum failure 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "f8273f13c977665c5db7eb2b99ae520952fe5ac831ae4cd09d80c4c7042b5ed9"
 "checksum failure_derive 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "0bc225b78e0391e4b8683440bf2e63c2deeeb2ce5189eab46e2b68c6d3725d08"
+"checksum fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)" = "2fad85553e09a6f881f739c29f0b00b0f01357c743266d478b68951ce23285f3"
+"checksum foreign-types 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1"
+"checksum foreign-types-shared 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b"
 "checksum fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba"
+"checksum fuchsia-zircon 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "2e9763c69ebaae630ba35f74888db465e49e259ba1bc0eda7d06f4a067615d82"
+"checksum fuchsia-zircon-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7"
+"checksum futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)" = "1b980f2816d6ee8673b6517b52cb0e808a180efc92e5c19d02cdda79066703ef"
+"checksum getrandom 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)" = "e7db7ca94ed4cd01190ceee0d8a8052f08a247aa1b469a7f68c6a3b71afcf407"
 "checksum heck 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "20564e78d53d2bb135c343b3f47714a56af2061f1c928fdb541dc7b9fdd94205"
+"checksum hermit-abi 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "f629dc602392d3ec14bfc8a09b5e644d7ffd725102b48b81e59f90f2633621d7"
+"checksum httparse 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "cd179ae861f0c2e53da70d892f5f3029f9594be0c41dc5269cd371691b1dc2f9"
+"checksum hyper 0.10.16 (registry+https://github.com/rust-lang/crates.io-index)" = "0a0652d9a2609a968c14be1a9ea00bf4b1d64e2e1f53a1b51b6fff3a6e829273"
+"checksum idna 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "38f09e0f0b1fb55fdee1f17470ad800da77af5186a1a76c026b679358b7e844e"
+"checksum iovec 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "b2b3ea6ff95e175473f8ffe6a7eb7c00d054240321b84c57051175fe3c1e075e"
 "checksum itoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)" = "501266b7edd0174f8530248f87f99c88fbe60ca4ef3dd486835b8d8d53136f7f"
+"checksum kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d"
+"checksum language-tags 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a91d884b6667cd606bb5a69aa0c99ba811a115fc68915e7056ec08a46e93199a"
 "checksum lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
 "checksum libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)" = "d515b1f41455adea1313a4a2ac8a8a477634fbae63cc6100e3aebb207ce61558"
 "checksum libloading 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f2b111a074963af1d37a139918ac6d49ad1d0d5e47f72fd55388619691a7d753"
 "checksum libretro-sys 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "207b060b02cecbcee6df3d0f5ed38691d5c4df1379dd1acd5c49c9b25d20b439"
+"checksum lock_api 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "e57b3997725d2b60dbec1297f6c2e2957cc383db1cebd6be812163f969c7d586"
+"checksum log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)" = "e19e8d5c34a3e0e2223db8e060f9e8264aeeb5c5fc64a4ee9965c062211c024b"
+"checksum log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)" = "14b6052be84e6b71ab17edffc2eeabf5c2c3ae1fdb464aae35ac50c67a44e1f7"
+"checksum matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08"
+"checksum maybe-uninit 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "60302e4db3a61da70c0cb7991976248362f30319e88850c487b9b95bbf059e00"
+"checksum mime 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "ba626b8a6de5da682e1caa06bdb42a335aee5a84db8e5046a3e8ab17ba0a3ae0"
+"checksum mio 0.6.21 (registry+https://github.com/rust-lang/crates.io-index)" = "302dec22bcf6bae6dfb69c647187f4b4d0fb6f535521f7bc022430ce8e12008f"
+"checksum miow 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "8c1f2f3b1cf331de6896aabf6e9d55dca90356cc9960cca7eaaf408a355ae919"
+"checksum native-tls 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "4b2df1a4c22fd44a62147fd8f13dd0f95c9d8ca7b2610299b2a2f9cf8964274e"
+"checksum net2 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)" = "42550d9fb7b6684a6d404d9fa7250c2eb2646df731d1c06afc06dcee9e1bcf88"
 "checksum num 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)" = "4703ad64153382334aa8db57c637364c322d3372e097840c72000dabdcf6156e"
 "checksum num 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "cf4825417e1e1406b3782a8ce92f4d53f26ec055e3622e1881ca8e9f5f9e08db"
 "checksum num-bigint 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "f9c3f34cdd24f334cb265d9bf8bfa8a241920d026916785747a92f0e55541a1a"
@@ -683,8 +1415,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum num-iter 0.1.39 (registry+https://github.com/rust-lang/crates.io-index)" = "76bd5272412d173d6bf9afdf98db8612bbabc9a7a830b7bfc9c188911716132e"
 "checksum num-rational 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f2885278d5fe2adc2f75ced642d52d879bffaceb5a2e0b1d4309ffdfb239b454"
 "checksum num-traits 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)" = "d4c81ffc11c212fa327657cb19dd85eb7419e163b5b076bede2bdb5c974c07e4"
+"checksum num_cpus 1.11.1 (registry+https://github.com/rust-lang/crates.io-index)" = "76dac5ed2a876980778b8b85f75a71b6cbf0db0b1232ee12f826bccb00d09d72"
 "checksum num_enum 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "be601e38e20a6f3d01049d85801cb9b7a34a8da7a0da70df507bbde7735058c8"
 "checksum num_enum_derive 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "b59f30f6a043f2606adbd0addbf1eef6f2e28e8c4968918b63b7ff97ac0db2a7"
+"checksum openssl 0.10.26 (registry+https://github.com/rust-lang/crates.io-index)" = "3a3cc5799d98e1088141b8e01ff760112bbd9f19d850c124500566ca6901a585"
+"checksum openssl-probe 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "77af24da69f9d9341038eba93a073b1fdaaa1b788221b00a69bce9e762cb32de"
+"checksum openssl-sys 0.9.53 (registry+https://github.com/rust-lang/crates.io-index)" = "465d16ae7fc0e313318f7de5cecf57b2fbe7511fd213978b457e1c96ff46736f"
+"checksum parking_lot 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f842b1982eb6c2fe34036a4fbfb06dd185a3f5c8edfaacdf7d1ea10b07de6252"
+"checksum parking_lot_core 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "b876b1b9e7ac6e1a74a6da34d25c42e17e8862aa409cbbbdcfc8d86c6f3bc62b"
+"checksum percent-encoding 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "31010dd2e1ac33d5b46a5b413495239882813e0369f8ed8a5e266f173602f831"
+"checksum pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)" = "05da548ad6865900e60eaba7f589cc0783590a92e940c26953ff81ddbab2d677"
+"checksum ppv-lite86 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "74490b50b9fbe561ac330df47c08f3f33073d2d00c150f719147d7c54522fa1b"
 "checksum proc-macro-crate 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "e10d4b51f154c8a7fb96fd6dad097cb74b863943ec010ac94b9fd1be8861fe1e"
 "checksum proc-macro-error 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "aeccfe4d5d8ea175d5f0e4a2ad0637e0f4121d63bd99d356fb1f39ab2e7c6097"
 "checksum proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)" = "cf3d2011ab5c909338f7887f4fc896d35932e29146c12c8d01da6b22a80ba759"
@@ -692,37 +1433,78 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)" = "6ce23b6b870e8f94f81fb0a363d65d86675884b34a09043c81e5562f11c1f8e1"
 "checksum quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "053a8c8bcc71fcce321828dc897a98ab9760bef03a4fc36693c231e5b3216cfe"
 "checksum rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)" = "6d71dacdc3c88c1fde3885a3be3fbab9f35724e6ce99467f7d9c5026132184ca"
+"checksum rand 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)" = "3ae1b169243eaf61759b8475a998f0a385e42042370f3a7dbaf35246eacc8412"
 "checksum rand_chacha 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "556d3a1ca6600bfcbab7c7c91ccb085ac7fbbcd70e008a98742e7847f4f7bcef"
+"checksum rand_chacha 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "03a2a90da8c7523f554344f921aa97283eadf6ac484a6d2a7d0212fa7f8d6853"
 "checksum rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6fdeb83b075e8266dcc8762c22776f6877a63111121f5f8c7411e5be7eed4b"
 "checksum rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9c33a3c44ca05fa6f1807d8e6743f3824e8509beca625669633be0acbdf509dc"
+"checksum rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19"
 "checksum rand_hc 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7b40677c7be09ae76218dc623efbf7b18e34bced3f38883af07bb75630a21bc4"
+"checksum rand_hc 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c"
 "checksum rand_isaac 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ded997c9d5f13925be2a6fd7e66bf1872597f759fd9dd93513dd7e92e5a5ee08"
 "checksum rand_jitter 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "1166d5c91dc97b88d1decc3285bb0a99ed84b05cfd0bc2341bdf2d43fc41e39b"
 "checksum rand_os 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "7b75f676a1e053fc562eafbb47838d67c84801e38fc1ba459e8f180deabd5071"
 "checksum rand_pcg 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "abf9b09b01790cfe0364f52bf32995ea3c39f4d2dd011eac241d2914146d0b44"
 "checksum rand_xorshift 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cbf7e9e623549b0e21f6e97cf8ecf247c1a8fd2e8a992ae265314300b2455d5c"
 "checksum rdrand 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "678054eb77286b51581ba43620cc911abf02758c91f93f479767aed0f90458b2"
+"checksum redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)" = "2439c63f3f6139d1b57529d16bc3b8bb855230c8efcc5d3a896c8bea7c3b1e84"
+"checksum remove_dir_all 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "4a83fa3702a688b9359eccba92d153ac33fd2e8462f9e0e3fdf155239ea7792e"
 "checksum rustc-demangle 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)" = "4c691c0e608126e00913e33f0ccf3727d5fc84573623b8d65b2df340b5201783"
+"checksum rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a"
 "checksum ryu 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "bfa8506c1de11c9c4e4c38863ccbe02a305c8188e85a05a784c9e11e1c3910c8"
+"checksum safemem 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ef703b7cb59335eae2eb93ceb664c0eb7ea6bf567079d843e09420219668e072"
+"checksum schannel 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)" = "87f550b06b6cba9c8b8be3ee73f391990116bf527450d2556e9b9ce263b9a021"
+"checksum scopeguard 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b42e15e59b18a828bbf5c58ea01debb36b9b096346de35d941dcb89009f24a0d"
 "checksum sdl2 0.32.2 (registry+https://github.com/rust-lang/crates.io-index)" = "d051a07231e303f5f719da78cb6f7394f6d5b54f733aef5b0b447804a83edd7b"
 "checksum sdl2-sys 0.32.6 (registry+https://github.com/rust-lang/crates.io-index)" = "34e71125077d297d57e4c1acfe8981b5bdfbf5a20e7b589abfdcb33bf1127f86"
+"checksum security-framework 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "8ef2429d7cefe5fd28bd1d2ed41c944547d4ff84776f5935b456da44593a16df"
+"checksum security-framework-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "e31493fc37615debb8c5090a7aeb4a9730bc61e77ab10b9af59f1a202284f895"
+"checksum semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403"
+"checksum semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3"
 "checksum serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)" = "414115f25f818d7dfccec8ee535d76949ae78584fc4f79a6f45a904bf8ab4449"
 "checksum serde_bytes 0.11.3 (registry+https://github.com/rust-lang/crates.io-index)" = "325a073952621257820e7a3469f55ba4726d8b28657e7e36653d1c36dc2c84ae"
 "checksum serde_derive 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)" = "128f9e303a5a29922045a830221b8f78ec74a5f544944f3d5984f8ec3895ef64"
 "checksum serde_json 1.0.44 (registry+https://github.com/rust-lang/crates.io-index)" = "48c575e0cc52bdd09b47f330f646cf59afc586e9c4e3ccd6fc1f625b8ea1dad7"
+"checksum sha1 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "2579985fda508104f7587689507983eadd6a6e84dd35d6d115361f530916fa0d"
+"checksum slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "c111b5bd5695e56cffe5129854aa230b39c93a305372fdbb2668ca2394eea9f8"
+"checksum smallvec 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)" = "f7b0758c52e15a8b5e3691eae6cc559f08eee9406e548a4477ba4e67770a82b6"
+"checksum smallvec 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "44e59e0c9fa00817912ae6e4e6e3c4fe04455e75699d06eedc7d85917ed8e8f4"
 "checksum strsim 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a"
 "checksum structopt 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "30b3a3e93f5ad553c38b3301c8a0a0cec829a36783f6a0c467fc4bf553a5f5bf"
 "checksum structopt-derive 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "ea692d40005b3ceba90a9fe7a78fa8d4b82b0ce627eebbffc329aab850f3410e"
 "checksum syn 0.15.44 (registry+https://github.com/rust-lang/crates.io-index)" = "9ca4b3b69a77cbe1ffc9e198781b7acb0c7365a883670e8f1c1bc66fba79a5c5"
 "checksum syn 1.0.11 (registry+https://github.com/rust-lang/crates.io-index)" = "dff0acdb207ae2fe6d5976617f887eb1e35a2ba52c13c7234c790960cdad9238"
 "checksum synstructure 0.12.3 (registry+https://github.com/rust-lang/crates.io-index)" = "67656ea1dc1b41b1451851562ea232ec2e5a80242139f7e679ceccfb5d61f545"
+"checksum tempfile 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6e24d9338a0a5be79593e2fa15a648add6138caa803e2d5bc782c371732ca9"
 "checksum textwrap 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060"
+"checksum time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)" = "db8dcfca086c1143c9270ac42a2bbd8a7ee477b78ac8e45b19abfb0cbede4b6f"
+"checksum tokio-codec 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "5c501eceaf96f0e1793cf26beb63da3d11c738c4a943fdf3746d81d64684c39f"
+"checksum tokio-executor 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "ca6df436c42b0c3330a82d855d2ef017cd793090ad550a6bc2184f4b933532ab"
+"checksum tokio-io 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)" = "5090db468dad16e1a7a54c8c67280c5e4b544f3d3e018f0b913b400261f85926"
+"checksum tokio-reactor 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)" = "6732fe6b53c8d11178dcb77ac6d9682af27fc6d4cb87789449152e5377377146"
+"checksum tokio-sync 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "d06554cce1ae4a50f42fba8023918afa931413aded705b560e29600ccf7c6d76"
+"checksum tokio-tcp 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "1d14b10654be682ac43efee27401d792507e30fd8d26389e1da3b185de2e4119"
+"checksum tokio-tls 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "354b8cd83825b3c20217a9dc174d6a0c67441a2fae5c41bcb1ea6679f6ae0f7c"
 "checksum toml 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)" = "01d1404644c8b12b16bfcffa4322403a91a451584daaaa7c28d3152e6cbc98cf"
+"checksum traitobject 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "efd1f82c56340fdf16f2a953d7bda4f8fdffba13d93b00844c25572110b26079"
+"checksum typeable 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "1410f6f91f21d1612654e7cc69193b0334f909dcf2c790c4826254fbb86f8887"
+"checksum unicase 1.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7f4765f83163b74f957c797ad9253caf97f103fb064d3999aea9568d09fc8a33"
+"checksum unicode-bidi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "49f2bd0c6468a8230e1db229cff8029217cf623c767ea5d60bfbd42729ea54d5"
+"checksum unicode-normalization 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)" = "b561e267b2326bb4cebfc0ef9e68355c7abe6c6f522aeac2f5bf95d56c59bdcf"
 "checksum unicode-segmentation 1.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e83e153d1053cbb5a118eeff7fd5be06ed99153f00dbcd8ae310c5fb2b22edc0"
 "checksum unicode-width 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "caaa9d531767d1ff2150b9332433f32a24622147e5ebb1f26409d5da67afd479"
 "checksum unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc"
 "checksum unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "826e7639553986605ec5979c7dd957c7895e93eabed50ab2ffa7f6128a75097c"
+"checksum url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)" = "dd4e7c0d531266369519a4aa4f399d748bd37043b00bde1e4ff1f60a120b355a"
+"checksum vcpkg 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "3fc439f2794e98976c88a2a2dafce96b930fe8010b0a256b3c2199a773933168"
 "checksum vec_map 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "05c78687fb1a80548ae3250346c3db86a80a7cdd77bda190189f2d0a0987c81a"
+"checksum version_check 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "914b1a6776c4c929a602fafd8bc742e06365d4bcbe48c30f9cca5824f70dc9dd"
+"checksum wasi 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b89c3ce4ce14bdc6fb6beaf9ec7928ca331de5df7e5ea278375642a2f478570d"
+"checksum websocket 0.24.0 (registry+https://github.com/rust-lang/crates.io-index)" = "413b37840b9e27b340ce91b319ede10731de8c72f5bc4cb0206ec1ca4ce581d0"
+"checksum websocket-base 0.24.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5e3810f0d00c4dccb54c30a4eee815e703232819dec7b007db115791c42aa374"
+"checksum winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a"
 "checksum winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)" = "8093091eeb260906a183e6ae1abdba2ef5ef2257a21801128899c3fc699229c6"
+"checksum winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc"
 "checksum winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
 "checksum winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
+"checksum ws2_32-sys 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d59cefebd0c892fa2dd6de581e937301d8552cb44489cdff035c6187cb63fa5e"
diff --git a/Cargo.toml b/Cargo.toml
index 82e0187..ccf638a 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -20,5 +20,6 @@ structopt = "^0.3"
 serde = { version = "1.0.104", features = ["derive"] }
 serde_bytes = "0.11"
 serde_json = "1.0.44"
+websocket = "0.24.0"
 
 [dev-dependencies]
\ No newline at end of file
diff --git a/src/comms.rs b/src/comms.rs
deleted file mode 100644
index d1f6e54..0000000
--- a/src/comms.rs
+++ /dev/null
@@ -1,37 +0,0 @@
-use std::path::{Path, PathBuf};
-use std::sync::mpsc::{Sender, Receiver};
-use std::sync::mpsc;
-use std::thread;
-use serde::{Serialize, Deserialize};
-
-pub struct Communication<T> {
-    tx: Sender<T>,
-    rx: Receiver<T>,
-}
-
-impl<T> Communication<T> {
-    pub fn new() -> Box<Self> {
-        let (to_thread, from_main): (Sender<T>, Receiver<T>) = mpsc::channel();
-        let (to_main, from_thread): (Sender<T>, Receiver<T>) = mpsc::channel();
-
-        // let child = thread::spawn(move || {
-        //     let client = WebsocketClient::<T> {
-        //         thread_tx: to_main,
-        //         thread_rx: from_main,
-        //     };
-
-        //     // todo: loop
-        //     println!("listener thread finished");
-        // });
-
-        Box::new(Communication {
-            tx: to_thread,
-            rx: from_thread,
-        })
-    }
-}
-
-struct WebsocketClient<T> {
-    thread_tx: Sender<T>,
-    thread_rx: Receiver<T>,
-}
\ No newline at end of file
diff --git a/src/emulator.rs b/src/emulator.rs
index e3d4a71..d84d43d 100644
--- a/src/emulator.rs
+++ b/src/emulator.rs
@@ -146,6 +146,7 @@ impl MyEmulator {
 
     pub fn run(&mut self) {
         self.audio_device.resume();
+        self.synced_pokemonrb.start_comms();
         let mut event_pump = self.sdl_context.event_pump().unwrap();
         'running: loop {
             let frame_begin = Instant::now();
@@ -173,8 +174,10 @@ impl MyEmulator {
                 spf = 1.0 / 60.0;
             }
 
+            self.synced_pokemonrb.handle_inbound_msgs();
+
             self.synced_pokemonrb.update_from_mem();
-            println!("{}", self.synced_pokemonrb);
+            //println!("{}", self.synced_pokemonrb);
 
             Duration::from_secs_f64(spf)
                 .checked_sub(frame_begin.elapsed())
diff --git a/src/main.rs b/src/main.rs
index 1fe5d77..0dc49d1 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -9,8 +9,6 @@ use std::path::{Path, PathBuf};
 
 mod emulator;
 use emulator::MyEmulator;
-mod comms;
-use comms::Communication;
 
 pub fn main() -> failure::Fallible<()> {
     let opt: Opt = Opt::from_args();
diff --git a/src/sync/comms.rs b/src/sync/comms.rs
new file mode 100644
index 0000000..5cfefe1
--- /dev/null
+++ b/src/sync/comms.rs
@@ -0,0 +1,109 @@
+use std::path::{Path, PathBuf};
+use std::sync::mpsc::{Sender, Receiver};
+use std::sync::mpsc;
+use std::thread;
+use std::thread::JoinHandle;
+use serde::Serialize;
+use serde::de::DeserializeOwned;
+use serde_json;
+
+use websocket::client::ClientBuilder;
+use websocket::receiver::Reader;
+use websocket::sender::Writer;
+use websocket::{Message, OwnedMessage};
+
+const CONNECTION: &'static str = "ws://127.0.0.1:8765";
+pub struct Communication<T> {
+    pub tx: Sender<T>,
+    pub rx: Receiver<T>,
+    inbound_thread: JoinHandle<Result<(), failure::Error>>,
+    outbound_thread: JoinHandle<Result<(), failure::Error>>,
+}
+
+impl<T> Communication<T> where T: std::marker::Send, T: Serialize, T: DeserializeOwned, T: 'static {
+    pub fn new() -> Self {
+        let (to_thread, from_main): (Sender<T>, Receiver<T>) = mpsc::channel();
+        let (to_main, from_thread): (Sender<T>, Receiver<T>) = mpsc::channel();
+
+        let ws_client = ClientBuilder::new(CONNECTION)
+            .unwrap()
+            .add_protocol("rust-websocket")
+            .connect_insecure()
+            .unwrap();
+
+        let (mut ws_receiver, mut ws_sender) = ws_client.split().unwrap();
+
+        let outbound = thread::spawn(move || -> Result<(), failure::Error> {
+            let mut from_main = from_main;
+            let mut ws_sender = ws_sender;
+            let mut flush = || -> Result<(), failure::Error> {
+                let msg = from_main.recv()?;
+                let msg_serialized = serde_json::to_string(&msg)?;
+                println!("sending a message {}", &msg_serialized);
+                ws_sender.send_message(&Message::text(msg_serialized))?;
+                Ok(())
+            };
+
+            loop {
+                 match flush() {
+                    Ok(_) => (),
+                    Err(e) => {
+                        println!("Error in outbound thread: {}", e);
+                        return Err(e)
+                    }
+                }
+            }
+        });
+
+        let inbound = thread::spawn(move || -> Result<(), failure::Error> {
+            let mut to_main = to_main;
+            let mut ws_receiver = ws_receiver;
+
+            let mut flush = || -> Result<(), failure::Error> {
+                let msg = ws_receiver.recv_message()?;
+                match msg {
+                    OwnedMessage::Text(text) => match serde_json::from_str(&text) {
+                        Ok(m) => {
+                            println!("receiving a message {}", &text);
+                            to_main.send(m);
+                            Ok(())
+                        }
+                        Err(e) => Err(failure::err_msg(format!("deserialization error: {:?}", e)))
+                    },
+                    OwnedMessage::Binary(_) => Err(failure::err_msg("binary message not implemented")),
+                    OwnedMessage::Close(_) => Err(failure::err_msg("close requested")),
+                    OwnedMessage::Ping(_) => Err(failure::err_msg("ping message not implemented")),
+                    OwnedMessage::Pong(_) => Err(failure::err_msg("pong message not implemented")),
+                }
+            };
+
+            loop {
+                match flush() {
+                    Ok(_) => (),
+                    Err(e) => {
+                        println!("Error in inbound thread: {}", e);
+                        return Err(e)
+                    }
+                }
+                /*
+                match Communication::<T>::handle_inbound(to_main) {
+                    Ok(_) => (),
+                    Err(e) => return Err(e)
+                }
+                */
+            }
+        });
+
+        Communication {
+            tx: to_thread,
+            rx: from_thread,
+            inbound_thread: inbound,
+            outbound_thread: outbound,
+        }
+    }
+}
+
+struct WebsocketClient<T> {
+    thread_tx: Sender<T>,
+    thread_rx: Receiver<T>,
+}
\ No newline at end of file
diff --git a/src/sync/mod.rs b/src/sync/mod.rs
index e0f9ea0..267b727 100644
--- a/src/sync/mod.rs
+++ b/src/sync/mod.rs
@@ -1,2 +1,3 @@
 pub mod pokemon_rb;
-pub mod memory_rw;
\ No newline at end of file
+pub mod memory_rw;
+pub mod comms;
\ No newline at end of file
diff --git a/src/sync/pokemon_rb.rs b/src/sync/pokemon_rb.rs
index f0f7cf2..02b6e91 100644
--- a/src/sync/pokemon_rb.rs
+++ b/src/sync/pokemon_rb.rs
@@ -4,10 +4,12 @@ use crate::sync::memory_rw::ReadWriteMemoryMap;
 use serde::{Serialize, Deserialize};
 use ferretro::retro::wrapper::LibretroWrapper; // want LibretroWrapper.api : LibretroApi.get_memory()
 use crate::num::ToPrimitive;
+use crate::sync::comms::Communication;
 
 pub struct SyncedPokemonRedBlue {
     raw: Raw<'static>,
     battle_context: BattleContext,
+    comms: Option<Communication<Message>>
 }
 
 
@@ -70,19 +72,45 @@ impl SyncedPokemonRedBlue {
         //     _ => ()
         // }
 
-
         self.battle_context = battle_context;
 
         let message: Message = (&self.raw).into();
-        match serde_json::to_string(&message) {
-            Ok(serialized) => {
-                println!("serialized data: {}", serialized)
-            }
-            Err(_) => ()
-        }
 
+        match &mut self.comms {
+            Some(comms) => {
+                comms.tx.send(message);
+            },
+            None => ()
+        }
     }
 
+    pub fn handle_inbound_msgs(&mut self) -> Result<(), failure::Error>{
+        let in_msg = self.comms.as_ref().ok_or(failure::err_msg("comms doesn't exist, can't handle inbound msgs"))?.rx.try_recv()?;
+        self.handle_message(in_msg)
+    }
+
+    fn handle_message(&mut self, msg: Message) -> Result<(), failure::Error> {
+        match msg.active_pkmn {
+            Some(src) => {
+                let target_slice = self.raw.active_pokemon_raw.slice.as_mut().ok_or(failure::err_msg("can't write message back to None memory slice"))?;
+                if src.len() != target_slice.len() {
+                    return Err(failure::err_msg("message size and slice size differ."));
+                }
+
+                let mut index: usize = 0;
+                for value in src.into_iter(){
+                    target_slice[index] = value;
+                    index += 1;
+                }
+
+                Ok(())
+
+            }
+            None => Ok(())
+        }
+    }
+
+
     // pub fn get_message<'a>(&self) -> Message {
     //     Message {
     //         active_pkmn: Box::from(&self.raw.active_pokemon_raw.clone())
@@ -136,12 +164,17 @@ impl SyncedPokemonRedBlue {
         SyncedPokemonRedBlue {
             raw: Raw::create(map),
             battle_context: BattleContext::default(),
+            comms: None,
         }
     }
 
     pub fn libretro_set_memory_maps(&mut self, libretro_memory_map: ferretro::retro::ffi::MemoryMap) {
         self.raw.libretro_set_memory_maps(libretro_memory_map)
     }
+
+    pub fn start_comms(&mut self) {
+        self.comms = Some(Communication::new());
+    }
 }
 
 impl Raw<'_> {

From ca27e3b114525b8f0bf23b4b8dd3bd6a8f13d5f4 Mon Sep 17 00:00:00 2001
From: Vivian Lim <vivvnlim@gmail.com>
Date: Thu, 2 Jan 2020 16:52:18 -0800
Subject: [PATCH 08/13] data sent back and forth every frame, works but doesn't
 have desired effect. progress!

---
 src/sync/comms.rs      | 49 +++++++++++++++++++++++++++++++-----------
 src/sync/pokemon_rb.rs |  4 ++--
 2 files changed, 38 insertions(+), 15 deletions(-)

diff --git a/src/sync/comms.rs b/src/sync/comms.rs
index 5cfefe1..fdd2bd0 100644
--- a/src/sync/comms.rs
+++ b/src/sync/comms.rs
@@ -14,16 +14,19 @@ use websocket::{Message, OwnedMessage};
 
 const CONNECTION: &'static str = "ws://127.0.0.1:8765";
 pub struct Communication<T> {
-    pub tx: Sender<T>,
-    pub rx: Receiver<T>,
+    rx: Receiver<T>,
+    tx: Sender<OwnedMessage>,
     inbound_thread: JoinHandle<Result<(), failure::Error>>,
     outbound_thread: JoinHandle<Result<(), failure::Error>>,
 }
 
 impl<T> Communication<T> where T: std::marker::Send, T: Serialize, T: DeserializeOwned, T: 'static {
     pub fn new() -> Self {
-        let (to_thread, from_main): (Sender<T>, Receiver<T>) = mpsc::channel();
-        let (to_main, from_thread): (Sender<T>, Receiver<T>) = mpsc::channel();
+        let (tx, from_main): (Sender<OwnedMessage>, Receiver<OwnedMessage>) = mpsc::channel();
+        let (to_main, rx): (Sender<T>, Receiver<T>) = mpsc::channel();
+
+        // transmitter for ping and close messages
+        let tx_1 = tx.clone();
 
         let ws_client = ClientBuilder::new(CONNECTION)
             .unwrap()
@@ -38,9 +41,8 @@ impl<T> Communication<T> where T: std::marker::Send, T: Serialize, T: Deserializ
             let mut ws_sender = ws_sender;
             let mut flush = || -> Result<(), failure::Error> {
                 let msg = from_main.recv()?;
-                let msg_serialized = serde_json::to_string(&msg)?;
-                println!("sending a message {}", &msg_serialized);
-                ws_sender.send_message(&Message::text(msg_serialized))?;
+                println!("sending a message {:?}", &msg);
+                ws_sender.send_message(&msg)?;
                 Ok(())
             };
 
@@ -58,6 +60,7 @@ impl<T> Communication<T> where T: std::marker::Send, T: Serialize, T: Deserializ
         let inbound = thread::spawn(move || -> Result<(), failure::Error> {
             let mut to_main = to_main;
             let mut ws_receiver = ws_receiver;
+            let mut tx_1 = tx_1;
 
             let mut flush = || -> Result<(), failure::Error> {
                 let msg = ws_receiver.recv_message()?;
@@ -65,15 +68,25 @@ impl<T> Communication<T> where T: std::marker::Send, T: Serialize, T: Deserializ
                     OwnedMessage::Text(text) => match serde_json::from_str(&text) {
                         Ok(m) => {
                             println!("receiving a message {}", &text);
-                            to_main.send(m);
+                            to_main.send(m); // todo print an error
                             Ok(())
                         }
                         Err(e) => Err(failure::err_msg(format!("deserialization error: {:?}", e)))
                     },
                     OwnedMessage::Binary(_) => Err(failure::err_msg("binary message not implemented")),
-                    OwnedMessage::Close(_) => Err(failure::err_msg("close requested")),
-                    OwnedMessage::Ping(_) => Err(failure::err_msg("ping message not implemented")),
-                    OwnedMessage::Pong(_) => Err(failure::err_msg("pong message not implemented")),
+                    OwnedMessage::Close(_) => {
+                        tx_1.send(OwnedMessage::Close(None));
+                        Err(failure::err_msg("Connection closed by request."))
+                    }
+                    OwnedMessage::Ping(data) => {
+                        tx_1.send(OwnedMessage::Pong(data));
+                        // todo print an error
+                        Ok(())
+                    },
+                    OwnedMessage::Pong(_) => {
+                        println!("received pong");
+                        Ok(())
+                    }
                 }
             };
 
@@ -95,12 +108,22 @@ impl<T> Communication<T> where T: std::marker::Send, T: Serialize, T: Deserializ
         });
 
         Communication {
-            tx: to_thread,
-            rx: from_thread,
+            tx: tx,
+            rx: rx,
             inbound_thread: inbound,
             outbound_thread: outbound,
         }
     }
+
+    pub fn send(&mut self, msg: T) -> Result<(), failure::Error> {
+        let msg_serialized = serde_json::to_string(&msg)?;
+        self.tx.send(OwnedMessage::Text(msg_serialized))?;
+        Ok(())
+    }
+
+    pub fn try_recv(&mut self) ->  Result<T, std::sync::mpsc::TryRecvError> {
+        self.rx.try_recv()
+    }
 }
 
 struct WebsocketClient<T> {
diff --git a/src/sync/pokemon_rb.rs b/src/sync/pokemon_rb.rs
index 02b6e91..98db4f2 100644
--- a/src/sync/pokemon_rb.rs
+++ b/src/sync/pokemon_rb.rs
@@ -78,14 +78,14 @@ impl SyncedPokemonRedBlue {
 
         match &mut self.comms {
             Some(comms) => {
-                comms.tx.send(message);
+                comms.send(message);
             },
             None => ()
         }
     }
 
     pub fn handle_inbound_msgs(&mut self) -> Result<(), failure::Error>{
-        let in_msg = self.comms.as_ref().ok_or(failure::err_msg("comms doesn't exist, can't handle inbound msgs"))?.rx.try_recv()?;
+        let in_msg = self.comms.as_mut().ok_or(failure::err_msg("comms doesn't exist, can't handle inbound msgs"))?.try_recv()?;
         self.handle_message(in_msg)
     }
 

From a3a7211cc64a22c3607a7a490b526f8f35e73429 Mon Sep 17 00:00:00 2001
From: Vivian Lim <vivvnlim@gmail.com>
Date: Sat, 7 Mar 2020 23:22:35 -0800
Subject: [PATCH 09/13] WIP: send memory only if it changed since last read.

---
 src/sync/pokemon_rb.rs | 49 ++++++++++++++++++++++++++++++++++++------
 1 file changed, 42 insertions(+), 7 deletions(-)

diff --git a/src/sync/pokemon_rb.rs b/src/sync/pokemon_rb.rs
index 98db4f2..6e19f1d 100644
--- a/src/sync/pokemon_rb.rs
+++ b/src/sync/pokemon_rb.rs
@@ -18,13 +18,10 @@ pub struct Message {
     active_pkmn: Option<Vec<u8>>
 }
 
-impl From<&Raw<'_>> for Message {
-    fn from(src: &Raw) -> Self {
+impl From<&mut Raw<'_>> for Message {
+    fn from(src: &mut Raw) -> Self {
         Message {
-            active_pkmn: match &src.active_pokemon_raw.slice {
-                Some(m) => Some(m.to_vec()),
-                None => None
-            }
+            active_pkmn: src.active_pokemon_raw.get_copy_if_changed_since_last_read()
         }
 
     }
@@ -42,12 +39,46 @@ struct EmulatorMemory<'a> {
     length: usize,
     bank_switch: usize,
     pub slice: Option<&'a mut [u8]>,
+    last_read_value: Option<Vec<u8>>,
 }
 
 impl EmulatorMemory<'_> {
     pub fn update_slice(&mut self, map: &ReadWriteMemoryMap) {
         self.slice = map.get_slice_from_region(self.offset, self.length, self.bank_switch);
     }
+
+    pub fn get_copy_if_changed_since_last_read(&mut self) -> Option<Vec<u8>> {
+        match &mut self.slice {
+            None => None,
+            Some(data) => match &mut self.last_read_value {
+                None => {
+                    // last read value isn't allocated yet
+                    let mut last = vec![0; data.len()];
+                    last.copy_from_slice(data); // ??? sizes are mismatching here.
+                    self.last_read_value = Some(last);
+                    self.last_read_value.clone()
+                },
+                Some(last) => {
+                    let mut index: usize = 0;
+                    let mut any_changes = false;
+
+                    for value in data.into_iter() {
+                        if last[index] != *value { // index out of range for last. last is not None but has size of 0??????
+                            last[index] = *value;
+                            any_changes = true;
+                        }
+                        index += 1;
+                    }
+
+                    if any_changes {
+                        return Some(last.clone());
+                    }
+                    None
+                }
+            }
+        }
+
+    }
 }
 
 struct BattleContext {
@@ -74,7 +105,7 @@ impl SyncedPokemonRedBlue {
 
         self.battle_context = battle_context;
 
-        let message: Message = (&self.raw).into();
+        let message: Message = (&mut self.raw).into();
 
         match &mut self.comms {
             Some(comms) => {
@@ -92,6 +123,7 @@ impl SyncedPokemonRedBlue {
     fn handle_message(&mut self, msg: Message) -> Result<(), failure::Error> {
         match msg.active_pkmn {
             Some(src) => {
+                println!("message contains a new active pokemon. data: {:?}", &src);
                 let target_slice = self.raw.active_pokemon_raw.slice.as_mut().ok_or(failure::err_msg("can't write message back to None memory slice"))?;
                 if src.len() != target_slice.len() {
                     return Err(failure::err_msg("message size and slice size differ."));
@@ -127,18 +159,21 @@ impl Raw<'_> {
                 length: 0x27,
                 bank_switch: 0,
                 slice: None,
+                last_read_value: None,
             },
             player_and_party: EmulatorMemory {
                 offset: 0xd158,
                 length: 0x19e,
                 bank_switch: 0,
                 slice: None,
+                last_read_value: None,
             },
             pokemon_out: EmulatorMemory {
                 offset: 0xcc2f,
                 length: 0x1,
                 bank_switch: 0,
                 slice: None,
+                last_read_value: None,
             },
             memory_map: map
         }

From 2b5f05deb480258f524573917f8939c38968c663 Mon Sep 17 00:00:00 2001
From: Vivian Lim <vivvnlim@gmail.com>
Date: Sat, 7 Mar 2020 23:23:00 -0800
Subject: [PATCH 10/13] remove debug notes

---
 src/sync/pokemon_rb.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/sync/pokemon_rb.rs b/src/sync/pokemon_rb.rs
index 6e19f1d..f6f8009 100644
--- a/src/sync/pokemon_rb.rs
+++ b/src/sync/pokemon_rb.rs
@@ -54,7 +54,7 @@ impl EmulatorMemory<'_> {
                 None => {
                     // last read value isn't allocated yet
                     let mut last = vec![0; data.len()];
-                    last.copy_from_slice(data); // ??? sizes are mismatching here.
+                    last.copy_from_slice(data);
                     self.last_read_value = Some(last);
                     self.last_read_value.clone()
                 },
@@ -63,7 +63,7 @@ impl EmulatorMemory<'_> {
                     let mut any_changes = false;
 
                     for value in data.into_iter() {
-                        if last[index] != *value { // index out of range for last. last is not None but has size of 0??????
+                        if last[index] != *value {
                             last[index] = *value;
                             any_changes = true;
                         }

From 6d66f5e80b91d0fa87b9a6c94a4b408118d02c49 Mon Sep 17 00:00:00 2001
From: Vivian Lim <vivvnlim@gmail.com>
Date: Sun, 8 Mar 2020 20:43:55 -0700
Subject: [PATCH 11/13] wip- big refactoring to generalize games

---
 .vscode/launch.json                           |   2 +-
 src/{ => emulator}/emulator.rs                |  42 +++-
 .../libretro_memory_map.rs}                   |  20 +-
 src/emulator/mod.rs                           |   2 +
 src/lib.rs                                    |   3 +-
 src/main.rs                                   |  28 ++-
 src/sync/comms.rs                             |  13 +-
 src/sync/game.rs                              |  30 +++
 src/sync/memory_slice_handle.rs               |  55 +++++
 src/sync/mod.rs                               |   5 +-
 src/sync/pokemon_rb.rs                        | 218 +++++-------------
 11 files changed, 226 insertions(+), 192 deletions(-)
 rename src/{ => emulator}/emulator.rs (93%)
 rename src/{sync/memory_rw.rs => emulator/libretro_memory_map.rs} (85%)
 create mode 100644 src/emulator/mod.rs
 create mode 100644 src/sync/game.rs
 create mode 100644 src/sync/memory_slice_handle.rs

diff --git a/.vscode/launch.json b/.vscode/launch.json
index 4cb3dfd..b6a81d5 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -14,7 +14,7 @@
             "cwd": "${workspaceFolder}",
             "environment": [{
                 "name": "RUST_BACKTRACE",
-                "value": "1"
+                "value": "full"
             }],
             "externalConsole": false,
         },
diff --git a/src/emulator.rs b/src/emulator/emulator.rs
similarity index 93%
rename from src/emulator.rs
rename to src/emulator/emulator.rs
index d84d43d..465c958 100644
--- a/src/emulator.rs
+++ b/src/emulator/emulator.rs
@@ -4,8 +4,7 @@ use ferretro::retro::constants::{InputIndex, JoypadButton, AnalogAxis, DeviceTyp
 use ferretro::retro::wrapped_types::{ControllerDescription2, InputDescriptor2, InputDeviceId, SubsystemInfo2, Variable2};
 use ferretro::retro::wrapper::LibretroWrapper;
 
-use ferretro_synced::sync::memory_rw::ReadWriteMemoryMap;
-use ferretro_synced::sync::pokemon_rb::SyncedPokemonRedBlue;
+use crate::sync::game::{SyncableGame, KnownGames, read_game_name, create_game};
 
 use std::ffi::CStr;
 use std::io::Read;
@@ -48,8 +47,8 @@ pub struct MyEmulator {
     gamepads: Vec<GameController>,
     pressed_keys: Vec<Keycode>,
 
-    // memory
-    synced_pokemonrb: SyncedPokemonRedBlue,
+    pub memory_map: Option<MemoryMap>,
+    synced_game: Option<Box<dyn SyncableGame>>,
 }
 
 impl MyEmulator {
@@ -116,8 +115,11 @@ impl MyEmulator {
 
         let pressed_keys = Vec::new();
 
+        /*
         let memory_map = std::default::Default::default();
+        let which_game = read_game_name("whatever");
         let synced_pokemonrb = SyncedPokemonRedBlue::create(memory_map);
+        */
 
         let emu = MyEmulator {
             retro,
@@ -136,7 +138,8 @@ impl MyEmulator {
             gamepad_subsys,
             gamepads,
             pressed_keys,
-            synced_pokemonrb,
+            memory_map: None,
+            synced_game: None,
         };
         let mut pin_emu = Box::pin(emu);
         retro::wrapper::set_handler(pin_emu.as_mut());
@@ -144,9 +147,12 @@ impl MyEmulator {
         pin_emu
     }
 
+    pub fn begin_sync(&mut self, synced_game: Box<dyn SyncableGame>){
+        self.synced_game = Some(synced_game);
+    }
+
     pub fn run(&mut self) {
         self.audio_device.resume();
-        self.synced_pokemonrb.start_comms();
         let mut event_pump = self.sdl_context.event_pump().unwrap();
         'running: loop {
             let frame_begin = Instant::now();
@@ -164,6 +170,18 @@ impl MyEmulator {
 
             self.update_key_state(&event_pump.keyboard_state());
 
+            match &mut self.synced_game {
+                Some(g) => {
+                    match g.handle_inbound_messages() {
+                        Ok(_) => (),
+                        Err(e) => {
+                            println!("Error while handling inbound messages: {:?}", e);
+                        }
+                    }
+                },
+                None => ()
+            }
+
             // The rest of the game loop goes here...
             self.retro.run();
             self.canvas.present();
@@ -174,9 +192,13 @@ impl MyEmulator {
                 spf = 1.0 / 60.0;
             }
 
-            self.synced_pokemonrb.handle_inbound_msgs();
-
-            self.synced_pokemonrb.update_from_mem();
+            match &mut self.synced_game {
+                Some(g) => {
+                    g.update_state();
+                    g.send_state_messages();
+                },
+                None => ()
+            }
             //println!("{}", self.synced_pokemonrb);
 
             Duration::from_secs_f64(spf)
@@ -410,7 +432,7 @@ impl retro::wrapper::Handler for MyEmulator {
     }
 
     fn set_memory_maps(&mut self, memory_map: MemoryMap) -> bool {
-        self.synced_pokemonrb.libretro_set_memory_maps(memory_map);
+        self.memory_map = Some(memory_map);
         true
     }
 }
diff --git a/src/sync/memory_rw.rs b/src/emulator/libretro_memory_map.rs
similarity index 85%
rename from src/sync/memory_rw.rs
rename to src/emulator/libretro_memory_map.rs
index b88a40a..6383740 100644
--- a/src/sync/memory_rw.rs
+++ b/src/emulator/libretro_memory_map.rs
@@ -1,13 +1,11 @@
 use std::convert::TryFrom;
-use std::default::Default;
 use ferretro::retro::ffi::{MemoryMap};
 
-#[derive(Default)]
-pub struct ReadWriteMemoryMap {
-    regions: Vec<MemoryRegion>,
+pub struct LibRetroMemoryMap {
+    regions: Vec<LibRetroMemoryRegion>,
 }
 
-impl ReadWriteMemoryMap {
+impl LibRetroMemoryMap {
     pub fn get_slice_from_region(&self, offset: usize, length: usize, bank_switch: usize) -> Option<&'static mut [u8]> {
         match self.find_bank(offset, length, bank_switch) {
             Some(ptr) => Some(unsafe { std::slice::from_raw_parts_mut(ptr as *mut u8, length) }),
@@ -36,8 +34,8 @@ impl ReadWriteMemoryMap {
         None
     }
 
-    pub fn libretro_set_memory_maps(&mut self, memory_map: MemoryMap) {
-        let mut regions: Vec<MemoryRegion> = Vec::new();
+    pub fn create(memory_map: &MemoryMap) -> Self {
+        let mut regions: Vec<LibRetroMemoryRegion> = Vec::new();
         let num_descriptors = isize::try_from(memory_map.num_descriptors).unwrap();
         for i in 0..num_descriptors {
             let region = unsafe { &*memory_map.descriptors.offset(i) };
@@ -48,18 +46,20 @@ impl ReadWriteMemoryMap {
                 println!("truncating memory region {:x} from size {:x} to {:x} banks of size {:x}", region.start, region.len, region.len/length, length)
             }
 
-            regions.push(MemoryRegion {
+            regions.push(LibRetroMemoryRegion {
                 start: region.start,
                 end: region.start + length,
                 pointer: region.ptr,
             })
         }
 
-        self.regions = regions;
+        LibRetroMemoryMap {
+            regions: regions
+        }
     }
 }
 
-struct MemoryRegion {
+struct LibRetroMemoryRegion {
     start: usize,
     end: usize,
     pointer: *const std::ffi::c_void,
diff --git a/src/emulator/mod.rs b/src/emulator/mod.rs
new file mode 100644
index 0000000..552b575
--- /dev/null
+++ b/src/emulator/mod.rs
@@ -0,0 +1,2 @@
+pub mod emulator;
+pub mod libretro_memory_map;
\ No newline at end of file
diff --git a/src/lib.rs b/src/lib.rs
index 9301560..9e71475 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -4,4 +4,5 @@ extern crate num;
 #[macro_use]
 extern crate num_derive;
 
-pub mod sync;
\ No newline at end of file
+pub mod sync;
+pub mod emulator;
\ No newline at end of file
diff --git a/src/main.rs b/src/main.rs
index 0dc49d1..07ada1b 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -7,18 +7,42 @@ extern crate serde_bytes;
 use structopt::StructOpt;
 use std::path::{Path, PathBuf};
 
-mod emulator;
-use emulator::MyEmulator;
+use ferretro_synced::emulator::emulator::MyEmulator;
+use ferretro_synced::emulator::libretro_memory_map::LibRetroMemoryMap;
+use ferretro_synced::sync::game::{SyncableGame, KnownGames, read_game_name, create_game};
+use ferretro_synced::sync::comms::CommunicationSettings;
 
 pub fn main() -> failure::Fallible<()> {
     let opt: Opt = Opt::from_args();
     let mut emu = MyEmulator::new(&opt.core, &opt.system);
     emu.load_game(&opt.rom);
+
+    // memory map should be ready after init & loading game.
+    let ffi_memory_map = emu.memory_map.as_ref().expect("Memory map was not set by emulator core, cannot continue.");
+    let memory_map = LibRetroMemoryMap::create(ffi_memory_map);
+
     match (&opt.state) {
         Some(s) => emu.load_state(s),
         None => ()
     }
 
+    let which_game = read_game_name("assume you can get it from emu".to_string());
+
+    let comms_settings = CommunicationSettings {
+        connection: "ws://127.0.0.1:8765".to_string()
+    };
+
+    match which_game {
+        Some(which_game) => {
+            let synced_game = create_game(which_game, comms_settings, &memory_map);
+
+            emu.begin_sync(synced_game);
+        },
+        None => {
+            println!("Game is unknown, not syncing.")
+        }
+
+    }
     //let mut comms = Communication::new::<ferretro_synced::sync::pokemon_rb::Message>();
 
     emu.run();
diff --git a/src/sync/comms.rs b/src/sync/comms.rs
index fdd2bd0..f87a39c 100644
--- a/src/sync/comms.rs
+++ b/src/sync/comms.rs
@@ -20,15 +20,19 @@ pub struct Communication<T> {
     outbound_thread: JoinHandle<Result<(), failure::Error>>,
 }
 
+pub struct CommunicationSettings {
+    pub connection: String
+}
+
 impl<T> Communication<T> where T: std::marker::Send, T: Serialize, T: DeserializeOwned, T: 'static {
-    pub fn new() -> Self {
+    pub fn new(settings: CommunicationSettings) -> Self {
         let (tx, from_main): (Sender<OwnedMessage>, Receiver<OwnedMessage>) = mpsc::channel();
         let (to_main, rx): (Sender<T>, Receiver<T>) = mpsc::channel();
 
         // transmitter for ping and close messages
         let tx_1 = tx.clone();
 
-        let ws_client = ClientBuilder::new(CONNECTION)
+        let ws_client = ClientBuilder::new(settings.connection.as_str())
             .unwrap()
             .add_protocol("rust-websocket")
             .connect_insecure()
@@ -124,9 +128,4 @@ impl<T> Communication<T> where T: std::marker::Send, T: Serialize, T: Deserializ
     pub fn try_recv(&mut self) ->  Result<T, std::sync::mpsc::TryRecvError> {
         self.rx.try_recv()
     }
-}
-
-struct WebsocketClient<T> {
-    thread_tx: Sender<T>,
-    thread_rx: Receiver<T>,
 }
\ No newline at end of file
diff --git a/src/sync/game.rs b/src/sync/game.rs
new file mode 100644
index 0000000..279dfe0
--- /dev/null
+++ b/src/sync/game.rs
@@ -0,0 +1,30 @@
+use crate::sync::pokemon_rb::SyncedPokemonRedBlue;
+use crate::sync::comms::CommunicationSettings;
+use crate::emulator::libretro_memory_map::LibRetroMemoryMap;
+
+pub trait SyncableGame {
+    // Update internal state based on tracked memory and the emulator
+    fn update_state(&mut self);
+
+    // Check for messages and handle them
+    fn handle_inbound_messages(&mut self) -> Result<(), failure::Error>;
+
+    // Check for messages and handle them
+    fn send_state_messages(&mut self) -> Result<(), failure::Error>;
+}
+
+pub enum KnownGames {
+    PokemonRedBlue,
+}
+
+pub fn read_game_name(name: String) -> Option<KnownGames> {
+    Some(KnownGames::PokemonRedBlue) // todo: actually read the name of the game
+}
+
+
+pub fn create_game(which_game: KnownGames, comms_settings: CommunicationSettings, memory_map: &LibRetroMemoryMap) -> Box<dyn SyncableGame> {
+    match which_game {
+        KnownGames::PokemonRedBlue => Box::from(SyncedPokemonRedBlue::create(comms_settings, memory_map))
+    }
+
+}
\ No newline at end of file
diff --git a/src/sync/memory_slice_handle.rs b/src/sync/memory_slice_handle.rs
new file mode 100644
index 0000000..e9c5262
--- /dev/null
+++ b/src/sync/memory_slice_handle.rs
@@ -0,0 +1,55 @@
+use crate::emulator::libretro_memory_map::LibRetroMemoryMap;
+
+pub struct MemorySliceHandle<'a> {
+    pub offset: usize,
+    pub length: usize,
+    pub bank_switch: usize,
+    pub slice: Option<&'a mut [u8]>,
+    pub last_read_value: Option<Vec<u8>>,
+}
+
+impl MemorySliceHandle<'_> {
+    pub fn create(offset: usize, length: usize, bank_switch: usize, memory_map: &LibRetroMemoryMap) -> Self {
+        let slice = memory_map.get_slice_from_region(offset, length, bank_switch);
+
+        MemorySliceHandle {
+            offset: offset,
+            length: length,
+            bank_switch: bank_switch,
+            slice,
+            last_read_value: None
+        }
+    }
+
+    pub fn get_copy_if_changed_since_last_read(&mut self) -> Option<Vec<u8>> {
+        match &mut self.slice {
+            None => None,
+            Some(data) => match &mut self.last_read_value {
+                None => {
+                    // last read value isn't allocated yet
+                    let last = data.to_vec();
+                    self.last_read_value = Some(last);
+                    self.last_read_value.clone()
+                },
+                Some(last) => {
+                    let mut index: usize = 0;
+                    let mut any_changes = false;
+
+                    for value in data.into_iter() {
+                        if last[index] != *value {
+                            last[index] = *value;
+                            any_changes = true;
+                        }
+                        index += 1;
+                    }
+
+                    if any_changes {
+                        return Some(last.clone());
+                    }
+                    None
+                }
+            }
+        }
+
+    }
+}
\ No newline at end of file
diff --git a/src/sync/mod.rs b/src/sync/mod.rs
index 267b727..0a57e5f 100644
--- a/src/sync/mod.rs
+++ b/src/sync/mod.rs
@@ -1,3 +1,4 @@
 pub mod pokemon_rb;
-pub mod memory_rw;
-pub mod comms;
\ No newline at end of file
+pub mod comms;
+pub mod memory_slice_handle;
+pub mod game;
\ No newline at end of file
diff --git a/src/sync/pokemon_rb.rs b/src/sync/pokemon_rb.rs
index f6f8009..0296216 100644
--- a/src/sync/pokemon_rb.rs
+++ b/src/sync/pokemon_rb.rs
@@ -1,181 +1,77 @@
 use std::default::Default;
 use std::fmt::Display;
-use crate::sync::memory_rw::ReadWriteMemoryMap;
+use crate::emulator::libretro_memory_map::LibRetroMemoryMap;
 use serde::{Serialize, Deserialize};
 use ferretro::retro::wrapper::LibretroWrapper; // want LibretroWrapper.api : LibretroApi.get_memory()
 use crate::num::ToPrimitive;
 use crate::sync::comms::Communication;
+use crate::sync::comms::CommunicationSettings;
+use crate::sync::memory_slice_handle::MemorySliceHandle;
+use crate::sync::game::SyncableGame;
 
 pub struct SyncedPokemonRedBlue {
-    raw: Raw<'static>,
+    memory_handles: PokemonRedBlueMemoryHandles<'static>,
     battle_context: BattleContext,
-    comms: Option<Communication<Message>>
+    comms: Communication<PokemonRedBlueMessage>
 }
 
-
 #[derive(Serialize, Deserialize)]
-pub struct Message {
+pub struct PokemonRedBlueMessage {
     active_pkmn: Option<Vec<u8>>
 }
 
-impl From<&mut Raw<'_>> for Message {
-    fn from(src: &mut Raw) -> Self {
-        Message {
-            active_pkmn: src.active_pokemon_raw.get_copy_if_changed_since_last_read()
+impl From<&mut PokemonRedBlueMemoryHandles<'_>> for PokemonRedBlueMessage {
+    fn from(src: &mut PokemonRedBlueMemoryHandles) -> Self {
+        PokemonRedBlueMessage {
+            active_pkmn: src.active_pokemon.get_copy_if_changed_since_last_read()
         }
-
     }
 }
 
-struct Raw<'a> {
-    active_pokemon_raw: EmulatorMemory<'a>,
-    player_and_party: EmulatorMemory<'a>,
-    pokemon_out: EmulatorMemory<'a>,
-    pub memory_map: ReadWriteMemoryMap,
-}
-
-struct EmulatorMemory<'a> {
-    offset: usize,
-    length: usize,
-    bank_switch: usize,
-    pub slice: Option<&'a mut [u8]>,
-    last_read_value: Option<Vec<u8>>,
-}
-
-impl EmulatorMemory<'_> {
-    pub fn update_slice(&mut self, map: &ReadWriteMemoryMap) {
-        self.slice = map.get_slice_from_region(self.offset, self.length, self.bank_switch);
-    }
-
-    pub fn get_copy_if_changed_since_last_read(&mut self) -> Option<Vec<u8>> {
-        match &mut self.slice {
-            None => None,
-            Some(data) => match &mut self.last_read_value {
-                None => {
-                    // last read value isn't allocated yet
-                    let mut last = vec![0; data.len()];
-                    last.copy_from_slice(data);
-                    self.last_read_value = Some(last);
-                    self.last_read_value.clone()
-                },
-                Some(last) => {
-                    let mut index: usize = 0;
-                    let mut any_changes = false;
-
-                    for value in data.into_iter() {
-                        if last[index] != *value {
-                            last[index] = *value;
-                            any_changes = true;
-                        }
-                        index += 1;
-                    }
-
-                    if any_changes {
-                        return Some(last.clone());
-                    }
-                    None
-                }
-            }
-        }
-
-    }
+struct PokemonRedBlueMemoryHandles<'a> {
+    active_pokemon: MemorySliceHandle<'a>,
+    player_and_party: MemorySliceHandle<'a>,
+    pokemon_out: MemorySliceHandle<'a>,
 }
 
 struct BattleContext {
     active_pokemon: Pokemon,
 }
 
-
-impl SyncedPokemonRedBlue {
-    pub fn update_from_mem(&mut self) {
+impl SyncableGame for SyncedPokemonRedBlue {
+    fn update_state(&mut self) {
         let battle_context = BattleContext {
-            active_pokemon: match &self.raw.active_pokemon_raw.slice {
+            active_pokemon: match &self.memory_handles.active_pokemon.slice {
                 Some(d) => num::FromPrimitive::from_u8(d[0xB]).unwrap_or(Pokemon::Unknown),
                 None => Pokemon::Unknown
             }
         };
 
-        // test to see that we can indeed write back to the slice
-        // match self.raw.active_pokemon_raw.get_slice(mem){
-        //     Some(s) => {
-        //         s[0xD] = 69
-        //     },
-        //     _ => ()
-        // }
-
         self.battle_context = battle_context;
+    }
 
-        let message: Message = (&mut self.raw).into();
-
-        match &mut self.comms {
-            Some(comms) => {
-                comms.send(message);
-            },
-            None => ()
+    fn send_state_messages(&mut self) -> Result<(), failure::Error>{
+        let message: PokemonRedBlueMessage = (&mut self.memory_handles).into();
+        if !message.active_pkmn.is_none() {
+            self.comms.send(message)
+        }
+        else {
+            Ok(())
         }
     }
 
-    pub fn handle_inbound_msgs(&mut self) -> Result<(), failure::Error>{
-        let in_msg = self.comms.as_mut().ok_or(failure::err_msg("comms doesn't exist, can't handle inbound msgs"))?.try_recv()?;
+    fn handle_inbound_messages(&mut self) -> Result<(), failure::Error>{
+        let in_msg = self.comms.try_recv()?;
         self.handle_message(in_msg)
     }
-
-    fn handle_message(&mut self, msg: Message) -> Result<(), failure::Error> {
-        match msg.active_pkmn {
-            Some(src) => {
-                println!("message contains a new active pokemon. data: {:?}", &src);
-                let target_slice = self.raw.active_pokemon_raw.slice.as_mut().ok_or(failure::err_msg("can't write message back to None memory slice"))?;
-                if src.len() != target_slice.len() {
-                    return Err(failure::err_msg("message size and slice size differ."));
-                }
-
-                let mut index: usize = 0;
-                for value in src.into_iter(){
-                    target_slice[index] = value;
-                    index += 1;
-                }
-
-                Ok(())
-
-            }
-            None => Ok(())
-        }
-    }
-
-
-    // pub fn get_message<'a>(&self) -> Message {
-    //     Message {
-    //         active_pkmn: Box::from(&self.raw.active_pokemon_raw.clone())
-    //     }
-
-    // }
 }
 
-impl Raw<'_> {
-    pub fn create(map: ReadWriteMemoryMap) -> Self {
-        Raw {
-            active_pokemon_raw: EmulatorMemory {
-                offset: 0xd009,
-                length: 0x27,
-                bank_switch: 0,
-                slice: None,
-                last_read_value: None,
-            },
-            player_and_party: EmulatorMemory {
-                offset: 0xd158,
-                length: 0x19e,
-                bank_switch: 0,
-                slice: None,
-                last_read_value: None,
-            },
-            pokemon_out: EmulatorMemory {
-                offset: 0xcc2f,
-                length: 0x1,
-                bank_switch: 0,
-                slice: None,
-                last_read_value: None,
-            },
-            memory_map: map
+impl PokemonRedBlueMemoryHandles<'_> {
+    pub fn create(memory_map: &LibRetroMemoryMap) -> Self {
+        PokemonRedBlueMemoryHandles {
+            active_pokemon: MemorySliceHandle::create(0xd009, 0x27, 0, memory_map),
+            player_and_party: MemorySliceHandle::create(0xd158, 0x19e, 0, memory_map),
+            pokemon_out: MemorySliceHandle::create(0xcc2f, 0x1, 0, memory_map),
         }
     }
 }
@@ -195,31 +91,34 @@ impl Display for SyncedPokemonRedBlue {
 }
 
 impl SyncedPokemonRedBlue {
-    pub fn create(map: ReadWriteMemoryMap) -> Self {
+    pub fn create(comms_settings: CommunicationSettings, memory_map: &LibRetroMemoryMap) -> Self {
         SyncedPokemonRedBlue {
-            raw: Raw::create(map),
+            memory_handles: PokemonRedBlueMemoryHandles::create(memory_map),
             battle_context: BattleContext::default(),
-            comms: None,
+            comms: Communication::new(comms_settings),
         }
     }
 
-    pub fn libretro_set_memory_maps(&mut self, libretro_memory_map: ferretro::retro::ffi::MemoryMap) {
-        self.raw.libretro_set_memory_maps(libretro_memory_map)
-    }
+    fn handle_message(&mut self, msg: PokemonRedBlueMessage) -> Result<(), failure::Error> {
+        match msg.active_pkmn {
+            Some(src) => {
+                println!("message contains a new active pokemon. data: {:?}", &src);
+                let target_slice = self.memory_handles.active_pokemon.slice.as_mut().ok_or(failure::err_msg("can't write message back to None memory slice"))?;
+                if src.len() != target_slice.len() {
+                    return Err(failure::err_msg("message size and slice size differ."));
+                }
 
-    pub fn start_comms(&mut self) {
-        self.comms = Some(Communication::new());
-    }
-}
+                let mut index: usize = 0;
+                for value in src.into_iter(){
+                    target_slice[index] = value;
+                    index += 1;
+                }
 
-impl Raw<'_> {
-    pub fn libretro_set_memory_maps(&mut self, libretro_memory_map: ferretro::retro::ffi::MemoryMap) {
-        self.memory_map.libretro_set_memory_maps(libretro_memory_map);
+                Ok(())
 
-        // update our slices
-        self.active_pokemon_raw.update_slice(&self.memory_map);
-        self.player_and_party.update_slice(&self.memory_map);
-        self.pokemon_out.update_slice(&self.memory_map);
+            }
+            None => Ok(())
+        }
     }
 }
 
@@ -384,8 +283,8 @@ mod tests {
     use super::*;
     use serde_json;
 
-    fn build_message(em: &EmulatorMemory) -> Message {
-        Message {
+    fn build_message(em: &MemorySliceHandle) -> PokemonRedBlueMessage {
+        PokemonRedBlueMessage {
             active_pkmn: match &em.slice {
                 Some(m) => Some(m.to_vec()),
                 None => None
@@ -397,11 +296,12 @@ mod tests {
     fn serde_mem() -> Result<(), String> {
         let mut data: [u8; 5] = [1, 2, 3, 4, 5];
         let b: &mut [u8] = &mut data;
-        let slice = EmulatorMemory {
+        let slice = MemorySliceHandle {
             offset: 0,
             length: 0,
             bank_switch: 0,
             slice: Some(b),
+            last_read_value: None
         };
 
         let message = build_message(&slice);
@@ -410,7 +310,7 @@ mod tests {
 
         println!("serialized data: {}", serialized);
 
-        let deserialized: Message = serde_json::from_str(&serialized).unwrap();
+        let deserialized: PokemonRedBlueMessage = serde_json::from_str(&serialized).unwrap();
 
         assert_eq!(deserialized.active_pkmn.unwrap()[0], data[0]);
         Ok(())

From ccc3f16491bab0eb8b76d70661db8f73bc6174f8 Mon Sep 17 00:00:00 2001
From: Vivian Lim <vivvnlim@gmail.com>
Date: Sun, 8 Mar 2020 21:30:41 -0700
Subject: [PATCH 12/13] sync and debounce working good

---
 src/emulator/emulator.rs        |  9 +++++----
 src/main.rs                     |  3 +--
 src/sync/comms.rs               | 15 +++++++++++---
 src/sync/memory_slice_handle.rs | 36 +++++++++++++++++++++++++++++++++
 src/sync/pokemon_rb.rs          | 20 +++++-------------
 5 files changed, 59 insertions(+), 24 deletions(-)

diff --git a/src/emulator/emulator.rs b/src/emulator/emulator.rs
index 465c958..e3df8b7 100644
--- a/src/emulator/emulator.rs
+++ b/src/emulator/emulator.rs
@@ -5,6 +5,7 @@ use ferretro::retro::wrapped_types::{ControllerDescription2, InputDescriptor2, I
 use ferretro::retro::wrapper::LibretroWrapper;
 
 use crate::sync::game::{SyncableGame, KnownGames, read_game_name, create_game};
+use crate::emulator::libretro_memory_map::LibRetroMemoryMap;
 
 use std::ffi::CStr;
 use std::io::Read;
@@ -47,7 +48,7 @@ pub struct MyEmulator {
     gamepads: Vec<GameController>,
     pressed_keys: Vec<Keycode>,
 
-    pub memory_map: Option<MemoryMap>,
+    pub memory_map: Option<LibRetroMemoryMap>,
     synced_game: Option<Box<dyn SyncableGame>>,
 }
 
@@ -175,7 +176,7 @@ impl MyEmulator {
                     match g.handle_inbound_messages() {
                         Ok(_) => (),
                         Err(e) => {
-                            println!("Error while handling inbound messages: {:?}", e);
+                            println!("Error while handling inbound messages");
                         }
                     }
                 },
@@ -431,8 +432,8 @@ impl retro::wrapper::Handler for MyEmulator {
         eprint!("[{:?}] {}", level, msg);
     }
 
-    fn set_memory_maps(&mut self, memory_map: MemoryMap) -> bool {
-        self.memory_map = Some(memory_map);
+    fn set_memory_maps(&mut self, ffi_memory_map: MemoryMap) -> bool {
+        self.memory_map = Some(LibRetroMemoryMap::create(&ffi_memory_map));
         true
     }
 }
diff --git a/src/main.rs b/src/main.rs
index 07ada1b..0fbb0e9 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -18,8 +18,7 @@ pub fn main() -> failure::Fallible<()> {
     emu.load_game(&opt.rom);
 
     // memory map should be ready after init & loading game.
-    let ffi_memory_map = emu.memory_map.as_ref().expect("Memory map was not set by emulator core, cannot continue.");
-    let memory_map = LibRetroMemoryMap::create(ffi_memory_map);
+    let memory_map = emu.memory_map.as_ref().expect("Memory map was not set by emulator core, cannot continue.");
 
     match (&opt.state) {
         Some(s) => emu.load_state(s),
diff --git a/src/sync/comms.rs b/src/sync/comms.rs
index f87a39c..df9a548 100644
--- a/src/sync/comms.rs
+++ b/src/sync/comms.rs
@@ -1,5 +1,5 @@
 use std::path::{Path, PathBuf};
-use std::sync::mpsc::{Sender, Receiver};
+use std::sync::mpsc::{Sender, Receiver, TryRecvError};
 use std::sync::mpsc;
 use std::thread;
 use std::thread::JoinHandle;
@@ -125,7 +125,16 @@ impl<T> Communication<T> where T: std::marker::Send, T: Serialize, T: Deserializ
         Ok(())
     }
 
-    pub fn try_recv(&mut self) ->  Result<T, std::sync::mpsc::TryRecvError> {
-        self.rx.try_recv()
+    pub fn receive_if_any(&mut self) ->  Option<T> {
+        match self.rx.try_recv() {
+            Err(e) => match e {
+                TryRecvError::Empty => None,
+                TryRecvError::Disconnected => {
+                    println!("Disconnected when trying to receive.");
+                    None
+                }
+            }
+            Ok(msg) => Some(msg)
+        }
     }
 }
\ No newline at end of file
diff --git a/src/sync/memory_slice_handle.rs b/src/sync/memory_slice_handle.rs
index e9c5262..d52cb44 100644
--- a/src/sync/memory_slice_handle.rs
+++ b/src/sync/memory_slice_handle.rs
@@ -21,6 +21,42 @@ impl MemorySliceHandle<'_> {
         }
     }
 
+    pub fn write_to_slice(&mut self, data: Vec<u8>) -> Result<(), failure::Error> {
+        match &mut self.slice {
+            Some(slice) => {
+                if data.len() != slice.len() {
+                    return Err(failure::err_msg("message size and slice size differ."));
+                }
+
+                // if last_read_value is set, update it as the same time that we write back to the emulator.
+                match &mut self.last_read_value {
+                    None => {
+                        let mut index: usize = 0;
+                        for value in data.into_iter(){
+                            slice[index] = value;
+                            index += 1;
+                        }
+                    },
+                    Some(last_read_value) => {
+                        let mut index: usize = 0;
+                        for value in data.into_iter(){
+                            slice[index] = value;
+                            last_read_value[index] = value;
+                            index += 1;
+                        }
+                    }
+                }
+
+                Ok(())
+            },
+            None => {
+                println!("slice doesn't exist to write to.");
+                Ok(())
+            }
+
+        }
+    }
+
     pub fn get_copy_if_changed_since_last_read(&mut self) -> Option<Vec<u8>> {
         match &mut self.slice {
             None => None,
diff --git a/src/sync/pokemon_rb.rs b/src/sync/pokemon_rb.rs
index 0296216..4c97934 100644
--- a/src/sync/pokemon_rb.rs
+++ b/src/sync/pokemon_rb.rs
@@ -61,8 +61,10 @@ impl SyncableGame for SyncedPokemonRedBlue {
     }
 
     fn handle_inbound_messages(&mut self) -> Result<(), failure::Error>{
-        let in_msg = self.comms.try_recv()?;
-        self.handle_message(in_msg)
+        match self.comms.receive_if_any() {
+            Some(msg) => self.handle_message(msg),
+            None => Ok(())
+        }
     }
 }
 
@@ -103,19 +105,7 @@ impl SyncedPokemonRedBlue {
         match msg.active_pkmn {
             Some(src) => {
                 println!("message contains a new active pokemon. data: {:?}", &src);
-                let target_slice = self.memory_handles.active_pokemon.slice.as_mut().ok_or(failure::err_msg("can't write message back to None memory slice"))?;
-                if src.len() != target_slice.len() {
-                    return Err(failure::err_msg("message size and slice size differ."));
-                }
-
-                let mut index: usize = 0;
-                for value in src.into_iter(){
-                    target_slice[index] = value;
-                    index += 1;
-                }
-
-                Ok(())
-
+                self.memory_handles.active_pokemon.write_to_slice(src)
             }
             None => Ok(())
         }

From 6889711f5bff710ee36a295fd5126d9e4221ca2b Mon Sep 17 00:00:00 2001
From: Vivian Lim <vivvnlim@gmail.com>
Date: Tue, 10 Mar 2020 00:15:33 -0700
Subject: [PATCH 13/13] Handle multiple games by reading their metadata

---
 Cargo.lock                      |  7 +++++
 Cargo.toml                      |  1 +
 src/emulator/emulator.rs        | 29 +++++++++++++++-----
 src/emulator/metadata_reader.rs | 47 +++++++++++++++++++++++++++++++++
 src/emulator/mod.rs             |  3 ++-
 src/main.rs                     | 36 ++++++++++++++++---------
 src/sync/game.rs                |  7 +++--
 7 files changed, 108 insertions(+), 22 deletions(-)
 create mode 100644 src/emulator/metadata_reader.rs

diff --git a/Cargo.lock b/Cargo.lock
index ebf655e..fb27344 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -8,6 +8,11 @@ dependencies = [
  "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "ascii"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "atty"
 version = "0.2.13"
@@ -204,6 +209,7 @@ dependencies = [
 name = "ferretro-synced"
 version = "0.1.0"
 dependencies = [
+ "ascii 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "cc 1.0.48 (registry+https://github.com/rust-lang/crates.io-index)",
  "crossbeam-channel 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "failure 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1353,6 +1359,7 @@ dependencies = [
 
 [metadata]
 "checksum ansi_term 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b"
+"checksum ascii 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "bbf56136a5198c7b01a49e3afcbef6cf84597273d298f54432926024107b0109"
 "checksum atty 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)" = "1803c647a3ec87095e7ae7acfca019e98de5ec9a7d01343f611cf3152ed71a90"
 "checksum autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "1d49d90015b3c36167a20fe2810c5cd875ad504b39cff3d4eae7977e6b7c1cb2"
 "checksum backtrace 0.3.40 (registry+https://github.com/rust-lang/crates.io-index)" = "924c76597f0d9ca25d762c25a4d369d51267536465dc5064bdf0eb073ed477ea"
diff --git a/Cargo.toml b/Cargo.toml
index ccf638a..4e49823 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -21,5 +21,6 @@ serde = { version = "1.0.104", features = ["derive"] }
 serde_bytes = "0.11"
 serde_json = "1.0.44"
 websocket = "0.24.0"
+ascii = "1.0.0"
 
 [dev-dependencies]
\ No newline at end of file
diff --git a/src/emulator/emulator.rs b/src/emulator/emulator.rs
index e3df8b7..cdd999c 100644
--- a/src/emulator/emulator.rs
+++ b/src/emulator/emulator.rs
@@ -6,6 +6,7 @@ use ferretro::retro::wrapper::LibretroWrapper;
 
 use crate::sync::game::{SyncableGame, KnownGames, read_game_name, create_game};
 use crate::emulator::libretro_memory_map::LibRetroMemoryMap;
+use crate::emulator::metadata_reader::{GameInfo, get_game_info};
 
 use std::ffi::CStr;
 use std::io::Read;
@@ -30,6 +31,7 @@ pub struct MyEmulator {
 
     sys_info: SystemInfo,
     av_info: SystemAvInfo,
+    pub game_info: Option<GameInfo>,
 
     sdl_context: sdl2::Sdl,
 
@@ -129,6 +131,7 @@ impl MyEmulator {
             preferred_pad: None,
             av_info,
             sys_info,
+            game_info: None,
             sdl_context,
             canvas,
             pixel_format,
@@ -208,17 +211,31 @@ impl MyEmulator {
         }
     }
 
-    pub fn load_game(&self, rom: impl AsRef<Path>) {
+    pub fn load_game(&mut self, rom: impl AsRef<Path>) {
         let path = rom.as_ref();
         let mut data = None;
         let mut v = Vec::new();
-        if !self.sys_info.need_fullpath {
-            if let Ok(mut f) = std::fs::File::open(path) {
-                if f.read_to_end(&mut v).is_ok() {
-                    data = Some(v.as_ref());
-                }
+
+        if let Ok(mut f) = std::fs::File::open(path) {
+            if f.read_to_end(&mut v).is_ok() {
+                data = Some(v.as_ref());
+
+                let library_name = unsafe { CStr::from_ptr(self.sys_info.library_name) }.to_string_lossy();
+
+                self.game_info = match get_game_info(library_name.as_ref(), v.as_ref()) {
+                    Ok(game_info) => Some(game_info),
+                    Err(e) => {
+                        println!("Couldn't get game metadata: {:?}", e);
+                        None
+                    }
+                };
             }
         }
+
+        if self.sys_info.need_fullpath { // this core will load the rom itself, so don't pass it data
+            data = None
+        }
+
         self.retro
             .load_game(Some(path), data, None)
             .unwrap();
diff --git a/src/emulator/metadata_reader.rs b/src/emulator/metadata_reader.rs
new file mode 100644
index 0000000..627241a
--- /dev/null
+++ b/src/emulator/metadata_reader.rs
@@ -0,0 +1,47 @@
+use ascii::AsAsciiStr;
+
+pub enum GamePlatform {
+    GameBoyColor,
+    SuperNintendo,
+    Genesis
+}
+
+pub struct GameInfo {
+    pub platform: GamePlatform,
+    pub core_name: String,
+    pub game_name: String,
+}
+
+fn core_to_platform(core_name: &str) -> GamePlatform {
+    match core_name.to_lowercase().as_str() {
+        "gambatte" => GamePlatform::GameBoyColor,
+        "bsnes" => GamePlatform::SuperNintendo,
+        "genesis plus gx" => GamePlatform::Genesis,
+        "higan (super famicom accuracy)" => GamePlatform::SuperNintendo,
+        _ => panic!(format!("unknown core {}", core_name))
+    }
+}
+
+pub fn get_game_info(core_name: &str, data: &[u8]) -> Result<GameInfo, failure::Error> {
+    let platform = core_to_platform(&core_name);
+
+    let game_name = match &platform {
+        GamePlatform::GameBoyColor => data.slice_ascii(0x134..0x143)?.to_string()
+            .trim_end_matches("\0").to_string(), // remove nulls at end
+
+        GamePlatform::SuperNintendo => data.slice_ascii(0x7fc0..0x7fd5)?.to_string()
+            .trim_end_matches("\0").to_string(), // remove nulls at end
+
+        GamePlatform::Genesis => data.slice_ascii(0x120..0x150)?.to_string()
+            .split(" ")
+            .filter(|w| w.len() > 0)
+            .collect::<Vec<&str>>()
+            .join(" "), // remove duplicate spaces
+    };
+
+    Ok(GameInfo {
+        platform,
+        core_name: String::from(core_name),
+        game_name,
+    })
+}
\ No newline at end of file
diff --git a/src/emulator/mod.rs b/src/emulator/mod.rs
index 552b575..f25abfe 100644
--- a/src/emulator/mod.rs
+++ b/src/emulator/mod.rs
@@ -1,2 +1,3 @@
 pub mod emulator;
-pub mod libretro_memory_map;
\ No newline at end of file
+pub mod libretro_memory_map;
+pub mod metadata_reader;
\ No newline at end of file
diff --git a/src/main.rs b/src/main.rs
index 0fbb0e9..d5dba4f 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -1,8 +1,10 @@
+#[macro_use] extern crate failure;
 extern crate crossbeam_channel;
 extern crate ferretro;
 extern crate sdl2;
 extern crate serde;
 extern crate serde_bytes;
+extern crate ascii;
 
 use structopt::StructOpt;
 use std::path::{Path, PathBuf};
@@ -18,37 +20,45 @@ pub fn main() -> failure::Fallible<()> {
     emu.load_game(&opt.rom);
 
     // memory map should be ready after init & loading game.
-    let memory_map = emu.memory_map.as_ref().expect("Memory map was not set by emulator core, cannot continue.");
+    //let memory_map = emu.memory_map.as_ref().expect("Memory map was not set by emulator core, cannot continue.");
 
     match (&opt.state) {
         Some(s) => emu.load_state(s),
         None => ()
     }
 
-    let which_game = read_game_name("assume you can get it from emu".to_string());
-
     let comms_settings = CommunicationSettings {
         connection: "ws://127.0.0.1:8765".to_string()
     };
 
-    match which_game {
-        Some(which_game) => {
-            let synced_game = create_game(which_game, comms_settings, &memory_map);
-
-            emu.begin_sync(synced_game);
-        },
-        None => {
-            println!("Game is unknown, not syncing.")
-        }
 
+    if let Err(e) = attempt_to_start_sync(&mut emu, comms_settings) {
+        println!("Error trying to start sync: {:?}", e);
     }
-    //let mut comms = Communication::new::<ferretro_synced::sync::pokemon_rb::Message>();
 
     emu.run();
 
     Ok(())
 }
 
+fn attempt_to_start_sync(emu: &mut MyEmulator, comms_settings: CommunicationSettings) -> Result<(), failure::Error> {
+    match &emu.game_info {
+        Some(game_info) => match read_game_name(&game_info.game_name) {
+            Some(which_game) => match &emu.memory_map {
+                Some(memory_map) => {
+                    let synced_game = create_game(which_game, comms_settings, memory_map);
+                    emu.begin_sync(synced_game);
+                    Ok(())
+                },
+                None => Err(format_err!("Memory map has not been set"))
+            },
+            None => Err(format_err!("Unrecognized game {}", game_info.game_name))
+        },
+        None => Err(format_err!("Couldn't get game metadata"))
+    }
+
+}
+
 #[derive(StructOpt)]
 struct Opt {
     /// Core module to use.
diff --git a/src/sync/game.rs b/src/sync/game.rs
index 279dfe0..3f5bd0b 100644
--- a/src/sync/game.rs
+++ b/src/sync/game.rs
@@ -17,8 +17,11 @@ pub enum KnownGames {
     PokemonRedBlue,
 }
 
-pub fn read_game_name(name: String) -> Option<KnownGames> {
-    Some(KnownGames::PokemonRedBlue) // todo: actually read the name of the game
+pub fn read_game_name(name: &str) -> Option<KnownGames> {
+    match name {
+        "POKEMON BLUE" => Some(KnownGames::PokemonRedBlue),
+        _ => None
+    }
 }