From d35773d842a4fcd0a3741fe59665c54a90aa4bbd Mon Sep 17 00:00:00 2001
From: David Isaksson <davidisaksson93@gmail.com>
Date: Sun, 7 Jan 2024 15:24:49 +0100
Subject: [PATCH] emu: Temporary fix for program start address

Need to figure out how to specify where the disassembler should start
looking for the program. Maybe check if 0xfffc is set?
---
 src/bin/asm.rs          | 24 +-----------------------
 src/bin/emu.rs          | 25 ++-----------------------
 src/emulator.rs         |  4 ++--
 src/emulator/tui/app.rs | 31 ++++++++++++++++---------------
 4 files changed, 21 insertions(+), 63 deletions(-)

diff --git a/src/bin/asm.rs b/src/bin/asm.rs
index 880526c..29dece4 100644
--- a/src/bin/asm.rs
+++ b/src/bin/asm.rs
@@ -2,28 +2,6 @@ use anyhow::{Context, Result};
 use tracing_chrome::ChromeLayerBuilder;
 use tracing_subscriber::prelude::*;
 
-fn demo() -> &'static str {
-    "
-  define zero $00
-  LDX #zero
-  LDY #$00
-firstloop:
-  TXA
-  STA $0200,Y
-  PHA
-  INX
-  INY
-  CPY #$10
-  BNE firstloop ;loop until Y is $10
-secondloop:
-  PLA
-  STA $0200,Y
-  INY
-  CPY #$20      ;loop until Y is $20
-  BNE secondloop
-"
-}
-
 const PROGRAM_START: u16 = 0x8000;
 
 #[tracing::instrument]
@@ -34,7 +12,7 @@ fn main() -> Result<()> {
     let input_source = if let Some(filename) = std::env::args().nth(1) {
         std::fs::read_to_string(filename).unwrap()
     } else {
-        demo().to_string()
+        return Err(anyhow::anyhow!("No file specified. Allowed filetype: .asm"));
     };
 
     let bytes = mos6502::assembler::compile_code(&input_source, PROGRAM_START)
diff --git a/src/bin/emu.rs b/src/bin/emu.rs
index 5ae8c8b..c6f3f29 100644
--- a/src/bin/emu.rs
+++ b/src/bin/emu.rs
@@ -8,28 +8,7 @@ use mos6502::{
     emulator::{self, tui},
 };
 
-fn demo() -> &'static str {
-    "
-  define zero $00
-  LDX #zero
-  LDY #$00
-firstloop:
-  TXA
-  STA $0200,Y
-  PHA
-  INX
-  INY
-  CPY #$10
-  BNE firstloop ;loop until Y is $10
-secondloop:
-  PLA
-  STA $0200,Y
-  INY
-  CPY #$20      ;loop until Y is $20
-  BNE secondloop
-"
-}
-
+// TODO: Either pass this as an argument, or check 0xfffc...?
 const PROGRAM_START: u16 = 0x8000;
 
 fn get_program_bytes() -> anyhow::Result<Vec<u8>> {
@@ -45,7 +24,7 @@ fn get_program_bytes() -> anyhow::Result<Vec<u8>> {
             return Err(anyhow::anyhow!("Unknown file type. Allowed: .bin, .asm"));
         }
     } else {
-        compile_code(demo(), PROGRAM_START).with_context(|| "Compilation failed")
+        Err(anyhow::anyhow!("No file specified. Allowed: .bin, .asm"))
     }
 }
 
diff --git a/src/emulator.rs b/src/emulator.rs
index 63d5046..121f47c 100644
--- a/src/emulator.rs
+++ b/src/emulator.rs
@@ -11,8 +11,8 @@ pub mod tui;
 /// Runs the emulator with the given program bytes and program start address.
 pub fn run(program_bytes: &[u8], program_start: u16) -> anyhow::Result<()> {
     let mut memory = Memory::new();
-    memory.write_word(cpu::RESET_VECTOR, program_start);
-    memory.load(program_start, program_bytes);
+    memory.write_word(cpu::RESET_VECTOR, program_start); // TODO: Include in the program
+    memory.load(0x0000, program_bytes);
     let mut cpu = Cpu::new();
     cpu.reset();
     cpu.run(&mut memory, RunOption::StopOnBreakInstruction);
diff --git a/src/emulator/tui/app.rs b/src/emulator/tui/app.rs
index d7fea0d..06918b3 100644
--- a/src/emulator/tui/app.rs
+++ b/src/emulator/tui/app.rs
@@ -48,19 +48,20 @@ impl App {
         // turn a Vec<Instruction> into a Vec<(usize, String)>
         // where the usize is the memory address of the instruction.
         // TODO: Refactor this into a function
-        let disassembly: Vec<(usize, String)> = disassemble_code(program)
-            .iter()
-            .scan(0, |acc, ins| {
-                let addr = *acc;
-                *acc += ins.size();
-                Some((addr, ins.clone()))
-            })
-            .map(|(addr, node)| {
-                let memory_addr = program_start as usize + addr;
-                let line = listing::generate_line(memory_addr, &node);
-                (memory_addr, line)
-            })
-            .collect();
+        let disassembly: Vec<(usize, String)> =
+            disassemble_code(&program[program_start as usize..])
+                .iter()
+                .scan(0, |acc, ins| {
+                    let addr = *acc;
+                    *acc += ins.size();
+                    Some((addr, ins.clone()))
+                })
+                .map(|(addr, node)| {
+                    let memory_addr = program_start as usize + addr;
+                    let line = listing::generate_line(memory_addr, &node);
+                    (memory_addr, line)
+                })
+                .collect();
 
         let mut app = Self {
             program: program.to_vec(),
@@ -82,8 +83,8 @@ impl App {
     pub fn reset(&mut self) {
         self.memory = Memory::new();
         self.memory
-            .write_word(cpu::RESET_VECTOR, self.program_start);
-        self.memory.load(self.program_start, &self.program);
+            .write_word(cpu::RESET_VECTOR, self.program_start); // TODO: Include in the program
+        self.memory.load(0x0000, &self.program);
 
         self.cpu = Cpu::new();
         self.cpu.reset();