From 56bf151b4fd091360246b2cfe230997e4082b0bc Mon Sep 17 00:00:00 2001
From: David Li <li.davidm96@gmail.com>
Date: Wed, 13 Jan 2016 09:42:18 -0700
Subject: Start working on updating global data structures

---
 src/system.rs | 24 ++++++++++--------------
 1 file changed, 10 insertions(+), 14 deletions(-)

(limited to 'src/system.rs')

diff --git a/src/system.rs b/src/system.rs
index 4e48303..c0343bb 100644
--- a/src/system.rs
+++ b/src/system.rs
@@ -3,7 +3,7 @@ use std::cell::RefCell;
 use std::rc::Rc;
 
 use rustv::isa;
-use rustv::memory::SharedMemory;
+use rustv::memory::{Mmu, SharedMemory};
 use rustv::register_file::RegisterFile;
 use rustv::syscall;
 use rustv::trap::Trap;
@@ -27,8 +27,7 @@ impl<'a> SyscallHandler<'a> {
 }
 
 impl<'a> SyscallHandler<'a> {
-    fn prints(&mut self, core_id: usize,
-             registers: &mut RegisterFile) -> Option<Trap> {
+    fn prints(&mut self, registers: &mut RegisterFile) -> Option<Trap> {
         let mut base = registers.read_word(isa::Register::X11);
         let mut string = vec![];
 
@@ -55,23 +54,20 @@ impl<'a> SyscallHandler<'a> {
         None
     }
 
-    fn printi(&mut self, core_id: usize,
+    fn printi(&mut self,
               registers: &mut RegisterFile) -> Option<Trap> {
         println!("{}", registers.read_word(isa::Register::X11));
-
         None
     }
 
-    fn enable_secondary(&mut self, core_id: usize,
-                        registers: &mut RegisterFile) -> Option<Trap> {
+    fn enable_secondary(&mut self, core_id: usize) -> Option<Trap> {
         debug!("[syscall] [memory] Secondary cache enabled for core {}",
                core_id);
         self.caches[core_id].borrow_mut().enable_secondary();
         None
     }
 
-    fn disable_secondary(&mut self, core_id: usize,
-                         registers: &mut RegisterFile) -> Option<Trap> {
+    fn disable_secondary(&mut self, core_id: usize) -> Option<Trap> {
         debug!("[syscall] [memory] Secondary cache disabled for core {}",
                core_id);
         self.caches[core_id].borrow_mut().disable_secondary();
@@ -82,14 +78,14 @@ impl<'a> SyscallHandler<'a> {
 impl<'a> syscall::SyscallHandler for SyscallHandler<'a> {
     // TODO: is trap really appropriate here?
     fn syscall(&mut self, core_id: usize,
-               registers: &mut RegisterFile) -> Option<Trap> {
+               registers: &mut RegisterFile, mmu: &Mmu) -> Option<Trap> {
         let syscall_number = registers.read_word(isa::Register::X10);
 
         match syscall_number {
-            22 => self.prints(core_id, registers),
-            23 => self.printi(core_id, registers),
-            24 => self.enable_secondary(core_id, registers),
-            25 => self.disable_secondary(core_id, registers),
+            22 => self.prints(registers),
+            23 => self.printi(registers),
+            24 => self.enable_secondary(core_id),
+            25 => self.disable_secondary(core_id),
 
             _ => {
                 // TODO: some sort of error reporting
-- 
cgit v1.2.3