Update TODOs, memory layout

2 files changed, 21 insertions, 2 deletions

diff --git a/TODO.md b/TODO.md
index 4532918..aed4946 100644
--- a/TODO.md
+++ b/TODO.md
@@ -1,6 +1,20 @@
 # CacheRacer TODOs
 
 - [ ] Come up with a theme
+  - [ ] Overall theme
+  - [ ] Sneak attack/retreat =
+  - [ ] White walker/dragon glass =
+  - [ ] Arrow barrage =
+
+## Memory
+
+- [ ] Make sure `ReverseMmu` maps addresses correctly (i.e. 0x0 should
+  map to an actual array element)
+- [ ] Implement global data structures
+    - [ ] Player status
+    - [ ] Core status
+    - [ ] Cache info
+    - [ ] Enemy status should be inaccessible unless in sneak-attack mode
 
 ## Scoring
 
@@ -11,6 +25,7 @@
 ## Sneak Attack/Retreat
 
 - [ ] Test sneak attack/retreat system calls
+- [ ] Implement taunt array
 
 ## Traps
 
@@ -19,6 +34,7 @@
 
 ## Development/Debugging
 
+- [ ] Write the header file
 - [x] Write some sample bots
     - [ ] Publish them
 - [ ] Package RISC-V toolchain
@@ -30,6 +46,9 @@
 
 ## Misc
 
+- [ ] Allow custom trap handling in simulator, so we can restart cores
+  if they crash
+
 <style>
 h1:before, h2:before { content: none; }
 </style>
diff --git a/src/main.rs b/src/main.rs
index 1745084..ff5ed3a 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -87,13 +87,13 @@ fn main() {
     let mut cores = vec![];
     for i in 0..4 {
         let mut core = simulator::Core::new(
-            i, start1, (0x1000 + i * 0x1000) as u32, cache1.clone(),
+            i, start1, (0x100000 * (i + 1)) as u32, cache1.clone(),
             Box::new(memory::IdentityMmu::new())
             );
         core.registers().write_word(isa::Register::X10, i as isa::Word);
         cores.push(core);
         let mut core = simulator::Core::new(
-            i, start2, (0x1000 + i * 0x1000) as u32, cache2.clone(),
+            i, start2, (0x100000 * (i + 1)) as u32, cache2.clone(),
             Box::new(memory::ReverseMmu::new(0x4000000))
             );
         core.registers().write_word(isa::Register::X10, i as isa::Word);