6502/CLK
1
0
Fork 0
mirror of https://github.com/TomHarte/CLK.git synced 2024-11-26 08:49:37 +00:00
Code Issues Projects Releases Wiki Activity

Implement MOVS, STOS, revealing an issue in the memory handler.

Browse Source
This commit is contained in:
Thomas Harte 2023-10-20 21:46:47 -04:00
parent dab3dcaafb
commit 93e90b09a0
2 changed files with 45 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
InstructionSets/x86/Implementation/PerformImplementation.hpp
View File

@ -1417,6 +1417,38 @@ void lods(const InstructionT &instruction, AddressT &eCX, AddressT &eSI, IntT &e
repeat<AddressT>(instruction, eCX, flow_controller);
}
template <typename IntT, typename AddressT, typename InstructionT, typename MemoryT, typename FlowControllerT>
void movs(const InstructionT &instruction, AddressT &eCX, AddressT &eSI, AddressT &eDI, MemoryT &memory, Status &status, FlowControllerT &flow_controller) {
if(repetition_over<AddressT>(instruction, eCX)) {
return;
}
Source source_segment = instruction.segment_override();
if(source_segment == Source::None) source_segment = Source::DS;
memory.template access<IntT>(Source::ES, eDI) = memory.template access<IntT>(source_segment, eSI);
eSI += status.direction<AddressT>() * sizeof(IntT);
eDI += status.direction<AddressT>() * sizeof(IntT);
repeat<AddressT>(instruction, eCX, flow_controller);
}
template <typename IntT, typename AddressT, typename InstructionT, typename MemoryT, typename FlowControllerT>
void stos(const InstructionT &instruction, AddressT &eCX, AddressT &eDI, IntT &eAX, MemoryT &memory, Status &status, FlowControllerT &flow_controller) {
if(repetition_over<AddressT>(instruction, eCX)) {
return;
}
Source destination_segment = instruction.segment_override();
if(destination_segment == Source::None) destination_segment = Source::DS;
memory.template access<IntT>(destination_segment, eDI) = eAX;
eDI += status.direction<AddressT>() * sizeof(IntT);
repeat<AddressT>(instruction, eCX, flow_controller);
}
}
@ -1664,6 +1696,12 @@ template <
case Operation::LODS:
Primitive::lods<IntT, AddressT>(instruction, eCX(), eSI(), pair_low(), memory, status, flow_controller);
break;
case Operation::MOVS:
Primitive::movs<IntT, AddressT>(instruction, eCX(), eSI(), eDI(), memory, status, flow_controller);
break;
case Operation::STOS:
Primitive::stos<IntT, AddressT>(instruction, eCX(), eDI(), pair_low(), memory, status, flow_controller);
break;
}
// Write to memory if required to complete this operation.

8
OSBindings/Mac/Clock SignalTests/8088Tests.mm
View File

@ -401,13 +401,19 @@ struct FailedExecution {
@"C4.json.gz", // LES
@"8D.json.gz", // LEA
// TODO: MOVS, SCAS, STOS
// TODO: SCAS, INS, OUTS
*/
// MOVS
@"A4.json.gz", @"A5.json.gz",
// CMPS
@"A6.json.gz", @"A7.json.gz",
// LODS
@"AC.json.gz", @"AD.json.gz",
// STOS
@"AA.json.gz", @"AB.json.gz",
/*
@"E0.json.gz", // LOOPNE
@"E1.json.gz", // LOOPE