6502/CLK
1
0
Fork 0
mirror of https://github.com/TomHarte/CLK.git synced 2024-11-23 03:32:32 +00:00
Code Issues Projects Releases Wiki Activity

Double down on AddressT, add an assert on memory_mask.

Browse Source
This commit is contained in:
Thomas Harte 2022-02-28 10:03:58 -05:00
parent d8601ef01f
commit b920507f34
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
InstructionSets/x86/DataPointerResolver.hpp
View File

@ -56,7 +56,7 @@ template <Model model, typename RegistersT, typename MemoryT> class DataPointerR
MemoryT &memory,
const Instruction<is_32bit(model)> &instruction,
DataPointer pointer,
typename Instruction<is_32bit(model)>::ImmediateT memory_mask = ~0) {
typename Instruction<is_32bit(model)>::AddressT memory_mask = ~0) {
DataT result;
access<true>(registers, memory, instruction, pointer, memory_mask, result);
return result;
@ -68,7 +68,7 @@ template <Model model, typename RegistersT, typename MemoryT> class DataPointerR
const Instruction<is_32bit(model)> &instruction,
DataPointer pointer,
DataT value,
typename Instruction<is_32bit(model)>::ImmediateT memory_mask = ~0) {
typename Instruction<is_32bit(model)>::AddressT memory_mask = ~0) {
access<false>(registers, memory, instruction, pointer, memory_mask, value);
}
@ -78,13 +78,14 @@ template <Model model, typename RegistersT, typename MemoryT> class DataPointerR
MemoryT &memory,
const Instruction<is_32bit(model)> &instruction,
DataPointer pointer,
typename Instruction<is_32bit(model)>::ImmediateT memory_mask,
typename Instruction<is_32bit(model)>::AddressT memory_mask,
DataT &value) {
assert(memory_mask == 0xffff'ffff || memory_mask == 0xffff);
const Source source = pointer.source();
#define read_or_write(v, x, is_for_indirection) \
case Source::x: \
if constexpr(!is_for_indirection && is_write) { \
if constexpr (!is_for_indirection && is_write) { \
registers.template write<decltype(v), register_for_source<decltype(v)>(Source::x)>(v); \
} else { \
v = registers.template read<decltype(v), register_for_source<decltype(v)>(Source::x)>(); \
@ -118,7 +119,7 @@ template <Model model, typename RegistersT, typename MemoryT> class DataPointerR
break;
case Source::Indirect: {
using AddressT = typename Instruction<is_32bit(model)>::AddressComponentT;
using AddressT = typename Instruction<is_32bit(model)>::AddressT;
AddressT base = 0, index = 0;
#define f(x, y) read_or_write(x, y, true)

2
InstructionSets/x86/Instruction.hpp
View File

@ -511,7 +511,7 @@ template<bool is_32bit> class Instruction {
using DisplacementT = typename std::conditional<is_32bit, int32_t, int16_t>::type;
using ImmediateT = typename std::conditional<is_32bit, uint32_t, uint16_t>::type;
using AddressComponentT = ImmediateT;
using AddressT = ImmediateT;
/* Note to self — current thinking is: