From 3302193965e0050e19cc4f470167614ca5c08c4d Mon Sep 17 00:00:00 2001 From: Isabelle L Date: Fri, 19 Jun 2020 02:58:11 -0500 Subject: [PATCH] changed gp to pc --- README.md | 4 ++-- ceres-sys/src/registers.rs | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index ac05551..3d6ee60 100644 --- a/README.md +++ b/README.md @@ -14,8 +14,8 @@ all registers are unsigned 16 bit | Register number | Register name | Register usage | | --------------- | ------------- | -------------------- | | 0 | z0 | always contains zero | -| 1 | gp | global pointer | -| 2 | gp | stack pointer | +| 1 | pc | program counter | +| 2 | sp | stack pointer | | 3 | ra | return address | | 4-6 | a0-a2 | argument registers | | 7 | v0 | return register | diff --git a/ceres-sys/src/registers.rs b/ceres-sys/src/registers.rs index 8a32a07..e9a9eae 100644 --- a/ceres-sys/src/registers.rs +++ b/ceres-sys/src/registers.rs @@ -6,7 +6,7 @@ pub struct Registers { z0: u16, // system registers - gp: u16, + pc: u16, sp: u16, ra: u16, @@ -34,7 +34,7 @@ impl Registers { pub fn init() -> Registers { Registers { z0: 0x0000, - gp: 0x0000, + pc: 0x0000, sp: 0x0000, ra: 0x0000, a0: 0x0000, @@ -61,7 +61,7 @@ impl std::ops::Index for Registers { fn index(&self, idx: usize) -> &u16 { match idx { 0 => &self.z0, - 1 => &self.gp, + 1 => &self.pc, 2 => &self.sp, 3 => &self.ra, 4 => &self.a0, @@ -87,7 +87,7 @@ impl std::ops::IndexMut for Registers { fn index_mut(&mut self, idx: usize) -> &mut u16 { match idx { 0 => &mut self.z0, - 1 => &mut self.gp, + 1 => &mut self.pc, 2 => &mut self.sp, 3 => &mut self.ra, 4 => &mut self.a0, @@ -112,7 +112,7 @@ impl fmt::Display for Registers { write!( f, "-- registers ----------------------------------------\n\ -| z0: 0x{:04X} | gp: 0x{:04X} | sp: 0x{:04X} | ra: 0x{:04X} |\n\ +| z0: 0x{:04X} | pc: 0x{:04X} | sp: 0x{:04X} | ra: 0x{:04X} |\n\ | a0: 0x{:04X} | a1: 0x{:04X} | a2: 0x{:04X} | v0: 0x{:04X} |\n\ | v1: 0x{:04X} | t0: 0x{:04X} | t1: 0x{:04X} | t2: 0x{:04X} |\n\ | t3: 0x{:04X} | t4: 0x{:04X} | t5: 0x{:04X} | t6: 0x{:04X} |\n\