6502/CLK
1
0
Fork 0
mirror of https://github.com/TomHarte/CLK.git synced 2025-02-21 20:29:06 +00:00
Code Issues Projects Releases Wiki Activity

Mental delusion lifted: JSR doesn't look enough like BSR.

Browse Source
This commit is contained in:
Thomas Harte 2019-04-17 10:02:14 -04:00
parent b64da2710a
commit cadc0bd509
3 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Processors/68000/Implementation/68000Implementation.hpp
View File

@ -1085,10 +1085,13 @@ template <class T, bool dtack_is_implicit> void Processor<T, dtack_is_implicit>:
} }
} break; } break;
case int(MicroOp::Action::PrepareJSRBSR): case int(MicroOp::Action::PrepareJSR):
// If the lowest byte of the instruction is non-zero then there's no 16-bit offset after it, so the destination_bus_data_[0].full = program_counter_.full;
// return address should be two less. This holds for both a BSR and a JSR as a JSR always has bit address_[7].full -= 4;
// 7 set. effective_address_[1].full = address_[7].full;
break;
case int(MicroOp::Action::PrepareBSR):
destination_bus_data_[0].full = (decoded_instruction_ & 0xff) ? program_counter_.full - 2 : program_counter_.full; destination_bus_data_[0].full = (decoded_instruction_ & 0xff) ? program_counter_.full - 2 : program_counter_.full;
address_[7].full -= 4; address_[7].full -= 4;
effective_address_[1].full = address_[7].full; effective_address_[1].full = address_[7].full;

12
Processors/68000/Implementation/68000Storage.cpp
View File

@ -1125,7 +1125,7 @@ struct ProcessorStorageConstructor {
// This is BSR, which is unconditional and means pushing a return address to the stack first. // This is BSR, which is unconditional and means pushing a return address to the stack first.
// Push the return address to the stack. // Push the return address to the stack.
op(Action::PrepareJSRBSR, seq("n nW+ nw", { ea(1), ea(1) })); op(Action::PrepareBSR, seq("n nW+ nw", { ea(1), ea(1) }));
} }
// This is Bcc. // This is Bcc.
@ -1808,33 +1808,33 @@ struct ProcessorStorageConstructor {
default: continue; default: continue;
case Ind: // JSR (An) case Ind: // JSR (An)
storage_.instructions[instruction].source = &storage_.address_[ea_register]; storage_.instructions[instruction].source = &storage_.address_[ea_register];
op(Action::PrepareJSRBSR); op(Action::PrepareJSR);
op(Action::PerformOperation, seq("np nW+ nw np", { ea(1), ea(1) })); op(Action::PerformOperation, seq("np nW+ nw np", { ea(1), ea(1) }));
break; break;
case d16PC: // JSR (d16, PC) case d16PC: // JSR (d16, PC)
case d16An: // JSR (d16, An) case d16An: // JSR (d16, An)
op(Action::PrepareJSRBSR); op(Action::PrepareJSR);
op(calc_action_for_mode(mode) | MicroOp::SourceMask); op(calc_action_for_mode(mode) | MicroOp::SourceMask);
op(Action::PerformOperation, seq("n np nW+ nw np", { ea(1), ea(1) })); op(Action::PerformOperation, seq("n np nW+ nw np", { ea(1), ea(1) }));
break; break;
case d8PCXn: // JSR (d8, PC, Xn) case d8PCXn: // JSR (d8, PC, Xn)
case d8AnXn: // JSR (d8, An, Xn) case d8AnXn: // JSR (d8, An, Xn)
op(Action::PrepareJSRBSR); op(Action::PrepareJSR);
op(calc_action_for_mode(mode) | MicroOp::SourceMask); op(calc_action_for_mode(mode) | MicroOp::SourceMask);
op(Action::PerformOperation, seq("n nn np nW+ nw np", { ea(1), ea(1) })); op(Action::PerformOperation, seq("n nn np nW+ nw np", { ea(1), ea(1) }));
break; break;
case XXXl: // JSR (xxx).L case XXXl: // JSR (xxx).L
op(Action::None, seq("np")); op(Action::None, seq("np"));
op(Action::PrepareJSRBSR); op(Action::PrepareJSR);
op(address_assemble_for_mode(mode) | MicroOp::SourceMask); op(address_assemble_for_mode(mode) | MicroOp::SourceMask);
op(Action::PerformOperation, seq("n np nW+ nw np", { ea(1), ea(1) })); op(Action::PerformOperation, seq("n np nW+ nw np", { ea(1), ea(1) }));
break; break;
case XXXw: // JSR (xxx).W case XXXw: // JSR (xxx).W
op(Action::PrepareJSRBSR); op(Action::PrepareJSR);
op(address_assemble_for_mode(mode) | MicroOp::SourceMask); op(address_assemble_for_mode(mode) | MicroOp::SourceMask);
op(Action::PerformOperation, seq("n np nW+ nw np", { ea(1), ea(1) })); op(Action::PerformOperation, seq("n np nW+ nw np", { ea(1), ea(1) }));
break; break;

3
Processors/68000/Implementation/68000Storage.hpp
View File

@ -233,7 +233,8 @@ class ProcessorStorage {
// (i) inspects the prefetch queue to determine the length of this instruction and copies the next PC to destination_bus_data_; // (i) inspects the prefetch queue to determine the length of this instruction and copies the next PC to destination_bus_data_;
// (ii) copies the stack pointer minus 4 to effective_address_[1]; // (ii) copies the stack pointer minus 4 to effective_address_[1];
// (iii) decrements the stack pointer by four. // (iii) decrements the stack pointer by four.
PrepareJSRBSR, PrepareJSR,
PrepareBSR,
// (i) copies the stack pointer to effective_address_[0]; // (i) copies the stack pointer to effective_address_[0];
// (ii) increments the stack pointer by four. // (ii) increments the stack pointer by four.