6502/CLK
1
0
Fork 0
mirror of https://github.com/TomHarte/CLK.git synced 2024-12-26 09:29:45 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch '68000Mk2' into InMacintosh

Browse Source
This commit is contained in:
Thomas Harte 2022-05-25 08:15:41 -04:00
commit 24f7b5806c
1 changed files with 50 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
Processors/68000Mk2/Implementation/68000Mk2Implementation.hpp
View File

@ -107,6 +107,8 @@ enum ExecutionState: int {
MOVE, MOVE,
MOVE_predec, MOVE_predec,
MOVE_predec_l,
MOVE_prefetch_decode,
MOVE_complete, MOVE_complete,
MOVE_complete_l, MOVE_complete_l,
@ -1581,8 +1583,20 @@ void Processor<BusHandler, dtack_is_implicit, permit_overrun, signal_will_perfor
// so that all that's left is modes that write to memory and then // so that all that's left is modes that write to memory and then
// prefetch. // prefetch.
switch(instruction_.mode(1)) { switch(instruction_.mode(1)) {
case Mode::DataRegisterDirect: {
const uint32_t write_mask = size_masks[int(instruction_.operand_size())];
const int reg = instruction_.reg(1);
registers_[reg].l =
(operand_[1].l & write_mask) |
(registers_[reg].l & ~write_mask);
}
MoveToStateSpecific(MOVE_prefetch_decode);
case Mode::AddressRegisterDirect: case Mode::AddressRegisterDirect:
case Mode::DataRegisterDirect: registers_[8 + instruction_.reg(1)].l = operand_[1].l;
MoveToStateSpecific(MOVE_prefetch_decode);
case Mode::AddressRegisterIndirectWithPredecrement: case Mode::AddressRegisterIndirectWithPredecrement:
MoveToStateSpecific(MOVE_predec); MoveToStateSpecific(MOVE_predec);
@ -1593,11 +1607,43 @@ void Processor<BusHandler, dtack_is_implicit, permit_overrun, signal_will_perfor
post_ea_state_ = MOVE_complete; post_ea_state_ = MOVE_complete;
MoveToStateSpecific(CalcEffectiveAddress); MoveToStateSpecific(CalcEffectiveAddress);
BeginState(MOVE_prefetch_decode):
Prefetch();
MoveToStateSpecific(Decode);
BeginState(MOVE_predec): BeginState(MOVE_predec):
Prefetch(); Prefetch();
next_operand_ = 1;
post_ea_state_ = StoreOperand; SetDataAddress(registers_[8 + instruction_.reg(1)].l);
MoveToStateSpecific(CalcEffectiveAddress); switch(instruction_.operand_size()) {
case InstructionSet::M68k::DataSize::LongWord:
MoveToStateSpecific(MOVE_predec_l);
case InstructionSet::M68k::DataSize::Word:
SetupDataAccess(0, Microcycle::SelectWord);
registers_[8 + instruction_.reg(1)].l -= 2;
break;
case InstructionSet::M68k::DataSize::Byte:
SetupDataAccess(0, Microcycle::SelectByte);
registers_[8 + instruction_.reg(1)].l -=
address_increments[0][instruction_.reg(next_operand_)];
break;
}
SetupDataAccess(0, Microcycle::SelectWord);
SetDataAddress(registers_[8 + instruction_.reg(1)].l);
Access(operand_[1].low);
MoveToStateSpecific(Decode);
BeginState(MOVE_predec_l):
SetupDataAccess(0, Microcycle::SelectWord);
registers_[8 + instruction_.reg(1)].l -= 2;
Access(operand_[1].low);
registers_[8 + instruction_.reg(1)].l -= 2;
Access(operand_[1].high);
MoveToStateSpecific(Decode);
BeginState(MOVE_complete): BeginState(MOVE_complete):
SetDataAddress(effective_address_[1].l); SetDataAddress(effective_address_[1].l);