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

Avoid ambiguous naming.

Browse Source
This commit is contained in:
Thomas Harte 2023-01-16 11:43:43 -05:00
parent 1a58ddaa67
commit 1769c24531
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Machines/MSX/MSX.cpp
View File

@ -430,7 +430,7 @@ class ConcreteMachine:
final_slot_ = &memory_slots_[primary >> 6]; final_slot_ = &memory_slots_[primary >> 6];
for(int c = 0; c < 8; c += 2) { for(int c = 0; c < 8; c += 2) {
const PrimarySlot &slot = memory_slots_[primary & 3]; const HandledSlot &slot = memory_slots_[primary & 3];
primary >>= 2; primary >>= 2;
read_pointers_[c] = slot.read_pointer(c); read_pointers_[c] = slot.read_pointer(c);
@ -859,7 +859,7 @@ class ConcreteMachine:
/// In principle one might want to attach a handler to a secondary slot rather /// In principle one might want to attach a handler to a secondary slot rather
/// than a primary, but in practice that isn't required in the slot allocation used /// than a primary, but in practice that isn't required in the slot allocation used
/// by this emulator. /// by this emulator.
struct PrimarySlot: public MSX::PrimarySlot { struct HandledSlot: public MSX::PrimarySlot {
using MSX::PrimarySlot::PrimarySlot; using MSX::PrimarySlot::PrimarySlot;
/// Storage for a slot-specialised handler. /// Storage for a slot-specialised handler.
@ -868,8 +868,8 @@ class ConcreteMachine:
/// The handler is updated just-in-time. /// The handler is updated just-in-time.
HalfCycles cycles_since_update; HalfCycles cycles_since_update;
}; };
PrimarySlot memory_slots_[4]; HandledSlot memory_slots_[4];
PrimarySlot *final_slot_ = nullptr; HandledSlot *final_slot_ = nullptr;
HalfCycles time_since_ay_update_; HalfCycles time_since_ay_update_;
@ -923,10 +923,10 @@ class ConcreteMachine:
return disk_primary().subslot(0); return disk_primary().subslot(0);
} }
PrimarySlot &cartridge_primary() { HandledSlot &cartridge_primary() {
return memory_slots_[1]; return memory_slots_[1];
} }
PrimarySlot &disk_primary() { HandledSlot &disk_primary() {
return memory_slots_[2]; return memory_slots_[2];
} }