FranLMSP/rmg-001
1
0
Fork 0
mirror of https://github.com/FranLMSP/rmg-001.git synced 2024-09-20 10:10:50 +00:00
Code Issues Projects Releases Wiki Activity

Some refactors on instructions

Browse Source
This commit is contained in:
Franco Colmenarez 2021-10-20 18:16:45 -05:00
parent 09c9ef16aa
commit 758772200f
2 changed files with 70 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/bus.rs
View File

@ -43,7 +43,7 @@ pub struct Bus {
impl Bus { impl Bus {
pub fn new() -> Self { pub fn new() -> Self {
// let game_rom = match ROM::load_file("roms/cpu_instrs_individual/01-special.gb".to_string()) { let game_rom = match ROM::load_file("roms/cpu_instrs_individual/01-special.gb".to_string()) {
// let game_rom = match ROM::load_file("roms/cpu_instrs_individual/03-op sp,hl.gb".to_string()) { // let game_rom = match ROM::load_file("roms/cpu_instrs_individual/03-op sp,hl.gb".to_string()) {
// let game_rom = match ROM::load_file("roms/cpu_instrs_individual/04-op r,imm.gb".to_string()) { // let game_rom = match ROM::load_file("roms/cpu_instrs_individual/04-op r,imm.gb".to_string()) {
// let game_rom = match ROM::load_file("roms/cpu_instrs_individual/05-op rp.gb".to_string()) { // let game_rom = match ROM::load_file("roms/cpu_instrs_individual/05-op rp.gb".to_string()) {
@ -52,7 +52,7 @@ impl Bus {
// let game_rom = match ROM::load_file("roms/cpu_instrs_individual/08-misc instrs.gb".to_string()) { // let game_rom = match ROM::load_file("roms/cpu_instrs_individual/08-misc instrs.gb".to_string()) {
// let game_rom = match ROM::load_file("roms/cpu_instrs_individual/09-op r,r.gb".to_string()) { // let game_rom = match ROM::load_file("roms/cpu_instrs_individual/09-op r,r.gb".to_string()) {
// let game_rom = match ROM::load_file("roms/cpu_instrs_individual/10-bit ops.gb".to_string()) { // let game_rom = match ROM::load_file("roms/cpu_instrs_individual/10-bit ops.gb".to_string()) {
let game_rom = match ROM::load_file("roms/cpu_instrs_individual/11-op a,(hl).gb".to_string()) { // let game_rom = match ROM::load_file("roms/cpu_instrs_individual/11-op a,(hl).gb".to_string()) {
Ok(rom) => rom, Ok(rom) => rom,
_ => ROM::from_bytes(&[0; 0xFFFF]) _ => ROM::from_bytes(&[0; 0xFFFF])
}; };

140
src/cpu.rs
View File

@ -871,7 +871,7 @@ impl CPU {
let program_counter = self.registers.get(Register::PC); let program_counter = self.registers.get(Register::PC);
let parameter_bytes = OpcodeParameterBytes::from_address(program_counter, bus); let parameter_bytes = OpcodeParameterBytes::from_address(program_counter, bus);
let (opcode, cycles) = parameter_bytes.parse_opcode(); let (opcode, cycles) = parameter_bytes.parse_opcode();
self.log(parameter_bytes); // self.log(parameter_bytes);
self.increment_cycles(cycles); self.increment_cycles(cycles);
self.exec(opcode, bus); self.exec(opcode, bus);
self.increment_exec_calls_count(); self.increment_exec_calls_count();
@ -1008,78 +1008,75 @@ impl CPU {
}, },
_ => {}, _ => {},
}, },
Opcode::AND(params) => match params { Opcode::AND(params) => {
OpcodeParameter::Register_Register(reg1, reg2) => { match params {
self.registers.increment(Register::PC, 1); OpcodeParameter::Register_Register(reg1, reg2) => {
if reg2.is_8bit() { self.registers.increment(Register::PC, 1);
self.registers.set(reg1, self.registers.get(reg1) & self.registers.get(reg2)); if reg2.is_8bit() {
} else { self.registers.set(reg1, self.registers.get(reg1) & self.registers.get(reg2));
let val = bus.read(self.registers.get(reg2)) as u16; } else {
self.registers.set(reg1, self.registers.get(reg1) & val); let val = bus.read(self.registers.get(reg2)) as u16;
} self.registers.set(reg1, self.registers.get(reg1) & val);
self.registers.set_flag(FlagRegister::Zero, self.registers.get(reg1) == 0); }
self.registers.set_flag(FlagRegister::Substract, false); self.registers.set_flag(FlagRegister::Zero, self.registers.get(reg1) == 0);
self.registers.set_flag(FlagRegister::HalfCarry, true); },
self.registers.set_flag(FlagRegister::Carry, false); OpcodeParameter::Register_U8(reg, val) => {
}, self.registers.increment(Register::PC, 2);
OpcodeParameter::Register_U8(reg, val) => { self.registers.set(reg, self.registers.get(reg) & (val as u16));
self.registers.increment(Register::PC, 2); self.registers.set_flag(FlagRegister::Zero, self.registers.get(reg) == 0);
self.registers.set(reg, self.registers.get(reg) & (val as u16)); },
self.registers.set_flag(FlagRegister::Zero, self.registers.get(reg) == 0); _ => {},
self.registers.set_flag(FlagRegister::Substract, false); };
self.registers.set_flag(FlagRegister::HalfCarry, true); self.registers.set_flag(FlagRegister::Substract, false);
self.registers.set_flag(FlagRegister::Carry, false); self.registers.set_flag(FlagRegister::HalfCarry, true);
}, self.registers.set_flag(FlagRegister::Carry, false);
_ => {},
}, },
Opcode::OR(params) => match params { Opcode::OR(params) => {
OpcodeParameter::Register_Register(reg1, reg2) => { match params {
self.registers.increment(Register::PC, 1); OpcodeParameter::Register_Register(reg1, reg2) => {
if reg2.is_8bit() { self.registers.increment(Register::PC, 1);
self.registers.set(reg1, self.registers.get(reg1) | self.registers.get(reg2)); if reg2.is_8bit() {
} else { self.registers.set(reg1, self.registers.get(reg1) | self.registers.get(reg2));
let val = bus.read(self.registers.get(reg2)) as u16; } else {
self.registers.set(reg1, self.registers.get(reg1) | val); let val = bus.read(self.registers.get(reg2)) as u16;
} self.registers.set(reg1, self.registers.get(reg1) | val);
self.registers.set_flag(FlagRegister::Zero, self.registers.get(reg1) == 0); }
self.registers.set_flag(FlagRegister::Substract, false); self.registers.set_flag(FlagRegister::Zero, self.registers.get(reg1) == 0);
self.registers.set_flag(FlagRegister::HalfCarry, false); },
self.registers.set_flag(FlagRegister::Carry, false); OpcodeParameter::Register_U8(reg, val) => {
}, self.registers.increment(Register::PC, 2);
OpcodeParameter::Register_U8(reg, val) => { self.registers.set(reg, self.registers.get(reg) | (val as u16));
self.registers.increment(Register::PC, 2); self.registers.set_flag(FlagRegister::Zero, self.registers.get(reg) == 0);
self.registers.set(reg, self.registers.get(reg) | (val as u16)); },
self.registers.set_flag(FlagRegister::Zero, self.registers.get(reg) == 0); _ => {},
self.registers.set_flag(FlagRegister::Substract, false); };
self.registers.set_flag(FlagRegister::HalfCarry, false); self.registers.set_flag(FlagRegister::Substract, false);
self.registers.set_flag(FlagRegister::Carry, false); self.registers.set_flag(FlagRegister::HalfCarry, false);
}, self.registers.set_flag(FlagRegister::Carry, false);
_ => {}, },
Opcode::XOR(params) => {
match params {
OpcodeParameter::Register_Register(reg1, reg2) => {
self.registers.increment(Register::PC, 1);
if reg2.is_8bit() {
self.registers.set(reg1, self.registers.get(reg1) ^ self.registers.get(reg2));
} else {
let val = bus.read(self.registers.get(reg2)) as u16;
self.registers.set(reg1, self.registers.get(reg1) ^ val);
}
self.registers.set_flag(FlagRegister::Zero, self.registers.get(reg1) == 0);
},
OpcodeParameter::Register_U8(reg, val) => {
self.registers.increment(Register::PC, 2);
self.registers.set(reg, self.registers.get(reg) ^ (val as u16));
self.registers.set_flag(FlagRegister::Zero, self.registers.get(reg) == 0);
},
_ => {},
};
self.registers.set_flag(FlagRegister::Substract, false);
self.registers.set_flag(FlagRegister::HalfCarry, false);
self.registers.set_flag(FlagRegister::Carry, false);
}, },
Opcode::XOR(params) => match params {
OpcodeParameter::Register_Register(reg1, reg2) => {
self.registers.increment(Register::PC, 1);
if reg2.is_8bit() {
self.registers.set(reg1, self.registers.get(reg1) ^ self.registers.get(reg2));
} else {
let val = bus.read(self.registers.get(reg2)) as u16;
self.registers.set(reg1, self.registers.get(reg1) ^ val);
}
self.registers.set_flag(FlagRegister::Zero, self.registers.get(reg1) == 0);
self.registers.set_flag(FlagRegister::Substract, false);
self.registers.set_flag(FlagRegister::HalfCarry, false);
self.registers.set_flag(FlagRegister::Carry, false);
},
OpcodeParameter::Register_U8(reg, val) => {
self.registers.increment(Register::PC, 2);
self.registers.set(reg, self.registers.get(reg) ^ (val as u16));
self.registers.set_flag(FlagRegister::Zero, self.registers.get(reg) == 0);
self.registers.set_flag(FlagRegister::Substract, false);
self.registers.set_flag(FlagRegister::HalfCarry, false);
self.registers.set_flag(FlagRegister::Carry, false);
},
_ => {},
}
// Substract without storing the value // Substract without storing the value
Opcode::CP(params) => { Opcode::CP(params) => {
let mut val1: i16 = 0; let mut val1: i16 = 0;
@ -1339,7 +1336,6 @@ impl CPU {
Opcode::DAA => { Opcode::DAA => {
self.registers.increment(Register::PC, 1); self.registers.increment(Register::PC, 1);
let mut val = self.registers.get_8bit(Register::A); let mut val = self.registers.get_8bit(Register::A);
if !self.registers.get_flag(FlagRegister::Substract) { if !self.registers.get_flag(FlagRegister::Substract) {
if self.registers.get_flag(FlagRegister::Carry) || val > 0x99 { if self.registers.get_flag(FlagRegister::Carry) || val > 0x99 {
val = val.wrapping_add(0x60); val = val.wrapping_add(0x60);