Macintosh-Tools/moa
1
0
Fork 0
mirror of https://github.com/transistorfet/moa.git synced 2024-06-28 07:29:28 +00:00
Code Issues Projects Releases Wiki Activity

Split the Z80 instructions into individual functions like the m68k

Browse Source
This commit is contained in:
transistor 2023-05-14 15:49:38 -07:00
parent 7e62a2691c
commit aaa7952dd0
10 changed files with 1016 additions and 777 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
emulator/cpus/z80/src/debugger.rs
View File

@ -3,6 +3,7 @@ use moa_core::{System, Error, Address, Debuggable};
use crate::state::Z80;
use crate::decode::Z80Decoder;
use crate::instructions::Register;
#[derive(Clone, Default)]
@ -47,7 +48,6 @@ impl Debuggable for Z80 {
fn execute_command(&mut self, _system: &System, args: &[&str]) -> Result<bool, Error> {
match args[0] {
"l" => {
use super::state::Register;
self.state.reg[Register::L as usize] = 0x05
},
_ => { return Ok(true); },

175
emulator/cpus/z80/src/decode.rs
View File

@ -1,178 +1,7 @@
use moa_core::{Error, ClockTime, Address, Addressable};
use crate::state::{Register, InterruptMode};
#[derive(Copy, Clone, Debug, PartialEq, Eq)]
pub enum Direction {
ToAcc,
FromAcc,
}
#[derive(Copy, Clone, Debug, PartialEq, Eq)]
pub enum Size {
Byte,
Word,
}
#[derive(Copy, Clone, Debug, PartialEq, Eq)]
pub enum Condition {
NotZero,
Zero,
NotCarry,
Carry,
ParityOdd,
ParityEven,
Positive,
Negative,
}
#[derive(Copy, Clone, Debug, PartialEq, Eq)]
pub enum RegisterPair {
BC,
DE,
HL,
AF,
SP,
IX,
IY,
}
#[derive(Copy, Clone, Debug, PartialEq, Eq)]
pub enum IndexRegister {
IX,
IY,
}
#[derive(Copy, Clone, Debug, PartialEq, Eq)]
pub enum IndexRegisterHalf {
IXH,
IXL,
IYH,
IYL,
}
#[derive(Copy, Clone, Debug, PartialEq, Eq)]
pub enum SpecialRegister {
I,
R,
}
#[derive(Copy, Clone, Debug, PartialEq, Eq)]
pub enum Target {
DirectReg(Register),
DirectRegHalf(IndexRegisterHalf),
IndirectReg(RegisterPair),
IndirectOffset(IndexRegister, i8),
Immediate(u8),
}
#[derive(Copy, Clone, Debug, PartialEq, Eq)]
pub enum LoadTarget {
DirectRegByte(Register),
DirectRegHalfByte(IndexRegisterHalf),
DirectRegWord(RegisterPair),
IndirectRegByte(RegisterPair),
IndirectRegWord(RegisterPair),
IndirectOffsetByte(IndexRegister, i8),
DirectAltRegByte(Register),
IndirectByte(u16),
IndirectWord(u16),
ImmediateByte(u8),
ImmediateWord(u16),
}
pub type UndocumentedCopy = Option<Target>;
#[derive(Clone, Debug, PartialEq, Eq)]
pub enum Instruction {
ADCa(Target),
ADC16(RegisterPair, RegisterPair),
ADDa(Target),
ADD16(RegisterPair, RegisterPair),
AND(Target),
BIT(u8, Target),
CALL(u16),
CALLcc(Condition, u16),
CCF,
CP(Target),
CPD,
CPDR,
CPI,
CPIR,
CPL,
DAA,
DEC16(RegisterPair),
DEC8(Target),
DI,
DJNZ(i8),
EI,
EXX,
EXafaf,
EXhlde,
EXsp(RegisterPair),
HALT,
IM(InterruptMode),
INC16(RegisterPair),
INC8(Target),
IND,
INDR,
INI,
INIR,
INic(Register),
INicz,
INx(u8),
JP(u16),
JPIndirect(RegisterPair),
JPcc(Condition, u16),
JR(i8),
JRcc(Condition, i8),
LD(LoadTarget, LoadTarget),
LDsr(SpecialRegister, Direction),
LDD,
LDDR,
LDI,
LDIR,
NEG,
NOP,
OR(Target),
OTDR,
OTIR,
OUTD,
OUTI,
OUTic(Register),
OUTicz,
OUTx(u8),
POP(RegisterPair),
PUSH(RegisterPair),
RES(u8, Target, UndocumentedCopy),
RET,
RETI,
RETN,
RETcc(Condition),
RL(Target, UndocumentedCopy),
RLA,
RLC(Target, UndocumentedCopy),
RLCA,
RLD,
RR(Target, UndocumentedCopy),
RRA,
RRC(Target, UndocumentedCopy),
RRCA,
RRD,
RST(u8),
SBCa(Target),
SBC16(RegisterPair, RegisterPair),
SCF,
SET(u8, Target, UndocumentedCopy),
SLA(Target, UndocumentedCopy),
SLL(Target, UndocumentedCopy),
SRA(Target, UndocumentedCopy),
SRL(Target, UndocumentedCopy),
SUB(Target),
XOR(Target),
}
use crate::instructions::{Direction, Condition, Register, RegisterPair, IndexRegister, IndexRegisterHalf, SpecialRegister, InterruptMode, Target, LoadTarget, UndocumentedCopy, Instruction};
#[derive(Clone)]
pub struct Z80Decoder {
@ -837,7 +666,7 @@ fn get_condition(cond: u8) -> Condition {
/// Z80 Decode
///
/// Based on an algorithm described in a Romanian book called "Ghidul Programatorului ZX Spectrum"
/// ("The ZX Spectrum Programmer's Guide") via http://www.z80.info/decoding.htm
/// ("The ZX Spectrum Programmer's Guide") via <http://www.z80.info/decoding.htm>
///
/// Instructions are broken up into x, y, and z parts, or alternatively into x, p, q, and z parts
/// +----------------------+

542
emulator/cpus/z80/src/execute.rs
View File

@ -1,8 +1,8 @@
use moa_core::{System, Error, ErrorType, ClockDuration, Address, Steppable, Addressable, Interruptable, Debuggable, Transmutable, read_beu16, write_beu16};
use crate::decode::{Condition, Instruction, LoadTarget, Target, RegisterPair, IndexRegister, SpecialRegister, IndexRegisterHalf, Size, Direction};
use crate::state::{Z80, Status, Flags, Register};
use crate::instructions::{Condition, Instruction, LoadTarget, Target, Register, InterruptMode, RegisterPair, IndexRegister, SpecialRegister, IndexRegisterHalf, Size, Direction, UndocumentedCopy};
use crate::state::{Z80, Status, Flags};
const DEV_NAME: &str = "z80-cpu";
@ -17,7 +17,6 @@ enum RotateType {
Bit9,
}
impl Steppable for Z80 {
fn step(&mut self, system: &System) -> Result<ClockDuration, Error> {
let clocks = if self.reset.get() {
@ -101,7 +100,110 @@ impl Z80 {
pub fn execute_current(&mut self) -> Result<(), Error> {
match self.decoder.instruction {
Instruction::ADCa(target) => {
Instruction::ADCa(target) => self.execute_adca(target),
Instruction::ADC16(dest_pair, src_pair) => self.execute_adc16(dest_pair, src_pair),
Instruction::ADDa(target) => self.execute_adda(target),
Instruction::ADD16(dest_pair, src_pair) => self.execute_add16(dest_pair, src_pair),
Instruction::AND(target) => self.execute_and(target),
Instruction::BIT(bit, target) => self.execute_bit(bit, target),
Instruction::CALL(addr) => self.execute_call(addr),
Instruction::CALLcc(cond, addr) => self.execute_callcc(cond, addr),
Instruction::CCF => self.execute_ccf(),
Instruction::CP(target) => self.execute_cp(target),
//Instruction::CPD => {
//},
//Instruction::CPDR => {
//},
//Instruction::CPI => {
//},
//Instruction::CPIR => {
//},
Instruction::CPL => self.execute_cpl(),
Instruction::DAA => self.execute_daa(),
Instruction::DEC16(regpair) => self.execute_dec16(regpair),
Instruction::DEC8(target) => self.execute_dec8(target),
Instruction::DI => self.execute_di(),
Instruction::DJNZ(offset) => self.execute_djnz(offset),
Instruction::EI => self.execute_ei(),
Instruction::EXX => self.execute_exx(),
Instruction::EXafaf => self.execute_ex_af_af(),
Instruction::EXhlde => self.execute_ex_hl_de(),
Instruction::EXsp(regpair) => self.execute_ex_sp(regpair),
Instruction::HALT => self.execute_halt(),
Instruction::IM(mode) => self.execute_im(mode),
Instruction::INC16(regpair) => self.execute_inc16(regpair),
Instruction::INC8(target) => self.execute_inc8(target),
//Instruction::IND => {
//},
//Instruction::INDR => {
//},
Instruction::INI => self.execute_ini(),
//Instruction::INIR => {
//},
Instruction::INic(reg) => self.execute_inic(reg),
//Instruction::INicz => {
//},
Instruction::INx(n) => self.execute_inx(n),
Instruction::JP(addr) => self.execute_jp(addr),
Instruction::JPIndirect(regpair) => self.execute_jp_indirect(regpair),
Instruction::JPcc(cond, addr) => self.execute_jpcc(cond, addr),
Instruction::JR(offset) => self.execute_jr(offset),
Instruction::JRcc(cond, offset) => self.execute_jrcc(cond, offset),
Instruction::LD(dest, src) => self.execute_ld(dest, src),
Instruction::LDsr(special_reg, dir) => self.execute_ldsr(special_reg, dir),
Instruction::LDD | Instruction::LDDR | Instruction::LDI | Instruction::LDIR => self.execute_ldx(),
Instruction::NEG => self.execute_neg(),
Instruction::NOP => {
Ok(())
},
Instruction::OR(target) => self.execute_or(target),
//Instruction::OTDR => {
//},
//Instruction::OTIR => {
//},
//Instruction::OUTD => {
//},
//Instruction::OUTI => {
//},
Instruction::OUTic(reg) => self.execute_outic(reg),
//Instruction::OUTicz => {
//},
Instruction::OUTx(n) => self.execute_outx(n),
Instruction::POP(regpair) => self.execute_pop(regpair),
Instruction::PUSH(regpair) => self.execute_push(regpair),
Instruction::RES(bit, target, opt_copy) => self.execute_res(bit, target, opt_copy),
Instruction::RET => self.execute_ret(),
Instruction::RETI => self.execute_reti(),
Instruction::RETN => self.execute_retn(),
Instruction::RETcc(cond) => self.execute_retcc(cond),
Instruction::RL(target, opt_copy) => self.execute_rl(target, opt_copy),
Instruction::RLA => self.execute_rla(),
Instruction::RLC(target, opt_copy) => self.execute_rlc(target, opt_copy),
Instruction::RLCA => self.execute_rlca(),
Instruction::RLD => self.execute_rld(),
Instruction::RR(target, opt_copy) => self.execute_rr(target, opt_copy),
Instruction::RRA => self.execute_rra(),
Instruction::RRC(target, opt_copy) => self.execute_rrc(target, opt_copy),
Instruction::RRCA => self.execute_rrca(),
Instruction::RRD => self.execute_rrd(),
Instruction::RST(addr) => self.execute_rst(addr),
Instruction::SBCa(target) => self.execute_sbca(target),
Instruction::SBC16(dest_pair, src_pair) => self.execute_sbc16(dest_pair, src_pair),
Instruction::SCF => self.execute_scf(),
Instruction::SET(bit, target, opt_copy) => self.execute_set(bit, target, opt_copy),
Instruction::SLA(target, opt_copy) => self.execute_sla(target, opt_copy),
Instruction::SLL(target, opt_copy) => self.execute_sll(target, opt_copy),
Instruction::SRA(target, opt_copy) => self.execute_sra(target, opt_copy),
Instruction::SRL(target, opt_copy) => self.execute_srl(target, opt_copy),
Instruction::SUB(target) => self.execute_sub(target),
Instruction::XOR(target) => self.execute_xor(target),
_ => {
Err(Error::new(&format!("{}: unimplemented instruction: {:?}", DEV_NAME, self.decoder.instruction)))
}
}
}
fn execute_adca(&mut self, target: Target) -> Result<(), Error> {
let src = self.get_target_value(target)?;
let acc = self.get_register_value(Register::A);
@ -110,8 +212,10 @@ impl Z80 {
self.set_arithmetic_op_flags(result2 as u16, Size::Byte, false, carry1 | carry2, overflow1 ^ overflow2, half_carry1 | half_carry2);
self.set_register_value(Register::A, result2);
},
Instruction::ADC16(dest_pair, src_pair) => {
Ok(())
}
fn execute_adc16(&mut self, dest_pair: RegisterPair, src_pair: RegisterPair) -> Result<(), Error> {
let src = self.get_register_pair_value(src_pair);
let dest = self.get_register_pair_value(dest_pair);
@ -120,8 +224,10 @@ impl Z80 {
self.set_arithmetic_op_flags(result2, Size::Word, false, carry1 | carry2, overflow1 ^ overflow2, half_carry1 | half_carry2);
self.set_register_pair_value(dest_pair, result2);
},
Instruction::ADDa(target) => {
Ok(())
}
fn execute_adda(&mut self, target: Target) -> Result<(), Error> {
let src = self.get_target_value(target)?;
let acc = self.get_register_value(Register::A);
@ -129,8 +235,10 @@ impl Z80 {
self.set_arithmetic_op_flags(result as u16, Size::Byte, false, carry, overflow, half_carry);
self.set_register_value(Register::A, result);
},
Instruction::ADD16(dest_pair, src_pair) => {
Ok(())
}
fn execute_add16(&mut self, dest_pair: RegisterPair, src_pair: RegisterPair) -> Result<(), Error> {
let src = self.get_register_pair_value(src_pair);
let dest = self.get_register_pair_value(dest_pair);
@ -140,15 +248,19 @@ impl Z80 {
self.set_flag(Flags::HalfCarry, half_carry);
self.set_register_pair_value(dest_pair, result);
},
Instruction::AND(target) => {
Ok(())
}
fn execute_and(&mut self, target: Target) -> Result<(), Error> {
let acc = self.get_register_value(Register::A);
let value = self.get_target_value(target)?;
let result = acc & value;
self.set_register_value(Register::A, result);
self.set_logic_op_flags(result, false, true);
},
Instruction::BIT(bit, target) => {
Ok(())
}
fn execute_bit(&mut self, bit: u8, target: Target) -> Result<(), Error> {
let value = self.get_target_value(target)?;
let result = value & (1 << bit);
self.set_flag(Flags::Zero, result == 0);
@ -156,44 +268,57 @@ impl Z80 {
self.set_flag(Flags::Parity, result == 0);
self.set_flag(Flags::AddSubtract, false);
self.set_flag(Flags::HalfCarry, true);
},
Instruction::CALL(addr) => {
Ok(())
}
fn execute_call(&mut self, addr: u16) -> Result<(), Error> {
self.push_word(self.decoder.end)?;
self.state.pc = addr;
},
Instruction::CALLcc(cond, addr) => {
Ok(())
}
fn execute_callcc(&mut self, cond: Condition, addr: u16) -> Result<(), Error> {
if self.get_current_condition(cond) {
self.push_word(self.decoder.end)?;
self.state.pc = addr;
}
},
Instruction::CCF => {
Ok(())
}
fn execute_ccf(&mut self) -> Result<(), Error> {
self.set_flag(Flags::AddSubtract, false);
self.set_flag(Flags::HalfCarry, self.get_flag(Flags::Carry));
self.set_flag(Flags::Carry, !self.get_flag(Flags::Carry));
},
Instruction::CP(target) => {
Ok(())
}
fn execute_cp(&mut self, target: Target) -> Result<(), Error> {
let src = self.get_target_value(target)?;
let acc = self.get_register_value(Register::A);
let (result, carry, overflow, half_carry) = sub_bytes(acc, src);
self.set_arithmetic_op_flags(result as u16, Size::Byte, true, carry, overflow, half_carry);
},
Ok(())
}
//Instruction::CPD => {
//},
//}
//Instruction::CPDR => {
//},
//}
//Instruction::CPI => {
//},
//}
//Instruction::CPIR => {
//},
Instruction::CPL => {
//}
fn execute_cpl(&mut self) -> Result<(), Error> {
let value = self.get_register_value(Register::A);
self.set_register_value(Register::A, !value);
self.set_flag(Flags::HalfCarry, true);
self.set_flag(Flags::AddSubtract, true);
},
Instruction::DAA => {
Ok(())
}
fn execute_daa(&mut self) -> Result<(), Error> {
// From <http://z80-heaven.wikidot.com/instructions-set:daa>
// if the least significant four bits of A contain a non-BCD digit (i. e. it is
// greater than 9) or the H flag is set, then $06 is added to the register. Then
@ -235,15 +360,19 @@ impl Z80 {
self.set_parity_flags(value);
self.set_flag(Flags::HalfCarry, half_carry);
self.set_flag(Flags::Carry, carry);
},
Instruction::DEC16(regpair) => {
Ok(())
}
fn execute_dec16(&mut self, regpair: RegisterPair) -> Result<(), Error> {
let value = self.get_register_pair_value(regpair);
let (result, _, _, _) = sub_words(value, 1);
self.set_register_pair_value(regpair, result);
},
Instruction::DEC8(target) => {
Ok(())
}
fn execute_dec8(&mut self, target: Target) -> Result<(), Error> {
let value = self.get_target_value(target)?;
let (result, _, overflow, half_carry) = sub_bytes(value, 1);
@ -251,12 +380,16 @@ impl Z80 {
self.set_arithmetic_op_flags(result as u16, Size::Byte, true, carry, overflow, half_carry);
self.set_target_value(target, result)?;
},
Instruction::DI => {
Ok(())
}
fn execute_di(&mut self) -> Result<(), Error> {
self.state.iff1 = false;
self.state.iff2 = false;
},
Instruction::DJNZ(offset) => {
Ok(())
}
fn execute_djnz(&mut self, offset: i8) -> Result<(), Error> {
let value = self.get_register_value(Register::B);
let result = value.wrapping_sub(1);
self.set_register_value(Register::B, result);
@ -264,52 +397,70 @@ impl Z80 {
if result != 0 {
self.state.pc = self.state.pc.wrapping_add_signed(offset as i16);
}
},
Instruction::EI => {
Ok(())
}
fn execute_ei(&mut self) -> Result<(), Error> {
self.state.iff1 = true;
self.state.iff2 = true;
},
Instruction::EXX => {
Ok(())
}
fn execute_exx(&mut self) -> Result<(), Error> {
for i in 0..6 {
let (normal, shadow) = (self.state.reg[i], self.state.shadow_reg[i]);
self.state.reg[i] = shadow;
self.state.shadow_reg[i] = normal;
}
},
Instruction::EXafaf => {
Ok(())
}
fn execute_ex_af_af(&mut self) -> Result<(), Error> {
for i in 6..8 {
let (normal, shadow) = (self.state.reg[i], self.state.shadow_reg[i]);
self.state.reg[i] = shadow;
self.state.shadow_reg[i] = normal;
}
},
Instruction::EXhlde => {
Ok(())
}
fn execute_ex_hl_de(&mut self) -> Result<(), Error> {
let (hl, de) = (self.get_register_pair_value(RegisterPair::HL), self.get_register_pair_value(RegisterPair::DE));
self.set_register_pair_value(RegisterPair::DE, hl);
self.set_register_pair_value(RegisterPair::HL, de);
},
Instruction::EXsp(regpair) => {
Ok(())
}
fn execute_ex_sp(&mut self, regpair: RegisterPair) -> Result<(), Error> {
let reg_value = self.get_register_pair_value(regpair);
let sp = self.get_register_pair_value(RegisterPair::SP);
let sp_value = self.read_port_u16(sp)?;
self.set_register_pair_value(regpair, sp_value);
self.write_port_u16(sp, reg_value)?;
},
Instruction::HALT => {
Ok(())
}
fn execute_halt(&mut self) -> Result<(), Error> {
self.state.status = Status::Halted;
self.state.pc -= 1;
},
Instruction::IM(mode) => {
Ok(())
}
fn execute_im(&mut self, mode: InterruptMode) -> Result<(), Error> {
self.state.im = mode;
},
Instruction::INC16(regpair) => {
Ok(())
}
fn execute_inc16(&mut self, regpair: RegisterPair) -> Result<(), Error> {
let value = self.get_register_pair_value(regpair);
let (result, _, _, _) = add_words(value, 1);
self.set_register_pair_value(regpair, result);
},
Instruction::INC8(target) => {
Ok(())
}
fn execute_inc8(&mut self, target: Target) -> Result<(), Error> {
let value = self.get_target_value(target)?;
let (result, _, overflow, half_carry) = add_bytes(value, 1);
@ -317,12 +468,15 @@ impl Z80 {
self.set_arithmetic_op_flags(result as u16, Size::Byte, false, carry, overflow, half_carry);
self.set_target_value(target, result)?;
},
Ok(())
}
//Instruction::IND => {
//},
//Instruction::INDR => {
//},
Instruction::INI => {
//}
fn execute_ini(&mut self) -> Result<(), Error> {
let b = self.get_register_value(Register::B);
let c = self.get_register_value(Register::C);
let value = self.get_ioport_value(b, c)?;
@ -332,10 +486,13 @@ impl Z80 {
self.set_register_pair_value(RegisterPair::HL, hl);
let b = self.get_register_value(Register::B).wrapping_sub(1);
self.set_register_value(Register::B, b);
},
Ok(())
}
//Instruction::INIR => {
//},
Instruction::INic(reg) => {
//}
fn execute_inic(&mut self, reg: Register) -> Result<(), Error> {
let b = self.get_register_value(Register::B);
let c = self.get_register_value(Register::C);
let value = self.get_ioport_value(b, c)?;
@ -345,39 +502,56 @@ impl Z80 {
self.set_parity_flags(value);
self.set_flag(Flags::HalfCarry, false);
self.set_flag(Flags::AddSubtract, false);
},
Ok(())
}
//Instruction::INicz => {
//},
Instruction::INx(n) => {
//}
fn execute_inx(&mut self, n: u8) -> Result<(), Error> {
let a = self.get_register_value(Register::A);
let value = self.get_ioport_value(a, n)?;
self.set_register_value(Register::A, value);
},
Instruction::JP(addr) => {
Ok(())
}
fn execute_jp(&mut self, addr: u16) -> Result<(), Error> {
self.state.pc = addr;
},
Instruction::JPIndirect(regpair) => {
Ok(())
}
fn execute_jp_indirect(&mut self, regpair: RegisterPair) -> Result<(), Error> {
let value = self.get_register_pair_value(regpair);
self.state.pc = value;
},
Instruction::JPcc(cond, addr) => {
Ok(())
}
fn execute_jpcc(&mut self, cond: Condition, addr: u16) -> Result<(), Error> {
if self.get_current_condition(cond) {
self.state.pc = addr;
}
},
Instruction::JR(offset) => {
Ok(())
}
fn execute_jr(&mut self, offset: i8) -> Result<(), Error> {
self.state.pc = self.state.pc.wrapping_add_signed(offset as i16);
},
Instruction::JRcc(cond, offset) => {
Ok(())
}
fn execute_jrcc(&mut self, cond: Condition, offset: i8) -> Result<(), Error> {
if self.get_current_condition(cond) {
self.state.pc = self.state.pc.wrapping_add_signed(offset as i16);
}
},
Instruction::LD(dest, src) => {
Ok(())
}
fn execute_ld(&mut self, dest: LoadTarget, src: LoadTarget) -> Result<(), Error> {
let src_value = self.get_load_target_value(src)?;
self.set_load_target_value(dest, src_value)?;
},
Instruction::LDsr(special_reg, dir) => {
Ok(())
}
fn execute_ldsr(&mut self, special_reg: SpecialRegister, dir: Direction) -> Result<(), Error> {
let addr = match special_reg {
SpecialRegister::I => &mut self.state.i,
SpecialRegister::R => &mut self.state.r,
@ -397,8 +571,10 @@ impl Z80 {
},
}
Ok(())
}
Instruction::LDD | Instruction::LDDR | Instruction::LDI | Instruction::LDIR => {
fn execute_ldx(&mut self) -> Result<(), Error> {
let diff = if self.decoder.instruction == Instruction::LDI || self.decoder.instruction == Instruction::LDIR {
1
} else {
@ -419,23 +595,28 @@ impl Z80 {
{
self.state.pc -= 2;
}
},
Instruction::NEG => {
Ok(())
}
fn execute_neg(&mut self) -> Result<(), Error> {
let acc = self.get_register_value(Register::A);
let (result, carry, overflow, half_carry) = sub_bytes(0, acc);
self.set_arithmetic_op_flags(result as u16, Size::Byte, true, carry, overflow, half_carry);
self.set_register_value(Register::A, result);
},
Instruction::NOP => { },
Instruction::OR(target) => {
Ok(())
}
fn execute_or(&mut self, target: Target) -> Result<(), Error> {
let acc = self.get_register_value(Register::A);
let value = self.get_target_value(target)?;
let result = acc | value;
self.set_register_value(Register::A, result);
self.set_logic_op_flags(result, false, false);
},
Ok(())
}
//Instruction::OTDR => {
//},
//Instruction::OTIR => {
@ -443,53 +624,73 @@ impl Z80 {
//Instruction::OUTD => {
//},
//Instruction::OUTI => {
//},
Instruction::OUTic(reg) => {
//}
fn execute_outic(&mut self, reg: Register) -> Result<(), Error> {
let b = self.get_register_value(Register::B);
let c = self.get_register_value(Register::C);
let value = self.get_register_value(reg);
self.set_ioport_value(b, c, value)?;
},
Ok(())
}
//Instruction::OUTicz => {
//},
Instruction::OUTx(n) => {
//}
fn execute_outx(&mut self, n: u8) -> Result<(), Error> {
let a = self.get_register_value(Register::A);
let value = self.get_register_value(Register::A);
self.set_ioport_value(a, n, value)?;
},
Instruction::POP(regpair) => {
Ok(())
}
fn execute_pop(&mut self, regpair: RegisterPair) -> Result<(), Error> {
let value = self.pop_word()?;
self.set_register_pair_value(regpair, value);
},
Instruction::PUSH(regpair) => {
Ok(())
}
fn execute_push(&mut self, regpair: RegisterPair) -> Result<(), Error> {
let value = self.get_register_pair_value(regpair);
self.push_word(value)?;
},
Instruction::RES(bit, target, opt_copy) => {
Ok(())
}
fn execute_res(&mut self, bit: u8, target: Target, opt_copy: UndocumentedCopy) -> Result<(), Error> {
let mut value = self.get_target_value(target)?;
value &= !(1 << bit);
self.set_target_value(target, value)?;
if let Some(target) = opt_copy {
self.set_target_value(target, value)?;
}
},
Instruction::RET => {
Ok(())
}
fn execute_ret(&mut self) -> Result<(), Error> {
self.state.pc = self.pop_word()?;
},
Instruction::RETI => {
Ok(())
}
fn execute_reti(&mut self) -> Result<(), Error> {
self.state.pc = self.pop_word()?;
self.state.iff1 = self.state.iff2;
},
Instruction::RETN => {
Ok(())
}
fn execute_retn(&mut self) -> Result<(), Error> {
self.state.pc = self.pop_word()?;
self.state.iff1 = self.state.iff2;
},
Instruction::RETcc(cond) => {
Ok(())
}
fn execute_retcc(&mut self, cond: Condition) -> Result<(), Error> {
if self.get_current_condition(cond) {
self.state.pc = self.pop_word()?;
}
},
Instruction::RL(target, opt_copy) => {
Ok(())
}
fn execute_rl(&mut self, target: Target, opt_copy: UndocumentedCopy) -> Result<(), Error> {
let value = self.get_target_value(target)?;
let (result, out_bit) = self.rotate_left(value, RotateType::Bit9);
self.set_logic_op_flags(result, out_bit, false);
@ -497,16 +698,20 @@ impl Z80 {
if let Some(target) = opt_copy {
self.set_target_value(target, value)?;
}
},
Instruction::RLA => {
Ok(())
}
fn execute_rla(&mut self) -> Result<(), Error> {
let value = self.get_register_value(Register::A);
let (result, out_bit) = self.rotate_left(value, RotateType::Bit9);
self.set_flag(Flags::AddSubtract, false);
self.set_flag(Flags::HalfCarry, false);
self.set_flag(Flags::Carry, out_bit);
self.set_register_value(Register::A, result);
},
Instruction::RLC(target, opt_copy) => {
Ok(())
}
fn execute_rlc(&mut self, target: Target, opt_copy: UndocumentedCopy) -> Result<(), Error> {
let value = self.get_target_value(target)?;
let (result, out_bit) = self.rotate_left(value, RotateType::Bit8);
self.set_logic_op_flags(result, out_bit, false);
@ -514,16 +719,20 @@ impl Z80 {
if let Some(target) = opt_copy {
self.set_target_value(target, value)?;
}
},
Instruction::RLCA => {
Ok(())
}
fn execute_rlca(&mut self) -> Result<(), Error> {
let value = self.get_register_value(Register::A);
let (result, out_bit) = self.rotate_left(value, RotateType::Bit8);
self.set_flag(Flags::AddSubtract, false);
self.set_flag(Flags::HalfCarry, false);
self.set_flag(Flags::Carry, out_bit);
self.set_register_value(Register::A, result);
},
Instruction::RLD => {
Ok(())
}
fn execute_rld(&mut self) -> Result<(), Error> {
let a = self.get_register_value(Register::A);
let mem = self.get_load_target_value(LoadTarget::IndirectRegByte(RegisterPair::HL))? as u8;
@ -538,8 +747,10 @@ impl Z80 {
self.set_parity_flags(a);
self.set_flag(Flags::HalfCarry, false);
self.set_flag(Flags::AddSubtract, false);
},
Instruction::RR(target, opt_copy) => {
Ok(())
}
fn execute_rr(&mut self, target: Target, opt_copy: UndocumentedCopy) -> Result<(), Error> {
let value = self.get_target_value(target)?;
let (result, out_bit) = self.rotate_right(value, RotateType::Bit9);
self.set_logic_op_flags(result, out_bit, false);
@ -547,16 +758,20 @@ impl Z80 {
if let Some(target) = opt_copy {
self.set_target_value(target, value)?;
}
},
Instruction::RRA => {
Ok(())
}
fn execute_rra(&mut self) -> Result<(), Error> {
let value = self.get_register_value(Register::A);
let (result, out_bit) = self.rotate_right(value, RotateType::Bit9);
self.set_flag(Flags::AddSubtract, false);
self.set_flag(Flags::HalfCarry, false);
self.set_flag(Flags::Carry, out_bit);
self.set_register_value(Register::A, result);
},
Instruction::RRC(target, opt_copy) => {
Ok(())
}
fn execute_rrc(&mut self, target: Target, opt_copy: UndocumentedCopy) -> Result<(), Error> {
let value = self.get_target_value(target)?;
let (result, out_bit) = self.rotate_right(value, RotateType::Bit8);
self.set_logic_op_flags(result, out_bit, false);
@ -564,16 +779,20 @@ impl Z80 {
if let Some(target) = opt_copy {
self.set_target_value(target, value)?;
}
},
Instruction::RRCA => {
Ok(())
}
fn execute_rrca(&mut self) -> Result<(), Error> {
let value = self.get_register_value(Register::A);
let (result, out_bit) = self.rotate_right(value, RotateType::Bit8);
self.set_flag(Flags::AddSubtract, false);
self.set_flag(Flags::HalfCarry, false);
self.set_flag(Flags::Carry, out_bit);
self.set_register_value(Register::A, result);
},
Instruction::RRD => {
Ok(())
}
fn execute_rrd(&mut self) -> Result<(), Error> {
let a = self.get_register_value(Register::A);
let mem = self.get_load_target_value(LoadTarget::IndirectRegByte(RegisterPair::HL))? as u8;
@ -588,12 +807,16 @@ impl Z80 {
self.set_parity_flags(a);
self.set_flag(Flags::HalfCarry, false);
self.set_flag(Flags::AddSubtract, false);
},
Instruction::RST(addr) => {
Ok(())
}
fn execute_rst(&mut self, addr: u8) -> Result<(), Error> {
self.push_word(self.decoder.end)?;
self.state.pc = addr as u16;
},
Instruction::SBCa(target) => {
Ok(())
}
fn execute_sbca(&mut self, target: Target) -> Result<(), Error> {
let src = self.get_target_value(target)?;
let acc = self.get_register_value(Register::A);
@ -602,8 +825,10 @@ impl Z80 {
self.set_arithmetic_op_flags(result2 as u16, Size::Byte, true, carry1 | carry2, overflow1 ^ overflow2, half_carry1 | half_carry2);
self.set_register_value(Register::A, result2);
},
Instruction::SBC16(dest_pair, src_pair) => {
Ok(())
}
fn execute_sbc16(&mut self, dest_pair: RegisterPair, src_pair: RegisterPair) -> Result<(), Error> {
let src = self.get_register_pair_value(src_pair);
let dest = self.get_register_pair_value(dest_pair);
@ -612,21 +837,27 @@ impl Z80 {
self.set_arithmetic_op_flags(result2, Size::Word, true, carry1 | carry2, overflow1 ^ overflow2, half_carry1 | half_carry2);
self.set_register_pair_value(dest_pair, result2);
},
Instruction::SCF => {
Ok(())
}
fn execute_scf(&mut self) -> Result<(), Error> {
self.set_flag(Flags::AddSubtract, false);
self.set_flag(Flags::HalfCarry, false);
self.set_flag(Flags::Carry, true);
},
Instruction::SET(bit, target, opt_copy) => {
Ok(())
}
fn execute_set(&mut self, bit: u8, target: Target, opt_copy: UndocumentedCopy) -> Result<(), Error> {
let mut value = self.get_target_value(target)?;
value |= 1 << bit;
self.set_target_value(target, value)?;
if let Some(target) = opt_copy {
self.set_target_value(target, value)?;
}
},
Instruction::SLA(target, opt_copy) => {
Ok(())
}
fn execute_sla(&mut self, target: Target, opt_copy: UndocumentedCopy) -> Result<(), Error> {
let value = self.get_target_value(target)?;
let out_bit = get_msb(value as u16, Size::Byte);
let result = value << 1;
@ -635,8 +866,10 @@ impl Z80 {
if let Some(target) = opt_copy {
self.set_target_value(target, value)?;
}
},
Instruction::SLL(target, opt_copy) => {
Ok(())
}
fn execute_sll(&mut self, target: Target, opt_copy: UndocumentedCopy) -> Result<(), Error> {
let value = self.get_target_value(target)?;
let out_bit = get_msb(value as u16, Size::Byte);
let result = (value << 1) | 0x01;
@ -645,8 +878,10 @@ impl Z80 {
if let Some(target) = opt_copy {
self.set_target_value(target, value)?;
}
},
Instruction::SRA(target, opt_copy) => {
Ok(())
}
fn execute_sra(&mut self, target: Target, opt_copy: UndocumentedCopy) -> Result<(), Error> {
let value = self.get_target_value(target)?;
let out_bit = (value & 0x01) != 0;
let msb_mask = if get_msb(value as u16, Size::Byte) { 0x80 } else { 0 };
@ -656,8 +891,10 @@ impl Z80 {
if let Some(target) = opt_copy {
self.set_target_value(target, value)?;
}
},
Instruction::SRL(target, opt_copy) => {
Ok(())
}
fn execute_srl(&mut self, target: Target, opt_copy: UndocumentedCopy) -> Result<(), Error> {
let value = self.get_target_value(target)?;
let out_bit = (value & 0x01) != 0;
let result = value >> 1;
@ -666,8 +903,10 @@ impl Z80 {
if let Some(target) = opt_copy {
self.set_target_value(target, value)?;
}
},
Instruction::SUB(target) => {
Ok(())
}
fn execute_sub(&mut self, target: Target) -> Result<(), Error> {
let src = self.get_target_value(target)?;
let acc = self.get_register_value(Register::A);
@ -675,22 +914,19 @@ impl Z80 {
self.set_arithmetic_op_flags(result as u16, Size::Byte, true, carry, overflow, half_carry);
self.set_register_value(Register::A, result);
},
Instruction::XOR(target) => {
Ok(())
}
fn execute_xor(&mut self, target: Target) -> Result<(), Error> {
let acc = self.get_register_value(Register::A);
let value = self.get_target_value(target)?;
let result = acc ^ value;
self.set_register_value(Register::A, result);
self.set_logic_op_flags(result, false, false);
},
_ => {
return Err(Error::new(&format!("{}: unimplemented instruction: {:?}", DEV_NAME, self.decoder.instruction)));
}
}
Ok(())
}
fn rotate_left(&mut self, mut value: u8, rtype: RotateType) -> (u8, bool) {
let out_bit = get_msb(value as u16, Size::Byte);

204
emulator/cpus/z80/src/instructions.rs Normal file
View File

@ -0,0 +1,204 @@
#[derive(Copy, Clone, Debug, PartialEq, Eq)]
pub enum Direction {
ToAcc,
FromAcc,
}
#[derive(Copy, Clone, Debug, PartialEq, Eq)]
pub enum Size {
Byte,
Word,
}
#[derive(Copy, Clone, Debug, PartialEq, Eq)]
pub enum Condition {
NotZero,
Zero,
NotCarry,
Carry,
ParityOdd,
ParityEven,
Positive,
Negative,
}
#[repr(u8)]
#[derive(Copy, Clone, Debug, PartialEq, Eq)]
pub enum Register {
B = 0,
C = 1,
D = 2,
E = 3,
H = 4,
L = 5,
A = 6,
F = 7,
}
#[derive(Copy, Clone, Debug, PartialEq, Eq)]
pub enum RegisterPair {
BC,
DE,
HL,
AF,
SP,
IX,
IY,
}
#[derive(Copy, Clone, Debug, PartialEq, Eq)]
pub enum IndexRegister {
IX,
IY,
}
#[derive(Copy, Clone, Debug, PartialEq, Eq)]
pub enum IndexRegisterHalf {
IXH,
IXL,
IYH,
IYL,
}
#[derive(Copy, Clone, Debug, PartialEq, Eq)]
pub enum SpecialRegister {
I,
R,
}
#[derive(Copy, Clone, Debug, PartialEq, Eq)]
pub enum InterruptMode {
Mode0,
Mode1,
Mode2,
Unknown(u8),
}
#[derive(Copy, Clone, Debug, PartialEq, Eq)]
pub enum Target {
DirectReg(Register),
DirectRegHalf(IndexRegisterHalf),
IndirectReg(RegisterPair),
IndirectOffset(IndexRegister, i8),
Immediate(u8),
}
#[derive(Copy, Clone, Debug, PartialEq, Eq)]
pub enum LoadTarget {
DirectRegByte(Register),
DirectRegHalfByte(IndexRegisterHalf),
DirectRegWord(RegisterPair),
IndirectRegByte(RegisterPair),
IndirectRegWord(RegisterPair),
IndirectOffsetByte(IndexRegister, i8),
DirectAltRegByte(Register),
IndirectByte(u16),
IndirectWord(u16),
ImmediateByte(u8),
ImmediateWord(u16),
}
pub type UndocumentedCopy = Option<Target>;
#[derive(Clone, Debug, PartialEq, Eq)]
pub enum Instruction {
ADCa(Target),
ADC16(RegisterPair, RegisterPair),
ADDa(Target),
ADD16(RegisterPair, RegisterPair),
AND(Target),
BIT(u8, Target),
CALL(u16),
CALLcc(Condition, u16),
CCF,
CP(Target),
CPD,
CPDR,
CPI,
CPIR,
CPL,
DAA,
DEC16(RegisterPair),
DEC8(Target),
DI,
DJNZ(i8),
EI,
EXX,
EXafaf,
EXhlde,
EXsp(RegisterPair),
HALT,
IM(InterruptMode),
INC16(RegisterPair),
INC8(Target),
IND,
INDR,
INI,
INIR,
INic(Register),
INicz,
INx(u8),
JP(u16),
JPIndirect(RegisterPair),
JPcc(Condition, u16),
JR(i8),
JRcc(Condition, i8),
LD(LoadTarget, LoadTarget),
LDsr(SpecialRegister, Direction),
LDD,
LDDR,
LDI,
LDIR,
NEG,
NOP,
OR(Target),
OTDR,
OTIR,
OUTD,
OUTI,
OUTic(Register),
OUTicz,
OUTx(u8),
POP(RegisterPair),
PUSH(RegisterPair),
RES(u8, Target, UndocumentedCopy),
RET,
RETI,
RETN,
RETcc(Condition),
RL(Target, UndocumentedCopy),
RLA,
RLC(Target, UndocumentedCopy),
RLCA,
RLD,
RR(Target, UndocumentedCopy),
RRA,
RRC(Target, UndocumentedCopy),
RRCA,
RRD,
RST(u8),
SBCa(Target),
SBC16(RegisterPair, RegisterPair),
SCF,
SET(u8, Target, UndocumentedCopy),
SLA(Target, UndocumentedCopy),
SLL(Target, UndocumentedCopy),
SRA(Target, UndocumentedCopy),
SRL(Target, UndocumentedCopy),
SUB(Target),
XOR(Target),
}
impl From<u8> for InterruptMode {
fn from(im: u8) -> Self {
match im {
0 => InterruptMode::Mode0,
1 => InterruptMode::Mode1,
2 => InterruptMode::Mode2,
_ => InterruptMode::Unknown(im),
}
}
}

2
emulator/cpus/z80/src/lib.rs
View File

@ -3,7 +3,7 @@ pub mod state;
pub mod decode;
pub mod execute;
pub mod debugger;
pub mod instructions;
pub use self::state::{Z80, Z80Type};
pub use self::state::InterruptMode;

35
emulator/cpus/z80/src/state.rs
View File

@ -3,6 +3,7 @@ use moa_core::{ClockTime, Address, BusPort, Signal, Frequency};
use crate::decode::Z80Decoder;
use crate::debugger::Z80Debugger;
use crate::instructions::{Register, InterruptMode};
#[allow(dead_code)]
@ -18,26 +19,6 @@ pub enum Status {
Halted,
}
#[derive(Copy, Clone, Debug, PartialEq, Eq)]
pub enum InterruptMode {
Mode0,
Mode1,
Mode2,
Unknown(u8),
}
impl From<u8> for InterruptMode {
fn from(im: u8) -> Self {
match im {
0 => InterruptMode::Mode0,
1 => InterruptMode::Mode1,
2 => InterruptMode::Mode2,
_ => InterruptMode::Unknown(im),
}
}
}
#[repr(u8)]
#[allow(dead_code)]
#[derive(Copy, Clone, Debug, PartialEq, Eq)]
@ -52,20 +33,6 @@ pub enum Flags {
Sign = 0x80,
}
#[repr(u8)]
#[derive(Copy, Clone, Debug, PartialEq, Eq)]
pub enum Register {
B = 0,
C = 1,
D = 2,
E = 3,
H = 4,
L = 5,
A = 6,
F = 7,
}
#[derive(Clone, Debug, PartialEq, Eq)]
pub struct Z80State {
pub status: Status,

3
emulator/cpus/z80/tests/decode_tests.rs
View File

@ -2,8 +2,7 @@
use moa_core::{System, MemoryBlock, BusPort, Frequency, Address, Addressable, wrap_transmutable};
use moa_z80::{Z80, Z80Type};
use moa_z80::state::Register;
use moa_z80::decode::{Instruction, LoadTarget, Target, RegisterPair, IndexRegister, IndexRegisterHalf};
use moa_z80::instructions::{Instruction, LoadTarget, Target, Register, RegisterPair, IndexRegister, IndexRegisterHalf};
fn init_decode_test() -> (Z80, System) {
let mut system = System::default();

7
emulator/cpus/z80/tests/execute_tests.rs
View File

@ -2,8 +2,8 @@
use moa_core::{System, MemoryBlock, BusPort, Frequency, Address, Addressable, wrap_transmutable};
use moa_z80::{Z80, Z80Type};
use moa_z80::state::{Z80State, Register};
use moa_z80::decode::{Instruction, LoadTarget, Target, RegisterPair, Condition};
use moa_z80::state::Z80State;
use moa_z80::instructions::{Instruction, LoadTarget, Target, Register, RegisterPair, Condition};
struct TestState {
pc: u16,
@ -535,6 +535,9 @@ fn run_test(case: &TestCase) {
// TODO this is a hack to ignore the functioning of the F5, F3 flags for now
cpu.state.reg[Register::F as usize] &= 0xD7;
expected_state.reg[Register::F as usize] &= 0xD7;
// TODO this is a hack to ignore the refresh register, even though it probably works
cpu.state.r = 0;
expected_state.r = 0;
assert_eq!(cpu.state, expected_state);
}

8
tests/rad_tests/latest.txt
View File

@ -1,4 +1,4 @@
Last run on 2023-05-13 at commit 5ec2fe41578e06279419b35826bb4b575bc14c09
Last run on 2023-05-14 at commit 7e62a2691c552f3a628ac18b3eaba2a45265abde
00.json completed, all passed!
01.json completed, all passed!
@ -41,7 +41,7 @@ Last run on 2023-05-13 at commit 5ec2fe41578e06279419b35826bb4b575bc14c09
24.json completed, all passed!
25.json completed, all passed!
26.json completed, all passed!
27.json completed: 396 passed, 604 FAILED
27.json completed: 547 passed, 453 FAILED
28.json completed, all passed!
29.json completed, all passed!
2a.json completed, all passed!
@ -579,7 +579,7 @@ ed 7e.json completed, all passed!
ed 7f.json completed, all passed!
ed a0.json completed, all passed!
ed a1.json completed: 0 passed, 1000 FAILED
ed a2.json completed: 0 passed, 1000 FAILED
ed a2.json completed: 13 passed, 987 FAILED
ed a3.json completed: 0 passed, 1000 FAILED
ed a8.json completed, all passed!
ed a9.json completed: 0 passed, 1000 FAILED
@ -643,5 +643,5 @@ fd f9.json completed, all passed!
fe.json completed, all passed!
ff.json completed, all passed!
passed: 629394, failed: 12606, total 98%
passed: 629558, failed: 12442, total 98%
completed in 0m 32s

3
tests/rad_tests/src/main.rs
View File

@ -15,7 +15,8 @@ use serde_derive::Deserialize;
use moa_core::{System, Error, MemoryBlock, Bus, BusPort, Frequency, Address, Addressable, Steppable, wrap_transmutable};
use moa_z80::{Z80, Z80Type, InterruptMode};
use moa_z80::{Z80, Z80Type};
use moa_z80::instructions::InterruptMode;
use moa_z80::state::Flags;
use moa_z80::state::Status;