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

Reduce repetition.

Browse Source
This commit is contained in:
Thomas Harte 2023-10-09 11:49:38 -04:00
parent 5a77f0c93c
commit 769aed10ea
1 changed files with 15 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -34,30 +34,22 @@ uint32_t address(
MemoryT &memory MemoryT &memory
) { ) {
// TODO: non-word indexes and bases. // TODO: non-word indexes and bases.
uint32_t address; if constexpr (source == Source::DirectAddress) {
switch(source) { return instruction.offset();
default: return 0;
case Source::Indirect: {
uint16_t zero = 0;
address = *resolve<model, uint16_t>(instruction, pointer.index(), pointer, registers, memory, &zero);
if constexpr (is_32bit(model)) {
address <<= pointer.scale();
}
address += instruction.offset() + *resolve<model, uint16_t>(instruction, pointer.base(), pointer, registers, memory);
} break;
case Source::IndirectNoBase: {
uint16_t zero = 0;
address = *resolve<model, uint16_t>(instruction, pointer.index(), pointer, registers, memory, &zero);
if constexpr (is_32bit(model)) {
address <<= pointer.scale();
}
address += instruction.offset();
} break;
case Source::DirectAddress: return instruction.offset();
} }
return address;
uint32_t address;
uint16_t zero = 0;
address = *resolve<model, uint16_t>(instruction, pointer.index(), pointer, registers, memory, &zero);
if constexpr (is_32bit(model)) {
address <<= pointer.scale();
}
address += instruction.offset();
if constexpr (source == Source::IndirectNoBase) {
return address;
}
return address + *resolve<model, uint16_t>(instruction, pointer.base(), pointer, registers, memory);
} }
template <Model model, typename IntT, typename InstructionT, typename RegistersT, typename MemoryT> template <Model model, typename IntT, typename InstructionT, typename RegistersT, typename MemoryT>