6502/mre-mos6502
1
0
Fork 0
mirror of https://github.com/mre/mos6502.git synced 2024-11-25 02:33:26 +00:00
Code Issues Projects Releases Wiki Activity

properly inc PC

Browse Source
This commit is contained in:
Alex Weisberger 2014-10-01 18:38:07 -04:00
parent f590b2d90c
commit 3e2fecec8f
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/bin/main.rs
View File

@ -34,7 +34,8 @@ fn main() {
let mut machine = machine::Machine::new(); let mut machine = machine::Machine::new();
// "Load" a program // "Load" a program
machine.memory.set_byte(&Address(0), 5); machine.memory.set_byte(&Address(0), 0x69); // ADC immediate opcode
machine.memory.set_byte(&Address(1), 0x07); // Immediate operand
// Obviously this will run the full program, just // Obviously this will run the full program, just

12
src/machine.rs
View File

@ -28,7 +28,7 @@
use address::AddressDiff; use address::AddressDiff;
use std::fmt; use std::fmt;
use instruction::Instruction; use instruction::Instruction;
use instruction::ADC; use instruction::{ADC, NOP};
use memory::Memory; use memory::Memory;
use registers::{ Registers, Status, StatusArgs }; use registers::{ Registers, Status, StatusArgs };
use registers::{ ps_negative, ps_overflow, ps_zero, ps_carry }; use registers::{ ps_negative, ps_overflow, ps_zero, ps_carry };
@ -55,12 +55,15 @@ impl Machine {
// Will need smarter logic to fetch the correct number of bytes // Will need smarter logic to fetch the correct number of bytes
// for instruction // for instruction
self.registers.program_counter.add(&AddressDiff(1)); self.registers.program_counter = self.registers.program_counter + AddressDiff(1);
instr instr
} }
pub fn decode_instruction(&mut self, raw_instruction: u8) -> Instruction { pub fn decode_instruction(&mut self, raw_instruction: u8) -> Instruction {
ADC match raw_instruction {
0x69 => ADC,
_ => NOP
}
} }
pub fn execute_instruction(&mut self, instruction: Instruction) { pub fn execute_instruction(&mut self, instruction: Instruction) {
@ -68,6 +71,9 @@ impl Machine {
ADC => { ADC => {
println!("executing add with carry"); println!("executing add with carry");
self.add_with_carry(1); self.add_with_carry(1);
},
NOP => {
println!("nop instr");
} }
_ => println!("attempting to execute unimplemented instruction") _ => println!("attempting to execute unimplemented instruction")
}; };