From 5600ebffdf12117d398476f93897a8cc289eb468 Mon Sep 17 00:00:00 2001
From: David Li <li.davidm96@gmail.com>
Date: Thu, 14 Jan 2016 15:57:12 -0700
Subject: Match rustv refactor, check traps properly

---
 src/globals.rs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/globals.rs')

diff --git a/src/globals.rs b/src/globals.rs
index 27d3bbd..2d2a067 100644
--- a/src/globals.rs
+++ b/src/globals.rs
@@ -1,12 +1,12 @@
 use std::cell::RefCell;
 use std::rc::Rc;
 
-use rustv::isa;
+use rustv::isa::{self, IsaType};
 use rustv::memory::{Memory, MemoryInterface, Mmu};
 
 use memory_tracker::MemoryTracker;
 
-pub const HOME_STATUS: isa::Address = 0xFFF00;
+pub const HOME_STATUS: isa::Address = isa::Word(0xFFF00);
 
 /// Update the various global data structures as requested by other
 /// subsystems.
@@ -35,10 +35,10 @@ impl<'a> GlobalsUpdater<'a> {
             let address2 = self.mmu2.translate(HOME_STATUS + 28 + offset);
             let _ = self.memory.borrow_mut().write_word(
                 address1,
-                (-1 as i32) as isa::Word);
+                isa::SignedWord(-1).as_word());
             let _ = self.memory.borrow_mut().write_word(
                 address2,
-                (-1 as i32) as isa::Word);
+                isa::SignedWord(-1).as_word());
         }
     }
 
-- 
cgit v1.2.3