aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Li <li.davidm96@gmail.com>2015-12-15 13:38:54 -0500
committerDavid Li <li.davidm96@gmail.com>2015-12-15 13:38:58 -0500
commit32b7dacc64b70c12096ecb4007465e41f3c2098a (patch)
tree91e1e1d3a11351c92ae8591d3fcac5d8361c7af1
Outline the simulator
-rw-r--r--.gitignore2
-rw-r--r--Cargo.toml4
-rw-r--r--src/binary.rs15
-rw-r--r--src/cache.rs8
-rw-r--r--src/isa/mod.rs32
-rw-r--r--src/isa/opcodes.rs2
-rw-r--r--src/lib.rs9
-rw-r--r--src/memory.rs21
-rw-r--r--src/simulator.rs58
9 files changed, 151 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..a9d37c5
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+target
+Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
new file mode 100644
index 0000000..99470d5
--- /dev/null
+++ b/Cargo.toml
@@ -0,0 +1,4 @@
+[package]
+name = "rustv"
+version = "0.1.0"
+authors = ["David Li <li.davidm96@gmail.com>"]
diff --git a/src/binary.rs b/src/binary.rs
new file mode 100644
index 0000000..2564637
--- /dev/null
+++ b/src/binary.rs
@@ -0,0 +1,15 @@
+pub struct Binary<'a> {
+ words: &'a [u32],
+}
+
+impl<'a> Binary<'a> {
+ pub fn new(words: &'a [u32]) -> Binary<'a> {
+ Binary {
+ words: words,
+ }
+ }
+
+ // pub fn new_from_hex_file() -> Binary<'a> {
+
+ // }
+}
diff --git a/src/cache.rs b/src/cache.rs
new file mode 100644
index 0000000..26fdc18
--- /dev/null
+++ b/src/cache.rs
@@ -0,0 +1,8 @@
+// pub struct Cache {
+// }
+
+// impl Cache {
+// pub fn new(sets: usize, ways: usize, block_size: usize) -> Cache {
+
+// }
+// }
diff --git a/src/isa/mod.rs b/src/isa/mod.rs
new file mode 100644
index 0000000..5e9a7dc
--- /dev/null
+++ b/src/isa/mod.rs
@@ -0,0 +1,32 @@
+pub mod opcodes;
+
+enum Register {
+ X0 = 0,
+ X1 = 1,
+ X2 = 2,
+ X3 = 3,
+ X4 = 4,
+ X5 = 5,
+ X6 = 6,
+ X7 = 7,
+ X8 = 8,
+ X9 = 9,
+ X10 = 10,
+ X11 = 11,
+}
+
+pub struct Instruction {
+ word: u32,
+}
+
+impl Instruction {
+ pub fn new(word: u32) -> Instruction {
+ Instruction {
+ word: word,
+ }
+ }
+
+ pub fn opcode(&self) -> u32 {
+ self.word & 0x7F
+ }
+}
diff --git a/src/isa/opcodes.rs b/src/isa/opcodes.rs
new file mode 100644
index 0000000..0ea7613
--- /dev/null
+++ b/src/isa/opcodes.rs
@@ -0,0 +1,2 @@
+pub const Branch: u32 = 0x12;
+pub const IntegerImmediate: u32 = 0x13;
diff --git a/src/lib.rs b/src/lib.rs
new file mode 100644
index 0000000..f710c03
--- /dev/null
+++ b/src/lib.rs
@@ -0,0 +1,9 @@
+mod isa;
+mod binary;
+mod memory;
+mod cache;
+mod simulator;
+
+#[test]
+fn it_works() {
+}
diff --git a/src/memory.rs b/src/memory.rs
new file mode 100644
index 0000000..854b0ea
--- /dev/null
+++ b/src/memory.rs
@@ -0,0 +1,21 @@
+use isa::{Instruction};
+
+pub struct Memory {
+ memory: Vec<u32>,
+}
+
+impl Memory {
+ pub fn new(size: usize) -> Memory {
+ Memory {
+ memory: Vec::with_capacity(size),
+ }
+ }
+
+ pub fn read_word(&self, address: usize) -> Option<u32> {
+ self.memory.get(address).map(Clone::clone)
+ }
+
+ pub fn read_instruction(&self, pc: usize) -> Option<Instruction> {
+ self.memory.get(pc).map(Clone::clone).map(Instruction::new)
+ }
+}
diff --git a/src/simulator.rs b/src/simulator.rs
new file mode 100644
index 0000000..e965686
--- /dev/null
+++ b/src/simulator.rs
@@ -0,0 +1,58 @@
+use isa;
+use binary::{Binary};
+use memory::{Memory};
+
+pub struct Simulator<'a> {
+ binary: Binary<'a>,
+ num_cores: usize,
+ memory: Memory,
+}
+
+#[derive(Clone)]
+struct Core {
+ pc: usize,
+}
+
+struct RegisterFile {
+ registers: [u32; 32],
+}
+
+impl<'a> Simulator<'a> {
+ pub fn new(num_cores: usize, binary: Binary<'a>) -> Simulator<'a> {
+ Simulator {
+ binary: binary,
+ num_cores: num_cores,
+ memory: Memory::new(0x20000),
+ }
+ }
+
+ pub fn run(&mut self) {
+ let mut cores = vec![Core { pc: 0x10000, }; self.num_cores];
+ // TODO: set up memory, cache, devices
+ // TODO: map binary into RAM
+ loop {
+ for core in cores.iter_mut() {
+ self.step_core(core);
+ }
+ }
+ }
+
+ fn step_core(&mut self, core: &mut Core) {
+ if let Some(inst) = self.memory.read_instruction(core.pc) {
+ match inst.opcode() {
+ isa::opcodes::Branch => {
+
+ }
+ isa::opcodes::IntegerImmediate => {
+
+ }
+ _ => {
+
+ }
+ }
+ }
+ else {
+ // trap
+ }
+ }
+}